From 44ed718894b56376144860f56165f04746325ed1 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 13:43:52 +0900
Subject: [PATCH 01/61] =?UTF-8?q?common=E3=83=A2=E3=82=B8=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/.gitignore                     |  1 +
 feature/common/build.gradle                   | 35 +++++++++++++++++++
 feature/common/consumer-rules.pro             |  0
 feature/common/proguard-rules.pro             | 21 +++++++++++
 .../common/ExampleInstrumentedTest.java       | 26 ++++++++++++++
 feature/common/src/main/AndroidManifest.xml   |  4 +++
 .../feature/common/ExampleUnitTest.java       | 17 +++++++++
 settings.gradle                               |  1 +
 8 files changed, 105 insertions(+)
 create mode 100644 feature/common/.gitignore
 create mode 100644 feature/common/build.gradle
 create mode 100644 feature/common/consumer-rules.pro
 create mode 100644 feature/common/proguard-rules.pro
 create mode 100644 feature/common/src/androidTest/java/one/nem/kidshift/feature/common/ExampleInstrumentedTest.java
 create mode 100644 feature/common/src/main/AndroidManifest.xml
 create mode 100644 feature/common/src/test/java/one/nem/kidshift/feature/common/ExampleUnitTest.java

diff --git a/feature/common/.gitignore b/feature/common/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/feature/common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/common/build.gradle b/feature/common/build.gradle
new file mode 100644
index 0000000..984c638
--- /dev/null
+++ b/feature/common/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    alias(libs.plugins.androidLibrary)
+}
+
+android {
+    namespace 'one.nem.kidshift.feature.common'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 24
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation libs.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
+}
\ No newline at end of file
diff --git a/feature/common/consumer-rules.pro b/feature/common/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/feature/common/proguard-rules.pro b/feature/common/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/feature/common/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/common/src/androidTest/java/one/nem/kidshift/feature/common/ExampleInstrumentedTest.java b/feature/common/src/androidTest/java/one/nem/kidshift/feature/common/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..2ec335a
--- /dev/null
+++ b/feature/common/src/androidTest/java/one/nem/kidshift/feature/common/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package one.nem.kidshift.feature.common;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("one.nem.kidshift.feature.common.test", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/feature/common/src/main/AndroidManifest.xml b/feature/common/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/feature/common/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/feature/common/src/test/java/one/nem/kidshift/feature/common/ExampleUnitTest.java b/feature/common/src/test/java/one/nem/kidshift/feature/common/ExampleUnitTest.java
new file mode 100644
index 0000000..24976ff
--- /dev/null
+++ b/feature/common/src/test/java/one/nem/kidshift/feature/common/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package one.nem.kidshift.feature.common;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index c809618..cda8bac 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -29,3 +29,4 @@ include ':utils'
 include ':data'
 include ':model'
 include ':shared'
+include ':feature:common'
-- 
2.45.1


From eb03dca2768c981721c5da6fbee288c51bbbd794 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 13:44:52 +0900
Subject: [PATCH 02/61] =?UTF-8?q?common=E3=83=A2=E3=82=B8=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3cd2a4c..4d7371d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$/data" />
             <option value="$PROJECT_DIR$/feature" />
             <option value="$PROJECT_DIR$/feature/child" />
+            <option value="$PROJECT_DIR$/feature/common" />
             <option value="$PROJECT_DIR$/feature/debug" />
             <option value="$PROJECT_DIR$/feature/parent" />
             <option value="$PROJECT_DIR$/feature/setting" />
-- 
2.45.1


From 04fdae855fa68fd0f544c30f6d5b41f0537d9a08 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:37:12 +0900
Subject: [PATCH 03/61] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=83=A1?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java    | 64 +++++++++++++++++++
 .../main/res/layout/fragment_common_home.xml  | 14 ++++
 .../common/src/main/res/values/strings.xml    |  4 ++
 3 files changed, 82 insertions(+)
 create mode 100644 feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java
 create mode 100644 feature/common/src/main/res/layout/fragment_common_home.xml
 create mode 100644 feature/common/src/main/res/values/strings.xml

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
new file mode 100644
index 0000000..fd9fb12
--- /dev/null
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java
@@ -0,0 +1,64 @@
+package one.nem.kidshift.feature.common;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link CommonHomeFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class CommonHomeFragment extends Fragment {
+
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+
+    public CommonHomeFragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment CommonHomeFragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static CommonHomeFragment newInstance(String param1, String param2) {
+        CommonHomeFragment fragment = new CommonHomeFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_common_home, container, false);
+    }
+}
\ No newline at end of file
diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
new file mode 100644
index 0000000..bbcaf83
--- /dev/null
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CommonHomeFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/feature/common/src/main/res/values/strings.xml b/feature/common/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6048840
--- /dev/null
+++ b/feature/common/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+</resources>
\ No newline at end of file
-- 
2.45.1


From df9130a1bf7619519ab687ba7b8b2bc570a0de6b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:39:02 +0900
Subject: [PATCH 04/61] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java    | 43 +------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

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 fd9fb12..61937ec 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
@@ -8,53 +8,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link CommonHomeFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
+
 public class CommonHomeFragment extends Fragment {
-
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
     public CommonHomeFragment() {
         // Required empty public constructor
     }
 
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment CommonHomeFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static CommonHomeFragment newInstance(String param1, String param2) {
-        CommonHomeFragment fragment = new CommonHomeFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-- 
2.45.1


From 963a6979bc550874f1c7cef7c02592179ed7ce23 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:46:26 +0900
Subject: [PATCH 05/61] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/build.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index 984c638..38688a3 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.androidLibrary)
+    id 'com.google.dagger.hilt.android'
 }
 
 android {
@@ -32,4 +33,13 @@ dependencies {
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
+
+    // Hilt (DI)
+    implementation libs.com.google.dagger.hilt.android
+    annotationProcessor libs.com.google.dagger.hilt.compiler
+
+    // Project modules
+    implementation project(':model')
+    implementation project(':utils')
+    implementation project(':data')
 }
\ No newline at end of file
-- 
2.45.1


From 1b8aa63e5d8bdcdc3f8fbd429d6827e28de9ce4f Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:50:04 +0900
Subject: [PATCH 06/61] =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82=E3=81=AB?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index 38688a3..50f9e75 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -38,6 +38,8 @@ dependencies {
     implementation libs.com.google.dagger.hilt.android
     annotationProcessor libs.com.google.dagger.hilt.compiler
 
+    api 'com.github.sundeepk:compact-calendar-view:3.0.0'
+
     // Project modules
     implementation project(':model')
     implementation project(':utils')
-- 
2.45.1


From 10be91ba19b2d22c19f1210f4a75aba59f300d9b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:58:53 +0900
Subject: [PATCH 07/61] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle            | 1 +
 feature/common/build.gradle | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index b4dfcbf..439df16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation project(':feature:parent')
     implementation project(':feature:child')
     implementation project(':feature:setting')
+    implementation project(':feature:common')
 
     implementation project(':data')
 
diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index 50f9e75..be3f370 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -44,4 +44,5 @@ dependencies {
     implementation project(':model')
     implementation project(':utils')
     implementation project(':data')
+    implementation project(':shared')
 }
\ No newline at end of file
-- 
2.45.1


From a57b8da206a9e11978ec4d9f54021c2c944ae513 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 14:59:34 +0900
Subject: [PATCH 08/61] =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80?=
 =?UTF-8?q?=E3=83=BC=E8=BF=BD=E5=8A=A0=20=E3=83=86=E3=82=B9=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_common_home.xml  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
index bbcaf83..de358e3 100644
--- a/feature/common/src/main/res/layout/fragment_common_home.xml
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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=".CommonHomeFragment">
+    tools:context=".CommonHomeFragment" >
 
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+    <com.github.sundeepk.compactcalendarview.CompactCalendarView
+        android:id="@+id/calendar"
+        android:layout_width="fill_parent"
+        android:layout_height="250dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        app:compactCalendarBackgroundColor="#ffe95451"
+        app:compactCalendarCurrentDayBackgroundColor="#B71C1C"
+        app:compactCalendarCurrentSelectedDayBackgroundColor="#E57373"
+        app:compactCalendarMultiEventIndicatorColor="#fff"
+        app:compactCalendarTargetHeight="250dp"
+        app:compactCalendarTextColor="#fff"
+        app:compactCalendarTextSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.45.1


From 267bb876490403fcdcfd0719475924e19e68edd0 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:03:47 +0900
Subject: [PATCH 09/61] =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E3=83=AC=E3=82=A4?=
 =?UTF-8?q?=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

---
 .../common/src/main/res/layout/fragment_common_home.xml   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
index de358e3..6501d08 100644
--- a/feature/common/src/main/res/layout/fragment_common_home.xml
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -23,4 +23,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/calendar" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.45.1


From 735fab046c7915f0a1d752cb16873a71351b87ca Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:15:06 +0900
Subject: [PATCH 10/61] =?UTF-8?q?ID=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/src/main/res/layout/fragment_common_home.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
index 6501d08..38670ad 100644
--- a/feature/common/src/main/res/layout/fragment_common_home.xml
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -24,6 +24,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/taskListRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-- 
2.45.1


From 7463606db4f9f64b8c512924630692542083c47b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:15:19 +0900
Subject: [PATCH 11/61] =?UTF-8?q?Adapter=E4=BD=9C=E6=88=90=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/adapter/TaskListItemAdapter.java   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
new file mode 100644
index 0000000..e20ff90
--- /dev/null
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -0,0 +1,30 @@
+package one.nem.kidshift.feature.common.adapter;
+
+import android.view.ViewGroup;
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapter.ViewHolder> {
+    @NonNull
+    @Override
+    public TaskListItemAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull TaskListItemAdapter.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+}
-- 
2.45.1


From 165c0cd0529679a44deffe5364f47d01f473b1d5 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:15:26 +0900
Subject: [PATCH 12/61] WIP

---
 .../feature/common/CommonHomeFragment.java    | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

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 61937ec..5b25677 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
@@ -8,16 +8,64 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.github.sundeepk.compactcalendarview.CompactCalendarView;
 
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+import one.nem.kidshift.data.ChildData;
+import one.nem.kidshift.data.TaskData;
+import one.nem.kidshift.utils.factory.KSLoggerFactory;
+
+@AndroidEntryPoint
 public class CommonHomeFragment extends Fragment {
+
+    private static final String ARG_IS_CHILD_MODE = "isChildMode";
+
+    @Inject
+    KSLoggerFactory ksLoggerFactory;
+    @Inject
+    TaskData taskData;
+    @Inject
+    ChildData childData;
+
+    private boolean isChildMode;
+
+    CompactCalendarView compactCalendarView;
+
     public CommonHomeFragment() {
         // Required empty public constructor
     }
 
+    public static CommonHomeFragment newInstance(boolean isChildMode) {
+        CommonHomeFragment fragment = new CommonHomeFragment();
+        Bundle args = new Bundle();
+        args.putBoolean(ARG_IS_CHILD_MODE, isChildMode);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            isChildMode = getArguments().getBoolean(ARG_IS_CHILD_MODE);
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_common_home, container, false);
+        View view = inflater.inflate(R.layout.fragment_common_home, container, false);
+
+        compactCalendarView = view.findViewById(R.id.calendar);
+
+
+        return view;
     }
-}
\ No newline at end of file
+
+    private void updateCalender() {
+
+    }
+}
-- 
2.45.1


From 64d4d3d98b7447c441f49489d3bfc1bdaf796d3e Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:16:57 +0900
Subject: [PATCH 13/61] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=82=A2?=
 =?UTF-8?q?=E3=82=A4=E3=83=86=E3=83=A0=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/list_item_common_task_list_item.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 feature/common/src/main/res/layout/list_item_common_task_list_item.xml

diff --git a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.45.1


From f1f3a86f9fecbc52cb7deb6dc25dfcffe6dd8435 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:19:32 +0900
Subject: [PATCH 14/61] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E3=80=80=E7=A7=BB=E6=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../list_item_common_task_list_item.xml       | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
index 77d9ef6..d03f813 100644
--- a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
+++ b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
@@ -1,6 +1,51 @@
 <?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">
+    android:layout_height="wrap_content"
+    android:layout_margin="12dp">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/textContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/task_title_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:text="お手伝い名"
+            android:textSize="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/task_contents_text_view"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="13dp"
+            android:text="円／回"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/task_title_text_view" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="0">
+
+        <Button
+            android:id="@+id/actbutton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="完了"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
2.45.1


From 1306df3ee97ae4c2a90cdbe1b6a721c83c915e7c Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:21:18 +0900
Subject: [PATCH 15/61] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?=
 =?UTF-8?q?=E3=83=88=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/list_item_common_task_list_item.xml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
index d03f813..ab16c7e 100644
--- a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
+++ b/feature/common/src/main/res/layout/list_item_common_task_list_item.xml
@@ -18,7 +18,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:text="お手伝い名"
-            android:textSize="24dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
+            android:textSize="20sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-- 
2.45.1


From 21549fb5890705e75de88e26ec0749aa4ada002a Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:27:31 +0900
Subject: [PATCH 16/61] =?UTF-8?q?Adapter=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/adapter/TaskListItemAdapter.java   | 51 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
index e20ff90..5c03da8 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -1,20 +1,54 @@
 package one.nem.kidshift.feature.common.adapter;
 
+import android.annotation.SuppressLint;
 import android.view.ViewGroup;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.util.List;
+
+import one.nem.kidshift.feature.common.R;
+import one.nem.kidshift.model.tasks.TaskItemModel;
+
 public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapter.ViewHolder> {
+
+    private List<TaskItemModel> taskItemModelList;
+
+    private CompleteButtonClickedCallback callback;
+
+    public TaskListItemAdapter() {
+    }
+
+    public void setTaskItemModelList(List<TaskItemModel> taskItemModelList) {
+        this.taskItemModelList = taskItemModelList;
+    }
+
+    public void setCallback(CompleteButtonClickedCallback callback) {
+        this.callback = callback;
+    }
+
     @NonNull
     @Override
     public TaskListItemAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return null;
+        View view = View.inflate(parent.getContext(), R.layout.list_item_common_task_list_item, null);
+        return new ViewHolder(view);
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull TaskListItemAdapter.ViewHolder holder, int position) {
-
+        TaskItemModel taskItemModel = taskItemModelList.get(position);
+        holder.taskTitle.setText(taskItemModel.getName());
+        holder.taskContents.setText(taskItemModel.getReward() + "円"); // TODO: ハードコードやめる
+        holder.completedButton.setOnClickListener(v -> {
+            if (callback != null) {
+                callback.onClicked(taskItemModel.getId());
+            }
+        });
     }
 
     @Override
@@ -23,8 +57,21 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
+
+        TextView taskTitle;
+        TextView taskContents;
+        Button completedButton;
+
         public ViewHolder(@NonNull View itemView) {
             super(itemView);
+            taskTitle = itemView.findViewById(R.id.task_title_text_view);
+            taskContents = itemView.findViewById(R.id.task_contents_text_view);
+            completedButton = itemView.findViewById(R.id.actbutton);
+
         }
     }
+
+    public interface CompleteButtonClickedCallback {
+        void onClicked(String taskId);
+    }
 }
-- 
2.45.1


From d1a58f93dab8878808d498b0ac3bf49db77920ce Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:34:12 +0900
Subject: [PATCH 17/61] WIP

---
 .../feature/common/CommonHomeFragment.java    | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 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 5b25677..4b534c7 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
@@ -1,5 +1,6 @@
 package one.nem.kidshift.feature.common;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -10,11 +11,16 @@ import android.view.ViewGroup;
 
 import com.github.sundeepk.compactcalendarview.CompactCalendarView;
 
+import java.util.List;
+
 import javax.inject.Inject;
 
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.ChildData;
 import one.nem.kidshift.data.TaskData;
+import one.nem.kidshift.feature.common.adapter.TaskListItemAdapter;
+import one.nem.kidshift.model.callback.TaskItemModelCallback;
+import one.nem.kidshift.model.tasks.TaskItemModel;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
 
 @AndroidEntryPoint
@@ -32,6 +38,7 @@ public class CommonHomeFragment extends Fragment {
     private boolean isChildMode;
 
     CompactCalendarView compactCalendarView;
+    TaskListItemAdapter taskListItemAdapter;
 
     public CommonHomeFragment() {
         // Required empty public constructor
@@ -60,11 +67,40 @@ public class CommonHomeFragment extends Fragment {
         View view = inflater.inflate(R.layout.fragment_common_home, container, false);
 
         compactCalendarView = view.findViewById(R.id.calendar);
-
+        taskListItemAdapter = new TaskListItemAdapter();
+        taskListItemAdapter.setCallback(taskId -> {
+            if (isChildMode) {
+                // 確認ダイアログ呼び出し
+            } else {
+                // 子供選択ダイアログ呼び出し
+            }
+        });
 
         return view;
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    private void updateTaskInfo() {
+        taskData.getTasks(new TaskItemModelCallback() {
+            @Override
+            public void onUnchanged() {
+            }
+
+            @Override
+            public void onUpdated(List<TaskItemModel> taskItem) {
+            }
+
+            @Override
+            public void onFailed(String message) {
+            }
+        }).thenAccept(taskItemModel -> {
+            taskListItemAdapter.setTaskItemModelList(taskItemModel);
+            requireActivity().runOnUiThread(() -> {
+                taskListItemAdapter.notifyDataSetChanged();
+            });
+        });
+    }
+
     private void updateCalender() {
 
     }
-- 
2.45.1


From 95fb3b1aae9e2c15ad42cfd5bf3de471c1e90a2e Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:34:52 +0900
Subject: [PATCH 18/61] WIP

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java   | 4 ++++
 1 file changed, 4 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 4b534c7..2170bc8 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
@@ -79,6 +79,10 @@ public class CommonHomeFragment extends Fragment {
         return view;
     }
 
+    private void showConfirmDialog(String taskName) {
+        // 確認ダイアログ表示
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private void updateTaskInfo() {
         taskData.getTasks(new TaskItemModelCallback() {
-- 
2.45.1


From 5ea8077e7c47b40f2a49bcd613f73aad1879b7df Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:35:41 +0900
Subject: [PATCH 19/61] =?UTF-8?q?name=E3=82=82=E6=B8=A1=E3=81=99=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/adapter/TaskListItemAdapter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
index 5c03da8..7a1d12f 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -46,7 +46,7 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
         holder.taskContents.setText(taskItemModel.getReward() + "円"); // TODO: ハードコードやめる
         holder.completedButton.setOnClickListener(v -> {
             if (callback != null) {
-                callback.onClicked(taskItemModel.getId());
+                callback.onClicked(taskItemModel.getId(), taskItemModel.getName());
             }
         });
     }
@@ -72,6 +72,6 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
     }
 
     public interface CompleteButtonClickedCallback {
-        void onClicked(String taskId);
+        void onClicked(String taskId, String taskName);
     }
 }
-- 
2.45.1


From 70fecadaf16e24f11c2ab42690121f19c05d214a Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:36:01 +0900
Subject: [PATCH 20/61] WIP

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 2170bc8..0a9791f 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
@@ -68,7 +68,7 @@ public class CommonHomeFragment extends Fragment {
 
         compactCalendarView = view.findViewById(R.id.calendar);
         taskListItemAdapter = new TaskListItemAdapter();
-        taskListItemAdapter.setCallback(taskId -> {
+        taskListItemAdapter.setCallback((taskId, taskName) -> {
             if (isChildMode) {
                 // 確認ダイアログ呼び出し
             } else {
@@ -79,8 +79,9 @@ public class CommonHomeFragment extends Fragment {
         return view;
     }
 
-    private void showConfirmDialog(String taskName) {
+    private boolean showConfirmDialog(String taskName) {
         // 確認ダイアログ表示
+        return false;
     }
 
     @SuppressLint("NotifyDataSetChanged")
-- 
2.45.1


From bbeed80914cdcb8fd1ca5788027cce5208961b24 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:36:26 +0900
Subject: [PATCH 21/61] WIP

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java   | 4 ++++
 1 file changed, 4 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 0a9791f..e1db0d2 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
@@ -84,6 +84,10 @@ public class CommonHomeFragment extends Fragment {
         return false;
     }
 
+    private void showChildSelectDialog() {
+        // 子供選択ダイアログ表示
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private void updateTaskInfo() {
         taskData.getTasks(new TaskItemModelCallback() {
-- 
2.45.1


From ad8b38810140bac02f42d86f9e17fc64bca2aa88 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:37:30 +0900
Subject: [PATCH 22/61] =?UTF-8?q?Logger=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    | 3 +++
 1 file changed, 3 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 e1db0d2..e5a6bee 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
@@ -21,6 +21,7 @@ import one.nem.kidshift.data.TaskData;
 import one.nem.kidshift.feature.common.adapter.TaskListItemAdapter;
 import one.nem.kidshift.model.callback.TaskItemModelCallback;
 import one.nem.kidshift.model.tasks.TaskItemModel;
+import one.nem.kidshift.utils.KSLogger;
 import one.nem.kidshift.utils.factory.KSLoggerFactory;
 
 @AndroidEntryPoint
@@ -36,6 +37,7 @@ public class CommonHomeFragment extends Fragment {
     ChildData childData;
 
     private boolean isChildMode;
+    private KSLogger logger;
 
     CompactCalendarView compactCalendarView;
     TaskListItemAdapter taskListItemAdapter;
@@ -58,6 +60,7 @@ public class CommonHomeFragment extends Fragment {
         if (getArguments() != null) {
             isChildMode = getArguments().getBoolean(ARG_IS_CHILD_MODE);
         }
+        logger = ksLoggerFactory.create("CommonHomeFragment");
     }
 
     @Override
-- 
2.45.1


From a167d8495b6be05ae266f61f482337b81e3612da Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:38:07 +0900
Subject: [PATCH 23/61] WIP

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 e5a6bee..1ed2b1a 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
@@ -73,9 +73,11 @@ public class CommonHomeFragment extends Fragment {
         taskListItemAdapter = new TaskListItemAdapter();
         taskListItemAdapter.setCallback((taskId, taskName) -> {
             if (isChildMode) {
-                // 確認ダイアログ呼び出し
+                if (showConfirmDialog(taskName)) {
+                    // タスク完了処理
+                }
             } else {
-                // 子供選択ダイアログ呼び出し
+                showChildSelectDialog();
             }
         });
 
-- 
2.45.1


From 3dde8dfa023efc2bfde4b053600b5a8c33d74668 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:39:13 +0900
Subject: [PATCH 24/61] =?UTF-8?q?ChildID=E3=82=92=E5=BC=95=E6=95=B0?=
 =?UTF-8?q?=E3=81=A8=E3=81=97=E3=81=A6=E5=8F=96=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
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, 5 insertions(+), 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 1ed2b1a..2292268 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
@@ -28,6 +28,7 @@ import one.nem.kidshift.utils.factory.KSLoggerFactory;
 public class CommonHomeFragment extends Fragment {
 
     private static final String ARG_IS_CHILD_MODE = "isChildMode";
+    private static final String ARG_CHILD_ID = "childId";
 
     @Inject
     KSLoggerFactory ksLoggerFactory;
@@ -37,6 +38,7 @@ public class CommonHomeFragment extends Fragment {
     ChildData childData;
 
     private boolean isChildMode;
+    private String childId;
     private KSLogger logger;
 
     CompactCalendarView compactCalendarView;
@@ -46,10 +48,11 @@ public class CommonHomeFragment extends Fragment {
         // Required empty public constructor
     }
 
-    public static CommonHomeFragment newInstance(boolean isChildMode) {
+    public static CommonHomeFragment newInstance(boolean isChildMode, String childId) {
         CommonHomeFragment fragment = new CommonHomeFragment();
         Bundle args = new Bundle();
         args.putBoolean(ARG_IS_CHILD_MODE, isChildMode);
+        args.putString(ARG_CHILD_ID, childId);
         fragment.setArguments(args);
         return fragment;
     }
@@ -59,6 +62,7 @@ public class CommonHomeFragment extends Fragment {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             isChildMode = getArguments().getBoolean(ARG_IS_CHILD_MODE);
+            childId = getArguments().getString(ARG_CHILD_ID);
         }
         logger = ksLoggerFactory.create("CommonHomeFragment");
     }
-- 
2.45.1


From 72efe84497beca5bd7c4f4fc69d056c1f6c1ba40 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:40:02 +0900
Subject: [PATCH 25/61] =?UTF-8?q?isChildMode=E3=81=AB=E5=BF=9C=E3=81=98?=
 =?UTF-8?q?=E3=81=A6childId=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E6=B1=BA?=
 =?UTF-8?q?=E5=AE=9A=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

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java   | 4 +++-
 1 file changed, 3 insertions(+), 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 2292268..45d574d 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
@@ -52,7 +52,9 @@ public class CommonHomeFragment extends Fragment {
         CommonHomeFragment fragment = new CommonHomeFragment();
         Bundle args = new Bundle();
         args.putBoolean(ARG_IS_CHILD_MODE, isChildMode);
-        args.putString(ARG_CHILD_ID, childId);
+        if (isChildMode) {
+            args.putString(ARG_CHILD_ID, childId);
+        }
         fragment.setArguments(args);
         return fragment;
     }
-- 
2.45.1


From db1f2582c4cd0a1092e1488b974284f77fe1605d Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:42:46 +0900
Subject: [PATCH 26/61] =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=81=8B=E3=82=89=E3=81=AE=E6=88=BB=E3=82=8A=E5=9C=B0?=
 =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E5=AE=9F=E8=A3=85?=
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 45d574d..747377c 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
@@ -80,7 +80,7 @@ public class CommonHomeFragment extends Fragment {
         taskListItemAdapter.setCallback((taskId, taskName) -> {
             if (isChildMode) {
                 if (showConfirmDialog(taskName)) {
-                    // タスク完了処理
+                    taskData.recordTaskCompletion(taskId, childId);
                 }
             } else {
                 showChildSelectDialog();
-- 
2.45.1


From e3068f12993bacc38b1b48881fdbc7d747867928 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:46:39 +0900
Subject: [PATCH 27/61] =?UTF-8?q?=E5=AD=90=E4=BE=9B=E5=81=B4=E3=83=80?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java    | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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 747377c..9308b14 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
@@ -10,8 +10,10 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.github.sundeepk.compactcalendarview.CompactCalendarView;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.inject.Inject;
 
@@ -91,12 +93,23 @@ public class CommonHomeFragment extends Fragment {
     }
 
     private boolean showConfirmDialog(String taskName) {
-        // 確認ダイアログ表示
-        return false;
+        AtomicBoolean selection = new AtomicBoolean(false);
+        new MaterialAlertDialogBuilder(requireContext())
+                .setTitle("タスクを完了しますか？")
+                .setMessage(taskName + "を完了しますか？")
+                .setPositiveButton("はい", (dialog, which) -> {
+                    dialog.dismiss();
+                    selection.set(true);
+                })
+                .setNegativeButton("いいえ", (dialog, which) -> {
+                    dialog.dismiss();
+                    selection.set(false);
+                })
+                .show();
+        return selection.get();
     }
 
     private void showChildSelectDialog() {
-        // 子供選択ダイアログ表示
     }
 
     @SuppressLint("NotifyDataSetChanged")
-- 
2.45.1


From c85f9edd72aed30239e0694e96dece0b0c642d37 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:50:16 +0900
Subject: [PATCH 28/61] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._common_task_list_item.xml => list_item_common_task.xml} | 0
 .../src/main/res/layout/list_item_task_completion_child.xml | 6 ++++++
 2 files changed, 6 insertions(+)
 rename feature/common/src/main/res/layout/{list_item_common_task_list_item.xml => list_item_common_task.xml} (100%)
 create mode 100644 feature/common/src/main/res/layout/list_item_task_completion_child.xml

diff --git a/feature/common/src/main/res/layout/list_item_common_task_list_item.xml b/feature/common/src/main/res/layout/list_item_common_task.xml
similarity index 100%
rename from feature/common/src/main/res/layout/list_item_common_task_list_item.xml
rename to feature/common/src/main/res/layout/list_item_common_task.xml
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
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/feature/common/src/main/res/layout/list_item_task_completion_child.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.45.1


From a7f5eee0325f6d6c90ee2b2ff6aec0a9c8f8b249 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 15:57:58 +0900
Subject: [PATCH 29/61] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=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

---
 .../list_item_task_completion_child.xml       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

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 77d9ef6..e2e1e31 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
@@ -1,6 +1,32 @@
 <?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">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal"
+        android:padding="8px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/childNameTextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="PLACEHOLDER"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button" />
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.45.1


From 30d35cf4f2b6b1ef07ca787706d7858e80aa0a7b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:02:42 +0900
Subject: [PATCH 30/61] =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/adapter/ChildListItemAdapter.java  | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
new file mode 100644
index 0000000..8ebcf80
--- /dev/null
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
@@ -0,0 +1,70 @@
+package one.nem.kidshift.feature.common.adapter;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+import one.nem.kidshift.feature.common.R;
+import one.nem.kidshift.model.ChildModel;
+
+public class ChildListItemAdapter extends RecyclerView.Adapter<ChildListItemAdapter.ViewHolder> {
+
+    private List<ChildModel> childDataList;
+    private CompleteButtonClickedCallback callback;
+
+    public ChildListItemAdapter() {
+        // Empty constructor
+    }
+
+    public void setChildDataList(List<ChildModel> childDataList) {
+        this.childDataList = childDataList;
+    }
+
+    public void setCallback(CompleteButtonClickedCallback callback) {
+        this.callback = callback;
+    }
+
+    @NonNull
+    @Override
+    public ChildListItemAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = View.inflate(parent.getContext(), R.layout.list_item_task_completion_child, null);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ChildListItemAdapter.ViewHolder holder, int position) {
+        ChildModel childData = childDataList.get(position);
+        holder.childName.setText(childData.getName());
+        holder.completedButton.setOnClickListener(v -> {
+            if (callback != null) {
+                callback.onClicked(childData.getId());
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView childName;
+        Button completedButton;
+
+        public ViewHolder(@NonNull android.view.View itemView) {
+            super(itemView);
+            childName = itemView.findViewById(R.id.childNameTextView);
+            completedButton = itemView.findViewById(R.id.actbutton);
+        }
+    }
+
+    public interface CompleteButtonClickedCallback {
+        void onClicked(String taskId);
+    }
+}
-- 
2.45.1


From 3e80c62cfd4fcbb0c922628157d2ff8066f1a2df Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:02:58 +0900
Subject: [PATCH 31/61] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E8=BF=BD=E5=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/adapter/TaskListItemAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
index 7a1d12f..d61ef6f 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -34,7 +34,7 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
     @NonNull
     @Override
     public TaskListItemAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = View.inflate(parent.getContext(), R.layout.list_item_common_task_list_item, null);
+        View view = View.inflate(parent.getContext(), R.layout.list_item_common_task, null);
         return new ViewHolder(view);
     }
 
-- 
2.45.1


From 5f66572569844ea0004d2f6e483d7f710af52570 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:05:47 +0900
Subject: [PATCH 32/61] =?UTF-8?q?ItemCount=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/adapter/ChildListItemAdapter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
index 8ebcf80..94d81d0 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
@@ -50,7 +50,7 @@ public class ChildListItemAdapter extends RecyclerView.Adapter<ChildListItemAdap
 
     @Override
     public int getItemCount() {
-        return 0;
+        return childDataList == null ? 0 : childDataList.size();
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
-- 
2.45.1


From a69bbcdec18d20825e4803d787540900a9a958a1 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:09:30 +0900
Subject: [PATCH 33/61] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=A9=E3=82=AF=E3=82=BF=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/adapter/ChildListItemAdapter.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
index 94d81d0..97dd86c 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
@@ -22,6 +22,10 @@ public class ChildListItemAdapter extends RecyclerView.Adapter<ChildListItemAdap
         // Empty constructor
     }
 
+    public ChildListItemAdapter(List<ChildModel> childDataList) {
+        this.childDataList = childDataList;
+    }
+
     public void setChildDataList(List<ChildModel> childDataList) {
         this.childDataList = childDataList;
     }
-- 
2.45.1


From 31ba7dea75cfd32019fb77fd646c3d5877dfed1f Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:11:34 +0900
Subject: [PATCH 34/61] =?UTF-8?q?=E8=A6=AA=E5=81=B4=E3=81=AE=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=81=AB=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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 9308b14..b71378f 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
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,6 +22,7 @@ import javax.inject.Inject;
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.ChildData;
 import one.nem.kidshift.data.TaskData;
+import one.nem.kidshift.feature.common.adapter.ChildListItemAdapter;
 import one.nem.kidshift.feature.common.adapter.TaskListItemAdapter;
 import one.nem.kidshift.model.callback.TaskItemModelCallback;
 import one.nem.kidshift.model.tasks.TaskItemModel;
@@ -85,7 +88,7 @@ public class CommonHomeFragment extends Fragment {
                     taskData.recordTaskCompletion(taskId, childId);
                 }
             } else {
-                showChildSelectDialog();
+                showChildSelectDialog(taskId);
             }
         });
 
@@ -109,7 +112,22 @@ public class CommonHomeFragment extends Fragment {
         return selection.get();
     }
 
-    private void showChildSelectDialog() {
+    private void showChildSelectDialog(String taskId) {
+        RecyclerView childListRecyclerView = new RecyclerView(requireContext());
+        childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        childData.getChildListDirect().thenAccept(childModelList -> {
+            ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter();
+            childListRecyclerView.setAdapter(childListItemAdapter);
+            childListItemAdapter.setCallback(childId -> {
+                taskData.recordTaskCompletion(taskId, childId);
+            });
+        });
+
+        new MaterialAlertDialogBuilder(requireContext())
+                .setTitle("お手伝いをしたお子様を選択")
+                .setView(childListRecyclerView)
+                .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss())
+                .show();
     }
 
     @SuppressLint("NotifyDataSetChanged")
-- 
2.45.1


From 356643892ec86c3fa45171a07f4bc35a2f2b4bd8 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:12:18 +0900
Subject: [PATCH 35/61] =?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

---
 .../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 b71378f..9c1e87e 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
@@ -112,7 +112,7 @@ public class CommonHomeFragment extends Fragment {
         return selection.get();
     }
 
-    private void showChildSelectDialog(String taskId) {
+    private void showChildSelectDialog(String taskId) { // TODO: Assignされている子供かどうかを考慮するように
         RecyclerView childListRecyclerView = new RecyclerView(requireContext());
         childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         childData.getChildListDirect().thenAccept(childModelList -> {
-- 
2.45.1


From 50b75709b70304bcb5d4411173378127e6dab863 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:13:18 +0900
Subject: [PATCH 36/61] =?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

---
 .../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 9c1e87e..0074d27 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
@@ -131,7 +131,7 @@ public class CommonHomeFragment extends Fragment {
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    private void updateTaskInfo() {
+    private void updateTaskInfo() { // TODO: updatedの場合の処理など実装
         taskData.getTasks(new TaskItemModelCallback() {
             @Override
             public void onUnchanged() {
-- 
2.45.1


From da4b436b78343d714086642e684b30e2f8089c50 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:16:01 +0900
Subject: [PATCH 37/61] =?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

---
 .../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 0074d27..58e804f 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
@@ -153,6 +153,6 @@ public class CommonHomeFragment extends Fragment {
     }
 
     private void updateCalender() {
-
+        // TODO: タスクの完了状況をカレンダーに表示
     }
 }
-- 
2.45.1


From 7696ebee21e6111875eebc806ff6a8a36141ba12 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:19:17 +0900
Subject: [PATCH 38/61] =?UTF-8?q?SwipeToRefresh=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index be3f370..115311e 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -33,6 +33,7 @@ dependencies {
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
+    implementation libs.androidx.swiperefreshlayout
 
     // Hilt (DI)
     implementation libs.com.google.dagger.hilt.android
-- 
2.45.1


From e4b5f32d1627ea3d853c3a8ad8fd355874e2b534 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:19:50 +0900
Subject: [PATCH 39/61] =?UTF-8?q?SwipeToRefresh=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_common_home.xml  | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
index 38670ad..cc87f91 100644
--- a/feature/common/src/main/res/layout/fragment_common_home.xml
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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=".CommonHomeFragment" >
 
-    <com.github.sundeepk.compactcalendarview.CompactCalendarView
-        android:id="@+id/calendar"
-        android:layout_width="fill_parent"
-        android:layout_height="250dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        app:compactCalendarBackgroundColor="#ffe95451"
-        app:compactCalendarCurrentDayBackgroundColor="#B71C1C"
-        app:compactCalendarCurrentSelectedDayBackgroundColor="#E57373"
-        app:compactCalendarMultiEventIndicatorColor="#fff"
-        app:compactCalendarTargetHeight="250dp"
-        app:compactCalendarTextColor="#fff"
-        app:compactCalendarTextSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/taskListRecyclerView"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/calendar" />
+        android:layout_height="match_parent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <com.github.sundeepk.compactcalendarview.CompactCalendarView
+            android:id="@+id/calendar"
+            android:layout_width="fill_parent"
+            android:layout_height="250dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            app:compactCalendarBackgroundColor="#ffe95451"
+            app:compactCalendarCurrentDayBackgroundColor="#B71C1C"
+            app:compactCalendarCurrentSelectedDayBackgroundColor="#E57373"
+            app:compactCalendarMultiEventIndicatorColor="#fff"
+            app:compactCalendarTargetHeight="250dp"
+            app:compactCalendarTextColor="#fff"
+            app:compactCalendarTextSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/taskListRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/calendar" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
-- 
2.45.1


From 2854a97a24cf1d78f624a8ed3a2c90d1aa2328f6 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:31:05 +0900
Subject: [PATCH 40/61] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/navigation/feature_parent_navigation.xml  | 10 ++--------
 .../main/res/navigation/internal_parent_navigation.xml |  6 ++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 feature/parent/src/main/res/navigation/internal_parent_navigation.xml

diff --git a/feature/parent/src/main/res/navigation/feature_parent_navigation.xml b/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
index 04e134b..5d0e567 100644
--- a/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
+++ b/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
@@ -2,12 +2,6 @@
 <navigation 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/feature_parent_navigation"
-    app:startDestination="@id/featureParentFragment">
-
-    <fragment
-        android:id="@+id/featureParentFragment"
-        android:name="one.nem.kidshift.feature.parent.ParentMainFragment"
-        android:label="fragment_feature_parent"
-        tools:layout="@layout/fragment_parent_main" />
+    android:id="@+id/feature_parent_navigation" >
+    <include app:graph="@navigation/internal_parent_navigation" />
 </navigation>
\ No newline at end of file
diff --git a/feature/parent/src/main/res/navigation/internal_parent_navigation.xml b/feature/parent/src/main/res/navigation/internal_parent_navigation.xml
new file mode 100644
index 0000000..9eb9a98
--- /dev/null
+++ b/feature/parent/src/main/res/navigation/internal_parent_navigation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/internal_parent_navigation">
+
+</navigation>
\ No newline at end of file
-- 
2.45.1


From 512e096487865ed378197cb882adca742fbae461 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:31:55 +0900
Subject: [PATCH 41/61] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E9=96=A2=E4=BF=82?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/parent/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature/parent/build.gradle b/feature/parent/build.gradle
index e2e98ea..fe1359c 100644
--- a/feature/parent/build.gradle
+++ b/feature/parent/build.gradle
@@ -45,4 +45,5 @@ dependencies {
     implementation project(':model')
     implementation project(':utils')
     implementation project(':data')
+    implementation project(':feature:common')
 }
\ No newline at end of file
-- 
2.45.1


From 7d916e485551e7e8ae1d7dab35ffd85a9b06d594 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:32:09 +0900
Subject: [PATCH 42/61] =?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

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java     | 2 ++
 1 file changed, 2 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 58e804f..0e64344 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
@@ -53,6 +53,8 @@ public class CommonHomeFragment extends Fragment {
         // Required empty public constructor
     }
 
+    // TODO: SwipeToRefreshの実装
+
     public static CommonHomeFragment newInstance(boolean isChildMode, String childId) {
         CommonHomeFragment fragment = new CommonHomeFragment();
         Bundle args = new Bundle();
-- 
2.45.1


From 1c88c55e909f582ae5444b79de3a66d4cde3be8b Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:33:32 +0900
Subject: [PATCH 43/61] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/build.gradle                                 | 2 ++
 .../src/main/res/navigation/feature_common_navigation.xml   | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 feature/common/src/main/res/navigation/feature_common_navigation.xml

diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index 115311e..03fb839 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -30,6 +30,8 @@ dependencies {
 
     implementation libs.appcompat
     implementation libs.material
+    implementation libs.navigation.fragment
+    implementation libs.navigation.ui
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
diff --git a/feature/common/src/main/res/navigation/feature_common_navigation.xml b/feature/common/src/main/res/navigation/feature_common_navigation.xml
new file mode 100644
index 0000000..a081abe
--- /dev/null
+++ b/feature/common/src/main/res/navigation/feature_common_navigation.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/feature_common_navigation">
+
+</navigation>
\ No newline at end of file
-- 
2.45.1


From 0fd977bb68343ec297b7ba92a461e7c643665e2a Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:33:52 +0900
Subject: [PATCH 44/61] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/navigation/feature_common_navigation.xml    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/feature/common/src/main/res/navigation/feature_common_navigation.xml b/feature/common/src/main/res/navigation/feature_common_navigation.xml
index a081abe..6f578c1 100644
--- a/feature/common/src/main/res/navigation/feature_common_navigation.xml
+++ b/feature/common/src/main/res/navigation/feature_common_navigation.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/feature_common_navigation">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/feature_common_navigation"
+    app:startDestination="@id/commonHomeFragment">
 
+    <fragment
+        android:id="@+id/commonHomeFragment"
+        android:name="one.nem.kidshift.feature.common.CommonHomeFragment"
+        android:label="fragment_common_home"
+        tools:layout="@layout/fragment_common_home" />
 </navigation>
\ No newline at end of file
-- 
2.45.1


From 2a35d18fe504dfd15e407d8e6d3ed5d8082597e1 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:34:17 +0900
Subject: [PATCH 45/61] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/navigation/internal_parent_navigation.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature/parent/src/main/res/navigation/internal_parent_navigation.xml b/feature/parent/src/main/res/navigation/internal_parent_navigation.xml
index 9eb9a98..679923b 100644
--- a/feature/parent/src/main/res/navigation/internal_parent_navigation.xml
+++ b/feature/parent/src/main/res/navigation/internal_parent_navigation.xml
@@ -3,4 +3,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/internal_parent_navigation">
 
+    <include app:graph="@navigation/feature_common_navigation" />
 </navigation>
\ No newline at end of file
-- 
2.45.1


From 801b00e7ea29442019dc149166376194fb2d0c91 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 16:36:05 +0900
Subject: [PATCH 46/61] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=AE=9F=E8=A3=85=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/parent/ParentMainFragment.java    | 120 +-----------------
 .../main/res/layout/fragment_parent_main.xml  |  27 +---
 2 files changed, 4 insertions(+), 143 deletions(-)

diff --git a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
index bc8c2be..e0e34ee 100644
--- a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
+++ b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
@@ -32,132 +32,14 @@ import one.nem.kidshift.utils.models.FabEventCallback;
 @AndroidEntryPoint
 public class ParentMainFragment extends Fragment {
 
-    @Inject
-    KSLoggerFactory ksLoggerFactory;
-    @Inject
-    TaskData taskData;
-    @Inject
-    ChildData childData;
-    @Inject
-    FabManager fabManager;
-
-    private KSLogger logger;
-
-    ParentAdapter parentAdapter;
-    SwipeRefreshLayout swipeRefreshLayout;
-    LayoutInflater layoutInflater;
-
-    @SuppressLint({"DatasetChange", "NotifyDataSetChanged"})
-    private void updateTaskInfo(){
-        swipeRefreshLayout.setRefreshing(true);
-        taskData.getTasks(new TaskItemModelCallback() {
-            @Override
-            public void onUnchanged() {
-
-            }
-
-            @Override
-            public void onUpdated(List<TaskItemModel> taskItem) {
-
-            }
-
-            @Override
-            public void onFailed(String message) {
-
-            }
-        }).thenAccept(taskItemModel -> {
-            parentAdapter.setTaskDataList(taskItemModel);
-            try { // Workaround
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                // Do nothing
-            }
-            requireActivity().runOnUiThread(()-> {
-                parentAdapter.notifyDataSetChanged(); // Workaround
-            });
-        }).thenRun(() -> swipeRefreshLayout.setRefreshing(false));
-    }
-
     public ParentMainFragment() {
         // Required empty public constructor
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.logger = ksLoggerFactory.create("ParentMainFragment");
-        this.layoutInflater = requireActivity().getLayoutInflater();
-    }
-
-    @SuppressLint("MissingInflatedId")
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_parent_main, container, false);
-
-        swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_layout);
-
-        RecyclerView recyclerView = view.findViewById(R.id.main_recycle_view);
-
-        recyclerView.setHasFixedSize(true);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
-        recyclerView.setLayoutManager(layoutManager);
-
-        parentAdapter = new ParentAdapter();
-        parentAdapter.setCallback(taskId -> {
-            View childListView = layoutInflater.inflate(R.layout.act_child_select_dialog, null);
-            RecyclerView childListRecyclerView = childListView.findViewById(R.id.act_recycle_view);
-            childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-            childData.getChildListDirect().thenAccept(childModelList -> childListRecyclerView.setAdapter(new TackCompleteDialogChildListAdapter(childModelList))).thenRun(() -> {
-                MaterialAlertDialogBuilder builder1 = new MaterialAlertDialogBuilder(requireContext());
-                builder1.setTitle("お手伝いをしたお子様の名前を選択してください")
-                        .setView(childListView)
-                        .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss());
-                builder1.show();
-            }).join();
-
-        });
-        recyclerView.setAdapter(parentAdapter);
-
-        updateTaskInfo();
-
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // FABイベント設定
-        if (!fabManager.isShown()) fabManager.show();
-        fabManager.setFabEventCallback(new FabEventCallback() {
-            @Override
-            public void onClicked() {
-                View childListView = layoutInflater.inflate(R.layout.add_task_list_dialog, null);
-                RecyclerView childListRecyclerView = childListView.findViewById(R.id.taskchild);
-                childData.getChildListDirect().thenAccept(childModelList ->
-                        childListRecyclerView.setAdapter(
-                            new AddTaskDialogChildListAdapter(childModelList)))
-                        .thenRun(() -> {
-                            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
-                            builder.setTitle("お手伝い名追加")
-                                    .setView(childListView)
-                                    .setPositiveButton("追加", null)
-                                    .setNeutralButton("閉じる", null);
-                            builder.show();
-                        }).join();
-            }
-
-            @Override
-            public void onLongClicked() {
-                // Do nothing
-            }
-        });
-
-        // SwipeToRefresh
-        swipeRefreshLayout.setOnRefreshListener(this::updateTaskInfo);
+        return inflater.inflate(R.layout.fragment_parent_main, container, false);
     }
 }
\ No newline at end of file
diff --git a/feature/parent/src/main/res/layout/fragment_parent_main.xml b/feature/parent/src/main/res/layout/fragment_parent_main.xml
index 8cd746d..8c25a47 100644
--- a/feature/parent/src/main/res/layout/fragment_parent_main.xml
+++ b/feature/parent/src/main/res/layout/fragment_parent_main.xml
@@ -1,28 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
+<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/swipe_refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ParentMainFragment">
-
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical">
-
-
-        <Button
-            android:id="@+id/addtask"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Button" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/main_recycle_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </LinearLayout>
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
+    tools:context=".ParentMainFragment"/>
\ No newline at end of file
-- 
2.45.1


From 59164af22ef8e0fa70e63f45db79b2032f4fcf00 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sat, 6 Jul 2024 17:19:41 +0900
Subject: [PATCH 47/61] WIP

---
 .../feature/common/CommonHomeFragment.java         |  2 +-
 .../feature/parent/ParentMainFragment.java         | 14 ++++++++++++++
 .../src/main/res/layout/fragment_parent_main.xml   | 11 ++++++++++-
 .../res/navigation/feature_parent_navigation.xml   |  5 +++--
 4 files changed, 28 insertions(+), 4 deletions(-)

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 0e64344..041f391 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
@@ -53,7 +53,7 @@ public class CommonHomeFragment extends Fragment {
         // Required empty public constructor
     }
 
-    // TODO: SwipeToRefreshの実装
+    // TODO: SwipeToRef
 
     public static CommonHomeFragment newInstance(boolean isChildMode, String childId) {
         CommonHomeFragment fragment = new CommonHomeFragment();
diff --git a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
index e0e34ee..d10e672 100644
--- a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
+++ b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
@@ -5,6 +5,9 @@ import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -22,6 +25,7 @@ import javax.inject.Inject;
 import dagger.hilt.android.AndroidEntryPoint;
 import one.nem.kidshift.data.ChildData;
 import one.nem.kidshift.data.TaskData;
+import one.nem.kidshift.feature.common.CommonHomeFragment;
 import one.nem.kidshift.model.callback.TaskItemModelCallback;
 import one.nem.kidshift.model.tasks.TaskItemModel;
 import one.nem.kidshift.utils.FabManager;
@@ -42,4 +46,14 @@ public class ParentMainFragment extends Fragment {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_parent_main, container, false);
     }
+
+    @Override
+    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+//        FragmentManager fragmentManager = getChildFragmentManager();
+//        NavHostFragment navHostFragment = (NavHostFragment) fragmentManager.findFragmentById(R.id.navHostFragment);
+//        NavController navController = navHostFragment.getNavController();
+
+    }
 }
\ No newline at end of file
diff --git a/feature/parent/src/main/res/layout/fragment_parent_main.xml b/feature/parent/src/main/res/layout/fragment_parent_main.xml
index 8c25a47..fbd988a 100644
--- a/feature/parent/src/main/res/layout/fragment_parent_main.xml
+++ b/feature/parent/src/main/res/layout/fragment_parent_main.xml
@@ -4,4 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ParentMainFragment"/>
\ No newline at end of file
+    tools:context=".ParentMainFragment">
+
+<!--    <androidx.fragment.app.FragmentContainerView-->
+<!--        android:id="@+id/navHostFragment"-->
+<!--        android:name="androidx.navigation.fragment.NavHostFragment"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:defaultNavHost="true"-->
+<!--        app:navGraph="@navigation/internal_parent_navigation" />-->
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/feature/parent/src/main/res/navigation/feature_parent_navigation.xml b/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
index 5d0e567..426251e 100644
--- a/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
+++ b/feature/parent/src/main/res/navigation/feature_parent_navigation.xml
@@ -2,6 +2,7 @@
 <navigation 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/feature_parent_navigation" >
-    <include app:graph="@navigation/internal_parent_navigation" />
+    android:id="@+id/feature_parent_navigation"
+    app:startDestination="@id/feature_common_navigation">
+    <include app:graph="@navigation/feature_common_navigation" />
 </navigation>
\ No newline at end of file
-- 
2.45.1


From 708ddf0490281f78c149b2cd0a850365c7b73f15 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 13:48:32 +0900
Subject: [PATCH 48/61] =?UTF-8?q?=E8=87=AA=E5=89=8D=E3=81=AE=E3=83=AA?=
 =?UTF-8?q?=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index cda8bac..bdfc9a2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,10 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven {
+            name = 'CompactCalendarView-GHPages'
+            url = uri('https://r-ca.github.io/CompactCalendarView/')
+        }
     }
 }
 
-- 
2.45.1


From 1141580a44ee1b0fc0ca2193a39fe8b75c66c107 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 13:51:19 +0900
Subject: [PATCH 49/61] =?UTF-8?q?=E8=87=AA=E5=89=8D=E3=81=AE=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=82=AF=E3=81=AB=E5=88=87=E3=82=8A=E6=9B=BF?=
 =?UTF-8?q?=E3=81=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/common/build.gradle b/feature/common/build.gradle
index 03fb839..189aead 100644
--- a/feature/common/build.gradle
+++ b/feature/common/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdk 34
 
     defaultConfig {
-        minSdk 24
+        minSdk 28
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -41,7 +41,7 @@ dependencies {
     implementation libs.com.google.dagger.hilt.android
     annotationProcessor libs.com.google.dagger.hilt.compiler
 
-    api 'com.github.sundeepk:compact-calendar-view:3.0.0'
+    implementation 'one.nem:compact-calendar-view:1.0.0'
 
     // Project modules
     implementation project(':model')
-- 
2.45.1


From b3a1b32ba1cb234be8a37fb7f1b257bc45a895af Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 14:08:34 +0900
Subject: [PATCH 50/61] =?UTF-8?q?getItemCount=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/adapter/TaskListItemAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
index d61ef6f..6c5e5e9 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -53,7 +53,7 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
 
     @Override
     public int getItemCount() {
-        return 0;
+        return taskItemModelList == null ? 0 : taskItemModelList.size();
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
-- 
2.45.1


From 6c1fdbc9740e469408c571f93d6b8cd2801581c0 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 14:12:55 +0900
Subject: [PATCH 51/61] =?UTF-8?q?=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?=
 =?UTF-8?q?=E6=BC=8F=E3=82=8C=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kidshift/feature/common/CommonHomeFragment.java   | 11 +++++++++++
 1 file changed, 11 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 041f391..22a1d6c 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
@@ -94,9 +94,20 @@ public class CommonHomeFragment extends Fragment {
             }
         });
 
+        RecyclerView taskListRecyclerView = view.findViewById(R.id.taskListRecyclerView);
+        taskListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        taskListRecyclerView.setAdapter(taskListItemAdapter);
+
         return view;
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateTaskInfo();
+        updateCalender();
+    }
+
     private boolean showConfirmDialog(String taskName) {
         AtomicBoolean selection = new AtomicBoolean(false);
         new MaterialAlertDialogBuilder(requireContext())
-- 
2.45.1


From 28b8f9e06b42152de5959db5711730bf8d14e3b6 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 14:49:50 +0900
Subject: [PATCH 52/61] Workaround

---
 .../kidshift/feature/common/adapter/TaskListItemAdapter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
index 6c5e5e9..091dbad 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/TaskListItemAdapter.java
@@ -1,6 +1,7 @@
 package one.nem.kidshift.feature.common.adapter;
 
 import android.annotation.SuppressLint;
+import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.view.View;
 import android.widget.Button;
@@ -34,7 +35,9 @@ public class TaskListItemAdapter extends RecyclerView.Adapter<TaskListItemAdapte
     @NonNull
     @Override
     public TaskListItemAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = View.inflate(parent.getContext(), R.layout.list_item_common_task, null);
+//        View view = View.inflate(parent.getContext(), R.layout.list_item_common_task, null);
+        // Workaround? by https://stackoverflow.com/questions/30691150/match-parent-width-does-not-work-in-recyclerview
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_common_task, parent, false);
         return new ViewHolder(view);
     }
 
-- 
2.45.1


From a76208f115fb0c31ed183fdcb48f35a03fc70edf Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:18:34 +0900
Subject: [PATCH 53/61] =?UTF-8?q?=E5=A4=89=E6=8F=9B=E6=A9=9F=E6=A7=8B?=
 =?UTF-8?q?=E3=81=AE=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/room/utils/converter/TaskCacheConverter.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/src/main/java/one/nem/kidshift/data/room/utils/converter/TaskCacheConverter.java b/data/src/main/java/one/nem/kidshift/data/room/utils/converter/TaskCacheConverter.java
index bc9c6b1..f1ffda1 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/utils/converter/TaskCacheConverter.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/utils/converter/TaskCacheConverter.java
@@ -37,7 +37,14 @@ public class TaskCacheConverter {
      * @return TaskItemModel
      */
     public static TaskItemModel taskCacheEntityToTaskModel(TaskCacheEntity entity) {
-        return new TaskItemModel(entity.id, entity.name, entity.iconEmoji, entity.reward, null);
+        TaskItemModel model = new TaskItemModel();
+        model.setId(entity.id);
+        model.setName(entity.name);
+        model.setReward(entity.reward);
+        model.setIconEmoji(entity.iconEmoji == null ? "" : entity.iconEmoji); // Workaround
+        model.setBgColor(null); // TODO: 実装
+        model.setAttachedChildren(null); // TODO: 実装
+        return model;
     }
 
     /**
-- 
2.45.1


From 3151060bb484f88331e382d8b7c99364d6a6b446 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:20:57 +0900
Subject: [PATCH 54/61] =?UTF-8?q?=E5=BC=95=E6=95=B0=E6=B8=A1=E3=81=97?=
 =?UTF-8?q?=E5=BF=98=E3=82=8C=E4=BF=AE=E6=AD=A3?=
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 22a1d6c..afe018a 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
@@ -129,7 +129,7 @@ public class CommonHomeFragment extends Fragment {
         RecyclerView childListRecyclerView = new RecyclerView(requireContext());
         childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         childData.getChildListDirect().thenAccept(childModelList -> {
-            ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter();
+            ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter(childModelList);
             childListRecyclerView.setAdapter(childListItemAdapter);
             childListItemAdapter.setCallback(childId -> {
                 taskData.recordTaskCompletion(taskId, childId);
-- 
2.45.1


From 650e0ce591b00e618b174acb0dcc34ef8ecb6f25 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:24:29 +0900
Subject: [PATCH 55/61] =?UTF-8?q?=E5=87=A1=E3=83=9F=E3=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../one/nem/kidshift/feature/common/CommonHomeFragment.java     | 2 +-
 .../kidshift/feature/common/adapter/ChildListItemAdapter.java   | 2 +-
 .../src/main/res/layout/list_item_task_completion_child.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 afe018a..071fe4f 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
@@ -130,10 +130,10 @@ public class CommonHomeFragment extends Fragment {
         childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         childData.getChildListDirect().thenAccept(childModelList -> {
             ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter(childModelList);
-            childListRecyclerView.setAdapter(childListItemAdapter);
             childListItemAdapter.setCallback(childId -> {
                 taskData.recordTaskCompletion(taskId, childId);
             });
+            childListRecyclerView.setAdapter(childListItemAdapter);
         });
 
         new MaterialAlertDialogBuilder(requireContext())
diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
index 97dd86c..cdcb298 100644
--- a/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
+++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/adapter/ChildListItemAdapter.java
@@ -64,7 +64,7 @@ public class ChildListItemAdapter extends RecyclerView.Adapter<ChildListItemAdap
         public ViewHolder(@NonNull android.view.View itemView) {
             super(itemView);
             childName = itemView.findViewById(R.id.childNameTextView);
-            completedButton = itemView.findViewById(R.id.actbutton);
+            completedButton = itemView.findViewById(R.id.completeButton);
         }
     }
 
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 e2e1e31..da82b2b 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
@@ -23,7 +23,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         <Button
-            android:id="@+id/button"
+            android:id="@+id/completeButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Button" />
-- 
2.45.1


From b34683f0ea6a347122f84eae960d529295d28ed8 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:28:55 +0900
Subject: [PATCH 56/61] =?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

---
 .../java/one/nem/kidshift/feature/common/CommonHomeFragment.java | 1 +
 1 file changed, 1 insertion(+)

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 071fe4f..5fe6add 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
@@ -128,6 +128,7 @@ public class CommonHomeFragment extends Fragment {
     private void showChildSelectDialog(String taskId) { // TODO: Assignされている子供かどうかを考慮するように
         RecyclerView childListRecyclerView = new RecyclerView(requireContext());
         childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        // TODO: キャッシュから取得する方にする？
         childData.getChildListDirect().thenAccept(childModelList -> {
             ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter(childModelList);
             childListItemAdapter.setCallback(childId -> {
-- 
2.45.1


From 06819474780e1a5c8a514f794a6e1d9d5dadc1e6 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:32:43 +0900
Subject: [PATCH 57/61] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=96?=
 =?UTF-8?q?=E5=BE=97=E5=AE=8C=E4=BA=86=E5=89=8D=E3=81=AB=E3=83=80=E3=82=A4?=
 =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 5fe6add..2c560d3 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
@@ -90,7 +90,7 @@ public class CommonHomeFragment extends Fragment {
                     taskData.recordTaskCompletion(taskId, childId);
                 }
             } else {
-                showChildSelectDialog(taskId);
+                showChildSelectDialog(taskId, taskName);
             }
         });
 
@@ -125,7 +125,7 @@ public class CommonHomeFragment extends Fragment {
         return selection.get();
     }
 
-    private void showChildSelectDialog(String taskId) { // TODO: Assignされている子供かどうかを考慮するように
+    private void showChildSelectDialog(String taskId, String taskName) { // TODO: Assignされている子供かどうかを考慮するように
         RecyclerView childListRecyclerView = new RecyclerView(requireContext());
         childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         // TODO: キャッシュから取得する方にする？
@@ -135,13 +135,15 @@ public class CommonHomeFragment extends Fragment {
                 taskData.recordTaskCompletion(taskId, childId);
             });
             childListRecyclerView.setAdapter(childListItemAdapter);
+        }).thenRun(() -> {
+            requireActivity().runOnUiThread(() -> {
+                new MaterialAlertDialogBuilder(requireContext())
+                        .setTitle(taskName + "を完了したお子様を選択")
+                        .setView(childListRecyclerView)
+                        .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss())
+                        .show();
+            });
         });
-
-        new MaterialAlertDialogBuilder(requireContext())
-                .setTitle("お手伝いをしたお子様を選択")
-                .setView(childListRecyclerView)
-                .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss())
-                .show();
     }
 
     @SuppressLint("NotifyDataSetChanged")
-- 
2.45.1


From 229382cc04485386de38db6c9228ccc199615b7e Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:37:34 +0900
Subject: [PATCH 58/61] =?UTF-8?q?SwipeRefreshLayout=E3=81=ABID=E3=82=92?=
 =?UTF-8?q?=E4=BB=98=E4=B8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature/common/src/main/res/layout/fragment_common_home.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/feature/common/src/main/res/layout/fragment_common_home.xml b/feature/common/src/main/res/layout/fragment_common_home.xml
index cc87f91..6aa5d22 100644
--- a/feature/common/src/main/res/layout/fragment_common_home.xml
+++ b/feature/common/src/main/res/layout/fragment_common_home.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CommonHomeFragment" >
+    tools:context=".CommonHomeFragment"
+    android:id="@+id/swipeRefreshLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-- 
2.45.1


From 6efbfd914d1e7f3565491e1836ef5d3f71398b09 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:38:20 +0900
Subject: [PATCH 59/61] WIP

---
 .../nem/kidshift/feature/common/CommonHomeFragment.java   | 8 ++++++++
 1 file changed, 8 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 2c560d3..30a61db 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
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -47,6 +48,7 @@ public class CommonHomeFragment extends Fragment {
     private KSLogger logger;
 
     CompactCalendarView compactCalendarView;
+    SwipeRefreshLayout swipeRefreshLayout;
     TaskListItemAdapter taskListItemAdapter;
 
     public CommonHomeFragment() {
@@ -98,6 +100,12 @@ public class CommonHomeFragment extends Fragment {
         taskListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         taskListRecyclerView.setAdapter(taskListItemAdapter);
 
+        swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout);
+        swipeRefreshLayout.setOnRefreshListener(() -> {
+            updateTaskInfo();
+            updateCalender();
+        });
+
         return view;
     }
 
-- 
2.45.1


From d733a4c75b12181f970a0ba75160f247f7eb0df1 Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:40:25 +0900
Subject: [PATCH 60/61] =?UTF-8?q?=E3=83=A9=E3=83=83=E3=83=91=E3=83=BC?=
 =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feature/common/CommonHomeFragment.java    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

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 30a61db..a6eaa92 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
@@ -16,6 +16,7 @@ import com.github.sundeepk.compactcalendarview.CompactCalendarView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.inject.Inject;
@@ -101,10 +102,7 @@ public class CommonHomeFragment extends Fragment {
         taskListRecyclerView.setAdapter(taskListItemAdapter);
 
         swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout);
-        swipeRefreshLayout.setOnRefreshListener(() -> {
-            updateTaskInfo();
-            updateCalender();
-        });
+        swipeRefreshLayout.setOnRefreshListener(this::updateData);
 
         return view;
     }
@@ -112,8 +110,7 @@ public class CommonHomeFragment extends Fragment {
     @Override
     public void onResume() {
         super.onResume();
-        updateTaskInfo();
-        updateCalender();
+        updateData();
     }
 
     private boolean showConfirmDialog(String taskName) {
@@ -155,8 +152,8 @@ public class CommonHomeFragment extends Fragment {
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    private void updateTaskInfo() { // TODO: updatedの場合の処理など実装
-        taskData.getTasks(new TaskItemModelCallback() {
+    private CompletableFuture<Void> updateTaskInfo() { // TODO: updatedの場合の処理など実装
+        return taskData.getTasks(new TaskItemModelCallback() {
             @Override
             public void onUnchanged() {
             }
@@ -176,7 +173,15 @@ public class CommonHomeFragment extends Fragment {
         });
     }
 
-    private void updateCalender() {
+    private CompletableFuture<Void> updateCalender() {
         // TODO: タスクの完了状況をカレンダーに表示
+        return CompletableFuture.completedFuture(null);
+    }
+
+    private void updateData() {
+        swipeRefreshLayout.setRefreshing(true);
+        CompletableFuture.allOf(updateTaskInfo(), updateCalender()).thenRun(() -> {
+            swipeRefreshLayout.setRefreshing(false);
+        });
     }
 }
-- 
2.45.1


From 86266e9311039981e9211a92a7b38d30fb3a388d Mon Sep 17 00:00:00 2001
From: rca <nem@nem.x0.to>
Date: Sun, 7 Jul 2024 15:42:37 +0900
Subject: [PATCH 61/61] =?UTF-8?q?Workaround=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 a6eaa92..722f141 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
@@ -181,6 +181,12 @@ public class CommonHomeFragment extends Fragment {
     private void updateData() {
         swipeRefreshLayout.setRefreshing(true);
         CompletableFuture.allOf(updateTaskInfo(), updateCalender()).thenRun(() -> {
+            // Workaround: リスト更新処理があまりにも重くてアニメーションが壊れるため
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
             swipeRefreshLayout.setRefreshing(false);
         });
     }
-- 
2.45.1