From 627fe279a5994c71b9b7f6ebff2e20ee7ffc1787 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:12:58 +0900 Subject: [PATCH 01/17] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=82=92=E3=83=89=E3=83=AD=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/menu/nav_menu.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml index 71af31a..5310165 100644 --- a/app/src/main/res/menu/nav_menu.xml +++ b/app/src/main/res/menu/nav_menu.xml @@ -4,4 +4,15 @@ android:id="@+id/manage_child_account" android:icon="@drawable/pending_24px" android:title="子供アカウントの管理" /> + + + + + From f0674c1a8823e8ba4da1d03c122e42eed90b6252 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:40:47 +0900 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BB=AE=E7=BD=AE=E3=81=8D=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=B0=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=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/MainActivity.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index 8f06992..34c7f8a 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -1,8 +1,12 @@ package one.nem.kidshift; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.MenuItem; +import android.widget.LinearLayout; +import android.widget.ScrollView; +import android.widget.TextView; import androidx.activity.EdgeToEdge; import androidx.annotation.NonNull; @@ -20,6 +24,8 @@ import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; import com.google.android.material.bottomnavigation.BottomNavigationView; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.google.android.material.divider.MaterialDivider; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.navigation.NavigationView; @@ -75,6 +81,11 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(MainActivity.this, ChildManageMainActivity.class); startActivity(intent); return true; + } else if (item.getItemId() == R.id.show_debug_dialog) { + showDebugDialog(); + return true; + } else { + logger.warn("不明なアイテム: " + item.getItemId()); } return false; } @@ -124,4 +135,55 @@ public class MainActivity extends AppCompatActivity { private void startup() { } + + private void showDebugDialog() { + + ScrollView scrollView = new ScrollView(this); + scrollView.setPadding(32, 16, 32, 16); + LinearLayout linearLayout = new LinearLayout(this); + + TextView serverAddressTextView = new TextView(this); + serverAddressTextView.setText("サーバーアドレス: " + userSettings.getApiSetting().getApiBaseUrl()); + serverAddressTextView.setTextSize(16); + + TextView accessTokenTextView = new TextView(this); + accessTokenTextView.setText("アクセストークン: " + userSettings.getAppCommonSetting().getAccessToken()); + accessTokenTextView.setTextSize(16); + + TextView childModeTextView = new TextView(this); + childModeTextView.setText("子供モード: " + userSettings.getAppCommonSetting().isChildMode()); + childModeTextView.setTextSize(16); + + linearLayout.setOrientation(LinearLayout.VERTICAL); + linearLayout.addView(serverAddressTextView); + linearLayout.addView(createDivider(this)); + linearLayout.addView(accessTokenTextView); + linearLayout.addView(createDivider(this)); + linearLayout.addView(childModeTextView); + + scrollView.addView(linearLayout); + + new MaterialAlertDialogBuilder(this) + .setTitle("参考情報(評価用)") + .setView(scrollView) + .setPositiveButton("OK", (dialog, which) -> { + // Do nothing + }) + .show(); + + } + + private MaterialDivider createDivider(Context context) { + MaterialDivider divider = new MaterialDivider(context); + // Margin (48, 16, 48, 16) + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT + ); + params.setMargins(48, 16, 48, 16); + divider.setLayoutParams(params); + return divider; + } + + } \ No newline at end of file From cc6dcb84b9c4b3f72690bc5922e8ebf95216a36e Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:42:46 +0900 Subject: [PATCH 03/17] =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/src/main/res/drawable/account_box_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/manage_accounts_24px.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 shared/src/main/res/drawable/account_box_24px.xml create mode 100644 shared/src/main/res/drawable/manage_accounts_24px.xml diff --git a/shared/src/main/res/drawable/account_box_24px.xml b/shared/src/main/res/drawable/account_box_24px.xml new file mode 100644 index 0000000..6f66173 --- /dev/null +++ b/shared/src/main/res/drawable/account_box_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/manage_accounts_24px.xml b/shared/src/main/res/drawable/manage_accounts_24px.xml new file mode 100644 index 0000000..d4c710b --- /dev/null +++ b/shared/src/main/res/drawable/manage_accounts_24px.xml @@ -0,0 +1,10 @@ + + + From 9d134ab0cb95c10ab2ec42588e32cea36acad147 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:43:04 +0900 Subject: [PATCH 04/17] =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/menu/nav_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml index 5310165..4641ed8 100644 --- a/app/src/main/res/menu/nav_menu.xml +++ b/app/src/main/res/menu/nav_menu.xml @@ -2,7 +2,7 @@ From 3e48fb8795fdc0dc17fc94f7a64eb156b2481baf Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:53:31 +0900 Subject: [PATCH 05/17] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java index 024f149..847d4b8 100644 --- a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java +++ b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java @@ -68,14 +68,17 @@ public class FeatureFlagImpl implements FeatureFlag { // init private void initBase() { // ベース, (= Production) setFlag("dynamicColorEnable", true, false); + setFlag("showDebugMenu", false, false); } private void initBeta() { // 上書き setFlag("dynamicColorEnable", true, true); + setFlag("showDebugMenu", false, true); } private void initDevelop() { // 上書き setFlag("dynamicColorEnable", true, true); + setFlag("showDebugMenu", true, true); } // utils From 649e63d6680c985542430861c257b9846aec71ea Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:53:52 +0900 Subject: [PATCH 06/17] =?UTF-8?q?Production=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java index 847d4b8..e00342d 100644 --- a/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java +++ b/utils/src/main/java/one/nem/kidshift/utils/impl/FeatureFlagImpl.java @@ -22,7 +22,7 @@ public class FeatureFlagImpl implements FeatureFlag { private final SharedPreferences sharedPreferences; // ここを書き換えてプロファイルを書き換え - private final Profile currentProfile = Profile.DEVELOP; + private final Profile currentProfile = Profile.PRODUCTION; enum Profile { DEVELOP("develop"), From 7b85eb41afd032acada98a5f7b76c0c6605fcfe6 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:56:28 +0900 Subject: [PATCH 07/17] =?UTF-8?q?FeatureFlag=E3=82=92=E9=81=A9=E7=94=A8?= =?UTF-8?q?=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 --- app/src/main/java/one/nem/kidshift/MainActivity.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index 34c7f8a..5636481 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -35,6 +35,7 @@ import dagger.hilt.android.AndroidEntryPoint; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.feature.child.ChildManageMainActivity; import one.nem.kidshift.utils.FabManager; +import one.nem.kidshift.utils.FeatureFlag; import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.factory.KSLoggerFactory; @@ -47,6 +48,10 @@ public class MainActivity extends AppCompatActivity { @Inject FabManager fabManager; + @Inject + FeatureFlag featureFlag; + + private KSLogger logger; private FloatingActionButton fab; @@ -127,6 +132,10 @@ public class MainActivity extends AppCompatActivity { fab = findViewById(R.id.mainFab); fabManager.setFab(fab); + + // Apply feature flag + if (!featureFlag.isEnabled("showDebugMenu")) + bottomNavigationView.getMenu().removeItem(R.id.feature_debug_navigation); } /** From 13b6922c6d52272186bb95e55f86c49fc2ef2ea5 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:57:54 +0900 Subject: [PATCH 08/17] =?UTF-8?q?=E6=97=A7=E8=A8=AD=E5=AE=9A=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=82=92=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=8B=E3=82=89=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/menu/main_nav_menu.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/src/main/res/menu/main_nav_menu.xml b/app/src/main/res/menu/main_nav_menu.xml index d7b8f89..588d02c 100644 --- a/app/src/main/res/menu/main_nav_menu.xml +++ b/app/src/main/res/menu/main_nav_menu.xml @@ -16,11 +16,6 @@ android:icon="@drawable/developer_mode_24px" android:title="Debug" /> - - Date: Mon, 8 Jul 2024 23:58:29 +0900 Subject: [PATCH 09/17] =?UTF-8?q?=E6=97=A7=E8=A8=AD=E5=AE=9A=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=82=92=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=8B=E3=82=89=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/navigation/main_nav.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/navigation/main_nav.xml b/app/src/main/res/navigation/main_nav.xml index 1577ce7..59f7276 100644 --- a/app/src/main/res/navigation/main_nav.xml +++ b/app/src/main/res/navigation/main_nav.xml @@ -7,6 +7,5 @@ - \ No newline at end of file From 2e9a6c5660379c5e95766f45f748c9fad2b8a7d5 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:58:59 +0900 Subject: [PATCH 10/17] =?UTF-8?q?=E8=A6=8F=E5=AE=9A=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/navigation/main_nav.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/navigation/main_nav.xml b/app/src/main/res/navigation/main_nav.xml index 59f7276..4cb3b20 100644 --- a/app/src/main/res/navigation/main_nav.xml +++ b/app/src/main/res/navigation/main_nav.xml @@ -2,7 +2,7 @@ + app:startDestination="@id/feature_parent_navigation"> From 81d708ebe3a3b012fd47d9fa5ea73276648d0fc2 Mon Sep 17 00:00:00 2001 From: rca Date: Mon, 8 Jul 2024 23:59:38 +0900 Subject: [PATCH 11/17] =?UTF-8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=83=89=E3=83=AD=E3=83=AF=E3=83=BC=E3=82=92=E9=96=8B=E3=81=8F?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/one/nem/kidshift/MainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index 5636481..634f3c1 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -74,7 +74,6 @@ public class MainActivity extends AppCompatActivity { setSupportActionBar(toolbar); DrawerLayout drawerLayout = findViewById(R.id.drawerLayout); - drawerLayout.open(); // アイテムが選択されたときの処理 NavigationView navigationView = findViewById(R.id.navigationView); From 483e63875415ca6acf5aae646b2b7a4670a8ef0e Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:02:41 +0900 Subject: [PATCH 12/17] =?UTF-8?q?=E5=AD=90=E4=BE=9B=E3=81=AE=E6=95=B0?= =?UTF-8?q?=E3=81=8C=E5=A4=9A=E3=81=84=E3=81=A8=E3=81=8D=E3=81=AF=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=99=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 --- .../src/main/res/layout/fragment_wallet_parent_wrapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feature/wallet/src/main/res/layout/fragment_wallet_parent_wrapper.xml b/feature/wallet/src/main/res/layout/fragment_wallet_parent_wrapper.xml index dc9b2fa..57018fa 100644 --- a/feature/wallet/src/main/res/layout/fragment_wallet_parent_wrapper.xml +++ b/feature/wallet/src/main/res/layout/fragment_wallet_parent_wrapper.xml @@ -12,7 +12,8 @@ android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" + app:tabMode="scrollable"> From 081b469f24628a16667b3353037be7280fddbaab Mon Sep 17 00:00:00 2001 From: rca Date: Tue, 9 Jul 2024 00:07:09 +0900 Subject: [PATCH 13/17] =?UTF-8?q?=E4=BD=99=E7=99=BD=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/common/src/main/res/layout/list_item_common_task.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/feature/common/src/main/res/layout/list_item_common_task.xml b/feature/common/src/main/res/layout/list_item_common_task.xml index ab16c7e..8263d3d 100644 --- a/feature/common/src/main/res/layout/list_item_common_task.xml +++ b/feature/common/src/main/res/layout/list_item_common_task.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp"> + android:layout_marginHorizontal="24dp" + android:layout_marginVertical="8dp"> Date: Tue, 9 Jul 2024 00:07:56 +0900 Subject: [PATCH 14/17] =?UTF-8?q?=E5=9B=9E=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/feature/common/adapter/ChildListItemAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 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 cdcb298..b926514 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 @@ -1,5 +1,6 @@ package one.nem.kidshift.feature.common.adapter; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; @@ -37,7 +38,7 @@ public class ChildListItemAdapter extends RecyclerView.Adapter Date: Tue, 9 Jul 2024 00:08:27 +0900 Subject: [PATCH 15/17] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E9=AB=98=E3=81=95=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/list_item_task_completion_child.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/common/src/main/res/layout/list_item_task_completion_child.xml b/feature/common/src/main/res/layout/list_item_task_completion_child.xml index da82b2b..9b07e91 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 @@ -3,7 +3,7 @@ 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"> Date: Tue, 9 Jul 2024 00:09:21 +0900 Subject: [PATCH 16/17] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=83=B3?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/list_item_task_completion_child.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feature/common/src/main/res/layout/list_item_task_completion_child.xml b/feature/common/src/main/res/layout/list_item_task_completion_child.xml index 9b07e91..e216ba2 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 @@ -3,7 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:layout_marginVertical="4dp"> Date: Tue, 9 Jul 2024 00:13:20 +0900 Subject: [PATCH 17/17] =?UTF-8?q?Padding=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 4499d10..45a8beb 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 @@ -179,6 +179,7 @@ public class CommonHomeFragment extends Fragment { private void showChildSelectDialog(String taskId, String taskName) { // TODO: Assignされている子供かどうかを考慮するように RecyclerView childListRecyclerView = new RecyclerView(requireContext()); childListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + childListRecyclerView.setPadding(0, 48, 0, 0); // TODO: キャッシュから取得する方にする？ childData.getChildListDirect().thenAccept(childModelList -> { ChildListItemAdapter childListItemAdapter = new ChildListItemAdapter(childModelList);