Fix 2803,2802,2800

Fix 2796
2024-04-03 21:39:12 +09:00 · 2024-04-03 20:44:30 +09:00
15 changed files with 249 additions and 48 deletions
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+platform :ios, '12.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -23,7 +23,7 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
    - Flutter
  - pointer_interceptor_ios (0.0.1):
    - Flutter
@ -103,13 +103,13 @@ SPEC CHECKSUMS:
  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
  isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
  pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
  sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812

-PODFILE CHECKSUM: fd4b34215e7c57e79d347e509d4d64bfebe797fc
+PODFILE CHECKSUM: 7a34d5e980f9e05ecf4e24c79da64ca020615638

-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -139,6 +139,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */,
+				4D62FB08D65E9D3D4D84B418 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -213,6 +214,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		4D62FB08D65E9D3D4D84B418 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@ -360,15 +378,20 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ECMVJVB7LV;
+				CURRENT_PROJECT_VERSION = 453;
+				DEVELOPMENT_TEAM = UMNEWT25JR;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 4.5.0;
+				FLUTTER_BUILD_NUMBER = 453;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -494,15 +517,20 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ECMVJVB7LV;
+				CURRENT_PROJECT_VERSION = 453;
+				DEVELOPMENT_TEAM = UMNEWT25JR;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 4.5.0;
+				FLUTTER_BUILD_NUMBER = 453;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -521,15 +549,20 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = ECMVJVB7LV;
+				CURRENT_PROJECT_VERSION = 453;
+				DEVELOPMENT_TEAM = UMNEWT25JR;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 4.5.0;
+				FLUTTER_BUILD_NUMBER = 453;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "岐阜ナビ";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 4.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -65,5 +65,7 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>FLTEnableImpeller</key>
+	<false/>
 </dict>
 </plist>
--- a/lib/pages/destination/destination_controller.dart
+++ b/lib/pages/destination/destination_controller.dart
@ -561,7 +561,14 @@ class DestinationController extends GetxController {
          }
        });
      } else {
-        Get.snackbar("始まっていない", "ロゲイニングを始める必要があります");
+        Get.snackbar(
+	    "始まっていません", 
+	    "ロゲ開始ボタンをタップして、ロゲイニングを始める必要があります",
+	    icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+	    snackPosition: SnackPosition.TOP,
+	    duration: const Duration(seconds: 3),
+	    backgroundColor: Colors.yellow,
+	);
      }
    }
  }
@ -931,7 +938,11 @@ class DestinationController extends GetxController {
  }

  void centerMapToCurrentLocation() {
+    assert(() {
    print("center is ${currentLon}, ${currentLon}");
+    return true;
+    }());
+    // Akira
    if (currentLat != 0 || currentLon != 0) {
      indexController.mapController.move(LatLng(currentLat, currentLon), 17.0);
    }
--- a/lib/pages/index/index_controller.dart
+++ b/lib/pages/index/index_controller.dart
@ -172,11 +172,11 @@ class IndexController extends GetxController {
      } else {
        isLoading.value = false;
        Get.snackbar(
-          "Failed",
-          "User login failed, please try again.",
+          "ログイン失敗",
+          "ログインIDかパスワードを確認して下さい。",
          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
          snackPosition: SnackPosition.TOP,
-          duration: const Duration(milliseconds: 800),
+          duration: const Duration(seconds: 3),
          backgroundColor: Colors.yellow,
          //icon:Image(image:AssetImage("assets/images/dora.png"))
        );
@ -282,6 +282,7 @@ class IndexController extends GetxController {
    });
  }

+/*
  void loadLocationsBound() {
    if (isCustomAreaSelected.value == true) {
      return;
@ -320,7 +321,7 @@ class IndexController extends GetxController {
          icon: const Icon(Icons.assistant_photo_outlined,
              size: 40.0, color: Colors.blue),
          snackPosition: SnackPosition.TOP,
-          duration: const Duration(milliseconds: 800),
+          duration: const Duration(seconds: 2),
          backgroundColor: Colors.yellow,
          //icon:Image(image:AssetImage("assets/images/dora.png"))
        );
@ -333,6 +334,73 @@ class IndexController extends GetxController {
      }
    });
  }
+*/
+
+  // 2024-04-03 Akira .. Update the code . See ticket 2800.
+  //
+  void loadLocationsBound() {
+    if (isCustomAreaSelected.value == true) {
+      return;
+    }
+    locations.clear();
+    String cat = currentCat.isNotEmpty ? currentCat[0] : "";
+    if (currentCat.isNotEmpty && currentCat[0] == "-all-") {
+      cat = "";
+    }
+    LatLngBounds bounds = mapController.bounds!;
+    currentBound.clear();
+    currentBound.add(bounds);
+  
+    isLoading.value = true; // ローディング状態をtrueに設定
+  
+    LocationService.loadLocationsBound(
+      bounds.southWest.latitude,
+      bounds.southWest.longitude,
+      bounds.northWest.latitude,
+      bounds.northWest.longitude,
+      bounds.northEast.latitude,
+      bounds.northEast.longitude,
+      bounds.southEast.latitude,
+      bounds.southEast.longitude,
+      cat
+    ).then((value) {
+      isLoading.value = false; // ローディング状態をfalseに設定
+  
+      if (value == null) {
+        // APIからのレスポンスがnullの場合は処理を中断
+        return;
+      }
+      if (value.features.isEmpty) {
+        if (showPopup == false) {
+          return;
+        }
+        Get.snackbar(
+          "Too many Points",
+          "please zoom in",
+          icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(seconds: 3),
+          backgroundColor: Colors.yellow,
+        );
+        showPopup = false;
+      }
+      if (value.features.isNotEmpty) {
+        locations.add(value);
+      }
+    }).catchError((error) {
+      isLoading.value = false; // ローディング状態をfalseに設定
+  
+      // エラーハンドリング: APIリクエストが失敗した場合
+      Get.snackbar(
+        "Error",
+        "Failed to load locations. Please check your internet connection and try again.",
+        icon: const Icon(Icons.error, size: 40.0, color: Colors.red),
+        snackPosition: SnackPosition.TOP,
+        duration: const Duration(milliseconds: 800),
+        backgroundColor: Colors.yellow,
+      );
+    });
+  }

  void setBound(LatLngBounds bounds) {
    currentBound.clear();
--- a/lib/pages/login/login_page.dart
+++ b/lib/pages/login/login_page.dart
@ -16,6 +16,12 @@ class LoginPage extends StatelessWidget {
    return Scaffold(
      resizeToAvoidBottomInset: false,
      backgroundColor: Colors.white,
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Colors.white,
+        automaticallyImplyLeading: false,
+      ),
+/* 2024-04-03 Updated by Akira . See https://wiki.sumasen.net/issues/2796?issue_count=1&issue_position=1
      appBar: AppBar(
        elevation: 0,
        backgroundColor: Colors.white,
@ -29,6 +35,7 @@ class LoginPage extends StatelessWidget {
              color: Colors.black,
            )),
      ),
+*/
      body: indexController.currentUser.isEmpty
          ? SizedBox(
              width: double.infinity,
@ -88,7 +95,7 @@ class LoginPage extends StatelessWidget {
                                        MaterialButton(
                                          minWidth: double.infinity,
                                          height: 40,
-                                          onPressed: () {
+                                          onPressed: () async {
                                            if (emailController.text.isEmpty ||
                                                passwordController
                                                    .text.isEmpty) {
@ -104,7 +111,7 @@ class LoginPage extends StatelessWidget {
                                                snackPosition:
                                                    SnackPosition.TOP,
                                                duration: const Duration(
-                                                    milliseconds: 800),
+                                                    seconds: 3),
                                                backgroundColor: Colors.yellow,
                                                //icon:Image(image:AssetImage("assets/images/dora.png"))
                                              );
@ -116,6 +123,30 @@ class LoginPage extends StatelessWidget {
                                                emailController.text,
                                                passwordController.text,
                                                context);
+/*
+					    try {
+					      bool isLoggedIn = await indexController.login(emailController.text, passwordController.text,context);
+					      if (isLoggedIn) {
+					        Get.offAllNamed(AppPages.INDEX);
+					      } else {
+					        Get.snackbar(
+					          "Login Failed",
+					          "Invalid email or password",
+					          icon: const Icon(Icons.error, color: Colors.red),
+					          snackPosition: SnackPosition.BOTTOM,
+					        );
+					      }
+					    } catch (e) {
+					      Get.snackbar(
+					        "Error",
+					        "An error occurred during login",
+					        icon: const Icon(Icons.error, color: Colors.red),
+					        snackPosition: SnackPosition.BOTTOM,
+					      );
+					    } finally {
+					      indexController.isLoading.value = false;
+					    }
+*/					    // ここまで
                                          },
                                          color: Colors.indigoAccent[400],
                                          shape: RoundedRectangleBorder(
@ -128,6 +159,16 @@ class LoginPage extends StatelessWidget {
                                                fontSize: 16,
                                                color: Colors.white70),
                                          ),
+/*
+					  child: Obx(
+					    () => indexController.isLoading.value
+					        ? const CircularProgressIndicator(color: Colors.white)
+					        : const Text(
+					            "ログイン",
+					            style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white70),
+					          ),
+					  ),
+*/					  // ここまで
                                        ),
                                        const SizedBox(
                                          height: 5.0,
--- a/lib/utils/string_values.dart
+++ b/lib/utils/string_values.dart
@ -129,7 +129,7 @@ class StringValues extends Translations{
      'finishing_rogaining' : 'ロゲイニングを終えて',
      'cp_pls_take_photo' : "CPです。撮影してください。",
      'take_photo of the clock' : '時計の写真を撮る',
-      'finish_goal': 'フィニッシュゴール',
+      'finish_goal': 'ゴール完了',
      'goal_saved': "目標を保存しました",
      'goal_added_successfuly' : '目標が正常に追加されました',
      'goal_not_added' : '目標が追加されていません',
--- a/lib/widgets/bottom_sheet_new.dart
+++ b/lib/widgets/bottom_sheet_new.dart
@ -111,10 +111,14 @@ class BottomSheetNew extends GetView<BottomSheetController> {
  }

  Widget getActionButton(BuildContext context, Destination destination) {
+    assert(() {
    print("getActionButton ${destinationController.rogainingCounted.value}");
    print("getActionButton ${destinationController.distanceToStart()}");
    print("getActionButton ${destination.cp}");
    print("getActionButton ${DestinationController.ready_for_goal}");
+    return true;
+    }());
+    // ...2024-04-03 Akira デバッグモードのみ出力するようにした。

    Destination cdest = destinationController
        .festuretoDestination(indexController.currentFeature[0]);
--- a/lib/widgets/map_widget.dart
+++ b/lib/widgets/map_widget.dart
@ -181,7 +181,12 @@ class _MapWidgetState extends State<MapWidget> {
  }

  void _centerMapOnUser() {
+    assert(() {
    print("showBottomSheet ${destinationController.shouldShowBottomSheet}");
+    return true;
+    }());
+    // 2024-04-03 Akira Log enabled only debug mode..
+    //
    //if (destinationController.shouldShowBottomSheet) {
    destinationController.centerMapToCurrentLocation();
    //}
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -5,9 +5,9 @@ PODS:
  - file_selector_macos (0.0.1):
    - FlutterMacOS
  - FlutterMacOS (1.0.0)
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
+  - FMDB (2.7.10):
+    - FMDB/standard (= 2.7.10)
+  - FMDB/standard (2.7.10)
  - geolocator_apple (1.2.0):
    - FlutterMacOS
  - isar_flutter_libs (1.0.0):
@ -15,7 +15,7 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - ReachabilitySwift (5.0.0)
+  - ReachabilitySwift (5.2.1)
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
@ -65,15 +65,15 @@ SPEC CHECKSUMS:
  connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
  file_selector_macos: 468fb6b81fac7c0e88d71317f3eec34c3b008ff9
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  FMDB: eae540775bf7d0c87a5af926ae37af69effe5a19
  geolocator_apple: 72a78ae3f3e4ec0db62117bd93e34523f5011d58
  isar_flutter_libs: 43385c99864c168fadba7c9adeddc5d38838ca6a
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: d0307f984e859ce2bd39b230d672a448ea3f47b4
  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95

 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@ -195,7 +195,6 @@
 				DB3AD6E65B5CC8A5A9E2767E /* Pods-RunnerTests.release.xcconfig */,
 				6114E0F2A0E1D978BBC23F48 /* Pods-RunnerTests.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@ -259,7 +258,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {
@ -342,6 +341,7 @@
 		};
 		33CC111E2044C6BF0003C045 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@ -358,7 +358,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
+			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire\n";
 		};
 		427A05FAB0ED774C4EAAB828 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/pubspec.lock
+++ b/pubspec.lock
@ -696,6 +696,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.9.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
  lints:
    dependency: transitive
    description:
@ -724,18 +748,18 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
  material_design_icons_flutter:
    dependency: "direct main"
    description:
@ -748,10 +772,10 @@ packages:
    dependency: "direct main"
    description:
      name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
  mgrs_dart:
    dependency: transitive
    description:
@ -796,10 +820,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
  path_provider:
    dependency: "direct main"
    description:
@ -860,10 +884,10 @@ packages:
    dependency: "direct main"
    description:
      name: permission_handler
-      sha256: "45ff3fbcb99040fde55c528d5e3e6ca29171298a85436274d49c6201002087d6"
+      sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
      url: "https://pub.dev"
    source: hosted
-    version: "11.2.0"
+    version: "11.3.1"
  permission_handler_android:
    dependency: transitive
    description:
@ -876,10 +900,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: c6bf440f80acd2a873d3d91a699e4cc770f86e7e6b576dda98759e8b92b39830
+      sha256: e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662
      url: "https://pub.dev"
    source: hosted
-    version: "9.3.0"
+    version: "9.4.4"
  permission_handler_html:
    dependency: transitive
    description:
@ -892,10 +916,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: "5c43148f2bfb6d14c5a8162c0a712afe891f2d847f35fcff29c406b37da43c3c"
+      sha256: "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20"
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.0"
+    version: "4.2.1"
  permission_handler_windows:
    dependency: transitive
    description:
@ -1301,6 +1325,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
  watcher:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -37,7 +37,12 @@ dependencies:
  get: ^4.6.6
  flutter_map: ^6.0.1
  geolocator: ^10.1.0
-  permission_handler: ^11.1.0
+  permission_handler: ^11.3.1
+#  permission_handler: ^11.1.0 <== older
+#  permission_handler 11.2.0 (11.3.1 available)
+#  permission_handler_android 12.0.3 (12.0.5 available)
+#  permission_handler_apple 9.3.0 (9.4.4 available)
+#  permission_handler_platform_interface 4.1.0 (4.2.1 available)
  google_api_availability: ^5.0.0
  tuple: ^2.0.0
  latlong2: ^0.9.0
Author	SHA1	Message	Date
AKIRA	accd0cad43	Fix 2803,2802,2800	2024-04-03 21:39:12 +09:00
AKIRA	7e6b5f887a	Fix 2796	2024-04-03 20:44:30 +09:00