From 640d094e340996193118077924f66b8ca0f1c24e Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:15:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E5=9B=9E=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/feature/common/CommonHomeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java index 45a8beb..5a68d65 100644 --- a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java +++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java @@ -243,7 +243,7 @@ public class CommonHomeFragment extends Fragment { try { Thread.sleep(500); } catch (InterruptedException e) { - e.printStackTrace(); + // do nothing } swipeRefreshLayout.setRefreshing(false); }); From a9e6d16540c4291dd4f1a222efa8dd4e879b30e5 Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:16:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=AD=E3=82=B0=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/feature/common/CommonHomeFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java index 5a68d65..898e5d8 100644 --- a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java +++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java @@ -81,6 +81,12 @@ public class CommonHomeFragment extends Fragment { childId = getArguments().getString(ARG_CHILD_ID); } logger = ksLoggerFactory.create("CommonHomeFragment"); + + if (isChildMode) { + logger.info("Child mode, childId: " + childId); + } else { + logger.info("Parent mode"); + } } @Override From 3fbbc7311fd0bccf9b81e88c82f5c29f104fe64e Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:17:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/list_item_task_completion_child.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/common/src/main/res/layout/list_item_task_completion_child.xml b/feature/common/src/main/res/layout/list_item_task_completion_child.xml index e216ba2..d8f87d2 100644 --- a/feature/common/src/main/res/layout/list_item_task_completion_child.xml +++ b/feature/common/src/main/res/layout/list_item_task_completion_child.xml @@ -28,7 +28,7 @@ android:id="@+id/completeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Button" /> + android:text="完了" /> \ No newline at end of file From 1ba551ccb503df5a54298ac8f7f66a0e4469dce1 Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:17:31 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=A1=E3=83=A2=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/list_item_task_completion_child.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/common/src/main/res/layout/list_item_task_completion_child.xml b/feature/common/src/main/res/layout/list_item_task_completion_child.xml index d8f87d2..9309a9e 100644 --- a/feature/common/src/main/res/layout/list_item_task_completion_child.xml +++ b/feature/common/src/main/res/layout/list_item_task_completion_child.xml @@ -24,6 +24,7 @@ android:text="PLACEHOLDER" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> +