remove/kind/pill sheet appearance old sequential

lib/components/organisms/pill_sheet/setting_pill_sheet_view.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/utils/analytics.dart';
 import 'package:pilll/components/atoms/color.dart';
 import 'package:pilll/components/organisms/pill_mark/pill_mark.dart';
@@ -7,7 +8,6 @@ import 'package:pilll/components/organisms/pill_mark/pill_mark_with_number_layou
 import 'package:pilll/components/organisms/pill_sheet/pill_sheet_view_layout.dart';
 import 'package:pilll/entity/pill_mark_type.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/entity/weekday.dart';
 
 class SettingPillSheetView extends StatelessWidget {

lib/components/template/setting_menstruation/setting_menstruation_pill_sheet_list.dart

@@ -4,8 +4,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:pilll/components/molecules/dots_page_indicator.dart';
 import 'package:pilll/components/organisms/pill_sheet/pill_sheet_view_layout.dart';
 import 'package:pilll/components/organisms/pill_sheet/setting_pill_sheet_view.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 
 class SettingMenstruationPillSheetList extends HookConsumerWidget {
   final List<PillSheetType> pillSheetTypes;

lib/entity/pill_sheet_group.codegen.dart

@@ -77,7 +77,7 @@ class PillSheetGroup with _$PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return 0;
       case PillSheetAppearanceMode.sequential:
-        return pillNumbersForSequential.firstWhereOrNull((element) => isSameDay(element.date, today()))?.number ?? 0;
+        return pillNumbersForCyclicSequential.firstWhereOrNull((element) => isSameDay(element.date, today()))?.number ?? 0;
       case PillSheetAppearanceMode.cyclicSequential:
         return pillNumbersForCyclicSequential.firstWhereOrNull((element) => isSameDay(element.date, today()))?.number ?? 0;
     }
@@ -94,7 +94,7 @@ class PillSheetGroup with _$PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return 0;
       case PillSheetAppearanceMode.sequential:
-        return pillNumbersForSequential.firstWhereOrNull((element) => isSameDay(element.date, activePillSheetLastTakenDate))?.number ?? 0;
+        return pillNumbersForCyclicSequential.firstWhereOrNull((element) => isSameDay(element.date, activePillSheetLastTakenDate))?.number ?? 0;
       case PillSheetAppearanceMode.cyclicSequential:
         return pillNumbersForCyclicSequential.firstWhereOrNull((element) => isSameDay(element.date, activePillSheetLastTakenDate))?.number ?? 0;
     }
@@ -106,7 +106,7 @@ class PillSheetGroup with _$PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return 0;
       case PillSheetAppearanceMode.sequential:
-        return pillNumbersForSequential.last.number;
+        return pillNumbersForCyclicSequential.last.number;
       case PillSheetAppearanceMode.cyclicSequential:
         return pillNumbersForCyclicSequential.last.number;
     }
@@ -132,7 +132,6 @@ class PillSheetGroup with _$PillSheetGroup {
           case PillSheetAppearanceMode.date:
             return _pillNumberInPillSheet(pillNumberInPillSheet: lastTakenPillNumber);
           case PillSheetAppearanceMode.sequential:
-            return _sequentialPillSheetNumber(pageIndex: pillSheet.groupIndex, pillNumberInPillSheet: lastTakenPillNumber);
           case PillSheetAppearanceMode.cyclicSequential:
             return _cycleSequentialPillSheetNumber(pageIndex: pillSheet.groupIndex, pillNumberInPillSheet: lastTakenPillNumber);
         }
@@ -151,7 +150,6 @@ class PillSheetGroup with _$PillSheetGroup {
   }
 
   late final List<PillSheetGroupPillNumberDomainPillMarkValue> pillNumbersInPillSheet = _pillNumbersInPillSheet();
-  late final List<PillSheetGroupPillNumberDomainPillMarkValue> pillNumbersForSequential = _pillNumbersForSequential();
   late final List<PillSheetGroupPillNumberDomainPillMarkValue> pillNumbersForCyclicSequential = _pillNumbersForCyclicSequential();
 }
 
@@ -174,7 +172,6 @@ extension PillSheetGroupDisplayDomain on PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return _pillNumberInPillSheet(pillNumberInPillSheet: pillNumberInPillSheet);
       case PillSheetAppearanceMode.sequential:
-        return _sequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet);
       case PillSheetAppearanceMode.cyclicSequential:
         return _cycleSequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet);
     }
@@ -191,7 +188,6 @@ extension PillSheetGroupDisplayDomain on PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return pillNumbersInPillSheet.firstWhere((e) => isSameDay(e.date, date)).number;
       case PillSheetAppearanceMode.sequential:
-        return pillNumbersForSequential.firstWhere((e) => isSameDay(e.date, date)).number;
       case PillSheetAppearanceMode.cyclicSequential:
         return pillNumbersForCyclicSequential.firstWhere((e) => isSameDay(e.date, date)).number;
     }
@@ -219,7 +215,7 @@ extension PillSheetGroupDisplayDomain on PillSheetGroup {
       PillSheetAppearanceMode.date => premiumOrTrial
           ? _displayPillSheetDate(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet)
           : _pillNumberInPillSheet(pillNumberInPillSheet: pillNumberInPillSheet),
-      PillSheetAppearanceMode.sequential => _sequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet),
+      PillSheetAppearanceMode.sequential => _cycleSequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet),
       PillSheetAppearanceMode.cyclicSequential => _cycleSequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet),
     };
     return pillNumber.toString();
@@ -246,21 +242,6 @@ extension PillSheetGroupDisplayDomain on PillSheetGroup {
     return DateTimeFormatter.monthAndDay(pillSheets[pageIndex].displayPillTakeDate(pillNumberInPillSheet));
   }
 
-  @visibleForTesting
-  int sequentialPillSheetNumber({
-    required int pageIndex,
-    required int pillNumberInPillSheet,
-  }) {
-    return _sequentialPillSheetNumber(pageIndex: pageIndex, pillNumberInPillSheet: pillNumberInPillSheet);
-  }
-
-  int _sequentialPillSheetNumber({
-    required int pageIndex,
-    required int pillNumberInPillSheet,
-  }) {
-    return pillNumbersForSequential.where((e) => e.pillSheet.groupIndex == pageIndex).toList()[pillNumberInPillSheet - 1].number;
-  }
-
   @visibleForTesting
   int cycleSequentialPillSheetNumber({
     required int pageIndex,
@@ -301,7 +282,6 @@ extension PillSheetGroupPillNumberDomain on PillSheetGroup {
       case PillSheetAppearanceMode.date:
         return pillNumbersInPillSheet;
       case PillSheetAppearanceMode.sequential:
-        return pillNumbersForSequential;
       case PillSheetAppearanceMode.cyclicSequential:
         return pillNumbersForCyclicSequential;
     }
@@ -532,3 +512,29 @@ class PillSheetGroupDisplayNumberSetting with _$PillSheetGroupDisplayNumberSetti
 
   factory PillSheetGroupDisplayNumberSetting.fromJson(Map<String, dynamic> json) => _$PillSheetGroupDisplayNumberSettingFromJson(json);
 }
+
+@JsonEnum(valueField: 'value')
+enum PillSheetAppearanceMode {
+  @JsonValue('number')
+  number,
+  @JsonValue('date')
+  date,
+  // 古い値。cyclicSequentialに変更した。一時的に両立されていた
+  @JsonValue('sequential')
+  sequential,
+  @JsonValue('cyclicSequential')
+  cyclicSequential,
+}
+
+extension PillSheetAppearanceModeExt on PillSheetAppearanceMode {
+  bool get isSequential {
+    switch (this) {
+      case PillSheetAppearanceMode.number:
+      case PillSheetAppearanceMode.date:
+        return false;
+      case PillSheetAppearanceMode.sequential:
+      case PillSheetAppearanceMode.cyclicSequential:
+        return true;
+    }
+  }
+}

lib/entity/setting.codegen.dart

@@ -1,3 +1,4 @@
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -26,30 +27,6 @@ class ReminderTime with _$ReminderTime {
   static const int minimumCount = 1;
 }
 
-enum PillSheetAppearanceMode {
-  @JsonValue('number')
-  number,
-  @JsonValue('date')
-  date,
-  @JsonValue('sequential')
-  sequential,
-  @JsonValue('cyclicSequential')
-  cyclicSequential,
-}
-
-extension PillSheetAppearanceModeExt on PillSheetAppearanceMode {
-  bool get isSequential {
-    switch (this) {
-      case PillSheetAppearanceMode.number:
-      case PillSheetAppearanceMode.date:
-        return false;
-      case PillSheetAppearanceMode.sequential:
-      case PillSheetAppearanceMode.cyclicSequential:
-        return true;
-    }
-  }
-}
-
 class SettingFirestoreFieldKeys {
   static const pillSheetAppearanceMode = 'pillSheetAppearanceMode';
   static const timezoneDatabaseName = 'timezoneDatabaseName';

lib/features/initial_setting/initial_setting_state.codegen.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:flutter_native_timezone/flutter_native_timezone.dart';
 import 'package:pilll/entity/firestore_id_generator.dart';
 import 'package:pilll/entity/link_account_type.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/utils/datetime/date_add.dart';
 import 'package:pilll/utils/datetime/day.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

lib/features/initial_setting/today_pill_number/select_today_pill_number_pill_sheet_list.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/utils/analytics.dart';
 import 'package:pilll/components/molecules/dots_page_indicator.dart';
 import 'package:pilll/components/organisms/pill_sheet/pill_sheet_view_layout.dart';
 import 'package:pilll/components/organisms/pill_sheet/setting_pill_sheet_view.dart';
 import 'package:pilll/features/initial_setting/initial_setting_state.codegen.dart';
 import 'package:pilll/features/initial_setting/initial_setting_state_notifier.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 
 class SelectTodayPillNumberPillSheetList extends HookConsumerWidget {
   final InitialSettingState state;

lib/features/record/components/add_pill_sheet_group/display_number_setting.dart

@@ -8,7 +8,6 @@ import 'package:pilll/components/atoms/color.dart';
 import 'package:pilll/components/atoms/font.dart';
 import 'package:pilll/components/atoms/text_color.dart';
 import 'package:pilll/entity/pill_sheet_group.codegen.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/utils/formatter/text_input_formatter.dart';
 
 class DisplayNumberSetting extends HookConsumerWidget {

lib/features/record/components/header/today_taken_pill_number.dart

@@ -6,7 +6,6 @@ import 'package:pilll/components/atoms/text_color.dart';
 import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
 import 'package:flutter/material.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 
 class TodayTakenPillNumber extends StatelessWidget {
   final PillSheetGroup? pillSheetGroup;

lib/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart

@@ -4,7 +4,6 @@ import 'package:pilll/components/atoms/button.dart';
 import 'package:pilll/components/atoms/font.dart';
 import 'package:pilll/components/atoms/text_color.dart';
 import 'package:pilll/entity/pill_sheet_group.codegen.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/features/localizations/l.dart';
 import 'package:pilll/utils/formatter/date_time_formatter.dart';
 
@@ -121,7 +120,6 @@ class RecordPageRestDurationDialogTitle extends StatelessWidget {
         final dateString = DateTimeFormatter.monthAndDay(date);
         return dateString;
       case PillSheetAppearanceMode.sequential:
-        return L.withNumber((pillSheetGroup.sequentialLastTakenPillNumber + 1).toString());
       case PillSheetAppearanceMode.cyclicSequential:
         return L.withNumber((pillSheetGroup.sequentialLastTakenPillNumber + 1).toString());
     }

lib/features/record/components/setting/components/appearance_mode/select_appearance_mode_modal.dart

@@ -74,18 +74,6 @@ class SelectAppearanceModeModal extends HookConsumerWidget {
                   text: L.pillNumber,
                   isPremiumFunction: false,
                 ),
-                _row(
-                  context,
-                  setting: setting,
-                  pillSheetGroup: pillSheetGroup,
-                  setSetting: setSetting,
-                  setPillSheetGroup: setPillSheetGroup,
-                  registerReminderLocalNotification: registerReminderLocalNotification,
-                  user: user,
-                  mode: PillSheetAppearanceMode.sequential,
-                  text: L.pillDays,
-                  isPremiumFunction: false,
-                ),
                 _row(
                   context,
                   setting: setting,

lib/features/record/components/setting/components/rest_duration/begin_manual_rest_duration.dart

@@ -3,7 +3,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:flutter/material.dart';
 import 'package:pilll/entity/pill_sheet.codegen.dart';
 import 'package:pilll/entity/pill_sheet_group.codegen.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/features/localizations/l.dart';
 import 'package:pilll/features/record/components/pill_sheet/components/record_page_rest_duration_dialog.dart';
 import 'package:pilll/features/record/components/setting/components/rest_duration/invalid_already_taken_pill_dialog.dart';

lib/features/release_note/release_note.dart

@@ -42,9 +42,12 @@ class ReleaseNote extends StatelessWidget {
                       alignment: Alignment.center,
                       child: Container(
                         padding: const EdgeInsets.only(top: 40, left: 40, right: 40),
-                        child: Text(
-                          L.addedDisplayModePillDaysCycle,
-                          style: const TextStyle(
+                        child: const Text(
+                          '',
+                          // (周期)を消すことになったので無効化。リリースノート自体も無効化する
+                          // "addedDisplayModePillDaysCycle": "表示モード服用日数(周期)が追加されました",
+                          // L.addedDisplayModePillDaysCycle,
+                          style: TextStyle(
                             fontFamily: FontFamily.japanese,
                             fontWeight: FontWeight.w600,
                             fontSize: 16,
@@ -102,15 +105,18 @@ void showReleaseNotePreDialog(BuildContext context) async {
   if (storage.getBool(key) ?? false) {
     return;
   }
+
   await storage.setBool(key, true);
+  // NOTE: (周期)のリリース後に、(周期)を消すことにした。リリースノートに現在記載されている。そのため一旦リリースノート自体を無効
+  return;
 
-  if (context.mounted) {
-    showDialog(
-        context: context,
-        builder: (context) {
-          return const ReleaseNote();
-        });
-  }
+  // if (context.mounted) {
+  //   showDialog(
+  //       context: context,
+  //       builder: (context) {
+  //         return const ReleaseNote();
+  //       });
+  // }
 }
 
 void openReleaseNote() async {

lib/features/settings/menstruation/setting_menstruation_page.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/features/localizations/l.dart';
 import 'package:pilll/utils/analytics.dart';
 import 'package:pilll/components/template/setting_menstruation/setting_menstruation_dynamic_description.dart';
 import 'package:pilll/components/template/setting_menstruation/setting_menstruation_page_template.dart';
 import 'package:pilll/components/template/setting_menstruation/setting_menstruation_pill_sheet_list.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/provider/setting.dart';
 
 class SettingMenstruationPage extends HookConsumerWidget {
@@ -21,7 +21,7 @@ class SettingMenstruationPage extends HookConsumerWidget {
       title: L.aboutMenstruation,
       pillSheetList: SettingMenstruationPillSheetList(
         pillSheetTypes: setting.pillSheetEnumTypes,
-        appearanceMode: PillSheetAppearanceMode.sequential,
+        appearanceMode: PillSheetAppearanceMode.cyclicSequential,
         selectedPillNumber: (pageIndex) {
           final passedTotalCount = summarizedPillCountWithPillSheetTypesToIndex(pillSheetTypes: setting.pillSheetEnumTypes, toIndex: pageIndex);
           if (passedTotalCount >= setting.pillNumberForFromMenstruation) {

lib/features/settings/today_pill_number/setting_today_pill_number_pill_sheet_list.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/utils/analytics.dart';
 import 'package:pilll/components/molecules/dots_page_indicator.dart';
 import 'package:pilll/components/organisms/pill_sheet/pill_sheet_view_layout.dart';
 import 'package:pilll/components/organisms/pill_sheet/setting_pill_sheet_view.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 
 class SettingTodayPillNumberPillSheetList extends HookConsumerWidget {
   final List<PillSheetType> pillSheetTypes;

lib/l10n/app_af.arb

@@ -1866,7 +1866,7 @@
   "@purchaseErrorPurchasePendingError": {
     "description": "課金の有効化が完了しておりません。しばらく時間をおいてからご確認ください"
   },
-  "launchError": "`'n` 'Ongesteldheid: 'n fout het voorgekom tydens opstart.",
+  "launchError": "`'n` '{ErrorMessagesConnection}: 'n fout het voorgekom tydens opstart.",
   "@launchError": {
     "description": "起動時にエラーが発生しました\n{ErrorMessagesConnection}\n詳細:",
     "placeholders": {

lib/l10n/app_ja.arb

@@ -641,13 +641,9 @@
   "@pillNumber": {
     "description": "ピル番号"
   },
-  "pillDays": "服用日数",
-  "@pillDays": {
-    "description": "服用日数"
-  },
-  "pillDaysCycle": "服用日数(周期)",
+  "pillDaysCycle": "服用日数",
   "@pillDaysCycle": {
-    "description": "服用日数(周期)"
+    "description": "服用日数"
   },
   "pillSheetEnded": "ピルシートが終了しました",
   "@pillSheetEnded": {
@@ -1015,10 +1011,6 @@
   "@viewPremiumFeatures": {
     "description": "プレミアム機能を見る"
   },
-  "addedDisplayModePillDaysCycle": "表示モード服用日数(周期)が追加されました",
-  "@addedDisplayModePillDaysCycle": {
-    "description": "表示モード服用日数(周期)が追加されました"
-  },
   "seeDetails": "詳細を見る",
   "@seeDetails": {
     "description": "詳細を見る"

test/components/organisms/pill_sheet/setting_pill_sheet_view_test.dart

@@ -1,7 +1,7 @@
 import 'package:pilll/components/organisms/pill_mark/pill_marks.dart';
 import 'package:pilll/components/organisms/pill_sheet/setting_pill_sheet_view.dart';
+import 'package:pilll/entity/pill_sheet_group.codegen.dart';
 import 'package:pilll/entity/pill_sheet_type.dart';
-import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/utils/environment.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';