style: misc

fulleni · fulleni · commit b1e46e587808 · 2025-09-06T09:34:42.000+01:00
diff --git a/lib/account/bloc/account_bloc.dart b/lib/account/bloc/account_bloc.dart
@@ -38,11 +38,11 @@ class AccountBloc extends Bloc<AccountEvent, AccountState> {
         .entityUpdated
         .where((type) => type == UserContentPreferences)
         .listen((_) {
-      // If there's a current user, reload their preferences.
-      if (state.user?.id != null) {
-        add(AccountLoadUserPreferences(userId: state.user!.id));
-      }
-    });
+          // If there's a current user, reload their preferences.
+          if (state.user?.id != null) {
+            add(AccountLoadUserPreferences(userId: state.user!.id));
+          }
+        });
 
     // Register event handlers
     on<AccountUserChanged>(_onAccountUserChanged);
diff --git a/lib/ads/ad_service.dart b/lib/ads/ad_service.dart
@@ -229,11 +229,11 @@ class AdService {
 
     final adId = feedAd
         ? (adType == AdType.native
-            ? platformAdIdentifiers.feedNativeAdId
-            : platformAdIdentifiers.feedBannerAdId)
+              ? platformAdIdentifiers.feedNativeAdId
+              : platformAdIdentifiers.feedBannerAdId)
         : (adType == AdType.native
-            ? platformAdIdentifiers.inArticleNativeAdId
-            : platformAdIdentifiers.inArticleBannerAdId);
+              ? platformAdIdentifiers.inArticleNativeAdId
+              : platformAdIdentifiers.inArticleBannerAdId);
 
     if (adId == null || adId.isEmpty) {
       _logger.warning(
diff --git a/lib/ads/admob_ad_provider.dart b/lib/ads/admob_ad_provider.dart
@@ -57,10 +57,9 @@ class AdMobAdProvider implements AdProvider {
 
     // Determine the template type based on the user's feed style preference.
     // Use largeThumbnail for a more prominent, square-like ad.
-    final templateType =
-        headlineImageStyle == HeadlineImageStyle.largeThumbnail
-            ? NativeAdTemplateType.medium
-            : NativeAdTemplateType.small;
+    final templateType = headlineImageStyle == HeadlineImageStyle.largeThumbnail
+        ? NativeAdTemplateType.medium
+        : NativeAdTemplateType.small;
 
     final completer = Completer<admob.NativeAd?>();
 
diff --git a/lib/ads/local_ad_provider.dart b/lib/ads/local_ad_provider.dart
@@ -21,8 +21,8 @@ class LocalAdProvider implements AdProvider {
   LocalAdProvider({
     required DataRepository<LocalAd> localAdRepository,
     Logger? logger,
-  })  : _localAdRepository = localAdRepository,
-        _logger = logger ?? Logger('LocalAdProvider');
+  }) : _localAdRepository = localAdRepository,
+       _logger = logger ?? Logger('LocalAdProvider');
 
   final DataRepository<LocalAd> _localAdRepository;
   final Logger _logger;
@@ -54,7 +54,9 @@ class LocalAdProvider implements AdProvider {
       final localNativeAd = await _localAdRepository.read(id: adId);
 
       if (localNativeAd is LocalNativeAd) {
-        _logger.info('Local native ad loaded successfully: ${localNativeAd.id}');
+        _logger.info(
+          'Local native ad loaded successfully: ${localNativeAd.id}',
+        );
         return NativeAd(
           id: _uuid.v4(),
           provider: AdPlatformType.local,
@@ -101,7 +103,9 @@ class LocalAdProvider implements AdProvider {
       final localBannerAd = await _localAdRepository.read(id: adId);
 
       if (localBannerAd is LocalBannerAd) {
-        _logger.info('Local banner ad loaded successfully: ${localBannerAd.id}');
+        _logger.info(
+          'Local banner ad loaded successfully: ${localBannerAd.id}',
+        );
         return BannerAd(
           id: _uuid.v4(),
           provider: AdPlatformType.local,
diff --git a/lib/ads/models/banner_ad.dart b/lib/ads/models/banner_ad.dart
@@ -22,11 +22,7 @@ class BannerAd extends InlineAd {
 
   /// Creates a copy of this [BannerAd] but with the given fields replaced with
   /// the new values.
-  BannerAd copyWith({
-    String? id,
-    AdPlatformType? provider,
-    Object? adObject,
-  }) {
+  BannerAd copyWith({String? id, AdPlatformType? provider, Object? adObject}) {
     return BannerAd(
       id: id ?? this.id,
       provider: provider ?? this.provider,
diff --git a/lib/ads/widgets/feed_ad_loader_widget.dart b/lib/ads/widgets/feed_ad_loader_widget.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/ad_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_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/models/banner_ad.dart';
diff --git a/lib/ads/widgets/in_article_ad_loader_widget.dart b/lib/ads/widgets/in_article_ad_loader_widget.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/ad_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/ads/models/banner_ad.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/ads/models/inline_ad.dart';
diff --git a/lib/ads/widgets/local_banner_ad_widget.dart b/lib/ads/widgets/local_banner_ad_widget.dart
@@ -25,8 +25,9 @@ class LocalBannerAdWidget extends StatelessWidget {
 
     // Determine the height based on the headlineImageStyle.
     // If largeThumbnail, use a square aspect ratio, otherwise a standard banner height.
-    final double imageHeight =
-        headlineImageStyle == HeadlineImageStyle.largeThumbnail ? 250 : 90;
+    final imageHeight = headlineImageStyle == HeadlineImageStyle.largeThumbnail
+        ? 250
+        : 90;
 
     return Card(
       margin: const EdgeInsets.symmetric(
@@ -48,7 +49,7 @@ class LocalBannerAdWidget extends StatelessWidget {
                 Image.network(
                   localBannerAd.imageUrl,
                   fit: BoxFit.cover,
-                  height: imageHeight,
+                  height: imageHeight.toDouble(),
                   width: double.infinity,
                   errorBuilder: (context, error, stackTrace) =>
                       const SizedBox.shrink(),
diff --git a/lib/ads/widgets/local_interstitial_ad_dialog.dart b/lib/ads/widgets/local_interstitial_ad_dialog.dart
@@ -73,10 +73,7 @@ class LocalInterstitialAdDialog extends StatelessWidget {
             top: AppSpacing.lg,
             right: AppSpacing.lg,
             child: IconButton(
-              icon: Icon(
-                Icons.close,
-                color: theme.colorScheme.onSurface,
-              ),
+              icon: Icon(Icons.close, color: theme.colorScheme.onSurface),
               onPressed: () {
                 // Dismiss the dialog.
                 Navigator.of(context).pop();
diff --git a/lib/ads/widgets/local_native_ad_widget.dart b/lib/ads/widgets/local_native_ad_widget.dart
@@ -25,8 +25,9 @@ class LocalNativeAdWidget extends StatelessWidget {
 
     // Determine the height based on the headlineImageStyle.
     // If largeThumbnail, use a square aspect ratio, otherwise a standard native ad height.
-    final double imageHeight =
-        headlineImageStyle == HeadlineImageStyle.largeThumbnail ? 250 : 180;
+    final imageHeight = headlineImageStyle == HeadlineImageStyle.largeThumbnail
+        ? 250
+        : 180;
 
     return Card(
       margin: const EdgeInsets.symmetric(
@@ -44,7 +45,7 @@ class LocalNativeAdWidget extends StatelessWidget {
                 child: Image.network(
                   localNativeAd.imageUrl,
                   fit: BoxFit.cover,
-                  height: imageHeight,
+                  height: imageHeight.toDouble(),
                   width: double.infinity,
                   errorBuilder: (context, error, stackTrace) =>
                       const SizedBox.shrink(),
@@ -72,7 +73,9 @@ class LocalNativeAdWidget extends StatelessWidget {
                 onPressed: () {
                   // TODO(fulleni): Implement navigation to localNativeAd.targetUrl
                   // For now, just log the action.
-                  debugPrint('Local Native Ad clicked: ${localNativeAd.targetUrl}');
+                  debugPrint(
+                    'Local Native Ad clicked: ${localNativeAd.targetUrl}',
+                  );
                 },
                 child: const Text('Learn More'),
               ),
diff --git a/lib/ads/widgets/widgets.dart b/lib/ads/widgets/widgets.dart
@@ -1,5 +1,5 @@
-export 'feed_ad_loader_widget.dart';
 export 'admob_inline_ad_widget.dart';
+export 'feed_ad_loader_widget.dart';
 export 'in_article_ad_loader_widget.dart';
 export 'local_banner_ad_widget.dart';
 export 'local_interstitial_ad_dialog.dart';
diff --git a/lib/app/bloc/app_bloc.dart b/lib/app/bloc/app_bloc.dart
@@ -28,48 +28,48 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     this.demoDataMigrationService,
     this.demoDataInitializerService,
     this.initialUser,
-  })  : _authenticationRepository = authenticationRepository,
-        _userAppSettingsRepository = userAppSettingsRepository,
-        _appConfigRepository = appConfigRepository,
-        _userRepository = userRepository,
-        _environment = environment,
-        _adService = adService,
-        _logger = Logger('AppBloc'),
-        super(
-          AppState(
-            settings: UserAppSettings(
-              id: 'default',
-              displaySettings: const DisplaySettings(
-                baseTheme: AppBaseTheme.system,
-                accentTheme: AppAccentTheme.defaultBlue,
-                fontFamily: 'SystemDefault',
-                textScaleFactor: AppTextScaleFactor.medium,
-                fontWeight: AppFontWeight.regular,
-              ),
-              language: languagesFixturesData.firstWhere(
-                (l) => l.code == 'en',
-                orElse: () => throw StateError(
-                  'Default language "en" not found in language fixtures.',
-                ),
-              ),
-              feedPreferences: const FeedDisplayPreferences(
-                headlineDensity: HeadlineDensity.standard,
-                headlineImageStyle: HeadlineImageStyle.largeThumbnail,
-                showSourceInHeadlineFeed: true,
-                showPublishDateInHeadlineFeed: true,
-              ),
-            ),
-            selectedBottomNavigationIndex: 0,
-            remoteConfig: null,
-            environment: environment,
-            status: initialUser != null
-                ? (initialUser.appRole == AppUserRole.standardUser
-                    ? AppStatus.authenticated
-                    : AppStatus.anonymous)
-                : AppStatus.unauthenticated,
-            user: initialUser,
-          ),
-        ) {
+  }) : _authenticationRepository = authenticationRepository,
+       _userAppSettingsRepository = userAppSettingsRepository,
+       _appConfigRepository = appConfigRepository,
+       _userRepository = userRepository,
+       _environment = environment,
+       _adService = adService,
+       _logger = Logger('AppBloc'),
+       super(
+         AppState(
+           settings: UserAppSettings(
+             id: 'default',
+             displaySettings: const DisplaySettings(
+               baseTheme: AppBaseTheme.system,
+               accentTheme: AppAccentTheme.defaultBlue,
+               fontFamily: 'SystemDefault',
+               textScaleFactor: AppTextScaleFactor.medium,
+               fontWeight: AppFontWeight.regular,
+             ),
+             language: languagesFixturesData.firstWhere(
+               (l) => l.code == 'en',
+               orElse: () => throw StateError(
+                 'Default language "en" not found in language fixtures.',
+               ),
+             ),
+             feedPreferences: const FeedDisplayPreferences(
+               headlineDensity: HeadlineDensity.standard,
+               headlineImageStyle: HeadlineImageStyle.largeThumbnail,
+               showSourceInHeadlineFeed: true,
+               showPublishDateInHeadlineFeed: true,
+             ),
+           ),
+           selectedBottomNavigationIndex: 0,
+           remoteConfig: null,
+           environment: environment,
+           status: initialUser != null
+               ? (initialUser.appRole == AppUserRole.standardUser
+                     ? AppStatus.authenticated
+                     : AppStatus.anonymous)
+               : AppStatus.unauthenticated,
+           user: initialUser,
+         ),
+       ) {
     on<AppUserChanged>(_onAppUserChanged);
     on<AppSettingsRefreshed>(_onAppSettingsRefreshed);
     on<AppConfigFetchRequested>(_onAppConfigFetchRequested);
@@ -271,8 +271,8 @@ class AppBloc extends Bloc<AppEvent, AppState> {
         baseTheme: event.themeMode == ThemeMode.light
             ? AppBaseTheme.light
             : (event.themeMode == ThemeMode.dark
-                ? AppBaseTheme.dark
-                : AppBaseTheme.system),
+                  ? AppBaseTheme.dark
+                  : AppBaseTheme.system),
       ),
     );
     emit(state.copyWith(settings: updatedSettings, themeMode: event.themeMode));
@@ -290,8 +290,8 @@ class AppBloc extends Bloc<AppEvent, AppState> {
         accentTheme: event.flexScheme == FlexScheme.blue
             ? AppAccentTheme.defaultBlue
             : (event.flexScheme == FlexScheme.red
-                ? AppAccentTheme.newsRed
-                : AppAccentTheme.graphiteGray),
+                  ? AppAccentTheme.newsRed
+                  : AppAccentTheme.graphiteGray),
       ),
     );
     emit(
@@ -509,7 +509,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
       // Get the current status for the decorator, or create a default if not present.
       final currentStatus =
           originalUser.feedDecoratorStatus[event.feedDecoratorType] ??
-              const UserFeedDecoratorStatus(isCompleted: false);
+          const UserFeedDecoratorStatus(isCompleted: false);
 
       // Create an updated status.
       // It always updates the `lastShownAt` timestamp.
@@ -523,12 +523,12 @@ class AppBloc extends Bloc<AppEvent, AppState> {
       // Create a new map with the updated status for the specific decorator type.
       final newFeedDecoratorStatus =
           Map<FeedDecoratorType, UserFeedDecoratorStatus>.from(
-        originalUser.feedDecoratorStatus,
-      )..update(
-              event.feedDecoratorType,
-              (_) => updatedDecoratorStatus,
-              ifAbsent: () => updatedDecoratorStatus,
-            );
+            originalUser.feedDecoratorStatus,
+          )..update(
+            event.feedDecoratorType,
+            (_) => updatedDecoratorStatus,
+            ifAbsent: () => updatedDecoratorStatus,
+          );
 
       // Update the user with the new feedDecoratorStatus map.
       final updatedUser = originalUser.copyWith(
diff --git a/lib/app/bloc/app_state.dart b/lib/app/bloc/app_state.dart
@@ -112,16 +112,16 @@ class AppState extends Equatable {
 
   @override
   List<Object?> get props => [
-        selectedBottomNavigationIndex,
-        themeMode,
-        flexScheme,
-        fontFamily,
-        appTextScaleFactor,
-        status,
-        user,
-        settings,
-        locale,
-        remoteConfig,
-        environment,
-      ];
+    selectedBottomNavigationIndex,
+    themeMode,
+    flexScheme,
+    fontFamily,
+    appTextScaleFactor,
+    status,
+    user,
+    settings,
+    locale,
+    remoteConfig,
+    environment,
+  ];
 }
diff --git a/lib/headline-details/view/headline_details_page.dart b/lib/headline-details/view/headline_details_page.dart
@@ -245,7 +245,7 @@ class _HeadlineDetailsPageState extends State<HeadlineDetailsPage> {
     final adService = context.read<AdService>();
     final adThemeStyle = AdThemeStyle.fromTheme(Theme.of(context));
 
-    final List<Widget> slivers = [
+    final slivers = <Widget>[
       SliverAppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios_new),
diff --git a/lib/router/router.dart b/lib/router/router.dart
@@ -71,7 +71,8 @@ GoRouter createRouter({
   required DataRepository<User> userRepository,
   required local_config.AppEnvironment environment,
   required AdService adService,
-  required AdNavigatorObserver adNavigatorObserver, // Accept AdNavigatorObserver
+  required AdNavigatorObserver
+  adNavigatorObserver, // Accept AdNavigatorObserver
 }) {
   // Instantiate AccountBloc once to be shared
   final accountBloc = AccountBloc(
