Everything is provider

lib/components/organisms/calendar/band/calendar_band.dart

@@ -1,51 +1,3 @@
-import 'package:flutter/material.dart';
-import 'package:pilll/components/atoms/font.dart';
-import 'package:pilll/components/atoms/text_color.dart';
-import 'package:pilll/components/molecules/diagonal_striped_line.dart';
-
-import 'calendar_band_model.dart';
-
 abstract class CalendarBandConst {
   static const double height = 13;
 }
-
-class CalendarBand extends StatelessWidget {
-  const CalendarBand({
-    Key? key,
-    required this.model,
-    required this.isLineBreaked,
-    required this.width,
-    this.onTap,
-  }) : super(key: key);
-
-  final CalendarBandModel model;
-  final bool isLineBreaked;
-  final double width;
-  final Function(CalendarBandModel)? onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    final onTap = this.onTap;
-    return GestureDetector(
-      onTap: () => onTap != null ? onTap(model) : null,
-      child: Container(
-        height: CalendarBandConst.height,
-        child: Stack(
-          children: [
-            CustomPaint(
-              painter: DiagonalStripedLine(
-                  color: model.color,
-                  isNecessaryBorder: model.isNecessaryBorder),
-              size: Size(width, CalendarBandConst.height),
-            ),
-            Container(
-              padding: const EdgeInsets.only(left: 10),
-              child: Text(isLineBreaked ? "" : model.label,
-                  style: FontType.sSmallTitle.merge(TextColorStyle.white)),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/components/organisms/calendar/utility.dart → lib/components/organisms/calendar/band/calendar_band_function.dart

@@ -8,6 +8,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/util/datetime/date_compare.dart';
+import 'package:pilll/util/datetime/day.dart';
 
 List<DateRange> scheduledOrInTheMiddleMenstruationDateRanges(
   PillSheetGroup pillSheetGroup,
@@ -148,3 +149,13 @@ List<CalendarBandModel> buildBandModels(
     ]
   ];
 }
+
+bool isNecessaryLineBreak(DateTime date, DateRange dateRange) {
+  return !dateRange.inRange(date.date());
+}
+
+int offsetForStartPositionAtLine(DateTime begin, DateRange dateRange) {
+  return isNecessaryLineBreak(begin, dateRange)
+      ? 0
+      : daysBetween(dateRange.begin.date(), begin.date());
+}

lib/components/organisms/calendar/band/calendar_band_model.dart

@@ -1,56 +1,28 @@
-import 'package:pilll/components/atoms/color.dart';
-import 'package:flutter/material.dart';
-import 'package:pilll/components/organisms/calendar/band/calendar_band.dart';
 import 'package:pilll/entity/menstruation.codegen.dart';
 
 abstract class CalendarBandModel {
-  Color get color;
-  String get label;
-  double get bottom;
-  bool get isNecessaryBorder;
-
   final DateTime begin;
   final DateTime end;
   CalendarBandModel(this.begin, this.end);
 }
 
 class CalendarScheduledMenstruationBandModel extends CalendarBandModel {
-  @override
-  Color get color => PilllColors.menstruation;
-  @override
-  String get label => "";
-  @override
-  double get bottom => 0;
-  @override
-  bool get isNecessaryBorder => true;
+  final DateTime begin;
+  final DateTime end;
 
-  CalendarScheduledMenstruationBandModel(DateTime begin, DateTime end)
+  CalendarScheduledMenstruationBandModel(this.begin, this.end)
       : super(begin, end);
 }
 
 class CalendarMenstruationBandModel extends CalendarBandModel {
-  @override
-  Color get color => PilllColors.menstruation.withAlpha(153);
-  @override
-  String get label => "";
-  @override
-  double get bottom => 0;
-  @override
-  bool get isNecessaryBorder => false;
   final Menstruation menstruation;
   CalendarMenstruationBandModel(this.menstruation)
       : super(menstruation.beginDate, menstruation.endDate);
 }
 
 class CalendarNextPillSheetBandModel extends CalendarBandModel {
-  @override
-  Color get color => PilllColors.duration;
-  @override
-  String get label => "新しいシート開始 ▶︎";
-  @override
-  double get bottom => CalendarBandConst.height;
-  @override
-  bool get isNecessaryBorder => false;
-  CalendarNextPillSheetBandModel(DateTime begin, DateTime end)
-      : super(begin, end);
+  final DateTime begin;
+  final DateTime end;
+
+  CalendarNextPillSheetBandModel(this.begin, this.end) : super(begin, end);
 }

lib/components/organisms/calendar/band/calendar_band_provider.dart

@@ -0,0 +1,74 @@
+import 'package:pilll/components/organisms/calendar/band/calendar_band_function.dart';
+import 'package:pilll/components/organisms/calendar/band/calendar_band_model.dart';
+import 'package:pilll/database/menstruation.dart';
+import 'package:pilll/database/pill_sheet_group.dart';
+import 'package:pilll/database/setting.dart';
+import 'package:riverpod/riverpod.dart';
+
+final calendarMenstruationBandListProvider =
+    Provider<AsyncValue<List<CalendarMenstruationBandModel>>>((ref) {
+  final allMenstruations = ref.watch(allMenstruationStreamProvider);
+
+  if (allMenstruations is AsyncLoading) {
+    return const AsyncValue.loading();
+  }
+
+  try {
+    return AsyncValue.data(
+      allMenstruations.value!
+          .map((menstruation) => CalendarMenstruationBandModel(menstruation))
+          .toList(),
+    );
+  } catch (error, stackTrace) {
+    return AsyncValue.error(error, stackTrace: stackTrace);
+  }
+});
+
+final calendarScheduledMenstruationBandListProvider =
+    Provider<AsyncValue<List<CalendarScheduledMenstruationBandModel>>>((ref) {
+  final allMenstruations = ref.watch(allMenstruationStreamProvider);
+  final pillSheetGroup = ref.watch(latestPillSheetGroupStreamProvider);
+  final setting = ref.watch(settingStreamProvider);
+
+  if (allMenstruations is AsyncLoading ||
+      pillSheetGroup is AsyncLoading ||
+      setting is AsyncLoading) {
+    return const AsyncValue.loading();
+  }
+
+  try {
+    return AsyncValue.data(
+      scheduledOrInTheMiddleMenstruationDateRanges(
+        pillSheetGroup.value!,
+        setting.value!,
+        allMenstruations.value!,
+        15,
+      )
+          .map((dateRange) => CalendarScheduledMenstruationBandModel(
+              dateRange.begin, dateRange.end))
+          .toList(),
+    );
+  } catch (error, stackTrace) {
+    return AsyncValue.error(error, stackTrace: stackTrace);
+  }
+});
+
+final calendarNextPillSheetBandListProvider =
+    Provider<AsyncValue<List<CalendarNextPillSheetBandModel>>>((ref) {
+  final pillSheetGroup = ref.watch(latestPillSheetGroupStreamProvider);
+
+  if (pillSheetGroup is AsyncLoading) {
+    return const AsyncValue.loading();
+  }
+
+  try {
+    return AsyncValue.data(
+      nextPillSheetDateRanges(pillSheetGroup.value!, 15)
+          .map((dateRange) =>
+              CalendarNextPillSheetBandModel(dateRange.begin, dateRange.end))
+          .toList(),
+    );
+  } catch (error, stackTrace) {
+    return AsyncValue.error(error, stackTrace: stackTrace);
+  }
+});

lib/components/organisms/calendar/band/calendar_menstruation_band.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:pilll/components/atoms/color.dart';
+import 'package:pilll/components/molecules/diagonal_striped_line.dart';
+import 'package:pilll/components/organisms/calendar/band/calendar_band.dart';
+import 'package:pilll/entity/menstruation.codegen.dart';
+
+class CalendarMenstruationBand extends StatelessWidget {
+  const CalendarMenstruationBand({
+    Key? key,
+    required this.menstruation,
+    required this.width,
+    required this.onTap,
+  }) : super(key: key);
+
+  final Menstruation menstruation;
+  final double width;
+  final Function(Menstruation) onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => onTap(menstruation),
+      child: Container(
+        height: CalendarBandConst.height,
+        child: CustomPaint(
+          painter: DiagonalStripedLine(
+            color: PilllColors.menstruation,
+            isNecessaryBorder: false,
+          ),
+          size: Size(width, CalendarBandConst.height),
+        ),
+      ),
+    );
+  }
+}

lib/components/organisms/calendar/band/calendar_next_pill_sheet_band.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+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/components/molecules/diagonal_striped_line.dart';
+import 'package:pilll/components/organisms/calendar/band/calendar_band.dart';
+
+class CalendarNextPillSheetBand extends StatelessWidget {
+  const CalendarNextPillSheetBand({
+    Key? key,
+    required this.begin,
+    required this.end,
+    required this.isLineBreak,
+    required this.width,
+  }) : super(key: key);
+
+  final DateTime begin;
+  final DateTime end;
+  final bool isLineBreak;
+  final double width;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: CalendarBandConst.height,
+      child: Stack(
+        children: [
+          CustomPaint(
+            painter: DiagonalStripedLine(
+                color: PilllColors.duration, isNecessaryBorder: false),
+            size: Size(width, CalendarBandConst.height),
+          ),
+          Container(
+            padding: const EdgeInsets.only(left: 10),
+            child: Text(isLineBreak ? "" : "新しいシート開始 ▶︎",
+                style: FontType.sSmallTitle.merge(TextColorStyle.white)),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/components/organisms/calendar/band/calendar_scheduled_menstruation_band.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:pilll/components/atoms/color.dart';
+import 'package:pilll/components/molecules/diagonal_striped_line.dart';
+import 'package:pilll/components/organisms/calendar/band/calendar_band.dart';
+
+class CalendarScheduledMenstruationBand extends StatelessWidget {
+  const CalendarScheduledMenstruationBand({
+    Key? key,
+    required this.begin,
+    required this.end,
+    required this.width,
+  }) : super(key: key);
+
+  final DateTime begin;
+  final DateTime end;
+  final double width;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: CalendarBandConst.height,
+      child: CustomPaint(
+        painter: DiagonalStripedLine(
+          color: PilllColors.menstruation.withAlpha(153),
+          isNecessaryBorder: true,
+        ),
+        size: Size(width, CalendarBandConst.height),
+      ),
+    );
+  }
+}

lib/components/organisms/calendar/day/calendar_day_tile.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 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/components/organisms/calendar/monthly/monthly_calendar_layout.dart';
+import 'package:pilll/domain/calendar/components/month_calendar/month_calendar.dart';
 import 'package:pilll/entity/weekday.dart';
 
 class CalendarDayTile extends StatelessWidget {