From 09f0f6acfbb9b2905ad09da832f71574cfe153c0 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:50:45 +0900
Subject: [PATCH 01/17] =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=83=86=E3=82=A3?=
 =?UTF-8?q?=E3=83=93=E3=83=86=E3=82=A3=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 15 +-----------
 app/src/main/AndroidManifest.xml              |  3 +++
 .../one/nem/kidshift/RegisterActivity.java    | 24 +++++++++++++++++++
 app/src/main/res/layout/activity_register.xml | 10 ++++++++
 4 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/one/nem/kidshift/RegisterActivity.java
 create mode 100644 app/src/main/res/layout/activity_register.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 7b71903..0c0c338 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="adb-ZY22H7V3G7-Y7s4Km._adb-tls-connect._tcp" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-07-07T11:33:14.803530838Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b6d3fd6..36dc8f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.KidShift"
         tools:targetApi="31">
+        <activity
+            android:name=".RegisterActivity"
+            android:exported="false" />
         <activity
             android:name=".LoginActivity"
             android:exported="false" />
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
new file mode 100644
index 0000000..654e86e
--- /dev/null
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -0,0 +1,24 @@
+package one.nem.kidshift;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+public class RegisterActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EdgeToEdge.enable(this);
+        setContentView(R.layout.activity_register);
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
+            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
+            return insets;
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
new file mode 100644
index 0000000..2963c0a
--- /dev/null
+++ b/app/src/main/res/layout/activity_register.xml
@@ -0,0 +1,10 @@
+<?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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".RegisterActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From dc78d6cd02881f4e6a1543fc9927ec200a52081d Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:52:01 +0900
Subject: [PATCH 02/17] =?UTF-8?q?=E4=BB=AE=E7=BD=AE=E3=81=8D=E3=83=AC?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_register.xml | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 2963c0a..e1589d1 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -7,4 +7,47 @@
     android:layout_height="match_parent"
     tools:context=".RegisterActivity">
 
+    <LinearLayout
+        android:id="@+id/inputContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/emailEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textEmailAddress" />
+
+        <EditText
+            android:id="@+id/passwordEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textPassword" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="※Loginボタン長押しでBypass"
+        app:layout_constraintBottom_toTopOf="@+id/registerButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="REGISTER"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d1d8af6b390aad1d9d18ad554c0add149811af4b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:53:33 +0900
Subject: [PATCH 03/17] WIP

---
 .../one/nem/kidshift/data/retrofit/KidShiftApiService.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
index a0fd57f..041338d 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
@@ -35,6 +35,10 @@ public interface KidShiftApiService {
     @POST("/parent/auth/login")
     Call<ParentLoginResponse> parentLogin(@Body ParentLoginRequest request);
 
+
+    @POST("/parent/auth/register")
+    Call<ParentLoginResponse> parentRegister(@Body ParentLoginRequest request);
+
     /**
      * 保護者アカウント情報取得処理
      * @return ParentInfoResponse

From a0eb13db8b5bdfa97c90655466e4f0250a23e393 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:53:57 +0900
Subject: [PATCH 04/17] =?UTF-8?q?=E3=83=AA=E3=83=8D=E3=83=BC=E3=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java      | 4 ++--
 .../one/nem/kidshift/data/retrofit/KidShiftApiService.java | 7 +++----
 .../{ParentLoginResponse.java => ParentAuthResponse.java}  | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/{ParentLoginResponse.java => ParentAuthResponse.java} (82%)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index d9a6a9b..1f45e18 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -18,7 +18,7 @@ import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.data.retrofit.KidShiftApiService;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginRequest;
-import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginResponse;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
 import retrofit2.Response;
@@ -62,7 +62,7 @@ public class LoginActivity extends AppCompatActivity {
         findViewById(R.id.loginButton).setOnClickListener(v -> {
             CompletableFuture.supplyAsync(() -> {
                 try {
-                    Response<ParentLoginResponse> response = apiService.parentLogin(
+                    Response<ParentAuthResponse> response = apiService.parentLogin(
                             new ParentLoginRequest(
                                     emailEditText.getText().toString(),
                                     passwordEditText.getText().toString()
diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
index 041338d..f2fabb0 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
@@ -7,7 +7,7 @@ import one.nem.kidshift.data.retrofit.model.child.ChildLoginCodeResponse;
 import one.nem.kidshift.data.retrofit.model.child.ChildResponse;
 import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginRequest;
-import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginResponse;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
 import one.nem.kidshift.data.retrofit.model.task.TaskAddRequest;
 import one.nem.kidshift.data.retrofit.model.task.TaskListResponse;
 import one.nem.kidshift.data.retrofit.model.task.TaskResponse;
@@ -15,7 +15,6 @@ import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
-import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
@@ -33,11 +32,11 @@ public interface KidShiftApiService {
      * @return ParentLoginResponse
      */
     @POST("/parent/auth/login")
-    Call<ParentLoginResponse> parentLogin(@Body ParentLoginRequest request);
+    Call<ParentAuthResponse> parentLogin(@Body ParentLoginRequest request);
 
 
     @POST("/parent/auth/register")
-    Call<ParentLoginResponse> parentRegister(@Body ParentLoginRequest request);
+    Call<ParentAuthResponse> parentRegister(@Body ParentLoginRequest request);
 
     /**
      * 保護者アカウント情報取得処理
diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthResponse.java
similarity index 82%
rename from data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginResponse.java
rename to data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthResponse.java
index 08197ba..a3b5b77 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginResponse.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthResponse.java
@@ -1,13 +1,13 @@
 package one.nem.kidshift.data.retrofit.model.parent.auth;
 
-public class ParentLoginResponse {
+public class ParentAuthResponse {
     private String accessToken;
 
     /**
      * コンストラクタ (全プロパティ)
      * @param accessToken アクセストークン
      */
-    public ParentLoginResponse(String accessToken) {
+    public ParentAuthResponse(String accessToken) {
         this.accessToken = accessToken;
     }
 

From 5e92be0f986bdd728e8afa4e27212c7e746df49f Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:54:14 +0900
Subject: [PATCH 05/17] =?UTF-8?q?=E3=83=AA=E3=83=8D=E3=83=BC=E3=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java       | 4 ++--
 .../one/nem/kidshift/data/retrofit/KidShiftApiService.java  | 6 +++---
 .../{ParentLoginRequest.java => ParentAuthRequest.java}     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/{ParentLoginRequest.java => ParentAuthRequest.java} (86%)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 1f45e18..4c7f1b5 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -17,7 +17,7 @@ import javax.inject.Inject;
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.data.retrofit.KidShiftApiService;
-import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginRequest;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
@@ -63,7 +63,7 @@ public class LoginActivity extends AppCompatActivity {
             CompletableFuture.supplyAsync(() -> {
                 try {
                     Response<ParentAuthResponse> response = apiService.parentLogin(
-                            new ParentLoginRequest(
+                            new ParentAuthRequest(
                                     emailEditText.getText().toString(),
                                     passwordEditText.getText().toString()
                             )).execute();
diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
index f2fabb0..5247d44 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
@@ -6,7 +6,7 @@ import one.nem.kidshift.data.retrofit.model.child.ChildListResponse;
 import one.nem.kidshift.data.retrofit.model.child.ChildLoginCodeResponse;
 import one.nem.kidshift.data.retrofit.model.child.ChildResponse;
 import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse;
-import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginRequest;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
 import one.nem.kidshift.data.retrofit.model.task.TaskAddRequest;
 import one.nem.kidshift.data.retrofit.model.task.TaskListResponse;
@@ -32,11 +32,11 @@ public interface KidShiftApiService {
      * @return ParentLoginResponse
      */
     @POST("/parent/auth/login")
-    Call<ParentAuthResponse> parentLogin(@Body ParentLoginRequest request);
+    Call<ParentAuthResponse> parentLogin(@Body ParentAuthRequest request);
 
 
     @POST("/parent/auth/register")
-    Call<ParentAuthResponse> parentRegister(@Body ParentLoginRequest request);
+    Call<ParentAuthResponse> parentRegister(@Body ParentAuthRequest request);
 
     /**
      * 保護者アカウント情報取得処理
diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthRequest.java
similarity index 86%
rename from data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginRequest.java
rename to data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthRequest.java
index 9245db3..7673bca 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentLoginRequest.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/auth/ParentAuthRequest.java
@@ -1,6 +1,6 @@
 package one.nem.kidshift.data.retrofit.model.parent.auth;
 
-public class ParentLoginRequest {
+public class ParentAuthRequest {
     private String email;
     private String password;
 
@@ -9,7 +9,7 @@ public class ParentLoginRequest {
      * @param email メールアドレス
      * @param password パスワード
      */
-    public ParentLoginRequest(String email, String password) {
+    public ParentAuthRequest(String email, String password) {
         this.email = email;
         this.password = password;
     }

From 038ac102d1f4ed1c3f367319f02e1aa4b0c1101d Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 23:54:25 +0900
Subject: [PATCH 06/17] JavaDoc

---
 .../one/nem/kidshift/data/retrofit/KidShiftApiService.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
index 5247d44..d249874 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
@@ -34,7 +34,11 @@ public interface KidShiftApiService {
     @POST("/parent/auth/login")
     Call<ParentAuthResponse> parentLogin(@Body ParentAuthRequest request);
 
-
+    /**
+     * 保護者登録処理
+     * @param request ParentRegisterRequest
+     * @return ParentRegisterResponse
+     */
     @POST("/parent/auth/register")
     Call<ParentAuthResponse> parentRegister(@Body ParentAuthRequest request);
 

From f9aa29eefab4c7a05fefd7142ddbba2e07e13b94 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:03:19 +0900
Subject: [PATCH 07/17] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../one/nem/kidshift/RegisterActivity.java    | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index 654e86e..3ae1f59 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -1,6 +1,7 @@
 package one.nem.kidshift;
 
 import android.os.Bundle;
+import android.widget.EditText;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -8,8 +9,27 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.kidshift.data.UserSettings;
+import one.nem.kidshift.data.retrofit.KidShiftApiService;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
+import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
+import retrofit2.Call;
+import retrofit2.Response;
+
+@AndroidEntryPoint
 public class RegisterActivity extends AppCompatActivity {
 
+
+    @Inject
+    KidShiftApiService kidShiftApiService;
+
+    @Inject
+    UserSettings userSettings;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -20,5 +40,31 @@ public class RegisterActivity extends AppCompatActivity {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
             return insets;
         });
+
+        EditText emailEditText = findViewById(R.id.emailEditText);
+        EditText passwordEditText = findViewById(R.id.passwordEditText);
+
+        findViewById(R.id.registerButton).setOnClickListener(v -> {
+            String email = emailEditText.getText().toString();
+            String password = passwordEditText.getText().toString();
+
+            Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
+            try {
+                Response<ParentAuthResponse> response = call.execute();
+                if (response.isSuccessful()) {
+                    ParentAuthResponse parentAuthResponse = response.body();
+                    if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+                        // エラー処理
+                        return;
+                    }
+                    userSettings.getAppCommonSetting().setLoggedIn(true);
+                    userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
+                } else {
+                    // エラー処理
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
     }
 }
\ No newline at end of file

From eeacc23a2e402a181f2c708506d4ecffb90046f6 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:03:55 +0900
Subject: [PATCH 08/17] =?UTF-8?q?=E7=A7=BB=E6=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/one/nem/kidshift/LoginActivity.java  | 69 ++++++-------------
 1 file changed, 20 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 4c7f1b5..8de7b3e 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -21,6 +21,7 @@ import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
+import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -36,6 +37,9 @@ public class LoginActivity extends AppCompatActivity {
     @Inject
     UserSettings userSettings;
 
+    @Inject
+    KidShiftApiService kidShiftApiService;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -47,63 +51,30 @@ public class LoginActivity extends AppCompatActivity {
             return insets;
         });
 
-        logger = loggerFactory.create("LoginActivity");
-
-        // Retrofit init
-        KidShiftApiService apiService = new Retrofit.Builder()
-                .baseUrl("https://kidshift-beta.nem.one/")
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-                .create(KidShiftApiService.class);
-
         EditText emailEditText = findViewById(R.id.emailEditText);
         EditText passwordEditText = findViewById(R.id.passwordEditText);
 
         findViewById(R.id.loginButton).setOnClickListener(v -> {
-            CompletableFuture.supplyAsync(() -> {
-                try {
-                    Response<ParentAuthResponse> response = apiService.parentLogin(
-                            new ParentAuthRequest(
-                                    emailEditText.getText().toString(),
-                                    passwordEditText.getText().toString()
-                            )).execute();
+            String email = emailEditText.getText().toString();
+            String password = passwordEditText.getText().toString();
 
-                    return response;
-                } catch (IOException e) {
-                    logger.error("IOException");
-                    throw new RuntimeException(e);
-                }
-            }).thenAccept(response -> {
+            Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
+            try {
+                Response<ParentAuthResponse> response = call.execute();
                 if (response.isSuccessful()) {
-                    logger.info("Login Success");
-                    logger.debug("AccessToken: " + response.body().getAccessToken());
-
-                    UserSettings.AppCommonSetting appCommonSetting = userSettings.getAppCommonSetting();
-                    appCommonSetting.setLoggedIn(true);
-                    appCommonSetting.setAccessToken(response.body().getAccessToken());
-                    appCommonSetting.setChildMode(false);
-
-                    finish();
-                } else {
-                    logger.error("Login Failed");
-                    try {
-                        logger.debug("Response: " + response.errorBody().string());
-                    } catch (IOException e) {
-                        logger.error("IOException while reading error body");
+                    ParentAuthResponse parentAuthResponse = response.body();
+                    if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+                        // エラー処理
+                        return;
                     }
-                    // ログイン失敗時の処理
+                    userSettings.getAppCommonSetting().setLoggedIn(true);
+                    userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
+                } else {
+                    // エラー処理
                 }
-            }).exceptionally(e -> {
-                logger.error("Exception occurred: " + e.getMessage());
-                return null;
-            });
-        });
-
-        // for Debug
-        findViewById(R.id.loginButton).setOnLongClickListener(v -> {
-            // ログイン画面をバイパスしてメイン画面に遷移
-            finish();
-            return true;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         });
     }
 }
\ No newline at end of file

From e6e23d6ef30637bffaee47095b83d4dd5fb1cecb Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:06:01 +0900
Subject: [PATCH 09/17] =?UTF-8?q?=E3=83=AD=E3=82=B0=E6=8C=BF=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/one/nem/kidshift/LoginActivity.java   |  4 +++-
 .../java/one/nem/kidshift/RegisterActivity.java     | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 8de7b3e..6d61682 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -65,15 +65,17 @@ public class LoginActivity extends AppCompatActivity {
                     ParentAuthResponse parentAuthResponse = response.body();
                     if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
                         // エラー処理
+                        logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
                         return;
                     }
                     userSettings.getAppCommonSetting().setLoggedIn(true);
                     userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
                 } else {
+                    logger.error("リクエストに失敗しました");
                     // エラー処理
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error("リクエストに失敗しました: " + e.getMessage());
             }
         });
     }
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index 3ae1f59..a4ef029 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -16,6 +16,8 @@ import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.data.retrofit.KidShiftApiService;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest;
 import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse;
+import one.nem.kidshift.utils.KSLogger;
+import one.nem.kidshift.utils.factory.KSLoggerFactory;
 import retrofit2.Call;
 import retrofit2.Response;
 
@@ -29,6 +31,11 @@ public class RegisterActivity extends AppCompatActivity {
     @Inject
     UserSettings userSettings;
 
+    @Inject
+    KSLoggerFactory loggerFactory;
+
+    private KSLogger logger;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,6 +48,8 @@ public class RegisterActivity extends AppCompatActivity {
             return insets;
         });
 
+        logger = loggerFactory.create("RegisterActivity");
+
         EditText emailEditText = findViewById(R.id.emailEditText);
         EditText passwordEditText = findViewById(R.id.passwordEditText);
 
@@ -55,15 +64,17 @@ public class RegisterActivity extends AppCompatActivity {
                     ParentAuthResponse parentAuthResponse = response.body();
                     if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
                         // エラー処理
+                        logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
                         return;
                     }
                     userSettings.getAppCommonSetting().setLoggedIn(true);
                     userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
                 } else {
+                    logger.error("リクエストに失敗しました");
                     // エラー処理
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error("リクエストに失敗しました: " + e.getMessage());
             }
         });
     }

From 4f0e54ad23db68e6a177ce9ac79a82f874d6a3aa Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:06:23 +0900
Subject: [PATCH 10/17] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java    | 2 +-
 app/src/main/java/one/nem/kidshift/RegisterActivity.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 6d61682..fe40d10 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -55,7 +55,7 @@ public class LoginActivity extends AppCompatActivity {
         EditText passwordEditText = findViewById(R.id.passwordEditText);
 
         findViewById(R.id.loginButton).setOnClickListener(v -> {
-            String email = emailEditText.getText().toString();
+            String email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション
             String password = passwordEditText.getText().toString();
 
             Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index a4ef029..830d870 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -50,7 +50,7 @@ public class RegisterActivity extends AppCompatActivity {
 
         logger = loggerFactory.create("RegisterActivity");
 
-        EditText emailEditText = findViewById(R.id.emailEditText);
+        EditText emailEditText = findViewById(R.id.emailEditText); // TODO: メールアドレスのバリデーション
         EditText passwordEditText = findViewById(R.id.passwordEditText);
 
         findViewById(R.id.registerButton).setOnClickListener(v -> {

From 2468800b0395bcf41eecfa99f1e3f3711f5b2a0e Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:09:05 +0900
Subject: [PATCH 11/17] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_login.xml | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 389d6ef..4807f50 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -38,16 +38,33 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="※Loginボタン長押しでBypass"
-        app:layout_constraintBottom_toTopOf="@+id/loginButton"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <Button
-        android:id="@+id/loginButton"
+    <LinearLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="LOGIN"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="LOGIN" />
+
+        <Button
+            android:id="@+id/intentRegisterButton"
+            style="@style/Widget.Material3.Button.IconButton.Outlined"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Register" />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3bc38c4020abdac4842715fcfb5f8f5944a5ac0e Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:09:58 +0900
Subject: [PATCH 12/17] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_register.xml | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index e1589d1..4b255a7 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -37,17 +37,34 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="※Loginボタン長押しでBypass"
-        app:layout_constraintBottom_toTopOf="@+id/registerButton"
+        android:text="※Registerボタン長押しでBypass"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <Button
-        android:id="@+id/registerButton"
+    <LinearLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="REGISTER"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent">
+
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="REGISTER" />
+
+        <Button
+            android:id="@+id/intentLoginButton"
+            style="@style/Widget.Material3.Button.IconButton.Outlined"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Login" />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3e5b1f2626666fd84de6c79b11de40c2544df881 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:10:52 +0900
Subject: [PATCH 13/17] =?UTF-8?q?=E7=9B=B8=E4=BA=92=E3=81=AB=E3=82=A4?=
 =?UTF-8?q?=E3=83=B3=E3=83=86=E3=83=B3=E3=83=88=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java    | 5 +++++
 app/src/main/java/one/nem/kidshift/RegisterActivity.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index fe40d10..18cbdd3 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -1,5 +1,6 @@
 package one.nem.kidshift;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.EditText;
 
@@ -78,5 +79,9 @@ public class LoginActivity extends AppCompatActivity {
                 logger.error("リクエストに失敗しました: " + e.getMessage());
             }
         });
+
+        findViewById(R.id.intentRegisterButton).setOnClickListener(v -> {
+            startActivity(new Intent(this, RegisterActivity.class));
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index 830d870..d67cc8c 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -1,5 +1,6 @@
 package one.nem.kidshift;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.EditText;
 
@@ -77,5 +78,9 @@ public class RegisterActivity extends AppCompatActivity {
                 logger.error("リクエストに失敗しました: " + e.getMessage());
             }
         });
+
+        findViewById(R.id.intentLoginButton).setOnClickListener(v -> {
+            startActivity(new Intent(this, LoginActivity.class));
+        });
     }
 }
\ No newline at end of file

From 95e2bcef9feea08dd6ec6407826d039229e4300a Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:12:54 +0900
Subject: [PATCH 14/17] =?UTF-8?q?Logger=E3=82=A4=E3=83=8B=E3=82=B7?=
 =?UTF-8?q?=E3=83=A3=E3=83=A9=E3=82=A4=E3=82=BA=E5=BF=98=E3=82=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 18cbdd3..3b26777 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -52,6 +52,8 @@ public class LoginActivity extends AppCompatActivity {
             return insets;
         });
 
+        logger = loggerFactory.create("LoginActivity");
+
         EditText emailEditText = findViewById(R.id.emailEditText);
         EditText passwordEditText = findViewById(R.id.passwordEditText);
 

From db4710623cc3b9c7a26e7b83bd666b98a24867a3 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:15:40 +0900
Subject: [PATCH 15/17] =?UTF-8?q?=E3=82=B3=E3=83=94=E3=83=9A=E3=83=9F?=
 =?UTF-8?q?=E3=82=B9=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index 3b26777..f44875c 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -61,7 +61,7 @@ public class LoginActivity extends AppCompatActivity {
             String email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション
             String password = passwordEditText.getText().toString();
 
-            Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
+            Call<ParentAuthResponse> call = kidShiftApiService.parentLogin(new ParentAuthRequest(email, password));
             try {
                 Response<ParentAuthResponse> response = call.execute();
                 if (response.isSuccessful()) {

From bdb57f541256f716bcd9880de599a620e491fcea Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:17:03 +0900
Subject: [PATCH 16/17] =?UTF-8?q?printStackTrace=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/one/nem/kidshift/LoginActivity.java    | 1 +
 app/src/main/java/one/nem/kidshift/RegisterActivity.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index f44875c..f986e58 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -79,6 +79,7 @@ public class LoginActivity extends AppCompatActivity {
                 }
             } catch (Exception e) {
                 logger.error("リクエストに失敗しました: " + e.getMessage());
+                e.printStackTrace();
             }
         });
 
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index d67cc8c..7842266 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -76,6 +76,7 @@ public class RegisterActivity extends AppCompatActivity {
                 }
             } catch (Exception e) {
                 logger.error("リクエストに失敗しました: " + e.getMessage());
+                e.printStackTrace();
             }
         });
 

From 9f3f34ed72bd4c42955748a855515e8133e985a9 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 00:19:34 +0900
Subject: [PATCH 17/17] =?UTF-8?q?=E9=9D=9E=E5=90=8C=E6=9C=9F=E5=AE=9F?=
 =?UTF-8?q?=E8=A1=8C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/one/nem/kidshift/LoginActivity.java  | 38 ++++++++++--------
 .../one/nem/kidshift/RegisterActivity.java    | 40 +++++++++++--------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/one/nem/kidshift/LoginActivity.java b/app/src/main/java/one/nem/kidshift/LoginActivity.java
index f986e58..2c070b8 100644
--- a/app/src/main/java/one/nem/kidshift/LoginActivity.java
+++ b/app/src/main/java/one/nem/kidshift/LoginActivity.java
@@ -61,26 +61,30 @@ public class LoginActivity extends AppCompatActivity {
             String email = emailEditText.getText().toString(); // TODO: メールアドレスのバリデーション
             String password = passwordEditText.getText().toString();
 
-            Call<ParentAuthResponse> call = kidShiftApiService.parentLogin(new ParentAuthRequest(email, password));
-            try {
-                Response<ParentAuthResponse> response = call.execute();
-                if (response.isSuccessful()) {
-                    ParentAuthResponse parentAuthResponse = response.body();
-                    if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+            CompletableFuture.runAsync(() -> {
+                Call<ParentAuthResponse> call = kidShiftApiService.parentLogin(new ParentAuthRequest(email, password));
+                try {
+                    Response<ParentAuthResponse> response = call.execute();
+                    if (response.isSuccessful()) {
+                        ParentAuthResponse parentAuthResponse = response.body();
+                        if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+                            // エラー処理
+                            logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
+                            return;
+                        }
+                        userSettings.getAppCommonSetting().setLoggedIn(true);
+                        userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
+                    } else {
+                        logger.error("リクエストに失敗しました");
                         // エラー処理
-                        logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
-                        return;
                     }
-                    userSettings.getAppCommonSetting().setLoggedIn(true);
-                    userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
-                } else {
-                    logger.error("リクエストに失敗しました");
-                    // エラー処理
+                } catch (Exception e) {
+                    logger.error("リクエストに失敗しました: " + e.getMessage());
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                logger.error("リクエストに失敗しました: " + e.getMessage());
-                e.printStackTrace();
-            }
+            }).thenRun(() -> {
+                startActivity(new Intent(this, MainActivity.class));
+            });
         });
 
         findViewById(R.id.intentRegisterButton).setOnClickListener(v -> {
diff --git a/app/src/main/java/one/nem/kidshift/RegisterActivity.java b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
index 7842266..f251e9d 100644
--- a/app/src/main/java/one/nem/kidshift/RegisterActivity.java
+++ b/app/src/main/java/one/nem/kidshift/RegisterActivity.java
@@ -10,6 +10,8 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import java.util.concurrent.CompletableFuture;
+
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
@@ -58,26 +60,30 @@ public class RegisterActivity extends AppCompatActivity {
             String email = emailEditText.getText().toString();
             String password = passwordEditText.getText().toString();
 
-            Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
-            try {
-                Response<ParentAuthResponse> response = call.execute();
-                if (response.isSuccessful()) {
-                    ParentAuthResponse parentAuthResponse = response.body();
-                    if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+            CompletableFuture.runAsync(() -> {
+                Call<ParentAuthResponse> call = kidShiftApiService.parentRegister(new ParentAuthRequest(email, password));
+                try {
+                    Response<ParentAuthResponse> response = call.execute();
+                    if (response.isSuccessful()) {
+                        ParentAuthResponse parentAuthResponse = response.body();
+                        if (parentAuthResponse == null || parentAuthResponse.getAccessToken() == null) {
+                            // エラー処理
+                            logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
+                            return;
+                        }
+                        userSettings.getAppCommonSetting().setLoggedIn(true);
+                        userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
+                    } else {
+                        logger.error("リクエストに失敗しました");
                         // エラー処理
-                        logger.error("ParentAuthResponseがnullまたはAccessTokenがnullです");
-                        return;
                     }
-                    userSettings.getAppCommonSetting().setLoggedIn(true);
-                    userSettings.getAppCommonSetting().setAccessToken(parentAuthResponse.getAccessToken());
-                } else {
-                    logger.error("リクエストに失敗しました");
-                    // エラー処理
+                } catch (Exception e) {
+                    logger.error("リクエストに失敗しました: " + e.getMessage());
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                logger.error("リクエストに失敗しました: " + e.getMessage());
-                e.printStackTrace();
-            }
+            }).thenRun(() -> {
+                startActivity(new Intent(this, MainActivity.class));
+            });
         });
 
         findViewById(R.id.intentLoginButton).setOnClickListener(v -> {