Merge pull request #95 from flutter-news-app-full-source-code/Refine-Main-Filter-Page-And-Implement-Apply-Favorites-in-Sub-Pages

Refine main filter page and implement apply favorites in sub pages

Author: fulleni

lib/headlines-feed/bloc/countries_filter_bloc.dart

@@ -5,6 +5,7 @@ import 'package:bloc_concurrency/bloc_concurrency.dart';
 import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart'; // Import AppBloc
 
 part 'countries_filter_event.dart';
 part 'countries_filter_state.dart';
@@ -20,16 +21,29 @@ class CountriesFilterBloc
   /// {@macro countries_filter_bloc}
   ///
   /// Requires a [DataRepository<Country>] to interact with the data layer.
-  CountriesFilterBloc({required DataRepository<Country> countriesRepository})
-    : _countriesRepository = countriesRepository,
-      super(const CountriesFilterState()) {
+  CountriesFilterBloc({
+    required DataRepository<Country> countriesRepository,
+    required DataRepository<UserContentPreferences>
+    userContentPreferencesRepository, // Inject UserContentPreferencesRepository
+    required AppBloc appBloc, // Inject AppBloc
+  }) : _countriesRepository = countriesRepository,
+       _userContentPreferencesRepository = userContentPreferencesRepository,
+       _appBloc = appBloc,
+       super(const CountriesFilterState()) {
     on<CountriesFilterRequested>(
       _onCountriesFilterRequested,
       transformer: restartable(),
     );
+    on<CountriesFilterApplyFollowedRequested>(
+      _onCountriesFilterApplyFollowedRequested,
+      transformer: restartable(),
+    ); // Register new event handler
   }
 
   final DataRepository<Country> _countriesRepository;
+  final DataRepository<UserContentPreferences>
+  _userContentPreferencesRepository;
+  final AppBloc _appBloc;
 
   /// Handles the request to fetch countries based on a specific usage.
   ///
@@ -74,4 +88,56 @@ class CountriesFilterBloc
       emit(state.copyWith(status: CountriesFilterStatus.failure, error: e));
     }
   }
+
+  /// Handles the request to apply the user's followed countries as filters.
+  Future<void> _onCountriesFilterApplyFollowedRequested(
+    CountriesFilterApplyFollowedRequested event,
+    Emitter<CountriesFilterState> emit,
+  ) async {
+    emit(
+      state.copyWith(followedCountriesStatus: CountriesFilterStatus.loading),
+    );
+
+    final currentUser = _appBloc.state.user!;
+
+    try {
+      final preferences = await _userContentPreferencesRepository.read(
+        id: currentUser.id,
+        userId: currentUser.id,
+      );
+
+      if (preferences.followedCountries.isEmpty) {
+        emit(
+          state.copyWith(
+            followedCountriesStatus: CountriesFilterStatus.success,
+            followedCountries: const [],
+            clearError: true,
+          ),
+        );
+        return;
+      }
+
+      emit(
+        state.copyWith(
+          followedCountriesStatus: CountriesFilterStatus.success,
+          followedCountries: preferences.followedCountries,
+          clearFollowedCountriesError: true,
+        ),
+      );
+    } on HttpException catch (e) {
+      emit(
+        state.copyWith(
+          followedCountriesStatus: CountriesFilterStatus.failure,
+          error: e,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          followedCountriesStatus: CountriesFilterStatus.failure,
+          error: UnknownException(e.toString()),
+        ),
+      );
+    }
+  }
 }

lib/headlines-feed/bloc/countries_filter_event.dart

@@ -27,3 +27,9 @@ final class CountriesFilterRequested extends CountriesFilterEvent {
   @override
   List<Object?> get props => [usage];
 }
+
+/// {@template countries_filter_apply_followed_requested}
+/// Event triggered to request applying the user's followed countries as filters.
+/// {@endtemplate}
+final class CountriesFilterApplyFollowedRequested
+    extends CountriesFilterEvent {}

lib/headlines-feed/bloc/countries_filter_state.dart

@@ -34,6 +34,8 @@ final class CountriesFilterState extends Equatable {
     this.hasMore = true,
     this.cursor,
     this.error,
+    this.followedCountriesStatus = CountriesFilterStatus.initial,
+    this.followedCountries = const [],
   });
 
   /// The current status of fetching countries.
@@ -52,15 +54,24 @@ final class CountriesFilterState extends Equatable {
   /// An optional error object if the status is [CountriesFilterStatus.failure].
   final HttpException? error;
 
+  /// The current status of fetching followed countries.
+  final CountriesFilterStatus followedCountriesStatus;
+
+  /// The list of [Country] objects representing the user's followed countries.
+  final List<Country> followedCountries;
+
   /// Creates a copy of this state with the given fields replaced.
   CountriesFilterState copyWith({
     CountriesFilterStatus? status,
     List<Country>? countries,
     bool? hasMore,
     String? cursor,
     HttpException? error,
+    CountriesFilterStatus? followedCountriesStatus,
+    List<Country>? followedCountries,
     bool clearError = false,
     bool clearCursor = false,
+    bool clearFollowedCountriesError = false,
   }) {
     return CountriesFilterState(
       status: status ?? this.status,
@@ -70,9 +81,20 @@ final class CountriesFilterState extends Equatable {
       cursor: clearCursor ? null : (cursor ?? this.cursor),
       // Clear error if requested, otherwise keep existing or use new one
       error: clearError ? null : error ?? this.error,
+      followedCountriesStatus:
+          followedCountriesStatus ?? this.followedCountriesStatus,
+      followedCountries: followedCountries ?? this.followedCountries,
     );
   }
 
   @override
-  List<Object?> get props => [status, countries, hasMore, cursor, error];
+  List<Object?> get props => [
+    status,
+    countries,
+    hasMore,
+    cursor,
+    error,
+    followedCountriesStatus,
+    followedCountries,
+  ];
 }

lib/headlines-feed/bloc/sources_filter_bloc.dart

@@ -4,6 +4,7 @@ import 'package:bloc/bloc.dart';
 import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/bloc/app_bloc.dart'; // Import AppBloc
 
 part 'sources_filter_event.dart';
 part 'sources_filter_state.dart';
@@ -12,20 +13,30 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
   SourcesFilterBloc({
     required DataRepository<Source> sourcesRepository,
     required DataRepository<Country> countriesRepository,
+    required DataRepository<UserContentPreferences>
+    userContentPreferencesRepository,
+    required AppBloc appBloc,
   }) : _sourcesRepository = sourcesRepository,
        _countriesRepository = countriesRepository,
+       _userContentPreferencesRepository = userContentPreferencesRepository,
+       _appBloc = appBloc,
        super(const SourcesFilterState()) {
     on<LoadSourceFilterData>(_onLoadSourceFilterData);
     on<CountryCapsuleToggled>(_onCountryCapsuleToggled);
     on<AllSourceTypesCapsuleToggled>(_onAllSourceTypesCapsuleToggled);
     on<SourceTypeCapsuleToggled>(_onSourceTypeCapsuleToggled);
     on<SourceCheckboxToggled>(_onSourceCheckboxToggled);
     on<ClearSourceFiltersRequested>(_onClearSourceFiltersRequested);
-    // Removed _FetchFilteredSourcesRequested event listener
+    on<SourcesFilterApplyFollowedRequested>(
+      _onSourcesFilterApplyFollowedRequested,
+    );
   }
 
   final DataRepository<Source> _sourcesRepository;
   final DataRepository<Country> _countriesRepository;
+  final DataRepository<UserContentPreferences>
+  _userContentPreferencesRepository;
+  final AppBloc _appBloc;
 
   Future<void> _onLoadSourceFilterData(
     LoadSourceFilterData event,
@@ -182,6 +193,63 @@ class SourcesFilterBloc extends Bloc<SourcesFilterEvent, SourcesFilterState> {
     );
   }
 
+  /// Handles the request to apply the user's followed sources as filters.
+  Future<void> _onSourcesFilterApplyFollowedRequested(
+    SourcesFilterApplyFollowedRequested event,
+    Emitter<SourcesFilterState> emit,
+  ) async {
+    emit(
+      state.copyWith(
+        followedSourcesStatus: SourceFilterDataLoadingStatus.loading,
+      ),
+    );
+
+    final currentUser = _appBloc.state.user!;
+
+    try {
+      final preferences = await _userContentPreferencesRepository.read(
+        id: currentUser.id,
+        userId: currentUser.id,
+      );
+
+      if (preferences.followedSources.isEmpty) {
+        emit(
+          state.copyWith(
+            followedSourcesStatus: SourceFilterDataLoadingStatus.success,
+            followedSources: const [],
+            clearErrorMessage: true,
+          ),
+        );
+        return;
+      }
+
+      emit(
+        state.copyWith(
+          followedSourcesStatus: SourceFilterDataLoadingStatus.success,
+          followedSources: preferences.followedSources,
+          finallySelectedSourceIds: preferences.followedSources
+              .map((s) => s.id)
+              .toSet(),
+          clearFollowedSourcesError: true,
+        ),
+      );
+    } on HttpException catch (e) {
+      emit(
+        state.copyWith(
+          followedSourcesStatus: SourceFilterDataLoadingStatus.failure,
+          error: e,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          followedSourcesStatus: SourceFilterDataLoadingStatus.failure,
+          error: UnknownException(e.toString()),
+        ),
+      );
+    }
+  }
+
   // Helper method to filter sources based on selected countries and types
   List<Source> _getFilteredSources({
     required List<Source> allSources,

lib/headlines-feed/bloc/sources_filter_event.dart

@@ -20,17 +20,13 @@ abstract class SourcesFilterEvent extends Equatable {
 /// {@endtemplate}
 class LoadSourceFilterData extends SourcesFilterEvent {
   /// {@macro load_source_filter_data}
-  const LoadSourceFilterData({
-    this.initialSelectedSources = const [],
-  });
+  const LoadSourceFilterData({this.initialSelectedSources = const []});
 
   /// The list of sources that were initially selected on the previous page.
   final List<Source> initialSelectedSources;
 
   @override
-  List<Object?> get props => [
-    initialSelectedSources,
-  ];
+  List<Object?> get props => [initialSelectedSources];
 }
 
 class CountryCapsuleToggled extends SourcesFilterEvent {
@@ -69,3 +65,8 @@ class SourceCheckboxToggled extends SourcesFilterEvent {
 class ClearSourceFiltersRequested extends SourcesFilterEvent {
   const ClearSourceFiltersRequested();
 }
+
+/// {@template sources_filter_apply_followed_requested}
+/// Event triggered to request applying the user's followed sources as filters.
+/// {@endtemplate}
+final class SourcesFilterApplyFollowedRequested extends SourcesFilterEvent {}

lib/headlines-feed/bloc/sources_filter_state.dart

@@ -15,6 +15,8 @@ class SourcesFilterState extends Equatable {
     this.finallySelectedSourceIds = const {},
     this.dataLoadingStatus = SourceFilterDataLoadingStatus.initial,
     this.error,
+    this.followedSourcesStatus = SourceFilterDataLoadingStatus.initial,
+    this.followedSources = const [],
   });
 
   final List<Country> availableCountries;
@@ -27,6 +29,12 @@ class SourcesFilterState extends Equatable {
   final SourceFilterDataLoadingStatus dataLoadingStatus;
   final HttpException? error;
 
+  /// The current status of fetching followed sources.
+  final SourceFilterDataLoadingStatus followedSourcesStatus;
+
+  /// The list of [Source] objects representing the user's followed sources.
+  final List<Source> followedSources;
+
   SourcesFilterState copyWith({
     List<Country>? availableCountries,
     Set<String>? selectedCountryIsoCodes,
@@ -37,7 +45,10 @@ class SourcesFilterState extends Equatable {
     Set<String>? finallySelectedSourceIds,
     SourceFilterDataLoadingStatus? dataLoadingStatus,
     HttpException? error,
+    SourceFilterDataLoadingStatus? followedSourcesStatus,
+    List<Source>? followedSources,
     bool clearErrorMessage = false,
+    bool clearFollowedSourcesError = false,
   }) {
     return SourcesFilterState(
       availableCountries: availableCountries ?? this.availableCountries,
@@ -51,6 +62,9 @@ class SourcesFilterState extends Equatable {
           finallySelectedSourceIds ?? this.finallySelectedSourceIds,
       dataLoadingStatus: dataLoadingStatus ?? this.dataLoadingStatus,
       error: clearErrorMessage ? null : error ?? this.error,
+      followedSourcesStatus:
+          followedSourcesStatus ?? this.followedSourcesStatus,
+      followedSources: followedSources ?? this.followedSources,
     );
   }
 
@@ -65,5 +79,7 @@ class SourcesFilterState extends Equatable {
     finallySelectedSourceIds,
     dataLoadingStatus,
     error,
+    followedSourcesStatus,
+    followedSources,
   ];
 }