Merge pull request #1061 from bannzai/fix/function/diary

Fix diary
bannzai · Jan 17, 2024 · 427b05a · 427b05a
2 parents fbb3f00 + a0b312a
commit 427b05a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 31 deletions.
diff --git a/lib/components/organisms/calendar/week/week_calendar.dart b/lib/components/organisms/calendar/week/week_calendar.dart
@@ -19,7 +19,7 @@ import 'package:pilll/features/schedule_post/schedule_post_page.dart';
 import 'package:pilll/entity/diary.codegen.dart';
 import 'package:pilll/entity/schedule.codegen.dart';
 import 'package:pilll/entity/weekday.dart';
-import 'package:pilll/features/diary_post/confirm_diary_sheet.dart';
+import 'package:pilll/features/diary_post/diary_confirmation_sheet.dart';
 import 'package:pilll/utils/datetime/date_compare.dart';
 import 'package:pilll/utils/datetime/day.dart';
 
@@ -172,7 +172,7 @@ void transitionWhenCalendarDayTapped(
 void _showConfirmDiarySheet(BuildContext context, Diary diary) {
   showModalBottomSheet(
     context: context,
-    builder: (context) => ConfirmDiarySheet(diary: diary),
+    builder: (context) => DiaryConfirmationSheet(date: diary.date),
     backgroundColor: Colors.transparent,
   );
 }
diff --git a/...tures/diary_post/confirm_diary_sheet.dart → .../diary_post/diary_confirmation_sheet.dart b/...tures/diary_post/confirm_diary_sheet.dart → .../diary_post/diary_confirmation_sheet.dart
@@ -1,4 +1,5 @@
 import 'package:pilll/components/atoms/button.dart';
+import 'package:pilll/components/molecules/indicator.dart';
 import 'package:pilll/components/page/discard_dialog.dart';
 import 'package:pilll/features/diary_post/diary_post_page.dart';
 import 'package:pilll/entity/diary.codegen.dart';
@@ -11,17 +12,22 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 
-class ConfirmDiarySheet extends HookConsumerWidget {
-  final Diary diary;
+class DiaryConfirmationSheet extends HookConsumerWidget {
+  final DateTime date;
 
-  const ConfirmDiarySheet({
+  const DiaryConfirmationSheet({
     Key? key,
-    required this.diary,
+    required this.date,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final diary = ref.watch(diaryProvider(date));
     final deleteDiary = ref.watch(deleteDiaryProvider);
+    if (diary == null) {
+      return const Indicator();
+    }
+
     return Container(
       decoration: const BoxDecoration(
         borderRadius: BorderRadius.only(
@@ -32,12 +38,12 @@ class ConfirmDiarySheet extends HookConsumerWidget {
       ),
       padding: const EdgeInsets.fromLTRB(16, 20, 16, 20),
       child: Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [
-        _title(context, deleteDiary),
+        _title(context, deleteDiary, diary),
         ...[
-          if (diary.hasPhysicalConditionStatus) _physicalCondition(),
-          _physicalConditionDetails(),
-          if (diary.hasSex) _sex(),
-          _memo(),
+          if (diary.hasPhysicalConditionStatus) _physicalCondition(diary),
+          _physicalConditionDetails(diary),
+          if (diary.hasSex) _sex(diary),
+          _memo(diary),
         ].map((e) => _withContentSpacer(e)),
       ]),
     );
@@ -50,7 +56,7 @@ class ConfirmDiarySheet extends HookConsumerWidget {
     );
   }
 
-  Widget _title(BuildContext context, DeleteDiary deleteDiary) {
+  Widget _title(BuildContext context, DeleteDiary deleteDiary, Diary diary) {
     return Row(
       mainAxisSize: MainAxisSize.max,
       children: [
@@ -113,7 +119,7 @@ class ConfirmDiarySheet extends HookConsumerWidget {
     }
   }
 
-  Widget _physicalCondition() {
+  Widget _physicalCondition(Diary diary) {
     return Row(
       children: [
         const Text("体調",
@@ -129,7 +135,7 @@ class ConfirmDiarySheet extends HookConsumerWidget {
     );
   }
 
-  Widget _physicalConditionDetails() {
+  Widget _physicalConditionDetails(Diary diary) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -154,7 +160,7 @@ class ConfirmDiarySheet extends HookConsumerWidget {
     );
   }
 
-  Widget _sex() {
+  Widget _sex(Diary diary) {
     return Container(
       padding: const EdgeInsets.all(4),
       width: 32,
@@ -164,7 +170,7 @@ class ConfirmDiarySheet extends HookConsumerWidget {
     );
   }
 
-  Widget _memo() {
+  Widget _memo(Diary diary) {
     return Text(
       diary.memo,
       maxLines: 2,

diff --git a/lib/features/diary_post/diary_post_page.dart b/lib/features/diary_post/diary_post_page.dart
@@ -73,16 +73,16 @@ class DiaryPostPageBody extends HookConsumerWidget {
     required this.user,
     required this.diarySetting,
   }) : super(key: key);
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final textEditingController = useTextEditingController(text: diary.memo);
+    final memoTextEditingController = useTextEditingController(text: diary.memo);
     final focusNode = useFocusNode();
     final scrollController = useScrollController();
 
     final physicalCondition = useState<PhysicalConditionStatus?>(diary.physicalConditionStatus);
     final physicalConditionDetails = useState(diary.physicalConditions);
     final sex = useState(diary.hasSex);
-    final memo = useState(diary.memo);
 
     final setDiary = ref.watch(setDiaryProvider);
 
@@ -114,7 +114,7 @@ class DiaryPostPageBody extends HookConsumerWidget {
                   physicalConditionStatus: physicalCondition.value,
                   physicalConditions: physicalConditionDetails.value,
                   hasSex: sex.value,
-                  memo: memo.value,
+                  memo: memoTextEditingController.text,
                 ));
 
                 navigator.pop();
@@ -145,7 +145,7 @@ class DiaryPostPageBody extends HookConsumerWidget {
                   const SizedBox(height: 20),
                   DiaryPostSex(sex: sex),
                   const SizedBox(height: 20),
-                  DiaryPostMemo(textEditingController: textEditingController, focusNode: focusNode, memo: memo),
+                  DiaryPostMemo(textEditingController: memoTextEditingController, focusNode: focusNode),
                 ],
               ),
             ),

diff --git a/lib/features/diary_post/memo.dart b/lib/features/diary_post/memo.dart
@@ -4,12 +4,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 class DiaryPostMemo extends HookConsumerWidget {
   final TextEditingController textEditingController;
   final FocusNode focusNode;
-  final ValueNotifier<String> memo;
-  const DiaryPostMemo({Key? key, required this.textEditingController, required this.focusNode, required this.memo}) : super(key: key);
+  const DiaryPostMemo({Key? key, required this.textEditingController, required this.focusNode}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    const textLength = 120;
     return ConstrainedBox(
       constraints: BoxConstraints(
         minWidth: MediaQuery.of(context).size.width,
@@ -18,17 +16,13 @@ class DiaryPostMemo extends HookConsumerWidget {
         maxHeight: 200,
       ),
       child: TextFormField(
-        onChanged: (text) {
-          memo.value = text;
-        },
         decoration: const InputDecoration(
           hintText: "メモ",
           border: OutlineInputBorder(),
         ),
         controller: textEditingController,
         maxLines: null,
-        maxLength: textLength,
-        keyboardType: TextInputType.multiline,
+        maxLength: 120,
         focusNode: focusNode,
       ),
     );

diff --git a/lib/provider/diary.dart b/lib/provider/diary.dart
@@ -50,6 +50,10 @@ List<Diary> _sortedDiaries(List<Diary> diaries) {
   return diaries;
 }
 
+final diaryProvider = Provider.family((ref, DateTime date) {
+  return ref.watch(diariesForMonthProvider(date)).asData?.value.firstWhereOrNull((element) => element.date == date);
+});
+
 final setDiaryProvider = Provider((ref) => SetDiary(ref.watch(databaseProvider)));
 
 class SetDiary {

diff --git a/pubspec.lock b/pubspec.lock
@@ -474,10 +474,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_hooks
-      sha256: "7c8db779c2d1010aa7f9ea3fbefe8f86524fcb87b69e8b0af31e1a4b55422dec"
+      sha256: "09f64db63fee3b2ab8b9038a1346be7d8986977fae3fec601275bf32455ccfc0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.3"
+    version: "0.20.4"
   flutter_lints:
     dependency: "direct dev"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -46,7 +46,7 @@ dependencies:
   riverpod: ^2.4.4
   hooks_riverpod: ^2.4.4
   riverpod_annotation: 2.3.0
-  flutter_hooks: ^0.20.3
+  flutter_hooks: ^0.20.4
   firebase_crashlytics: ^3.0.12
   dotted_border: ^2.1.0
   in_app_review: ^2.0.8