Merge pull request #110 from flutter-news-app-full-source-code/fix-bootstraping-dependency-chain

Fix bootstraping dependency chain

Author: fulleni

lib/ads/ad_navigator_observer.dart

@@ -118,7 +118,7 @@ class AdNavigatorObserver extends NavigatorObserver {
         _pageTransitionCount >= requiredTransitions) {
       _logger.info('Interstitial ad due. Requesting ad.');
       _showInterstitialAd();
-      _pageTransitionCount = 0; // Reset count after showing
+      _pageTransitionCount = 0;
     }
   }
 

lib/ads/admob_ad_provider.dart

@@ -26,7 +26,7 @@ class AdMobAdProvider implements AdProvider {
   final Logger _logger;
   final Uuid _uuid = const Uuid();
 
-  static const _adLoadTimeout = 15; // Unified timeout for all ad types
+  static const _adLoadTimeout = 15;
 
   @override
   Future<void> initialize() async {

lib/ads/models/banner_ad.dart

@@ -1,4 +1,4 @@
-import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:core/core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
 

lib/ads/models/inline_ad.dart

@@ -1,4 +1,4 @@
-import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:core/core.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 

lib/ads/models/interstitial_ad.dart

@@ -1,4 +1,4 @@
-import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:core/core.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 

lib/ads/models/native_ad.dart

@@ -1,4 +1,4 @@
-import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:core/core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
 

lib/ads/widgets/admob_inline_ad_widget.dart

@@ -38,7 +38,7 @@ class AdmobInlineAdWidget extends StatefulWidget {
 }
 
 class _AdmobInlineAdWidgetState extends State<AdmobInlineAdWidget> {
-  admob.Ad? _ad; // Can be NativeAd or BannerAd
+  admob.Ad? _ad;
   final Logger _logger = Logger('AdmobInlineAdWidget');
 
   @override
@@ -80,7 +80,7 @@ class _AdmobInlineAdWidgetState extends State<AdmobInlineAdWidget> {
     } else if (widget.inlineAd.adObject is admob.BannerAd) {
       _ad = widget.inlineAd.adObject as admob.BannerAd;
     } else {
-      _ad = null; // Ensure _ad is null if the type is incorrect
+      _ad = null;
 
       _logger.severe(
         'The provided ad object for AdMob inline ad is not of type '
@@ -111,7 +111,7 @@ class _AdmobInlineAdWidgetState extends State<AdmobInlineAdWidget> {
       // If largeThumbnail, assume mediumRectangle (300x250), otherwise standard banner (320x50).
       adHeight = widget.headlineImageStyle == HeadlineImageStyle.largeThumbnail
           ? 250 // Height for mediumRectangle
-          : 50; // Height for standard banner
+          : 50;
     } else {
       // Fallback height for unknown inline ad types.
       adHeight = 100;

lib/ads/widgets/feed_ad_loader_widget.dart

@@ -62,7 +62,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
   InlineAd? _loadedAd;
   bool _isLoading = true;
   bool _hasError = false;
-  final Logger _logger = Logger('FeedAdLoaderWidget'); // Renamed logger
+  final Logger _logger = Logger('FeedAdLoaderWidget');
   final InlineAdCacheService _adCacheService = InlineAdCacheService();
 
   /// Completer to manage the lifecycle of the ad loading future.
@@ -100,7 +100,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
           ),
         );
       }
-      _loadAdCompleter = null; // Clear the old completer for the new load
+      _loadAdCompleter = null;
 
       // Immediately set the widget to a loading state to prevent UI flicker.
       // This ensures a smooth transition from the old ad (or no ad) to the
@@ -110,7 +110,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
         _isLoading = true;
         _hasError = false;
       });
-      _loadAd(); // Start loading the new ad
+      _loadAd();
     }
   }
 
@@ -160,7 +160,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
       // Complete the completer only if it hasn't been completed already
       // (e.g., by dispose() or didUpdateWidget() cancelling an old load).
       if (_loadAdCompleter?.isCompleted == false) {
-        _loadAdCompleter!.complete(); // Complete the completer on success
+        _loadAdCompleter!.complete();
       }
       return;
     }
@@ -220,7 +220,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
         });
         // Complete the completer only if it hasn't been completed already.
         if (_loadAdCompleter?.isCompleted == false) {
-          _loadAdCompleter!.complete(); // Complete the completer on success
+          _loadAdCompleter!.complete();
         }
       } else {
         _logger.warning(
@@ -237,7 +237,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
         if (_loadAdCompleter?.isCompleted == false) {
           _loadAdCompleter?.completeError(
             StateError('Failed to load ad: No ad returned.'),
-          ); // Complete with error
+          );
         }
       }
     } catch (e, s) {
@@ -254,7 +254,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
       });
       // Complete the completer with an error only if it hasn't been completed already.
       if (_loadAdCompleter?.isCompleted == false) {
-        _loadAdCompleter?.completeError(e); // Complete with error
+        _loadAdCompleter?.completeError(e);
       }
     }
   }

lib/bootstrap.dart

@@ -21,6 +21,7 @@ import 'package:flutter_news_app_mobile_client_full_source_code/app/services/dem
 import 'package:flutter_news_app_mobile_client_full_source_code/bloc_observer.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/shared/data/clients/country_inmemory_client.dart';
 import 'package:http_client/http_client.dart';
+import 'package:kv_storage_service/kv_storage_service.dart';
 import 'package:kv_storage_shared_preferences/kv_storage_shared_preferences.dart';
 import 'package:logging/logging.dart';
 import 'package:timeago/timeago.dart' as timeago;
@@ -32,22 +33,57 @@ Future<Widget> bootstrap(
 ) async {
   WidgetsFlutterBinding.ensureInitialized();
   Bloc.observer = const AppBlocObserver();
-
+  final logger = Logger('bootstrap');
   timeago.setLocaleMessages('en', EnTimeagoMessages());
   timeago.setLocaleMessages('ar', ArTimeagoMessages());
 
-  final logger = Logger('bootstrap');
-
+  // 1. Initialize KV Storage Service first, as it's a foundational dependency.
   final kvStorage = await KVStorageSharedPreferences.getInstance();
 
+  // 2. Conditionally initialize HttpClient and Auth services based on environment.
+  // This ensures HttpClient is available before any DataApi or AdProvider
+  // that depends on it.
   late final AuthClient authClient;
   late final AuthRepository authenticationRepository;
-  HttpClient? httpClient;
+  late final HttpClient httpClient;
+  if (appConfig.environment == app_config.AppEnvironment.demo) {
+    // In-memory authentication for demo environment.
+    authClient = AuthInmemory();
+    authenticationRepository = AuthRepository(
+      authClient: authClient,
+      storageService: kvStorage,
+    );
+    // For demo, httpClient is not strictly needed for DataApi,
+    // but we initialize a dummy one to satisfy non-nullable requirements
+    // if any part of the code path expects it.
+    // In a real scenario, DataApi would not be used in demo mode.
+    httpClient = HttpClient(
+      baseUrl: appConfig.baseUrl,
+      tokenProvider: () async => null, // No token needed for demo
+      logger: logger,
+    );
+  } else {
+    // For production and development environments, an HTTP client is needed.
+    // Initialize HttpClient first. Its tokenProvider now directly reads from
+    // kvStorage, breaking the circular dependency with AuthRepository.
+    httpClient = HttpClient(
+      baseUrl: appConfig.baseUrl,
+      tokenProvider: () =>
+          kvStorage.readString(key: StorageKey.authToken.stringValue),
+      logger: logger,
+    );
 
-  // Initialize AdProvider and AdService
-  // Initialize AdProvider based on platform.
-  // On web, use a No-Op provider to prevent MissingPluginException,
-  // as Google Mobile Ads SDK does not support native ads on web.
+    // Now that httpClient is available, initialize AuthApi and AuthRepository.
+    authClient = AuthApi(httpClient: httpClient);
+    authenticationRepository = AuthRepository(
+      authClient: authClient,
+      storageService: kvStorage,
+    );
+  }
+
+  // 3. Initialize AdProvider and AdService.
+  // These now have a guaranteed valid httpClient (for DataApi-based LocalAdProvider)
+  // or can proceed independently (AdMobAdProvider).
   final adProviders = <AdPlatformType, AdProvider>{
     AdPlatformType.admob: AdMobAdProvider(logger: logger),
     AdPlatformType.local: LocalAdProvider(
@@ -60,7 +96,8 @@ Future<Widget> bootstrap(
                 logger: logger,
               )
             : DataApi<LocalAd>(
-                httpClient: httpClient!,
+                httpClient:
+                    httpClient, // httpClient is now guaranteed to be non-null
                 modelName: 'local_ad',
                 fromJson: LocalAd.fromJson,
                 toJson: LocalAd.toJson,
@@ -72,33 +109,14 @@ Future<Widget> bootstrap(
   };
 
   final adService = AdService(adProviders: adProviders, logger: logger);
-  await adService.initialize(); // Initialize all selected AdProviders early
-
-  if (appConfig.environment == app_config.AppEnvironment.demo) {
-    authClient = AuthInmemory();
-    authenticationRepository = AuthRepository(
-      authClient: authClient,
-      storageService: kvStorage,
-    );
-  } else {
-    // For production and development environments, an HTTP client is needed.
-    httpClient = HttpClient(
-      baseUrl: appConfig.baseUrl,
-      tokenProvider: () => authenticationRepository.getAuthToken(),
-      logger: logger,
-    );
-    authClient = AuthApi(httpClient: httpClient);
-    authenticationRepository = AuthRepository(
-      authClient: authClient,
-      storageService: kvStorage,
-    );
-  }
+  await adService.initialize();
 
   // Fetch the initial user from the authentication repository.
   // This ensures the AppBloc starts with an accurate authentication status.
   final initialUser = await authenticationRepository.getCurrentUser();
 
-  // Conditional data client instantiation based on environment
+  // 4. Initialize all other DataClients and Repositories.
+  // These now also have a guaranteed valid httpClient.
   DataClient<Headline> headlinesClient;
   DataClient<Topic> topicsClient;
   DataClient<Country> countriesClient;
@@ -107,8 +125,7 @@ Future<Widget> bootstrap(
   DataClient<UserAppSettings> userAppSettingsClient;
   DataClient<RemoteConfig> remoteConfigClient;
   DataClient<User> userClient;
-  DataClient<LocalAd> localAdClient; // Declare localAdClient
-
+  DataClient<LocalAd> localAdClient;
   if (appConfig.environment == app_config.AppEnvironment.demo) {
     headlinesClient = DataInMemory<Headline>(
       toJson: (i) => i.toJson(),
@@ -192,7 +209,7 @@ Future<Widget> bootstrap(
     );
   } else if (appConfig.environment == app_config.AppEnvironment.development) {
     headlinesClient = DataApi<Headline>(
-      httpClient: httpClient!,
+      httpClient: httpClient,
       modelName: 'headline',
       fromJson: Headline.fromJson,
       toJson: (headline) => headline.toJson(),
@@ -257,7 +274,7 @@ Future<Widget> bootstrap(
   } else {
     // Default to API clients for production
     headlinesClient = DataApi<Headline>(
-      httpClient: httpClient!,
+      httpClient: httpClient,
       modelName: 'headline',
       fromJson: Headline.fromJson,
       toJson: (headline) => headline.toJson(),

lib/headlines-feed/bloc/countries_filter_bloc.dart

@@ -6,7 +6,7 @@ import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.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/headlines-feed/view/country_filter_page.dart'; // Import AppBloc
+import 'package:flutter_news_app_mobile_client_full_source_code/headlines-feed/view/country_filter_page.dart';
 
 part 'countries_filter_event.dart';
 part 'countries_filter_state.dart';
@@ -38,7 +38,7 @@ class CountriesFilterBloc
     on<CountriesFilterApplyFollowedRequested>(
       _onCountriesFilterApplyFollowedRequested,
       transformer: restartable(),
-    ); // Register new event handler
+    );
   }
 
   final DataRepository<Country> _countriesRepository;