style: misc

Author: fulleni

lib/headlines-feed/bloc/sources_filter_bloc.dart

@@ -61,9 +61,11 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
         state.copyWith(
           availableCountries: availableCountries.items,
           allAvailableSources: allAvailableSources,
-          displayableSources: displayableSources, // Now correctly filtered if initial capsules were set
+          displayableSources:
+              displayableSources, // Now correctly filtered if initial capsules were set
           finallySelectedSourceIds: initialSelectedSourceIds,
-          selectedCountryIsoCodes: initialSelectedCountryIsoCodes, // Use event's data
+          selectedCountryIsoCodes:
+              initialSelectedCountryIsoCodes, // Use event's data
           selectedSourceTypes: initialSelectedSourceTypes, // Use event's data
           dataLoadingStatus: SourceFilterDataLoadingStatus.success,
           clearErrorMessage: true,
@@ -191,10 +193,12 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
     }
 
     return allSources.where((source) {
-      final matchesCountry = selectedCountries.isEmpty ||
+      final matchesCountry =
+          selectedCountries.isEmpty ||
           (source.headquarters != null &&
               selectedCountries.contains(source.headquarters!.isoCode));
-      final matchesType = selectedTypes.isEmpty ||
+      final matchesType =
+          selectedTypes.isEmpty ||
           (source.sourceType != null &&
               selectedTypes.contains(source.sourceType!));
       return matchesCountry && matchesType;

lib/headlines-feed/bloc/sources_filter_event.dart

@@ -22,10 +22,10 @@ class LoadSourceFilterData extends SourcesFilterEvent {
 
   @override
   List<Object?> get props => [
-        initialSelectedSources,
-        initialSelectedCountryIsoCodes,
-        initialSelectedSourceTypes,
-      ];
+    initialSelectedSources,
+    initialSelectedCountryIsoCodes,
+    initialSelectedSourceTypes,
+  ];
 }
 
 class CountryCapsuleToggled extends SourcesFilterEvent {

lib/headlines-feed/bloc/sources_filter_state.dart

@@ -45,7 +45,8 @@ class SourcesFilterState extends Equatable {
           selectedCountryIsoCodes ?? this.selectedCountryIsoCodes,
       availableSourceTypes: availableSourceTypes ?? this.availableSourceTypes,
       selectedSourceTypes: selectedSourceTypes ?? this.selectedSourceTypes,
-      allAvailableSources: allAvailableSources ?? this.allAvailableSources, // Added
+      allAvailableSources:
+          allAvailableSources ?? this.allAvailableSources, // Added
       displayableSources: displayableSources ?? this.displayableSources,
       finallySelectedSourceIds:
           finallySelectedSourceIds ?? this.finallySelectedSourceIds,

lib/headlines-feed/models/headline_filter.dart

@@ -29,11 +29,11 @@ class HeadlineFilter extends Equatable {
 
   @override
   List<Object?> get props => [
-        categories,
-        sources,
-        selectedSourceCountryIsoCodes,
-        selectedSourceSourceTypes,
-      ];
+    categories,
+    sources,
+    selectedSourceCountryIsoCodes,
+    selectedSourceSourceTypes,
+  ];
 
   /// Creates a copy of this [HeadlineFilter] with the given fields
   /// replaced with the new values.
@@ -46,8 +46,8 @@ class HeadlineFilter extends Equatable {
     return HeadlineFilter(
       categories: categories ?? this.categories,
       sources: sources ?? this.sources,
-      selectedSourceCountryIsoCodes: selectedSourceCountryIsoCodes ??
-          this.selectedSourceCountryIsoCodes,
+      selectedSourceCountryIsoCodes:
+          selectedSourceCountryIsoCodes ?? this.selectedSourceCountryIsoCodes,
       selectedSourceSourceTypes:
           selectedSourceSourceTypes ?? this.selectedSourceSourceTypes,
     );

lib/headlines-feed/view/headlines_filter_page.dart

@@ -9,8 +9,7 @@ import 'package:ht_main/headlines-feed/models/headline_filter.dart';
 import 'package:ht_main/l10n/l10n.dart';
 import 'package:ht_main/router/routes.dart';
 import 'package:ht_main/shared/constants/constants.dart';
-import 'package:ht_shared/ht_shared.dart'
-    show Category, Source, SourceType;
+import 'package:ht_shared/ht_shared.dart' show Category, Source, SourceType;
 
 // Keys for passing data to/from SourceFilterPage
 const String keySelectedSources = 'selectedSources';
@@ -56,10 +55,12 @@ class _HeadlinesFilterPageState extends State<HeadlinesFilterPage> {
       _tempSelectedCategories = List.from(currentState.filter.categories ?? []);
       _tempSelectedSources = List.from(currentState.filter.sources ?? []);
       // Initialize source capsule states from the BLoC's current filter
-      _tempSelectedSourceCountryIsoCodes =
-          Set.from(currentState.filter.selectedSourceCountryIsoCodes ?? {});
-      _tempSelectedSourceSourceTypes =
-          Set.from(currentState.filter.selectedSourceSourceTypes ?? {});
+      _tempSelectedSourceCountryIsoCodes = Set.from(
+        currentState.filter.selectedSourceCountryIsoCodes ?? {},
+      );
+      _tempSelectedSourceSourceTypes = Set.from(
+        currentState.filter.selectedSourceSourceTypes ?? {},
+      );
     } else {
       _tempSelectedCategories = [];
       _tempSelectedSources = [];

lib/headlines-feed/view/source_filter_page.dart

@@ -118,7 +118,8 @@ class _SourceFilterView extends StatelessWidget {
             // Or, we could try to persist/retrieve the last known good capsule state.
             // For now, simple retry reloads all.
             const LoadSourceFilterData(
-              initialSelectedSources: [], // Or pass current selections if needed
+              initialSelectedSources:
+                  [], // Or pass current selections if needed
               initialSelectedCountryIsoCodes: {},
               initialSelectedSourceTypes: {},
             ),

lib/router/router.dart

@@ -403,15 +403,28 @@ GoRouter createRouter({
                               // Pass initialSelectedSources, country ISO codes, and source types from state.extra
                               child: Builder(
                                 builder: (context) {
-                                  final extraData = state.extra as Map<String, dynamic>? ?? const {};
-                                  final initialSources = extraData[keySelectedSources] as List<Source>? ?? const [];
-                                  final initialCountryIsoCodes = extraData[keySelectedCountryIsoCodes] as Set<String>? ?? const {};
-                                  final initialSourceTypes = extraData[keySelectedSourceTypes] as Set<SourceType>? ?? const {};
+                                  final extraData =
+                                      state.extra as Map<String, dynamic>? ??
+                                      const {};
+                                  final initialSources =
+                                      extraData[keySelectedSources]
+                                          as List<Source>? ??
+                                      const [];
+                                  final initialCountryIsoCodes =
+                                      extraData[keySelectedCountryIsoCodes]
+                                          as Set<String>? ??
+                                      const {};
+                                  final initialSourceTypes =
+                                      extraData[keySelectedSourceTypes]
+                                          as Set<SourceType>? ??
+                                      const {};
 
                                   return SourceFilterPage(
                                     initialSelectedSources: initialSources,
-                                    initialSelectedCountryIsoCodes: initialCountryIsoCodes,
-                                    initialSelectedSourceTypes: initialSourceTypes,
+                                    initialSelectedCountryIsoCodes:
+                                        initialCountryIsoCodes,
+                                    initialSelectedSourceTypes:
+                                        initialSourceTypes,
                                   );
                                 },
                               ),