Merge branch 'main' into refactor/filter-active-content-status

Signed-off-by: fulleni <fulleni@hotmail.com>

Author: fulleni

lib/ads/ad_service.dart

@@ -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,9 +231,13 @@ 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(
@@ -227,6 +246,8 @@ class AdService {
       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/inline_ad_cache_service.dart

@@ -127,9 +127,11 @@ class InlineAdCacheService {
       'Clearing all cached inline ads and disposing their resources.',
     );
     for (final ad in _cache.values.whereType<InlineAd>()) {
+
       // Delegate disposal to AdService
       _adService.disposeAd(ad);
     }
+    
     // 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,8 +166,12 @@ 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.');
@@ -288,18 +293,4 @@ class InterstitialAdManager {
       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/widgets/demo_banner_ad_widget.dart

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

lib/ads/widgets/demo_native_ad_widget.dart

@@ -23,7 +23,7 @@ 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
+        ? 250
         : 120;
 
     return Card(

lib/ads/widgets/feed_ad_loader_widget.dart

@@ -205,11 +205,10 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
         return;
       }
 
-      // Get the current HeadlineImageStyle from AppBloc
-      final headlineImageStyle = context
-          .read<AppBloc>()
-          .state
-          .headlineImageStyle;
+      // Get the current HeadlineImageStyle and user role from AppBloc
+      final appBlocState = context.read<AppBloc>().state;
+      final headlineImageStyle = appBlocState.headlineImageStyle;
+      final userRole = appBlocState.user?.appRole ?? AppUserRole.guestUser;
 
       // Call AdService.getFeedAd with the full AdConfig and adType from the placeholder.
       final loadedAd = await _adService.getFeedAd(

lib/ads/widgets/in_article_ad_loader_widget.dart

@@ -41,14 +41,14 @@ import 'package:ui_kit/ui_kit.dart';
 class InArticleAdLoaderWidget extends StatefulWidget {
   /// {@macro in_article_ad_loader_widget}
   const InArticleAdLoaderWidget({
-    required this.slotConfiguration,
+    required this.slotType,
     required this.adThemeStyle,
     required this.adConfig,
     super.key,
   });
 
-  /// The configuration for this specific in-article ad slot.
-  final InArticleAdSlotConfiguration slotConfiguration;
+  /// The type of the in-article ad slot.
+  final InArticleAdSlotType slotType;
 
   /// The current theme style for ads, used during ad loading.
   final AdThemeStyle adThemeStyle;
@@ -82,18 +82,18 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
   @override
   void didUpdateWidget(covariant InArticleAdLoaderWidget oldWidget) {
     super.didUpdateWidget(oldWidget);
-    // If the slotConfiguration changes, it means this widget is being reused
+    // If the slotType changes, it means this widget is being reused
     // for a different ad slot. We need to cancel any ongoing load for the old
     // ad and initiate a new load for the new ad.
     // Also, if the adConfig changes, we should re-evaluate and potentially reload.
-    if (widget.slotConfiguration != oldWidget.slotConfiguration ||
+    if (widget.slotType != oldWidget.slotType ||
         widget.adConfig != oldWidget.adConfig) {
       _logger.info(
-        'InArticleAdLoaderWidget updated for new slot configuration or AdConfig changed. Re-loading ad.',
+        'InArticleAdLoaderWidget updated for new slot type: '
+        '${widget.slotType.name} or AdConfig changed. Re-loading ad.',
       );
       // Dispose of the old ad's resources before loading a new one.
-      final oldCacheKey =
-          'in_article_ad_${oldWidget.slotConfiguration.slotType.name}';
+      final oldCacheKey = 'in_article_ad_${oldWidget.slotType.name}';
       // Only dispose if it was actually cached (i.e., not an AdMob in-article ad).
       // The removeAndDisposeAd method handles the check internally.
       _adCacheService.removeAndDisposeAd(oldCacheKey);
@@ -116,7 +116,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
   @override
   void dispose() {
     // Dispose of the ad's resources when the widget is permanently removed.
-    final cacheKey = 'in_article_ad_${widget.slotConfiguration.slotType.name}';
+    final cacheKey = 'in_article_ad_${widget.slotType.name}';
     // Only dispose if it was actually cached (i.e., not an AdMob in-article ad).
     // The removeAndDisposeAd method handles the check internally.
     _adCacheService.removeAndDisposeAd(cacheKey);
@@ -148,7 +148,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
 
     // In-article ads are typically unique to their slot, so we use the slotType
     // as part of the cache key to differentiate them.
-    final cacheKey = 'in_article_ad_${widget.slotConfiguration.slotType.name}';
+    final cacheKey = 'in_article_ad_${widget.slotType.name}';
     InlineAd? loadedAd;
 
     // Determine if the primary ad platform is AdMob.
@@ -159,7 +159,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
       final cachedAd = _adCacheService.getAd(cacheKey);
       if (cachedAd != null) {
         _logger.info(
-          'Using cached in-article ad for slot: ${widget.slotConfiguration.slotType.name}',
+          'Using cached in-article ad for slot: ${widget.slotType.name}',
         );
         if (!mounted) return;
         setState(() {
@@ -174,23 +174,27 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
     } else {
       _logger.info(
         'AdMob is primary ad platform. Bypassing cache for in-article ad '
-        'for slot: ${widget.slotConfiguration.slotType.name}.',
+        'for slot: ${widget.slotType.name}.',
       );
     }
 
-    _logger.info(
-      'Loading new in-article ad for slot: ${widget.slotConfiguration.slotType.name}',
-    );
+    _logger.info('Loading new in-article ad for slot: ${widget.slotType.name}');
     try {
+      // Get the current user role from AppBloc
+      final appBlocState = context.read<AppBloc>().state;
+      final userRole = appBlocState.user?.appRole ?? AppUserRole.guestUser;
+
       // Call AdService.getInArticleAd with the full AdConfig.
       loadedAd = await _adService.getInArticleAd(
         adConfig: widget.adConfig,
         adThemeStyle: widget.adThemeStyle,
+        userRole: userRole,
+        slotType: widget.slotType,
       );
 
       if (loadedAd != null) {
         _logger.info(
-          'New in-article ad loaded for slot: ${widget.slotConfiguration.slotType.name}',
+          'New in-article ad loaded for slot: ${widget.slotType.name}',
         );
         // Only cache non-AdMob ads. AdMob ads are not cached to prevent reuse issues.
         if (!isAdMob) {
@@ -211,7 +215,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
         }
       } else {
         _logger.warning(
-          'Failed to load in-article ad for slot: ${widget.slotConfiguration.slotType.name}. '
+          'Failed to load in-article ad for slot: ${widget.slotType.name}. '
           'No ad returned.',
         );
         if (!mounted) return;
@@ -227,7 +231,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
       }
     } catch (e, s) {
       _logger.severe(
-        'Error loading in-article ad for slot: ${widget.slotConfiguration.slotType.name}: $e',
+        'Error loading in-article ad for slot: ${widget.slotType.name}: $e',
         e,
         s,
       );