Merge pull request #8 from headlines-toolkit/fix_settings_feature

fulleni · web-flow · commit 9cb619807290 · 2025-06-30T08:46:50.000+01:00
Fix settings feature
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -931,6 +931,30 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Arabic'**
   String get arabicLanguage;
+
+  /// Label for the Appearance settings tab
+  ///
+  /// In en, this message translates to:
+  /// **'Appearance'**
+  String get appearanceSettingsLabel;
+
+  /// Label for the Language settings tab
+  ///
+  /// In en, this message translates to:
+  /// **'Language'**
+  String get languageSettingsLabel;
+
+  /// Label for the Theme Settings sub-tab
+  ///
+  /// In en, this message translates to:
+  /// **'Theme Settings'**
+  String get themeSettingsLabel;
+
+  /// Label for the Font Settings sub-tab
+  ///
+  /// In en, this message translates to:
+  /// **'Font Settings'**
+  String get fontSettingsLabel;
 }
 
 class _AppLocalizationsDelegate
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
@@ -487,4 +487,16 @@ class AppLocalizationsAr extends AppLocalizations {
 
   @override
   String get arabicLanguage => 'العربية';
+
+  @override
+  String get appearanceSettingsLabel => 'المظهر';
+
+  @override
+  String get languageSettingsLabel => 'اللغة';
+
+  @override
+  String get themeSettingsLabel => 'إعدادات السمة';
+
+  @override
+  String get fontSettingsLabel => 'إعدادات الخط';
 }
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
@@ -485,4 +485,16 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get arabicLanguage => 'Arabic';
+
+  @override
+  String get appearanceSettingsLabel => 'Appearance';
+
+  @override
+  String get languageSettingsLabel => 'Language';
+
+  @override
+  String get themeSettingsLabel => 'Theme Settings';
+
+  @override
+  String get fontSettingsLabel => 'Font Settings';
 }
diff --git a/lib/l10n/arb/app_ar.arb b/lib/l10n/arb/app_ar.arb
@@ -579,5 +579,21 @@
   "arabicLanguage": "العربية",
   "@arabicLanguage": {
     "description": "خيار اللغة العربية"
+  },
+  "appearanceSettingsLabel": "المظهر",
+  "@appearanceSettingsLabel": {
+    "description": "تسمية تبويب إعدادات المظهر"
+  },
+  "languageSettingsLabel": "اللغة",
+  "@languageSettingsLabel": {
+    "description": "تسمية تبويب إعدادات اللغة"
+  },
+  "themeSettingsLabel": "إعدادات السمة",
+  "@themeSettingsLabel": {
+    "description": "تسمية تبويب إعدادات السمة الفرعي"
+  },
+  "fontSettingsLabel": "إعدادات الخط",
+  "@fontSettingsLabel": {
+    "description": "تسمية تبويب إعدادات الخط الفرعي"
   }
 }
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
@@ -579,5 +579,21 @@
   "arabicLanguage": "Arabic",
   "@arabicLanguage": {
     "description": "Option for Arabic language"
+  },
+  "appearanceSettingsLabel": "Appearance",
+  "@appearanceSettingsLabel": {
+    "description": "Label for the Appearance settings tab"
+  },
+  "languageSettingsLabel": "Language",
+  "@languageSettingsLabel": {
+    "description": "Label for the Language settings tab"
+  },
+  "themeSettingsLabel": "Theme Settings",
+  "@themeSettingsLabel": {
+    "description": "Label for the Theme Settings sub-tab"
+  },
+  "fontSettingsLabel": "Font Settings",
+  "@fontSettingsLabel": {
+    "description": "Label for the Font Settings sub-tab"
   }
 }
diff --git a/lib/router/router.dart b/lib/router/router.dart
@@ -140,6 +140,17 @@ GoRouter createRouter({
                 path: Routes.dashboard,
                 name: Routes.dashboardName,
                 builder: (context, state) => const DashboardPage(),
+                routes: [
+                  // The settings page is a sub-route of the dashboard.
+                  // This allows it to be displayed within the AppShell
+                  // (with sidebar and top bar visible) without adding
+                  // a new item to the main navigation sidebar.
+                  GoRoute(
+                    path: Routes.settings,
+                    name: Routes.settingsName,
+                    builder: (context, state) => const SettingsPage(),
+                  ),
+                ],
               ),
             ],
           ),
@@ -180,11 +191,6 @@ GoRouter createRouter({
           ),
         ],
       ),
-      GoRoute(
-        path: Routes.settings,
-        name: Routes.settingsName,
-        builder: (context, state) => const SettingsPage(),
-      ),
     ],
   );
 }
diff --git a/lib/settings/bloc/settings_bloc.dart b/lib/settings/bloc/settings_bloc.dart
@@ -12,7 +12,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
   SettingsBloc({
     required HtDataRepository<UserAppSettings> userAppSettingsRepository,
   }) : _userAppSettingsRepository = userAppSettingsRepository,
-       super(SettingsInitial()) {
+       super(const SettingsInitial()) {
     on<SettingsLoaded>(_onSettingsLoaded);
     on<SettingsBaseThemeChanged>(_onSettingsBaseThemeChanged);
     on<SettingsAccentThemeChanged>(_onSettingsAccentThemeChanged);
@@ -28,9 +28,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsLoaded event,
     Emitter<SettingsState> emit,
   ) async {
-    emit(SettingsLoadInProgress());
+    emit(SettingsLoadInProgress(userAppSettings: state.userAppSettings));
     try {
-      // Assuming a fixed ID for user settings, or fetching based on current user
       final userAppSettings = await _userAppSettingsRepository.read(
         id: event.userId!,
       );
@@ -40,9 +39,9 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
       await _userAppSettingsRepository.create(item: defaultSettings);
       emit(SettingsLoadSuccess(userAppSettings: defaultSettings));
     } on HtHttpException catch (e) {
-      emit(SettingsLoadFailure(e.message));
+      emit(SettingsLoadFailure(e.message, userAppSettings: state.userAppSettings));
     } catch (e) {
-      emit(SettingsLoadFailure('An unexpected error occurred: $e'));
+      emit(SettingsLoadFailure('An unexpected error occurred: $e', userAppSettings: state.userAppSettings));
     }
   }
 
@@ -58,18 +57,18 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
       );
       emit(SettingsUpdateSuccess(userAppSettings: result));
     } on HtHttpException catch (e) {
-      emit(SettingsUpdateFailure(e.message));
+      emit(SettingsUpdateFailure(e.message, userAppSettings: state.userAppSettings));
     } catch (e) {
-      emit(SettingsUpdateFailure('An unexpected error occurred: $e'));
+      emit(SettingsUpdateFailure('An unexpected error occurred: $e', userAppSettings: state.userAppSettings));
     }
   }
 
   Future<void> _onSettingsBaseThemeChanged(
     SettingsBaseThemeChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         displaySettings: currentSettings.displaySettings.copyWith(
           baseTheme: event.baseTheme,
@@ -83,8 +82,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsAccentThemeChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         displaySettings: currentSettings.displaySettings.copyWith(
           accentTheme: event.accentTheme,
@@ -98,8 +97,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsFontFamilyChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         displaySettings: currentSettings.displaySettings.copyWith(
           fontFamily: event.fontFamily,
@@ -113,8 +112,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsTextScaleFactorChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         displaySettings: currentSettings.displaySettings.copyWith(
           textScaleFactor: event.textScaleFactor,
@@ -128,8 +127,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsFontWeightChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         displaySettings: currentSettings.displaySettings.copyWith(
           fontWeight: event.fontWeight,
@@ -143,8 +142,8 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     SettingsLanguageChanged event,
     Emitter<SettingsState> emit,
   ) async {
-    if (state is SettingsLoadSuccess) {
-      final currentSettings = (state as SettingsLoadSuccess).userAppSettings;
+    final currentSettings = state.userAppSettings;
+    if (currentSettings != null) {
       final updatedSettings = currentSettings.copyWith(
         language: event.language,
       );
diff --git a/lib/settings/bloc/settings_state.dart b/lib/settings/bloc/settings_state.dart
@@ -1,88 +1,79 @@
 part of 'settings_bloc.dart';
 
 sealed class SettingsState extends Equatable {
-  const SettingsState();
+  const SettingsState({this.userAppSettings});
+
+  /// The current user application settings. Null if not loaded or unauthenticated.
+  final UserAppSettings? userAppSettings;
 
   @override
-  List<Object?> get props => [];
+  List<Object?> get props => [userAppSettings];
 }
 
 /// {@template settings_initial}
 /// The initial settings state.
 /// {@endtemplate}
-final class SettingsInitial extends SettingsState {}
+final class SettingsInitial extends SettingsState {
+  /// {@macro settings_initial}
+  const SettingsInitial({super.userAppSettings});
+}
 
 /// {@template settings_load_in_progress}
 /// State indicating that user settings are being loaded.
 /// {@endtemplate}
-final class SettingsLoadInProgress extends SettingsState {}
+final class SettingsLoadInProgress extends SettingsState {
+  /// {@macro settings_load_in_progress}
+  const SettingsLoadInProgress({super.userAppSettings});
+}
 
 /// {@template settings_load_success}
 /// State indicating that user settings have been successfully loaded.
 /// {@endtemplate}
 final class SettingsLoadSuccess extends SettingsState {
   /// {@macro settings_load_success}
-  const SettingsLoadSuccess({required this.userAppSettings});
-
-  /// The loaded user application settings.
-  final UserAppSettings userAppSettings;
-
-  @override
-  List<Object?> get props => [userAppSettings];
+  const SettingsLoadSuccess({required super.userAppSettings});
 }
 
 /// {@template settings_load_failure}
 /// State indicating that loading user settings failed.
 /// {@endtemplate}
 final class SettingsLoadFailure extends SettingsState {
   /// {@macro settings_load_failure}
-  const SettingsLoadFailure(this.errorMessage);
+  const SettingsLoadFailure(this.errorMessage, {super.userAppSettings});
 
   /// The error message describing the failure.
   final String errorMessage;
 
   @override
-  List<Object?> get props => [errorMessage];
+  List<Object?> get props => [errorMessage, userAppSettings];
 }
 
 /// {@template settings_update_in_progress}
 /// State indicating that user settings are being updated.
 /// {@endtemplate}
 final class SettingsUpdateInProgress extends SettingsState {
   /// {@macro settings_update_in_progress}
-  const SettingsUpdateInProgress({required this.userAppSettings});
-
-  /// The user application settings being updated.
-  final UserAppSettings userAppSettings;
-
-  @override
-  List<Object?> get props => [userAppSettings];
+  const SettingsUpdateInProgress({required super.userAppSettings});
 }
 
 /// {@template settings_update_success}
 /// State indicating that user settings have been successfully updated.
 /// {@endtemplate}
 final class SettingsUpdateSuccess extends SettingsState {
   /// {@macro settings_update_success}
-  const SettingsUpdateSuccess({required this.userAppSettings});
-
-  /// The updated user application settings.
-  final UserAppSettings userAppSettings;
-
-  @override
-  List<Object?> get props => [userAppSettings];
+  const SettingsUpdateSuccess({required super.userAppSettings});
 }
 
 /// {@template settings_update_failure}
 /// State indicating that updating user settings failed.
 /// {@endtemplate}
 final class SettingsUpdateFailure extends SettingsState {
   /// {@macro settings_update_failure}
-  const SettingsUpdateFailure(this.errorMessage);
+  const SettingsUpdateFailure(this.errorMessage, {super.userAppSettings});
 
   /// The error message describing the failure.
   final String errorMessage;
 
   @override
-  List<Object?> get props => [errorMessage];
+  List<Object?> get props => [errorMessage, userAppSettings];
 }
diff --git a/lib/settings/view/settings_page.dart b/lib/settings/view/settings_page.dart
