From 7e7c221ae11ce744d5d397f91ed07eaa981bce85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Mon, 8 Jul 2024 12:39:33 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Fab=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/common/CommonHomeFragment.java | 19 +++++++++++++++++++ 1 file changed, 19 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 722f141..9600e8b 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,8 +28,10 @@ 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; +import one.nem.kidshift.utils.FabManager; import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.factory.KSLoggerFactory; +import one.nem.kidshift.utils.models.FabEventCallback; @AndroidEntryPoint public class CommonHomeFragment extends Fragment { @@ -43,6 +45,8 @@ public class CommonHomeFragment extends Fragment { TaskData taskData; @Inject ChildData childData; + @Inject + FabManager fabManager; private boolean isChildMode; private String childId; @@ -113,6 +117,21 @@ public class CommonHomeFragment extends Fragment { updateData(); } + private void setupFab() { + fabManager.show(); + fabManager.setFabEventCallback(new FabEventCallback() { + @Override + public void onClicked() { + // TODO + } + + @Override + public void onLongClicked() { + // Do nothing + } + }); + } + private boolean showConfirmDialog(String taskName) { AtomicBoolean selection = new AtomicBoolean(false); new MaterialAlertDialogBuilder(requireContext()) From deec9301df601f18e51943f1b43cb16e8f63ddad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Mon, 8 Jul 2024 12:40:09 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=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 9600e8b..3fcbf70 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 @@ -122,7 +122,7 @@ public class CommonHomeFragment extends Fragment { fabManager.setFabEventCallback(new FabEventCallback() { @Override public void onClicked() { - // TODO + // TODO: 子供追加ダイアログ表示 } @Override From 4c1a342b5871385118072ceb1607b694434161f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Mon, 8 Jul 2024 12:43:28 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E5=87=A6=E7=90=86?= =?UTF-8?q?=E5=AE=9F=E8=A3=85=E3=81=AA=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/common/CommonHomeFragment.java | 16 ++++++++++++++-- 1 file changed, 14 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 3fcbf70..4955ec7 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 @@ -117,12 +117,12 @@ public class CommonHomeFragment extends Fragment { updateData(); } - private void setupFab() { + private void setupFabParent() { fabManager.show(); fabManager.setFabEventCallback(new FabEventCallback() { @Override public void onClicked() { - // TODO: 子供追加ダイアログ表示 + showAddTaskDialog(); } @Override @@ -132,6 +132,10 @@ public class CommonHomeFragment extends Fragment { }); } + private void setupFabChild() { + fabManager.hide(); + } + private boolean showConfirmDialog(String taskName) { AtomicBoolean selection = new AtomicBoolean(false); new MaterialAlertDialogBuilder(requireContext()) @@ -209,4 +213,12 @@ public class CommonHomeFragment extends Fragment { swipeRefreshLayout.setRefreshing(false); }); } + + private void showAddTaskDialog() { + new MaterialAlertDialogBuilder(requireContext()) + .setTitle("Placeholder") + .setMessage("Placeholder") + .setPositiveButton("OK", (dialog, which) -> dialog.dismiss()) + .show(); + } } From 5bc5930d5b77a13096b60aa83b66aa90aa58f2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Mon, 8 Jul 2024 12:44:26 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fab=E3=81=AE=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=82=92onResume=E3=81=A7=E5=91=BC?= =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/feature/common/CommonHomeFragment.java | 5 +++++ 1 file changed, 5 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 4955ec7..a884acf 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 @@ -115,6 +115,11 @@ public class CommonHomeFragment extends Fragment { public void onResume() { super.onResume(); updateData(); + if (isChildMode) { + setupFabChild(); + } else { + setupFabParent(); + } } private void setupFabParent() {