Merge pull request #164 from flutter-news-app-full-source-code/fix/saved-filters-demo-intial-data-not-applied

Fix/saved filters demo intial data not applied

Author: fulleni

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.4.0 - 2025-10-14
 
+- **feat(demo)**: pre-populate saved filters and settings for new anonymous users
+- **fix**: ensure saved filters are immediately visible on app start
 - **feat**: implement saved feed filters with create, rename, and delete
 - **feat**: add horizontal filter bar to the headlines feed for quick selection
 - **refactor**: replace monolithic "apply followed items" with granular controls

lib/app/bloc/app_bloc.dart

@@ -350,6 +350,11 @@ class AppBloc extends Bloc<AppEvent, AppState> {
             '[AppBloc] Demo mode: User-specific data initialized for '
             'user: ${newUser.id}.',
           );
+          // After successful initialization, immediately re-fetch the user data.
+          // This ensures that the newly created fixture data (settings and preferences)
+          // is loaded into the AppState and propagated to the UI, making features
+          // like the saved filters bar immediately visible.
+          await _fetchAndSetUserData(newUser, emit);
         } catch (e, s) {
           _logger.severe(
             '[AppBloc] ERROR: Failed to initialize demo user data.',
@@ -408,9 +413,12 @@ class AppBloc extends Bloc<AppEvent, AppState> {
         }
       }
 
-      // After potential initialization and migration,
-      // ensure user-specific data (settings and preferences) are loaded.
-      await _fetchAndSetUserData(newUser, emit);
+      // If not in demo mode, or if the demo initializer is not used,
+      // perform the standard data fetch. In demo mode, this call is now
+      // redundant as it's handled immediately after initialization.
+      if (_environment != local_config.AppEnvironment.demo) {
+        await _fetchAndSetUserData(newUser, emit);
+      }
     } else {
       // If user logs out, clear user-specific data from state.
       emit(state.copyWith(settings: null, userContentPreferences: null));

lib/app/services/demo_data_initializer_service.dart

@@ -4,8 +4,13 @@ import 'package:logging/logging.dart';
 
 /// {@template demo_data_initializer_service}
 /// A service responsible for ensuring that essential user-specific data
-/// (like [UserAppSettings] and [UserContentPreferences]) exists in the
-/// data in-memory clients when a user is first encountered in the demo environment.
+/// (like [UserAppSettings] and [UserContentPreferences]) exists for a new user
+/// in the demo environment.
+///
+/// Instead of creating default empty objects, this service now acts as a
+/// "fixture injector". It clones rich, pre-defined data from fixture lists,
+/// providing new anonymous users with a full-featured initial experience,
+/// including pre-populated saved filters.
 ///
 /// This service is specifically designed for the in-memory data clients
 /// used in the demo environment. In production/development environments,
@@ -17,6 +22,8 @@ class DemoDataInitializerService {
     required DataRepository<UserAppSettings> userAppSettingsRepository,
     required DataRepository<UserContentPreferences>
     userContentPreferencesRepository,
+    required this.userAppSettingsFixturesData,
+    required this.userContentPreferencesFixturesData,
   }) : _userAppSettingsRepository = userAppSettingsRepository,
        _userContentPreferencesRepository = userContentPreferencesRepository,
        _logger = Logger('DemoDataInitializerService');
@@ -26,6 +33,16 @@ class DemoDataInitializerService {
   _userContentPreferencesRepository;
   final Logger _logger;
 
+  /// A list of [UserAppSettings] fixture data to be used as a template.
+  ///
+  /// The first item in this list will be cloned for new users.
+  final List<UserAppSettings> userAppSettingsFixturesData;
+
+  /// A list of [UserContentPreferences] fixture data to be used as a template.
+  ///
+  /// The first item in this list will be cloned for new users.
+  final List<UserContentPreferences> userContentPreferencesFixturesData;
+
   /// Initializes essential user-specific data in the in-memory clients
   /// for the given [user].
   ///
@@ -58,36 +75,25 @@ class DemoDataInitializerService {
     } on NotFoundException {
       _logger.info(
         'UserAppSettings not found for user ID: '
-        '$userId. Creating default settings.',
+        '$userId. Creating settings from fixture.',
       );
-      final defaultSettings = UserAppSettings(
+      // Clone the first item from the fixture data, assigning the new user's ID.
+      // This ensures every new demo user gets a rich, pre-populated set of settings.
+      if (userAppSettingsFixturesData.isEmpty) {
+        throw StateError(
+          'Cannot create settings from fixture: userAppSettingsFixturesData is empty.',
+        );
+      }
+      final fixtureSettings = userAppSettingsFixturesData.first.copyWith(
         id: userId,
-        displaySettings: const DisplaySettings(
-          baseTheme: AppBaseTheme.system,
-          accentTheme: AppAccentTheme.defaultBlue,
-          fontFamily: 'SystemDefault',
-          textScaleFactor: AppTextScaleFactor.medium,
-          fontWeight: AppFontWeight.regular,
-        ),
-        language: languagesFixturesData.firstWhere(
-          (l) => l.code == 'en',
-          orElse: () => throw StateError(
-            'Default language "en" not found in language fixtures.',
-          ),
-        ),
-        feedPreferences: const FeedDisplayPreferences(
-          headlineDensity: HeadlineDensity.standard,
-          headlineImageStyle: HeadlineImageStyle.smallThumbnail,
-          showSourceInHeadlineFeed: true,
-          showPublishDateInHeadlineFeed: true,
-        ),
       );
+
       await _userAppSettingsRepository.create(
-        item: defaultSettings,
+        item: fixtureSettings,
         userId: userId,
       );
       _logger.info(
-        'Default UserAppSettings created for '
+        'UserAppSettings from fixture created for '
         'user ID: $userId.',
       );
     } catch (e, s) {
@@ -110,22 +116,24 @@ class DemoDataInitializerService {
     } on NotFoundException {
       _logger.info(
         'UserContentPreferences not found for '
-        'user ID: $userId. Creating default preferences.',
-      );
-      final defaultPreferences = UserContentPreferences(
-        id: userId,
-        followedCountries: const [],
-        followedSources: const [],
-        followedTopics: const [],
-        savedHeadlines: const [],
-        savedFilters: const [],
+        'user ID: $userId. Creating preferences from fixture.',
       );
+      // Clone the first item from the fixture data, assigning the new user's ID.
+      // This provides new demo users with pre-populated saved filters and other preferences.
+      if (userContentPreferencesFixturesData.isEmpty) {
+        throw StateError(
+          'Cannot create preferences from fixture: userContentPreferencesFixturesData is empty.',
+        );
+      }
+      final fixturePreferences = userContentPreferencesFixturesData.first
+          .copyWith(id: userId);
+
       await _userContentPreferencesRepository.create(
-        item: defaultPreferences,
+        item: fixturePreferences,
         userId: userId,
       );
       _logger.info(
-        'Default UserContentPreferences created '
+        'UserContentPreferences from fixture created '
         'for user ID: $userId.',
       );
     } catch (e, s) {

lib/bootstrap.dart

@@ -469,15 +469,18 @@ Future<Widget> bootstrap(
   );
 
   // Conditionally instantiate DemoDataInitializerService
-  // This service is responsible for ensuring that essential user-specific data
-  // (like UserAppSettings, UserContentPreferences)
-  // exists in the data in-memory clients when a user is first encountered
-  // in the demo environment.
+  // In the demo environment, this service acts as a "fixture injector".
+  // When a new user is encountered, it clones pre-defined fixture data
+  // (settings and preferences, including saved filters) for that user,
+  // ensuring a rich initial experience.
   final demoDataInitializerService =
       appConfig.environment == app_config.AppEnvironment.demo
       ? DemoDataInitializerService(
           userAppSettingsRepository: userAppSettingsRepository,
           userContentPreferencesRepository: userContentPreferencesRepository,
+          userAppSettingsFixturesData: userAppSettingsFixturesData,
+          userContentPreferencesFixturesData:
+              userContentPreferencesFixturesData,
         )
       : null;
   logger

lib/headlines-feed/bloc/headlines_feed_bloc.dart

@@ -30,12 +30,25 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
     required FeedDecoratorService feedDecoratorService,
     required AppBloc appBloc,
     required InlineAdCacheService inlineAdCacheService,
+    UserContentPreferences? initialUserContentPreferences,
   }) : _headlinesRepository = headlinesRepository,
        _feedDecoratorService = feedDecoratorService,
        _appBloc = appBloc,
        _inlineAdCacheService = inlineAdCacheService,
-       super(const HeadlinesFeedState()) {
+       super(
+         HeadlinesFeedState(
+           // Initialize the state with saved filters from the AppBloc's
+           // current state. This prevents a race condition where the
+           // feed bloc is created after the AppBloc has already loaded
+           // the user's preferences, ensuring the UI has the data
+           // from the very beginning.
+           savedFilters:
+               initialUserContentPreferences?.savedFilters ?? const [],
+         ),
+       ) {
     // Subscribe to AppBloc to receive updates on user preferences.
+    // This handles subsequent changes to preferences (e.g., adding/deleting
+    // a filter) while the feed page is active.
     _appBlocSubscription = _appBloc.stream.listen((appState) {
       // Check if userContentPreferences has changed and is not null.
       if (appState.userContentPreferences != null &&

lib/router/router.dart

@@ -346,12 +346,21 @@ GoRouter createRouter({
             providers: [
               BlocProvider(
                 create: (context) {
+                  // Read the AppBloc once to get the initial state.
+                  final appBloc = context.read<AppBloc>();
+
                   return HeadlinesFeedBloc(
                     headlinesRepository: context
                         .read<DataRepository<Headline>>(),
                     feedDecoratorService: feedDecoratorService,
-                    appBloc: context.read<AppBloc>(),
+                    appBloc: appBloc,
                     inlineAdCacheService: inlineAdCacheService,
+                    // Prime the HeadlinesFeedBloc with the initial user
+                    // preferences. This prevents a race condition where the
+                    // feed is displayed before the bloc receives the saved
+                    // filters from the AppBloc stream.
+                    initialUserContentPreferences:
+                        appBloc.state.userContentPreferences,
                   );
                 },
               ),