chore: misc

Author: fulleni

lib/ads/widgets/widgets.dart

@@ -1,4 +1,4 @@
-export 'ad_loader_widget.dart';
+export 'feed_ad_loader_widget.dart';
 export 'admob_inline_ad_widget.dart';
 export 'in_article_ad_loader_widget.dart';
 export 'local_banner_ad_widget.dart';

lib/entity_details/bloc/entity_details_bloc.dart

@@ -7,7 +7,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/account/bloc/account_bloc.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_cache_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/inline_ad_cache_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.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/shared/services/feed_decorator_service.dart';
@@ -68,7 +68,7 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
   ) async {
     // When loading a new entity's details, clear any previously cached ads
     // to ensure a fresh set of ads is displayed for the new content.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     emit(
       state.copyWith(status: EntityDetailsStatus.loading, clearEntity: true),
     );

lib/entity_details/view/entity_details_page.dart

@@ -6,7 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_placeholder.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/ad_loader_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/feed_ad_loader_widget.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/entity_details/bloc/entity_details_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/app_localizations.dart';
@@ -354,16 +354,19 @@ class _EntityDetailsViewState extends State<EntityDetailsView> {
                         // Retrieve the user's preferred headline image style from the AppBloc.
                         // This is the single source of truth for this setting.
                         // Access the AppBloc to get the remoteConfig for ads.
-                        final adConfig =
-                            context.read<AppBloc>().state.remoteConfig?.adConfig;
+                        final adConfig = context
+                            .read<AppBloc>()
+                            .state
+                            .remoteConfig
+                            ?.adConfig;
 
                         // Ensure adConfig is not null before building the AdLoaderWidget.
                         if (adConfig == null) {
                           // Return an empty widget or a placeholder if adConfig is not available.
                           return const SizedBox.shrink();
                         }
 
-                        return AdLoaderWidget(
+                        return FeedAdLoaderWidget(
                           adPlaceholder: item,
                           adService: context.read<AdService>(),
                           adThemeStyle: AdThemeStyle.fromTheme(

lib/headlines-feed/bloc/headlines_feed_bloc.dart

@@ -5,7 +5,7 @@ import 'package:bloc_concurrency/bloc_concurrency.dart';
 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/ads/ad_cache_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/inline_ad_cache_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.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/models/headline_filter.dart';
@@ -154,7 +154,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
     Emitter<HeadlinesFeedState> emit,
   ) async {
     // On a full refresh, clear the ad cache to ensure fresh ads are loaded.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     emit(state.copyWith(status: HeadlinesFeedStatus.loading));
     try {
       final currentUser = _appBloc.state.user;
@@ -236,7 +236,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
   ) async {
     // When applying new filters, this is considered a major feed change,
     // so we clear the ad cache to get a fresh set of relevant ads.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     emit(
       state.copyWith(
         status: HeadlinesFeedStatus.loading,
@@ -323,7 +323,7 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
     Emitter<HeadlinesFeedState> emit,
   ) async {
     // Clearing filters is a major feed change, so clear the ad cache.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     emit(
       state.copyWith(
         status: HeadlinesFeedStatus.loading,

lib/headlines-feed/view/headlines_feed_page.dart

@@ -8,7 +8,7 @@ import 'package:flutter_news_app_mobile_client_full_source_code/account/bloc/acc
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_placeholder.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/ad_loader_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/feed_ad_loader_widget.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/bloc/headlines_feed_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/l10n/l10n.dart';
@@ -324,16 +324,19 @@ class _HeadlinesFeedPageState extends State<HeadlinesFeedPage> {
                     return tile;
                   } else if (item is AdPlaceholder) {
                     // Access the AppBloc to get the remoteConfig for ads.
-                    final adConfig =
-                        context.read<AppBloc>().state.remoteConfig?.adConfig;
+                    final adConfig = context
+                        .read<AppBloc>()
+                        .state
+                        .remoteConfig
+                        ?.adConfig;
 
                     // Ensure adConfig is not null before building the AdLoaderWidget.
                     if (adConfig == null) {
                       // Return an empty widget or a placeholder if adConfig is not available.
                       return const SizedBox.shrink();
                     }
 
-                    return AdLoaderWidget(
+                    return FeedAdLoaderWidget(
                       adPlaceholder: item,
                       adService: context.read<AdService>(),
                       adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),

lib/headlines-search/bloc/headlines_search_bloc.dart

@@ -5,7 +5,7 @@ import 'package:bloc_concurrency/bloc_concurrency.dart';
 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/ads/ad_cache_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/inline_ad_cache_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.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/shared/services/feed_decorator_service.dart';
@@ -201,7 +201,7 @@ class HeadlinesSearchBloc
     }
 
     // New search, clear previous ad cache.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     emit(
       HeadlinesSearchLoading(
         lastSearchTerm: searchTerm,

lib/headlines-search/view/headlines_search_page.dart

@@ -8,7 +8,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_placeholder.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_theme_style.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/ad_loader_widget.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/feed_ad_loader_widget.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 // HeadlineItemWidget import removed
 import 'package:flutter_news_app_mobile_client_full_source_code/headlines-search/bloc/headlines_search_bloc.dart';
@@ -359,7 +359,7 @@ class _HeadlinesSearchViewState extends State<_HeadlinesSearchView> {
                             return const SizedBox.shrink();
                           }
 
-                          return AdLoaderWidget(
+                          return FeedAdLoaderWidget(
                             adPlaceholder: feedItem,
                             adService: context.read<AdService>(),
                             adThemeStyle: AdThemeStyle.fromTheme(

lib/settings/bloc/settings_bloc.dart

@@ -5,7 +5,7 @@ import 'package:bloc_concurrency/bloc_concurrency.dart';
 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/ads/ad_cache_service.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/inline_ad_cache_service.dart';
 
 part 'settings_event.dart';
 part 'settings_state.dart';
@@ -167,7 +167,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     // When the theme's accent color changes, ads must be reloaded to reflect
     // the new styling. Clearing the cache ensures that any visible or
     // soon-to-be-visible ads are fetched again with the updated theme.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     await _persistSettings(updatedSettings, emit);
   }
 
@@ -232,7 +232,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
     // (small or medium) is requested. To ensure the correct ad format is
     // displayed, the cache must be cleared, forcing a new ad load with the
     // appropriate template.
-    AdCacheService().clearAllAds();
+    InlineAdCacheService().clearAllAds();
     await _persistSettings(updatedSettings, emit);
   }