Early remote config fetch and app initialization streamlining

lib/account/view/manage_followed_items/countries/add_country_to_follow_page.dart

@@ -2,8 +2,8 @@ import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/available_countries_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:ui_kit/ui_kit.dart';
 
@@ -57,14 +57,14 @@ class AddCountryToFollowPage extends StatelessWidget {
 
             final countries = countriesState.availableCountries;
 
-            return BlocBuilder<AccountBloc, AccountState>(
+            return BlocBuilder<AppBloc, AppState>(
               buildWhen: (previous, current) =>
-                  previous.preferences?.followedCountries !=
-                      current.preferences?.followedCountries ||
-                  previous.status != current.status,
-              builder: (context, accountState) {
+                  previous.userContentPreferences?.followedCountries !=
+                  current.userContentPreferences?.followedCountries,
+              builder: (context, appState) {
+                final userContentPreferences = appState.userContentPreferences;
                 final followedCountries =
-                    accountState.preferences?.followedCountries ?? [];
+                    userContentPreferences?.followedCountries ?? [];
 
                 return ListView.builder(
                   padding: const EdgeInsets.symmetric(
@@ -150,8 +150,28 @@ class AddCountryToFollowPage extends StatelessWidget {
                               ? l10n.unfollowCountryTooltip(country.name)
                               : l10n.followCountryTooltip(country.name),
                           onPressed: () {
-                            context.read<AccountBloc>().add(
-                              AccountFollowCountryToggled(country: country),
+                            if (userContentPreferences == null) return;
+
+                            final updatedFollowedCountries = List<Country>.from(
+                              followedCountries,
+                            );
+                            if (isFollowed) {
+                              updatedFollowedCountries.removeWhere(
+                                (c) => c.id == country.id,
+                              );
+                            } else {
+                              updatedFollowedCountries.add(country);
+                            }
+
+                            final updatedPreferences = userContentPreferences
+                                .copyWith(
+                                  followedCountries: updatedFollowedCountries,
+                                );
+
+                            context.read<AppBloc>().add(
+                              AppUserContentPreferencesChanged(
+                                preferences: updatedPreferences,
+                              ),
                             );
                           },
                         ),

lib/account/view/manage_followed_items/countries/followed_countries_list_page.dart

@@ -1,8 +1,8 @@
 import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/interstitial_ad_manager.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/router/routes.dart';
 import 'package:go_router/go_router.dart';
@@ -18,8 +18,6 @@ class FollowedCountriesListPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizationsX(context).l10n;
-    final followedCountries =
-        context.watch<AccountBloc>().state.preferences?.followedCountries ?? [];
 
     return Scaffold(
       appBar: AppBar(
@@ -34,33 +32,31 @@ class FollowedCountriesListPage extends StatelessWidget {
           ),
         ],
       ),
-      body: BlocBuilder<AccountBloc, AccountState>(
-        builder: (context, state) {
-          if (state.status == AccountStatus.loading &&
-              state.preferences == null) {
+      body: BlocBuilder<AppBloc, AppState>(
+        builder: (context, appState) {
+          final user = appState.user;
+          final userContentPreferences = appState.userContentPreferences;
+
+          if (appState.status == AppLifeCycleStatus.loadingUserData ||
+              userContentPreferences == null) {
             return LoadingStateWidget(
               icon: Icons.flag_outlined,
               headline: l10n.followedCountriesLoadingHeadline,
               subheadline: l10n.pleaseWait,
             );
           }
 
-          if (state.status == AccountStatus.failure &&
-              state.preferences == null) {
+          if (appState.initialUserPreferencesError != null) {
             return FailureStateWidget(
-              exception:
-                  state.error ??
-                  OperationFailedException(l10n.followedCountriesErrorHeadline),
+              exception: appState.initialUserPreferencesError!,
               onRetry: () {
-                if (state.user?.id != null) {
-                  context.read<AccountBloc>().add(
-                    AccountLoadUserPreferences(userId: state.user!.id),
-                  );
-                }
+                context.read<AppBloc>().add(AppStarted(initialUser: user));
               },
             );
           }
 
+          final followedCountries = userContentPreferences.followedCountries;
+
           if (followedCountries.isEmpty) {
             return InitialStateWidget(
               icon: Icons.location_off_outlined,
@@ -91,8 +87,18 @@ class FollowedCountriesListPage extends StatelessWidget {
                   ),
                   tooltip: l10n.unfollowCountryTooltip(country.name),
                   onPressed: () {
-                    context.read<AccountBloc>().add(
-                      AccountFollowCountryToggled(country: country),
+                    final updatedFollowedCountries = List<Country>.from(
+                      followedCountries,
+                    )..removeWhere((c) => c.id == country.id);
+
+                    final updatedPreferences = userContentPreferences.copyWith(
+                      followedCountries: updatedFollowedCountries,
+                    );
+
+                    context.read<AppBloc>().add(
+                      AppUserContentPreferencesChanged(
+                        preferences: updatedPreferences,
+                      ),
                     );
                   },
                 ),

lib/account/view/manage_followed_items/sources/add_source_to_follow_page.dart

@@ -2,8 +2,8 @@ import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/account_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/available_sources_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
 import 'package:ui_kit/ui_kit.dart';
 
@@ -47,14 +47,14 @@ class AddSourceToFollowPage extends StatelessWidget {
               );
             }
 
-            return BlocBuilder<AccountBloc, AccountState>(
+            return BlocBuilder<AppBloc, AppState>(
               buildWhen: (previous, current) =>
-                  previous.preferences?.followedSources !=
-                      current.preferences?.followedSources ||
-                  previous.status != current.status,
-              builder: (context, accountState) {
+                  previous.userContentPreferences?.followedSources !=
+                  current.userContentPreferences?.followedSources,
+              builder: (context, appState) {
+                final userContentPreferences = appState.userContentPreferences;
                 final followedSources =
-                    accountState.preferences?.followedSources ?? [];
+                    userContentPreferences?.followedSources ?? [];
 
                 return ListView.builder(
                   padding: const EdgeInsets.all(AppSpacing.md),
@@ -80,8 +80,28 @@ class AddSourceToFollowPage extends StatelessWidget {
                               ? l10n.unfollowSourceTooltip(source.name)
                               : l10n.followSourceTooltip(source.name),
                           onPressed: () {
-                            context.read<AccountBloc>().add(
-                              AccountFollowSourceToggled(source: source),
+                            if (userContentPreferences == null) return;
+
+                            final updatedFollowedSources = List<Source>.from(
+                              followedSources,
+                            );
+                            if (isFollowed) {
+                              updatedFollowedSources.removeWhere(
+                                (s) => s.id == source.id,
+                              );
+                            } else {
+                              updatedFollowedSources.add(source);
+                            }
+
+                            final updatedPreferences = userContentPreferences
+                                .copyWith(
+                                  followedSources: updatedFollowedSources,
+                                );
+
+                            context.read<AppBloc>().add(
+                              AppUserContentPreferencesChanged(
+                                preferences: updatedPreferences,
+                              ),
                             );
                           },
                         ),