feature: Implemented the font size adjustment for the setting feature, and resolved localization errors by adding missing keys to lib/l10n/arb/app_en.arb and lib/l10n/arb/app_ar.arb and running flutter gen-l10n.

fulleni · fulleni · commit 243710005cbf · 2025-04-12T06:54:46.000+01:00
diff --git a/lib/app/bloc/app_bloc.dart b/lib/app/bloc/app_bloc.dart
@@ -6,11 +6,12 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart'; // Added
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart'; // Added for font mapping
+import 'package:google_fonts/google_fonts.dart';
 import 'package:ht_authentication_client/ht_authentication_client.dart';
 import 'package:ht_authentication_repository/ht_authentication_repository.dart';
-import 'package:ht_preferences_client/ht_preferences_client.dart'; // Added
-import 'package:ht_preferences_repository/ht_preferences_repository.dart'; // Added
+// Ensure full import for FontSize enum access
+import 'package:ht_preferences_client/ht_preferences_client.dart';
+import 'package:ht_preferences_repository/ht_preferences_repository.dart';
 
 part 'app_event.dart';
 part 'app_state.dart';
@@ -91,13 +92,16 @@ class AppBloc extends Bloc<AppEvent, AppState> {
         themeSettings?.themeName ?? AppThemeName.grey, // Default
       );
       final newFontFamily = _mapAppFontType(
-        appSettings?.appFontType, // Nullable, default handled in theme
+        appSettings?.appFontType,
       );
+      // Extract App Font Size
+      final newAppFontSize = appSettings?.appFontSize ?? FontSize.medium; // Default
 
       emit(
         state.copyWith(
           themeMode: newThemeMode,
           flexScheme: newFlexScheme,
+          appFontSize: newAppFontSize, // Pass font size
           fontFamily: newFontFamily,
           // Use clearFontFamily flag if appSettings was null and we want to reset
           clearFontFamily: appSettings == null,
diff --git a/lib/app/bloc/app_state.dart b/lib/app/bloc/app_state.dart
@@ -20,18 +20,22 @@ class AppState extends Equatable {
   AppState({
     this.selectedBottomNavigationIndex = 0,
     this.themeMode = ThemeMode.system,
-    this.flexScheme = FlexScheme.material, // Default scheme
-    this.fontFamily, // Default font family (null means use FlexColorScheme default)
-    this.status = AppStatus.initial, // Default to initial
+    this.appFontSize = FontSize.medium, // Default font size
+    this.flexScheme = FlexScheme.material,
+    this.fontFamily,
+    this.status = AppStatus.initial,
     User? user,
-  }) : user = user ?? User(); // Use default constructor
+  }) : user = user ?? User();
 
   /// The index of the currently selected item in the bottom navigation bar.
   final int selectedBottomNavigationIndex;
 
   /// The overall theme mode (light, dark, system).
   final ThemeMode themeMode;
 
+  /// The font size for the app's UI.
+  final FontSize appFontSize;
+
   /// The active color scheme defined by FlexColorScheme.
   final FlexScheme flexScheme;
 
@@ -51,16 +55,18 @@ class AppState extends Equatable {
     ThemeMode? themeMode,
     FlexScheme? flexScheme,
     String? fontFamily,
+    FontSize? appFontSize, // Added
     AppStatus? status,
     User? user,
-    bool clearFontFamily = false, // Flag to explicitly clear font family
+    bool clearFontFamily = false,
   }) {
     return AppState(
       selectedBottomNavigationIndex:
           selectedBottomNavigationIndex ?? this.selectedBottomNavigationIndex,
       themeMode: themeMode ?? this.themeMode,
       flexScheme: flexScheme ?? this.flexScheme,
       fontFamily: clearFontFamily ? null : fontFamily ?? this.fontFamily,
+      appFontSize: appFontSize ?? this.appFontSize, // Added
       status: status ?? this.status,
       user: user ?? this.user,
     );
@@ -72,6 +78,7 @@ class AppState extends Equatable {
         themeMode,
         flexScheme,
         fontFamily,
+        appFontSize, // Added
         status,
         user,
       ];
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -227,11 +227,12 @@ class _AppViewState extends State<_AppView> {
         _statusNotifier.value = state.status;
       },
       child: BlocBuilder<AppBloc, AppState>(
-        // Build when theme-related properties change
+        // Build when theme-related properties change (including font size)
         buildWhen: (previous, current) =>
             previous.themeMode != current.themeMode ||
             previous.flexScheme != current.flexScheme ||
-            previous.fontFamily != current.fontFamily,
+            previous.fontFamily != current.fontFamily ||
+            previous.appFontSize != current.appFontSize, // Added condition
         builder: (context, state) {
           return MaterialApp.router(
             debugShowCheckedModeBanner: false,
@@ -240,10 +241,12 @@ class _AppViewState extends State<_AppView> {
             theme: lightTheme(
               scheme: state.flexScheme,
               fontFamily: state.fontFamily,
+              appFontSize: state.appFontSize, // Pass font size
             ),
             darkTheme: darkTheme(
               scheme: state.flexScheme,
               fontFamily: state.fontFamily,
+              appFontSize: state.appFontSize, // Pass font size
             ),
             routerConfig: _router,
             localizationsDelegates: AppLocalizations.localizationsDelegates,
diff --git a/lib/l10n/arb/app_ar.arb b/lib/l10n/arb/app_ar.arb
@@ -357,5 +357,65 @@
     "accountSignInPromptButton": "تسجيل / تسجيل الدخول",
     "@accountSignInPromptButton": {
         "description": "Button text shown in the user header for anonymous users to initiate sign-in/sign-up"
-    }
+    },
+    "settingsTitle": "الإعدادات",
+    "@settingsTitle": { "description": "Title for the main settings page" },
+    "settingsLoadingHeadline": "جارٍ تحميل الإعدادات...",
+    "@settingsLoadingHeadline": { "description": "Headline shown while settings are loading" },
+    "settingsLoadingSubheadline": "يرجى الانتظار بينما نقوم بجلب تفضيلاتك.",
+    "@settingsLoadingSubheadline": { "description": "Subheadline shown while settings are loading" },
+    "settingsErrorDefault": "تعذر تحميل الإعدادات.",
+    "@settingsErrorDefault": { "description": "Default error message when settings fail to load" },
+    "settingsAppearanceTitle": "المظهر",
+    "@settingsAppearanceTitle": { "description": "Title for the appearance settings section/page" },
+    "settingsFeedDisplayTitle": "عرض الموجز",
+    "@settingsFeedDisplayTitle": { "description": "Title for the feed display settings section/page" },
+    "settingsArticleDisplayTitle": "عرض المقال",
+    "@settingsArticleDisplayTitle": { "description": "Title for the article display settings section/page" },
+    "settingsNotificationsTitle": "الإشعارات",
+    "@settingsNotificationsTitle": { "description": "Title for the notification settings section/page" },
+    "settingsAppearanceThemeModeLight": "فاتح",
+    "@settingsAppearanceThemeModeLight": { "description": "Label for the light theme mode option" },
+    "settingsAppearanceThemeModeDark": "داكن",
+    "@settingsAppearanceThemeModeDark": { "description": "Label for the dark theme mode option" },
+    "settingsAppearanceThemeModeSystem": "النظام",
+    "@settingsAppearanceThemeModeSystem": { "description": "Label for the system theme mode option" },
+    "settingsAppearanceThemeNameRed": "أحمر",
+    "@settingsAppearanceThemeNameRed": { "description": "Label for the red color scheme option" },
+    "settingsAppearanceThemeNameBlue": "أزرق",
+    "@settingsAppearanceThemeNameBlue": { "description": "Label for the blue color scheme option" },
+    "settingsAppearanceThemeNameGrey": "رمادي",
+    "@settingsAppearanceThemeNameGrey": { "description": "Label for the grey color scheme option" },
+    "settingsAppearanceFontSizeSmall": "صغير",
+    "@settingsAppearanceFontSizeSmall": { "description": "Label for the small font size option" },
+    "settingsAppearanceFontSizeLarge": "كبير",
+    "@settingsAppearanceFontSizeLarge": { "description": "Label for the large font size option" },
+    "settingsAppearanceFontSizeMedium": "متوسط",
+    "@settingsAppearanceFontSizeMedium": { "description": "Label for the medium font size option" },
+    "settingsAppearanceThemeModeLabel": "وضع المظهر",
+    "@settingsAppearanceThemeModeLabel": { "description": "Label for the theme mode selection dropdown" },
+    "settingsAppearanceThemeNameLabel": "نظام الألوان",
+    "@settingsAppearanceThemeNameLabel": { "description": "Label for the color scheme selection dropdown" },
+    "settingsAppearanceAppFontSizeLabel": "حجم خط التطبيق",
+    "@settingsAppearanceAppFontSizeLabel": { "description": "Label for the app font size selection dropdown" },
+    "settingsAppearanceAppFontTypeLabel": "خط التطبيق",
+    "@settingsAppearanceAppFontTypeLabel": { "description": "Label for the app font selection dropdown" },
+    "settingsFeedTileTypeImageTop": "صورة في الأعلى",
+    "@settingsFeedTileTypeImageTop": { "description": "Label for the feed tile type with image on top" },
+    "settingsFeedTileTypeImageStart": "صورة في البداية",
+    "@settingsFeedTileTypeImageStart": { "description": "Label for the feed tile type with image at the start" },
+    "settingsFeedTileTypeTextOnly": "نص فقط",
+    "@settingsFeedTileTypeTextOnly": { "description": "Label for the feed tile type with text only" },
+    "settingsFeedTileTypeLabel": "تخطيط عنصر الموجز",
+    "@settingsFeedTileTypeLabel": { "description": "Label for the feed tile layout selection dropdown" },
+    "settingsArticleFontSizeLabel": "حجم خط المقال",
+    "@settingsArticleFontSizeLabel": { "description": "Label for the article font size selection dropdown" },
+    "settingsNotificationsEnableLabel": "تفعيل الإشعارات",
+    "@settingsNotificationsEnableLabel": { "description": "Label for the switch to enable/disable notifications" },
+    "settingsNotificationsCategoriesLabel": "الفئات المتابعة",
+    "@settingsNotificationsCategoriesLabel": { "description": "Label for the section to select notification categories" },
+    "settingsNotificationsSourcesLabel": "المصادر المتابعة",
+    "@settingsNotificationsSourcesLabel": { "description": "Label for the section to select notification sources" },
+    "settingsNotificationsCountriesLabel": "البلدان المتابعة",
+    "@settingsNotificationsCountriesLabel": { "description": "Label for the section to select notification countries" }
 }
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
@@ -357,5 +357,65 @@
     "sourceFilterEmptySubheadline": "There are no sources available at the moment.",
     "@sourceFilterEmptySubheadline": {
         "description": "Subheadline for empty state on source filter page"
-    }
+    },
+    "settingsTitle": "Settings",
+    "@settingsTitle": { "description": "Title for the main settings page" },
+    "settingsLoadingHeadline": "Loading Settings...",
+    "@settingsLoadingHeadline": { "description": "Headline shown while settings are loading" },
+    "settingsLoadingSubheadline": "Please wait while we fetch your preferences.",
+    "@settingsLoadingSubheadline": { "description": "Subheadline shown while settings are loading" },
+    "settingsErrorDefault": "Could not load settings.",
+    "@settingsErrorDefault": { "description": "Default error message when settings fail to load" },
+    "settingsAppearanceTitle": "Appearance",
+    "@settingsAppearanceTitle": { "description": "Title for the appearance settings section/page" },
+    "settingsFeedDisplayTitle": "Feed Display",
+    "@settingsFeedDisplayTitle": { "description": "Title for the feed display settings section/page" },
+    "settingsArticleDisplayTitle": "Article Display",
+    "@settingsArticleDisplayTitle": { "description": "Title for the article display settings section/page" },
+    "settingsNotificationsTitle": "Notifications",
+    "@settingsNotificationsTitle": { "description": "Title for the notification settings section/page" },
+    "settingsAppearanceThemeModeLight": "Light",
+    "@settingsAppearanceThemeModeLight": { "description": "Label for the light theme mode option" },
+    "settingsAppearanceThemeModeDark": "Dark",
+    "@settingsAppearanceThemeModeDark": { "description": "Label for the dark theme mode option" },
+    "settingsAppearanceThemeModeSystem": "System",
+    "@settingsAppearanceThemeModeSystem": { "description": "Label for the system theme mode option" },
+    "settingsAppearanceThemeNameRed": "Red",
+    "@settingsAppearanceThemeNameRed": { "description": "Label for the red color scheme option" },
+    "settingsAppearanceThemeNameBlue": "Blue",
+    "@settingsAppearanceThemeNameBlue": { "description": "Label for the blue color scheme option" },
+    "settingsAppearanceThemeNameGrey": "Grey",
+    "@settingsAppearanceThemeNameGrey": { "description": "Label for the grey color scheme option" },
+    "settingsAppearanceFontSizeSmall": "Small",
+    "@settingsAppearanceFontSizeSmall": { "description": "Label for the small font size option" },
+    "settingsAppearanceFontSizeLarge": "Large",
+    "@settingsAppearanceFontSizeLarge": { "description": "Label for the large font size option" },
+    "settingsAppearanceFontSizeMedium": "Medium",
+    "@settingsAppearanceFontSizeMedium": { "description": "Label for the medium font size option" },
+    "settingsAppearanceThemeModeLabel": "Theme Mode",
+    "@settingsAppearanceThemeModeLabel": { "description": "Label for the theme mode selection dropdown" },
+    "settingsAppearanceThemeNameLabel": "Color Scheme",
+    "@settingsAppearanceThemeNameLabel": { "description": "Label for the color scheme selection dropdown" },
+    "settingsAppearanceAppFontSizeLabel": "App Font Size",
+    "@settingsAppearanceAppFontSizeLabel": { "description": "Label for the app font size selection dropdown" },
+    "settingsAppearanceAppFontTypeLabel": "App Font",
+    "@settingsAppearanceAppFontTypeLabel": { "description": "Label for the app font selection dropdown" },
+    "settingsFeedTileTypeImageTop": "Image Top",
+    "@settingsFeedTileTypeImageTop": { "description": "Label for the feed tile type with image on top" },
+    "settingsFeedTileTypeImageStart": "Image Start",
+    "@settingsFeedTileTypeImageStart": { "description": "Label for the feed tile type with image at the start" },
+    "settingsFeedTileTypeTextOnly": "Text Only",
+    "@settingsFeedTileTypeTextOnly": { "description": "Label for the feed tile type with text only" },
+    "settingsFeedTileTypeLabel": "Feed Tile Layout",
+    "@settingsFeedTileTypeLabel": { "description": "Label for the feed tile layout selection dropdown" },
+    "settingsArticleFontSizeLabel": "Article Font Size",
+    "@settingsArticleFontSizeLabel": { "description": "Label for the article font size selection dropdown" },
+    "settingsNotificationsEnableLabel": "Enable Notifications",
+    "@settingsNotificationsEnableLabel": { "description": "Label for the switch to enable/disable notifications" },
+    "settingsNotificationsCategoriesLabel": "Followed Categories",
+    "@settingsNotificationsCategoriesLabel": { "description": "Label for the section to select notification categories" },
+    "settingsNotificationsSourcesLabel": "Followed Sources",
+    "@settingsNotificationsSourcesLabel": { "description": "Label for the section to select notification sources" },
+    "settingsNotificationsCountriesLabel": "Followed Countries",
+    "@settingsNotificationsCountriesLabel": { "description": "Label for the section to select notification countries" }
 }
diff --git a/lib/shared/theme/app_theme.dart b/lib/shared/theme/app_theme.dart
