Merge pull request #127 from flutter-news-app-full-source-code/build/update-deps

build(deps): update git dependencies to specific refs

Author: fulleni

lib/account/view/saved_headlines_page.dart

@@ -95,8 +95,7 @@ class SavedHeadlinesPage extends StatelessWidget {
               final headline = savedHeadlines[index];
               final imageStyle =
                   appState.settings?.feedPreferences.headlineImageStyle ??
-                  HeadlineImageStyle
-                      .smallThumbnail; // Default if settings not loaded
+                  HeadlineImageStyle.smallThumbnail;
 
               final trailingButton = IconButton(
                 icon: Icon(Icons.delete_outline, color: colorScheme.error),

lib/ads/ad_service.dart

@@ -56,7 +56,7 @@ class AdService {
   Future<void> disposeAd(dynamic adModel) async {
     // Determine the AdPlatformType from the adModel if it's an InlineAd or InterstitialAd.
     AdPlatformType? providerType;
-    Object? adObject; // To hold the actual ad object
+    Object? adObject;
 
     if (adModel is InlineAd) {
       providerType = adModel.provider;
@@ -69,7 +69,7 @@ class AdService {
     if (providerType != null && adObject != null) {
       final adProvider = _adProviders[providerType];
       if (adProvider != null) {
-        await adProvider.disposeAd(adObject); // Pass the actual ad object
+        await adProvider.disposeAd(adObject);
       } else {
         _logger.warning(
           'AdService: No AdProvider found for type $providerType to dispose ad.',
@@ -95,10 +95,12 @@ class AdService {
   /// - [adThemeStyle]: UI-agnostic theme properties for ad styling.
   /// - [headlineImageStyle]: The user's preference for feed layout,
   ///   which can be used to request an appropriately sized ad.
+  /// - [userRole]: The current role of the user, used to determine ad visibility.
   Future<InlineAd?> getFeedAd({
     required AdConfig adConfig,
     required AdType adType,
     required AdThemeStyle adThemeStyle,
+    required AppUserRole userRole,
     HeadlineImageStyle? headlineImageStyle,
   }) async {
     _logger.info('AdService: getFeedAd called for adType: $adType');
@@ -108,6 +110,7 @@ class AdService {
       adThemeStyle: adThemeStyle,
       feedAd: true,
       headlineImageStyle: headlineImageStyle,
+      userRole: userRole,
     );
   }
 
@@ -116,25 +119,37 @@ class AdService {
   /// This method delegates the ad loading to the appropriate [AdProvider]
   /// based on the [adConfig]'s `primaryAdPlatform`. It is specifically
   /// designed for interstitial ads that are displayed as full-screen overlays,
-  /// typically triggered on route changes.
+  /// typically on route changes.
   ///
   /// Returns an [InterstitialAd] if an interstitial ad is available, otherwise `null`.
   ///
   /// - [adConfig]: The remote configuration for ad display rules.
   /// - [adThemeStyle]: UI-agnostic theme properties for ad styling.
+  /// - [userRole]: The current role of the user, used to determine ad visibility.
   Future<InterstitialAd?> getInterstitialAd({
     required AdConfig adConfig,
     required AdThemeStyle adThemeStyle,
+    required AppUserRole userRole,
   }) async {
     _logger.info('AdService: getInterstitialAd called.');
     if (!adConfig.enabled) {
       _logger.info('AdService: Ads are globally disabled in RemoteConfig.');
       return null;
     }
 
-    // Check if interstitial ads are enabled in the remote config.
-    if (!adConfig.interstitialAdConfiguration.enabled) {
-      _logger.info('AdService: Interstitial ads are disabled in RemoteConfig.');
+    // Check if interstitial ads are enabled for the current user role.
+    final interstitialConfig = adConfig.interstitialAdConfiguration;
+    // Check if the interstitial ads are globally enabled AND if the current
+    // user role has a defined configuration in the visibleTo map.
+    final isInterstitialEnabledForRole =
+        interstitialConfig.enabled &&
+        interstitialConfig.visibleTo.containsKey(userRole);
+
+    if (!isInterstitialEnabledForRole) {
+      _logger.info(
+        'AdService: Interstitial ads are disabled for user role $userRole '
+        'or globally in RemoteConfig.',
+      );
       return null;
     }
 
@@ -216,17 +231,23 @@ class AdService {
   ///
   /// - [adConfig]: The remote configuration for ad display rules.
   /// - [adThemeStyle]: UI-agnostic theme properties for ad styling.
+  /// - [userRole]: The current role of the user, used to determine ad visibility.
+  /// - [slotType]: The specific in-article ad slot type.
   Future<InlineAd?> getInArticleAd({
     required AdConfig adConfig,
     required AdThemeStyle adThemeStyle,
+    required AppUserRole userRole,
+    required InArticleAdSlotType slotType,
   }) async {
     _logger.info('AdService: getInArticleAd called.');
     return _loadInlineAd(
       adConfig: adConfig,
-      adType: AdType.banner, // In-article ads are now always banners
+      adType: AdType.banner,
       adThemeStyle: adThemeStyle,
       feedAd: false,
       bannerAdShape: adConfig.articleAdConfiguration.bannerAdShape,
+      userRole: userRole,
+      slotType: slotType,
     );
   }
 
@@ -243,30 +264,57 @@ class AdService {
   /// - [headlineImageStyle]: The user's preference for feed layout,
   ///   which can be used to request an appropriately sized ad.
   /// - [bannerAdShape]: The preferred shape for banner ads, used for in-article banners.
+  /// - [userRole]: The current role of the user, used to determine ad visibility.
+  /// - [slotType]: The specific in-article ad slot type, used for in-article ads.
   ///
   /// Returns an [InlineAd] if an ad is successfully loaded, otherwise `null`.
   Future<InlineAd?> _loadInlineAd({
     required AdConfig adConfig,
     required AdType adType,
     required AdThemeStyle adThemeStyle,
     required bool feedAd,
+    required AppUserRole userRole,
     HeadlineImageStyle? headlineImageStyle,
     BannerAdShape? bannerAdShape,
+    InArticleAdSlotType? slotType,
   }) async {
     _logger.info(
       'AdService: _loadInlineAd called for adType: $adType, feedAd: $feedAd',
     );
-    // Check if ads are globally enabled and specifically for the context (feed or article).
+    // Check if ads are globally enabled.
     if (!adConfig.enabled) {
       _logger.info('AdService: Ads are globally disabled in RemoteConfig.');
       return null;
     }
-    if (feedAd && !adConfig.feedAdConfiguration.enabled) {
-      _logger.info('AdService: Feed ads are disabled in RemoteConfig.');
-      return null;
+
+    // Check if ads are enabled for the specific context and user role.
+    var isContextEnabled = false;
+    if (feedAd) {
+      final feedAdConfig = adConfig.feedAdConfiguration;
+      // Check if feed ads are globally enabled AND if the current user role
+      // has a defined configuration in the visibleTo map.
+      isContextEnabled =
+          feedAdConfig.enabled && feedAdConfig.visibleTo.containsKey(userRole);
+    } else {
+      // For in-article ads, check global article ad enablement and then
+      // specific slot enablement for the user role.
+      final articleAdConfig = adConfig.articleAdConfiguration;
+      final isArticleAdEnabledForRole = articleAdConfig.visibleTo.containsKey(
+        userRole,
+      );
+      final isSlotEnabledForRole =
+          articleAdConfig.visibleTo[userRole]?[slotType] ?? false;
+      isContextEnabled =
+          articleAdConfig.enabled &&
+          isArticleAdEnabledForRole &&
+          isSlotEnabledForRole;
     }
-    if (!feedAd && !adConfig.articleAdConfiguration.enabled) {
-      _logger.info('AdService: In-article ads are disabled in RemoteConfig.');
+
+    if (!isContextEnabled) {
+      _logger.info(
+        'AdService: Ads are disabled for current context (feedAd: $feedAd, '
+        'slotType: $slotType) and user role $userRole in RemoteConfig.',
+      );
       return null;
     }
 

lib/ads/demo_ad_provider.dart

@@ -44,7 +44,7 @@ class DemoAdProvider implements AdProvider {
     return NativeAd(
       id: _uuid.v4(),
       provider: AdPlatformType.demo,
-      adObject: Object(), // Placeholder object
+      adObject: Object(),
       templateType: headlineImageStyle == HeadlineImageStyle.largeThumbnail
           ? NativeAdTemplateType.medium
           : NativeAdTemplateType.small,
@@ -65,7 +65,7 @@ class DemoAdProvider implements AdProvider {
     return BannerAd(
       id: _uuid.v4(),
       provider: AdPlatformType.demo,
-      adObject: Object(), // Placeholder object
+      adObject: Object(),
     );
   }
 
@@ -82,7 +82,7 @@ class DemoAdProvider implements AdProvider {
     return InterstitialAd(
       id: _uuid.v4(),
       provider: AdPlatformType.demo,
-      adObject: Object(), // Placeholder object
+      adObject: Object(),
     );
   }
 

lib/ads/inline_ad_cache_service.dart

@@ -109,7 +109,7 @@ class InlineAdCacheService {
     final ad = _cache[id];
     if (ad != null) {
       _logger.info('Removing and disposing inline ad with ID "$id".');
-      _adService.disposeAd(ad); // Delegate disposal to AdService
+      _adService.disposeAd(ad);
       _cache.remove(id);
     } else {
       _logger.info('Inline ad with ID "$id" not found in cache for disposal.');
@@ -126,9 +126,9 @@ class InlineAdCacheService {
       'Clearing all cached inline ads and disposing their resources.',
     );
     for (final ad in _cache.values.whereType<InlineAd>()) {
-      _adService.disposeAd(ad); // Delegate disposal to AdService
+      _adService.disposeAd(ad);
     }
-    _cache.clear(); // Ensure cache is empty after disposal attempts.
+    _cache.clear();
     _logger.info('All cached inline ads cleared.');
   }
 

lib/ads/interstitial_ad_manager.dart

@@ -124,6 +124,7 @@ class InterstitialAdManager {
       final ad = await _adService.getInterstitialAd(
         adConfig: adConfig,
         adThemeStyle: adThemeStyle,
+        userRole: _userRole ?? AppUserRole.guestUser,
       );
 
       if (ad != null) {
@@ -165,14 +166,17 @@ class InterstitialAdManager {
     }
 
     final frequencyConfig =
-        adConfig.interstitialAdConfiguration.feedInterstitialAdFrequencyConfig;
-    final requiredTransitions = _getRequiredTransitions(frequencyConfig);
+        adConfig.interstitialAdConfiguration.visibleTo[_userRole];
+
+    // If no frequency config is found for the user role, or if it's explicitly
+    // disabled (transitionsBeforeShowingInterstitialAds == 0), then no ad should be shown.
+    final requiredTransitions =
+        frequencyConfig?.transitionsBeforeShowingInterstitialAds ?? 0;
 
     if (requiredTransitions > 0 && _transitionCount >= requiredTransitions) {
       _logger.info('Transition count meets threshold. Attempting to show ad.');
       await _showAd();
-      _transitionCount =
-          0; // Reset counter after showing (or attempting to show)
+      _transitionCount = 0;
     } else {
       _logger.info(
         'Transition count ($_transitionCount) has not met threshold ($requiredTransitions).',
@@ -197,7 +201,7 @@ class InterstitialAdManager {
     }
 
     final adToShow = _preloadedAd!;
-    _preloadedAd = null; // Clear the pre-loaded ad before showing
+    _preloadedAd = null;
 
     try {
       switch (adToShow.provider) {
@@ -230,7 +234,7 @@ class InterstitialAdManager {
     } finally {
       // After the ad is shown or fails to show, dispose of it and
       // start pre-loading the next one for the next opportunity.
-      _disposePreloadedAd(); // Ensure the ad object is disposed
+      _disposePreloadedAd();
       unawaited(_maybePreloadAd(_appBloc.state));
     }
   }
@@ -268,7 +272,7 @@ class InterstitialAdManager {
     // Await the result of showDialog, which completes when the dialog is popped.
     await showDialog<void>(
       context: context,
-      barrierDismissible: false, // Prevent dismissing by tapping outside
+      barrierDismissible: false,
       builder: (_) => LocalInterstitialAdDialog(
         localInterstitialAd: ad.adObject as LocalInterstitialAd,
       ),
@@ -279,22 +283,8 @@ class InterstitialAdManager {
     // Await the result of showDialog, which completes when the dialog is popped.
     await showDialog<void>(
       context: context,
-      barrierDismissible: false, // Prevent dismissing by tapping outside
+      barrierDismissible: false,
       builder: (_) => const DemoInterstitialAdDialog(),
     );
   }
-
-  /// Determines the required number of transitions based on the user's role.
-  int _getRequiredTransitions(InterstitialAdFrequencyConfig config) {
-    switch (_userRole) {
-      case AppUserRole.guestUser:
-        return config.guestTransitionsBeforeShowingInterstitialAds;
-      case AppUserRole.standardUser:
-        return config.standardUserTransitionsBeforeShowingInterstitialAds;
-      case AppUserRole.premiumUser:
-        return config.premiumUserTransitionsBeforeShowingInterstitialAds;
-      case null:
-        return config.guestTransitionsBeforeShowingInterstitialAds;
-    }
-  }
 }

lib/ads/local_ad_provider.dart

@@ -43,7 +43,7 @@ class LocalAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle, // Added for interface consistency
+    HeadlineImageStyle? headlineImageStyle,
   }) async {
     _logger.info('LocalAdProvider: loadNativeAd called for adId: $adId');
     if (adId == null || adId.isEmpty) {
@@ -97,7 +97,7 @@ class LocalAdProvider implements AdProvider {
     required AdPlatformIdentifiers adPlatformIdentifiers,
     required String? adId,
     required AdThemeStyle adThemeStyle,
-    HeadlineImageStyle? headlineImageStyle, // Added for interface consistency
+    HeadlineImageStyle? headlineImageStyle,
   }) async {
     _logger.info('LocalAdProvider: loadBannerAd called for adId: $adId');
     if (adId == null || adId.isEmpty) {

lib/ads/widgets/admob_inline_ad_widget.dart

@@ -59,7 +59,7 @@ class _AdmobInlineAdWidgetState extends State<AdmobInlineAdWidget> {
     // and set the new one. This is a more robust check than just comparing IDs,
     // as a new InlineAd instance might be created for the same logical ad slot.
     if (widget.inlineAd != oldWidget.inlineAd) {
-      _disposeCurrentAd(); // Dispose the old ad object
+      _disposeCurrentAd();
       _setAd();
     }
   }

lib/ads/widgets/demo_banner_ad_widget.dart

@@ -38,8 +38,8 @@ class DemoBannerAdWidget extends StatelessWidget {
       };
     } else {
       adHeight = headlineImageStyle == HeadlineImageStyle.largeThumbnail
-          ? 250 // Height for mediumRectangle banner
-          : 50; // Height for standard banner
+          ? 250
+          : 50;
     }
 
     return Card(

lib/ads/widgets/demo_native_ad_widget.dart

@@ -23,8 +23,8 @@ class DemoNativeAdWidget extends StatelessWidget {
 
     // Determine the height based on the headlineImageStyle, mimicking real ad widgets.
     final adHeight = headlineImageStyle == HeadlineImageStyle.largeThumbnail
-        ? 250 // Height for medium native ad template
-        : 120; // Height for small native ad template
+        ? 250
+        : 120;
 
     return Card(
       margin: const EdgeInsets.symmetric(