fix(headlines): prevent 'Custom' chip from showing when a saved filter is selected & apply and select newly saved filter automatically

This commit fixes a bug where creating and applying a new saved filter would not automatically select its corresponding chip in the filter bar.

The `HeadlinesFeedFiltersApplied` event now optionally carries the `SavedFilter` that was just created. The `HeadlinesFeedBloc` uses this information to correctly identify and set the new filter as active, ensuring the UI immediately reflects the change. If no saved filter is passed, the logic correctly falls back to identifying a pre-existing saved filter or marking the state as 'custom'.

Author: fulleni

lib/headlines-feed/bloc/headlines_feed_bloc.dart

@@ -248,14 +248,28 @@ class HeadlinesFeedBloc extends Bloc<HeadlinesFeedEvent, HeadlinesFeedState> {
     HeadlinesFeedFiltersApplied event,
     Emitter<HeadlinesFeedState> emit,
   ) async {
+    String? newActiveFilterId;
+
+    // If a saved filter was explicitly passed (e.g., just created), use its ID.
+    if (event.savedFilter != null) {
+      newActiveFilterId = event.savedFilter!.id;
+    } else {
+      // Otherwise, determine if this is a pre-existing saved filter being
+      // re-applied or a custom one.
+      final isSavedFilter =
+          state.activeFilterId != 'all' &&
+          state.activeFilterId != 'custom' &&
+          state.activeFilterId != null;
+      newActiveFilterId = isSavedFilter ? state.activeFilterId : 'custom';
+    }
+
     // When applying new filters, this is considered a major feed change,
     // so we clear the ad cache to get a fresh set of relevant ads.
     _inlineAdCacheService.clearAllAds();
     emit(
       state.copyWith(
-        // Applying a filter from the filter page always results in a 'custom' state.
         filter: event.filter,
-        activeFilterId: 'custom',
+        activeFilterId: newActiveFilterId,
         status: HeadlinesFeedStatus.loading,
         feedItems: [],
         cursor: null,

lib/headlines-feed/bloc/headlines_feed_event.dart

@@ -59,17 +59,23 @@ final class HeadlinesFeedFiltersApplied extends HeadlinesFeedEvent {
   const HeadlinesFeedFiltersApplied({
     required this.filter,
     required this.adThemeStyle,
+    this.savedFilter,
   });
 
   /// The [HeadlineFilter] containing the selected categories, sources,
   /// and/or countries.
   final HeadlineFilter filter;
 
+  /// The optional [SavedFilter] that this filter corresponds to.
+  /// This is used to correctly set the active filter ID when a new
+  /// filter is saved and immediately applied.
+  final SavedFilter? savedFilter;
+
   /// The current ad theme style of the application.
   final AdThemeStyle adThemeStyle;
 
   @override
-  List<Object?> get props => [filter, adThemeStyle];
+  List<Object?> get props => [filter, adThemeStyle, savedFilter];
 }
 
 /// {@template headlines_feed_filters_cleared}

lib/headlines-feed/view/headlines_filter_page.dart

@@ -51,9 +51,17 @@ class HeadlinesFilterPage extends StatelessWidget {
   }
 }
 
-class _HeadlinesFilterView extends StatelessWidget {
+class _HeadlinesFilterView extends StatefulWidget {
   const _HeadlinesFilterView();
 
+  @override
+  State<_HeadlinesFilterView> createState() => _HeadlinesFilterViewState();
+}
+
+class _HeadlinesFilterViewState extends State<_HeadlinesFilterView> {
+  /// Track the most recently saved filter within this page's lifecycle.
+  SavedFilter? _newlySavedFilter;
+
   /// Builds a [ListTile] representing a filter criterion (e.g., Categories).
   ///
   /// Displays the criterion [title], the number of currently selected items
@@ -144,6 +152,8 @@ class _HeadlinesFilterView extends StatelessWidget {
                         sources: filterState.selectedSources.toList(),
                         countries: filterState.selectedCountries.toList(),
                       );
+                      // Keep track of the newly saved filter.
+                      setState(() => _newlySavedFilter = newFilter);
                       context.read<AppBloc>().add(
                         SavedFilterAdded(filter: newFilter),
                       );
@@ -174,6 +184,8 @@ class _HeadlinesFilterView extends StatelessWidget {
               context.read<HeadlinesFeedBloc>().add(
                 HeadlinesFeedFiltersApplied(
                   filter: newFilter,
+                  // Pass the newly saved filter if it exists.
+                  savedFilter: _newlySavedFilter,
                   adThemeStyle: AdThemeStyle.fromTheme(Theme.of(context)),
                 ),
               );