From b423b919ac354e0101170d63085c56ed0becb948 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Thu, 6 Jun 2024 13:58:11 +0900
Subject: [PATCH 1/7] =?UTF-8?q?firebase=E5=B0=8E=E5=85=A5=E3=81=A8SetUpAct?=
 =?UTF-8?q?ivity=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                | 17 +++++++++--------
 .../java/com/example/oplogy/SetUpActivity.java  | 14 ++++++++++++++
 app/src/main/res/layout/activity_set_up.xml     |  9 +++++++++
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/example/oplogy/SetUpActivity.java
 create mode 100644 app/src/main/res/layout/activity_set_up.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c525a5..77f4fcc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Oplogy"
         tools:targetApi="31">
-
+        <activity
+            android:name=".SetUpActivity"
+            android:exported="false" />
         <!--
              TODO: Before you run your application, you need a Google Maps API key.
 
@@ -26,19 +28,18 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value = "AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" />
+            android:value="AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" />
 
         <activity
             android:name=".MapsActivity"
             android:exported="true"
             android:label="@string/title_activity_maps">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
-
-
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
new file mode 100644
index 0000000..f775443
--- /dev/null
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -0,0 +1,14 @@
+package com.example.oplogy;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class SetUpActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_set_up);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
new file mode 100644
index 0000000..0e8762d
--- /dev/null
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -0,0 +1,9 @@
+<?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

From 405ece373491c99add217a2b7ee347d8a41dec16 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:23:38 +0900
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=AE=E3=81=AB=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E3=81=AA=E8=A6=81=E7=B4=A0=E3=82=92=E5=85=A5=E5=8A=9B=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=82=92=E4=BD=9C?=
 =?UTF-8?q?=E3=82=8A=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 64 ++++++++++++++++++++-
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 0e8762d..43b5f0f 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -1,9 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
+    tools:context=".SetUpActivity"
+    android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <EditText
+        android:id="@+id/teacherName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/startPoint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/firstTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/endTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/intervalTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/breakTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <EditText
+        android:id="@+id/totalStudent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+    <Button
+        android:id="@+id/resetButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="リセット"/>
+
+    <Button
+        android:id="@+id/setUpButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="設定"/>
+
+    </LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file

From a265e81d2df070c81e9d06433727a12b773aa20e Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 7 Jun 2024 10:08:14 +0900
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BB=AE=E3=81=AB=E3=83=AC=E3=82=A4?=
 =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E4=BD=9C=E3=82=8A=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 51 ++++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 43b5f0f..c073f62 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -1,46 +1,62 @@
 <?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:orientation="vertical"
+    android:gravity="center"
+    android:layout_margin="25dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"
+        android:text="設定"
+        android:textSize="100px"/>
 
     <EditText
         android:id="@+id/teacherName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <EditText
         android:id="@+id/startPoint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <EditText
         android:id="@+id/firstTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"
+        />
 
     <EditText
         android:id="@+id/endTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <EditText
         android:id="@+id/intervalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <EditText
         android:id="@+id/breakTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <EditText
         android:id="@+id/totalStudent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"/>
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -52,7 +68,8 @@
         android:id="@+id/resetButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="リセット"/>
+        android:text="リセット"
+        android:layout_marginRight="100dp"/>
 
     <Button
         android:id="@+id/setUpButton"

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 4/7] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E5=B0=91=E3=81=97=E6=94=B9=E8=89=AF=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=81=E8=AD=A6=E5=91=8A=E3=82=82?=
 =?UTF-8?q?=E3=81=8A=E3=81=8A=E3=82=88=E3=81=9D=E6=B6=88=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=82=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

From 46bbea4d74896e4febde9b98ce2bf27633d7191e Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:36:22 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=83=AC?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E8=A6=8B=E3=82=84?=
 =?UTF-8?q?=E3=81=99=E3=81=8F=E6=94=B9=E8=89=AF=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 44 +++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index bc49834..2751368 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -55,6 +55,7 @@
         android:id="@+id/startPoint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:hint="住所"
         android:autofillHints=""
         android:inputType=""
         tools:ignore="LabelFor" />
@@ -120,13 +121,40 @@
         android:text="@string/intervalTime"
         android:gravity="center"/>
 
-    <EditText
-    android:id="@+id/intervalTime"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:autofillHints=""
-    android:inputType=""
-    tools:ignore="LabelFor"/>
+    <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/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" />
+
+    </RadioGroup>
 
     </LinearLayout>
 
@@ -147,6 +175,7 @@
     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"/>
@@ -170,6 +199,7 @@
     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"/>

From 6effabbb9c837914e5baf410b3ee962467898a3a Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:01:21 +0900
Subject: [PATCH 6/7] =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=83=AC?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E8=A6=8B=E3=82=84?=
 =?UTF-8?q?=E3=81=99=E3=81=8F=E6=94=B9=E8=89=AF=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 2751368..d08c2e3 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -76,7 +76,7 @@
         android:gravity="center"/>
 
     <EditText
-        android:id="@+id/firstTime"
+        android:id="@+id/startTime"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autofillHints=""

From d4b847db2e7dd233b92a1a9e80c173b1d79615ba Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:14:01 +0900
Subject: [PATCH 7/7] =?UTF-8?q?json=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=82=92=E4=BF=9D=E5=AD=98=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/google-services.json | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 app/src/google-services.json

diff --git a/app/src/google-services.json b/app/src/google-services.json
new file mode 100644
index 0000000..cc555ea
--- /dev/null
+++ b/app/src/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "317219128586",
+    "project_id": "oplogy-b6971",
+    "storage_bucket": "oplogy-b6971.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:317219128586:android:c29583456e8fbd5f12a6f3",
+        "android_client_info": {
+          "package_name": "com.example.oplogy"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDaULi2TFHLiscR7DSZBCKS08d76Rtb49c"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file