Fix date chips not rendering properly

lib/alarm/logic/schedule_description.dart

@@ -1,3 +1,4 @@
+import 'package:clock_app/alarm/types/range_interval.dart';
 import 'package:clock_app/common/data/weekdays.dart';
 import 'package:clock_app/alarm/types/alarm.dart';
 import 'package:clock_app/alarm/types/schedules/daily_alarm_schedule.dart';
@@ -43,11 +44,11 @@
       return 'Every ${weekdays.where((weekday) => alarmWeekdays.contains(weekday)).map((weekday) => weekday.displayName).join(', ')}';
     case DatesAlarmSchedule:
       List<DateTime> dates = alarm.dates;
-      return 'On ${DateFormat(dateFormat).format(dates[0])}${dates.length > 1 ? ' and ${dates.length - 1} other${dates.length > 2 ? 's' : ''}' : ''}';
+      return 'On ${DateFormat(dateFormat).format(dates[0])}${dates.length > 1 ? ' and ${dates.length - 1} other date${dates.length > 2 ? 's' : ''} ' : ''}';
     case RangeAlarmSchedule:
       DateTime rangeStart = alarm.startDate;
       DateTime rangeEnd = alarm.endDate;
-      Duration interval = alarm.interval;
+      RangeInterval interval = alarm.interval;
 
       String startString = DateFormat(dateFormat).format(rangeStart);
       String endString = DateFormat(dateFormat).format(rangeEnd);
@@ -65,7 +66,7 @@
         }
       }
 
-      return '${interval.inDays == 1 ? "Daily" : "Weekly"} from $startString to $endString';
+      return '${interval == RangeInterval.daily ? "Daily" : "Weekly"} from $startString to $endString';
     default:
       return 'Not scheduled';
   }

lib/alarm/types/alarm.dart

@@ -1,6 +1,7 @@
 import 'package:clock_app/alarm/logic/schedule_alarm.dart';
 import 'package:clock_app/alarm/types/alarm_runner.dart';
 import 'package:clock_app/alarm/types/alarm_task.dart';
+import 'package:clock_app/alarm/types/range_interval.dart';
 import 'package:clock_app/alarm/types/schedules/alarm_schedule.dart';
 import 'package:clock_app/alarm/types/schedules/daily_alarm_schedule.dart';
 import 'package:clock_app/alarm/types/schedules/dates_alarm_schedule.dart';
@@ -261,8 +262,8 @@
     return (getSetting("Date Range") as DateTimeSetting).value[1];
   }
 
-  Duration get interval {
-    return (getSetting("Interval") as SelectSetting<Duration>).value;
+  RangeInterval get interval {
+    return (getSetting("Interval") as SelectSetting<RangeInterval>).value;
   }
 
   Alarm.fromJson(Json json)

lib/common/logic/card_decoration.dart

@@ -25,9 +25,9 @@ BoxDecoration getCardDecoration(BuildContext context,
                 strokeAlign: BorderSide.strokeAlignInside,
               )
             : null,
-    color: color ?? Theme.of(context).colorScheme.surface,
-    borderRadius: (Theme.of(context).cardTheme.shape as RoundedRectangleBorder)
-        .borderRadius,
+    color: color ?? colorScheme.surface,
+    borderRadius:
+        (theme.cardTheme.shape as RoundedRectangleBorder).borderRadius,
     boxShadow: [
       if (showShadow && (themeStyle?.shadowOpacity ?? 0) > 0)
         BoxShadow(

lib/common/widgets/fields/date_picker_field.dart

@@ -1,3 +1,4 @@
+import 'package:clock_app/common/widgets/card_container.dart';
 import 'package:clock_app/common/widgets/fields/date_picker_bottom_sheet.dart';
 import 'package:clock_app/settings/data/settings_schema.dart';
 import 'package:clock_app/settings/types/setting.dart';
@@ -142,17 +143,18 @@ class DateChip extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     ColorScheme colorScheme = Theme.of(context).colorScheme;
-    return Chip(
-      backgroundColor: colorScheme.onBackground.withOpacity(0.1),
-      // labelPadding: EdgeInsets.zero,
-      padding: EdgeInsets.zero,
-
-      // side: ,
-      label: Text(
-        DateFormat(dateFormat).format(date),
-        style: const TextStyle(fontSize: 10),
+    return CardContainer(
+      key: const Key("DateChip"),
+      color: colorScheme.primary,
+      margin: const EdgeInsets.all(0),
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Text(
+          DateFormat(dateFormat).format(date),
+          style: const TextStyle(fontSize: 10)
+              .copyWith(color: colorScheme.onPrimary),
+        ),
       ),
-      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
   }
 }

test/common/widgets/fields/date_picker_field_test.dart

@@ -1,4 +1,5 @@
 import 'package:clock_app/common/widgets/fields/date_picker_field.dart';
+import 'package:clock_app/theme/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -17,19 +18,19 @@ void main() {
         testWidgets('with 1 date', (tester) async {
           final value = [DateTime(2021, 1, 1)];
           await _renderWidget(tester, value: value);
-          final valueFinder = find.byType(DateChip);
+          final valueFinder = find.byKey(const Key("DateChip"));
           expect(valueFinder, findsOneWidget);
         });
         testWidgets('with 2 dates', (tester) async {
           final value = [DateTime(2021, 1, 1), DateTime(2021, 1, 2)];
           await _renderWidget(tester, value: value);
-          final valueFinder = find.byType(DateChip);
+          final valueFinder = find.byKey(const Key("DateChip"));
           expect(valueFinder, findsNWidgets(2));
         });
         testWidgets('with 10 dates', (tester) async {
           final value = List.generate(10, (index) => DateTime(2021, 1, 1));
           await _renderWidget(tester, value: value);
-          final valueFinder = find.byType(DateChip);
+          final valueFinder = find.byKey(const Key("DateChip"));
           expect(valueFinder, findsNWidgets(10));
         });
       });
@@ -75,6 +76,7 @@ Future<void> _renderWidget(WidgetTester tester,
     void Function(List<DateTime>)? onChanged}) async {
   await tester.pumpWidget(
     MaterialApp(
+      theme: defaultTheme,
       home: Scaffold(
         body: DatePickerField(
           value: value,