Merge pull request #608 from bannzai/fix/view/weekline-spec-after-res…

…t-duration Fix calc weekday
bannzai · Jun 4, 2022 · 2fb7695 · 2fb7695
2 parents 6b90533 + c208472
commit 2fb7695
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/components/organisms/pill_sheet/pill_sheet_view_layout.dart b/lib/components/organisms/pill_sheet/pill_sheet_view_layout.dart
@@ -1,5 +1,4 @@
 import 'package:pilll/components/atoms/color.dart';
-import 'package:pilll/components/organisms/pill_sheet/pill_sheet_view_weekday_line.dart';
 import 'package:pilll/domain/record/weekday_badge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -33,7 +32,7 @@ class PillSheetViewLayout extends StatelessWidget {
     return copied.first;
   }
 
-  final PillSheetViewWeekdayLine? weekdayLines;
+  final Widget? weekdayLines;
   final List<Widget> pillMarkLines;
 
   const PillSheetViewLayout({

diff --git a/lib/domain/record/components/pill_sheet/record_page_pill_sheet.dart b/lib/domain/record/components/pill_sheet/record_page_pill_sheet.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:pilll/analytics.dart';
 import 'package:pilll/components/organisms/pill_mark/pill_mark.dart';
 import 'package:pilll/components/organisms/pill_mark/pill_mark_line.dart';
@@ -15,6 +16,7 @@ import 'package:pilll/entity/pill_sheet_type.dart';
 import 'package:pilll/entity/setting.codegen.dart';
 import 'package:pilll/entity/weekday.dart';
 import 'package:pilll/provider/premium_and_trial.codegen.dart';
+import 'package:pilll/util/datetime/day.dart';
 
 class RecordPagePillSheet extends StatelessWidget {
   final PillSheetGroup pillSheetGroup;
@@ -37,10 +39,14 @@ class RecordPagePillSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final weekdayDate = pillSheet.beginingDate.add(Duration(
+        days: summarizedRestDuration(
+            restDurations: pillSheet.restDurations, upperDate: today())));
+
     return PillSheetViewLayout(
       weekdayLines: PillSheetViewWeekdayLine(
-          firstWeekday:
-              WeekdayFunctions.weekdayFromDate(pillSheet.beginingDate)),
+        firstWeekday: WeekdayFunctions.weekdayFromDate(weekdayDate),
+      ),
       pillMarkLines: List.generate(
         pillSheet.pillSheetType.numberOfLineInPillSheet,
         (index) {