From 7d3adff0fbeeeb94ec695eca0b0a8e50c348a8b9 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 18:08:06 +0900 Subject: [PATCH 01/16] Fix wording --- .../components/record_page_rest_duration_dialog.dart | 6 +++--- .../rest_duration/begin_manual_rest_duration_button.dart | 2 +- .../rest_duration/invalid_already_taken_pill_dialog.dart | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart index a49b73004c..018d0e9df4 100644 --- a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart +++ b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart @@ -29,7 +29,7 @@ class RecordPageRestDurationDialog extends StatelessWidget { children: [ title, const SizedBox(height: 24), - const Text("休薬するとピル番号は進みません", + const Text("服用をお休みするとピル番号は進みません", style: TextStyle( fontFamily: FontFamily.japanese, fontWeight: FontWeight.w300, @@ -66,7 +66,7 @@ class RecordPageRestDurationDialog extends StatelessWidget { actions: [ AppOutlinedButton( onPressed: () async => onDone(), - text: "休薬する", + text: "服用お休みする", ), Center( child: AlertButton( @@ -111,7 +111,7 @@ class RecordPageRestDurationDialogTitle extends StatelessWidget { @override Widget build(BuildContext context) { - return Text("$_numberから休薬しますか？", + return Text("$_numberから服用をお休みしますか？", style: const TextStyle( color: TextColor.main, fontSize: 16, diff --git a/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart index cdb5bbedae..280da0f92b 100644 --- a/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart @@ -31,7 +31,7 @@ class BeginManualRestDurationButton extends HookConsumerWidget { return SizedBox( width: 80, child: SmallAppOutlinedButton( - text: "休薬する", + text: "服用お休み", onPressed: () async { analytics.logEvent(name: "begin_manual_rest_duration_pressed", parameters: {"pill_sheet_id": activedPillSheet.id}); diff --git a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart index e4302ed48d..5c217f72a1 100644 --- a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart +++ b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart @@ -22,7 +22,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ const Text( - "今日飲むピルが服用済みの場合\n休薬できません", + "今日飲むピルが服用済みの場合\n服用をお休みできません", style: TextStyle( fontFamily: FontFamily.japanese, fontWeight: FontWeight.w600, @@ -51,7 +51,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { ), ), TextSpan( - text: "休薬してください。今日以外の日から休薬したい場合は下記を参考にしてください。", + text: "お休みしてください。今日以外の日から服用お休みしたい場合は下記を参考にしてください。", style: TextStyle( fontFamily: FontFamily.japanese, fontWeight: FontWeight.w300, @@ -70,7 +70,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { analytics.logEvent(name: "invalid_already_taken_pill_faq"); launchUrl(Uri.parse("https://pilll.wraptas.site/467128e667ae4d6cbff4d61ee370cce5")); }, - text: "休薬機能の使い方を見る", + text: "服用お休みの使い方を見る", ), Center( child: AlertButton( From bf26f4dfc71babfbc41077218c57aeb5e28d7e45 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:24:22 +0900 Subject: [PATCH 02/16] replace image --- images/explain_rest_duration.svg | 61 ------------------------- images/explain_rest_duration_date.svg | 61 +++++++++++++++++++++++++ images/explain_rest_duration_number.svg | 61 +++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 61 deletions(-) delete mode 100644 images/explain_rest_duration.svg create mode 100644 images/explain_rest_duration_date.svg create mode 100644 images/explain_rest_duration_number.svg diff --git a/images/explain_rest_duration.svg b/images/explain_rest_duration.svg deleted file mode 100644 index 75fc242471..0000000000 --- a/images/explain_rest_duration.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/explain_rest_duration_date.svg b/images/explain_rest_duration_date.svg new file mode 100644 index 0000000000..edc31f0345 --- /dev/null +++ b/images/explain_rest_duration_date.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/explain_rest_duration_number.svg b/images/explain_rest_duration_number.svg new file mode 100644 index 0000000000..e0d6c99bed --- /dev/null +++ b/images/explain_rest_duration_number.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9b2a8dada615bd11b9e2453df82551e35c8f28b3 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:26:12 +0900 Subject: [PATCH 03/16] Fix image --- .../components/record_page_rest_duration_dialog.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart index 018d0e9df4..6c8c6ff5f0 100644 --- a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart +++ b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart @@ -10,11 +10,13 @@ import 'package:pilll/utils/formatter/date_time_formatter.dart'; class RecordPageRestDurationDialog extends StatelessWidget { final RecordPageRestDurationDialogTitle title; + final PillSheetAppearanceMode appearanceMode; final VoidCallback onDone; const RecordPageRestDurationDialog({ Key? key, required this.title, + required this.appearanceMode, required this.onDone, }) : super(key: key); @@ -37,7 +39,8 @@ class RecordPageRestDurationDialog extends StatelessWidget { color: TextColor.main, )), const SizedBox(height: 24), - SvgPicture.asset("images/explain_rest_duration.svg"), + SvgPicture.asset( + appearanceMode == PillSheetAppearanceMode.date ? "images/explain_rest_duration_date.svg" : "images/explain_rest_duration_number.svg"), const SizedBox(height: 24), const Text( "※休薬開始日を変えたい場合", @@ -92,6 +95,7 @@ showRecordPageRestDurationDialog( context: context, builder: (context) => RecordPageRestDurationDialog( title: RecordPageRestDurationDialogTitle(appearanceMode: appearanceMode, activedPillSheet: activedPillSheet, pillSheetGroup: pillSheetGroup), + appearanceMode: appearanceMode, onDone: onDone, ), ); From aa6d37058843cdb40d6ee3d8833c9f854f521095 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:37:14 +0900 Subject: [PATCH 04/16] fix --- ..._modified_history_ended_rest_duration.dart | 6 ++--- .../button/rest_duration_button.dart | 2 +- .../record_page_rest_duration_dialog.dart | 26 ++----------------- .../end_manual_rest_duration_button.dart | 2 +- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_ended_rest_duration.dart b/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_ended_rest_duration.dart index fc18782406..9eed8ddc0e 100644 --- a/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_ended_rest_duration.dart +++ b/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_ended_rest_duration.dart @@ -24,11 +24,9 @@ class PillSheetModifiedHistoryEndedRestDuration extends StatelessWidget { } return RowLayout( day: Day(estimatedEventCausingDate: estimatedEventCausingDate), - effectiveNumbersOrHyphen: EffectivePillNumber( - effectivePillNumber: - PillSheetModifiedHistoryDateEffectivePillNumber.hyphen()), + effectiveNumbersOrHyphen: EffectivePillNumber(effectivePillNumber: PillSheetModifiedHistoryDateEffectivePillNumber.hyphen()), detail: const Text( - "休薬終了", + "服用再開", style: TextStyle( color: TextColor.main, fontSize: 12, diff --git a/lib/features/record/components/button/rest_duration_button.dart b/lib/features/record/components/button/rest_duration_button.dart index 6b6786d1b3..4b58645fd0 100644 --- a/lib/features/record/components/button/rest_duration_button.dart +++ b/lib/features/record/components/button/rest_duration_button.dart @@ -15,7 +15,7 @@ class RestDurationButton extends StatelessWidget { style: TextButton.styleFrom(backgroundColor: PilllColors.disable), onPressed: null, child: const Text( - "休薬中", + "服用お休み中", style: TextStyle( color: TextColor.lightGray, fontFamily: FontFamily.japanese, diff --git a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart index 6c8c6ff5f0..e9c87163b4 100644 --- a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart +++ b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart @@ -34,7 +34,7 @@ class RecordPageRestDurationDialog extends StatelessWidget { const Text("服用をお休みするとピル番号は進みません", style: TextStyle( fontFamily: FontFamily.japanese, - fontWeight: FontWeight.w300, + fontWeight: FontWeight.w500, fontSize: 14, color: TextColor.main, )), @@ -42,28 +42,6 @@ class RecordPageRestDurationDialog extends StatelessWidget { SvgPicture.asset( appearanceMode == PillSheetAppearanceMode.date ? "images/explain_rest_duration_date.svg" : "images/explain_rest_duration_number.svg"), const SizedBox(height: 24), - const Text( - "※休薬開始日を変えたい場合", - style: TextStyle( - color: TextColor.main, - fontSize: 14, - fontFamily: FontFamily.japanese, - fontWeight: FontWeight.w700, - ), - textAlign: TextAlign.left, - ), - const SizedBox(height: 8), - const Text( - "希望日まで未服用にする必要があります。服用済みのピルマークをタップすることで未服用にできます", - style: TextStyle( - color: TextColor.main, - fontFamily: FontFamily.japanese, - fontSize: 14, - fontWeight: FontWeight.w400, - ), - textAlign: TextAlign.left, - ), - const SizedBox(height: 24), ], ), actions: [ @@ -119,7 +97,7 @@ class RecordPageRestDurationDialogTitle extends StatelessWidget { style: const TextStyle( color: TextColor.main, fontSize: 16, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, fontFamily: FontFamily.japanese, )); } diff --git a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart index 6da2368dd1..f6f97359fc 100644 --- a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart @@ -31,7 +31,7 @@ class EndManualRestDurationButton extends HookConsumerWidget { return SizedBox( width: 80, child: SmallAppOutlinedButton( - text: "休薬終了", + text: "服用再開", onPressed: () async { analytics.logEvent( name: "end_manual_rest_duration_pressed", From 325bc4dbbf933c1dd1395c52c9fc4530683e29b7 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:37:38 +0900 Subject: [PATCH 05/16] Fix --- .../pill_sheet_modified_history_began_rest_duration.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart b/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart index 70496e56fc..db8b4c3867 100644 --- a/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart +++ b/lib/features/calendar/components/pill_sheet_modified_history/components/rows/pill_sheet_modified_history_began_rest_duration.dart @@ -24,11 +24,9 @@ class PillSheetModifiedHistoryBeganRestDuration extends StatelessWidget { } return RowLayout( day: Day(estimatedEventCausingDate: estimatedEventCausingDate), - effectiveNumbersOrHyphen: EffectivePillNumber( - effectivePillNumber: - PillSheetModifiedHistoryDateEffectivePillNumber.hyphen()), + effectiveNumbersOrHyphen: EffectivePillNumber(effectivePillNumber: PillSheetModifiedHistoryDateEffectivePillNumber.hyphen()), detail: const Text( - "休薬開始", + "服用お休み", style: TextStyle( color: TextColor.main, fontSize: 12, From 75faeb1842d956e14a2e6666b5df53411b683007 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:39:55 +0900 Subject: [PATCH 06/16] fix wording --- .../supports/record_page_pill_sheet_support_actions.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart b/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart index 08f2f8006a..3478a9330b 100644 --- a/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart +++ b/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart @@ -59,7 +59,7 @@ class RecordPagePillSheetSupportActions extends StatelessWidget { duration: Duration( seconds: 2, ), - content: Text("休薬期間が終了しました"), + content: Text("服用お休みが終了しました"), ), ); } @@ -76,7 +76,7 @@ class RecordPagePillSheetSupportActions extends StatelessWidget { duration: Duration( seconds: 2, ), - content: Text("休薬期間が始まりました"), + content: Text("服用お休みを開始しました"), ), ); Navigator.of(context).pop(); From cfc1efd01384cb26dd4cc4360fa21381cb3c3478 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:41:00 +0900 Subject: [PATCH 07/16] Fix buton layout --- .../begin_manual_rest_duration_button.dart | 53 +++++++++---------- .../end_manual_rest_duration_button.dart | 29 +++++----- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart index 280da0f92b..abc765409f 100644 --- a/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/begin_manual_rest_duration_button.dart @@ -28,35 +28,32 @@ class BeginManualRestDurationButton extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final beginRestDuration = ref.watch(beginRestDurationProvider); - return SizedBox( - width: 80, - child: SmallAppOutlinedButton( - text: "服用お休み", - onPressed: () async { - analytics.logEvent(name: "begin_manual_rest_duration_pressed", parameters: {"pill_sheet_id": activedPillSheet.id}); + return SmallAppOutlinedButton( + text: "服用お休み", + onPressed: () async { + analytics.logEvent(name: "begin_manual_rest_duration_pressed", parameters: {"pill_sheet_id": activedPillSheet.id}); - if (activedPillSheet.todayPillIsAlreadyTaken) { - showInvalidAlreadyTakenPillDialog(context); - } else { - showRecordPageRestDurationDialog( - context, - appearanceMode: appearanceMode, - pillSheetGroup: pillSheetGroup, - activedPillSheet: activedPillSheet, - onDone: () async { - analytics.logEvent(name: "done_rest_duration"); - // NOTE: batch.commit でリモートのDBに書き込む時間がかかるので事前にバッジを0にする - FlutterAppBadger.removeBadge(); - await beginRestDuration( - activePillSheet: activedPillSheet, - pillSheetGroup: pillSheetGroup, - ); - didBeginRestDuration(); - }, - ); - } - }, - ), + if (activedPillSheet.todayPillIsAlreadyTaken) { + showInvalidAlreadyTakenPillDialog(context); + } else { + showRecordPageRestDurationDialog( + context, + appearanceMode: appearanceMode, + pillSheetGroup: pillSheetGroup, + activedPillSheet: activedPillSheet, + onDone: () async { + analytics.logEvent(name: "done_rest_duration"); + // NOTE: batch.commit でリモートのDBに書き込む時間がかかるので事前にバッジを0にする + FlutterAppBadger.removeBadge(); + await beginRestDuration( + activePillSheet: activedPillSheet, + pillSheetGroup: pillSheetGroup, + ); + didBeginRestDuration(); + }, + ); + } + }, ); } } diff --git a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart index f6f97359fc..7b9b2955b4 100644 --- a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart @@ -28,24 +28,21 @@ class EndManualRestDurationButton extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final endRestDuration = ref.watch(endRestDurationProvider); - return SizedBox( - width: 80, - child: SmallAppOutlinedButton( - text: "服用再開", - onPressed: () async { - analytics.logEvent( - name: "end_manual_rest_duration_pressed", - ); + return SmallAppOutlinedButton( + text: "服用再開", + onPressed: () async { + analytics.logEvent( + name: "end_manual_rest_duration_pressed", + ); - await endRestDuration( - restDuration: restDuration, - activePillSheet: activedPillSheet, - pillSheetGroup: pillSheetGroup, - ); + await endRestDuration( + restDuration: restDuration, + activePillSheet: activedPillSheet, + pillSheetGroup: pillSheetGroup, + ); - didEndRestDuration(); - }, - ), + didEndRestDuration(); + }, ); } } From 050a7cb1437de391bc14417c94ffbc427ac8ca68 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:45:12 +0900 Subject: [PATCH 08/16] Fix wording --- .../components/record_page_rest_duration_dialog.dart | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart index e9c87163b4..2ab0d73e8f 100644 --- a/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart +++ b/lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart @@ -39,6 +39,16 @@ class RecordPageRestDurationDialog extends StatelessWidget { color: TextColor.main, )), const SizedBox(height: 24), + Text( + appearanceMode == PillSheetAppearanceMode.date ? "例えば「1/12から3日間」服用お休みした場合" : "例えば「18番から3日間」服用お休みした場合", + style: const TextStyle( + color: TextColor.main, + fontWeight: FontWeight.w700, + fontFamily: FontFamily.japanese, + fontSize: 12, + ), + ), + const SizedBox(height: 8), SvgPicture.asset( appearanceMode == PillSheetAppearanceMode.date ? "images/explain_rest_duration_date.svg" : "images/explain_rest_duration_number.svg"), const SizedBox(height: 24), @@ -47,7 +57,7 @@ class RecordPageRestDurationDialog extends StatelessWidget { actions: [ AppOutlinedButton( onPressed: () async => onDone(), - text: "服用お休みする", + text: "服用をお休みする", ), Center( child: AlertButton( From d0af80d156f00d7e56932ae3e60cb5c2167737a4 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:45:46 +0900 Subject: [PATCH 09/16] Fix wording --- .../rest_duration/end_manual_rest_duration_button.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart index 7b9b2955b4..ec221a53c8 100644 --- a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart @@ -77,7 +77,7 @@ class EndRestDurationModal extends HookConsumerWidget { borderRadius: BorderRadius.circular(50), ), child: const Text( - "休薬期間終了", + "服用お休み期間終了", textAlign: TextAlign.center, style: TextStyle( color: TextColor.white, From 6ccc41120f98f53a15d6952455df6adf61ced7ee Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:50:47 +0900 Subject: [PATCH 10/16] Fix wording --- .../rest_duration/end_manual_rest_duration_button.dart | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart index ec221a53c8..bc4f57e8c9 100644 --- a/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart +++ b/lib/features/record/components/supports/components/rest_duration/end_manual_rest_duration_button.dart @@ -111,6 +111,15 @@ class EndRestDurationModal extends HookConsumerWidget { fontWeight: FontWeight.w400, ), ), + const Text( + "お休みした分だけシート上の曜日もずれます", + style: TextStyle( + color: TextColor.main, + fontSize: 14, + fontFamily: FontFamily.japanese, + fontWeight: FontWeight.w400, + ), + ), ], ), const SizedBox(height: 24), From 98b511ca782ab0354dd471316badc6839bbbd367 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:51:22 +0900 Subject: [PATCH 11/16] fix wording --- .../supports/record_page_pill_sheet_support_actions.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart b/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart index 3478a9330b..a910bb0b0e 100644 --- a/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart +++ b/lib/features/record/components/supports/record_page_pill_sheet_support_actions.dart @@ -59,7 +59,7 @@ class RecordPagePillSheetSupportActions extends StatelessWidget { duration: Duration( seconds: 2, ), - content: Text("服用お休みが終了しました"), + content: Text("服用のお休み期間が終了しました"), ), ); } From c568130f70ed5c6fccf12545893074e01ff73da1 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:53:15 +0900 Subject: [PATCH 12/16] Fix wording --- .../components/announcement_bar/components/rest_duration.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/announcement_bar/components/rest_duration.dart b/lib/features/record/components/announcement_bar/components/rest_duration.dart index 8c8f4e9d6d..939a43008a 100644 --- a/lib/features/record/components/announcement_bar/components/rest_duration.dart +++ b/lib/features/record/components/announcement_bar/components/rest_duration.dart @@ -42,7 +42,7 @@ class RestDurationAnnouncementBar extends StatelessWidget { final restDuration = activedPillSheet.activeRestDuration; if (restDuration != null) { final day = daysBetween(restDuration.beginDate.date(), today()) + 1; - return "休薬$day日目"; + return "🌙 服用お休み $day日目"; } if (activedPillSheet.typeInfo.dosingPeriod < activedPillSheet.todayPillNumber) { From 818e90653996848e527785d3e11d60c099676124 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:55:00 +0900 Subject: [PATCH 13/16] fix wording --- .../rest_duration/invalid_already_taken_pill_dialog.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart index 5c217f72a1..2e14915c29 100644 --- a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart +++ b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart @@ -70,7 +70,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { analytics.logEvent(name: "invalid_already_taken_pill_faq"); launchUrl(Uri.parse("https://pilll.wraptas.site/467128e667ae4d6cbff4d61ee370cce5")); }, - text: "服用お休みの使い方を見る", + text: "服用お休み機能の使い方を見る", ), Center( child: AlertButton( From 5725a414d888bec1bdcfb713df40a9e12c758db4 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:55:35 +0900 Subject: [PATCH 14/16] fix wording --- .../rest_duration/invalid_already_taken_pill_dialog.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart index 2e14915c29..265142c42a 100644 --- a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart +++ b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart @@ -22,7 +22,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ const Text( - "今日飲むピルが服用済みの場合\n服用をお休みできません", + "今日飲むピルが服用済みの場合\n「服用お休み」できません", style: TextStyle( fontFamily: FontFamily.japanese, fontWeight: FontWeight.w600, From 8f5681377a58f61290e23376311544d41f8e0398 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:55:45 +0900 Subject: [PATCH 15/16] fix style --- .../rest_duration/invalid_already_taken_pill_dialog.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart index 265142c42a..c1e3611d3f 100644 --- a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart +++ b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart @@ -25,7 +25,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { "今日飲むピルが服用済みの場合\n「服用お休み」できません", style: TextStyle( fontFamily: FontFamily.japanese, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, fontSize: 16, color: TextColor.main, ), From 9abbf2fd5c855c2aa761a7d80302674e1d86a894 Mon Sep 17 00:00:00 2001 From: bannzai Date: Sat, 18 Mar 2023 21:55:56 +0900 Subject: [PATCH 16/16] fix style --- .../rest_duration/invalid_already_taken_pill_dialog.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart index c1e3611d3f..8b2c46c831 100644 --- a/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart +++ b/lib/features/record/components/supports/components/rest_duration/invalid_already_taken_pill_dialog.dart @@ -45,7 +45,7 @@ class InvalidAlreadyTakenPillDialog extends StatelessWidget { text: "今日飲むピルを未服用にしてから", style: TextStyle( fontFamily: FontFamily.japanese, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w700, fontSize: 14, color: TextColor.main, ),