From 96b1a5ea6dd8056bed377f5d40267ad5c9f8a51d Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Tue, 9 Jul 2024 04:22:45 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=83=9D=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=A2=E3=83=87=E3=83=AB=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/child/auth/ChildAuthResponse.java      | 15 ++++++++++++++-
 .../kidshift/wallet/WalletContentFragment.java   | 16 +++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/auth/ChildAuthResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/auth/ChildAuthResponse.java
index 191f626..2b91544 100644
--- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/auth/ChildAuthResponse.java
+++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/auth/ChildAuthResponse.java
@@ -2,9 +2,22 @@ package one.nem.kidshift.data.retrofit.model.child.auth;
 
 public class ChildAuthResponse {
     private String accessToken;
+    private String childId;
 
-    public ChildAuthResponse(String accessToken) {
+    public ChildAuthResponse() {
+    }
+
+    public ChildAuthResponse(String accessToken, String childId) {
         this.accessToken = accessToken;
+        this.childId = childId;
+    }
+
+    public String getChildId() {
+        return childId;
+    }
+
+    public void setChildId(String childId) {
+        this.childId = childId;
     }
 
     public String getAccessToken() {
diff --git a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java
index ab9dc0c..879ba3c 100644
--- a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java
+++ b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java
@@ -11,6 +11,7 @@ import javax.inject.Inject;
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.KSActions;
 import one.nem.kidshift.data.RewardData;
+import one.nem.kidshift.data.UserSettings;
 import one.nem.kidshift.utils.FabManager;
 import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
@@ -19,7 +20,6 @@ import one.nem.kidshift.utils.factory.KSLoggerFactory;
 public class WalletContentFragment extends Fragment {
 
     private static final String ARG_CHILD_ID = "childId";
-
     @Inject
     KSLoggerFactory loggerFactory;
     @Inject
@@ -28,6 +28,9 @@ public class WalletContentFragment extends Fragment {
     @Inject
     FabManager fabManager;
 
+    @Inject
+    UserSettings userSettings;
+
     private KSLogger logger;
     private String childId;
 
@@ -45,6 +48,10 @@ public class WalletContentFragment extends Fragment {
         return fragment;
     }
 
+    public static WalletContentFragment newInstance() {
+        return new WalletContentFragment();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -53,6 +60,13 @@ public class WalletContentFragment extends Fragment {
         }
         logger = loggerFactory.create("WalletMainFragment");
         logger.debug("Received parameter: " + childId);
+        if (childId == null) {
+            // 単品で呼び出されてる = 子供モードでログインされている
+            childId = userSettings.getAppCommonSetting().getChildId();
+            if (childId == null) {
+                logger.error("Child ID is not set");
+            }
+        }
     }
 
     @Override