lint: misc

fulleni · fulleni · commit e52fe6a4cadf · 2025-09-06T07:20:21.000+01:00
diff --git a/lib/ads/ad_cache_service.dart b/lib/ads/ad_cache_service.dart
@@ -1,10 +1,10 @@
+import 'package:core/core.dart'; // Import core for AdPlatformType
 import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/banner_ad.dart'; // Import BannerAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart'; // Import InlineAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/native_ad.dart'; // Import NativeAd
-import 'package:logging/logging.dart';
-import 'package:core/core.dart'; // Import core for AdPlatformType
 import 'package:google_mobile_ads/google_mobile_ads.dart' as admob; // Import AdMob for disposal
+import 'package:logging/logging.dart';
 
 /// {@template ad_cache_service}
 /// A singleton service for caching loaded inline ad objects (native and banner).
diff --git a/lib/ads/ad_navigator_observer.dart b/lib/ads/ad_navigator_observer.dart
@@ -4,7 +4,6 @@ import 'package:core/core.dart';
 import 'package:flutter/material.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_theme_style.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/interstitial_ad.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart' as admob;
 import 'package:logging/logging.dart';
@@ -97,20 +96,16 @@ class AdNavigatorObserver extends NavigatorObserver {
       case AppUserRole.guestUser:
         requiredTransitions =
             frequencyConfig.guestTransitionsBeforeShowingInterstitialAds;
-        break;
       case AppUserRole.standardUser:
         requiredTransitions =
             frequencyConfig.standardUserTransitionsBeforeShowingInterstitialAds;
-        break;
       case AppUserRole.premiumUser:
         requiredTransitions =
             frequencyConfig.premiumUserTransitionsBeforeShowingInterstitialAds;
-        break;
       case null:
         // If user is null, default to guest user settings.
         requiredTransitions =
             frequencyConfig.guestTransitionsBeforeShowingInterstitialAds;
-        break;
     }
 
     _logger.info(
diff --git a/lib/ads/ad_service.dart b/lib/ads/ad_service.dart
@@ -2,10 +2,10 @@ import 'package:core/core.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_provider.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/ad_feed_item.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/models/banner_ad.dart'; // Import BannerAd
+// Import BannerAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart'; // Import InlineAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/interstitial_ad.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/native_ad.dart'; // Import NativeAd
+// Import NativeAd
 import 'package:logging/logging.dart';
 import 'package:uuid/uuid.dart';
 
@@ -92,7 +92,7 @@ class AdService {
       return null;
     }
 
-    final String? adId = switch (adType) {
+    final adId = switch (adType) {
       AdType.native => platformAdIdentifiers.feedNativeAdId,
       AdType.banner => platformAdIdentifiers.feedBannerAdId,
       _ => null, // Handled by the initial adType check
@@ -189,7 +189,7 @@ class AdService {
     }
 
     // Use the correct interstitial ad ID from AdPlatformIdentifiers
-    final String? adId = platformAdIdentifiers.feedToArticleInterstitialAdId;
+    final adId = platformAdIdentifiers.feedToArticleInterstitialAdId;
 
     if (adId == null || adId.isEmpty) {
       _logger.warning(
diff --git a/lib/ads/admob_ad_provider.dart b/lib/ads/admob_ad_provider.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:core/core.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_provider.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/models/banner_ad.dart'; // Import the new BannerAd model
@@ -55,7 +54,7 @@ class AdMobAdProvider implements AdProvider {
 
     _logger.info('Attempting to load native ad from unit ID: $adId');
 
-    final templateType = NativeAdTemplateType.medium; // Default to medium for native
+    const templateType = NativeAdTemplateType.medium; // Default to medium for native
 
     final completer = Completer<admob.NativeAd?>();
 
diff --git a/lib/ads/models/banner_ad.dart b/lib/ads/models/banner_ad.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/foundation.dart';
 import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
 
 /// {@template banner_ad}
@@ -22,7 +22,6 @@ class BannerAd extends InlineAd {
 
   /// Creates a copy of this [BannerAd] but with the given fields replaced with
   /// the new values.
-  @override
   BannerAd copyWith({
     String? id,
     AdPlatformType? provider,
diff --git a/lib/ads/models/inline_ad.dart b/lib/ads/models/inline_ad.dart
@@ -1,6 +1,6 @@
+import 'package:core/core.dart'; // Import core for AdPlatformType
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
-import 'package:core/core.dart'; // Import core for AdPlatformType
 
 /// {@template inline_ad}
 /// An abstract base class for all inline ad types (native and banner).
diff --git a/lib/ads/models/interstitial_ad.dart b/lib/ads/models/interstitial_ad.dart
@@ -1,6 +1,6 @@
+import 'package:core/core.dart'; // Import core for AdPlatformType
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
-import 'package:core/core.dart'; // Import core for AdPlatformType
 
 /// {@template interstitial_ad}
 /// A generic, provider-agnostic model representing a full-screen interstitial advertisement.
diff --git a/lib/ads/models/native_ad.dart b/lib/ads/models/native_ad.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/foundation.dart';
 import 'package:core/core.dart'; // Import core for AdPlatformType
+import 'package:flutter/foundation.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
 
 /// {@template native_ad_template_type}
@@ -43,7 +43,6 @@ class NativeAd extends InlineAd {
 
   /// Creates a copy of this [NativeAd] but with the given fields replaced with
   /// the new values.
-  @override
   NativeAd copyWith({
     String? id,
     AdPlatformType? provider,
diff --git a/lib/ads/widgets/ad_feed_item_widget.dart b/lib/ads/widgets/ad_feed_item_widget.dart
@@ -2,7 +2,6 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/banner_ad.dart'; // Import BannerAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart'; // Import InlineAd
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/native_ad.dart'; // Import NativeAd
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/models.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/admob_inline_ad_widget.dart'; // Use the renamed widget
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/local_banner_ad_widget.dart';
@@ -84,9 +83,6 @@ class _AdDispatcher extends StatelessWidget {
         }
         // Fallback for unsupported local ad types or errors
         return const PlaceholderAdWidget();
-      default:
-        // Fallback for unsupported ad platforms or types.
-        return const PlaceholderAdWidget();
-    }
+      }
   }
 }
diff --git a/lib/ads/widgets/ad_loader_widget.dart b/lib/ads/widgets/ad_loader_widget.dart
@@ -162,7 +162,7 @@ class _AdLoaderWidgetState extends State<AdLoaderWidget> {
     );
     try {
       // The adId is now directly available from the placeholder.
-      final String? adIdentifier = widget.adPlaceholder.adId;
+      final adIdentifier = widget.adPlaceholder.adId;
 
       if (adIdentifier == null || adIdentifier.isEmpty) {
         _logger.warning(
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -4,11 +4,11 @@ import 'package:data_repository/data_repository.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_navigator_observer.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_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/app/config/app_environment.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_navigator_observer.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/services/app_status_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_initializer_service.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/services/demo_data_migration_service.dart';
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
@@ -7,7 +7,6 @@ import 'package:data_api/data_api.dart';
 import 'package:data_client/data_client.dart';
 import 'package:data_inmemory/data_inmemory.dart';
 import 'package:data_repository/data_repository.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/ad_provider.dart';
@@ -24,7 +23,6 @@ import 'package:flutter_news_app_mobile_client_full_source_code/shared/data/clie
 import 'package:http_client/http_client.dart';
 import 'package:kv_storage_shared_preferences/kv_storage_shared_preferences.dart';
 import 'package:logging/logging.dart';
-import 'package:logging/logging.dart';
 import 'package:timeago/timeago.dart' as timeago;
 import 'package:ui_kit/ui_kit.dart';
 
@@ -50,13 +48,13 @@ Future<Widget> bootstrap(
   // 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.
-  final Map<AdPlatformType, AdProvider> adProviders = {
+  final adProviders = <AdPlatformType, AdProvider>{
     AdPlatformType.admob: AdMobAdProvider(logger: logger),
     AdPlatformType.local: LocalAdProvider(
       localAdRepository: DataRepository<LocalAd>(
         dataClient: appConfig.environment == app_config.AppEnvironment.demo
             ? DataInMemory<LocalAd>(
-                toJson: (i) => LocalAd.toJson(i),
+                toJson: LocalAd.toJson,
                 getId: (i) => i.id,
                 initialData: localAdsFixturesData,
                 logger: logger,
@@ -65,7 +63,7 @@ Future<Widget> bootstrap(
                 httpClient: httpClient!,
                 modelName: 'local_ad',
                 fromJson: LocalAd.fromJson,
-                toJson: (ad) => LocalAd.toJson(ad),
+                toJson: LocalAd.toJson,
                 logger: logger,
               ),
       ),
@@ -187,7 +185,7 @@ Future<Widget> bootstrap(
       logger: logger,
     );
     localAdClient = DataInMemory<LocalAd>(
-      toJson: (i) => LocalAd.toJson(i),
+      toJson: LocalAd.toJson,
       getId: (i) => i.id,
       initialData: localAdsFixturesData,
       logger: logger,
@@ -253,7 +251,7 @@ Future<Widget> bootstrap(
       httpClient: httpClient,
       modelName: 'local_ad',
       fromJson: LocalAd.fromJson,
-      toJson: (ad) => LocalAd.toJson(ad),
+      toJson: LocalAd.toJson,
       logger: logger,
     );
   } else {
@@ -318,7 +316,7 @@ Future<Widget> bootstrap(
       httpClient: httpClient,
       modelName: 'local_ad',
       fromJson: LocalAd.fromJson,
-      toJson: (ad) => LocalAd.toJson(ad),
+      toJson: LocalAd.toJson,
       logger: logger,
     );
   }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import 'package:core/core.dart';`
`2`	`2`	`import 'package:flutter/material.dart';`
`3`	`3`	`import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/banner_ad.dart'; // Import BannerAd`
`4`	`4`	`import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart'; // Import InlineAd`
`5`		`-import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/native_ad.dart'; // Import NativeAd`
`6`	`5`	`import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/models.dart';`
`7`	`6`	`import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/admob_inline_ad_widget.dart'; // Use the renamed widget`
`8`	`7`	`import 'package:flutter_news_app_mobile_client_full_source_code/ads/widgets/local_banner_ad_widget.dart';`
`@@ -84,9 +83,6 @@ class _AdDispatcher extends StatelessWidget {`
`84`	`83`	`}`
`85`	`84`	`// Fallback for unsupported local ad types or errors`
`86`	`85`	`return const PlaceholderAdWidget();`
`87`		`- default:`
`88`		`- // Fallback for unsupported ad platforms or types.`
`89`		`- return const PlaceholderAdWidget();`
`90`		`- }`
	`86`	`+ }`
`91`	`87`	`}`
`92`	`88`	`}`