休講・補講・教室変更の背景色を変更

Author: kantacky

lib/domain/lecture_status.dart

@@ -1 +1 @@
-enum LectureStatus { normal, cancelled, madeUp }
+enum LectureStatus { normal, cancelled, madeUp, roomChanged }

lib/feature/course/personal_timetable_calendar_view.dart

@@ -334,7 +334,13 @@ final class PersonalTimetableCalendarView extends HookConsumerWidget {
       child: TextButton(
         style: TextButton.styleFrom(
           padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-          backgroundColor: SemanticColor.light.backgroundSecondary,
+          backgroundColor: switch (item?.lectureStatus) {
+            LectureStatus.cancelled => SemanticColor.light.accentError.withValues(alpha: 0.1),
+            LectureStatus.madeUp => SemanticColor.light.accentWarning.withValues(alpha: 0.1),
+            LectureStatus.roomChanged => SemanticColor.light.accentInfo.withValues(alpha: 0.1),
+            LectureStatus.normal => SemanticColor.light.backgroundSecondary,
+            null => SemanticColor.light.backgroundSecondary,
+          },
           disabledBackgroundColor: SemanticColor.light.backgroundTertiary,
           overlayColor: SemanticColor.light.accentPrimary,
           side: BorderSide(color: SemanticColor.light.borderPrimary),
@@ -357,7 +363,26 @@ final class PersonalTimetableCalendarView extends HookConsumerWidget {
                       style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: SemanticColor.light.labelPrimary),
                     ),
                   ),
-                  if (item != null) _lectureStatusLabel(item.lectureStatus),
+                  if (item != null)
+                    switch (item.lectureStatus) {
+                      LectureStatus.cancelled => Text(
+                        '休講',
+                        style: Theme.of(
+                          context,
+                        ).textTheme.labelMedium?.copyWith(color: SemanticColor.light.accentError),
+                      ),
+                      LectureStatus.madeUp => Text(
+                        '補講',
+                        style: Theme.of(
+                          context,
+                        ).textTheme.labelMedium?.copyWith(color: SemanticColor.light.accentWarning),
+                      ),
+                      LectureStatus.roomChanged => Text(
+                        '教室変更',
+                        style: Theme.of(context).textTheme.labelMedium?.copyWith(color: SemanticColor.light.accentInfo),
+                      ),
+                      LectureStatus.normal => const SizedBox.shrink(),
+                    },
                 ],
               ),
             ),
@@ -372,26 +397,6 @@ final class PersonalTimetableCalendarView extends HookConsumerWidget {
     );
   }
 
-  Widget _lectureStatusLabel(LectureStatus status) {
-    return switch (status) {
-      LectureStatus.cancelled => Row(
-        spacing: 2,
-        children: [
-          Icon(Icons.cancel_outlined, size: 16, color: SemanticColor.light.accentError),
-          Text('休講', style: TextStyle(color: SemanticColor.light.accentError)),
-        ],
-      ),
-      LectureStatus.madeUp => Row(
-        spacing: 2,
-        children: [
-          Icon(Icons.info_outline, size: 16, color: SemanticColor.light.accentWarning),
-          Text('補講', style: TextStyle(color: SemanticColor.light.accentWarning)),
-        ],
-      ),
-      LectureStatus.normal => const SizedBox.shrink(),
-    };
-  }
-
   bool _isSameDate(DateTime a, DateTime b) {
     return a.year == b.year && a.month == b.month && a.day == b.day;
   }

lib/repository/personal_calendar_repository.dart

@@ -85,9 +85,12 @@ final class PersonalCalendarRepositoryImpl implements PersonalCalendarRepository
   @visibleForTesting
   static LectureStatus toLectureStatus(DottoFoundationV1PersonalCalendarItemStatus status) {
     return switch (status) {
+      DottoFoundationV1PersonalCalendarItemStatus.normal => LectureStatus.normal,
       DottoFoundationV1PersonalCalendarItemStatus.cancelled => LectureStatus.cancelled,
       DottoFoundationV1PersonalCalendarItemStatus.makeup => LectureStatus.madeUp,
-      _ => LectureStatus.normal,
+      DottoFoundationV1PersonalCalendarItemStatus.roomChanged => LectureStatus.roomChanged,
+      // TODO: API側でstatusの値が増えたときに例外を投げるようにするため、デフォルトはnormalにしておく
+      DottoFoundationV1PersonalCalendarItemStatus() => LectureStatus.normal,
     };
   }
 }