🚧 Refactor file names & color name

Author: Shubham Jitiya

example/lib/theme/app_theme.dart

@@ -48,27 +48,34 @@ class AppTheme {
 
   // Light theme
   static final light = CalendarTheme.light.copyWith(
-    // TODO(Shubham): Reorder
-    elevatedButtonTheme: ElevatedButtonThemeData(
-      style: ElevatedButton.styleFrom(
+      // TODO(Shubham): Reorder
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: AppColors.primary,
+          foregroundColor: AppColors.onPrimary,
+        ),
+      ),
+      floatingActionButtonTheme: FloatingActionButtonThemeData(
+        backgroundColor: AppColors.primary,
+      ),
+      inputDecorationTheme: baseInputDecorationTheme,
+      appBarTheme: AppBarTheme(
         backgroundColor: AppColors.primary,
         foregroundColor: AppColors.onPrimary,
       ),
-    ),
-    floatingActionButtonTheme: FloatingActionButtonThemeData(
-      backgroundColor: AppColors.primary,
-    ),
-    inputDecorationTheme: baseInputDecorationTheme,
-    appBarTheme: AppBarTheme(
-      backgroundColor: AppColors.primary,
-      foregroundColor: AppColors.onPrimary,
-    ),
-    radioTheme: RadioThemeData(
-      fillColor: WidgetStateColor.resolveWith(
-        (_) => AppColors.primary,
+      radioTheme: RadioThemeData(
+        fillColor: WidgetStateColor.resolveWith(
+          (_) => AppColors.primary,
+        ),
       ),
-    ),
-  );
+      extensions: [_lightAppColors]);
+
+  static final _lightAppColors = CalendarThemeExtension().copyWith(
+      // daysInMonth: Colors.green,
+      // daysNotInMonth: Colors.orange,
+      // pageBackground: Colors.black26,
+      // background: Colors.red,
+      );
 
   // Dark theme
   static final dark = CalendarTheme.dark.copyWith(

lib/calendar_view.dart

@@ -16,7 +16,7 @@ export './src/extensions.dart';
 export './src/modals.dart';
 export './src/month_view/month_view.dart';
 export './src/style/header_style.dart';
-export './src/theme/app_colors_extension.dart'; // TODO(Shubham): Check if it is required
 export './src/theme/calendar_theme.dart';
+export './src/theme/calendar_theme_extension.dart'; // TODO(Shubham): Check if it is required
 export './src/typedefs.dart';
 export './src/week_view/week_view.dart';

lib/src/day_view/day_view.dart

@@ -432,6 +432,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
   @override
   Widget build(BuildContext context) {
     final color = Theme.of(context).colorScheme;
+    final themeColor = context.themeColor;
 
     return SafeAreaWrapper(
       option: widget.safeAreaOption,
@@ -448,7 +449,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
               Expanded(
                 child: DecoratedBox(
                   decoration: BoxDecoration(
-                    color: widget.backgroundColor ?? color.surfaceContainerLow,
+                    color: widget.backgroundColor ?? themeColor.pageBackground,
                   ),
                   child: SizedBox(
                     height: _height,

lib/src/extensions.dart

@@ -255,6 +255,7 @@ void debugLog(String message) {
 
 extension BuildContextExtension on BuildContext {
   // TODO(Shubham): Update here theme based if possible
-  AppColorsExtension get themeColor =>
-      Theme.of(this).extension<AppColorsExtension>() ?? AppColorsExtension();
+  CalendarThemeExtension get themeColor =>
+      Theme.of(this).extension<CalendarThemeExtension>() ??
+      CalendarThemeExtension();
 }

lib/src/month_view/month_view.dart

@@ -569,9 +569,8 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
       return FilledCell<T>(
         date: date,
         shouldHighlight: isToday,
-        backgroundColor: isInMonth
-            ? themeColor.surfaceContainerLowest
-            : themeColor.surfaceContainerLow,
+        backgroundColor:
+            isInMonth ? themeColor.daysInMonth : themeColor.daysNotInMonth,
         events: events,
         isInMonth: isInMonth,
         onTileTap: widget.onEventTap,
@@ -585,9 +584,8 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
     return FilledCell<T>(
       date: date,
       shouldHighlight: isToday,
-      backgroundColor: isInMonth
-          ? themeColor.surfaceContainerLowest
-          : themeColor.surfaceContainerLow,
+      backgroundColor:
+          isInMonth ? themeColor.daysInMonth : themeColor.daysNotInMonth,
       events: events,
       onTileTap: widget.onEventTap,
       onTileLongTap: widget.onEventLongTap,

lib/src/theme/calendar_theme.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'app_colors_extension.dart';
+import 'calendar_theme_extension.dart';
 import 'dark_app_colors.dart';
 
 class CalendarTheme {
@@ -12,15 +12,15 @@ class CalendarTheme {
   );
 
   // Default colors assigned are of light theme
-  static final _lightAppColors = AppColorsExtension();
+  static final _lightAppColors = CalendarThemeExtension();
 
   // TODO(Shubham): Setup dark colors
   // Dark theme
   static final dark = ThemeData.dark().copyWith(
     extensions: [_darkAppColors],
   );
 
-  static final _darkAppColors = AppColorsExtension(
+  static final _darkAppColors = CalendarThemeExtension(
     primary: DarkAppColors.primary,
     onPrimary: DarkAppColors.onPrimary,
     onPrimaryContainer: DarkAppColors.onPrimaryContainer,
@@ -29,7 +29,8 @@ class CalendarTheme {
     secondaryContainer: DarkAppColors.secondaryContainer,
     outlineVariant: DarkAppColors.outlineVariant,
     onSurface: DarkAppColors.onSurface,
-    surfaceContainerLowest: DarkAppColors.surfaceContainerLowest,
-    surfaceContainerLow: DarkAppColors.surfaceContainerLow,
+    daysInMonth: DarkAppColors.surfaceContainerLowest,
+    daysNotInMonth: DarkAppColors.surfaceContainerLow,
+    pageBackground: DarkAppColors.surfaceContainerLowest,
   );
 }

lib/src/theme/app_colors_extension.dart …/src/theme/calendar_theme_extension.dartlib/src/theme/app_colors_extension.dart renamed to lib/src/theme/calendar_theme_extension.dart lib/src/theme/app_colors_extension.dart renamed to lib/src/theme/calendar_theme_extension.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'light_app_colors.dart';
 
 // Default theme is light theme
-class AppColorsExtension extends ThemeExtension<AppColorsExtension> {
-  AppColorsExtension({
+class CalendarThemeExtension extends ThemeExtension<CalendarThemeExtension> {
+  CalendarThemeExtension({
     this.primary = LightAppColors.primary,
     this.onPrimary = LightAppColors.onPrimary,
     this.onPrimaryContainer = LightAppColors.onPrimaryContainer,
@@ -13,8 +13,9 @@ class AppColorsExtension extends ThemeExtension<AppColorsExtension> {
     this.secondaryContainer = LightAppColors.secondaryContainer,
     this.outlineVariant = LightAppColors.outlineVariant,
     this.onSurface = LightAppColors.onSurface,
-    this.surfaceContainerLowest = LightAppColors.surfaceContainerLowest,
-    this.surfaceContainerLow = LightAppColors.surfaceContainerLow,
+    this.daysInMonth = LightAppColors.surfaceContainerLowest,
+    this.daysNotInMonth = LightAppColors.surfaceContainerLow,
+    this.pageBackground = LightAppColors.surfaceContainerLowest,
   });
 
   final Color primary;
@@ -25,31 +26,39 @@ class AppColorsExtension extends ThemeExtension<AppColorsExtension> {
   final Color secondaryContainer;
   final Color outlineVariant;
   final Color onSurface;
-  final Color surfaceContainerLowest;
-  final Color surfaceContainerLow;
+  final Color daysInMonth;
+  final Color daysNotInMonth;
+
+  /// Background color of week view & day view
+  final Color pageBackground;
 
   @override
-  ThemeExtension<AppColorsExtension> copyWith({
+  ThemeExtension<CalendarThemeExtension> copyWith({
     Color? primary,
     Color? onPrimary,
+    Color? daysInMonth,
+    Color? daysNotInMonth,
+    Color? pageBackground,
     Color? surfaceContainerHigh,
-    Color? background,
   }) {
-    return AppColorsExtension(
+    return CalendarThemeExtension(
       primary: primary ?? this.primary,
       onPrimary: onPrimary ?? this.onPrimary,
       surfaceContainerHigh: surfaceContainerHigh ?? this.surfaceContainerHigh,
+      daysInMonth: daysInMonth ?? this.daysInMonth,
+      daysNotInMonth: daysNotInMonth ?? this.daysNotInMonth,
+      pageBackground: pageBackground ?? this.pageBackground,
     );
   }
 
   @override
-  ThemeExtension<AppColorsExtension> lerp(
-    covariant ThemeExtension<AppColorsExtension>? other,
+  ThemeExtension<CalendarThemeExtension> lerp(
+    covariant ThemeExtension<CalendarThemeExtension>? other,
     double t,
   ) {
-    if (other is! AppColorsExtension) return this;
+    if (other is! CalendarThemeExtension) return this;
 
-    return AppColorsExtension(
+    return CalendarThemeExtension(
       primary: Color.lerp(primary, other.primary, t)!,
     );
   }

lib/src/week_view/_internal_week_view_page.dart

@@ -256,7 +256,7 @@ class _InternalWeekViewPageState<T extends Object?>
     final themeColor = context.themeColor;
 
     return Container(
-      color: widget.backgroundColor ?? themeColor.surfaceContainerLowest,
+      color: widget.backgroundColor ?? themeColor.pageBackground,
       height: widget.height + widget.weekTitleHeight,
       width: widget.width,
       child: Column(