From 7794d664ba00e3df1d787687be4187dc524f12ac 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, 23 Jul 2024 13:43:52 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=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 | 26 ++++++++++++++++--- 1 file changed, 22 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 90eb844..82b2bbd 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 @@ -24,6 +24,8 @@ import android.view.animation.AnimationUtils; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; +import android.widget.LinearLayout; +import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; @@ -46,6 +48,7 @@ import one.nem.kidshift.data.TaskData; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.feature.common.adapter.ChildListItemAdapter; import one.nem.kidshift.feature.common.adapter.TaskListItemAdapter; +import one.nem.kidshift.model.HistoryModel; import one.nem.kidshift.model.callback.TaskItemModelCallback; import one.nem.kidshift.model.tasks.TaskItemModel; import one.nem.kidshift.utils.FabManager; @@ -377,7 +380,7 @@ public class CommonHomeFragment extends Fragment { private CompletableFuture updateCalender() { return rewardData.getRewardHistoryList().thenAccept(historyModels -> { historyModels.forEach(historyModel -> { - compactCalendarView.addEvent(new Event(Color.RED, historyModel.getRegisteredAt().getTime(), historyModel.getTaskName())); // debug + compactCalendarView.addEvent(new Event(Color.RED, historyModel.getRegisteredAt().getTime(), historyModel)); // debug }); }); } @@ -387,10 +390,25 @@ public class CommonHomeFragment extends Fragment { @Override public void onDayClick(Date date) { // Test List events = compactCalendarView.getEvents(date); + + ScrollView scrollView = new ScrollView(requireContext()); + LinearLayout linearLayout = new LinearLayout(requireContext()); + linearLayout.setOrientation(LinearLayout.VERTICAL); + linearLayout.setPadding(96, 24, 96, 24); + scrollView.addView(linearLayout); + + events.forEach(event -> { + TextView textView = new TextView(requireContext()); + textView.setText(((HistoryModel) event.getData()).getTaskName() + " @ " + ((HistoryModel) event.getData()).getChildId()); + textView.setPadding(0, 0, 0, 24); + linearLayout.addView(textView); + }); + new MaterialAlertDialogBuilder(requireContext()) - .setTitle(date.toString()) - .setMessage(events.toString()) - .setPositiveButton("OK", (dialog, which) -> dialog.dismiss()) + .setTitle("タスク一覧 (DEBUG)") + .setMessage(events.size() + "件のタスクが登録されています") + .setView(scrollView) + .setNeutralButton("閉じる", (dialog, which) -> dialog.dismiss()) .show(); }