Resolve merge conflict between main and vypq

chore(ui): Update notificationCard and warningCard in HomeScreen
chore: update ios config to use location
2025-04-14 11:41:00 +07:00 · 2025-04-14 11:30:10 +07:00 · 2025-04-14 09:48:29 +07:00
11 changed files with 141 additions and 119 deletions
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -37,6 +37,35 @@ end
 post_install do |installer|
  installer.pods_project.targets.each do |target|
    flutter_additional_ios_build_settings(target)
+
+    target.build_configurations.each do |config|
+      # You can remove unused permissions here
+      # for more information: https://github.com/BaseflowIT/flutter-permission-handler/blob/master/permission_handler/ios/Classes/PermissionHandlerEnums.h
+      # e.g. when you don't need camera permission, just add 'PERMISSION_CAMERA=0'
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+
+        ## dart: PermissionGroup.camera
+        'PERMISSION_CAMERA=1',
+
+        ## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If
+        ## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE`
+        ## macro.
+        ##
+        ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+        'PERMISSION_LOCATION=0',
+        'PERMISSION_LOCATION_WHENINUSE=1',
+
+        ## dart: PermissionGroup.notification
+        'PERMISSION_NOTIFICATIONS=1',
+
+
+        ## dart: PermissionGroup.criticalAlerts
+        'PERMISSION_CRITICAL_ALERTS=1',
+
+      ]
+
+    end
        target.build_configurations.each do |config|
            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
        end
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -11,9 +11,9 @@
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		5EFD34A62DA7D89800351DB2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5EFD34A52DA7D89800351DB2 /* GoogleService-Info.plist */; };
+		634E6B9E5E8AF15560F03990 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501AA52756E2B08A7E1FBE73 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
-		8C56D767FE4FABDBA3A6FEC5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9FD75834CF1BDB8A25BFFEC /* Pods_Runner.framework */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -45,17 +45,18 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		22127402AC507377520FA076 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		25C6B6667708ECABC11CB63A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		30C8386A287397C265D21D0C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		501AA52756E2B08A7E1FBE73 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5EE624442DA6030500B7B650 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		5EFD34A52DA7D89800351DB2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		78334C166CCB562F36E48821 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		7F880EC2F80617123414BCDC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		932B4AD0BAFC1BC9FBBFA388 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -63,7 +64,6 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		F9FD75834CF1BDB8A25BFFEC /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -72,21 +72,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
-				8C56D767FE4FABDBA3A6FEC5 /* Pods_Runner.framework in Frameworks */,
+				634E6B9E5E8AF15560F03990 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		316923E64F63A0F9D874FB14 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				F9FD75834CF1BDB8A25BFFEC /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -95,6 +87,14 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		7E17DC341A9804E98C0A4D9D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				501AA52756E2B08A7E1FBE73 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -114,7 +114,7 @@
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				E4B9BF767E8449E8CDAC1C45 /* Pods */,
-				316923E64F63A0F9D874FB14 /* Frameworks */,
+				7E17DC341A9804E98C0A4D9D /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -147,9 +147,9 @@
 		E4B9BF767E8449E8CDAC1C45 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				7F880EC2F80617123414BCDC /* Pods-Runner.debug.xcconfig */,
-				78334C166CCB562F36E48821 /* Pods-Runner.release.xcconfig */,
-				932B4AD0BAFC1BC9FBBFA388 /* Pods-Runner.profile.xcconfig */,
+				30C8386A287397C265D21D0C /* Pods-Runner.debug.xcconfig */,
+				25C6B6667708ECABC11CB63A /* Pods-Runner.release.xcconfig */,
+				22127402AC507377520FA076 /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -178,15 +178,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				9EC01057D3A8F2BAF61BC6F6 /* [CP] Check Pods Manifest.lock */,
+				63291DA6552A39BD8B950BE6 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				F412CDB3CB7EB2B89B8A1F67 /* [CP] Embed Pods Frameworks */,
-				7A68DAC237480EA02778D297 /* [CP] Copy Pods Resources */,
+				6E40E7EA960942FA803CE7C6 /* [CP] Embed Pods Frameworks */,
+				1DD8F2A74CC23CF717FB4664 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -264,23 +264,7 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		7A68DAC237480EA02778D297 /* [CP] Copy Pods Resources */ = {
+		1DD8F2A74CC23CF717FB4664 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -297,22 +281,23 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
-			name = "Run Script";
+			name = "Thin Binary";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		9EC01057D3A8F2BAF61BC6F6 /* [CP] Check Pods Manifest.lock */ = {
+		63291DA6552A39BD8B950BE6 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -334,7 +319,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F412CDB3CB7EB2B89B8A1F67 /* [CP] Embed Pods Frameworks */ = {
+		6E40E7EA960942FA803CE7C6 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -351,6 +336,21 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -442,7 +442,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -460,7 +460,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = WM843WW2NF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -470,7 +470,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.smatec.sfm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -574,7 +574,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -623,7 +623,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -643,7 +643,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = WM843WW2NF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -653,7 +653,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.smatec.sfm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -673,7 +673,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = WM843WW2NF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -683,7 +683,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = vn.smatec.sfm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -28,14 +28,12 @@
 	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>Camera permission is required for barcode scanning.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Always and when in use!</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Can I have location always?</string>
-	<key>NSLocationUsageDescription</key>
-	<string>Older devices need location.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Need location when in use</string>
+	<string>Cần vị trí để hiển thị bản đồ hoặc tìm địa điểm gần bạn</string>
+	<key>NSUserNotificationsUsageDescription</key>
+	<string>Chúng tôi cần gửi thông báo khẩn cấp để cảnh báo về việc thiết bị phát hiện có cháy.</string>
+	<key>com.apple.developer.usernotifications.critical-alerts</key>
+	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
--- a/ios/build/.last_build_id
+++ b/ios/build/.last_build_id
@@ -1 +0,0 @@
-4f4dfcdc103d3d3b4ca43bd2cac6c5ac
--- a/ios/sfmTranslateErrors.txt
+++ b/ios/sfmTranslateErrors.txt
@@ -1 +0,0 @@
-{}
--- a/lib/feature/home/home_screen.dart
+++ b/lib/feature/home/home_screen.dart
@@ -82,60 +82,57 @@ class _HomeScreenState extends State<HomeScreen> {
                    stream: homeBloc.streamOwnerDevicesStatus,
                    builder: (context, snapshot) {
                      if (snapshot.data?['state'] != null || snapshot.data?['battery'] != null) {
-                        return Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            if (snapshot.data?['state'] != null)
-                              ...snapshot.data!['state']!
-                                  .map(
-                                    (item) => FutureBuilder<Widget>(
+                        return ConstrainedBox(
+                          constraints: BoxConstraints(minWidth: MediaQuery.of(context).size.width),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: [
+                              if (snapshot.data?['state'] != null)
+                                ...snapshot.data!['state']!
+                                    .map(
+                                      (item) => SizedBox(
+                                    width: context.dynamicWidth(0.95),
+                                    child: FutureBuilder<Widget>(
                                      future: warningCard(context, apiServices, item),
                                      builder: (context, warningCardSnapshot) {
                                        if (warningCardSnapshot.hasData) {
-                                          return ConstrainedBox(
-                                            constraints: const BoxConstraints(
-                                              maxWidth: 400,
-                                              maxHeight: 260,
-                                            ),
-                                            child: warningCardSnapshot.data!,
-                                          );
+                                          return warningCardSnapshot.data!;
                                        } else {
                                          return const SizedBox.shrink();
                                        }
                                      },
                                    ),
-                                  )
-                                  .toList(),
-                            if (snapshot.data?['battery'] != null)
-                              ...snapshot.data!['battery']!
-                                  .map(
-                                    (batteryItem) => FutureBuilder<Widget>(
+                                  ),
+                                )
+                                    .toList(),
+                              if (snapshot.data?['battery'] != null)
+                                ...snapshot.data!['battery']!
+                                    .map(
+                                      (batteryItem) => SizedBox(
+                                    width: context.dynamicWidth(0.95),
+                                    child: FutureBuilder<Widget>(
                                      future: notificationCard(
                                          context, "lowBattery", appLocalization(context).low_battery_message, batteryItem),
                                      builder: (context, warningCardSnapshot) {
                                        if (warningCardSnapshot.hasData) {
-                                          return ConstrainedBox(
-                                            constraints: const BoxConstraints(
-                                              maxWidth: 400,
-                                              maxHeight: 260,
-                                            ),
-                                            child: warningCardSnapshot.data!,
-                                          );
+                                          return warningCardSnapshot.data!;
                                        } else {
                                          return const SizedBox.shrink();
                                        }
                                      },
                                    ),
-                                  )
-                                  .toList(),
-                          ],
+                                  ),
+                                )
+                                    .toList(),
+                            ],
+                          ),
                        );
                      } else {
                        return Padding(
                          padding: context.paddingMedium,
                          child: Center(
                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
                              children: [
                                const Icon(
                                  Icons.check_circle_outline_rounded,
@@ -159,6 +156,11 @@ class _HomeScreenState extends State<HomeScreen> {
                  ),
                ),
              ),
+
+
+
+
+
              StreamBuilder<Map<String, List<DeviceWithAlias>>>(
                  stream: homeBloc.streamAllDevicesAliasMap,
                  builder: (context, allDevicesAliasMapSnapshot) {
--- a/lib/feature/home/shared/overview_card.dart
+++ b/lib/feature/home/shared/overview_card.dart
@@ -23,7 +23,6 @@ class OverviewCard extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Card(
-      margin: context.paddingLow,
      elevation: 8,
      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
      child: Padding(
--- a/lib/feature/map/map_screen.dart
+++ b/lib/feature/map/map_screen.dart
@@ -235,9 +235,9 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
    if (hasStateOne) {
      return flameIcon; // flameIcon
    } else if (hasOtherState) {
-      return normalIcon; // normalIcon
+      return offlineIcon; // normalIcon
    } else {
-      return offlineIcon; // offlineIcon
+      return normalIcon; // offlineIcon
    }
  }

@@ -275,16 +275,13 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
    if (response != "") {
      final data = jsonDecode(response);
      List<dynamic> result = data['items'];
-      if(result.isNotEmpty){
+      if (result.isNotEmpty) {
        devices.clear();
        final devicesList = Device.fromJsonDynamicList(result);
        for (var device in devicesList) {
          devices.add(device);
        }
-      }else{
-        
-      }
-
+      } else {}
    }
  }

--- a/lib/feature/map/widget/on_tap_marker_widget.dart
+++ b/lib/feature/map/widget/on_tap_marker_widget.dart
@@ -163,6 +163,7 @@ onTapMarker(
                      style: const ButtonStyle(
                        backgroundColor: WidgetStatePropertyAll(Colors.red),
                        foregroundColor: WidgetStatePropertyAll(Colors.white),
+                        iconColor: WidgetStatePropertyAll(Colors.white),
                      ),
                      icon: IconConstants.instance
                          .getMaterialIcon(Icons.fire_truck_outlined),
--- a/lib/product/services/map_services.dart
+++ b/lib/product/services/map_services.dart
@@ -43,24 +43,22 @@ class MapServices {
    List<LatLng> polylineCoordinates = [];
    PolylinePoints polylinePoints = PolylinePoints();

-    PolylineResult result = await polylinePoints.getRouteBetweenCoordinates(
-        googleApiKey: ApplicationConstants.MAP_KEY,
-        request: PolylineRequest(
-          origin: PointLatLng(origin.latitude, origin.longitude),
-          destination: PointLatLng(destination.latitude, destination.longitude),
-          mode: TravelMode.driving,
-          optimizeWaypoints: true
-        )
-        );
-    if (result.points.isNotEmpty) {
-      for (var point in result.points) {
-        polylineCoordinates.add(LatLng(point.latitude, point.longitude));
-      }
-      return polylineCoordinates;
-    } else {
-      log("Lỗi khi tìm đường");
-      return [];
-    }
+    // PolylineResult result = await polylinePoints.getRouteBetweenCoordinates(
+    //     ApplicationConstants.MAP_KEY,
+    //     PointLatLng(origin.latitude, origin.longitude),
+    //     PointLatLng(destination.latitude, destination.longitude),
+    //     travelMode: TravelMode.driving,
+    //     optimizeWaypoints: true);
+    // if (result.points.isNotEmpty) {
+    //   for (var point in result.points) {
+    //     polylineCoordinates.add(LatLng(point.latitude, point.longitude));
+    //   }
+    //   return polylineCoordinates;
+    // } else {
+    //   log("Lỗi khi tìm đường");
+    //   return [];
+    // }
+    return [];
  }

 }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Smart Fire Monitoring

 publish_to: "none" # Remove this line if you wish to publish to pub.dev

-version: 1.0.6+6
+version: 1.0.5+5

 environment:
  sdk: ">=3.0.1 <4.0.0"
Author	SHA1	Message	Date
anhtunz	6af1baed32	Resolve merge conflict between main and vypq	2025-04-14 11:41:00 +07:00
anhtunz	758cc22a0f	chore(ui): Update notificationCard and warningCard in HomeScreen	2025-04-14 11:30:10 +07:00
anhtunz	345c554519	chore: update ios config to use location	2025-04-14 09:48:29 +07:00