From f19a0004bbfd7fd1ad1e5220b04cdc0480231b22 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:03:12 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E5=B0=91=E3=81=97=E6=94=B9=E8=89=AF=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=81=E8=AD=A6=E5=91=8A=E3=82=82=E3=81=8A?=
 =?UTF-8?q?=E3=81=8A=E3=82=88=E3=81=9D=E6=B6=88=E3=81=97=E3=81=A6=E3=81=82?=
 =?UTF-8?q?=E3=82=8A=E3=81=BE=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 157 +++++++++++++++++---
 app/src/main/res/values/strings.xml         |   9 ++
 2 files changed, 147 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index c073f62..bc49834 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -12,70 +12,189 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="25dp"
-        android:text="設定"
-        android:textSize="100px"/>
+        android:text="@string/setUp"
+        android:textSize="30sp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        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:layout_marginBottom="25dp"/>
+        android:autofillHints=""
+        android:inputType=""
+        tools:ignore="LabelFor" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        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:layout_marginBottom="25dp"/>
+        android:autofillHints=""
+        android:inputType=""
+        tools:ignore="LabelFor" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:gravity="center">
+
+    <TextView
+        android:layout_width="90sp"
+        android:layout_height="wrap_content"
+        android:text="@string/startTime"
+        android:gravity="center"/>
 
     <EditText
         android:id="@+id/firstTime"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"
-        />
+        android:autofillHints=""
+        android:inputType=""
+        tools:ignore="LabelFor"/>
 
-    <EditText
-        android:id="@+id/endTime"
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"/>
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:gravity="center">
+
+    <TextView
+        android:layout_width="90sp"
+        android:layout_height="wrap_content"
+        android:text="@string/endTime"
+        android:gravity="center"/>
 
     <EditText
-        android:id="@+id/intervalTime"
+    android:id="@+id/endTime"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:autofillHints=""
+    android:inputType=""
+    tools:ignore="LabelFor"/>
+
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"/>
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:gravity="center">
+
+    <TextView
+        android:layout_width="90sp"
+        android:layout_height="wrap_content"
+        android:text="@string/intervalTime"
+        android:gravity="center"/>
 
     <EditText
-        android:id="@+id/breakTime"
+    android:id="@+id/intervalTime"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:autofillHints=""
+    android:inputType=""
+    tools:ignore="LabelFor"/>
+
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"/>
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:gravity="center">
+
+    <TextView
+        android:layout_width="90sp"
+        android:layout_height="wrap_content"
+        android:text="@string/breakTime"
+        android:gravity="center"/>
 
     <EditText
-        android:id="@+id/totalStudent"
+    android:id="@+id/breakTime"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:autofillHints=""
+    android:inputType=""
+    tools:ignore="LabelFor"/>
+
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"/>
+        android:orientation="horizontal"
+        android:padding="10dp"
+        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:autofillHints=""
+    android:inputType=""
+    tools:ignore="LabelFor"/>
+
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:weightSum="2">
+        android:weightSum="2"
+        android:layout_marginTop="20sp">
 
     <Button
         android:id="@+id/resetButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="リセット"
-        android:layout_marginRight="100dp"/>
+        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="設定"/>
+        android:text="@string/setUp"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8b47d1d..31481c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,13 @@
 <resources>
     <string name="app_name">oplogy</string>
     <string name="title_activity_maps">MapsActivity</string>
+    <string name="setUp">設定</string>
+    <string name="reset">リセット</string>
+    <string name="teacherName">担任の名前</string>
+    <string name="startPoint">開始地点</string>
+    <string name="startTime">開始時刻</string>
+    <string name="endTime">終了時刻</string>
+    <string name="intervalTime">訪問間隔</string>
+    <string name="breakTime">休憩時間</string>
+    <string name="totalStudent">生徒の人数</string>
 </resources>
\ No newline at end of file