Merge pull request #388 from bannzai/bugfix/ui/appearance_taken_button

Bugfix appearance record buttons
bannzai · Oct 3, 2021 · b3cc295 · b3cc295
2 parents 6438566 + 8f0f361
commit b3cc295
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/lib/domain/record/components/header/record_page_header.dart b/lib/domain/record/components/header/record_page_header.dart
@@ -58,7 +58,7 @@ class RecordPageInformationHeader extends StatelessWidget {
                         name: "tapped_record_information_header");
                     if (activedPillSheet != null &&
                         pillSheetGroup != null &&
-                        !pillSheetGroup.isDeleted) {
+                        !pillSheetGroup.isDeactived) {
                       Navigator.of(context).push(
                         SettingTodayPillNumberPageRoute.route(
                           pillSheetGroup: pillSheetGroup,

diff --git a/lib/domain/record/components/header/today_taken_pill_number.dart b/lib/domain/record/components/header/today_taken_pill_number.dart
@@ -44,8 +44,7 @@ class TodayTakenPillNumber extends StatelessWidget {
     final activedPillSheet = this.pillSheetGroup?.activedPillSheet;
     if (pillSheetGroup == null ||
         activedPillSheet == null ||
-        pillSheetGroup.isDeactived ||
-        pillSheetGroup.isDeleted) {
+        pillSheetGroup.isDeactived) {
       return Padding(
           padding: EdgeInsets.only(top: 8),
           child: Text("-",

diff --git a/lib/domain/record/record_page.dart b/lib/domain/record/record_page.dart
@@ -74,7 +74,7 @@ class RecordPage extends HookWidget {
                 ),
               ),
             ),
-            if (currentPillSheet != null)
+            if (currentPillSheet != null && !state.isDeactived)
               Positioned(
                 bottom: 20,
                 child: RecordPageButton(currentPillSheet: currentPillSheet),
@@ -91,13 +91,13 @@ class RecordPage extends HookWidget {
     RecordPageState state,
     RecordPageStore store,
   ) {
-    if (state.pillSheetGroupIsHidden)
+    if (state.isDeactived)
       return RecordPageAddingPillSheet(
         context: context,
         store: store,
         setting: settingEntity,
       );
-    if (!state.pillSheetGroupIsHidden)
+    if (!state.isDeactived)
       return RecordPagePillSheetList(
         state: state,
         store: store,

diff --git a/lib/domain/record/record_page_state.dart b/lib/domain/record/record_page_state.dart
@@ -30,11 +30,9 @@ abstract class RecordPageState implements _$RecordPageState {
     return pillSheetGroup?.activedPillSheet?.groupIndex ?? 0;
   }
 
-  bool get pillSheetGroupIsHidden {
+  bool get isDeactived {
     final pillSheetGroup = this.pillSheetGroup;
-    return pillSheetGroup == null ||
-        pillSheetGroup.isDeactived ||
-        pillSheetGroup.isDeleted;
+    return pillSheetGroup == null || pillSheetGroup.isDeactived;
   }
 
   bool get shouldShowTrial {

diff --git a/lib/domain/settings/setting_page.dart b/lib/domain/settings/setting_page.dart
@@ -109,7 +109,7 @@ class SettingPage extends HookWidget {
                       _separator(),
                       if (activedPillSheet != null &&
                           pillSheetGroup != null &&
-                          !pillSheetGroup.isDeleted) ...[
+                          !pillSheetGroup.isDeactived) ...[
                         TodayPllNumberRow(
                           setting: setting,
                           pillSheetGroup: pillSheetGroup,

diff --git a/lib/entity/pill_sheet_group.dart b/lib/entity/pill_sheet_group.dart
@@ -124,6 +124,6 @@ abstract class PillSheetGroup implements _$PillSheetGroup {
     return passedPillCount + latestTakenPillSheet.lastTakenPillNumber;
   }
 
-  bool get isDeactived => activedPillSheet == null;
-  bool get isDeleted => deletedAt != null;
+  bool get _isDeleted => deletedAt != null;
+  bool get isDeactived => activedPillSheet == null || _isDeleted;
 }