From e01a28b1c4d26a8df4fbae5a9e444889e6495c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 13:52:37 +0900 Subject: [PATCH 01/22] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 dc9e4cc..4476704 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 @@ -261,9 +261,11 @@ public class CommonHomeFragment extends Fragment { private void setupToolBar() { if (isChildMode) { - toolBarManager.setTitle("タスク一覧"); + toolBarManager.setTitle("KidShift"); + toolBarManager.setSubtitle("保護者ビュー - タスク一覧"); } else { - toolBarManager.setTitle("ホーム"); + toolBarManager.setTitle("KidShift"); + toolBarManager.setSubtitle("子供ビュー - タスク一覧"); } } From b9fed3ab711dbc4533a995240e734f518e60cc1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 13:53:12 +0900 Subject: [PATCH 02/22] =?UTF-8?q?=E9=80=86?= 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, 2 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 4476704..5053ca7 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 @@ -262,10 +262,10 @@ public class CommonHomeFragment extends Fragment { private void setupToolBar() { if (isChildMode) { toolBarManager.setTitle("KidShift"); - toolBarManager.setSubtitle("保護者ビュー - タスク一覧"); + toolBarManager.setSubtitle("子供ビュー - タスク一覧"); } else { toolBarManager.setTitle("KidShift"); - toolBarManager.setSubtitle("子供ビュー - タスク一覧"); + toolBarManager.setSubtitle("保護者ビュー - タスク一覧"); } } From 38e9277e9be0586c1ad7134b7b20771390764206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 14:18:46 +0900 Subject: [PATCH 03/22] =?UTF-8?q?addTaskDialog=E6=9A=AB=E5=AE=9A=E5=86=8D?= =?UTF-8?q?=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 | 17 +++++-- .../layout/common_task_add_dialog_layout.xml | 45 +++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 feature/common/src/main/res/layout/common_task_add_dialog_layout.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 index 5053ca7..0f4360b 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 android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.Button; +import android.widget.EditText; import android.widget.ImageButton; import android.widget.TextView; import android.widget.Toast; @@ -411,10 +412,20 @@ public class CommonHomeFragment extends Fragment { * タスク追加ダイアログを表示 */ private void showAddTaskDialog() { + View view = getLayoutInflater().inflate(R.layout.common_task_add_dialog_layout, null); new MaterialAlertDialogBuilder(requireContext()) - .setTitle("Placeholder") - .setMessage("Placeholder") - .setPositiveButton("OK", (dialog, which) -> dialog.dismiss()) + .setTitle("タスクを追加") + .setView(view) + .setPositiveButton("追加", (dialog, which) -> { + EditText taskNameEditText = view.findViewById(R.id.addTaskNameEditText); + EditText taskRewardEditText = view.findViewById(R.id.addTaskRewardEditText); + TaskItemModel taskItemModel = new TaskItemModel(); + taskItemModel.setName(taskNameEditText.getText().toString()); + taskItemModel.setReward(Integer.parseInt(taskRewardEditText.getText().toString())); + taskData.addTask(taskItemModel).thenRun(this::updateData); + }) + .setNegativeButton("キャンセル", (dialog, which) -> dialog.dismiss()) .show(); + } } diff --git a/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml b/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml new file mode 100644 index 0000000..0288dff --- /dev/null +++ b/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + \ No newline at end of file From 10ebcae6122bd8043fa208bcdac4c8f079aa58c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 14:21:50 +0900 Subject: [PATCH 04/22] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=83=B3?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/common_task_add_dialog_layout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml b/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml index 0288dff..a5febde 100644 --- a/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml +++ b/feature/common/src/main/res/layout/common_task_add_dialog_layout.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="32dp"> + android:layout_margin="0dp"> Date: Tue, 9 Jul 2024 14:21:57 +0900 Subject: [PATCH 05/22] =?UTF-8?q?=E6=8C=99=E5=8B=95=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/feature/common/CommonHomeFragment.java | 9 +++++++-- 1 file changed, 7 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 0f4360b..d2dffef 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 @@ -402,9 +402,13 @@ public class CommonHomeFragment extends Fragment { * データを更新 (updateTaskInfoとupdateCalenderを並列実行) */ private void updateData() { - swipeRefreshLayout.setRefreshing(true); + requireActivity().runOnUiThread(() -> { + swipeRefreshLayout.setRefreshing(true); + }); CompletableFuture.allOf(updateTaskInfo(), updateCalender()).thenRun(() -> { - swipeRefreshLayout.setRefreshing(false); + requireActivity().runOnUiThread(() -> { + swipeRefreshLayout.setRefreshing(false); + }); }); } @@ -413,6 +417,7 @@ public class CommonHomeFragment extends Fragment { */ private void showAddTaskDialog() { View view = getLayoutInflater().inflate(R.layout.common_task_add_dialog_layout, null); + view.setPadding(48, 24, 48, 24); new MaterialAlertDialogBuilder(requireContext()) .setTitle("タスクを追加") .setView(view) From 6769397484015359044a29a475fddae40d141fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:01:26 +0900 Subject: [PATCH 06/22] =?UTF-8?q?=E6=8C=99=E5=8B=95=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 | 123 +++++++++--------- 1 file changed, 64 insertions(+), 59 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 d2dffef..f580c03 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,6 +8,7 @@ import androidx.annotation.NonNull; import androidx.core.view.MenuHost; import androidx.core.view.MenuProvider; import androidx.fragment.app.Fragment; +import androidx.lifecycle.Lifecycle; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -80,6 +81,7 @@ public class CommonHomeFragment extends Fragment { private KSLogger logger; CompactCalendarView compactCalendarView; + View calendarContainer; SwipeRefreshLayout swipeRefreshLayout; TaskListItemAdapter taskListItemAdapter; TextView calendarTitleTextView; @@ -140,6 +142,7 @@ public class CommonHomeFragment extends Fragment { RecyclerView taskListRecyclerView = view.findViewById(R.id.taskListRecyclerView); taskListRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); taskListRecyclerView.setAdapter(taskListItemAdapter); + taskListRecyclerView.setItemViewCacheSize(10); recyclerViewAnimUtils.setSlideUpAnimation(taskListRecyclerView); swipeRefreshLayout = view.findViewById(R.id.swipeRefreshLayout); @@ -148,63 +151,7 @@ public class CommonHomeFragment extends Fragment { calendarTitleTextView = view.findViewById(R.id.calendarTitleTextView); calendarPrevButton = view.findViewById(R.id.calendarPrevButton); calendarNextButton = view.findViewById(R.id.calendarNextButton); - - initCalender(); - - MenuHost menuHost = requireActivity(); - menuHost.addMenuProvider(new MenuProvider() { - @Override - public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) { - menu.clear(); - menuInflater.inflate(R.menu.common_home_toolbar_menu, menu); - } - - @Override - public boolean onMenuItemSelected(@NonNull MenuItem menuItem) { - if (menuItem.getItemId() == R.id.toggle_calendar) { - View calendarContainer = view.findViewById(R.id.calendarContainer); - if (calendarContainer.getVisibility() == View.VISIBLE) { - Animation slideUp = AnimationUtils.loadAnimation(getContext(), one.nem.kidshift.shared.R.anim.slide_up); - calendarContainer.startAnimation(slideUp); - slideUp.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - recyclerViewRefresh(); - } - - @Override - public void onAnimationEnd(Animation animation) { - calendarContainer.setVisibility(View.GONE); - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - }); - } else { - Animation slideDown = AnimationUtils.loadAnimation(getContext(), one.nem.kidshift.shared.R.anim.slide_down); - calendarContainer.startAnimation(slideDown); - slideDown.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - calendarContainer.setVisibility(View.VISIBLE); - recyclerViewRefresh(); - } - - @Override - public void onAnimationEnd(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - }); - } - return true; - } - return false; - } - }); + calendarContainer = view.findViewById(R.id.calendarContainer); initCalender(); updateData(); @@ -268,6 +215,62 @@ public class CommonHomeFragment extends Fragment { toolBarManager.setTitle("KidShift"); toolBarManager.setSubtitle("保護者ビュー - タスク一覧"); } + MenuHost menuHost = requireActivity(); + + menuHost.invalidateMenu(); + menuHost.addMenuProvider(new MenuProvider() { + @Override + public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) { + logger.debug("onCreateMenu, インフレート"); + menu.clear(); + menuInflater.inflate(R.menu.common_home_toolbar_menu, menu); + } + + @Override + public boolean onMenuItemSelected(@NonNull MenuItem menuItem) { + if (menuItem.getItemId() == R.id.toggle_calendar) { + if (calendarContainer.getVisibility() == View.VISIBLE) { + Animation slideUp = AnimationUtils.loadAnimation(getContext(), one.nem.kidshift.shared.R.anim.slide_up); + calendarContainer.startAnimation(slideUp); + slideUp.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { + recyclerViewRefresh(); + } + + @Override + public void onAnimationEnd(Animation animation) { + calendarContainer.setVisibility(View.GONE); + } + + @Override + public void onAnimationRepeat(Animation animation) { + } + }); + } else { + Animation slideDown = AnimationUtils.loadAnimation(getContext(), one.nem.kidshift.shared.R.anim.slide_down); + calendarContainer.startAnimation(slideDown); + slideDown.setAnimationListener(new Animation.AnimationListener() { + @Override + public void onAnimationStart(Animation animation) { + calendarContainer.setVisibility(View.VISIBLE); + recyclerViewRefresh(); + } + + @Override + public void onAnimationEnd(Animation animation) { + } + + @Override + public void onAnimationRepeat(Animation animation) { + } + }); + } + return true; + } + return false; + } + }, this.getViewLifecycleOwner(), Lifecycle.State.RESUMED); } @@ -347,9 +350,11 @@ public class CommonHomeFragment extends Fragment { } }).thenAccept(taskItemModel -> { requireActivity().runOnUiThread(() -> { - taskListItemAdapter.notifyItemRangeRemoved(0, taskListItemAdapter.getItemCount()); +// taskListItemAdapter.notifyItemRangeRemoved(0, taskListItemAdapter.getItemCount()); +// taskListItemAdapter.setTaskItemModelList(taskItemModel); +// taskListItemAdapter.notifyItemRangeInserted(0, taskItemModel.size()); taskListItemAdapter.setTaskItemModelList(taskItemModel); - taskListItemAdapter.notifyItemRangeInserted(0, taskItemModel.size()); + taskListItemAdapter.notifyItemRangeChanged(0, taskItemModel.size()); }); }); } From a033a3888e50329b321ec4c6bf7fcc66618aa83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:01:35 +0900 Subject: [PATCH 07/22] =?UTF-8?q?=E5=BC=95=E6=95=B0=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/navigation/feature_common_parent_child_navigation.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/feature/common/src/main/res/navigation/feature_common_parent_child_navigation.xml b/feature/common/src/main/res/navigation/feature_common_parent_child_navigation.xml index 91aeac4..afe73e3 100644 --- a/feature/common/src/main/res/navigation/feature_common_parent_child_navigation.xml +++ b/feature/common/src/main/res/navigation/feature_common_parent_child_navigation.xml @@ -21,6 +21,10 @@ + \ No newline at end of file From 00febce148edee7386cd83e6a23d1a1e6bd2da41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:09:42 +0900 Subject: [PATCH 08/22] =?UTF-8?q?toolBar,=20Fab=E3=81=AE=E6=98=8E=E7=A4=BA?= =?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/CommonHomeFragment.java | 8 ++++---- .../feature/common/CommonSelectChildFragment.java | 5 +++++ .../nem/kidshift/wallet/WalletContentFragment.java | 5 +++++ .../wallet/WalletParentWrapperFragment.java | 14 ++++++++++++++ 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 f580c03..76acc32 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 @@ -209,11 +209,11 @@ public class CommonHomeFragment extends Fragment { private void setupToolBar() { if (isChildMode) { - toolBarManager.setTitle("KidShift"); - toolBarManager.setSubtitle("子供ビュー - タスク一覧"); + toolBarManager.setTitle("ホーム"); + toolBarManager.setSubtitle("子供ビュー"); } else { - toolBarManager.setTitle("KidShift"); - toolBarManager.setSubtitle("保護者ビュー - タスク一覧"); + toolBarManager.setTitle("ホーム"); + toolBarManager.setSubtitle("保護者ビュー"); } MenuHost menuHost = requireActivity(); diff --git a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonSelectChildFragment.java b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonSelectChildFragment.java index ba75ab2..372db9b 100644 --- a/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonSelectChildFragment.java +++ b/feature/common/src/main/java/one/nem/kidshift/feature/common/CommonSelectChildFragment.java @@ -22,6 +22,7 @@ import one.nem.kidshift.feature.common.adapter.SelectShowChildListItemAdapter; import one.nem.kidshift.utils.FabManager; import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.RecyclerViewAnimUtils; +import one.nem.kidshift.utils.ToolBarManager; import one.nem.kidshift.utils.factory.KSLoggerFactory; @AndroidEntryPoint @@ -34,6 +35,8 @@ public class CommonSelectChildFragment extends Fragment { @Inject FabManager fabManager; @Inject + ToolBarManager toolBarManager; + @Inject RecyclerViewAnimUtils recyclerViewAnimUtils; private KSLogger logger; @@ -80,6 +83,8 @@ public class CommonSelectChildFragment extends Fragment { public void onResume() { super.onResume(); fabManager.hide(); + toolBarManager.setTitle("子供選択"); + toolBarManager.setSubtitle(null); } } \ No newline at end of file diff --git a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java index 879ba3c..3a3786a 100644 --- a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java +++ b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletContentFragment.java @@ -14,6 +14,7 @@ import one.nem.kidshift.data.RewardData; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.utils.FabManager; import one.nem.kidshift.utils.KSLogger; +import one.nem.kidshift.utils.ToolBarManager; import one.nem.kidshift.utils.factory.KSLoggerFactory; @AndroidEntryPoint @@ -27,6 +28,8 @@ public class WalletContentFragment extends Fragment { @Inject FabManager fabManager; + @Inject + ToolBarManager toolBarManager; @Inject UserSettings userSettings; @@ -100,5 +103,7 @@ public class WalletContentFragment extends Fragment { super.onResume(); updateTotalReward(); fabManager.hide(); + toolBarManager.setTitle("ウォレット"); + toolBarManager.setSubtitle(null); } } diff --git a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletParentWrapperFragment.java b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletParentWrapperFragment.java index e90b96b..32ed3fc 100644 --- a/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletParentWrapperFragment.java +++ b/feature/wallet/src/main/java/one/nem/kidshift/wallet/WalletParentWrapperFragment.java @@ -26,7 +26,9 @@ import dagger.hilt.android.AndroidEntryPoint; import one.nem.kidshift.data.ChildData; import one.nem.kidshift.data.RewardData; import one.nem.kidshift.model.ChildModel; +import one.nem.kidshift.utils.FabManager; import one.nem.kidshift.utils.KSLogger; +import one.nem.kidshift.utils.ToolBarManager; import one.nem.kidshift.utils.factory.KSLoggerFactory; @AndroidEntryPoint @@ -42,6 +44,10 @@ public class WalletParentWrapperFragment extends Fragment { @Inject RewardData rewardData; + @Inject + FabManager fabManager; + @Inject + ToolBarManager toolBarManager; private TabLayout tabLayout; private ViewPager2 viewPager; @@ -104,4 +110,12 @@ public class WalletParentWrapperFragment extends Fragment { return childList == null ? 0 : childList.size(); } } + + @Override + public void onResume() { + super.onResume(); + fabManager.hide(); + toolBarManager.setTitle("ウォレット"); + toolBarManager.setSubtitle(null); + } } \ No newline at end of file From bb2298598ded76e231c71aac2b3ff61475e728a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:28:51 +0900 Subject: [PATCH 09/22] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?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 --- .../main/java/one/nem/kidshift/MainActivity.java | 13 +++++++++++++ app/src/main/res/menu/nav_menu.xml | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index da9ad7e..bfb08b3 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -101,6 +101,9 @@ public class MainActivity extends AppCompatActivity { } else if (item.getItemId() == R.id.show_debug_dialog) { showDebugDialog(); return true; + } else if (item.getItemId() == R.id.show_account_dialog) { + showAccountDialog(); + return true; } else { logger.warn("不明なアイテム: " + item.getItemId()); } @@ -158,6 +161,16 @@ public class MainActivity extends AppCompatActivity { } + private void showAccountDialog() { + new MaterialAlertDialogBuilder(this) + .setTitle("アカウント情報") + .setMessage("Placeholder") + .setPositiveButton("OK", (dialog, which) -> { + // Do nothing + }) + .show(); + } + private void showDebugDialog() { ScrollView scrollView = new ScrollView(this); diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml index 4641ed8..332c03b 100644 --- a/app/src/main/res/menu/nav_menu.xml +++ b/app/src/main/res/menu/nav_menu.xml @@ -1,5 +1,10 @@ + + Date: Tue, 9 Jul 2024 15:29:59 +0900 Subject: [PATCH 10/22] =?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 332c03b..714cb5b 100644 --- a/app/src/main/res/menu/nav_menu.xml +++ b/app/src/main/res/menu/nav_menu.xml @@ -2,7 +2,7 @@ Date: Tue, 9 Jul 2024 15:37:11 +0900 Subject: [PATCH 11/22] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E4=BB=AE=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/user_info_dialog_layout.xml | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 app/src/main/res/layout/user_info_dialog_layout.xml diff --git a/app/src/main/res/layout/user_info_dialog_layout.xml b/app/src/main/res/layout/user_info_dialog_layout.xml new file mode 100644 index 0000000..b6e0749 --- /dev/null +++ b/app/src/main/res/layout/user_info_dialog_layout.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From 555e0d3862d7b6e131748ddf2682059e6f4a6f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:38:18 +0900 Subject: [PATCH 12/22] =?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/edit_24px.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 shared/src/main/res/drawable/edit_24px.xml diff --git a/shared/src/main/res/drawable/edit_24px.xml b/shared/src/main/res/drawable/edit_24px.xml new file mode 100644 index 0000000..b253108 --- /dev/null +++ b/shared/src/main/res/drawable/edit_24px.xml @@ -0,0 +1,10 @@ + + + From 57b22b8ec41cb3a307abff58b30b15c90b2934e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:39:52 +0900 Subject: [PATCH 13/22] =?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 --- app/src/main/res/layout/user_info_dialog_layout.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/user_info_dialog_layout.xml b/app/src/main/res/layout/user_info_dialog_layout.xml index b6e0749..e93b875 100644 --- a/app/src/main/res/layout/user_info_dialog_layout.xml +++ b/app/src/main/res/layout/user_info_dialog_layout.xml @@ -28,11 +28,13 @@ android:textSize="24sp" /> + android:background="@android:color/transparent" + android:padding="24px" + app:srcCompat="@drawable/edit_24px" /> Date: Tue, 9 Jul 2024 15:43:14 +0900 Subject: [PATCH 14/22] =?UTF-8?q?getParentDirect=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/kidshift/data/ParentData.java | 6 ++++++ .../java/one/nem/kidshift/data/impl/ParentDataImpl.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/ParentData.java b/data/src/main/java/one/nem/kidshift/data/ParentData.java index 78c67c9..3f8df19 100644 --- a/data/src/main/java/one/nem/kidshift/data/ParentData.java +++ b/data/src/main/java/one/nem/kidshift/data/ParentData.java @@ -14,6 +14,12 @@ public interface ParentData { */ CompletableFuture getParent(ParentModelCallback callback); + /** + * 親ユーザー情報取得 + * @return 親ユーザー情報 + */ + CompletableFuture getParentDirect(); + /** * 親ユーザー情報更新 * @param parent 親ユーザー情報 diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java index e3334b8..aa82cc1 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java @@ -45,6 +45,11 @@ public class ParentDataImpl implements ParentData { return CompletableFuture.supplyAsync(() -> userSettings.getCache().getParent()); } + @Override + public CompletableFuture getParentDirect() { + return ksActions.syncParent(); + } + @Override public void updateParent(ParentModel parent) { From 2963ffec7e187eb67689124e8df6044b44c6d715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:58:07 +0900 Subject: [PATCH 15/22] =?UTF-8?q?=E5=AE=9F=E8=A3=85=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/MainActivity.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index bfb08b3..736cc55 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -4,6 +4,8 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.MenuItem; +import android.view.View; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; @@ -23,6 +25,7 @@ import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.ui.NavigationUI; import com.google.android.material.bottomnavigation.BottomNavigationView; +import com.google.android.material.chip.Chip; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.divider.MaterialDivider; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -31,8 +34,12 @@ import com.google.android.material.navigation.NavigationView; import javax.inject.Inject; import dagger.hilt.android.AndroidEntryPoint; +import one.nem.kidshift.data.ChildData; +import one.nem.kidshift.data.ParentData; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.feature.child.ChildManageMainActivity; +import one.nem.kidshift.model.ParentModel; +import one.nem.kidshift.model.callback.ParentModelCallback; import one.nem.kidshift.utils.FabManager; import one.nem.kidshift.utils.FeatureFlag; import one.nem.kidshift.utils.KSLogger; @@ -52,6 +59,11 @@ public class MainActivity extends AppCompatActivity { FeatureFlag featureFlag; @Inject UserSettings userSettings; + @Inject + ParentData parentData; + @Inject + ChildData childData; + private KSLogger logger; private FloatingActionButton fab; @@ -162,6 +174,50 @@ public class MainActivity extends AppCompatActivity { } private void showAccountDialog() { + boolean isEditMode = false; + View view = getLayoutInflater().inflate(R.layout.user_info_dialog_layout, null); + if (userSettings.getAppCommonSetting().isChildMode()) { + ((TextView) view.findViewById(R.id.userNameTextView)).setText( + childData.getChild(userSettings.getAppCommonSetting().getChildId()).join().getName()); + ((TextView) view.findViewById(R.id.emailTextView)).setText("子供モードはメールアドレスを設定できません"); + ((Chip) view.findViewById(R.id.chip)).setText("子供/Child"); + } else { + parentData.getParentDirect().thenAccept(parentModel -> { + ((TextView) view.findViewById(R.id.userNameTextView)).setText(parentModel.getName()); + ((TextView) view.findViewById(R.id.emailTextView)).setText(parentModel.getEmail()); + ((Chip) view.findViewById(R.id.chip)).setText("保護者/Parent"); + }); + } + + view.findViewById(R.id.userNameEditButton).setOnClickListener(v -> { + EditText editText = new EditText(this); + editText.setText(((TextView) view.findViewById(R.id.userNameTextView)).getText()); + editText.setHint("ユーザー名"); + new MaterialAlertDialogBuilder(this) + .setTitle("ユーザー名の変更") + .setView(editText) + .setPositiveButton("OK", (dialog, which) -> { + ((TextView) view.findViewById(R.id.userNameTextView)).setText(editText.getText()); + if (userSettings.getAppCommonSetting().isChildMode()) { + // 子供モード + childData.getChild(userSettings.getAppCommonSetting().getChildId()).thenAccept(childModel -> { + childModel.setName(editText.getText().toString()); + childData.updateChild(childModel); + }); + } else { + // 保護者モード + parentData.getParentDirect().thenAccept(parentModel -> { + parentModel.setName(editText.getText().toString()); + parentData.updateParent(parentModel); + }); + } + }) + .setNegativeButton("キャンセル", (dialog, which) -> { + // Do nothing + }) + .show(); + }); + new MaterialAlertDialogBuilder(this) .setTitle("アカウント情報") .setMessage("Placeholder") From 10374d2486a13ceab78374972c30835d3d42794f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 15:58:18 +0900 Subject: [PATCH 16/22] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/one/nem/kidshift/data/impl/ParentDataImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java index aa82cc1..0aa7998 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java @@ -22,7 +22,7 @@ public class ParentDataImpl implements ParentData { private final KSActions ksActions; @Inject - public ParentDataImpl(KidShiftApiService kidshiftApiService, UserSettings userSettings, KSLoggerFactory ksLoggerFactory, KSActions ksActions) { + public ParentDataImpl(UserSettings userSettings, KSLoggerFactory ksLoggerFactory, KSActions ksActions) { this.userSettings = userSettings; this.logger = ksLoggerFactory.create("ParentDataImpl"); this.ksActions = ksActions; From c846659e4b37602fecfda91b4eb6a46d2587f6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:00:43 +0900 Subject: [PATCH 17/22] =?UTF-8?q?Singleton=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/modules/ParentDataModule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/one/nem/kidshift/data/modules/ParentDataModule.java b/data/src/main/java/one/nem/kidshift/data/modules/ParentDataModule.java index 6b738ae..6315319 100644 --- a/data/src/main/java/one/nem/kidshift/data/modules/ParentDataModule.java +++ b/data/src/main/java/one/nem/kidshift/data/modules/ParentDataModule.java @@ -4,11 +4,12 @@ import dagger.Binds; import dagger.Module; import dagger.hilt.InstallIn; import dagger.hilt.android.components.FragmentComponent; +import dagger.hilt.components.SingletonComponent; import one.nem.kidshift.data.ParentData; import one.nem.kidshift.data.impl.ParentDataImpl; @Module -@InstallIn(FragmentComponent.class) +@InstallIn(SingletonComponent.class) public abstract class ParentDataModule { @Binds From 73bcefa99f662bc8441abf81a4706815ca2e987b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:05:05 +0900 Subject: [PATCH 18/22] parentRenameRequest --- .../model/parent/ParentRenameRequest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentRenameRequest.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentRenameRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentRenameRequest.java new file mode 100644 index 0000000..c6b4d07 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentRenameRequest.java @@ -0,0 +1,21 @@ +package one.nem.kidshift.data.retrofit.model.parent; + +public class ParentRenameRequest { + private String displayName; + + /** + * コンストラクタ (全プロパティ) + * @param displayName 表示名 + */ + public ParentRenameRequest(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } +} From 358116811fa0ae25b0e0ce6804f77f650f7b3b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:12:17 +0900 Subject: [PATCH 19/22] =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/data/ParentData.java | 2 +- .../kidshift/data/impl/ParentDataImpl.java | 20 ++++++++++++++++--- .../data/retrofit/KidShiftApiService.java | 10 ++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/ParentData.java b/data/src/main/java/one/nem/kidshift/data/ParentData.java index 3f8df19..7fa5fd4 100644 --- a/data/src/main/java/one/nem/kidshift/data/ParentData.java +++ b/data/src/main/java/one/nem/kidshift/data/ParentData.java @@ -24,6 +24,6 @@ public interface ParentData { * 親ユーザー情報更新 * @param parent 親ユーザー情報 */ - void updateParent(ParentModel parent); + CompletableFuture updateParent(ParentModel parent); } diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java index 0aa7998..977e898 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java @@ -8,21 +8,26 @@ import one.nem.kidshift.data.KSActions; import one.nem.kidshift.data.ParentData; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.data.retrofit.KidShiftApiService; +import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; +import one.nem.kidshift.data.retrofit.model.parent.ParentRenameRequest; import one.nem.kidshift.model.ParentModel; import one.nem.kidshift.model.callback.ParentModelCallback; import one.nem.kidshift.utils.KSLogger; import one.nem.kidshift.utils.factory.KSLoggerFactory; +import retrofit2.Call; public class ParentDataImpl implements ParentData { private final UserSettings userSettings; + private final KidShiftApiService kidShiftApiService; private final KSLogger logger; private final KSActions ksActions; @Inject - public ParentDataImpl(UserSettings userSettings, KSLoggerFactory ksLoggerFactory, KSActions ksActions) { + public ParentDataImpl(KidShiftApiService kidShiftApiService, UserSettings userSettings, KSLoggerFactory ksLoggerFactory, KSActions ksActions) { + this.kidShiftApiService = kidShiftApiService; this.userSettings = userSettings; this.logger = ksLoggerFactory.create("ParentDataImpl"); this.ksActions = ksActions; @@ -51,8 +56,17 @@ public class ParentDataImpl implements ParentData { } @Override - public void updateParent(ParentModel parent) { - + public CompletableFuture updateParent(ParentModel parent) { + Call call = kidShiftApiService.renameParent(new ParentRenameRequest(parent.getName())); + try { + ParentInfoResponse response = call.execute().body(); + if (response == null) { + return CompletableFuture.completedFuture(null); + } + return CompletableFuture.completedFuture(null); + } catch (Exception e) { + return CompletableFuture.completedFuture(null); + } } } diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java index 4bf792b..705c160 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java @@ -8,6 +8,7 @@ import one.nem.kidshift.data.retrofit.model.child.ChildResponse; import one.nem.kidshift.data.retrofit.model.child.auth.ChildAuthRequest; import one.nem.kidshift.data.retrofit.model.child.auth.ChildAuthResponse; import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; +import one.nem.kidshift.data.retrofit.model.parent.ParentRenameRequest; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse; import one.nem.kidshift.data.retrofit.model.task.HistoryListResponse; @@ -45,6 +46,15 @@ public interface KidShiftApiService { @POST("/parent/auth/register") Call parentRegister(@Body ParentAuthRequest request); + /** + * 保護者情報更新処理 + * @param request ParentRenameRequest + * @return ParentInfoResponse + */ + @PUT("/parent/account") + @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) + Call renameParent(@Body ParentRenameRequest request); + /** * 子供ログイン処理 * @param request ChildAuthRequest From cc5560745fa120feb8dbd983f98ddf4c1d85845c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:18:39 +0900 Subject: [PATCH 20/22] =?UTF-8?q?cache=E5=8F=96=E5=BE=97=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/kidshift/data/ParentData.java | 6 ++++++ .../java/one/nem/kidshift/data/impl/ParentDataImpl.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/ParentData.java b/data/src/main/java/one/nem/kidshift/data/ParentData.java index 7fa5fd4..7f3cf68 100644 --- a/data/src/main/java/one/nem/kidshift/data/ParentData.java +++ b/data/src/main/java/one/nem/kidshift/data/ParentData.java @@ -20,6 +20,12 @@ public interface ParentData { */ CompletableFuture getParentDirect(); + /** + * 親ユーザー情報取得 + * @return 親ユーザー情報 + */ + CompletableFuture getParentCache(); + /** * 親ユーザー情報更新 * @param parent 親ユーザー情報 diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java index 977e898..77d73e5 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataImpl.java @@ -55,6 +55,11 @@ public class ParentDataImpl implements ParentData { return ksActions.syncParent(); } + @Override + public CompletableFuture getParentCache() { + return CompletableFuture.supplyAsync(() -> userSettings.getCache().getParent()); + } + @Override public CompletableFuture updateParent(ParentModel parent) { Call call = kidShiftApiService.renameParent(new ParentRenameRequest(parent.getName())); From 94f47982f7f049c7d5d493d2764d927c1913bdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:22:23 +0900 Subject: [PATCH 21/22] rename --- .../main/java/one/nem/kidshift/MainActivity.java | 5 +++-- .../model/converter/ParentModelConverter.java | 2 +- .../model/parent/ParentInfoResponse.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/one/nem/kidshift/MainActivity.java b/app/src/main/java/one/nem/kidshift/MainActivity.java index 736cc55..63c975e 100644 --- a/app/src/main/java/one/nem/kidshift/MainActivity.java +++ b/app/src/main/java/one/nem/kidshift/MainActivity.java @@ -184,9 +184,10 @@ public class MainActivity extends AppCompatActivity { } else { parentData.getParentDirect().thenAccept(parentModel -> { ((TextView) view.findViewById(R.id.userNameTextView)).setText(parentModel.getName()); + logger.debug("ParentModel: " + parentModel.getName() + ", " + parentModel.getEmail()); ((TextView) view.findViewById(R.id.emailTextView)).setText(parentModel.getEmail()); ((Chip) view.findViewById(R.id.chip)).setText("保護者/Parent"); - }); + }).join(); } view.findViewById(R.id.userNameEditButton).setOnClickListener(v -> { @@ -220,7 +221,7 @@ public class MainActivity extends AppCompatActivity { new MaterialAlertDialogBuilder(this) .setTitle("アカウント情報") - .setMessage("Placeholder") + .setView(view) .setPositiveButton("OK", (dialog, which) -> { // Do nothing }) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java index b3c7869..c98b68d 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/ParentModelConverter.java @@ -11,7 +11,7 @@ public class ParentModelConverter { * @return ParentModel */ public static ParentModel parentInfoResponseToParentModel(ParentInfoResponse parentInfoResponse) { - return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplayName(), parentInfoResponse.getEmail()); + return new ParentModel(parentInfoResponse.getId(), parentInfoResponse.getDisplay_name(), parentInfoResponse.getEmail()); } /** diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentInfoResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentInfoResponse.java index f84503b..51cb7bc 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentInfoResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/parent/ParentInfoResponse.java @@ -4,18 +4,18 @@ public class ParentInfoResponse { private String id; private String email; - private String displayName; + private String display_name; /** * コンストラクタ (全プロパティ) * @param id 親ID * @param email メールアドレス - * @param displayName 表示名 + * @param display_name 表示名 */ - public ParentInfoResponse(String id, String email, String displayName) { + public ParentInfoResponse(String id, String email, String display_name) { this.id = id; this.email = email; - this.displayName = displayName; + this.display_name = display_name; } public String getId() { @@ -26,8 +26,8 @@ public class ParentInfoResponse { return email; } - public String getDisplayName() { - return displayName; + public String getDisplay_name() { + return display_name; } public void setId(String id) { @@ -38,7 +38,7 @@ public class ParentInfoResponse { this.email = email; } - public void setDisplayName(String displayName) { - this.displayName = displayName; + public void setDisplay_name(String display_name) { + this.display_name = display_name; } } From eb2e2e5b6d13782a8537f60c971bdba66f78ff36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 9 Jul 2024 16:25:43 +0900 Subject: [PATCH 22/22] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/nav_header.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml index 8aabc15..4449312 100644 --- a/app/src/main/res/layout/nav_header.xml +++ b/app/src/main/res/layout/nav_header.xml @@ -2,19 +2,15 @@ - - + android:padding="16dp"> + android:textSize="34sp" />