Merge pull request #30 from headlines-toolkit/refactor_remove_country_from_search_and_headline_details_page

Refactor remove country from search and headline details page

Author: fulleni

lib/account/bloc/account_bloc.dart

@@ -1,92 +1,58 @@
 part of 'account_bloc.dart';
 
-/// {@template account_event}
-/// Base class for Account events.
-/// {@endtemplate}
-sealed class AccountEvent extends Equatable {
-  /// {@macro account_event}
+abstract class AccountEvent extends Equatable {
   const AccountEvent();
 
   @override
   List<Object?> get props => [];
 }
 
-/// {@template _account_user_changed}
-/// Internal event triggered when the authenticated user changes.
-/// {@endtemplate}
-final class _AccountUserChanged extends AccountEvent {
-  /// {@macro _account_user_changed}
-  const _AccountUserChanged({required this.user});
-
-  /// The current authenticated user, or null if unauthenticated.
+class AccountUserChanged extends AccountEvent { // Corrected name
+  const AccountUserChanged(this.user);
   final User? user;
 
   @override
   List<Object?> get props => [user];
 }
 
-/// {@template account_load_content_preferences_requested}
-/// Event triggered when the user's content preferences need to be loaded.
-/// {@endtemplate}
-final class AccountLoadContentPreferencesRequested extends AccountEvent {
-  /// {@macro account_load_content_preferences_requested}
-  const AccountLoadContentPreferencesRequested({required this.userId});
-
-  /// The ID of the user whose content preferences should be loaded.
+class AccountLoadUserPreferences extends AccountEvent { // Corrected name
+  const AccountLoadUserPreferences({required this.userId});
   final String userId;
 
   @override
   List<Object> get props => [userId];
 }
 
-/// {@template account_follow_category_toggled}
-/// Event triggered when a user toggles following a category.
-/// {@endtemplate}
-final class AccountFollowCategoryToggled extends AccountEvent {
-  /// {@macro account_follow_category_toggled}
-  const AccountFollowCategoryToggled({required this.category});
+class AccountSaveHeadlineToggled extends AccountEvent {
+  const AccountSaveHeadlineToggled({required this.headline});
+  final Headline headline;
 
+  @override
+  List<Object> get props => [headline];
+}
+
+class AccountFollowCategoryToggled extends AccountEvent {
+  const AccountFollowCategoryToggled({required this.category});
   final Category category;
 
   @override
   List<Object> get props => [category];
 }
 
-/// {@template account_follow_source_toggled}
-/// Event triggered when a user toggles following a source.
-/// {@endtemplate}
-final class AccountFollowSourceToggled extends AccountEvent {
-  /// {@macro account_follow_source_toggled}
+class AccountFollowSourceToggled extends AccountEvent {
   const AccountFollowSourceToggled({required this.source});
-
   final Source source;
 
   @override
   List<Object> get props => [source];
 }
 
-/// {@template account_follow_country_toggled}
-/// Event triggered when a user toggles following a country.
-/// {@endtemplate}
-final class AccountFollowCountryToggled extends AccountEvent {
-  /// {@macro account_follow_country_toggled}
-  const AccountFollowCountryToggled({required this.country});
+// AccountFollowCountryToggled event correctly removed previously
 
-  final Country country;
-
-  @override
-  List<Object> get props => [country];
-}
-
-/// {@template account_save_headline_toggled}
-/// Event triggered when a user toggles saving a headline.
-/// {@endtemplate}
-final class AccountSaveHeadlineToggled extends AccountEvent {
-  /// {@macro account_save_headline_toggled}
-  const AccountSaveHeadlineToggled({required this.headline});
-
-  final Headline headline;
+class AccountClearUserPreferences extends AccountEvent {
+  const AccountClearUserPreferences({required this.userId});
+  final String userId;
 
   @override
-  List<Object> get props => [headline];
+  List<Object> get props => [userId];
 }

lib/account/bloc/account_event.dart

@@ -1,56 +1,36 @@
 part of 'account_bloc.dart';
 
-/// Defines the status of the account state.
-enum AccountStatus {
-  /// The initial state.
-  initial,
+enum AccountStatus { initial, loading, success, failure }
 
-  /// An operation is in progress.
-  loading,
-
-  /// An operation was successful.
-  success,
-
-  /// An operation failed.
-  failure,
-}
-
-/// {@template account_state}
-/// State for the Account feature.
-/// {@endtemplate}
-final class AccountState extends Equatable {
-  /// {@macro account_state}
+class AccountState extends Equatable {
   const AccountState({
     this.status = AccountStatus.initial,
     this.user,
     this.preferences,
     this.errorMessage,
   });
 
-  /// The current status of the account state.
   final AccountStatus status;
-
-  /// The currently authenticated user.
   final User? user;
-
-  /// The user's content preferences.
   final UserContentPreferences? preferences;
-
-  /// An error message if an operation failed.
   final String? errorMessage;
 
-  /// Creates a copy of this [AccountState] with the given fields replaced.
   AccountState copyWith({
     AccountStatus? status,
     User? user,
     UserContentPreferences? preferences,
     String? errorMessage,
+    bool clearUser = false,
+    bool clearPreferences = false,
+    bool clearErrorMessage = false,
   }) {
     return AccountState(
       status: status ?? this.status,
-      user: user ?? this.user,
-      preferences: preferences ?? this.preferences,
-      errorMessage: errorMessage ?? this.errorMessage,
+      user: clearUser ? null : user ?? this.user,
+      preferences:
+          clearPreferences ? null : preferences ?? this.preferences,
+      errorMessage:
+          clearErrorMessage ? null : errorMessage ?? this.errorMessage,
     );
   }