refactor: replace custom ContentThemeOverride with standard ThemeMode

SERDUN · SERDUN · commit dc92630c24e5 · 2026-02-04T11:45:01.000+02:00
diff --git a/lib/features/contacts/view/contacts_screen.dart b/lib/features/contacts/view/contacts_screen.dart
@@ -125,7 +125,7 @@ class _ContactsScreenState extends State<ContactsScreen> with SingleTickerProvid
     return Unfocuser(
       child: ThemedScaffold(
         background: effectiveStyle?.background,
-        contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ContentThemeOverride.auto,
+        contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ThemeMode.system,
         applyToAppBar: effectiveStyle?.applyToAppBar ?? false,
         appBar: MainAppBar(
           title: widget.title,
diff --git a/lib/features/contacts/view/contacts_screen_style.dart b/lib/features/contacts/view/contacts_screen_style.dart
@@ -1,19 +1,15 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 class ContactsScreenStyle extends BaseScreenStyle with Diagnosticable {
   const ContactsScreenStyle({super.background, this.contentThemeOverride, this.applyToAppBar});
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
-  ContactsScreenStyle copyWith({
-    BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
-    bool? applyToAppBar,
-  }) {
+  ContactsScreenStyle copyWith({BackgroundStyle? background, ThemeMode? contentThemeOverride, bool? applyToAppBar}) {
     return ContactsScreenStyle(
       background: background ?? this.background,
       contentThemeOverride: contentThemeOverride ?? this.contentThemeOverride,
@@ -45,7 +41,7 @@ class ContactsScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar));
   }
 }
diff --git a/lib/features/embedded/view/embedded_screen.dart b/lib/features/embedded/view/embedded_screen.dart
@@ -89,7 +89,7 @@ class _EmbeddedScreenState extends State<EmbeddedScreen> {
 
     return ThemedScaffold(
       background: effectiveStyle?.background,
-      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ContentThemeOverride.auto,
+      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ThemeMode.system,
       applyToAppBar: effectiveStyle?.applyToAppBar ?? false,
       appBar: widget.appBar,
       body: BlocConsumer<EmbeddedCubit, EmbeddedState>(
diff --git a/lib/features/embedded/view/embedded_screen_style.dart b/lib/features/embedded/view/embedded_screen_style.dart
@@ -1,19 +1,15 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 class EmbeddedScreenStyle extends BaseScreenStyle with Diagnosticable {
   const EmbeddedScreenStyle({super.background, this.contentThemeOverride, this.applyToAppBar});
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
-  EmbeddedScreenStyle copyWith({
-    BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
-    bool? applyToAppBar,
-  }) {
+  EmbeddedScreenStyle copyWith({BackgroundStyle? background, ThemeMode? contentThemeOverride, bool? applyToAppBar}) {
     return EmbeddedScreenStyle(
       background: background ?? this.background,
       contentThemeOverride: contentThemeOverride ?? this.contentThemeOverride,
@@ -45,7 +41,7 @@ class EmbeddedScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar));
   }
 }
diff --git a/lib/features/favorites/view/favorites_screen.dart b/lib/features/favorites/view/favorites_screen.dart
@@ -101,7 +101,7 @@ class _FavoritesScreenState extends State<FavoritesScreen> {
 
     return ThemedScaffold(
       background: effectiveStyle?.background,
-      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ContentThemeOverride.auto,
+      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ThemeMode.system,
       applyToAppBar: effectiveStyle?.applyToAppBar ?? false,
       appBar: MainAppBar(
         title: widget.title,
diff --git a/lib/features/favorites/view/favorites_screen_style.dart b/lib/features/favorites/view/favorites_screen_style.dart
@@ -1,19 +1,15 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 class FavoritesScreenStyle extends BaseScreenStyle with Diagnosticable {
   const FavoritesScreenStyle({super.background, this.contentThemeOverride, this.applyToAppBar});
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
-  FavoritesScreenStyle copyWith({
-    BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
-    bool? applyToAppBar,
-  }) {
+  FavoritesScreenStyle copyWith({BackgroundStyle? background, ThemeMode? contentThemeOverride, bool? applyToAppBar}) {
     return FavoritesScreenStyle(
       background: background ?? this.background,
       contentThemeOverride: contentThemeOverride ?? this.contentThemeOverride,
@@ -45,7 +41,7 @@ class FavoritesScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar));
   }
 }
diff --git a/lib/features/keypad/view/keypad_screen_style.dart b/lib/features/keypad/view/keypad_screen_style.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 import '../widgets/actionpad_style.dart';
 import '../widgets/keypad_style.dart';
@@ -23,7 +23,7 @@ class KeypadScreenStyle extends BaseScreenStyle with Diagnosticable {
   });
 
   /// Overrides the theme brightness (Light/Dark) for the screen content.
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
 
   /// If true, the AppBar will ignore the [contentThemeOverride] and keep the global theme.
   final bool? applyToAppBar;
@@ -43,7 +43,7 @@ class KeypadScreenStyle extends BaseScreenStyle with Diagnosticable {
   /// Creates a copy of this style with the given fields replaced with the new values.
   KeypadScreenStyle copyWith({
     BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
+    ThemeMode? contentThemeOverride,
     bool? applyToAppBar,
     TextFieldStyle? inputField,
     TextFieldStyle? contactNameField,
@@ -95,7 +95,7 @@ class KeypadScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar))
       ..add(DiagnosticsProperty<TextFieldStyle?>('inputField', inputField))
       ..add(DiagnosticsProperty<TextFieldStyle?>('contactNameField', contactNameField))
diff --git a/lib/features/messaging/features/conversations/view/conversations_screen.dart b/lib/features/messaging/features/conversations/view/conversations_screen.dart
@@ -150,7 +150,7 @@ class _ConversationsScreenState extends State<ConversationsScreen> with SingleTi
     return Unfocuser(
       child: ThemedScaffold(
         background: effectiveStyle?.background,
-        contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ContentThemeOverride.auto,
+        contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ThemeMode.system,
         applyToAppBar: effectiveStyle?.applyToAppBar ?? true,
         appBar: MainAppBar(
           title: widget.title,
diff --git a/lib/features/messaging/features/conversations/view/conversations_screen_style.dart b/lib/features/messaging/features/conversations/view/conversations_screen_style.dart
@@ -1,17 +1,17 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 class ConversationsScreenStyle extends BaseScreenStyle with Diagnosticable {
   const ConversationsScreenStyle({super.background, this.contentThemeOverride, this.applyToAppBar});
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
   ConversationsScreenStyle copyWith({
     BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
+    ThemeMode? contentThemeOverride,
     bool? applyToAppBar,
   }) {
     return ConversationsScreenStyle(
@@ -45,7 +45,7 @@ class ConversationsScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar));
   }
 }
diff --git a/lib/features/recents/view/recents_screen.dart b/lib/features/recents/view/recents_screen.dart
@@ -132,7 +132,7 @@ class _RecentsScreenState extends State<RecentsScreen> with SingleTickerProvider
 
     return ThemedScaffold(
       background: effectiveStyle?.background,
-      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ContentThemeOverride.auto,
+      contentThemeOverride: effectiveStyle?.contentThemeOverride ?? ThemeMode.system,
       applyToAppBar: effectiveStyle?.applyToAppBar ?? false,
       appBar: MainAppBar(
         title: widget.title,
diff --git a/lib/features/recents/view/recents_screen_style.dart b/lib/features/recents/view/recents_screen_style.dart
@@ -1,19 +1,15 @@
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 class RecentsScreenStyle extends BaseScreenStyle with Diagnosticable {
   const RecentsScreenStyle({super.background, this.contentThemeOverride, this.applyToAppBar});
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
-  RecentsScreenStyle copyWith({
-    BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
-    bool? applyToAppBar,
-  }) {
+  RecentsScreenStyle copyWith({BackgroundStyle? background, ThemeMode? contentThemeOverride, bool? applyToAppBar}) {
     return RecentsScreenStyle(
       background: background ?? this.background,
       contentThemeOverride: contentThemeOverride ?? this.contentThemeOverride,
@@ -45,7 +41,7 @@ class RecentsScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar));
   }
 }
diff --git a/lib/features/settings/view/settings_screen_style.dart b/lib/features/settings/view/settings_screen_style.dart
@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
-import 'package:webtrit_phone/widgets/themed_scaffold.dart';
 
 import '../widgets/group_title_list_style.dart';
 
@@ -25,7 +24,7 @@ class SettingScreenStyle extends BaseScreenStyle with Diagnosticable {
     this.itemTextStyle,
   });
 
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
   final bool? applyToAppBar;
 
   /// The color for leading icons in settings items (excluding logout and user icons which have specific overrides).
@@ -51,7 +50,7 @@ class SettingScreenStyle extends BaseScreenStyle with Diagnosticable {
 
   SettingScreenStyle copyWith({
     BackgroundStyle? background,
-    ContentThemeOverride? contentThemeOverride,
+    ThemeMode? contentThemeOverride,
     bool? applyToAppBar,
     Color? leadingIconsColor,
     Color? logoutIconColor,
@@ -113,7 +112,7 @@ class SettingScreenStyle extends BaseScreenStyle with Diagnosticable {
     super.debugFillProperties(properties);
     properties
       ..add(DiagnosticsProperty<BackgroundStyle?>('background', background))
-      ..add(EnumProperty<ContentThemeOverride?>('contentThemeOverride', contentThemeOverride))
+      ..add(EnumProperty<ThemeMode?>('contentThemeOverride', contentThemeOverride))
       ..add(DiagnosticsProperty<bool?>('applyToAppBar', applyToAppBar))
       ..add(ColorProperty('leadingIconsColor', leadingIconsColor))
       ..add(ColorProperty('logoutIconColor', logoutIconColor))
diff --git a/lib/theme/extension/extension.dart b/lib/theme/extension/extension.dart
@@ -20,4 +20,4 @@ export 'text_button_styles.dart';
 export 'text_field_config.dart';
 export 'text_style_config.dart';
 export 'theme_json_serializable.dart';
-export 'theme_mode_override_extension.dart';
+export 'theme_mode_extension.dart';
diff --git a/lib/theme/extension/theme_mode_extension.dart b/lib/theme/extension/theme_mode_extension.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+import 'package:webtrit_phone/theme/theme.dart';
+
+extension ThemeModeConfigExtension on ThemeModeConfig? {
+  ThemeMode toContentThemeOverride() {
+    return switch (this) {
+      ThemeModeConfig.light => ThemeMode.light,
+      ThemeModeConfig.dark => ThemeMode.dark,
+      ThemeModeConfig.system || null => ThemeMode.system,
+    };
+  }
+}
diff --git a/lib/theme/extension/theme_mode_override_extension.dart b/lib/theme/extension/theme_mode_override_extension.dart
diff --git a/lib/widgets/themed_scaffold.dart b/lib/widgets/themed_scaffold.dart
@@ -3,9 +3,6 @@ import 'package:flutter/services.dart';
 
 import 'package:webtrit_phone/theme/theme.dart';
 
-/// Defines how the content theme should be overridden within the scaffold.
-enum ContentThemeOverride { auto, light, dark }
-
 /// A wrapper around [Scaffold] that provides enhanced theming and background capabilities.
 ///
 /// This widget allows for:
@@ -17,7 +14,7 @@ class ThemedScaffold extends StatelessWidget {
     super.key,
     required this.body,
     this.background,
-    this.contentThemeOverride = ContentThemeOverride.auto,
+    this.contentThemeOverride = ThemeMode.system,
     this.applyToAppBar = true,
     this.appBar,
     this.floatingActionButton,
@@ -51,7 +48,7 @@ class ThemedScaffold extends StatelessWidget {
   final BackgroundStyle? background;
 
   /// Determines if the theme brightness should be forced to Light or Dark.
-  final ContentThemeOverride? contentThemeOverride;
+  final ThemeMode? contentThemeOverride;
 
   /// If true, the [contentThemeOverride] is applied to the entire Scaffold (including [appBar]).
   /// If false, it is applied only to the [body], allowing the [appBar] to retain the global theme.
@@ -83,7 +80,7 @@ class ThemedScaffold extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final shouldOverride = contentThemeOverride != ContentThemeOverride.auto;
+    final shouldOverride = contentThemeOverride != ThemeMode.system;
     final overrideTheme = shouldOverride ? _resolveThemeOverride(context) : null;
 
     final scaffoldBackgroundColor = switch (background) {
@@ -161,7 +158,7 @@ class ThemedScaffold extends StatelessWidget {
 
   ThemeData _resolveThemeOverride(BuildContext context) {
     final currentTheme = Theme.of(context);
-    final targetBrightness = contentThemeOverride == ContentThemeOverride.light ? Brightness.light : Brightness.dark;
+    final targetBrightness = contentThemeOverride == ThemeMode.light ? Brightness.light : Brightness.dark;
 
     final newColorScheme = ColorScheme.fromSeed(
       seedColor: currentTheme.colorScheme.primary,
