Resolve merge conflict between main and vypq

lib/feature/main/main_screen.dart

@@ -6,9 +6,11 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:go_router/go_router.dart';
 import 'package:badges/badges.dart' as badges;
 import 'package:persistent_bottom_nav_bar/persistent_bottom_nav_bar.dart';
+import 'package:sfm_app/product/utils/permission_handler.dart';
 import '../../product/permission/notification_permission.dart';
 import '../../product/services/notification_services.dart';
 import '../settings/profile/profile_model.dart';
@@ -46,20 +48,20 @@ class MainScreen extends StatefulWidget {
 
 PersistentTabController controller = PersistentTabController(initialIndex: 0);
 
-@pragma('vm:entry-point')
-Future<void> firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  log("Full background message payload: ${message.toMap()}");
-  await Firebase.initializeApp();
-  final notificationServices = NotificationServices();
-  await notificationServices.initLocalNotifications(controller);
-  await notificationServices.showNotification(message);
-  log("Background message handled: ${message.data['title']}");
-}
+// @pragma('vm:entry-point')
+// Future<void> firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+//   log("Full background message payload: ${message.toMap()}");
+//   await Firebase.initializeApp();
+//   final notificationServices = NotificationServices();
+//   await notificationServices.initLocalNotifications(controller);
+//   await notificationServices.showNotification(message);
+//   log("Background message handled: ${message.data['title']}");
+// }
 
 
 class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
   APIServices apiServices = APIServices();
-  final NotificationServices notificationServices = NotificationServices();
+  // final NotificationServices notificationServices = NotificationServices();
   late MainBloc mainBloc;
   bool isVN = true;
   bool isLight = true;
@@ -86,7 +88,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
     }
     mainBloc.sinkIsVNIcon.add(isVN);
     mainBloc.sinkThemeMode.add(isLight);
-    LocationPermissionRequest.instance.checkLocationPermission(context);
+    checkAndRequestPermission();
     NotificationPermission.instance.checkNotificationPermission(context);
   }
 
@@ -94,13 +96,38 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
   void initState() {
     super.initState();
     mainBloc = BlocProvider.of(context);
+    mainBloc.getFCMTokenAndPresentations();
     WidgetsBinding.instance.addObserver(this);
     initialCheck();
     getBellNotification();
     mainBloc.getUserProfile();
-    notificationServices.initLocalNotifications(controller);
-    notificationServices.firebaseInit(context);
-    NotificationServices().setupInteractMessage(controller);
+
+    FirebaseMessaging.instance.onTokenRefresh.listen((newToken) {
+      log("New FCM Token: $newToken");
+      // Gửi token mới lên server
+      mainBloc.sendNotificationToken(newToken);
+    });
+
+    FirebaseMessaging.onMessage.listen((RemoteMessage message) {
+      RemoteNotification? notification = message.notification;
+      AndroidNotification? android = message.notification?.android;
+      if (notification != null && android != null ) {
+        const AndroidNotificationDetails androidPlatformChannelSpecifics =
+        AndroidNotificationDetails(
+            'your channel id', 'your channel name',
+            importance: Importance.max,
+            priority: Priority.high,
+            ticker: 'ticker');
+        const NotificationDetails platformChannelSpecifics =
+        NotificationDetails(android: androidPlatformChannelSpecifics);
+        flutterLocalNotificationsPlugin.show(
+          notification.hashCode, notification.title, notification.body, platformChannelSpecifics,
+        );
+      }
+    });
+    // notificationServices.initLocalNotifications(controller);
+    // notificationServices.firebaseInit(context);
+    // NotificationServices().setupInteractMessage(controller);
   }
 
   @override
@@ -110,7 +137,6 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
       log("App Inactive");
     } else if (state == AppLifecycleState.resumed) {
       log("App Resumed");
-      LocationPermissionRequest.instance.checkLocationPermission(context);
     } else if (state == AppLifecycleState.paused) {
       log("App paused");
     } else if (state == AppLifecycleState.detached) {
@@ -220,7 +246,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
                       SizedBox(
                         width: context.lowValue,
                       ),
-                      Text(userSnapshot.data?.name ?? "")
+                      Flexible( child: Text(userSnapshot.data?.name ?? ""))
                     ],
                   );
                 }),

lib/feature/map/map_screen.dart

@@ -15,6 +15,7 @@ import 'package:sfm_app/product/base/bloc/base_bloc.dart';
 import 'package:sfm_app/product/constant/icon/icon_constants.dart';
 import 'package:sfm_app/product/permission/location_permission.dart';
 import 'package:sfm_app/product/services/api_services.dart';
+import 'package:sfm_app/product/utils/permission_handler.dart';
 import '../../product/constant/enums/app_theme_enums.dart';
 
 class MapScreen extends StatefulWidget {
@@ -181,8 +182,8 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
           ),
           position: cluster.location,
           onTap: () async {
-            bool check = await checkLocationPermission(context);
-            if (check == true) {
+            LocationPermission permission = await checkAndRequestPermission();
+            if (permission == LocationPermission.whileInUse || permission == LocationPermission.always) {
               Position position = await Geolocator.getCurrentPosition();
               onTapMarker(
                 // ignore: use_build_context_synchronously
@@ -284,9 +285,9 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
     }
   }
 
-  Future<bool> checkLocationPermission(context) async {
-    bool check = await LocationPermissionRequest.instance
-        .checkLocationPermission(context);
-    return check;
-  }
+  // Future<bool> checkLocationPermission(context) async {
+  //   bool check = await LocationPermissionRequest.instance
+  //       .checkLocationPermission(context);
+  //   return check;
+  // }
 }

lib/feature/map/widget/show_nearest_place.dart

@@ -52,6 +52,7 @@ showNearPlacesSideSheet(
         padding: context.paddingLow,
         width: screenWidth,
         height: screenHeight / 3,
+        color: Colors.white,
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [