From afa4b678e0b5130bd35a7abb563f3eadc4fed81b Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Tue, 11 Jun 2024 16:25:29 +0900
Subject: [PATCH] =?UTF-8?q?SetUpActivity=E3=81=8C=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E8=B5=B7=E3=81=93=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=81=E5=86=8D=E5=BA=A6=E4=BD=9C?=
 =?UTF-8?q?=E3=82=8A=E7=9B=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  46 +---
 .../java/com/example/oplogy/MainActivity.java |   2 +-
 app/src/main/res/layout/activity_set_up.xml   | 246 +++++++++---------
 app/src/main/res/layout/setup.xml             |   9 -
 4 files changed, 138 insertions(+), 165 deletions(-)
 delete mode 100644 app/src/main/res/layout/setup.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e938999..58c5659 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <application
         android:allowBackup="true"
@@ -13,23 +12,20 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Oplogy"
         tools:ignore="ExtraText"
-        tools:targetApi="31">
-
-<!--        TODO: Before you run your application, you need a Google Maps API key.-->
-
-<!--        To get one, follow the directions here:-->
-
-<!--        https://developers.google.com/maps/documentation/android-sdk/get-api-key-->
-
-<!--        Once you have your API key (it starts with "AIza"), define a new property in your-->
-<!--        project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the-->
-<!--        "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".-->
-
+        tools:targetApi="31" >
+        <activity
+            android:name=".SetUpActivity"
+            android:exported="false" />
+        <!-- TODO: Before you run your application, you need a Google Maps API key. -->
+        <!-- To get one, follow the directions here: -->
+        <!-- https://developers.google.com/maps/documentation/android-sdk/get-api-key -->
+        <!-- Once you have your API key (it starts with "AIza"), define a new property in your -->
+        <!-- project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the -->
+        <!-- "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}". -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" />
 
-
         <activity
             android:name=".Maps"
             android:exported="false"
@@ -43,22 +39,16 @@
         <activity
             android:name=".RootSearchActivity"
             android:exported="false" />
-        <activity
-            android:name=".SetupActivity"
-            android:exported="false" />
         <activity
             android:name=".CreateUUID"
             android:exported="false" />
-
         <activity
-            android:name="com.example.oplogy.DialogFragment"
+            android:name=".DialogFragment"
             android:exported="false" />
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            tools:ignore="DuplicateActivity">
-
+            tools:ignore="DuplicateActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -67,12 +57,4 @@
         </activity>
     </application>
 
-</manifest>
-
-
-
-  
-
-  
-
-
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index d7dc725..8a767e3 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -87,7 +87,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 //        セットアップのクリック処理
         if(view == setUp){
             imageSetup.setImageResource(R.drawable.ischecked_uuid);
-            Intent toSetup = new Intent(MainActivity.this,SetupActivity.class);
+            Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
             startActivity(toSetup);
 
         }
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index d08c2e3..a919523 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".SetUpActivity"
     android:orientation="vertical"
-    android:gravity="center"
-    android:layout_margin="25dp">
+    android:gravity="center">
 
     <TextView
         android:layout_width="wrap_content"
@@ -22,19 +22,19 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/teacherName"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/teacherName"
+            android:gravity="center"/>
 
-    <EditText
-        android:id="@+id/teacherName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:inputType=""
-        tools:ignore="LabelFor" />
+        <EditText
+            android:id="@+id/teacherName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor" />
 
     </LinearLayout>
 
@@ -45,20 +45,20 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/startPoint"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/startPoint"
+            android:gravity="center"/>
 
-    <EditText
-        android:id="@+id/startPoint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="住所"
-        android:autofillHints=""
-        android:inputType=""
-        tools:ignore="LabelFor" />
+        <EditText
+            android:id="@+id/startPoint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="住所"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor" />
 
     </LinearLayout>
 
@@ -69,19 +69,19 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/startTime"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/startTime"
+            android:gravity="center"/>
 
-    <EditText
-        android:id="@+id/startTime"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:inputType=""
-        tools:ignore="LabelFor"/>
+        <EditText
+            android:id="@+id/startTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor"/>
 
     </LinearLayout>
 
@@ -92,19 +92,19 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/endTime"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/endTime"
+            android:gravity="center"/>
 
-    <EditText
-    android:id="@+id/endTime"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:autofillHints=""
-    android:inputType=""
-    tools:ignore="LabelFor"/>
+        <EditText
+            android:id="@+id/endTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor"/>
 
     </LinearLayout>
 
@@ -115,46 +115,46 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/intervalTime"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/intervalTime"
+            android:gravity="center"/>
 
-    <RadioGroup
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="3">
+        <RadioGroup
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="3">
 
-    <RadioButton
-        android:id="@+id/tenMinute"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="10分"
-        android:paddingEnd="20dp"
-        tools:ignore="RtlSymmetry" />
+            <RadioButton
+                android:id="@+id/tenMinute"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="10分"
+                android:paddingEnd="20dp"
+                tools:ignore="RtlSymmetry" />
 
-    <RadioButton
-        android:id="@+id/fifteenMinute"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="15分"
-        android:paddingEnd="20dp"
-        tools:ignore="RtlSymmetry" />
+            <RadioButton
+                android:id="@+id/fifteenMinute"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="15分"
+                android:paddingEnd="20dp"
+                tools:ignore="RtlSymmetry" />
 
-    <RadioButton
-        android:id="@+id/thirtyMinute"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="30分"
-        android:paddingEnd="20dp"
-        tools:ignore="RtlSymmetry" />
+            <RadioButton
+                android:id="@+id/thirtyMinute"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="30分"
+                android:paddingEnd="20dp"
+                tools:ignore="RtlSymmetry" />
 
-    </RadioGroup>
+        </RadioGroup>
 
     </LinearLayout>
 
@@ -165,20 +165,20 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/breakTime"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/breakTime"
+            android:gravity="center"/>
 
-    <EditText
-    android:id="@+id/breakTime"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:hint="例）30分➝30 1時間半➝90"
-    android:autofillHints=""
-    android:inputType=""
-    tools:ignore="LabelFor"/>
+        <EditText
+            android:id="@+id/breakTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="例）30分➝30 1時間半➝90"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor"/>
 
     </LinearLayout>
 
@@ -189,20 +189,20 @@
         android:padding="10dp"
         android:gravity="center">
 
-    <TextView
-        android:layout_width="90sp"
-        android:layout_height="wrap_content"
-        android:text="@string/totalStudent"
-        android:gravity="center"/>
+        <TextView
+            android:layout_width="90sp"
+            android:layout_height="wrap_content"
+            android:text="@string/totalStudent"
+            android:gravity="center"/>
 
-    <EditText
-    android:id="@+id/totalStudent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:hint="例）30人➝30"
-    android:autofillHints=""
-    android:inputType=""
-    tools:ignore="LabelFor"/>
+        <EditText
+            android:id="@+id/totalStudent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="例）30人➝30"
+            android:autofillHints=""
+            android:inputType=""
+            tools:ignore="LabelFor"/>
 
     </LinearLayout>
 
@@ -213,18 +213,18 @@
         android:weightSum="2"
         android:layout_marginTop="20sp">
 
-    <Button
-        android:id="@+id/resetButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/reset"
-        android:layout_marginEnd="100dp"/>
+        <Button
+            android:id="@+id/resetButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/reset"
+            android:layout_marginEnd="100dp"/>
 
-    <Button
-        android:id="@+id/setUpButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/setUp"/>
+        <Button
+            android:id="@+id/setUpButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/setUp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/setup.xml b/app/src/main/res/layout/setup.xml
deleted file mode 100644
index eeacfd1..0000000
--- a/app/src/main/res/layout/setup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".SetupActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file