style: format & cleanup misc

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.',
@@ -223,7 +223,7 @@ class AdService {
     _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,

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,8 @@ 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
+      // 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 +127,11 @@ 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
+      // Delegate disposal to AdService
+      _adService.disposeAd(ad);
     }
-    _cache.clear(); // Ensure cache is empty after disposal attempts.
+    // Ensure cache is empty after disposal attempts.
+    _cache.clear();
     _logger.info('All cached inline ads cleared.');
   }
 

lib/ads/interstitial_ad_manager.dart

@@ -171,8 +171,8 @@ class InterstitialAdManager {
     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)
+      // Reset counter after showing (or attempting to show)
+      _transitionCount = 0;
     } else {
       _logger.info(
         'Transition count ($_transitionCount) has not met threshold ($requiredTransitions).',
@@ -197,7 +197,8 @@ class InterstitialAdManager {
     }
 
     final adToShow = _preloadedAd!;
-    _preloadedAd = null; // Clear the pre-loaded ad before showing
+    // Clear the pre-loaded ad before showing
+    _preloadedAd = null;
 
     try {
       switch (adToShow.provider) {
@@ -230,7 +231,9 @@ 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
+
+      // Ensure the ad object is disposed
+      _disposePreloadedAd();
       unawaited(_maybePreloadAd(_appBloc.state));
     }
   }
@@ -268,7 +271,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
+      // Prevent dismissing by tapping outside
+      barrierDismissible: false,
       builder: (_) => LocalInterstitialAdDialog(
         localInterstitialAd: ad.adObject as LocalInterstitialAd,
       ),
@@ -279,7 +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
+      // Prevent dismissing by tapping outside
+      barrierDismissible: false,
       builder: (_) => const DemoInterstitialAdDialog(),
     );
   }

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

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

lib/ads/widgets/demo_native_ad_widget.dart

@@ -24,7 +24,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
-        : 120; // Height for small native ad template
+        : 120;
 
     return Card(
       margin: const EdgeInsets.symmetric(

lib/ads/widgets/feed_ad_loader_widget.dart

@@ -98,7 +98,8 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
       // completed. This prevents a race condition if a new load is triggered
       // while an old one is still in progress.
       if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
-        _loadAdCompleter!.complete(); // Complete normally to prevent crashes
+        // Complete normally to prevent crashes
+        _loadAdCompleter!.complete();
       }
       _loadAdCompleter = null;
 
@@ -125,7 +126,8 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
     // This prevents `setState()` calls on a disposed widget.
     // Ensure the completer is not already completed before attempting to complete it.
     if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
-      _loadAdCompleter!.complete(); // Complete normally to prevent crashes
+      // Complete normally to prevent crashes
+      _loadAdCompleter!.complete();
     }
     _loadAdCompleter = null;
     super.dispose();
@@ -211,10 +213,10 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
 
       // Call AdService.getFeedAd with the full AdConfig and adType from the placeholder.
       final loadedAd = await _adService.getFeedAd(
-        adConfig: widget.adConfig, // Pass the full AdConfig
+        adConfig: widget.adConfig,
         adType: widget.adPlaceholder.adType,
         adThemeStyle: widget.adThemeStyle,
-        headlineImageStyle: headlineImageStyle, // Pass the headlineImageStyle
+        headlineImageStyle: headlineImageStyle,
       );
 
       if (loadedAd != null) {