Fix: Corrected state management issue in BookmarkMonumentsBloc #190

lib/application/popular_monuments/bookmark_monuments/bookmark_monuments_bloc.dart

@@ -17,39 +17,62 @@ class BookmarkMonumentsBloc
     on<GetBookmarkedMonuments>(_mapGetBookmarkedMonumentsToState);
   }
 
-  Future _mapBookmarkMonumentToState(
+  Future<void> _mapBookmarkMonumentToState(
       BookmarkMonument event, Emitter<BookmarkMonumentsState> emit) async {
-    await _monumentRepository.bookmarkMonument(event.monument.id);
-    emit(MonumentBookmarked(event.monument.id));
+    try {
+      await _monumentRepository.bookmarkMonument(event.monument.id);
+      final bookmarkedMonuments =
+          await _monumentRepository.getBookmarkedMonuments();
+      final bookmarkedMonumentsEntities =
+          bookmarkedMonuments.map((e) => e.toEntity()).toList();
+      emit(BookmarkedMonumentsLoaded(bookmarkedMonumentsEntities));
+    } catch (e) {
+      emit(BookmarkedMonumentsErrorState('Failed to bookmark monument'));
+    }
   }
 
-  Future _mapUnbookmarkMonumentToState(
+  Future<void> _mapUnbookmarkMonumentToState(
       UnbookmarkMonument event, Emitter<BookmarkMonumentsState> emit) async {
-    await _monumentRepository.unbookmarkMonument(event.monument.id);
-    emit(MonumentUnbookmarked(event.monument.id));
+    try {
+      await _monumentRepository.unbookmarkMonument(event.monument.id);
+      final bookmarkedMonuments =
+          await _monumentRepository.getBookmarkedMonuments();
+      final bookmarkedMonumentsEntities =
+          bookmarkedMonuments.map((e) => e.toEntity()).toList();
+      emit(BookmarkedMonumentsLoaded(bookmarkedMonumentsEntities));
+    } catch (e) {
+      emit(BookmarkedMonumentsErrorState('Failed to unbookmark monument'));
+    }
   }
 
-  Future _mapCheckIfMonumentIsBookmarkedToState(
+  Future<void> _mapCheckIfMonumentIsBookmarkedToState(
       CheckIfMonumentIsBookmarked event,
       Emitter<BookmarkMonumentsState> emit) async {
-    final isBookmarked =
-        await _monumentRepository.isMonumentBookmarked(event.monumentId);
-    if (isBookmarked) {
-      emit(MonumentAlreadyBookmarked(event.monumentId));
-    } else {
-      emit(MonumentNotBookmarked(event.monumentId));
+    try {
+      final isBookmarked =
+          await _monumentRepository.isMonumentBookmarked(event.monumentId);
+      if (isBookmarked) {
+        emit(MonumentAlreadyBookmarked(event.monumentId));
+      } else {
+        emit(MonumentNotBookmarked(event.monumentId));
+      }
+    } catch (e) {
+      emit(BookmarkedMonumentsErrorState('Error checking bookmark status'));
     }
   }
 
-  Future _mapGetBookmarkedMonumentsToState(GetBookmarkedMonuments event,
+  Future<void> _mapGetBookmarkedMonumentsToState(GetBookmarkedMonuments event,
       Emitter<BookmarkMonumentsState> emit) async {
     emit(BookmarkedMonumentsLoading());
-    final bookmarkedMonuments =
-        await _monumentRepository.getBookmarkedMonuments();
-
-    final bookmarkedMonumentsEntities =
-        bookmarkedMonuments.map((e) => e.toEntity()).toList();
-
-    emit(BookmarkedMonumentsLoaded(bookmarkedMonumentsEntities));
+    try {
+      final bookmarkedMonuments =
+          await _monumentRepository.getBookmarkedMonuments();
+      final bookmarkedMonumentsEntities =
+          bookmarkedMonuments.map((e) => e.toEntity()).toList();
+      emit(BookmarkedMonumentsLoaded(bookmarkedMonumentsEntities));
+    } catch (e) {
+      emit(BookmarkedMonumentsErrorState('Failed to load bookmarked monuments'));
+    }
   }
 }
+

lib/main.dart

@@ -13,31 +13,38 @@ import 'package:monumento/service_locator.dart';
 import 'package:monumento/utils/app_colors.dart';
 import 'package:monumento/utils/bloc_observer_logger.dart';
 import 'package:responsive_framework/responsive_framework.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:path_provider/path_provider.dart';
 
 import 'application/authentication/authentication_bloc.dart';
 import 'firebase_options.dart';
 import 'presentation/authentication/onboarding_view.dart';
 import 'presentation/home/home_view.dart';
 import 'router.dart';
 
-void main() async {
+void main(dynamic DefaultFirebaseOptions) async {
   WidgetsFlutterBinding.ensureInitialized();
   try {
     await dotenv.load(fileName: ".env");
   } catch (e) {
-    debugPrint('Failed to load .env file: $e');
+    debugPrint('Failed to load .env file: \$e');
   }
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
   setupLocator();
   Bloc.observer = BlocObserverLogger();
 
-  // runApp(MyApp());
+  final storage = await HydratedStorage.build(
+    storageDirectory: await getApplicationDocumentsDirectory(),
+  );
 
-  runApp(
-    DevicePreview(
-      enabled: !kReleaseMode,
-      builder: (context) => MyApp(),
+  HydratedBlocOverrides.runZoned(
+    () => runApp(
+      DevicePreview(
+        enabled: !kReleaseMode,
+        builder: (context) => MyApp(),
+      ),
     ),
+    storage: storage,
   );
 }
 
@@ -58,7 +65,6 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     Size designSize;
     if (kIsWeb) {
-      // if width is less than 530, it means the user resized the window to a smaller size
       if (MediaQuery.of(context).size.width < 530) {
         designSize = const Size(390, 844);
       } else {
@@ -68,7 +74,6 @@ class MyApp extends StatelessWidget {
       if (Platform.isIOS || Platform.isAndroid) {
         designSize = const Size(390, 844);
       } else if (Platform.isLinux || Platform.isWindows || Platform.isMacOS) {
-        // if width is less than 530, it means the user resized the window to a smaller size
         if (MediaQuery.of(context).size.width < 530) {
           designSize = const Size(390, 844);
         } else {
@@ -80,7 +85,6 @@ class MyApp extends StatelessWidget {
     }
 
     return MaterialApp.router(
-      // ignore: deprecated_member_use
       useInheritedMediaQuery: true,
       locale: DevicePreview.locale(context),
       routerConfig: router,