re factor rog

android/app/build.gradle

@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
 
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     lintOptions {
         checkReleaseBuilds false
@@ -56,7 +56,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.dvox.gifunavi"
         minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

android/app/src/main/kotlin/com/dvox/rog_app/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.dvox.rog_app
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -14,14 +14,8 @@ PODS:
   - FMDB/standard (2.7.5)
   - geolocator_apple (1.2.0):
     - Flutter
-  - google_maps_flutter_ios (0.0.1):
+  - image_gallery_saver (2.0.2):
     - Flutter
-    - GoogleMaps (< 8.0)
-  - GoogleMaps (5.2.0):
-    - GoogleMaps/Maps (= 5.2.0)
-  - GoogleMaps/Base (5.2.0)
-  - GoogleMaps/Maps (5.2.0):
-    - GoogleMaps/Base
   - image_picker_ios (0.0.1):
     - Flutter
   - isar_flutter_libs (1.0.0):
@@ -31,6 +25,8 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.1.1):
     - Flutter
+  - pointer_interceptor_ios (0.0.1):
+    - Flutter
   - ReachabilitySwift (5.0.0)
   - shared_preferences_foundation (0.0.1):
     - Flutter
@@ -48,11 +44,12 @@ DEPENDENCIES:
   - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
-  - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -60,7 +57,6 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - FMDB
-    - GoogleMaps
     - ReachabilitySwift
 
 EXTERNAL SOURCES:
@@ -76,8 +72,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
-  google_maps_flutter_ios:
-    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  image_gallery_saver:
+    :path: ".symlinks/plugins/image_gallery_saver/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   isar_flutter_libs:
@@ -86,6 +82,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  pointer_interceptor_ios:
+    :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
@@ -94,24 +92,24 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
-  google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
-  GoogleMaps: 025272d5876d3b32604e5c080dc25eaf68764693
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
 
-PODFILE CHECKSUM: a1c2f8dde3796ecc1697a15e7c75eb5205d8a740
+PODFILE CHECKSUM: fd4b34215e7c57e79d347e509d4d64bfebe797fc
 
 COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -7,13 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		084EA8A81CF8B34528999293 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7C4F924DD034151EFC15038 /* Pods_Runner.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		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 */; };
-		EAFC0FFB27C8DC9071E67D5D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -30,14 +30,14 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		13E5CD9612AF4CC8B90A74C3 /* 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>"; };
 		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>"; };
+		37AC108B2188F1C5AA1C2C9E /* 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>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		4310B59AA1289CC3AE4DBA82 /* 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>"; };
 		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>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
@@ -45,8 +45,8 @@
 		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>"; };
-		BEC4F75C6B655CA90D5B5E18 /* 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>"; };
-		F1D3FD8F51C2EAF6C3A7EE25 /* 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>"; };
+		D464128FC0D5DAEBC1011C26 /* 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>"; };
+		D7C4F924DD034151EFC15038 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,7 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EAFC0FFB27C8DC9071E67D5D /* Pods_Runner.framework in Frameworks */,
+				084EA8A81CF8B34528999293 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -64,9 +64,9 @@
 		6C3C11D7BE49E5BED7989712 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				BEC4F75C6B655CA90D5B5E18 /* Pods-Runner.debug.xcconfig */,
-				13E5CD9612AF4CC8B90A74C3 /* Pods-Runner.release.xcconfig */,
-				F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.xcconfig */,
+				4310B59AA1289CC3AE4DBA82 /* Pods-Runner.debug.xcconfig */,
+				37AC108B2188F1C5AA1C2C9E /* Pods-Runner.release.xcconfig */,
+				D464128FC0D5DAEBC1011C26 /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -89,7 +89,7 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				6C3C11D7BE49E5BED7989712 /* Pods */,
-				E6F2437A5B5AAF08D2998197 /* Frameworks */,
+				D3D7A1CBA3FB0154A6C84903 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -116,10 +116,10 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		E6F2437A5B5AAF08D2998197 /* Frameworks */ = {
+		D3D7A1CBA3FB0154A6C84903 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */,
+				D7C4F924DD034151EFC15038 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -131,15 +131,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */,
+				9ACF47601C5E8A391157E87A /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */,
-				FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */,
+				CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -214,7 +213,22 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */ = {
+		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";
+		};
+		9ACF47601C5E8A391157E87A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -236,22 +250,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;
 		};
-		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";
-		};
-		ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */ = {
+		CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -268,23 +267,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FE7C2E909403F98AB3140FE6 /* [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;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -360,8 +342,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -375,8 +358,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = D5SL68ATB9;
+				DEVELOPMENT_TEAM = ECMVJVB7LV;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -386,6 +371,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -439,7 +425,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -488,8 +474,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -505,8 +492,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = D5SL68ATB9;
+				DEVELOPMENT_TEAM = ECMVJVB7LV;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -516,6 +505,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -529,8 +519,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = D5SL68ATB9;
+				DEVELOPMENT_TEAM = ECMVJVB7LV;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -540,6 +532,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.dvox.gifunavi;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/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"

ios/Runner/AppDelegate.swift

@@ -1,6 +1,5 @@
 import UIKit
 import Flutter
-import GoogleMaps
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,7 +7,6 @@ import GoogleMaps
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GMSServices.provideAPIKey("AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

ios/Runner/Info.plist

@@ -27,17 +27,17 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
-	<string>写真撮影のためカメラにアクセスします</string>
+	<string>「岐阜ナビは旅のさまざまなチェックポイントで写真を撮影して共有するためにカメラへのアクセスが必要です。これにより、訪問を確認し、体験を向上させることができます。」</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>このアプリでは、位置情報の収集を行います。</string>
+	<string>「岐阜ナビはアプリが閉じられているときでも位置情報へのアクセスが必要です。これにより、チェックポイントでの自動チェックインを提供し、旅の間のナビゲーション体験を向上させます。」</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>このアプリでは、バックグラウンドで位置情報を収集します。</string>
+	<string>「自動チェックインを有効にし、ナビゲーションを改善するために、岐阜ナビはアプリが使用されていないときでも継続的に位置情報へのアクセスを必要とします。」</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>このアプリでは、開始時点で位置情報を収集します。</string>
+	<string>「岐阜ナビにアプリ使用中の位置情報へのアクセスを許可することで、チェックポイントでのチェックインを有効にし、位置に基づいた情報とガイダンスを提供します。」</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>プロフィールに動画を投稿してください。</string>
+	<string>「岐阜ナビは、ナビゲーション体験を向上させるために、音声コマンドやオーディオフィードバックなどの機能にマイクへのアクセスが必要です。」</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>写真ライブラリへのアクセス警告</string>
+	<string>「岐阜ナビはチェックポイントで撮影した写真を保存・管理し、他人と旅の様子を共有するために、写真ライブラリへのアクセスが必要です。」</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Need to save image in phone Album</string>
 	<key>UILaunchStoryboardName</key>
@@ -45,9 +45,7 @@
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSCameraUsageDescription</key>
-	<string>ロゲイニングのゴールでは写真撮影が必要です。</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string> 収録音声の保存が必要です。</string>
+	<string>「岐阜ナビはチェックポイントで撮影した写真を写真ライブラリに保存し、あなたの旅行の記録を保持し、友人と共有することができます。」</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

ios/RunnerTests/RunnerTests.swift

@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}

lib/features/auth/login/login_page.dart

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/home/home_page.dart';
+import 'package:rogapp/features/services/auth_repo.dart';
+import 'package:rogapp/features/state/user_state.dart';
+
+class LoginPage extends ConsumerStatefulWidget {
+  @override
+  _LoginScreenState createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends ConsumerState<LoginPage> {
+  final TextEditingController _emailController = TextEditingController();
+  final TextEditingController _passwordController = TextEditingController();
+  bool _isLoading = false; // Track loading state
+
+  void _login() {
+    setState(() {
+      _isLoading = true; // Start loading
+    });
+    String email = _emailController.text.trim();
+    String password = _passwordController.text;
+
+    ref.read(authProvider("$email|$password").future).then((user) {
+      setState(() {
+        _isLoading = false; // Stop loading
+      });
+      if (user != null) {
+        ref.read(userNotifierProvider.notifier).setUser(user);
+        Navigator.of(context).pushReplacement(MaterialPageRoute(
+          builder: (context) => const HomePage(),
+        ));
+      } else {
+        ScaffoldMessenger.of(context)
+            .showSnackBar(const SnackBar(content: Text('Login failed')));
+      }
+    }).catchError((error) {
+      ScaffoldMessenger.of(context)
+          .showSnackBar(SnackBar(content: Text('Error: $error')));
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('Login')),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          children: [
+            TextFormField(
+              controller: _emailController,
+              decoration: const InputDecoration(labelText: 'Email'),
+            ),
+            TextFormField(
+              controller: _passwordController,
+              decoration: const InputDecoration(labelText: 'Password'),
+              obscureText: true,
+            ),
+            _isLoading
+                ? CircularProgressIndicator()
+                : ElevatedButton(
+                    onPressed: _login,
+                    child: const Text('Login'),
+                  ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/data/checkpoint.dart

@@ -0,0 +1,397 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
+class FeatureCollection {
+  final String type;
+  final List<Feature> features;
+
+  FeatureCollection({required this.type, required this.features});
+
+  factory FeatureCollection.fromJson(Map<String, dynamic> json) {
+    return FeatureCollection(
+      type: json['type'],
+      features:
+          List<Feature>.from(json['features'].map((x) => Feature.fromJson(x))),
+    );
+  }
+}
+
+class Feature {
+  final int id;
+  final String type;
+  final Geometry geometry;
+  final Properties properties;
+
+  Feature(
+      {required this.id,
+      required this.type,
+      required this.geometry,
+      required this.properties});
+
+  factory Feature.fromJson(Map<String, dynamic> json) {
+    return Feature(
+      id: json['id'],
+      type: json['type'],
+      geometry: Geometry.fromJson(json['geometry']),
+      properties: Properties.fromJson(json['properties']),
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'type': type,
+      'geometry': geometry.toMap(), // Assuming Geometry has a toMap method
+      'properties':
+          properties.toMap(), // Assuming Properties has a toMap method
+    };
+  }
+
+  Feature.fromMap(Map<String, dynamic> map)
+      : id = map['id'],
+        type = map['type'],
+        geometry = Geometry.fromMap(map['geometry']),
+        properties = Properties.fromJson(map['properties']);
+
+  static empty() {}
+}
+
+class Geometry {
+  final String type;
+  final List<List<double>> coordinates;
+
+  Geometry({required this.type, required this.coordinates});
+
+  Geometry copyWith({
+    String? type,
+    List<List<double>>? coordinates,
+  }) {
+    return Geometry(
+      type: type ?? this.type,
+      coordinates: coordinates ?? this.coordinates,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'type': type,
+      'coordinates': coordinates,
+    };
+  }
+
+  factory Geometry.fromMap(Map<String, dynamic> map) {
+    return Geometry(
+      type: map['type'] as String,
+      coordinates: List<List<double>>.from(
+        (map['coordinates'] as List<dynamic>).map<List<double>>(
+          (coordinateList) {
+            // Ensure 'coordinateList' is treated as a List of dynamic elements.
+            // Then, for each element in the list, explicitly cast or convert it to double.
+            return List<double>.from(coordinateList.map((coordinate) {
+              // 'coordinate' is dynamic, needs explicit conversion to double.
+              // The conversion depends on the original data type of 'coordinate';
+              // if it's already a number, you can use .toDouble(); if it's a String, you might need double.parse.
+              return double.parse(coordinate.toString());
+            }));
+          },
+        ),
+      ),
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory Geometry.fromJson(Map<String, dynamic> source) {
+    final geom = Geometry.fromMap(source);
+    return geom;
+  }
+
+  get latitude => coordinates[0][1];
+  get longitude => coordinates[0][0];
+}
+
+class Properties {
+  // Include all properties fields
+  final int locationId;
+  final String subLocId;
+  final double cp;
+  final String? name;
+  final String? address;
+  final String? phone;
+  final String? email;
+  final String? webcontents;
+  final String? videos;
+  final String? category;
+  final int? series;
+  final double? lat;
+  final double? lon;
+  final int? listOrder;
+  final String? photos;
+  final double? checkinRadious;
+  final bool? autoCheckin;
+  bool? selected = false;
+  bool? checkedin = false;
+  final double? checkinPoint;
+  final double? buyPoint;
+  final bool? hiddenLocation;
+  String? checkinImage;
+  String? buypointImage;
+  bool? forcedCheckin = false;
+  final String? tags;
+
+  Properties(
+      {required this.locationId,
+      required this.subLocId,
+      required this.cp,
+      this.name,
+      this.address,
+      this.phone,
+      this.email,
+      this.webcontents,
+      this.videos,
+      this.category,
+      this.series,
+      this.lat,
+      this.lon,
+      this.listOrder,
+      this.photos,
+      this.checkinRadious,
+      this.autoCheckin,
+      this.selected,
+      this.checkedin,
+      this.checkinPoint,
+      this.buyPoint,
+      this.hiddenLocation,
+      this.checkinImage,
+      this.buypointImage,
+      this.forcedCheckin,
+      this.tags});
+
+  factory Properties.fromJson(Map<String, dynamic> json) {
+    Properties prop;
+    try {
+      prop = Properties(
+          locationId: json['location_id'],
+          subLocId: json['sub_loc_id'],
+          cp: json['cp'],
+          name: json['name'] ?? '',
+          address: json['address'] ?? '',
+          phone: json['phone'] ?? '',
+          email: json['email'] ?? '',
+          webcontents: json['webcontents'] ?? '',
+          videos: json['videos'] ?? '',
+          category: json['category'] ?? '',
+          series: json['series'] ?? 0,
+          lat: json['lat'] ?? 0.0,
+          lon: json['lon'] ?? 0.0,
+          listOrder: json['list_order'] ?? 0,
+          photos: json['photos'] ?? '',
+          checkinRadious: json['checkin_radious'] ?? 0.0,
+          autoCheckin: json['auto_checkin'] == 0 ? false : true,
+          selected: json['selected'] == 0 ? false : true,
+          checkedin: json['checkedin'] == 0 ? false : true,
+          checkinPoint: json['checkin_point'] ?? 0.0,
+          buyPoint: json['buy_point'] ?? 0.0,
+          hiddenLocation: json['hidden_location'] == 0 ? false : true,
+          checkinImage: json['checkin_image'] ?? '',
+          buypointImage: json['buypoint_image'] ?? '',
+          forcedCheckin: json['forced_checkin'] == 0 ? false : true,
+          tags: json['tags'] ?? '');
+      //print("from json --- $prop");
+    } catch (e) {
+      //print("from json --- $e");
+      return Properties(locationId: 0, subLocId: '', cp: 0.0, name: '');
+    }
+    return prop;
+  }
+
+  factory Properties.toJson(Properties prop) {
+    return Properties(
+        locationId: prop.locationId,
+        subLocId: prop.subLocId,
+        cp: prop.cp,
+        name: prop.name,
+        address: prop.address,
+        phone: prop.phone,
+        email: prop.email,
+        webcontents: prop.webcontents,
+        videos: prop.videos,
+        category: prop.category,
+        series: prop.series,
+        lat: prop.lat,
+        lon: prop.lon,
+        listOrder: prop.listOrder,
+        photos: prop.photos,
+        checkinRadious: prop.checkinRadious,
+        autoCheckin: prop.autoCheckin,
+        selected: prop.selected,
+        checkedin: prop.checkedin,
+        checkinPoint: prop.checkinPoint,
+        buyPoint: prop.buyPoint,
+        hiddenLocation: prop.hiddenLocation,
+        checkinImage: prop.checkinImage,
+        buypointImage: prop.buypointImage,
+        forcedCheckin: prop.forcedCheckin,
+        tags: prop.tags);
+  }
+
+  Properties copyWith({
+    int? locationId,
+    String? subLocId,
+    double? cp,
+    String? name,
+    String? address,
+    String? phone,
+    String? email,
+    String? webcontents,
+    String? videos,
+    String? category,
+    int? series,
+    double? lat,
+    double? lon,
+    int? listOrder,
+    String? photos,
+    double? checkinRadious,
+    bool? autoCheckin,
+    bool? selected,
+    bool? checkedin,
+    double? checkinPoint,
+    double? buyPoint,
+    bool? hiddenLocation,
+    String? checkinImage,
+    String? buypointImage,
+    bool? forcedCheckin,
+    String? tags,
+  }) {
+    return Properties(
+      locationId: locationId ?? this.locationId,
+      subLocId: subLocId ?? this.subLocId,
+      cp: cp ?? this.cp,
+      name: name ?? this.name,
+      address: address ?? this.address,
+      phone: phone ?? this.phone,
+      email: email ?? this.email,
+      webcontents: webcontents ?? this.webcontents,
+      videos: videos ?? this.videos,
+      category: category ?? this.category,
+      series: series ?? this.series,
+      lat: lat ?? this.lat,
+      lon: lon ?? this.lon,
+      listOrder: listOrder ?? this.listOrder,
+      photos: photos ?? this.photos,
+      checkinRadious: checkinRadious ?? this.checkinRadious,
+      autoCheckin: autoCheckin ?? this.autoCheckin,
+      selected: selected ?? this.selected,
+      checkedin: checkedin ?? this.checkedin,
+      checkinPoint: checkinPoint ?? this.checkinPoint,
+      buyPoint: buyPoint ?? this.buyPoint,
+      hiddenLocation: hiddenLocation ?? this.hiddenLocation,
+      checkinImage: checkinImage ?? this.checkinImage,
+      buypointImage: buypointImage ?? this.buypointImage,
+      forcedCheckin: forcedCheckin ?? this.forcedCheckin,
+      tags: tags ?? this.tags,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'locationId': locationId,
+      'subLocId': subLocId,
+      'cp': cp,
+      'name': name,
+      'address': address,
+      'phone': phone,
+      'email': email,
+      'webcontents': webcontents,
+      'videos': videos,
+      'category': category,
+      'series': series,
+      'lat': lat,
+      'lon': lon,
+      'listOrder': listOrder,
+      'photos': photos,
+      'checkinRadious': checkinRadious,
+      'autoCheckin': autoCheckin,
+      'selected': selected,
+      'checkedin': checkedin,
+      'checkinPoint': checkinPoint,
+      'buyPoint': buyPoint,
+      'hiddenLocation': hiddenLocation,
+      'checkinImage': checkinImage,
+      'buypointImage': buypointImage,
+      'forcedCheckin': forcedCheckin,
+      'tags': tags,
+    };
+  }
+
+  String toJson() => json.encode(toMap());
+
+  @override
+  String toString() {
+    return 'Properties(locationId: $locationId, subLocId: $subLocId, cp: $cp, name: $name, address: $address, phone: $phone, email: $email, webcontents: $webcontents, videos: $videos, category: $category, series: $series, lat: $lat, lon: $lon, listOrder: $listOrder, photos: $photos, checkinRadious: $checkinRadious, autoCheckin: $autoCheckin, selected: $selected, checkedin: $checkedin, checkinPoint: $checkinPoint, buyPoint: $buyPoint, hiddenLocation: $hiddenLocation, checkinImage: $checkinImage, buypointImage: $buypointImage, forcedCheckin: $forcedCheckin,  tags: $tags)';
+  }
+
+  @override
+  bool operator ==(covariant Properties other) {
+    if (identical(this, other)) return true;
+
+    return other.locationId == locationId &&
+        other.subLocId == subLocId &&
+        other.cp == cp &&
+        other.name == name &&
+        other.address == address &&
+        other.phone == phone &&
+        other.email == email &&
+        other.webcontents == webcontents &&
+        other.videos == videos &&
+        other.category == category &&
+        other.series == series &&
+        other.lat == lat &&
+        other.lon == lon &&
+        other.listOrder == listOrder &&
+        other.photos == photos &&
+        other.checkinRadious == checkinRadious &&
+        other.autoCheckin == autoCheckin &&
+        other.selected == selected &&
+        other.checkedin == checkedin &&
+        other.checkinPoint == checkinPoint &&
+        other.buyPoint == buyPoint &&
+        other.hiddenLocation == hiddenLocation &&
+        other.checkinImage == checkinImage &&
+        other.buypointImage == buypointImage &&
+        other.forcedCheckin == forcedCheckin &&
+        other.tags == tags;
+  }
+
+  @override
+  int get hashCode {
+    return locationId.hashCode ^
+        subLocId.hashCode ^
+        cp.hashCode ^
+        name.hashCode ^
+        address.hashCode ^
+        phone.hashCode ^
+        email.hashCode ^
+        webcontents.hashCode ^
+        videos.hashCode ^
+        category.hashCode ^
+        series.hashCode ^
+        lat.hashCode ^
+        lon.hashCode ^
+        listOrder.hashCode ^
+        photos.hashCode ^
+        checkinRadious.hashCode ^
+        autoCheckin.hashCode ^
+        selected.hashCode ^
+        checkedin.hashCode ^
+        checkinPoint.hashCode ^
+        buyPoint.hashCode ^
+        hiddenLocation.hashCode ^
+        checkinImage.hashCode ^
+        buypointImage.hashCode ^
+        forcedCheckin.hashCode ^
+        tags.hashCode;
+  }
+}

lib/features/data/checkpoint_visitis.dart

@@ -0,0 +1,82 @@
+import 'dart:convert';
+
+class CheckpointVisit {
+  final String id;
+  final String checkpointId;
+  final String teamName;
+  final String userName;
+  final String eventCode;
+  final DateTime visitTime;
+
+  CheckpointVisit({
+    required this.id,
+    required this.checkpointId,
+    required this.teamName,
+    required this.userName,
+    required this.eventCode,
+    required this.visitTime,
+  });
+
+  CheckpointVisit copyWith({
+    String? id,
+    String? checkpointId,
+    String? teamName,
+    String? userName,
+    String? eventCode,
+    DateTime? visitTime,
+  }) {
+    return CheckpointVisit(
+      id: id ?? this.id,
+      checkpointId: checkpointId ?? this.checkpointId,
+      teamName: teamName ?? this.teamName,
+      userName: userName ?? this.userName,
+      eventCode: eventCode ?? this.eventCode,
+      visitTime: visitTime ?? this.visitTime,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'checkpointId': checkpointId,
+      'teamName': teamName,
+      'userName': userName,
+      'eventCode': eventCode,
+      'visitTime': visitTime.millisecondsSinceEpoch,
+    };
+  }
+
+  factory CheckpointVisit.fromMap(Map<String, dynamic> map) {
+    return CheckpointVisit(
+      id: map['id'],
+      checkpointId: map['checkpointId'],
+      teamName: map['teamName'],
+      userName: map['userName'],
+      eventCode: map['eventCode'],
+      visitTime: DateTime.fromMillisecondsSinceEpoch(map['visitTime']),
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory CheckpointVisit.fromJson(String source) =>
+      CheckpointVisit.fromMap(json.decode(source));
+
+  @override
+  String toString() {
+    return 'CheckpointVisit(id: $id, checkpointId: $checkpointId, teamName: $teamName, userName: $userName, eventCode: $eventCode, visitTime: $visitTime)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is CheckpointVisit &&
+        other.id == id &&
+        other.checkpointId == checkpointId &&
+        other.teamName == teamName &&
+        other.userName == userName &&
+        other.eventCode == eventCode &&
+        other.visitTime == visitTime;
+  }
+}

lib/features/data/data_provider.dart

@@ -0,0 +1,329 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:sqflite/sqflite.dart';
+import 'package:path/path.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+import 'package:rogapp/features/data/user_location.dart';
+
+final dataProviderProvider = Provider<DataProvider>((ref) {
+  return DataProvider();
+});
+
+// Convert a Feature object to a Map
+Map<String, dynamic> featureToMap(Feature feature) {
+  var properties = feature.properties;
+
+  try {
+    return {
+      'id': feature.id,
+      'type': feature.type,
+      'name': properties.name ?? '',
+      'address': properties.address ?? '',
+      'phone': properties.phone ?? '',
+      'email': properties.email ?? '',
+      'webcontents': properties.webcontents ?? '',
+      'videos': properties.videos ?? '',
+      'category': properties.category ?? '',
+      'series': properties.series,
+      'lat': feature.geometry.latitude,
+      'lon': feature.geometry.longitude,
+      'list_order': properties.listOrder,
+      'photos': properties.photos ?? '',
+      'checkin_radious': properties.checkinRadious,
+      'sub_loc_id': properties.subLocId,
+      'auto_checkin': properties.autoCheckin! ? 1 : 0,
+      'selected': properties.selected == null
+          ? 0
+          : properties.selected!
+              ? 1
+              : 0,
+      'checkedin': properties.checkedin == null
+          ? 0
+          : properties.checkedin!
+              ? 1
+              : 0,
+      'cp': properties.cp,
+      'checkin_point': properties.checkinPoint,
+      'buy_point': properties.buyPoint,
+      'hidden_location': properties.hiddenLocation,
+      'checkin_image': properties.checkinImage,
+      'buypoint_image': properties.buypointImage,
+      'forced_checkin': properties.forcedCheckin == null
+          ? 0
+          : properties.forcedCheckin!
+              ? 1
+              : 0,
+      'tags': properties.tags ?? '',
+      'location_id': properties.locationId,
+    };
+  } catch (e) {
+    //print("--- feature to map Error: $e");
+    return {};
+  }
+}
+
+// Convert a Map to a Feature object
+Feature mapToFeature(Map<String, dynamic> map) {
+  Feature feat;
+  //print("mapToFeature id --- ${Properties.fromJson(map)}");
+  //print("mapToFeature --- ${map['type']}");
+  feat = Feature(
+    id: map['id'],
+    type: map['type'],
+    geometry: Geometry(
+      type: map['type'] ?? 'Point',
+      coordinates: [
+        [map['lon'], map['lat']]
+      ],
+    ),
+    properties: Properties.fromJson(map),
+  );
+
+  //print("mapToFeature --- $feat");
+
+  return feat;
+}
+
+class DataProvider {
+  static Database? _database;
+
+  Future<Database> get database async {
+    if (_database != null) return _database!;
+    _database = await initDB();
+    return _database!;
+  }
+
+  initDB() async {
+    var documentsDirectory = await getApplicationDocumentsDirectory();
+    String path = join(documentsDirectory.path, "GameDB.db");
+    return await openDatabase(path,
+        version: 1, onOpen: (db) {}, onCreate: _onCreate);
+  }
+
+  _onCreate(Database db, int version) async {
+    await db.execute('''
+      CREATE TABLE Checkpoints (
+      location_id INTEGER PRIMARY KEY,
+      id INTEGER,
+      type TEXT,
+      name TEXT,
+      address TEXT,
+      phone TEXT,
+      email TEXT,
+      webcontents TEXT,
+      videos TEXT,
+      category TEXT,
+      series INTEGER,
+      lat REAL, 
+      lon REAL, 
+      list_order INTEGER,
+      photos TEXT,
+      checkin_radious REAL,
+      sub_loc_id TEXT,
+      auto_checkin INTEGER,
+      selected INTEGER,
+      checkedin INTEGER,
+      cp REAL,
+      checkin_point REAL,
+      buy_point REAL,
+      hidden_location INTEGER,
+      checkin_image TEXT,
+      buypoint_image TEXT,
+      forced_checkin INTEGER,
+      recipt_times INTEGER,
+      tags TEXT
+      )
+    ''');
+    await db.execute('''
+      CREATE TABLE GPSLocations (
+        timestamp TEXT PRIMARY KEY,
+        latitude REAL,
+        longitude REAL,
+        event_code TEXT,
+        team_name TEXT,
+        user_name TEXT,
+        attempt_count INTEGER
+      )
+    ''');
+    await db.execute('''
+      CREATE TABLE GameState (
+        key TEXT PRIMARY KEY,
+        value TEXT,
+        event_code TEXT,
+        team_name TEXT,
+        user_name TEXT,
+        attempt_count INTEGER
+      )
+    ''');
+    await db.execute('''
+      CREATE TABLE CheckpointVisits (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        checkpointId INTEGER,
+        photoTaken BOOLEAN,
+        receiptPhotoTaken BOOLEAN,
+        timestamp DATETIME DEFAULT CURRENT_TIMESTAMP,
+        event_code TEXT,
+        team_name TEXT,
+        user_name TEXT,
+        attempt_count INTEGER DEFAULT 1,
+        FOREIGN KEY (checkpointId) REFERENCES Checkpoints(location_id)
+      )
+    ''');
+  }
+
+  Future<void> recordCheckpointVisit(
+      int locationId, String userName, String teamName, String eventCode,
+      {bool photoTaken = false, bool? receiptPhotoTaken}) async {
+    final db = await database;
+
+    // Fetching buy_point to determine if a receipt is required
+    var checkpointQueryResult = await db.query(
+      'Checkpoints',
+      columns: ['buy_point'],
+      where: 'location_id = ?',
+      whereArgs: [locationId],
+    );
+
+    var buyPoint = checkpointQueryResult.isNotEmpty
+        ? checkpointQueryResult.first['buy_point'] as double?
+        : null;
+    var requiresReceipt = buyPoint != null && buyPoint > 0.0;
+
+    await db.insert(
+      'CheckpointVisits',
+      {
+        'checkpointId': locationId,
+        'user_name': userName,
+        'team_name': teamName,
+        'event_code': eventCode,
+        'photoTaken': photoTaken ? 1 : 0,
+        'receiptPhotoTaken':
+            requiresReceipt ? (receiptPhotoTaken == true ? 1 : 0) : null,
+      },
+      conflictAlgorithm: ConflictAlgorithm.replace,
+    );
+  }
+
+  Future<Map<String, dynamic>> getIncompleteTasks(int locationId,
+      String userName, String teamName, String eventCode) async {
+    final db = await database;
+    var checkpoint = await db.query(
+      'Checkpoints',
+      where: 'location_id = ?',
+      whereArgs: [locationId],
+    );
+
+    var buyPointValue =
+        checkpoint.isNotEmpty ? checkpoint.first['buy_point'] as double? : null;
+    var requiresReceipt = buyPointValue != null && buyPointValue > 0.0;
+
+    // Fetch visits considering all relevant identifiers
+    List<Map> visits = await db.query(
+      'CheckpointVisits',
+      where:
+          'checkpointId = ? AND user_name = ? AND team_name = ? AND event_code = ?',
+      whereArgs: [locationId, userName, teamName, eventCode],
+    );
+
+    if (visits.isNotEmpty) {
+      var lastVisit = visits.last;
+      return {
+        'photoTaken': lastVisit['photoTaken'] == 1,
+        'receiptPhotoTaken':
+            requiresReceipt ? lastVisit['receiptPhotoTaken'] == 1 : true,
+      };
+    }
+
+    // Default return values when no visits found
+    return {
+      'photoTaken': false,
+      'receiptPhotoTaken': requiresReceipt ? false : true,
+    };
+  }
+
+  Future<void> insertMarker(Feature marker) async {
+    //print("--- inserting ${featureToMap(marker)} ---");
+    final db = await database;
+    try {
+      await db.insert(
+        'Checkpoints',
+        featureToMap(marker),
+        conflictAlgorithm: ConflictAlgorithm.replace,
+      );
+    } catch (e) {
+      print("--- ${e.toString()} ---");
+    }
+  }
+
+  Future<List<Feature>> getMarkers() async {
+    final db = await database;
+    var res = await db.query('Checkpoints');
+    List<Feature> list =
+        res.isNotEmpty ? res.map((c) => mapToFeature(c)).toList() : [];
+    //print("--- checkpoints ${res} ---");
+    return list;
+  }
+
+  Future<int> deleteMarker(int id) async {
+    final db = await database;
+    return db.delete('Checkpoints', where: 'id = ?', whereArgs: [id]);
+  }
+
+  Future<void> insertGPSLocation(UserLocation location) async {
+    final db = await database;
+    await db.insert(
+      'GPSLocations',
+      location
+          .toMap(), // Implement a method in UserLocation to convert the object to a Map
+      conflictAlgorithm: ConflictAlgorithm.replace,
+    );
+  }
+
+  Future<List<UserLocation>> getGPSLocations() async {
+    final db = await database;
+    var res = await db.query('GPSLocations');
+    List<UserLocation> locations =
+        res.isNotEmpty ? res.map((c) => UserLocation.fromMap(c)).toList() : [];
+    return locations;
+  }
+
+  Future<void> updateGameState(
+    String key,
+    String value,
+    String userName,
+    String teamName,
+    String eventCode,
+  ) async {
+    final db = await database;
+    await db.insert(
+      'GameState',
+      {
+        'key': key,
+        'value': value,
+        'team_name': teamName,
+        'event_code': eventCode,
+        'user_name': userName,
+      },
+      conflictAlgorithm: ConflictAlgorithm.replace,
+    );
+  }
+
+  Future<String?> getGameState(
+    String key,
+    String userName,
+    String teamName,
+    String eventCode,
+  ) async {
+    final db = await database;
+    List<Map<String, dynamic>> results = await db.query(
+      'GameState',
+      where: 'key = ? AND team_name = ? AND event_code = ? AND user_name = ?',
+      whereArgs: [key, teamName, eventCode, userName],
+    );
+
+    if (results.isNotEmpty) {
+      return results.first['value'] as String?;
+    }
+    return null;
+  }
+}

lib/features/data/game_event.dart

@@ -0,0 +1,17 @@
+enum EventType {
+  atStart,
+  starting,
+  started,
+  inCheckin,
+  checkiningIn,
+  checkedIn,
+  atGoal,
+  finishingGoal,
+  finishedGoal,
+}
+
+class GameEvent {
+  final EventType type;
+  final DateTime timestamp;
+  GameEvent({this.type = EventType.atStart, required this.timestamp});
+}

lib/features/data/user.dart

@@ -0,0 +1,24 @@
+class User {
+  User.User();
+
+  //AuthUser.from({required this.id, required this.email, required this.is_rogaining, required this.group, required this.zekken_number, required this.event_code, required this.team_name});
+
+  User.fromMap(Map<String, dynamic> map)
+      : id = int.parse(map["id"].toString()),
+        email = map["email"].toString(),
+        is_rogaining = bool.parse(map["is_rogaining"].toString()),
+        group = map["group"].toString(),
+        zekken_number = map["zekken_number"].toString(),
+        event_code = map["event_code"].toString(),
+        team_name = map["team_name"].toString(),
+        auth_token = map["token"];
+
+  int? id;
+  String? email;
+  bool? is_rogaining;
+  String? group;
+  String? zekken_number;
+  String? event_code;
+  String? team_name;
+  String? auth_token;
+}

lib/features/data/user_location.dart

@@ -0,0 +1,59 @@
+import 'dart:convert';
+
+import 'package:geolocator/geolocator.dart';
+
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+class UserLocation {
+  final double latitude;
+  final double longitude;
+  final DateTime timestamp;
+  UserLocation(
+      {required this.latitude,
+      required this.longitude,
+      required this.timestamp});
+
+  static UserLocation empty() {
+    return UserLocation(
+        latitude: 0.0, longitude: 0.0, timestamp: DateTime.now());
+  }
+
+  factory UserLocation.fromPosition(Position position) {
+    return UserLocation(
+        latitude: position.latitude,
+        longitude: position.longitude,
+        timestamp: position.timestamp);
+  }
+
+  UserLocation copyWith({
+    double? latitude,
+    double? longitude,
+    DateTime? timestamp,
+  }) {
+    return UserLocation(
+      latitude: latitude ?? this.latitude,
+      longitude: longitude ?? this.longitude,
+      timestamp: timestamp ?? this.timestamp,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return <String, dynamic>{
+      'latitude': latitude,
+      'longitude': longitude,
+      'timestamp': timestamp.millisecondsSinceEpoch,
+    };
+  }
+
+  factory UserLocation.fromMap(Map<String, dynamic> map) {
+    return UserLocation(
+      latitude: map['latitude'] as double,
+      longitude: map['longitude'] as double,
+      timestamp: DateTime.fromMillisecondsSinceEpoch(map['timestamp'] as int),
+    );
+  }
+
+  String toJson() => json.encode(toMap());
+
+  factory UserLocation.fromJson(String source) =>
+      UserLocation.fromMap(json.decode(source) as Map<String, dynamic>);
+}

lib/features/home/home_page.dart

@@ -0,0 +1,131 @@
+import 'package:dio_cache_interceptor_hive_store/dio_cache_interceptor_hive_store.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_cache/flutter_map_cache.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:rogapp/features/location/location_provider.dart';
+import 'package:rogapp/features/state/game_state.dart';
+import 'package:rogapp/features/state/game_view_model.dart';
+import 'package:path_provider/path_provider.dart';
+
+class HomePage extends ConsumerStatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  ConsumerState<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends ConsumerState<HomePage> {
+  MapController mapController = MapController();
+  String? _cachePath;
+
+  @override
+  void initState() {
+    super.initState();
+    //ref.read(featureCheckpointCollectionProvider.future);
+    ref.read(locationNotifierProvider.notifier).startListening();
+    _initializeCachePath();
+  }
+
+  Future<void> _initializeCachePath() async {
+    _cachePath = await getTemporaryDirectory().then((dir) => dir.path);
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final gameState = ref.watch(gameViewModelProvider);
+    final locationState = ref.watch(locationNotifierProvider);
+
+    if (_cachePath == null || gameState.markers.isEmpty) {
+      return Scaffold(
+        appBar: AppBar(),
+        body: Center(child: CircularProgressIndicator()),
+      );
+    }
+    return Scaffold(
+      appBar: AppBar(
+        actions: [
+          Text(
+              'Current Latitude: ${locationState.currentPosition?.latitude ?? 'No data'}'),
+          IconButton(
+            icon: Icon(MdiIcons.logout),
+            onPressed: () => _logGameState(gameState),
+          ),
+          Text(gameState.currentLocation?.latitude.toString() ??
+              '--- No location'),
+        ],
+      ),
+      body: Column(
+        children: [
+          Expanded(child: _buildMap(gameState, _cachePath!)),
+        ],
+      ),
+    );
+  }
+
+  void _logGameState(GameState gameState) {
+    print("Checkpoint photo taken: ${gameState.checkpointPhotoTaken}");
+    print("Current checkpoint: ${gameState.currentCheckpoint}");
+    print("Has left start area: ${gameState.hasLeftStartArea}");
+    print("Has visited checkpoint: ${gameState.hasVisitedCheckpoint}");
+  }
+
+  Widget _buildMap(GameState gameState, String cachePath) {
+    return FlutterMap(
+      mapController: mapController,
+      options: MapOptions(
+        interactionOptions: const InteractionOptions(
+          enableMultiFingerGestureRace: true,
+          flags: InteractiveFlag.doubleTapDragZoom |
+              InteractiveFlag.doubleTapZoom |
+              InteractiveFlag.drag |
+              InteractiveFlag.flingAnimation |
+              InteractiveFlag.pinchZoom |
+              InteractiveFlag.scrollWheelZoom,
+        ),
+        maxZoom: 18.4,
+        onMapReady: () => mapController.move(LatLng(37.153196, 139.587659), 4),
+      ),
+      children: [
+        TileLayer(
+          urlTemplate:
+              'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
+          tileProvider: CachedTileProvider(
+            maxStale: Duration(days: 30),
+            store: HiveCacheStore(cachePath, hiveBoxName: 'HiveCacheStore'),
+          ),
+        ),
+        CurrentLocationLayer(
+          alignDirectionOnUpdate: AlignOnUpdate.never,
+          style: const LocationMarkerStyle(
+            marker: DefaultLocationMarker(
+              child: Icon(
+                Icons.navigation,
+                color: Colors.white,
+                size: 15,
+              ),
+            ),
+            markerSize: Size(27, 27),
+            markerDirection: MarkerDirection.heading,
+          ),
+        ),
+        MarkerLayer(
+          markers: gameState.markers.map((feature) {
+            return Marker(
+              child: const Icon(Icons.location_on),
+              // Convert each Feature to a Marker
+              width: 80.0,
+              height: 80.0,
+              point:
+                  LatLng(feature.geometry.latitude, feature.geometry.longitude),
+            );
+          }).toList(),
+        ),
+      ],
+    );
+  }
+}

lib/features/initializer/app_initializer.dart

@@ -0,0 +1,53 @@
+import 'package:rogapp/features/initializer/camera_check.dart';
+import 'package:rogapp/features/initializer/icheck.dart';
+import 'package:rogapp/features/initializer/location_check.dart';
+
+class AppInitializer {
+  final List<ICheck> checks;
+
+  AppInitializer()
+      : checks = [
+          LocationCheck(),
+          CameraCheck(),
+          //NetworkCheck(),
+        ];
+
+  Future<bool> permissionStatus() async {
+    return await LocationCheck().locationPermissionStatus() &&
+        await CameraCheck().cameraPermissionStatus();
+  }
+
+  Future<bool> initializeApp() async {
+    if (!await runPreFlightChecks()) {
+      return false;
+    }
+
+    //await initializeTileCaching();
+    await loadInitialData();
+    await configureGlobalSettings();
+    // Add other initialization tasks as needed
+
+    return true;
+  }
+
+  Future<bool> runPreFlightChecks() async {
+    for (var check in checks) {
+      if (!await check.check()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  Future<void> initializeTileCaching() async {}
+
+  Future<void> loadInitialData() async {
+    // Logic to preload data that your app will need
+  }
+
+  Future<void> configureGlobalSettings() async {
+    // Logic to set up any global configurations for your app
+  }
+
+  // You can add more methods for other initialization tasks
+}

lib/features/initializer/camera_check.dart

@@ -0,0 +1,19 @@
+import 'package:permission_handler/permission_handler.dart';
+import 'package:rogapp/features/initializer/icheck.dart';
+
+class CameraCheck implements ICameraCheck {
+  @override
+  Future<bool> cameraPermissionStatus() async {
+    var permission = await Permission.camera.status;
+    return permission.isGranted;
+  }
+
+  @override
+  Future<bool> check() async {
+    var permission = await Permission.camera.status;
+    if (!permission.isGranted) {
+      permission = await Permission.camera.request();
+    }
+    return permission.isGranted;
+  }
+}

lib/features/initializer/icheck.dart

@@ -0,0 +1,17 @@
+abstract class ICheck {
+  Future<bool> check();
+}
+
+abstract class ILocationCheck extends ICheck {
+  Future<bool> locationPermissionStatus();
+  // Additional location-specific methods can be defined here
+}
+
+abstract class ICameraCheck extends ICheck {
+  Future<bool> cameraPermissionStatus();
+  // Additional camera-specific methods can be defined here
+}
+
+abstract class INetworkCheck extends ICheck {
+  // Additional network-specific methods can be defined here
+}

lib/features/initializer/location_check.dart

@@ -0,0 +1,19 @@
+import 'package:permission_handler/permission_handler.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:rogapp/features/initializer/icheck.dart';
+
+class LocationCheck implements ILocationCheck {
+  @override
+  Future<bool> check() async {
+    var permission = await Permission.locationWhenInUse.status;
+    if (!permission.isGranted) {
+      permission = await Permission.locationWhenInUse.request();
+    }
+    return permission.isGranted && await Geolocator.isLocationServiceEnabled();
+  }
+
+  @override
+  Future<bool> locationPermissionStatus() {
+    return Permission.locationWhenInUse.isGranted;
+  }
+}

lib/features/initializer/network_check.dart

@@ -0,0 +1,10 @@
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:rogapp/features/initializer/icheck.dart';
+
+class NetworkCheck implements INetworkCheck {
+  @override
+  Future<bool> check() async {
+    var connectivityResult = await Connectivity().checkConnectivity();
+    return connectivityResult != ConnectivityResult.none;
+  }
+}

lib/features/landing/denied_screen.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+// This screen shows when user denied and intented to close the app
+
+class DeniedScreen extends StatefulWidget {
+  const DeniedScreen({super.key});
+
+  @override
+  State<DeniedScreen> createState() => _DeniedScreenState();
+}
+
+class _DeniedScreenState extends State<DeniedScreen> {
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: Text("Dnied"),
+    );
+  }
+}

lib/features/landing/landing_page.dart

@@ -0,0 +1,172 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+import 'package:rogapp/features/data/data_provider.dart';
+import 'package:rogapp/features/home/home_page.dart';
+import 'package:rogapp/features/landing/denied_screen.dart';
+import 'package:rogapp/features/initializer/app_initializer.dart';
+import 'package:rogapp/features/services/checkpoint_repo.dart';
+import 'package:rogapp/features/state/game_state.dart';
+import 'package:rogapp/features/state/game_view_model.dart';
+
+// LandingPage serves as the initial screen displayed by the application to perform necessary checks, initialize required values, and set up services essential for the app's functionality.
+
+class LandingPage extends ConsumerStatefulWidget {
+  const LandingPage({super.key});
+
+  @override
+  ConsumerState<LandingPage> createState() => _LandingPageState();
+}
+
+class _LandingPageState extends ConsumerState<LandingPage> {
+  bool? _isInitialized;
+
+  @override
+  void initState() {
+    super.initState();
+    //load only if network available
+    ref.read(featureCheckpointCollectionProvider.future);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _initializeApp();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    AsyncValue<FeatureCollection> featureCollection =
+        ref.watch(featureCheckpointCollectionProvider);
+
+    return featureCollection.when(
+      data: (data) {
+        if (_isInitialized == null) {
+          return const MaterialApp(
+              home: Scaffold(body: Center(child: CircularProgressIndicator())));
+        }
+
+        return _isInitialized! ? const HomePage() : const DeniedScreen();
+      },
+      loading: () => const MaterialApp(
+          home: Scaffold(body: Center(child: CircularProgressIndicator()))),
+      error: (error, stack) => ErrorScreen(error: error),
+    );
+  }
+
+  Future<void> _restoreAppState() async {
+    final dataProvider = ref.read(dataProviderProvider);
+
+    // Example values, replace these with actual values from user and event context
+    String userName =
+        "current_user"; // Fetch the current user's name or identifier
+    String teamName = "user_team"; // Fetch the current user's team
+    String eventCode = "event_code"; // Fetch the current event code
+
+    // Load and restore game state
+    String? gameStateKey = "current_game_state";
+    String? gameStateValue = await dataProvider.getGameState(
+        gameStateKey, userName, teamName, eventCode);
+    if (gameStateValue != null) {
+      Map<String, dynamic> gameStateData = jsonDecode(gameStateValue);
+      GameState gameState = GameState.fromMap(gameStateData);
+      ref.read(gameViewModelProvider.notifier).loadGameState(gameState);
+    }
+
+    // After restoring all necessary states, proceed with the app
+    setState(() {
+      _isInitialized = true;
+    });
+  }
+
+  // Future<void> _restoreAppState() async {
+  //   await _initializeApp();
+  //   // Add additional restoration logic if needed, for example:
+  //   // Restore game state, user progress, etc., from the DataProvider.
+  //   // Example:
+  //   // var gameState = await _dataProvider.getGameState('current_state');
+  //   // Use the gameState to decide what to do next, e.g., navigate to a specific screen.
+
+  //   if (_isInitialized != true) {
+  //     // If initialization is not done, try to initialize the app.
+  //     _isInitialized = await _initializeApp();
+  //   }
+
+  //   if (!_isInitialized!) {
+  //     await _showRetryCloseDialog();
+  //   } else {
+  //     setState(() {
+  //       _isInitialized = true;
+  //     });
+  //   }
+  // }
+
+  Future<bool> _initializeApp() async {
+    AppInitializer initializer = AppInitializer();
+
+    // Check if permissions are already granted
+    bool permissionsAlreadyGranted = await initializer.permissionStatus();
+    if (!permissionsAlreadyGranted) {
+      await _showPermissionRequestMessage();
+    }
+
+    // Initialize the app and return the success status.
+    return await initializer.initializeApp();
+  }
+
+  Future<void> _showPermissionRequestMessage() async {
+    return showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext context) => AlertDialog(
+        title: const Text('Permissions Required'),
+        content: const Text(
+            'This app requires certain permissions to function properly. Please grant these permissions in the next steps.'),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Okay'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<bool> _requestPermissionsAndInitialize() async {
+    AppInitializer initializer = AppInitializer();
+    return await initializer.initializeApp();
+  }
+
+  Future<void> _showRetryCloseDialog() async {
+    await showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext context) => AlertDialog(
+        title: const Text('Initialization Failed'),
+        content: const Text(
+            'The app was unable to start properly due to missing permissions.'),
+        actions: <Widget>[
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Close'),
+          ),
+          TextButton(
+            onPressed: () async {
+              Navigator.of(context).pop();
+              bool retrySuccess = await _requestPermissionsAndInitialize();
+              if (!retrySuccess) {
+                await _showRetryCloseDialog();
+              } else {
+                setState(() {
+                  _isInitialized = true;
+                });
+              }
+            },
+            child: const Text('Retry'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  ErrorScreen({required Object error}) {}
+}

lib/features/location/location_provider.dart

@@ -0,0 +1,109 @@
+import 'dart:async';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:rogapp/features/data/user_location.dart';
+import 'package:rogapp/features/state/game_view_model.dart';
+
+/// The state for the location feature
+class LocationState {
+  final Position? currentPosition;
+  final bool isStreamPaused;
+
+  LocationState({
+    this.currentPosition,
+    this.isStreamPaused = false,
+  });
+
+  LocationState copyWith({
+    Position? currentPosition,
+    bool? isStreamPaused,
+  }) {
+    return LocationState(
+      currentPosition: currentPosition ?? this.currentPosition,
+      isStreamPaused: isStreamPaused ?? this.isStreamPaused,
+    );
+  }
+}
+
+/// A StateNotifier that manages the location state
+class LocationNotifier extends StateNotifier<LocationState> {
+  final Ref ref;
+  LocationNotifier(this.ref) : super(LocationState()) {
+    startListening();
+    startPeriodicUpdates();
+  }
+
+  StreamSubscription<Position>? _positionSubscription;
+  Position? _lastPosition;
+  final double _distanceThreshold = 220.0;
+  Timer? _periodicUpdateTimer;
+
+  void startPeriodicUpdates() {
+    _periodicUpdateTimer?.cancel();
+    _periodicUpdateTimer = Timer.periodic(Duration(seconds: 5), (timer) {
+      if (state.currentPosition != null) {
+        // Convert Position to UserLocation
+        UserLocation userLocation =
+            UserLocation.fromPosition(state.currentPosition!);
+        ref.read(gameViewModelProvider.notifier).updateLocation(userLocation);
+      }
+    });
+  }
+
+  void startListening() {
+    _positionSubscription =
+        Geolocator.getPositionStream().listen((Position position) {
+      if (_shouldUpdatePosition(position)) {
+        state = state.copyWith(currentPosition: position);
+        _lastPosition = position;
+      }
+    });
+  }
+
+  bool _shouldUpdatePosition(Position newPosition) {
+    if (_lastPosition == null) return true;
+
+    double distance = Geolocator.distanceBetween(
+      _lastPosition!.latitude,
+      _lastPosition!.longitude,
+      newPosition.latitude,
+      newPosition.longitude,
+    );
+
+    return distance < _distanceThreshold;
+  }
+
+  void stopListening() {
+    _positionSubscription?.cancel();
+    _positionSubscription = null;
+    state = state.copyWith(
+        currentPosition: null); // Reset the position state or handle as needed
+  }
+
+  void pauseListening() {
+    _positionSubscription?.pause();
+  }
+
+  void resumeListening() {
+    _positionSubscription?.resume();
+  }
+
+  void updateCurrentPosition(Position? position) {
+    state = state.copyWith(currentPosition: position);
+  }
+
+  void updateStreamPaused(bool isPaused) {
+    state = state.copyWith(isStreamPaused: isPaused);
+  }
+
+  @override
+  void dispose() {
+    _positionSubscription?.cancel();
+    super.dispose();
+  }
+}
+
+final locationNotifierProvider =
+    StateNotifierProvider<LocationNotifier, LocationState>((ref) {
+  return LocationNotifier(ref); // Pass ref directly
+});

lib/features/services/auth_repo.dart

@@ -0,0 +1,14 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/data/user.dart';
+import 'package:rogapp/features/services/auth_service.dart';
+
+final authProvider =
+    FutureProvider.family<User?, String>((ref, credentials) async {
+  // Assuming credentials is a combined string of "email|password"
+  List<String> parts = credentials.split('|');
+  String email = parts[0];
+  String password = parts[1];
+
+  AuthService authService = AuthService();
+  return await authService.userLogin(email, password);
+});

lib/features/services/auth_service.dart

@@ -0,0 +1,44 @@
+import 'package:rogapp/features/data/user.dart';
+
+import '../utils/const.dart';
+
+import 'package:dio/dio.dart';
+
+class AuthService {
+  Dio dio = Dio();
+
+  Future<User?> userLogin(String email, String password) async {
+    final String serverUrl = ConstValues.currentServer();
+    final String url = '$serverUrl/api/login/';
+
+    try {
+      final response = await dio.post(
+        url,
+        data: {
+          'email': email,
+          'password': password,
+        },
+        options: Options(
+          headers: {
+            'Content-Type': 'application/json; charset=UTF-8',
+          },
+        ),
+      );
+
+      if (response.statusCode == 200 && response.data != null) {
+        final data = response.data;
+        User user = User.fromMap(data["user"]);
+        final String token = data["token"];
+        user.auth_token = token;
+        return user;
+      }
+      return null;
+    } on DioException catch (e) {
+      print("Dio error: ${e.response?.statusCode} - ${e.message}");
+      return null;
+    } catch (e) {
+      print("Unexpected error: $e");
+      return null;
+    }
+  }
+}

lib/features/services/checkpoint_repo.dart

@@ -0,0 +1,32 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+import 'package:rogapp/features/data/data_provider.dart';
+import 'package:rogapp/features/services/checkpoint_service.dart'; // Import your ApiService file
+
+Future<void> storeFetchedFeatures(FeatureCollection featureCollection) async {
+  final dataProvider =
+      DataProvider(); // Ensure DataProvider is initialized appropriately
+
+  for (Feature feature in featureCollection.features) {
+    await dataProvider.insertMarker(feature);
+  }
+}
+
+final checkpointProvider = FutureProvider<List<Feature>>((ref) async {
+  final dataProvider =
+      DataProvider(); // Assuming you create or access an instance here
+  final markers = await dataProvider.getMarkers();
+  return markers;
+});
+
+final featureCheckpointCollectionProvider =
+    FutureProvider<FeatureCollection>((ref) async {
+  final apiService =
+      ApiService(); // Ensure ApiService is initialized appropriately
+  final featureCollection = await apiService.fetchFeatures();
+
+  // Store the fetched features in the local database
+  await storeFetchedFeatures(featureCollection);
+
+  return featureCollection; // Return the fetched feature collection
+});

lib/features/services/checkpoint_service.dart

@@ -0,0 +1,27 @@
+import 'package:dio/dio.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+
+class ApiService {
+  final Dio _dio = Dio();
+
+  Future<FeatureCollection> fetchFeatures() async {
+    try {
+      final tmp_url =
+          "https://rogaining.sumasen.net/api/inbound?rog=True&grp=養老ロゲ&ln1=136.52675654298724&la1=35.19710769333327&ln2=136.52675654298724&la2=35.38264844179004&ln3=136.65061968584442&la3=35.38264844179004&ln4=136.65061968584442&la4=35.19710769333327";
+      final response = await _dio.get(tmp_url);
+      if (response.statusCode == 200) {
+        return FeatureCollection.fromJson(response.data);
+      } else {
+        throw Exception('Failed to load features');
+      }
+    } on DioException catch (e) {
+      // Handle Dio errors here
+      print('Dio error: $e');
+      throw Exception('Failed to load features');
+    } catch (e) {
+      // Handle any other errors
+      print('General error: $e');
+      throw Exception('Failed to load features');
+    }
+  }
+}

lib/features/state/game_state.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+import 'package:rogapp/features/data/user_location.dart';
+
+enum GameStatus {
+  notStarted,
+  started,
+  inProgress,
+  atCheckpoint,
+  gameCompleted,
+}
+
+enum PendingAction {
+  none,
+  checkInPhoto,
+  receiptPhoto,
+  endGamePhoto,
+}
+
+@immutable
+class GameState {
+  final GameStatus status;
+  final List<Feature> markers;
+  final UserLocation? currentLocation;
+  final Set<Feature> visitedMarkers;
+  final bool isWithinStartRadius;
+  final bool hasLeftStartArea;
+  final bool hasVisitedCheckpoint;
+  final Feature? currentCheckpoint;
+  final bool checkpointPhotoTaken;
+  final bool receiptPhotoTaken;
+  final PendingAction pendingAction;
+
+  const GameState({
+    this.status = GameStatus.notStarted,
+    this.markers = const [],
+    this.currentLocation,
+    this.visitedMarkers = const {},
+    this.isWithinStartRadius = false,
+    this.hasLeftStartArea = false,
+    this.hasVisitedCheckpoint = false,
+    this.currentCheckpoint,
+    this.checkpointPhotoTaken = false,
+    this.receiptPhotoTaken = false,
+    this.pendingAction = PendingAction.none,
+  });
+
+  LatLng? getUserLatLng() {
+    return currentLocation != null
+        ? LatLng(currentLocation!.latitude, currentLocation!.longitude)
+        : null;
+  }
+
+  GameState.fromMap(Map<String, dynamic> map)
+      : status = GameStatus.values[map['status']],
+        markers =
+            List<Feature>.from(map['markers'].map((x) => Feature.fromMap(x))),
+        currentLocation = UserLocation.fromMap(map['currentLocation']),
+        visitedMarkers = Set<Feature>.from(
+            map['visitedMarkers'].map((x) => Feature.fromMap(x))),
+        isWithinStartRadius = map['isWithinStartRadius'],
+        hasLeftStartArea = map['hasLeftStartArea'],
+        hasVisitedCheckpoint = map['hasVisitedCheckpoint'],
+        currentCheckpoint = map['currentCheckpoint'] != null
+            ? Feature.fromMap(map['currentCheckpoint'])
+            : null,
+        checkpointPhotoTaken = map['checkpointPhotoTaken'],
+        receiptPhotoTaken = map['receiptPhotoTaken'],
+        pendingAction = PendingAction.values[map['pendingAction']];
+
+  GameState copyWith({
+    GameStatus? status,
+    List<Feature>? markers,
+    UserLocation? currentLocation,
+    Set<Feature>? visitedMarkers,
+    bool? isWithinStartRadius,
+    bool? hasLeftStartArea,
+    bool? hasVisitedCheckpoint,
+    Feature? currentCheckpoint,
+    bool? checkpointPhotoTaken,
+    bool? receiptPhotoTaken,
+    PendingAction? pendingAction,
+  }) {
+    return GameState(
+        status: status ?? this.status,
+        markers: markers ?? this.markers,
+        currentLocation: currentLocation ?? this.currentLocation,
+        visitedMarkers: visitedMarkers ?? this.visitedMarkers,
+        isWithinStartRadius: isWithinStartRadius ?? this.isWithinStartRadius,
+        hasLeftStartArea: hasLeftStartArea ?? this.hasLeftStartArea,
+        hasVisitedCheckpoint: hasVisitedCheckpoint ?? this.hasVisitedCheckpoint,
+        currentCheckpoint: currentCheckpoint ?? this.currentCheckpoint,
+        checkpointPhotoTaken: checkpointPhotoTaken ?? this.checkpointPhotoTaken,
+        receiptPhotoTaken: receiptPhotoTaken ?? this.receiptPhotoTaken,
+        pendingAction: pendingAction ?? this.pendingAction);
+  }
+}

lib/features/state/game_view_model.dart

@@ -0,0 +1,199 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:rogapp/features/data/checkpoint.dart';
+import 'package:rogapp/features/data/data_provider.dart';
+import 'package:rogapp/features/data/user_location.dart';
+import 'package:rogapp/features/state/game_state.dart';
+import 'package:rogapp/features/utils/params.dart';
+
+final gameViewModelProvider =
+    StateNotifierProvider<GameViewModel, GameState>((ref) {
+  final dataProvider = DataProvider();
+  return GameViewModel(dataProvider);
+});
+
+class GameViewModel extends StateNotifier<GameState> {
+  final DataProvider _dataProvider;
+
+  GameViewModel(this._dataProvider) : super(const GameState()) {
+    loadInitialData();
+  }
+
+  Future<void> loadInitialData() async {
+    List<Feature> markers = await _dataProvider.getMarkers();
+    state = state.copyWith(markers: markers);
+  }
+
+  void setMarkers(List<Feature> markers) {
+    state = state.copyWith(markers: markers);
+  }
+
+  void startGame() {
+    if (state.isWithinStartRadius) {
+      state = state.copyWith(status: GameStatus.started);
+    }
+  }
+
+  void updateLocation(UserLocation location) {
+    Feature startMarker = state.markers.firstWhere(
+        (marker) => marker.properties.cp == -1,
+        orElse: () => Feature.empty());
+    List<Feature> checkpoints =
+        state.markers.where((marker) => marker.properties.cp != -1).toList();
+
+    bool isWithinStartRadius =
+        _checkProximity(location, startMarker /* start marker location */
+            );
+    bool hasLeftArea =
+        state.hasLeftStartArea || _checkHasLeftStartArea(location, startMarker);
+
+    Feature? atCheckpoint = _checkAtAnyCheckpoint(location, checkpoints);
+
+    // Check if at any checkpoint (except start point after game started)
+    bool isAtCheckpoint =
+        state.status == GameStatus.started && atCheckpoint != null;
+    if (isAtCheckpoint) {
+      _handleCheckpointArrival(location, atCheckpoint);
+    }
+
+    // Update game state based on the new location
+    state = state.copyWith(
+      currentLocation: location,
+      isWithinStartRadius: isWithinStartRadius,
+      hasLeftStartArea: hasLeftArea,
+      status: isAtCheckpoint ? GameStatus.atCheckpoint : state.status,
+    );
+  }
+
+  void _handleCheckpointArrival(UserLocation location, Feature marker) {
+    // Directly set the current checkpoint; no need to check if the photo was taken here
+    state = state.copyWith(currentCheckpoint: marker);
+
+    // If no checkpoint photo has been taken yet, set the pending action to take a checkpoint photo
+    if (!state.checkpointPhotoTaken) {
+      state = state.copyWith(pendingAction: PendingAction.checkInPhoto);
+    }
+
+    // Additional actions specific to buy points can be prepared here, but it's usually better
+    // to handle them after the checkpoint photo is submitted, not at the moment of arrival.
+  }
+
+  void submitCheckInPhoto(String photoPath) {
+    // Logic to save or upload the check-in photo...
+    state = state.copyWith(checkpointPhotoTaken: true);
+
+    // Determine the next action based on the checkpoint type
+    if (state.currentCheckpoint != null &&
+        isBuyPoint(state.currentCheckpoint!)) {
+      state = state.copyWith(pendingAction: PendingAction.receiptPhoto);
+    } else {
+      // If it's not a buy point, mark the checkpoint visit as complete
+      _markCheckpointVisited(state.currentCheckpoint!);
+    }
+  }
+
+  void submitReceiptPhoto(String photoPath) {
+    // Logic to save or upload the receipt photo...
+    state = state.copyWith(receiptPhotoTaken: true);
+
+    // After submitting the receipt photo, mark the checkpoint visit as complete
+    _markCheckpointVisited(state.currentCheckpoint!);
+  }
+
+  void _markCheckpointVisited(Feature checkpoint) {
+    state = state.copyWith(
+      visitedMarkers: Set.from(state.visitedMarkers)..add(checkpoint),
+      hasVisitedCheckpoint: true,
+      pendingAction: PendingAction.none, // Reset the pending action
+    );
+
+    // Additional logic to determine if the game is completed...
+  }
+
+  bool isBuyPoint(Feature checkpoint) {
+    if (checkpoint.properties.buyPoint != null) {
+      return true;
+    }
+    return false;
+  }
+
+  bool _checkProximity(UserLocation location, Feature startMarker) {
+    const Distance distance = Distance();
+    return distance(
+            LatLng(location.latitude, location.longitude),
+            LatLng(startMarker.geometry.latitude,
+                startMarker.geometry.longitude)) <=
+        startMinDistance;
+  }
+
+  bool _checkHasLeftStartArea(UserLocation location, Feature startMarker) {
+    const Distance distance = Distance();
+    return distance(
+            LatLng(location.latitude, location.longitude),
+            LatLng(startMarker.geometry.latitude,
+                startMarker.geometry.longitude)) >=
+        minAwayfromStartDistance;
+  }
+
+  Feature? _checkAtAnyCheckpoint(UserLocation location, List<Feature> markers) {
+    const Distance distance = Distance();
+
+    for (Feature marker in markers) {
+      final double distanceInMeters = distance(
+        LatLng(location.latitude, location.longitude),
+        LatLng(marker.geometry.latitude, marker.geometry.longitude),
+      );
+      if (marker.properties.checkinRadious != null &&
+          marker.properties.checkinRadious! >= distanceInMeters) {
+        return marker;
+      }
+    }
+    return null;
+  }
+
+  Feature? _getCheckpointFromLocation(UserLocation location) {
+    const thresholdDistance = 50.0; // meters, adjust based on your game design
+    const Distance distance = Distance();
+
+    for (final marker in state.markers) {
+      final double distanceInMeters = distance(
+        LatLng(location.latitude, location.longitude),
+        LatLng(marker.geometry.latitude, marker.geometry.longitude),
+      );
+
+      if (distanceInMeters <=
+          (marker.properties.checkinRadious ?? thresholdDistance)) {
+        return marker;
+      }
+    }
+
+    return null; // No checkpoint is close enough to the user's location
+  }
+
+  bool _isBackAtStart(UserLocation location) {
+    const startThresholdDistance = 150.0; // Define proximity threshold
+    const Distance distance = Distance();
+
+    // Assuming the start point is the first marker
+    // Adjust based on your game's logic
+    final startPoint = state.markers.first;
+
+    final double distanceToStart = distance(
+      LatLng(location.latitude, location.longitude),
+      LatLng(startPoint.geometry.latitude, startPoint.geometry.longitude),
+    );
+
+    // User is considered back at the start if within the threshold distance
+    return distanceToStart <= startThresholdDistance;
+  }
+
+  void endGame() {
+    if (state.status == GameStatus.gameCompleted) {
+      // Perform any end game actions
+    }
+  }
+
+  void loadGameState(GameState gameState) {
+    state = gameState;
+  }
+}

lib/features/state/user_state.dart

@@ -0,0 +1,18 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/data/user.dart';
+
+class UserNotifier extends StateNotifier<User?> {
+  UserNotifier() : super(null);
+
+  void setUser(User? user) {
+    state = user;
+  }
+
+  void clearUser() {
+    state = null;
+  }
+}
+
+final userNotifierProvider = StateNotifierProvider<UserNotifier, User?>((ref) {
+  return UserNotifier();
+});

lib/features/utils/const.dart

@@ -0,0 +1,13 @@
+class ConstValues {
+  static const container_svr = "http://container.intranet.sumasen.net:8100";
+  static const server_uri = "https://rogaining.sumasen.net";
+  static const dev_server = "http://localhost:8100";
+  static const dev_ip_server = "http://192.168.8.100:8100";
+  static const dev_home_ip_server = "http://172.20.10.9:8100";
+  static const dev_home_ip_mserver = "http://192.168.1.10:8100";
+
+  static String currentServer() {
+    //return dev_ip_server;
+    return server_uri;
+  }
+}

lib/features/utils/distance_calculator.dart

@@ -0,0 +1,29 @@
+import 'dart:math';
+import 'package:latlong2/latlong.dart';
+
+class DistanceCalculatorHS {
+  static const int _radius = 6371; // Radius of the Earth in kilometers
+
+  static double _degreeToRadian(double degree) {
+    return degree * pi / 180;
+  }
+
+  static double calculateDistance(LatLng location1, LatLng location2) {
+    double latDistance =
+        _degreeToRadian(location2.latitude - location1.latitude);
+    double lonDistance =
+        _degreeToRadian(location2.longitude - location1.longitude);
+
+    double a = sin(latDistance / 2) * sin(latDistance / 2) +
+        cos(_degreeToRadian(location1.latitude)) *
+            cos(_degreeToRadian(location2.latitude)) *
+            sin(lonDistance / 2) *
+            sin(lonDistance / 2);
+
+    double c = 2 * atan2(sqrt(a), sqrt(1 - a));
+
+    double distance = _radius * c * 1000; // Convert to meters
+
+    return distance;
+  }
+}

lib/features/utils/error_reporter.dart

@@ -0,0 +1,17 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final errorReportingProvider = Provider<ErrorReporter>((ref) {
+  return ErrorReporterImpl();
+});
+
+class ErrorReporter {
+  void reportError(Object error, StackTrace stackTrace) {}
+}
+
+class ErrorReporterImpl extends ErrorReporter {
+  @override
+  void reportError(Object error, StackTrace stackTrace) {
+    // Send error and stackTrace to the server
+    // Include app state if necessary
+  }
+}

lib/features/utils/params.dart

@@ -0,0 +1,2 @@
+int startMinDistance = 150;
+int minAwayfromStartDistance = 300;

lib/main.dart

@@ -1,153 +1,47 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
-import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
-import 'package:get/get.dart';
-import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:rogapp/pages/index/index_binding.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/utils/string_values.dart';
-// import 'package:is_lock_screen/is_lock_screen.dart';
+import 'package:rogapp/features/landing/landing_page.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/utils/error_reporter.dart';
+
+void reportError(
+    ProviderContainer container, Object error, StackTrace stackTrace) {
+  // Log the error locally or report to a server
+  print('Caught an error: $error');
+  container.read(errorReportingProvider).reportError(error, stackTrace);
+}
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  await FlutterMapTileCaching.initialise();
-  final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
-  await instanceA.manage.createAsync();
-  await instanceA.metadata.addAsync(
-    key: 'sourceURL',
-    value: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
-  );
-  await instanceA.metadata.addAsync(
-    key: 'validDuration',
-    value: '14',
-  );
-  await instanceA.metadata.addAsync(
-    key: 'behaviour',
-    value: 'cacheFirst',
-  );
-
-  runApp(const MyApp());
+  final container = ProviderContainer();
+  runZonedGuarded(() {
+    runApp(UncontrolledProviderScope(container: container, child: const App()));
+    FlutterError.onError = (FlutterErrorDetails details) {
+      final error = details.exception;
+      final stackTrace = details.stack ?? StackTrace.current;
+      reportError(container, error, stackTrace);
+    };
+  }, (error, stackTrace) {
+    reportError(container, error, stackTrace ?? StackTrace.current);
+  });
 }
 
-class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+class App extends StatelessWidget {
+  const App({super.key});
 
-  @override
-  State<MyApp> createState() => _MyAppState();
-}
-
-class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   // This widget is the root of your application.
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addObserver(this);
-  }
-
-  
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
-  }
-
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-      switch (state) {
-        case AppLifecycleState.resumed:
-          print("RESUMED");
-          DestinationController destinationController = Get.find<DestinationController>();
-          if(destinationController.positionStream == null){
-            destinationController.startGPSTimer();
-          }
-          break;
-        case AppLifecycleState.inactive:
-          print("INACTIVE");
-          break;
-        case AppLifecycleState.paused:
-          print("PAUSED");
-          break;
-        case AppLifecycleState.detached:
-          print("DETACHED");
-          break;
-        case AppLifecycleState.hidden:
-          print("DETACHED");
-          break;
-      }
-    }
-
   @override
   Widget build(BuildContext context) {
-    return GetMaterialApp(
-      translations: StringValues(),
-      locale: const Locale('ja', 'JP'),
-      //locale: const Locale('en', 'US'),
-      fallbackLocale: const Locale('en', 'US'),
-      title: 'ROGAINING',
+    return MaterialApp(
+      title: 'Flutter Demo',
       theme: ThemeData(
-        colorScheme:
-            ColorScheme.fromSeed(seedColor: Color.fromARGB(255, 36, 135, 221)),
+        colorScheme: ColorScheme.fromSeed(
+            seedColor: const Color.fromARGB(255, 0, 35, 140)), //Samurai Blue
         useMaterial3: true,
       ),
-      debugShowCheckedModeBanner: false,
-      defaultTransition: Transition.cupertino,
-      opaqueRoute: Get.isOpaqueRouteDefault,
-      popGesture: Get.isPopGestureEnable,
-      transitionDuration: const Duration(milliseconds: 230),
-      initialBinding: IndexBinding(), //HomeBinding(),
-      initialRoute: AppPages.PERMISSION,
-      getPages: AppPages.routes,
-      enableLog: true,
+      home: const LandingPage(),
     );
   }
 }
-
-
-
-// class MyApp extends StatelessWidget {
-//   MyApp({Key? key}) : super(key: key);
-
-//   // This widget is the root of your application.
-//   @override
-//   Widget build(BuildContext context) {
-//     return MaterialApp(
-//       title: 'Flutter Demo',
-//       theme: ThemeData(
-//         primaryColor: Color(0xfff00B074),
-//         textTheme: const TextTheme(
-//           bodyText1: TextStyle(
-//               fontSize: 18.0,
-//               fontFamily: 'Barlow-Medium',
-//               color: Color(0xff464255)),
-//         ),
-//       ),
-//       home: PermissionHandlerScreen(),
-//     );
-//   }
-// }
-
-
-
-
-// class SplashScreen extends StatelessWidget {
-//   const SplashScreen({Key? key}) : super(key: key);
-
-//   @override
-//   Widget build(BuildContext context) {
-//     return WillPopScope(
-//       onWillPop: () async {
-//         SystemNavigator.pop();
-//         return true;
-//       },
-//       child: Scaffold(
-//         body: Center(
-//           child: Text(
-//             "Splash Screen",
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }

lib/main_mapsix.dart

@@ -0,0 +1,146 @@
+// import 'package:flutter/material.dart';
+// import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
+// import 'package:get/get.dart';
+// import 'package:rogapp/pages/destination/destination_controller.dart';
+// import 'package:rogapp/pages/index/index_binding.dart';
+// import 'package:rogapp/routes/app_pages.dart';
+// import 'package:rogapp/utils/location_controller.dart';
+// import 'package:rogapp/utils/string_values.dart';
+// import 'package:shared_preferences/shared_preferences.dart';
+// // import 'package:is_lock_screen/is_lock_screen.dart';
+
+// void saveGameState() async {
+//   DestinationController destinationController =
+//       Get.find<DestinationController>();
+//   SharedPreferences pref = await SharedPreferences.getInstance();
+//   pref.setBool("is_in_rog", destinationController.isInRog.value);
+//   pref.setBool(
+//       "rogaining_counted", destinationController.rogainingCounted.value);
+//   pref.setBool("ready_for_goal", DestinationController.ready_for_goal);
+// }
+
+// void restoreGame() async {
+//   SharedPreferences pref = await SharedPreferences.getInstance();
+//   DestinationController destinationController =
+//       Get.find<DestinationController>();
+//   destinationController.skipGps = false;
+//   destinationController.isInRog.value = pref.getBool("is_in_rog") ?? false;
+//   destinationController.rogainingCounted.value =
+//       pref.getBool("rogaining_counted") ?? false;
+//   DestinationController.ready_for_goal =
+//       pref.getBool("ready_for_goal") ?? false;
+//   //print(
+//   //    "--restored -- destinationController.isInRog.value ${pref.getBool("is_in_rog")} -- ${pref.getBool("rogaining_counted")}");
+// }
+
+// void main() async {
+//   WidgetsFlutterBinding.ensureInitialized();
+//   await FlutterMapTileCaching.initialise();
+//   final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
+//   await instanceA.manage.createAsync();
+//   await instanceA.metadata.addAsync(
+//     key: 'sourceURL',
+//     value: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
+//   );
+//   await instanceA.metadata.addAsync(
+//     key: 'validDuration',
+//     value: '14',
+//   );
+//   await instanceA.metadata.addAsync(
+//     key: 'behaviour',
+//     value: 'cacheFirst',
+//   );
+//   runApp(const MyApp());
+// }
+
+// class MyApp extends StatefulWidget {
+//   const MyApp({Key? key}) : super(key: key);
+
+//   @override
+//   State<MyApp> createState() => _MyAppState();
+// }
+
+// class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
+//   // This widget is the root of your application.
+
+//   @override
+//   void initState() {
+//     super.initState();
+//     if (context.mounted) {
+//       restoreGame();
+//     }
+//     WidgetsBinding.instance.addObserver(this);
+//   }
+
+//   @override
+//   void dispose() {
+//     WidgetsBinding.instance.removeObserver(this);
+//     super.dispose();
+//   }
+
+//   // void saveGameState() async {
+//   //     DestinationController destinationController = Get.find<DestinationController>();
+//   //     SharedPreferences pref = await SharedPreferences.getInstance();
+//   //     pref.setBool("is_in_rog", destinationController.is_in_rog.value);
+//   //     pref.setBool("rogaining_counted", destinationController.rogaining_counted.value);
+//   // }
+
+//   @override
+//   void didChangeAppLifecycleState(AppLifecycleState state) {
+//     LocationController locationController = Get.find<LocationController>();
+
+//     DestinationController destinationController =
+//         Get.find<DestinationController>();
+//     switch (state) {
+//       case AppLifecycleState.resumed:
+//         locationController.resumePositionStream();
+//         //print("RESUMED");
+//         restoreGame();
+//         break;
+//       case AppLifecycleState.inactive:
+//         locationController.resumePositionStream();
+//         //print("INACTIVE");
+//         break;
+//       case AppLifecycleState.paused:
+//         locationController.resumePositionStream();
+//         //print("PAUSED");
+//         saveGameState();
+//         break;
+//       case AppLifecycleState.detached:
+//         locationController.resumePositionStream();
+//         //print("DETACHED");
+//         saveGameState();
+//         break;
+//       case AppLifecycleState.hidden:
+//         locationController.resumePositionStream();
+//         //print("DETACHED");
+//         saveGameState();
+//         break;
+//     }
+//   }
+
+//   @override
+//   Widget build(BuildContext context) {
+//     return GetMaterialApp(
+//       translations: StringValues(),
+//       locale: const Locale('ja', 'JP'),
+//       //locale: const Locale('en', 'US'),
+//       fallbackLocale: const Locale('en', 'US'),
+//       title: 'ROGAINING',
+//       theme: ThemeData(
+//         colorScheme: ColorScheme.fromSeed(
+//             seedColor: const Color.fromARGB(255, 36, 135, 221)),
+//         useMaterial3: true,
+//       ),
+//       debugShowCheckedModeBanner: false,
+//       defaultTransition: Transition.cupertino,
+//       opaqueRoute: Get.isOpaqueRouteDefault,
+//       popGesture: Get.isPopGestureEnable,
+//       transitionDuration: const Duration(milliseconds: 230),
+//       initialBinding: IndexBinding(), //HomeBinding(),
+//       initialRoute: AppPages.PERMISSION,
+//       getPages: AppPages.routes,
+//       enableLog: true,
+//     );
+//   }
+// }

lib/main_nrog.dart

@@ -0,0 +1,61 @@
+// import 'package:flutter/material.dart';
+// import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';
+// import 'package:rogapp/nrog/pages/permission_page.dart';
+
+// void main() async {
+//   WidgetsFlutterBinding.ensureInitialized();
+
+//   await FlutterMapTileCaching.initialise();
+//   final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
+//   await instanceA.manage.createAsync();
+//   await instanceA.metadata.addAsync(
+//     key: 'sourceURL',
+//     value: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
+//   );
+//   await instanceA.metadata.addAsync(
+//     key: 'validDuration',
+//     value: '14',
+//   );
+//   await instanceA.metadata.addAsync(
+//     key: 'behaviour',
+//     value: 'cacheFirst',
+//   );
+//   runApp(
+//     const ProviderScope(child: MyApp()),
+//   );
+// }
+
+// class MyApp extends StatefulWidget {
+//   const MyApp({super.key});
+
+//   @override
+//   State<MyApp> createState() => _MyAppState();
+// }
+
+// class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
+//   @override
+//   void initState() {
+//     super.initState();
+//     WidgetsBinding.instance.addObserver(this);
+//   }
+
+//   @override
+//   void dispose() {
+//     WidgetsBinding.instance.removeObserver(this);
+//     super.dispose();
+//   }
+
+//   @override
+//   Widget build(BuildContext context) {
+//     return MaterialApp(
+//         debugShowCheckedModeBanner: false,
+//         title: 'Flutter Demo',
+//         theme: ThemeData(
+//           colorScheme: ColorScheme.fromSeed(
+//               seedColor: const Color.fromARGB(255, 124, 156, 9)),
+//           useMaterial3: true,
+//         ),
+//         home: const PermissionPage());
+//   }
+// }

lib/model/auth_user.dart

@@ -0,0 +1,24 @@
+class AuthUser {
+  AuthUser();
+
+  //AuthUser.from({required this.id, required this.email, required this.is_rogaining, required this.group, required this.zekken_number, required this.event_code, required this.team_name});
+
+  AuthUser.fromMap(Map<String, dynamic> map)
+      : id = int.parse(map["id"].toString()),
+        email = map["email"].toString(),
+        is_rogaining = bool.parse(map["is_rogaining"].toString()),
+        group = map["group"].toString(),
+        zekken_number = map["zekken_number"].toString(),
+        event_code = map["event_code"].toString(),
+        team_name = map["team_name"].toString(),
+        auth_token = map["token"];
+
+  int? id;
+  String? email;
+  bool? is_rogaining;
+  String? group;
+  String? zekken_number;
+  String? event_code;
+  String? team_name;
+  String? auth_token;
+}

lib/model/destination.dart

@@ -1,113 +1,130 @@
-
-
 class Destination {
-      String? name;
-      String? address;
-      String? phone;
-      String? email;
-      String? webcontents;
-      String? videos;
-      String? category;
-      int? series;
-      double? lat; 
-      double? lon; 
-      String? sub_loc_id;
-      int? location_id; 
-      int? list_order;
-      String? photos;
-      double? checkin_radious;
-      int? auto_checkin;
-      bool? selected = false;
-      bool? checkedin = false;
-      double? cp;
-      double? checkin_point;
-      double? buy_point;
-      int? hidden_location;
+  String? name;
+  String? address;
+  String? phone;
+  String? email;
+  String? webcontents;
+  String? videos;
+  String? category;
+  int? series;
+  double? lat;
+  double? lon;
+  String? sub_loc_id;
+  int? location_id;
+  int? list_order;
+  String? photos;
+  double? checkin_radious;
+  int? auto_checkin;
+  bool? selected = false;
+  bool? checkedin = false;
+  double? cp;
+  double? checkin_point;
+  double? buy_point;
+  int? hidden_location;
+  String? checkin_image;
+  String? buypoint_image;
+  bool forced_checkin = false;
+  int recipt_times = 0;
+  String? tags;
 
-      Destination({
-        this.name,
-        this.address,
-        this.phone,
-        this.email,
-        this.webcontents,
-        this.videos,
-        this.category, 
-        this.series, 
-        this.lat, 
-        this.lon, 
-        this.sub_loc_id,
-        this.location_id, 
-        this.list_order, 
-        this.photos,
-        this.checkin_radious,
-        this.auto_checkin, 
-        this.selected,
-        this.checkedin,
-        this.cp,
-        this.checkin_point,
-        this.buy_point,
-        this.hidden_location
-        });
+  Destination(
+      {this.name,
+      this.address,
+      this.phone,
+      this.email,
+      this.webcontents,
+      this.videos,
+      this.category,
+      this.series,
+      this.lat,
+      this.lon,
+      this.sub_loc_id,
+      this.location_id,
+      this.list_order,
+      this.photos,
+      this.checkin_radious,
+      this.auto_checkin,
+      this.selected,
+      this.checkedin,
+      this.cp,
+      this.checkin_point,
+      this.buy_point,
+      this.hidden_location,
+      this.checkin_image,
+      this.buypoint_image,
+      this.forced_checkin = false,
+      this.recipt_times = 0,
+      this.tags});
 
-      factory Destination.fromMap(Map<String, dynamic> json) {
+  factory Destination.fromMap(Map<String, dynamic> json) {
+    bool selec = json['selected'] == 0 ? false : true;
+    bool checkin = json['checkedin'] == 0 ? false : true;
+    bool forcedCheckin = json['forced_checkin'] == 0 ? false : true;
 
-        bool selec = json['selected'] == 0 ? false : true;
-        bool checkin = json['checkedin'] == 0 ? false : true;
-
-        return Destination(
-          name: json['name'],
-          address: json['address'],
-          phone: json['phone'],
-          email: json['email'],
-          webcontents: json['webcontents'],
-          videos: json['videos'],
-          category: json['category'],
-          series: json['series'],
-          lat: json['lat'],
-          lon: json['lon'],
-          sub_loc_id : json['sub_loc_id'],
-          location_id: json['location_id'],
-          list_order: json['list_order'],
-          photos: json['photos'],
-          checkin_radious: json['checkin_radious'],
-          auto_checkin:json['auto_checkin'],
-          selected: selec,
-          checkedin: checkin,
-          cp: json['cp'],
-          checkin_point: json['checkin_point'],
-          buy_point: json['buy_point'],
-          hidden_location: json['hidden_location']
-        );
-      }
-
-      Map<String, dynamic> toMap(){
-        int sel = selected == false ? 0 : 1;
-        int check = checkedin == false ? 0 : 1;
-        return  {
-          'name':name,
-          'address': address,
-          'phone': phone,
-          'email': email,
-          'webcontents': webcontents,
-          'videos': videos,
-          'category':category,
-          'series':series,
-          'lat':lat,
-          'lon':lon,
-          'sub_loc_id': sub_loc_id,
-          'location_id':location_id,
-          'list_order':list_order,
-          'photos':photos,
-          'checkin_radious': checkin_radious,
-          'auto_checkin': auto_checkin,
-          'selected': sel,
-          'checkedin': check,
-          'cp' : cp,
-          'checkin_point' : checkin_point,
-          'buy_point' : buy_point,
-          'hidden_location' : hidden_location
-        };
-      }
+    //print("-----tags model----- ${json}");
 
+    return Destination(
+        name: json['name'],
+        address: json['address'],
+        phone: json['phone'],
+        email: json['email'],
+        webcontents: json['webcontents'],
+        videos: json['videos'],
+        category: json['category'],
+        series: json['series'],
+        lat: json['lat'],
+        lon: json['lon'],
+        sub_loc_id: json['sub_loc_id'],
+        location_id: json['location_id'],
+        list_order: json['list_order'],
+        photos: json['photos'],
+        checkin_radious: json['checkin_radious'],
+        auto_checkin: json['auto_checkin'],
+        selected: selec,
+        checkedin: checkin,
+        cp: json['cp'],
+        checkin_point: json['checkin_point'],
+        buy_point: json['buy_point'],
+        hidden_location: json['hidden_location'],
+        checkin_image: json['checkin_image'],
+        buypoint_image: json["buypoint_image"],
+        forced_checkin: forcedCheckin,
+        recipt_times: json["recipt_times"],
+        tags: json["tags"]);
+  }
 
+  Map<String, dynamic> toMap() {
+    int sel = selected == false ? 0 : 1;
+    int check = checkedin == false ? 0 : 1;
+    int forcedCheckin = forced_checkin == false ? 0 : 1;
+    return {
+      'name': name,
+      'address': address,
+      'phone': phone,
+      'email': email,
+      'webcontents': webcontents,
+      'videos': videos,
+      'category': category,
+      'series': series,
+      'lat': lat,
+      'lon': lon,
+      'sub_loc_id': sub_loc_id,
+      'location_id': location_id,
+      'list_order': list_order,
+      'photos': photos,
+      'checkin_radious': checkin_radious,
+      'auto_checkin': auto_checkin,
+      'selected': sel,
+      'checkedin': check,
+      'cp': cp,
+      'checkin_point': checkin_point,
+      'buy_point': buy_point,
+      'hidden_location': hidden_location,
+      'checkin_image': checkin_image,
+      'buypoint_image': buypoint_image,
+      'forced_checkin': forcedCheckin,
+      'recipt_times': recipt_times,
+      'tags': tags
+    };
+  }
 }

lib/model/game_state_instance.dart

@@ -0,0 +1,8 @@
+enum LocationState { noGps, notInCheckin, withinCheckin }
+
+enum GameState { notStarted, startedNotCounted, startedCounted, nodeGoal }
+
+class GameInsStatetance {
+  LocationState locationState = LocationState.noGps;
+  GameState gameState = GameState.notStarted;
+}

lib/model/gps_data.dart

@@ -0,0 +1,47 @@
+class GpsData {
+  int id;
+  String team_name;
+  String event_code;
+  double lat;
+  double lon;
+  int is_checkin;
+  int created_at;
+  int is_synced;
+
+  GpsData({
+    required this.id,
+    required this.team_name,
+    required this.event_code,
+    required this.lat,
+    required this.lon,
+    required this.created_at,
+    this.is_checkin = 0,
+    this.is_synced = 0,
+  });
+
+  factory GpsData.fromMap(Map<String, dynamic> json) {
+    return GpsData(
+      id: json["id"],
+      team_name: json["team_name"],
+      event_code: json["event_code"],
+      lat: json["lat"],
+      lon: json["lon"],
+      is_checkin: json["is_checkin"],
+      created_at: json["created_at"],
+      is_synced: json["is_synced"] ?? 0,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': id,
+      'team_name': team_name,
+      'event_code': event_code,
+      'lat': lat,
+      'lon': lon,
+      'is_checkin': is_checkin,
+      'created_at': created_at,
+      'is_synced': is_synced,
+    };
+  }
+}

lib/model/map_state_instance.dart

@@ -0,0 +1,6 @@
+import 'package:flutter_map/flutter_map.dart';
+
+class MapStateInstance {
+  MapController? mapController;
+  LatLngBounds? currentBounds;
+}

lib/nrog/pages/auth_page.dart

@@ -0,0 +1,229 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+import 'package:keyboard_dismisser/keyboard_dismisser.dart';
+import 'package:rogapp/model/auth_user.dart';
+import 'package:rogapp/nrog/pages/home_page.dart';
+import 'package:rogapp/provider/auth_provider.dart';
+import 'package:rogapp/services/auth_service.dart';
+import 'package:rogapp/widgets/c_form_text_field.dart';
+import 'package:rogapp/widgets/c_password_text_filed.dart';
+
+class AuthPage extends ConsumerStatefulWidget {
+  const AuthPage({super.key});
+
+  @override
+  ConsumerState<AuthPage> createState() => _AuthPageState();
+}
+
+class _AuthPageState extends ConsumerState<AuthPage> {
+  final _formkey = GlobalKey<FormState>();
+  final FocusNode focusEmail = FocusNode();
+  final FocusNode focusPwd = FocusNode();
+  var _authMode = 'login';
+  bool _isLoginProgress = false;
+
+  final TextEditingController _emailTextEditingController =
+      TextEditingController();
+  final TextEditingController _passwordTextEditingController =
+      TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    _emailTextEditingController.addListener(() => setState(() {}));
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      checkUser();
+    });
+  }
+
+  void _submit() async {
+    setState(() {
+      _isLoginProgress = true;
+    });
+    if (_formkey.currentState!.validate()) {
+      AuthService authService = AuthService();
+      AuthUser? user = await authService.userLogin(
+          _emailTextEditingController.text,
+          _passwordTextEditingController.text);
+      if (user != null) {
+        setState(() {
+          ref.read(authUserStateProvider.notifier).addLogin(user);
+        });
+      }
+    }
+    setState(() {
+      _isLoginProgress = false;
+    });
+  }
+
+  Future<void> _submitToken(String token) async {
+    setState(() {
+      _isLoginProgress = true;
+    });
+    AuthService authService = AuthService();
+    AuthUser? user = await authService.userFromToken(token);
+    //////////////print("---user is ${user} ---");
+    if (user != null) {
+      setState(() {
+        _isLoginProgress = false;
+        ref.read(authUserStateProvider.notifier).addLogin(user);
+      });
+    } else {}
+  }
+
+  void checkUser() async {
+    String? token =
+        await ref.read(authUserStateProvider.notifier).tokenFromDevice();
+    //////////////print("--- red token is ${token} ---");
+    if (token != null) {
+      await _submitToken(token);
+      final id = ref.read(authUserStateProvider).id;
+      if (id != null) {
+        if (context.mounted) {
+          Navigator.of(context)
+              .push(MaterialPageRoute(builder: (ctx) => const HomePage()));
+        }
+      }
+    }
+    return;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (ref.read(authUserStateProvider).id != null) {
+      Navigator.of(context)
+          .push(MaterialPageRoute(builder: (ctx) => const HomePage()));
+    }
+
+    return Scaffold(
+      resizeToAvoidBottomInset: true,
+      body: KeyboardDismisser(
+        gestures: const [
+          GestureType.onTap,
+          //GestureType.onVerticalDragDown
+        ],
+        child: Center(
+            child: SizedBox(
+          child: Stack(
+            clipBehavior: Clip.none,
+            children: [
+              buildAuthCard(),
+              buildLogo(),
+            ],
+          ),
+        )),
+      ),
+    );
+  }
+
+  Positioned buildLogo() {
+    return Positioned(
+      top: -170,
+      left: MediaQuery.of(context).size.width / 2 - 100,
+      child: Center(
+        child: Container(
+          alignment: Alignment.center,
+          width: 200,
+          height: 200,
+          decoration: const BoxDecoration(
+            shape: BoxShape.circle,
+            image: DecorationImage(
+                image: AssetImage('assets/images/appicon.png'),
+                fit: BoxFit.fill),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget buildAuthCard() {
+    return Card(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.end,
+        children: [
+          Form(
+            key: _formkey,
+            child: Padding(
+              padding: const EdgeInsets.only(
+                  top: 40, bottom: 10, left: 12, right: 12),
+              child: Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.all(10.0),
+                    child: CFormTextField(
+                        cFocus: focusEmail,
+                        cController: _emailTextEditingController),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(10),
+                    child: CPasswordTextField(
+                      cController: _passwordTextEditingController,
+                      cFocusNode: focusPwd,
+                    ),
+                  ),
+                  const SizedBox(
+                    height: 12,
+                  ),
+                  buildControlls(),
+                  // SizedBox(height: MediaQuery.of(context).viewInsets.bottom,)
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget buildControlls() {
+    if (_isLoginProgress) {
+      return const Center(
+        child: CircularProgressIndicator(),
+      );
+    }
+
+    final usr = ref.read(authUserStateProvider);
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(right: 12.0),
+              child: ElevatedButton(
+                  onPressed: _submit,
+                  child: Text(_authMode == "login" ? "Submit" : "Register",
+                      style: GoogleFonts.lato(
+                          color: Theme.of(context).colorScheme.secondary))),
+            )
+          ],
+        ),
+        TextButton(
+          onPressed: () {
+            setState(() {
+              if (_authMode == 'login') {
+                _authMode = 'register';
+              } else {
+                _authMode = 'login';
+              }
+            });
+          },
+          child: Text(
+            _authMode == "login"
+                ? "${usr.id} Dont have account, please Register"
+                : "Already Registered, Login",
+            style: GoogleFonts.lato(
+                color: Theme.of(context).colorScheme.primary,
+                decoration: TextDecoration.underline,
+                fontSize: 16,
+                fontWeight: FontWeight.bold),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/nrog/pages/home_page.dart

@@ -0,0 +1,119 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:rogapp/provider/map_state_provider.dart';
+import 'package:rogapp/widgets/base_layer_widget.dart';
+
+class HomePage extends ConsumerStatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  ConsumerState<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends ConsumerState<HomePage> {
+  StreamSubscription? subscription;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final mapStateInstance = ref.watch(mapStateNotifierProvider);
+    return Scaffold(
+      //drawer: DrawerPage(),
+      appBar: AppBar(
+        title: const Text("Rogaining"),
+        actions: [
+          IconButton(
+              onPressed: () {
+                //Get.toNamed(AppPages.HISTORY);
+              },
+              icon: const Icon(Icons.history)),
+          IconButton(
+              onPressed: () {
+                // final tk = indexController.currentUser[0]["token"];
+                // if (tk != null) {
+                //   destinationController.fixMapBound(tk);
+                // }
+              },
+              icon: const Icon(Icons.refresh)),
+          InkWell(
+            onTap: () {
+              //Get.toNamed(AppPages.SEARCH);
+            },
+            child: Container(
+              height: 32,
+              width: 75,
+              decoration: BoxDecoration(
+                color: Colors.blue,
+                borderRadius: BorderRadius.circular(25),
+              ),
+              child: const Center(
+                child: Icon(Icons.search),
+              ),
+            ),
+          ),
+          //CatWidget(indexController: indexController,),
+        ],
+      ),
+      body: Center(
+        child: FlutterMap(
+          mapController: mapStateInstance.mapController,
+          options: MapOptions(
+            maxZoom: 18.4,
+            onMapReady: () {
+              // indexController.is_mapController_loaded.value = true;
+              subscription = mapStateInstance.mapController?.mapEventStream
+                  .listen((MapEvent mapEvent) {
+                if (mapEvent is MapEventMoveStart) {
+                  //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
+                  // do something
+                }
+                //   if (mapEvent is MapEventMoveEnd &&
+                //       indexController.currentUser.isEmpty) {
+                //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
+                //     indexController.loadLocationsBound();
+                //indexController.rogMapController!.move(c.center, c.zoom);
+                //   }
+              });
+            },
+            center: LatLng(37.15319600454702, 139.58765950528198),
+            //bounds:
+            zoom: 18,
+            interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
+
+            onPositionChanged: (MapPosition pos, isvalue) {
+              //indexController.currentBound = [pos.bounds!];
+            },
+            // onTap: (_, __) => popupController
+            //     .hideAllPopups(), // Hide popup when the map is tapped.
+          ),
+          children: [
+            //const BaseLayer(),
+            CurrentLocationLayer(
+              followOnLocationUpdate: FollowOnLocationUpdate.once,
+              turnOnHeadingUpdate: TurnOnHeadingUpdate.never,
+              style: const LocationMarkerStyle(
+                marker: DefaultLocationMarker(
+                  child: Icon(
+                    Icons.navigation,
+                    color: Colors.yellowAccent,
+                  ),
+                ),
+                markerSize: Size(27, 27),
+                markerDirection: MarkerDirection.heading,
+              ),
+            ),
+            const MarkerLayer(markers: [])
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/nrog/pages/permission_page.dart

@@ -0,0 +1,126 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:rogapp/nrog/pages/auth_page.dart';
+
+class PermissionPage extends StatefulWidget {
+  const PermissionPage({super.key});
+
+  @override
+  State<PermissionPage> createState() => _PermissionPageState();
+}
+
+class _PermissionPageState extends State<PermissionPage> {
+  bool hasNavigated = false;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _checkPermissionStatus();
+    });
+  }
+
+  _checkPermissionStatus() async {
+    PermissionStatus status = await Permission.location.status;
+
+    if (status.isGranted == false) {
+      if (context.mounted) {
+        showAlert(context);
+      }
+    } else if (status.isPermanentlyDenied) {
+      await requestPermission();
+    } else {
+      if (mounted) {
+        Navigator.of(context)
+            .push(MaterialPageRoute(builder: (_) => const AuthPage()));
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: Text(""),
+    );
+  }
+
+  void showAlert(BuildContext context) {
+    showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+              title: const Text('ロケーション許可'),
+              content: const SingleChildScrollView(
+                child: ListBody(
+                  children: <Widget>[
+                    Text('このアプリでは、位置情報の収集を行います。'),
+                    Text(
+                        '岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
+                  ],
+                ),
+              ),
+              actions: <Widget>[
+                ElevatedButton(
+                  child: const Text('OK'),
+                  onPressed: () {
+                    requestPermission();
+                  },
+                ),
+              ],
+            ));
+  }
+
+  Future<void> requestPermission() async {
+    PermissionStatus permission = await Permission.location.status;
+    if (permission == PermissionStatus.permanentlyDenied) {
+      showPermanentAlert();
+    } else {
+      PermissionStatus newPermission = await Permission.location.request();
+      if (newPermission != PermissionStatus.granted) {
+        exit(0);
+      } else {
+        if (context.mounted) {
+          Navigator.of(context)
+              .push(MaterialPageRoute(builder: (_) => const AuthPage()));
+        }
+      }
+    }
+  }
+
+  void showPermanentAlert() {
+    showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+              title: const Text('無効'),
+              content: const SingleChildScrollView(
+                child: ListBody(
+                  children: <Widget>[
+                    Text('位置情報が無効になっています'),
+                    Text(
+                        'このアプリケーションへの位置情報アクセスが無効になっています。続行するには設定>プライバシーとセキュリティ>位置情報サービス>岐阜ナビ で有効にしてください。'),
+                  ],
+                ),
+              ),
+              actions: <Widget>[
+                ElevatedButton(
+                  child: const Text('OK'),
+                  onPressed: () async {
+                    await openAppSettings().then(
+                      (value) async {
+                        if (value) {
+                          if (await Permission
+                                      .location.status.isPermanentlyDenied ==
+                                  true &&
+                              await Permission.location.status.isGranted ==
+                                  false) {
+                            requestPermission(); /* opens app settings until permission is granted */
+                          }
+                        }
+                      },
+                    );
+                  },
+                ),
+              ],
+            ));
+  }
+}

lib/pages/camera/camera_page.dart

@@ -7,141 +7,278 @@ import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/services/external_service.dart';
+import 'package:rogapp/utils/const.dart';
+
+String getTagText(bool isRecept, String? tags) {
+  if (tags == null || tags.isEmpty) {
+    return "";
+  }
+  List<String> tts = tags.split(" ");
+  List<String> ttt = tags.split("　");
+  if (isRecept) {
+    if (ttt.length > tts.length && ttt.length > 1) {
+      return ttt[1];
+    }
+  }
+  if (!isRecept) {
+    if (ttt.length > tts.length && ttt.length > 1) {
+      return ttt[0];
+    }
+  }
+  if (!isRecept) {
+    return tts[0];
+  }
+  return "";
+}
+
+Image getDisplayImage(Destination destination) {
+  String serverUrl = ConstValues.currentServer();
+
+  Image img = Image.asset("assets/images/empty_image.png");
+  if (destination.phone == null) {
+    return img;
+  }
+
+  if (destination.photos!.contains('http')) {
+    return Image(
+      image: NetworkImage(
+        destination.phone!,
+      ),
+      errorBuilder:
+          (BuildContext context, Object exception, StackTrace? stackTrace) {
+        return Image.asset("assets/images/empty_image.png");
+      },
+    );
+  } else {
+    return Image(
+      image: NetworkImage(
+        '$serverUrl/media/compressed/${destination.photos}',
+      ),
+      errorBuilder:
+          (BuildContext context, Object exception, StackTrace? stackTrace) {
+        return Image.asset("assets/images/empty_image.png");
+      },
+    );
+  }
+}
+
+ImageProvider getFinishImage() {
+  DestinationController destinationController =
+      Get.find<DestinationController>();
+  if (destinationController.photos.isNotEmpty) {
+    return FileImage(destinationController.photos[0]);
+  } else {
+    return const AssetImage('assets/images/empty_image.png');
+  }
+}
+
+ImageProvider getReceiptImage() {
+  DestinationController destinationController =
+      Get.find<DestinationController>();
+  if (destinationController.photos.isNotEmpty) {
+    return FileImage(destinationController.photos[0]);
+  } else {
+    return const AssetImage('assets/images/money.png');
+  }
+}
 
 class CameraPage extends StatelessWidget {
-  Destination? destination;
-  CameraPage({Key? key, this.destination}) : super(key: key);
-  DestinationController destinationController = Get.find<DestinationController>();
+  bool? manulaCheckin = false;
+  bool? buyPointPhoto = false;
+  Destination destination;
+  Destination? dbDest;
+  String? initImage;
+  CameraPage(
+      {Key? key,
+      required this.destination,
+      this.dbDest,
+      this.manulaCheckin,
+      this.buyPointPhoto,
+      this.initImage})
+      : super(key: key);
+  DestinationController destinationController =
+      Get.find<DestinationController>();
   IndexController indexController = Get.find<IndexController>();
 
   var settingGoal = false.obs;
 
   Timer? timer;
 
-  ImageProvider getFinishImage(){
-    if(destinationController.photos.isNotEmpty){
-      return FileImage(destinationController.photos[0]);
-    }
-    else{
-      return const AssetImage('assets/images/empty_image.png');
-    }
-  }
-
   Widget getAction(BuildContext context) {
-    if(destinationController.is_at_goal.value && destinationController.is_in_rog.value){
+    //print("----cccheckin is ---  ${dbDest?.checkedin} ----");
+    if (manulaCheckin == true) {
       return Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              ElevatedButton(
-                onPressed: (){
-                  if(settingGoal.value ==false){
-                    destinationController.openCamera(context);
-                  }
-                }, 
-                child: Text("take_photo of the clock".tr)
-              ),
-              Obx(() => 
-              destinationController.photos.isNotEmpty ?
-                settingGoal.value == false ?
-                  ElevatedButton(
-                    style: ElevatedButton.styleFrom(
-                      backgroundColor: Colors.red
-                    ),
-                    onPressed: () async {
-                      settingGoal.value = true;
-                      try{
-                        int userId = indexController.currentUser[0]["user"]["id"];
-                        //print("--- Pressed -----");
-                        String _team = indexController.currentUser[0]["user"]['team_name'];
-                        //print("--- _team : ${_team}-----");
-                        String _event_code = indexController.currentUser[0]["user"]["event_code"];
-                        //print("--- _event_code : ${_event_code}-----");
-                        String _token = indexController.currentUser[0]["token"];
-                        //print("--- _token : ${_token}-----");
-                        DateTime now = DateTime.now();
-                        String formattedDate = DateFormat('yyyy-MM-dd HH:mm:ss').format(now);
-                        
-                        await ExternalService().makeGoal(userId, _token, _team, destinationController.photos[0].path, formattedDate, _event_code).then((value){
-                          print("---called ext api ${value['status']} ------");
-                          if(value['status'] == 'OK'){
-                            Get.back();
-                            destinationController.skip_gps = false;
-                            Get.snackbar("目標が保存されました", "目標が正常に追加されました");
-                            destinationController.resetRogaining();
-                          }
-                          else{
-                            print("---- status ${value['status']} ---- ");
-                            Get.snackbar("目標が追加されていません", "please_try_again");
-                          }
-                        });
-                      }
-                      on Exception catch(_){
-                        settingGoal.value = false;
-                      }
-                      finally{
-                        settingGoal.value = false;
-                      }
-                    }, 
-                    child:Text("finish_goal".tr)
-                  )
-                :
-                Container(
-                  child: const Center(
-                    child: CircularProgressIndicator(),
-                  ),
-                ) 
-              :
-              Container()
-              )
-            ],
-          );
+        mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          ElevatedButton(
+              onPressed: () {
+                destinationController.openCamera(context, destination);
+              },
+              child: const Text("撮影")),
+          Obx(() => destinationController.photos.isNotEmpty
+              ? ElevatedButton(
+                  style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
+                  onPressed: () async {
+                    await destinationController.makeCheckin(destination, true,
+                        destinationController.photos[0].path);
+                    Get.back();
+                    destinationController.rogainingCounted.value = true;
+                    destinationController.skipGps = false;
+                    destinationController.isPhotoShoot.value = false;
+                    Get.snackbar("チェックインしました。",
+                        "${destination.sub_loc_id} : ${destination.name}");
+                  },
+                  child: const Text("チェックイン"))
+              : Container())
+        ],
+      );
     }
-    else{
-      return Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              Obx(() => 
-                ElevatedButton(
-                onPressed: (){
-                  destinationController.openCamera(context);
-                }, 
-                child: destinationController.photos.isNotEmpty ? const Text("再撮影") : const Text("撮影")
-              )
-              ),
-              Obx(() => 
-              destinationController.photos.isNotEmpty ?
-              ElevatedButton(
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: Colors.red
-                ),
-                onPressed: (){
-                  print("##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
-                  destinationController.makeCheckin(indexController.currentDestinationFeature[0], true, destinationController.photos[0].path);
-                  Get.back();
-                  destinationController.rogaining_counted.value = true;
-                  destinationController.skip_gps = false;
-                  destinationController.is_photo_shoot.value = false;
-                  Get.snackbar("チェックインした", "正常にチェックインしました");
 
-                  // ExternalService().makeGoal(user_id, _token, _team, destinationController.photos[0].path, formattedDate, _event_code).then((value){
-                  //   print("---called ext api ${value['status']} ------");
-                  //   if(value['status'] == 'OK'){
-                  //     Get.back();
-                  //     destinationController.skip_gps = false;
-                  //     Get.snackbar("Checked in", "Checked in successfuly");
-                  //   }
-                  //   else{
-                  //     print("---- status ${value['status']} ---- ");
-                  //     Get.snackbar("Checkin not added", "please_try_again");
-                  //   }
-                  // });
-                }, 
-                child: const Text("チェックイン")
-              ):
-              Container()
-              )
-            ],
-          );
+    if (destinationController.isAtGoal.value &&
+        destinationController.isInRog.value &&
+        destination.cp == -1) {
+      //goal
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          ElevatedButton(
+              onPressed: () {
+                if (settingGoal.value == false) {
+                  destinationController.openCamera(context, destination);
+                }
+              },
+              child: Text("take_photo of the clock".tr)),
+          Obx(() => destinationController.photos.isNotEmpty
+              ? settingGoal.value == false
+                  ? ElevatedButton(
+                      style:
+                          ElevatedButton.styleFrom(backgroundColor: Colors.red),
+                      onPressed: () async {
+                        // print(
+                        //     "----- user isss ${indexController.currentUser[0]} -----");
+
+                        settingGoal.value = true;
+                        try {
+                          int userId =
+                              indexController.currentUser[0]["user"]["id"];
+                          //print("--- Pressed -----");
+                          String team = indexController.currentUser[0]["user"]
+                              ['team_name'];
+                          //print("--- _team : ${_team}-----");
+                          String eventCode = indexController.currentUser[0]
+                              ["user"]["event_code"];
+                          //print("--- _event_code : ${_event_code}-----");
+                          String token =
+                              indexController.currentUser[0]["token"];
+                          //print("--- _token : ${_token}-----");
+                          DateTime now = DateTime.now();
+                          String formattedDate =
+                              DateFormat('yyyy-MM-dd HH:mm:ss').format(now);
+
+                          await ExternalService()
+                              .makeGoal(
+                                  userId,
+                                  token,
+                                  team,
+                                  destinationController.photos[0].path,
+                                  formattedDate,
+                                  eventCode)
+                              .then((value) {
+                            // print(
+                            //     "---called ext api ${value['status']} ------");
+                            if (value['status'] == 'OK') {
+                              Get.back();
+                              destinationController.skipGps = false;
+                              Get.snackbar("目標が保存されました", "目標が正常に追加されました");
+                              destinationController.resetRogaining(
+                                  isgoal: true);
+                            } else {
+                              //print("---- status ${value['status']} ---- ");
+                              Get.snackbar("目標が追加されていません", "please_try_again");
+                            }
+                          });
+                        } on Exception catch (_) {
+                          settingGoal.value = false;
+                        } finally {
+                          settingGoal.value = false;
+                        }
+                      },
+                      child: Text("finish_goal".tr))
+                  : const Center(
+                      child: CircularProgressIndicator(),
+                    )
+              : Container())
+        ],
+      );
+    } else if (destinationController.isInRog.value &&
+        dbDest?.checkedin != null &&
+        destination.cp != -1 &&
+        dbDest?.checkedin == true) {
+      //make buypoint image
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          Obx(() => ElevatedButton(
+              onPressed: () {
+                destinationController.openCamera(context, destination);
+              },
+              child: destinationController.photos.isNotEmpty
+                  ? const Text("再撮影")
+                  : const Text("撮影"))),
+          Obx(() => destinationController.photos.isNotEmpty
+              ? ElevatedButton(
+                  style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
+                  onPressed: () async {
+                    // print(
+                    //     "##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
+                    await destinationController.makeBuyPoint(
+                        destination, destinationController.photos[0].path);
+                    Get.back();
+                    destinationController.rogainingCounted.value = true;
+                    destinationController.skipGps = false;
+                    destinationController.isPhotoShoot.value = false;
+                    Get.snackbar("お買い物加点を行いました。",
+                        "${destination.sub_loc_id} : ${destination.name}");
+                  },
+                  child: const Text("レシートの写真を撮る"))
+              : Container())
+        ],
+      );
+    } else {
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          Obx(() => ElevatedButton(
+              onPressed: () {
+                destinationController.openCamera(context, destination);
+              },
+              child: destinationController.photos.isNotEmpty
+                  ? const Text("再撮影")
+                  : const Text("撮影"))),
+          Obx(() => destinationController.photos.isNotEmpty
+              ? ElevatedButton(
+                  style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
+                  onPressed: () async {
+                    // print(
+                    //     "##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
+                    await destinationController.makeCheckin(
+                        indexController.currentDestinationFeature[0],
+                        true,
+                        destinationController.photos[0].path);
+                    Get.back();
+                    destinationController.rogainingCounted.value = true;
+                    destinationController.skipGps = false;
+                    destinationController.isPhotoShoot.value = false;
+                    Get.snackbar(
+                        "チェックインしました",
+                        indexController.currentDestinationFeature[0].name ??
+                            "");
+                  },
+                  child: const Text("チェックイン"))
+              : Container())
+        ],
+      );
     }
   }
 
@@ -151,31 +288,136 @@ class CameraPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if(destinationController.is_in_rog.value){
+    //print("---- photos ${destination.photos} ----");
+    if (buyPointPhoto == true) {
+      //print("--- buy point camera ${destination.toString()}");
+      return BuyPointCamera(destination: destination);
+    } else if (destinationController.isInRog.value) {
+      //print("-----tags camera page----- ${destination.tags}");
+      //print("--- in normal camera ${destination.toString()}");
       return Scaffold(
-      appBar: 
-      destinationController.is_in_rog.value && destinationController.rogaining_counted.value == true ?
-      AppBar(
-        title: destination!.cp == -1 ? 
-          Text("finishing_rogaining".tr)
-        :
-          Text("cp_pls_take_photo".tr)
-        ,
-        leading: IconButton(
-          icon: Text("cancel".tr),
-          onPressed: (){
-            Navigator.of(context).pop();
-            destinationController.skip_10s = true;
-              timer = Timer.periodic(const Duration(seconds: 10), (Timer t){
-                destinationController.skip_10s = false;
-              });
-          },
+        appBar: destinationController.isInRog.value &&
+                destinationController.rogainingCounted.value == true
+            ? AppBar(
+                automaticallyImplyLeading: false,
+                title: destination.cp == -1
+                    ? Text("finishing_rogaining".tr)
+                    : Text("${destination.sub_loc_id} : ${destination.name}"),
+                leading: IconButton(
+                  icon: Text("cancel".tr),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                    destinationController.skip_10s = true;
+                    timer =
+                        Timer.periodic(const Duration(seconds: 10), (Timer t) {
+                      destinationController.skip_10s = false;
+                    });
+                  },
+                ),
+                centerTitle: true,
+              )
+            : AppBar(
+                automaticallyImplyLeading: false,
+                title: Text("${destination.sub_loc_id} : ${destination.name}"),
+              ),
+        body: SingleChildScrollView(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Center(
+                  child: Obx(
+                    () => Container(
+                      width: MediaQuery.of(context).size.width,
+                      height: 370,
+                      decoration: BoxDecoration(
+                          image: DecorationImage(
+                              image: destinationController.photos.isEmpty
+                                  ? getDisplayImage(destination).image
+                                  : getFinishImage(),
+                              fit: BoxFit.cover)),
+                    ),
+                  ),
+                ),
+              ),
+              Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Text(getTagText(
+                    false,
+                    destination.tags,
+                  ))
+                  // child: Obx(() => destinationController.photos.isEmpty == true
+                  //     ? const Text("撮影してチェックインしてください。")
+                  //     : const Text("チェックインをタップしてください。")),
+                  ),
+              getAction(context),
+            ],
+          ),
+        ),
+      );
+    } else {
+      return StartRogaining();
+    }
+  }
+}
+
+class StartRogaining extends StatelessWidget {
+  StartRogaining({Key? key}) : super(key: key);
+
+  DestinationController destinationController =
+      Get.find<DestinationController>();
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: Text(
+          "Not started yet".tr,
+        ),
+      ),
+      body: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text("You have not started rogaining yet.".tr,
+                style: const TextStyle(fontSize: 24)),
+            const SizedBox(
+              height: 40.0,
+            ),
+            ElevatedButton(
+              onPressed: () {
+                Get.back();
+                destinationController.skipGps = false;
+              },
+              child: const Text("Back"),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class BuyPointCamera extends StatelessWidget {
+  BuyPointCamera({Key? key, required this.destination}) : super(key: key);
+
+  Destination destination;
+
+  DestinationController destinationController =
+      Get.find<DestinationController>();
+
+  @override
+  Widget build(BuildContext context) {
+    //print("in camera purchase 1 ${destinationController.isInRog.value}");
+
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: Text(
+          "${destination.sub_loc_id} : ${destination.name}",
         ),
-        centerTitle: true,
-      )
-      :
-      AppBar(
-        title: const Text("チェックポイント"),
       ),
       body: Column(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -183,95 +425,93 @@ class CameraPage extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.all(8.0),
             child: Center(
-              child: Obx(() => 
-                Container(
-                width: MediaQuery.of(context).size.width,
-                height: 370,
-                decoration:  BoxDecoration(
-                  image:
-                    DecorationImage(
-                    image: getFinishImage(),
-                    fit: BoxFit.cover
-                  )
+              child: Obx(
+                () => Container(
+                  width: MediaQuery.of(context).size.width,
+                  height: 370,
+                  decoration: BoxDecoration(
+                      image: DecorationImage(
+                          image: getReceiptImage(), fit: BoxFit.cover)),
                 ),
               ),
-              ),
             ),
           ),
-          getAction(context),
-                  ],
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Text(getTagText(true, destination.tags)),
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Obx(() => Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      ElevatedButton(
+                          onPressed: () {
+                            // print(
+                            //     "in camera purchase 2 ${destinationController.isInRog.value}");
+                            destinationController.openCamera(
+                                context, destination);
+                          },
+                          child: destinationController.photos.isNotEmpty
+                              ? const Text("再撮影")
+                              : const Text("撮影")),
+                      const SizedBox(
+                        width: 10,
+                      ),
+                      ElevatedButton(
+                          onPressed: () async {
+                            await destinationController
+                                .cancelBuyPoint(destination);
+                            Navigator.of(Get.context!).pop();
+                            //Get.back();
+                            destinationController.rogainingCounted.value = true;
+                            destinationController.skipGps = false;
+                            destinationController.isPhotoShoot.value = false;
+                          },
+                          child: const Text("買い物なし"))
+                    ],
+                  )),
+              Obx(() => destinationController.photos.isNotEmpty
+                  ? Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        // ElevatedButton(
+                        //     style: ElevatedButton.styleFrom(
+                        //         backgroundColor: Colors.red),
+                        //     onPressed: () async {},
+                        //     child: const Text("買物なし")),
+                        // const SizedBox(
+                        //   width: 10,
+                        // ),
+                        ElevatedButton(
+                            style: ElevatedButton.styleFrom(
+                                backgroundColor: Colors.red),
+                            onPressed: () async {
+                              // print(
+                              //     "in camera purchase 3 ${destinationController.isInRog.value}");
+                              await destinationController.makeBuyPoint(
+                                  destination,
+                                  destinationController.photos[0].path);
+                              Get.back();
+                              // print(
+                              //     "in camera purchase 4 ${destinationController.isInRog.value}");
+                              destinationController.rogainingCounted.value =
+                                  true;
+                              destinationController.skipGps = false;
+                              destinationController.isPhotoShoot.value = false;
+                              Get.snackbar("お買い物加点を行いました",
+                                  "${destination.sub_loc_id} : ${destination.name}");
+                            },
+                            child: const Text("完了"))
+                      ],
+                    )
+                  : Container())
+            ],
+          ),
+        ],
       ),
     );
-    }
-    else {
-      return StartRogaining();
-    }
-
-  }
-}
-
-class StartRogaining extends StatelessWidget {
-  StartRogaining({Key? key}) : super(key: key);
-
-  DestinationController destinationController = Get.find<DestinationController>();
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("Not started yet".tr,),
-      ),
-      body: Container(
-      child: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text("You have not started rogaining yet.".tr, style: const TextStyle(fontSize: 24)),
-            const SizedBox(height: 40.0,),
-            ElevatedButton(
-              onPressed: (){
-                Get.back();
-                destinationController.skip_gps = false;
-              },
-              child: const Text("Back"),
-            ),
-          ],
-        ),
-      ),
-    ),
-    );
-  }
-}
-
-class NotAtGoal extends StatelessWidget {
-  NotAtGoal({Key? key}) : super(key: key);
-
-  DestinationController destinationController = Get.find<DestinationController>();
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text("Not reached the goal yet".tr,),
-      ),
-      body: Container(
-      child: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text("You have not reached the goal yet.".tr, style: const TextStyle(fontSize: 24)),
-            const SizedBox(height: 40.0,),
-            ElevatedButton(
-              onPressed: (){
-                Get.back();
-                destinationController.skip_gps = false;
-              },
-              child: const Text("Back"),
-            ),
-          ],
-        ),
-      ),
-    ),
-    );
   }
 }

lib/pages/changepassword/change_password_page.dart

@@ -13,150 +13,170 @@ class ChangePasswordPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomInset: false,
+        resizeToAvoidBottomInset: false,
         backgroundColor: Colors.white,
         appBar: AppBar(
           elevation: 0,
-
           backgroundColor: Colors.white,
-          leading:
-          IconButton( onPressed: (){
-            Navigator.pop(context);
-          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+          leading: IconButton(
+              onPressed: () {
+                Navigator.pop(context);
+              },
+              icon: const Icon(
+                Icons.arrow_back_ios,
+                size: 20,
+                color: Colors.black,
+              )),
         ),
-      body: 
-      SizedBox(
-        width: double.infinity,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Column(
-              children: [
-                Column(
-                  children: [
-                    Container(
-                      child: Text("change_password".tr, style: const TextStyle(fontSize: 24.0),),
-                    ),
-                    const SizedBox(height: 30,),
-                  ],
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 40
-                  ),
-                  child: Column(
+        body: SizedBox(
+          width: double.infinity,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Column(
+                children: [
+                  Column(
                     children: [
-                      makeInput(label: "old_password".tr, controller: oldPasswordController),
-                      makeInput(label: "new_password".tr, controller: newPasswordController, obsureText: true),
+                      Text(
+                        "change_password".tr,
+                        style: const TextStyle(fontSize: 24.0),
+                      ),
+                      const SizedBox(
+                        height: 30,
+                      ),
                     ],
                   ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 40),
-                  child: Container(
-                    padding: const EdgeInsets.only(top: 3,left: 3),
-                    decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(40),
-                    ),
-                    child: Obx((() => 
-                      indexController.is_loading == true ? MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        
-                      },
-                      color: Colors.grey[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: const CircularProgressIndicator(),
-                    ) :
-                      Column(
-                        children: [
-                        MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        if(oldPasswordController.text.isEmpty || newPasswordController.text.isEmpty){
-                          Get.snackbar(
-                            "no_values".tr,
-                            "values_required".tr,
-                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
-                            snackPosition: SnackPosition.TOP,
-                            duration: const Duration(milliseconds: 800),
-                            backgroundColor: Colors.yellow,
-                            //icon:Image(image:AssetImage("assets/images/dora.png"))
-                          );
-                          return;
-                        }
-                        indexController.is_loading.value = true;
-                        indexController.changePassword(oldPasswordController.text, newPasswordController.text, context);
-                        //indexController.login(oldPasswordController.text, newPasswordController.text, context);
-                      },
-                      color: Colors.indigoAccent[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: const Text("ログイン",style: TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
-                    const SizedBox(height: 10.0,),
-                    
-                        ],
-                      ) 
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 40),
+                    child: Column(
+                      children: [
+                        makeInput(
+                            label: "old_password".tr,
+                            controller: oldPasswordController),
+                        makeInput(
+                            label: "new_password".tr,
+                            controller: newPasswordController,
+                            obsureText: true),
+                      ],
                     ),
                   ),
-                )
-                ),
-                const SizedBox(height: 20,),
-                const Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                   
-                  ],
-                )
-              ],
-
-            ),
-          ],
-        ),
-      )
-    );
+                  Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
+                      child: Container(
+                        padding: const EdgeInsets.only(top: 3, left: 3),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(40),
+                        ),
+                        child: Obx(
+                          (() => indexController.isLoading.value == true
+                              ? MaterialButton(
+                                  minWidth: double.infinity,
+                                  height: 60,
+                                  onPressed: () {},
+                                  color: Colors.grey[400],
+                                  shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(40)),
+                                  child: const CircularProgressIndicator(),
+                                )
+                              : Column(
+                                  children: [
+                                    MaterialButton(
+                                      minWidth: double.infinity,
+                                      height: 60,
+                                      onPressed: () {
+                                        if (oldPasswordController
+                                                .text.isEmpty ||
+                                            newPasswordController
+                                                .text.isEmpty) {
+                                          Get.snackbar(
+                                            "no_values".tr,
+                                            "values_required".tr,
+                                            icon: const Icon(
+                                                Icons.assistant_photo_outlined,
+                                                size: 40.0,
+                                                color: Colors.blue),
+                                            snackPosition: SnackPosition.TOP,
+                                            duration: const Duration(
+                                                milliseconds: 800),
+                                            backgroundColor: Colors.yellow,
+                                            //icon:Image(image:AssetImage("assets/images/dora.png"))
+                                          );
+                                          return;
+                                        }
+                                        indexController.isLoading.value = true;
+                                        indexController.changePassword(
+                                            oldPasswordController.text,
+                                            newPasswordController.text,
+                                            context);
+                                        //indexController.login(oldPasswordController.text, newPasswordController.text, context);
+                                      },
+                                      color: Colors.indigoAccent[400],
+                                      shape: RoundedRectangleBorder(
+                                          borderRadius:
+                                              BorderRadius.circular(40)),
+                                      child: const Text(
+                                        "ログイン",
+                                        style: TextStyle(
+                                            fontWeight: FontWeight.w600,
+                                            fontSize: 16,
+                                            color: Colors.white70),
+                                      ),
+                                    ),
+                                    const SizedBox(
+                                      height: 10.0,
+                                    ),
+                                  ],
+                                )),
+                        ),
+                      )),
+                  const SizedBox(
+                    height: 20,
+                  ),
+                  const Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [],
+                  )
+                ],
+              ),
+            ],
+          ),
+        ));
   }
 
-  Widget makeInput({label, required TextEditingController controller, obsureText = false}){
-  return Column(
-    crossAxisAlignment: CrossAxisAlignment.start,
-    children: [
-      Text(label,style:const TextStyle(
-        fontSize: 15,
-        fontWeight: FontWeight.w400,
-        color: Colors.black87
-      ),),
-      const SizedBox(height: 5,),
-      TextField(
-        controller: controller,
-        obscureText: obsureText,
-        decoration: InputDecoration(
-          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
-          enabledBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: (Colors.grey[400])!,
+  Widget makeInput(
+      {label, required TextEditingController controller, obsureText = false}) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: const TextStyle(
+              fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+        ),
+        const SizedBox(
+          height: 5,
+        ),
+        TextField(
+          controller: controller,
+          obscureText: obsureText,
+          decoration: InputDecoration(
+            contentPadding:
+                const EdgeInsets.symmetric(vertical: 0, horizontal: 10),
+            enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(
+                color: (Colors.grey[400])!,
+              ),
+            ),
+            border: OutlineInputBorder(
+              borderSide: BorderSide(color: (Colors.grey[400])!),
             ),
           ),
-          border: OutlineInputBorder(
-            borderSide: BorderSide(color: (Colors.grey[400])!
-          ),
         ),
-      ),
-      ),
-      const SizedBox(height: 30.0,)
-    ],
-  );
-}
-
-
+        const SizedBox(
+          height: 30.0,
+        )
+      ],
+    );
+  }
 }

lib/pages/destination/destination_binding.dart

@@ -1,9 +1,11 @@
 import 'package:get/get.dart';
+import 'package:rogapp/main.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 
 class DestinationBinding extends Bindings {
   @override
   void dependencies() {
     Get.put<DestinationController>(DestinationController());
+    //restoreGame();
   }
 }

lib/pages/destination/destination_page.dart

@@ -1,208 +1,252 @@
+// import 'package:flutter/material.dart';
+// import 'package:geolocator/geolocator.dart';
+// import 'package:get/get.dart';
+// import 'package:latlong2/latlong.dart';
+// import 'package:rogapp/pages/destination/destination_controller.dart';
+// import 'package:rogapp/pages/destination_map/destination_map_page.dart';
+// import 'package:rogapp/pages/drawer/drawer_page.dart';
+// import 'package:rogapp/pages/index/index_controller.dart';
+// import 'package:rogapp/routes/app_pages.dart';
+// import 'package:rogapp/widgets/destination_widget.dart';
 
-import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:rogapp/pages/destination_map/destination_map_page.dart';
-import 'package:rogapp/pages/drawer/drawer_page.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/widgets/destination_widget.dart';
+// class XDestnationPage extends StatelessWidget {
+//   XDestnationPage({Key? key}) : super(key: key);
 
-class DestnationPage extends StatelessWidget {
-  DestnationPage({Key? key}) : super(key: key);
+//   final DestinationController destinationController =
+//       Get.find<DestinationController>();
 
-  final DestinationController destinationController = Get.find<DestinationController>();
+//   final IndexController indexController = Get.find<IndexController>();
 
-  final IndexController indexController = Get.find<IndexController>();
+//   final List<int> _items = List<int>.generate(50, (int index) => index);
 
-  final List<int> _items = List<int>.generate(50, (int index) => index);
+//   Future<void> showCurrentPosition() async {
+//     LocationPermission permission = await Geolocator.checkPermission();
+//     if (permission != LocationPermission.whileInUse ||
+//         permission != LocationPermission.always) {
+//       permission = await Geolocator.requestPermission();
+//     }
+//     Position position = await Geolocator.getCurrentPosition(
+//         desiredAccuracy: LocationAccuracy.high,
+//         forceAndroidLocationManager: true);
+//     indexController.rogMapController
+//         .move(LatLng(position.latitude, position.longitude), 14);
+//   }
 
-  Future<void> showCurrentPosition() async {
-    LocationPermission permission = await Geolocator.checkPermission();
-    if (permission != LocationPermission.whileInUse ||
-        permission != LocationPermission.always) {
-      permission = await Geolocator.requestPermission();
-    }
-    Position position = await Geolocator.getCurrentPosition(
-        desiredAccuracy: LocationAccuracy.high, forceAndroidLocationManager: true);
-    indexController.rogMapController.move(LatLng(position.latitude, position.longitude), 14);
-  }
+//   Image getImage(int index) {
+//     if (destinationController.destinations[index].photos == null ||
+//         destinationController.destinations[index].photos == "") {
+//       return const Image(image: AssetImage('assets/images/empty_image.png'));
+//     } else {
+//       return Image(
+//           image:
+//               NetworkImage(destinationController.destinations[index].photos!));
+//     }
+//   }
 
-  Image getImage(int index){
-    if(destinationController.destinations[index].photos == null || destinationController.destinations[index].photos == ""){
-      return const Image(image: AssetImage('assets/images/empty_image.png'));
-    }
-    else{
-      return Image(image: NetworkImage(destinationController.destinations[index].photos!));
-    }
-  }
+//   Widget getRoutingImage(int route) {
+//     switch (route) {
+//       case 0:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_9_man.png'),
+//           width: 35.0,
+//         );
+//       case 1:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_8_car.png'),
+//           width: 35.0,
+//         );
+//       case 2:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_10_train.png'),
+//           width: 35.0,
+//         );
+//       default:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_9_man.png'),
+//           width: 35.0,
+//         );
+//     }
+//   }
 
-  Widget getRoutingImage(int route){
-    switch (route) {
-      case 0:
-        return const Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
-      case 1:
-        return const Image(image: AssetImage('assets/images/p4_8_car.png'), width: 35.0,);
-      case 2:
-        return const Image(image: AssetImage('assets/images/p4_10_train.png'), width: 35.0,);
-      default:
-        return const Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
-    }
-  }
-
-@override
-  Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        indexController.switchPage(AppPages.INITIAL);
-        return false;
-      },
-      child: Scaffold(
-        drawer: DrawerPage(),
-        bottomNavigationBar: BottomAppBar(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.only(left:13.0),
-                child: InkWell(
-                  child: Obx((() => getRoutingImage(destinationController.travelMode.value))),
-                  onTap: (){
-                    Get.bottomSheet(
-                        Obx(() => 
-                          ListView(
-                            children: [
-                              Padding(
-                                padding: const EdgeInsets.only(top:30.0, bottom: 30),
-                                child: Center(child: Text("select_travel_mode".tr, style: const TextStyle(fontSize: 22.0, color:Colors.red, fontWeight:FontWeight.bold),),),
-                              ),
-                              ListTile(
-                                selected: destinationController.travelMode == 0 ? true : false,
-                                selectedTileColor: Colors.amber.shade200,
-                                leading: const Image(image: AssetImage('assets/images/p4_9_man.png'),),
-                                title: Text("walking".tr),
-                                onTap:(){
-                                  destinationController.travelMode.value = 0;
-                                  destinationController.PopulateDestinations();
-                                  Get.back();
-                                },
-                                ),
-                              ListTile(
-                                selected: destinationController.travelMode == 1 ? true : false,
-                                selectedTileColor: Colors.amber.shade200,
-                                leading: const Image(image: AssetImage('assets/images/p4_8_car.png'),),
-                                title: Text("driving".tr),
-                                onTap:(){
-                                  destinationController.travelMode.value = 1;
-                                  destinationController.PopulateDestinations();
-                                  Get.back();
-                                },
-                                ),
-                              // ListTile(
-                              //   selected: destinationController.travelMode == 2 ? true : false,
-                              //   selectedTileColor: Colors.amber.shade200,
-                              //   leading: Image(image: AssetImage('assets/images/p4_10_train.png'),),
-                              //   title: Text("transit".tr),
-                              //   onTap:(){
-                              //     destinationController.travelMode.value = 2;
-                              //     destinationController.PopulateDestinations();
-                              //     Get.back();
-                              //   },
-                              //   ),
-                            ],
-                            
-                          ),
-                        ),
-                        isScrollControlled:false,
-                        backgroundColor: Colors.white,
-                      ); 
-                      //destinationController.PopulateDestinations();
-                    }
-                  ),
-              )
-              ,
-                IconButton(
-                  icon: const Icon(Icons.travel_explore, size: 35,), 
-                    onPressed: (){
-                      indexController.switchPage(AppPages.INITIAL);
-                    }
-                ),
-            ],
-          ),
-        ),
-        floatingActionButton: FloatingActionButton(
-            onPressed: (){
-              //print("######");
-              indexController.toggleDestinationMode();
-            },
-            tooltip: 'Increment',
-            child: Obx(() => 
-              indexController.desination_mode == 1 ?
-              const Image(image: AssetImage('assets/images/list2.png'))
-              :
-              const Image(image: AssetImage('assets/images/map.png'))
-            ),
-            elevation: 4.0,
-          ),
-          floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
-        appBar:AppBar(
-          automaticallyImplyLeading: true,
-          title: Text("app_title".tr),
-          actions: [
-            InkWell(
-              onTap: (){
-                Get.toNamed(AppPages.CAMERA_PAGE);
-              },
-              child: destinationController.is_in_rog == true ?
-                Image.asset("assets/images/basic-walking.gif",height: 10.0,)
-              :
-                destinationController.is_at_goal == true ?
-                  IconButton(
-                    onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, 
-                    icon: const Icon(Icons.assistant_photo),
-                  )
-                :
-                  IconButton(
-                    onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, 
-                    icon: const Icon(Icons.accessibility),
-                  ),
-            ),
-            // Obx(() => 
-            //   Text(indexController.connectionStatusName.value)
-            // ),
-            Obx(() => 
-             ToggleButtons(
-                  disabledColor: Colors.grey.shade200,
-                  selectedColor: Colors.red,
-                children: const <Widget>[
-                  Icon(Icons.explore, size: 35.0,
-                )],
-                onPressed: (int index) {
-                  destinationController.is_gps_selected.value = !destinationController.is_gps_selected.value;
-                  if(destinationController.is_gps_selected.value){
-                    destinationController.chekcs = 0;
-                    destinationController.skip_gps = false;
-                    //destinationController.resetRogaining();
-                  }
-                },
-                isSelected: [destinationController.is_gps_selected.value],
-              ),
-            ),
-            // IconButton(onPressed: (){
-            //   showCurrentPosition();
-            // },
-            // icon: Icon(Icons.location_on_outlined))
-          ],
-        ),
-        body: Obx(() => 
-          indexController.desination_mode.value == 0 ?
-                  DestinationWidget():
-                  DestinationMapPage()
-        )
-      ),
-    );
-    
-  }
-}
+//   @override
+//   Widget build(BuildContext context) {
+//     return WillPopScope(
+//       onWillPop: () async {
+//         indexController.switchPage(AppPages.INITIAL);
+//         return false;
+//       },
+//       child: Scaffold(
+//           drawer: DrawerPage(),
+//           bottomNavigationBar: BottomAppBar(
+//             child: Row(
+//               mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//               children: <Widget>[
+//                 Padding(
+//                   padding: const EdgeInsets.only(left: 13.0),
+//                   child: InkWell(
+//                       child: Obx((() => getRoutingImage(
+//                           destinationController.travelMode.value))),
+//                       onTap: () {
+//                         Get.bottomSheet(
+//                           Obx(
+//                             () => ListView(
+//                               children: [
+//                                 Padding(
+//                                   padding: const EdgeInsets.only(
+//                                       top: 30.0, bottom: 30),
+//                                   child: Center(
+//                                     child: Text(
+//                                       "select_travel_mode".tr,
+//                                       style: const TextStyle(
+//                                           fontSize: 22.0,
+//                                           color: Colors.red,
+//                                           fontWeight: FontWeight.bold),
+//                                     ),
+//                                   ),
+//                                 ),
+//                                 ListTile(
+//                                   selected:
+//                                       destinationController.travelMode.value ==
+//                                               0
+//                                           ? true
+//                                           : false,
+//                                   selectedTileColor: Colors.amber.shade200,
+//                                   leading: const Image(
+//                                     image: AssetImage(
+//                                         'assets/images/p4_9_man.png'),
+//                                   ),
+//                                   title: Text("walking".tr),
+//                                   onTap: () {
+//                                     destinationController.travelMode.value = 0;
+//                                     destinationController
+//                                         .populateDestinations();
+//                                     Get.back();
+//                                   },
+//                                 ),
+//                                 ListTile(
+//                                   selected:
+//                                       destinationController.travelMode.value ==
+//                                               1
+//                                           ? true
+//                                           : false,
+//                                   selectedTileColor: Colors.amber.shade200,
+//                                   leading: const Image(
+//                                     image: AssetImage(
+//                                         'assets/images/p4_8_car.png'),
+//                                   ),
+//                                   title: Text("driving".tr),
+//                                   onTap: () {
+//                                     destinationController.travelMode.value = 1;
+//                                     destinationController
+//                                         .populateDestinations();
+//                                     Get.back();
+//                                   },
+//                                 ),
+//                                 // ListTile(
+//                                 //   selected: destinationController.travelMode == 2 ? true : false,
+//                                 //   selectedTileColor: Colors.amber.shade200,
+//                                 //   leading: Image(image: AssetImage('assets/images/p4_10_train.png'),),
+//                                 //   title: Text("transit".tr),
+//                                 //   onTap:(){
+//                                 //     destinationController.travelMode.value = 2;
+//                                 //     destinationController.PopulateDestinations();
+//                                 //     Get.back();
+//                                 //   },
+//                                 //   ),
+//                               ],
+//                             ),
+//                           ),
+//                           isScrollControlled: false,
+//                           backgroundColor: Colors.white,
+//                         );
+//                         //destinationController.PopulateDestinations();
+//                       }),
+//                 ),
+//                 IconButton(
+//                     icon: const Icon(
+//                       Icons.travel_explore,
+//                       size: 35,
+//                     ),
+//                     onPressed: () {
+//                       indexController.switchPage(AppPages.INITIAL);
+//                     }),
+//               ],
+//             ),
+//           ),
+//           floatingActionButton: FloatingActionButton(
+//             onPressed: () {
+//               //print("######");
+//               indexController.toggleDestinationMode();
+//             },
+//             tooltip: 'Increment',
+//             elevation: 4.0,
+//             child: Obx(() => indexController.desinationMode.value == 1
+//                 ? const Image(image: AssetImage('assets/images/list2.png'))
+//                 : const Image(image: AssetImage('assets/images/map.png'))),
+//           ),
+//           floatingActionButtonLocation:
+//               FloatingActionButtonLocation.centerDocked,
+//           appBar: AppBar(
+//             automaticallyImplyLeading: true,
+//             title: Text("app_title".tr),
+//             actions: [
+//               InkWell(
+//                 onTap: () {
+//                   Get.toNamed(AppPages.CAMERA_PAGE);
+//                 },
+//                 child: destinationController.isInRog.value == true
+//                     ? Image.asset(
+//                         "assets/images/basic-walking.gif",
+//                         height: 10.0,
+//                       )
+//                     : destinationController.isAtGoal.value == true
+//                         ? IconButton(
+//                             onPressed: () {
+//                               Get.toNamed(AppPages.CAMERA_PAGE);
+//                             },
+//                             icon: const Icon(Icons.assistant_photo),
+//                           )
+//                         : IconButton(
+//                             onPressed: () {
+//                               Get.toNamed(AppPages.CAMERA_PAGE);
+//                             },
+//                             icon: const Icon(Icons.accessibility),
+//                           ),
+//               ),
+//               // Obx(() =>
+//               //   Text(indexController.connectionStatusName.value)
+//               // ),
+//               Obx(
+//                 () => ToggleButtons(
+//                   disabledColor: Colors.grey.shade200,
+//                   selectedColor: Colors.red,
+//                   onPressed: (int index) {
+//                     destinationController.isGpsSelected.value =
+//                         !destinationController.isGpsSelected.value;
+//                     if (destinationController.isGpsSelected.value) {
+//                       destinationController.chekcs = 0;
+//                       destinationController.skipGps = false;
+//                       //destinationController.resetRogaining();
+//                     }
+//                   },
+//                   isSelected: [destinationController.isGpsSelected.value],
+//                   children: const <Widget>[
+//                     Icon(
+//                       Icons.explore,
+//                       size: 35.0,
+//                     )
+//                   ],
+//                 ),
+//               ),
+//               // IconButton(onPressed: (){
+//               //   showCurrentPosition();
+//               // },
+//               // icon: Icon(Icons.location_on_outlined))
+//             ],
+//           ),
+//           body: Obx(() => indexController.desinationMode.value == 0
+//               ? DestinationWidget()
+//               : DestinationMapPage())),
+//     );
+//   }
+// }

lib/pages/destination_map/destination_map_page.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_map/plugin_api.dart';
+import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
 import 'package:flutter_map_marker_popup/flutter_map_marker_popup.dart';
 import 'package:flutter_polyline_points/flutter_polyline_points.dart';
@@ -25,7 +25,7 @@ class DestinationMapPage extends StatelessWidget {
   final PopupController _popupLayerController = PopupController();
 
   List<LatLng>? getPoints() {
-    print("##### --- route point ${indexController.routePoints.length}");
+    //print("##### --- route point ${indexController.routePoints.length}");
     List<LatLng> pts = [];
     for (PointLatLng p in indexController.routePoints) {
       LatLng l = LatLng(p.latitude, p.longitude);
@@ -39,65 +39,64 @@ class DestinationMapPage extends StatelessWidget {
     int index = -1;
     for (int i = 0; i < destinationController.destinations.length; i++) {
       Destination d = destinationController.destinations[i];
-      print("^^^^ $d ^^^^");
+      //print("^^^^ $d ^^^^");
       Marker m = Marker(
           point: LatLng(d.lat!, d.lon!),
-          anchorPos: AnchorPos.align(AnchorAlign.center),
-          builder: (cts) {
-            return InkWell(
-              onTap: () {
-                print("-- Destination is --- ${d.name} ------");
-                if (indexController.currentDestinationFeature.isNotEmpty) {
-                  indexController.currentDestinationFeature.clear();
-                }
-                indexController.currentDestinationFeature.add(d);
-                //indexController.getAction();
+          alignment: Alignment.center,
+          child: InkWell(
+            onTap: () {
+              //print("-- Destination is --- ${d.name} ------");
+              if (indexController.currentDestinationFeature.isNotEmpty) {
+                indexController.currentDestinationFeature.clear();
+              }
+              indexController.currentDestinationFeature.add(d);
+              //indexController.getAction();
 
-                showModalBottomSheet(
-                    context: Get.context!,
-                    isScrollControlled: true,
-                    constraints: BoxConstraints.loose(
-                        Size(Get.width, Get.height * 0.75)),
-                    builder: ((context) => BottomSheetNew())).whenComplete(() {
-                  print("---- set skip gps to false -----");
-                  destinationController.skip_gps = false;
-                });
-              },
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Container(
-                    width: 20,
-                    height: 20,
-                    decoration: BoxDecoration(
-                      color: Colors.red,
-                      shape: BoxShape.circle,
-                      border: Border.all(
-                        color: Colors.white,
-                        width:
-                            d.checkin_radious != null ? d.checkin_radious! : 1,
-                      ),
-                    ),
-                    child: Center(
-                      child: Text(
-                        (i + 1).toString(),
-                        style: const TextStyle(color: Colors.white),
-                      ),
+              showModalBottomSheet(
+                  context: Get.context!,
+                  isScrollControlled: true,
+                  constraints:
+                      BoxConstraints.loose(Size(Get.width, Get.height * 0.85)),
+                  builder: ((context) => BottomSheetNew(
+                        destination: d,
+                      ))).whenComplete(() {
+                //print("---- set skip gps to false -----");
+                destinationController.skipGps = false;
+              });
+            },
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 20,
+                  height: 20,
+                  decoration: BoxDecoration(
+                    color: Colors.red,
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: Colors.white,
+                      width: d.checkin_radious != null ? d.checkin_radious! : 1,
                     ),
                   ),
-                  Container(
-                      color: Colors.yellow,
-                      child: Text(
-                        TextUtils.getDisplayText(d),
-                        style: const TextStyle(
-                            fontSize: 15.0,
-                            fontWeight: FontWeight.bold,
-                            overflow: TextOverflow.visible),
-                      )),
-                ],
-              ),
-            );
-          });
+                  child: Center(
+                    child: Text(
+                      (i + 1).toString(),
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                  ),
+                ),
+                Container(
+                    color: Colors.yellow,
+                    child: Text(
+                      TextUtils.getDisplayText(d),
+                      style: const TextStyle(
+                          fontSize: 15.0,
+                          fontWeight: FontWeight.bold,
+                          overflow: TextOverflow.visible),
+                    )),
+              ],
+            ),
+          ));
 
       pts.add(m);
     }
@@ -118,18 +117,18 @@ class DestinationMapPage extends StatelessWidget {
             Padding(
               padding: const EdgeInsets.only(top: 0.0),
               //child: TravelMap(),
-              child: TravelMap(),
+              child: travelMap(),
             ),
           ],
         )));
   }
 
-  FlutterMap TravelMap() {
+  FlutterMap travelMap() {
     return FlutterMap(
       mapController: indexController.rogMapController,
       options: MapOptions(
         onMapReady: () {
-          indexController.is_rog_mapcontroller_loaded.value = true;
+          indexController.isRogMapcontrollerLoaded.value = true;
           subscription = indexController.rogMapController.mapEventStream
               .listen((MapEvent mapEvent) {
             if (mapEvent is MapEventMoveStart) {}
@@ -156,7 +155,7 @@ class DestinationMapPage extends StatelessWidget {
         interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
       ),
       children: [
-        const BaseLayer(),
+        //const BaseLayer(),
         Obx(
           () => indexController.routePointLenght > 0
               ? PolylineLayer(

lib/pages/drawer/drawer_page.dart

@@ -1,18 +1,18 @@
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 import 'package:rogapp/services/auth_service.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class DrawerPage extends StatelessWidget {
-  DrawerPage({ Key? key }) : super(key: key);
+  DrawerPage({Key? key}) : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
 
   void _launchURL(url) async {
-    if (!await launch(url)) throw 'Could not launch $url';
+    if (!await launchUrl(url)) throw 'Could not launch $url';
   }
 
   @override
@@ -27,71 +27,125 @@ class DrawerPage extends StatelessWidget {
             Container(
               height: 100,
               color: Colors.amber,
-              child: Obx(() => 
-                Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: 
-                  indexController.currentUser.isEmpty ?
-                    Flexible(child: Text("drawer_title".tr, style: const TextStyle(color: Colors.black, fontSize: 20),))
-                    :
-                    Text(indexController.currentUser[0]['user']['email'], style: const TextStyle(color: Colors.black, fontSize: 20),),
-                ),
-              )
-              ),
+              child: Obx(() => Center(
+                    child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: indexController.currentUser.isEmpty
+                          ? Flexible(
+                              child: Text(
+                              "drawer_title".tr,
+                              style: const TextStyle(
+                                  color: Colors.black, fontSize: 20),
+                            ))
+                          : Text(
+                              indexController.currentUser[0]['user']['email'],
+                              style: const TextStyle(
+                                  color: Colors.black, fontSize: 20),
+                            ),
+                    ),
+                  )),
             ),
-            Obx(() => 
-              indexController.currentUser.isEmpty ?
-              ListTile(
-                leading: const Icon(Icons.login),
-                title: Text("login".tr),
-                onTap: (){
-                  Get.toNamed(AppPages.LOGIN);
-                },
-              ) : 
-              ListTile(
-                leading: const Icon(Icons.login),
-                title: Text("logout".tr),
-                onTap: (){
-                  indexController.logout();
-                  Get.toNamed(AppPages.LOGIN);
-                },
-              )
-            ),
-            indexController.currentUser.isNotEmpty ?
-            ListTile(
-              leading: const Icon(Icons.password),
-              title: Text("change_password".tr),
-              onTap: (){
-                Get.toNamed(AppPages.CHANGE_PASSWORD);
-              },
-            ) : 
-            const SizedBox(width: 0, height: 0,),
-            indexController.currentUser.isEmpty ?
-            ListTile(
-              leading: const Icon(Icons.person),
-              title: Text("sign_up".tr),
-              onTap: (){
-                Get.toNamed(AppPages.REGISTER);
-              },
-            ) : 
-            const SizedBox(width: 0, height: 0,),
-            indexController.currentUser.isNotEmpty ?
-            ListTile(
-              leading: const Icon(Icons.delete_forever),
-              title: Text("delete_account".tr),
-              onTap: (){
-                String _token = indexController.currentUser[0]['token'];
-                AuthService.deleteUser(_token).then((value){
-                  if(value.isNotEmpty){
-                    indexController.logout();
-                    Get.toNamed(AppPages.TRAVEL);
-                    Get.snackbar("accounted_deleted".tr, "account_deleted_message".tr);
-                  }
-                });
-              },
-            ) : 
-            const SizedBox(width: 0, height: 0,),
+            Obx(() => indexController.currentUser.isEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.login),
+                    title: Text("login".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.LOGIN);
+                    },
+                  )
+                : ListTile(
+                    leading: const Icon(Icons.login),
+                    title: Text("logout".tr),
+                    onTap: () {
+                      indexController.logout();
+                      Get.toNamed(AppPages.LOGIN);
+                    },
+                  )),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.password),
+                    title: Text("change_password".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.CHANGE_PASSWORD);
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.person),
+                    title: Text("sign_up".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.REGISTER);
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.password),
+                    title: const Text("リセット"),
+                    onTap: () {
+                      Get.defaultDialog(
+                        title: "よろしいですか、リセットしますか?",
+                        middleText: "これにより、すべてのゲーム データが削除され、すべての状態が削除されます",
+                        textConfirm: "確認する",
+                        textCancel: "キャンセルする",
+                        onCancel: () => Get.back(),
+                        onConfirm: () {
+                          DestinationController destinationController =
+                              Get.find<DestinationController>();
+                          destinationController.resetRogaining();
+                          destinationController.deleteDBDestinations();
+                          Get.back();
+                        },
+                      );
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.delete_forever),
+                    title: Text("delete_account".tr),
+                    onTap: () {
+                      String token = indexController.currentUser[0]['token'];
+                      AuthService.deleteUser(token).then((value) {
+                        if (value.isNotEmpty) {
+                          indexController.logout();
+                          Get.toNamed(AppPages.TRAVEL);
+                          Get.snackbar("accounted_deleted".tr,
+                              "account_deleted_message".tr);
+                        }
+                      });
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.delete_forever),
+                    title: Text("ユーザーデータを削除する".tr),
+                    onTap: () {
+                      String token = indexController.currentUser[0]['token'];
+                      AuthService.deleteUser(token).then((value) {
+                        Get.snackbar("ユーザーデータを削除する",
+                            "データを削除するためにユーザーの同意が設定されています アプリとサーバーでユーザーデータが削除されました");
+                      });
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
             // ListTile(
             //   leading: const Icon(Icons.person),
             //   title: Text("profile".tr),
@@ -107,19 +161,22 @@ class DrawerPage extends StatelessWidget {
             //   title: Text("point_rank".tr),
             //   onTap: (){},
             // ),
-            indexController.currentUser.isNotEmpty ?
-            ListTile(
-              leading: const Icon(Icons.featured_video),
-              title: Text("rog_web".tr),
-              onTap: (){
-                _launchURL("https://www.gifuai.net/?page_id=17397");
-              },
-            ) : 
-            const SizedBox(width: 0, height: 0,),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.featured_video),
+                    title: Text("rog_web".tr),
+                    onTap: () {
+                      _launchURL("https://www.gifuai.net/?page_id=17397");
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
             ListTile(
               leading: const Icon(Icons.privacy_tip),
               title: Text("privacy".tr),
-              onTap: (){
+              onTap: () {
                 _launchURL("https://rogaining.sumasen.net/api/privacy/");
               },
             )

lib/pages/gps/gps_page.dart

@@ -0,0 +1,152 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:get/get.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:rogapp/model/gps_data.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
+import 'package:rogapp/pages/index/index_controller.dart';
+import 'package:rogapp/utils/database_gps.dart';
+import 'package:rogapp/widgets/base_layer_widget.dart';
+
+class GpsPage extends StatefulWidget {
+  const GpsPage({super.key});
+
+  @override
+  State<GpsPage> createState() => _GpsPageState();
+}
+
+class _GpsPageState extends State<GpsPage> {
+  var gpsData = [].obs;
+  MapController? mapController;
+  StreamSubscription? subscription;
+  final IndexController indexController = Get.find<IndexController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
+
+  @override
+  void initState() {
+    super.initState();
+    loadGpsData();
+  }
+
+  void loadGpsData() async {
+    final team_name = indexController.currentUser[0]["user"]['team_name'];
+    final event_code = indexController.currentUser[0]["user"]["event_code"];
+    GpsDatabaseHelper db = GpsDatabaseHelper.instance;
+    var data = await db.getGPSData(team_name, event_code);
+    gpsData.value = data;
+
+    //print("--- gps data ${data} ----");
+  }
+
+  Widget getMarkerShape(GpsData i) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        InkWell(
+          onTap: () {},
+          child: Container(
+              height: 22,
+              width: 22,
+              decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  color: Colors.transparent,
+                  border: Border.all(
+                      color:
+                          i.is_checkin == 0 ? Colors.blueAccent : Colors.green,
+                      width: i.is_checkin == 0 ? 0.4 : 2,
+                      style: BorderStyle.solid)),
+              child: const Stack(
+                alignment: Alignment.center,
+                children: [
+                  Icon(
+                    Icons.circle,
+                    size: 6.0,
+                  ),
+                ],
+              )),
+        ),
+        Container(
+            color: Colors.transparent,
+            child: i.is_checkin == 1
+                ? Text(
+                    DateTime.fromMicrosecondsSinceEpoch(i.created_at)
+                            .hour
+                            .toString() +
+                        ":" +
+                        DateTime.fromMicrosecondsSinceEpoch(i.created_at)
+                            .minute
+                            .toString(),
+                    // ":" +
+                    // DateTime.fromMicrosecondsSinceEpoch(i.created_at)
+                    //     .second
+                    //     .toString(),
+                    style: const TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.bold,
+                      color: Colors.black,
+                    ))
+                : Container()),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("GPS way points"),
+      ),
+      body: Container(
+          child: Obx(
+        () => FlutterMap(
+          mapController: mapController,
+          options: MapOptions(
+            maxZoom: 18.4,
+            onMapReady: () {},
+            //center: LatLng(37.15319600454702, 139.58765950528198),
+            bounds: indexController.currentBound.isNotEmpty
+                ? indexController.currentBound[0]
+                : LatLngBounds.fromPoints([
+                    LatLng(35.03999881162295, 136.40587119778962),
+                    LatLng(36.642756778706904, 137.95226720406063)
+                  ]),
+            zoom: 1,
+            interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
+            onPositionChanged: (MapPosition pos, bool hasGesture) {
+              if (hasGesture) {
+                indexController.currentBound = [pos.bounds!];
+              }
+            },
+            onTap: (tapPos, cord) {}, // Hide popup when the map is tapped.
+          ),
+          children: [
+            //const BaseLayer(),
+            MarkerLayer(
+              markers: gpsData.map((i) {
+                return Marker(
+                    width: 30.0, // Fixed width
+                    height: 30.0, // Fixed height
+                    point: LatLng(i.lat, i.lon),
+                    child: getMarkerShape(i),
+                    alignment: Alignment.center);
+              }).toList(),
+            ),
+            // MarkerLayer(
+            //   markers: gpsData.map((i) {
+            //     return Marker(
+            //         alignment: Alignment.center,
+            //         height: 32.0,
+            //         width: 120.0,
+            //         point: LatLng(i.lat, i.lon),
+            //         child: getMarkerShape(i));
+            //   }).toList(),
+            // )
+          ],
+        ),
+      )),
+    );
+  }
+}

lib/pages/history/history_page.dart

@@ -18,7 +18,7 @@ class _HistoryPageState extends State<HistoryPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("History"),
+        title: const Text("通過履歴"),
       ),
       body: SingleChildScrollView(
         child: Column(
@@ -32,37 +32,45 @@ class _HistoryPageState extends State<HistoryPage> {
                       return Center(
                         child: Text(
                           '${snapshot.error} occurred',
-                          style: TextStyle(fontSize: 18),
+                          style: const TextStyle(fontSize: 18),
                         ),
                       );
                     } else if (snapshot.hasData) {
                       final dests = snapshot.data;
-                      if (dests!.length > 0) {
-                        print("----- history -----");
-                        return Container(
+                      if (dests!.isNotEmpty) {
+                        //print("----- history -----");
+                        return SizedBox(
                             width: MediaQuery.of(context).size.width,
-                            height: 150,
-                            child: Expanded(
-                              child: ListView.builder(
-                                  itemCount: dests.length,
-                                  itemBuilder: (ctx, index) {
-                                    return ListTile(
-                                      title: Text(dests[index].name ?? ""),
+                            height: MediaQuery.of(context).size.height,
+                            child: ListView.builder(
+                                itemCount: dests.length,
+                                itemBuilder: (ctx, index) {
+                                  //print("--- photo ${dests[index].checkin_image!} ----");
+                                  return Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: CustomWidget(
+                                      title: dests[index].name!,
                                       subtitle:
-                                          Text(dests[index].address ?? ""),
-                                      leading: dests[0].photos != null
-                                          ? Container(width: 100, height: 100, child: Image.file(File(dests[0].photos!)))
-                                          : Container(),
-                                    );
-                                  }),
-                            ));
+                                          "${dests[index].sub_loc_id} : ${dests[index].name}",
+                                      image1: dests[index].checkin_image != null
+                                          ? Image.file(
+                                              File(dests[index].checkin_image!))
+                                          : null,
+                                      image2:
+                                          dests[index].buypoint_image != null
+                                              ? Image.file(File(
+                                                  dests[index].buypoint_image!))
+                                              : null,
+                                    ),
+                                  );
+                                }));
                       } else {
-                        return Center(child: Text("No checkin yet"));
+                        return const Center(child: Text("No checkin yet"));
                       }
                     }
                   } else if (snapshot.connectionState ==
                       ConnectionState.waiting) {
-                    return Center(
+                    return const Center(
                       child: CircularProgressIndicator(),
                     );
                   }
@@ -74,3 +82,69 @@ class _HistoryPageState extends State<HistoryPage> {
     );
   }
 }
+
+class CustomWidget extends StatelessWidget {
+  final Image? image1;
+  final Image? image2;
+  final String title;
+  final String subtitle;
+
+  const CustomWidget({
+    super.key,
+    this.image1,
+    this.image2,
+    required this.title,
+    required this.subtitle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SizedBox(
+          width:
+              104, // 50 (width of each image) + 2 (space between images) + 2*1 (padding on both sides)
+          child: Row(
+            children: [
+              if (image1 != null)
+                SizedBox(
+                  width: 50,
+                  height: 100,
+                  child: image1,
+                ),
+              if (image1 != null && image2 != null) const SizedBox(width: 2),
+              if (image2 != null)
+                SizedBox(
+                  width: 50,
+                  height: 100,
+                  child: image2,
+                ),
+            ],
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                title,
+                style:
+                    const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                maxLines:
+                    null, // Allows the text to wrap onto an unlimited number of lines
+              ),
+              Text(
+                subtitle,
+                style: const TextStyle(fontSize: 16),
+                maxLines:
+                    null, // Allows the text to wrap onto an unlimited number of lines
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/pages/index/index_binding.dart

@@ -1,10 +1,13 @@
-
 import 'package:get/get.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
+import 'package:rogapp/utils/location_controller.dart';
 
 class IndexBinding extends Bindings {
   @override
   void dependencies() {
     Get.put<IndexController>(IndexController());
+    Get.put<LocationController>(LocationController());
+    Get.put<DestinationController>(DestinationController());
   }
 }

lib/pages/index/index_controller.dart

@@ -4,27 +4,21 @@ import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map/plugin_api.dart';
 import 'package:flutter_polyline_points/flutter_polyline_points.dart';
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:rogapp/model/destination.dart';
-import 'package:rogapp/pages/destination/destination_binding.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:rogapp/pages/destination/destination_page.dart';
 import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/services/action_service.dart';
 import 'package:rogapp/services/auth_service.dart';
-import 'package:rogapp/services/cat_service.dart';
 import 'package:rogapp/services/location_service.dart';
-import 'package:rogapp/services/perfecture_service.dart';
 import 'package:rogapp/utils/database_helper.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class IndexController extends GetxController {
-  List<GeoJsonFeatureCollection> locations = <GeoJsonFeatureCollection>[].obs;
-  List<GeoJsonFeature> currentFeature = <GeoJsonFeature>[].obs;
+  List<GeoJSONFeatureCollection> locations = <GeoJSONFeatureCollection>[].obs;
+  List<GeoJSONFeature> currentFeature = <GeoJSONFeature>[].obs;
   List<Destination> currentDestinationFeature = <Destination>[].obs;
   List<dynamic> perfectures = <dynamic>[].obs;
   List<LatLngBounds> currentBound = <LatLngBounds>[].obs;
@@ -40,169 +34,143 @@ class IndexController extends GetxController {
   List<PointLatLng> routePoints = <PointLatLng>[].obs;
   var routePointLenght = 0.obs;
 
-  double current_lat = 0.0, current_lon = 0.0;
+  double currentLat = 0.0, currentLon = 0.0;
 
-  var is_loading = false.obs;
+  var isLoading = false.obs;
 
-  var is_mapController_loaded = false.obs;
-  var is_rog_mapcontroller_loaded = false.obs;
+  var isRogMapcontrollerLoaded = false.obs;
 
-  var is_custom_area_selected = false.obs;
+  var isCustomAreaSelected = false.obs;
 
   MapController mapController = MapController();
   MapController rogMapController = MapController();
 
   String? userToken;
 
+  // mode = 0 is map mode, mode = 1 list mode
   var mode = 0.obs;
 
   // master mode, rog or selection
-  var rog_mode = 1.obs;
+  var rogMode = 1.obs;
 
-  var desination_mode = 1.obs;
+  var desinationMode = 1.obs;
 
   bool showPopup = true;
 
-
   String dropdownValue = "9";
   String subDropdownValue = "-1";
   String areaDropdownValue = "-1";
   String cateogory = "-all-";
 
-  late Worker _ever;
-
   ConnectivityResult connectionStatus = ConnectivityResult.none;
   var connectionStatusName = "".obs;
   final Connectivity _connectivity = Connectivity();
   late StreamSubscription<ConnectivityResult> _connectivitySubscription;
 
-  void toggleMode(){
-    if(mode.value==0){
+  void toggleMode() {
+    if (mode.value == 0) {
       mode += 1;
-    }
-    else{
+    } else {
       mode -= 1;
     }
   }
 
-  void toggleDestinationMode(){
-    if(desination_mode.value==0){
-      desination_mode.value += 1;
-    }
-    else{
-      desination_mode.value -= 1;
+  void toggleDestinationMode() {
+    if (desinationMode.value == 0) {
+      desinationMode.value += 1;
+    } else {
+      desinationMode.value -= 1;
     }
   }
 
-  void switchPage(String page){
-    //print("######## ${currentUser[0]["user"]["id"]}");
+  void switchPage(String page) {
+    ////print("######## ${currentUser[0]["user"]["id"]}");
     switch (page) {
-      case AppPages.INITIAL :{
-        rog_mode.value = 0;
-        print("-- rog mode is ctrl is ${rog_mode.value}");
-        Get.toNamed(page);
-      }
+      case AppPages.INDEX:
+        {
+          rogMode.value = 0;
+          //print("-- rog mode is ctrl is ${rog_mode.value}");
+          Get.toNamed(page);
+        }
         break;
-      case AppPages.TRAVEL : {
-        rog_mode.value = 1;
-        //Get.back();
-        Get.off(DestnationPage(), binding: DestinationBinding());
-
-      }
-      break;
-      case AppPages.LOGIN :{
-        rog_mode.value = 2;
-        Get.toNamed(page);
-      }
-      break;
-      default:{
-        rog_mode.value = 0;
-        Get.toNamed(AppPages.INITIAL);
-      }
+      case AppPages.TRAVEL:
+        {
+          rogMode.value = 1;
+          //Get.back();
+          //Get.off(DestnationPage(), binding: DestinationBinding());
+        }
+        break;
+      case AppPages.LOGIN:
+        {
+          rogMode.value = 2;
+          Get.toNamed(page);
+        }
+        break;
+      default:
+        {
+          rogMode.value = 1;
+          Get.toNamed(AppPages.INDEX);
+        }
     }
   }
 
-
   @override
   void onInit() {
-    _ever = ever(rog_mode, (_) => print("$_ has been changed (ever)"));
-
-    if(perfectures.isEmpty){
-      PerfectureService.loadPerfectures().then((value){
-        perfectures.add(value);
-        loadAreaFor("9");
-        
-        //loadSubPerfFor("9");
-      });
-    } 
-
-    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
+    // _connectivitySubscription =
+    //     _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
     super.onInit();
-}
+  }
 
-@override
-void onClose() {
+  @override
+  void onClose() {
     _connectivitySubscription.cancel();
     super.onClose();
-}
+  }
 
-Future<void> _updateConnectionStatus(ConnectivityResult result) async {
-      connectionStatus = result;
-      connectionStatusName.value = result.name;
-}
+  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
+    connectionStatus = result;
+    connectionStatusName.value = result.name;
+  }
 
-Future<void> initConnectivity() async {
-    late ConnectivityResult result;
-    // Platform messages may fail, so we use a try/catch PlatformException.
-    try {
-      result = await _connectivity.checkConnectivity();
-    } on PlatformException catch (e) {
-      print('Couldn\'t check connectivity status --- $e');
-      return;
+  Future<void> initConnectivity() async {
+    // late ConnectivityResult result;
+    // // Platform messages may fail, so we use a try/catch PlatformException.
+    // try {
+    //   //result = await _connectivity.checkConnectivity();
+    // } on PlatformException catch (_) {
+    //   //print('Couldn\'t check connectivity status --- $e');
+    //   return;
+    // }
+
+    // return _updateConnectionStatus(result);
+  }
+
+  LatLngBounds boundsFromLatLngList(List<LatLng> list) {
+    double? x0, x1, y0, y1;
+    for (LatLng latLng in list) {
+      if (x0 == null || x1 == null || y0 == null || y1 == null) {
+        x0 = x1 = latLng.latitude;
+        y0 = y1 = latLng.longitude;
+      } else {
+        if (latLng.latitude > x1) x1 = latLng.latitude;
+        if (latLng.latitude < x0) x0 = latLng.latitude;
+        if (latLng.longitude > y1) y1 = latLng.longitude;
+        if (latLng.longitude < y0) y0 = latLng.longitude;
+      }
     }
 
-    return _updateConnectionStatus(result);
+    return LatLngBounds(LatLng(x1!, y1!), LatLng(x0!, y0!));
   }
 
-LatLngBounds boundsFromLatLngList(List<LatLng> list) {
-  double? x0, x1, y0, y1;
-  for (LatLng latLng in list) {
-    if (x0 == null || x1 == null || y0 == null || y1 == null) {
-      x0 = x1 = latLng.latitude;
-      y0 = y1 = latLng.longitude;
-    } else {
-      if (latLng.latitude > x1) x1 = latLng.latitude;
-      if (latLng.latitude < x0) x0 = latLng.latitude;
-      if (latLng.longitude > y1) y1 = latLng.longitude;
-      if (latLng.longitude < y0) y0 = latLng.longitude;
-    }
-  }
-
-  return LatLngBounds(LatLng(x1!, y1!), LatLng(x0!, y0!));
-}
-
-
-List<LatLng> getLocationsList(){
-  List<LatLng> locs = [];
-  for(int i=0; i<= locations[0].collection.length - 1; i++){
-    GeoJsonMultiPoint p = locations[0].collection[i].geometry as GeoJsonMultiPoint;
-
-    LatLng latLng = LatLng(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude);
-    locs.add(latLng);  
-  }
-  return locs;
-}
-
-
   void login(String email, String password, BuildContext context) {
     AuthService.login(email, password).then((value) {
-      print("------- logged in user details ######## $value ###### --------");
+      //print("------- logged in user details ######## $value ###### --------");
       if (value.isNotEmpty) {
         Navigator.pop(context);
-        print("--------- user details login ----- $value");
+        //print("--------- user details login ----- $value");
         changeUser(value);
       } else {
-        is_loading.value = false;
+        isLoading.value = false;
         Get.snackbar(
           "Failed",
           "User login failed, please try again.",
@@ -216,502 +184,174 @@ List<LatLng> getLocationsList(){
     });
   }
 
-   void changePassword(String oldpassword, String newpassword, BuildContext context){
-      String _token = currentUser[0]['token'];
-      //print("------- change password ######## ${currentUser[0]['token']} ###### --------");
-      AuthService.changePassword(oldpassword, newpassword, _token).then((value){
-      print("------- change password ######## $value ###### --------");
-       if(value.isNotEmpty){
-        is_loading.value = false;
+  void changePassword(
+      String oldpassword, String newpassword, BuildContext context) {
+    String token = currentUser[0]['token'];
+    ////print("------- change password ######## ${currentUser[0]['token']} ###### --------");
+    AuthService.changePassword(oldpassword, newpassword, token).then((value) {
+      ////print("------- change password ######## $value ###### --------");
+      if (value.isNotEmpty) {
+        isLoading.value = false;
         Navigator.pop(context);
-        if(rog_mode.value == 1){
+        if (rogMode.value == 1) {
           switchPage(AppPages.TRAVEL);
+        } else {
+          switchPage(AppPages.INDEX);
         }
-        else{
-          switchPage(AppPages.INITIAL);
-        }
-       }else{
+      } else {
         Get.snackbar(
-              'failed'.tr,
-               'password_change_failed_please_try_again'.tr,
-               icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
-               duration: const Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
-       }
+          'failed'.tr,
+          'password_change_failed_please_try_again'.tr,
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
+      }
+    });
+    isLoading.value = false;
+  }
 
-     });
-     is_loading.value = false;
-   }
-
-   void logout() async{
+  void logout() async {
     locations.clear();
     DatabaseHelper db = DatabaseHelper.instance;
-    db.deleteAllDestinations().then((value){
-      DestinationController destinationController = Get.find<DestinationController>();
-      destinationController.PopulateDestinations();
+    db.deleteAllDestinations().then((value) {
+      DestinationController destinationController =
+          Get.find<DestinationController>();
+      destinationController.populateDestinations();
     });
     currentUser.clear();
     cats.clear();
-   }
+  }
 
-   void register(String email, String password, BuildContext context){
-     AuthService.register(email, password).then((value){
-       if(value.isNotEmpty){
+  void register(String email, String password, BuildContext context) {
+    AuthService.register(email, password).then((value) {
+      if (value.isNotEmpty) {
         currentUser.clear();
         currentUser.add(value);
-        is_loading.value = false;
+        isLoading.value = false;
         Navigator.pop(context);
-        loadUserDetails();
-        Get.toNamed(AppPages.INITIAL);
-       }else{
-         is_loading.value = false;
-         Get.snackbar(
-              'failed'.tr,
-              'user_registration_failed_please_try_again'.tr,
-               icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
-               duration: const Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
-       }
-     });
-   }
-
-   void makeAction(BuildContext context){
-    int userId = currentUser[0]["user"]["id"] as int;
-    int locationId = currentFeature[0].properties!["location_id"] as int;
-     bool wanttogo = currentAction[0][0]["wanttogo"];
-     bool like = currentAction[0][0]["like"];
-     bool checkin = currentAction[0][0]["checkin"];
-     if(userId > 0){
-       ActionService.makeAction(userId, locationId, wanttogo, like, checkin).then((value){
-       });
-     }
-     
-   }
-
-  String getCatText(){
-    String _cat = 'all'.tr;
-    if(currentUser.isNotEmpty){
-      Map<String, dynamic> _urs = currentUser[0];
-      print('-- is_rogaining :-- ${_urs['user']['is_rogaining']} ------');
-      if(_urs['user']['is_rogaining'] == true){
-        _cat = 'rogaining'.tr;
+        Get.toNamed(AppPages.INDEX);
+      } else {
+        isLoading.value = false;
+        Get.snackbar(
+          'failed'.tr,
+          'user_registration_failed_please_try_again'.tr,
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
       }
-      else {
-        _cat = 'sight_seeing'.tr;
-      }
-    }
-    return _cat;
-  }
-
-  void loadCatsv2(){
-     dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController.bounds!;
-     if(bounds.southWest != null && bounds.northEast != null ){
-       CatService.loadCats(bounds.southWest!.latitude, bounds.southWest!.longitude, bounds.northWest.latitude, bounds.northWest.longitude, bounds.northEast!.latitude, bounds.northEast!.longitude, bounds.southEast.latitude, bounds.southEast.longitude).then((value) {
-          cats.clear();
-          cats.add(initVal);
-          for(dynamic cat in value!){
-            if(cat['category'] != null){
-              cats.add(cat!);
-            }
-          }
-       });
-     }
-   }
-
-   void loadCatForCity(String city){
-    dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController.bounds!;
-     if(bounds.southWest != null && bounds.northEast != null ){
-       CatService.loadCatByCity(city).then((value) {
-          cats.clear();
-          cats.add(initVal);
-          for(dynamic cat in value!){
-            if(cat['category'] != null){
-              cats.add(cat!);
-            }
-          }
-       });
-     }
-   }
-
-
-
-   void refreshLocationForCat(){
-    loadLocationsBound();
-    //  if(subDropdownValue == "-1"){
-    //    LocationService.loadLocationsFor(dropdownValue, currentCat[0]).then((value){
-    //       locations.clear();
-    //       locations.add(value!);
-    //       is_loading.value = false;
-    //    });
-    //    print("loading main------");
-    //  } 
-    //  else{
-    //    LocationService.loadLocationsSubFor(subDropdownValue, currentCat[0]).then((value){
-    //       locations.clear();
-    //       locations.add(value!);
-    //       is_loading.value = false;
-    //    });
-    //    print("loading sub------");
-    //  }
-   }
-
-  void loadAreaFor(String perf){
-    areas.clear();
-    dynamic initVal = {'id':'-1', 'area_nm':'----'};
-    PerfectureService.loadGifuAreas(perf).then((value){
-      value!.add(initVal);
-      areas.add(value);
     });
   }
 
-  void loadUserDetails(){
-    if(currentUser.isNotEmpty){
-      int userId = currentUser[0]["user"]["id"] as int;
-      AuthService.UserDetails(userId).then((value){
-        print("--------- user details ----- $value");
-        if(value != null && value.isNotEmpty){
-          bool paid = value[0]["paid"] as bool;
-          if(paid){
-            loadCustomAreas();
-          }
-        }
-      });
-    }
-  }
-
   void saveToDevice(String val) async {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
     await prefs.setString("user_token", val);
   }
 
   void changeUser(Map<String, dynamic> value, {bool replace = true}) {
-    print("---- change user to ${value} -----");
+    //print("---- change user to $value -----");
     currentUser.clear();
     currentUser.add(value);
-    if(replace){
+    if (replace) {
       saveToDevice(currentUser[0]["token"]);
     }
-    is_loading.value = false;
-    loadUserDetails();
+    isLoading.value = false;
     loadLocationsBound();
-    cats.clear();
-    if (currentFeature.isNotEmpty) {
-      getAction();
-    }
-
     if (currentUser.isNotEmpty) {
-      rog_mode.value = 0;
+      rogMode.value = 0;
     } else {
-      rog_mode.value = 1;
+      rogMode.value = 1;
     }
-
-    if (rog_mode.value == 1) {
-      switchPage(AppPages.TRAVEL);
-    } else {
-      switchPage(AppPages.INITIAL);
-    }
-    //Get.toNamed(AppPages.INITIAL);
+    //print('--- c rog mode --- ${rogMode.value}');
+    Get.toNamed(AppPages.INDEX);
   }
 
   loadUserDetailsForToken(String token) async {
-      AuthService.userForToken(token).then((value) {
-        print("----token val-- $value  ------");
-        if(value![0]["user"].isEmpty){
-          Get.toNamed(AppPages.LOGIN);
-          return;
-        }
-        changeUser(value[0], replace:false);
-        print("--------- user details ----- $value");
-        // if (value != null && value.isNotEmpty) {
-        //   bool paid = value[0]["paid"] as bool;
-        //   if (paid) {
-        //     loadCustomAreas();
-        //   }
-        // }
-      });
-  }
-
-
-  void loadCustomAreas(){
-    customAreas.clear();
-    PerfectureService.loadCustomAreas().then((value){
-      print("--- loading custom areas $value");
-      customAreas.add(value);
-    });
-  }
-
-
-  void loadSubPerfFor(String perf){
-    subPerfs.clear();
-    dynamic initVal = {'id':'-1', 'adm2_ja':'----'};
-    PerfectureService.loadSubPerfectures(perf).then((value){
-      value!.add(initVal);
-      subPerfs.add(value);
-      subDropdownValue = getSubInitialVal();
-    });
-  }
-
-  String getSubInitialVal(){
-    int min = 0;
-    if(subPerfs.isNotEmpty){
-      min = int.parse(subPerfs[0][0]['id'].toString());
-      for(var sub in subPerfs[0]){
-        int x = int.parse(sub['id'].toString()); // as int;
-        if(x < min){
-          min = x;
-        }
+    AuthService.userForToken(token).then((value) {
+      ////print("----token val-- $value  ------");
+      if (value![0]["user"].isEmpty) {
+        Get.toNamed(AppPages.LOGIN);
+        return;
       }
-    }
-    return min.toString();
-  }
-
-  void loadLocationforPerf(String perf, MapController mapController) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    print(currentCat);
-    // LocationService.loadLocationsFor(perf, cat).then((value){
-    //   locations.clear();
-    //   locations.add(value!);
-    //    mapController.fitBounds(currentBound[0]);
-    // });
-    locations.clear();
-    mapController.fitBounds(currentBound[0]);
-  }
-
-  void loadLocationforSubPerf(String subperf, MapController mapController) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
-      cat = "";
-    }
-    LocationService.loadLocationsSubFor(subperf, cat).then((value){
-      locations.clear();
-      locations.add(value!);
+      changeUser(value[0], replace: false);
     });
   }
 
-  void loadCustomLocation(String customarea) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
-      cat = "";
-    }
-    print("----- $customarea");
-    LocationService.loadCustomLocations(customarea, cat).then((value){
-      locations.clear();
-      locations.add(value!);
-      List<LatLng> locs = getLocationsList();
-      LatLngBounds bounds = boundsFromLatLngList(locs);
-      mapController.fitBounds(bounds);
-      setBound(bounds);
-      Future.delayed(const Duration(microseconds: 400), () {
-        mapController.fitBounds(bounds);
-      });
-      
-    });
-  }
-
-  void loadLocationsBound(){
-    if(is_custom_area_selected.value == true){
+  void loadLocationsBound() {
+    if (isCustomAreaSelected.value == true) {
       return;
     }
     locations.clear();
     String cat = currentCat.isNotEmpty ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
+    if (currentCat.isNotEmpty && currentCat[0] == "-all-") {
       cat = "";
     }
     LatLngBounds bounds = mapController.bounds!;
     currentBound.clear();
     currentBound.add(bounds);
-    //print(currentCat);
-    if(bounds.southWest != null && bounds.northEast != null ){
-      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){
-      //print("---value length ------ ${value!.collection.length}");
-      if(value == null){
+    ////print(currentCat);
+    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) {
+      ////print("---value length ------ ${value!.collection.length}");
+      if (value == null) {
         return;
       }
-      if(value.collection.isEmpty){
-        if(showPopup == false) {
+      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(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
+          "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(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
         showPopup = false;
         //Get.showSnackbar(GetSnackBar(message: "Too many points, please zoom in",));
       }
-      if(value.collection.isNotEmpty){
-          //print("---- added---");
-          locations.add(value);
-          loadCatsv2();
-        }
-      });
-    }
-    
+      if (value.features.isNotEmpty) {
+        ////print("---- added---");
+        locations.add(value);
+      }
+    });
   }
 
-  void setBound(LatLngBounds bounds){
+  void setBound(LatLngBounds bounds) {
     currentBound.clear();
     currentBound.add(bounds);
   }
 
-  void zoomtoMainPerf(String id){
+  GeoJSONFeature? getFeatureForLatLong(double lat, double long) {
+    if (locations.isNotEmpty) {
+      GeoJSONFeature? foundFeature;
 
-    PerfectureService.getMainPerfExt(id).then((value){
-      LatLng lat1 = LatLng(value![1], value[0]);
-      LatLng lat2 = LatLng(value[3], value[2]);
-      LatLngBounds bound = LatLngBounds(lat1, lat2);
-      mapController.fitBounds(bound);
-      setBound(bound);
-    });
-    
-  }
-
-  void zoomtoSubPerf(String id){
-
-    print("zooooom");
-    
-    PerfectureService.getSubExt(id).then((value){
-      LatLng lat1 = LatLng(value![1], value[0]);
-      LatLng lat2 = LatLng(value[3], value[2]);
-      LatLngBounds bound = LatLngBounds(lat1, lat2);
-      mapController.fitBounds(bound);
-      setBound(bound);
-    });
-    
-  }
-
-
-  void populateForPerf(String perf, MapController mapController){
-    loadSubPerfFor(perf);
-    loadLocationforPerf(perf, mapController);
-    zoomtoMainPerf(perf);
-    is_loading.value = false;
-  }
-
-  void populateForSubPerf(String subperf, MapController mapController){
-    //subDropdownValue = subperf;
-    loadLocationforSubPerf(subperf, mapController);
-    zoomtoSubPerf(subperf);
-    is_loading.value = false;
-  }
-
-  void populateSubPerForArea(String area, MapController mapController){
-    loadSubPerfFor(area);
-    //loadCustomLocation("cus", mapController);
-    //zoomtoSubPerf(subperf);
-    is_loading.value = false;
-  }
-
-  
-  GeoJsonFeature? getFeatureForLatLong(double lat, double long){
-      if(locations.isNotEmpty){
-          for(GeoJsonFeature i in locations[0].collection){
-            GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
-            if(p.geoSerie!.geoPoints[0].latitude == lat && p.geoSerie!.geoPoints[0].longitude  == long){
-              return i;
-          }
+      locations[0].features.forEach((i) {
+        GeoJSONMultiPoint p = i!.geometry as GeoJSONMultiPoint;
+        if (p.coordinates[0][1] == lat && p.coordinates[0][0] == long) {
+          foundFeature = i;
         }
-      }
-      return null;
+      });
+
+      return foundFeature;
+    }
+    return null;
   }
-
-  void getAction(){
-    //print(currentUser[0]["user"]["id"]);
-    //print(currentFeature[0].properties!["location_id"]);
-    if(currentUser.isEmpty){
-      return;
-    }
-    int userId = currentUser[0]["user"]["id"] as int;
-    print("---- loc id ${currentFeature[0].properties}");
-    int locationId = currentFeature[0].properties!["location_id"] as int;
-    ActionService.userAction(userId, locationId).then((value){
-      print("------$value");
-      if(value != null && value.isNotEmpty){
-        currentAction.clear();
-        currentAction.add(value);
-        print("------${currentAction[0]}");
-      }else{
-        List<dynamic> initval = [{"user": userId, "location": locationId, "wanttogo": false, "like": false, "checkin": false}];
-        currentAction.clear();
-        currentAction.add(initval);
-      }
-    });
-  }
-
-  void makeNext(GeoJsonFeature fs){
-
-    if(rog_mode == 1){
-      DestinationController destinationController = Get.find<DestinationController>();
-    }
-    else {
-      GeoJsonFeature<GeoJsonMultiPoint> pt = fs  as GeoJsonFeature<GeoJsonMultiPoint>;
-
-    for(int i=0; i<= locations[0].collection.length - 1; i++){
-      GeoJsonMultiPoint p = locations[0].collection[i].geometry as GeoJsonMultiPoint;
-
-      if(p.geoSerie!.geoPoints[0].latitude == pt.geometry!.geoSerie!.geoPoints[0].latitude && p.geoSerie!.geoPoints[0].longitude  == pt.geometry!.geoSerie!.geoPoints[0].longitude ){
-          
-          if(currentFeature.isNotEmpty){
-            currentFeature.clear();
-          }
-          if(i >= locations[0].collection.length - 1 ){
-            currentFeature.add(locations[0].collection[0]);
-            getAction();
-          }
-          else{
-            currentFeature.add(locations[0].collection[i + 1]);
-            getAction();
-          }
-      }
-    }
-    }
-
-    
-
-  }
-
-  void makePrevious(GeoJsonFeature fs){
-
-    if(rog_mode == 1){
-      DestinationController destinationController = Get.find<DestinationController>();
-    }
-    else {
-
-          GeoJsonFeature<GeoJsonMultiPoint> pt = fs  as GeoJsonFeature<GeoJsonMultiPoint>; 
-
-      for(int i=0; i<= locations[0].collection.length - 1; i++){
-        GeoJsonMultiPoint p = locations[0].collection[i].geometry as GeoJsonMultiPoint;
-
-        if(p.geoSerie!.geoPoints[0].latitude == pt.geometry!.geoSerie!.geoPoints[0].latitude && p.geoSerie!.geoPoints[0].longitude  == pt.geometry!.geoSerie!.geoPoints[0].longitude ){
-            
-            if(currentFeature.isNotEmpty){
-              currentFeature.clear();
-            }
-            if(i == 0 ){
-              currentFeature.add(locations[0].collection[locations[0].collection.length -1]);
-              getAction();
-            }
-            else{
-              currentFeature.add(locations[0].collection[i - 1]);
-              getAction();
-            }
-        }
-      }
-    }
-  }
-
-
-
 }

lib/pages/index/index_page.dart

@@ -1,9 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:rogapp/model/destination.dart';
+import 'package:rogapp/model/gps_data.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/drawer/drawer_page.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
+import 'package:rogapp/services/DatabaseService.dart';
+import 'package:rogapp/utils/database_gps.dart';
+import 'package:rogapp/utils/database_helper.dart';
 import 'package:rogapp/widgets/list_widget.dart';
 import 'package:rogapp/widgets/map_widget.dart';
 
@@ -21,16 +26,25 @@ class IndexPage extends GetView<IndexController> {
       child: Scaffold(
         drawer: DrawerPage(),
         appBar: AppBar(
-          //  automaticallyImplyLeading: false,
-          //   leading: IconButton(
-          //   icon: Icon(Icons.arrow_back_ios),
-          //   onPressed: (){
-          //     indexController.switchPage(AppPages.TRAVEL);
-          //   },
-          // ),
-          //automaticallyImplyLeading: false,
           title: Text("add_location".tr),
           actions: [
+            // IconButton(
+            //     onPressed: () {
+            //       DatabaseService ds = DatabaseService();
+            //       ds.updateDatabase();
+            //     },
+            //     icon: const Icon(Icons.ten_k_sharp)),
+
+            IconButton(
+                onPressed: () async {
+                  // GpsDatabaseHelper db = GpsDatabaseHelper.instance;
+                  // List<GpsData> data = await db.getGPSData(
+                  //     indexController.currentUser[0]["user"]['team_name'],
+                  //     indexController.currentUser[0]["user"]["event_code"]);
+                  // print("GPS data is ${data.length}");
+                  Get.toNamed(AppPages.GPS);
+                },
+                icon: const Icon(Icons.telegram)),
             IconButton(
                 onPressed: () {
                   Get.toNamed(AppPages.HISTORY);
@@ -63,118 +77,86 @@ class IndexPage extends GetView<IndexController> {
             //CatWidget(indexController: indexController,),
           ],
         ),
-        bottomNavigationBar: BottomAppBar(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: <Widget>[
-              Padding(
-                padding:
-                    const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
-                child: InkWell(
-                    child:
-                        Obx(() => destinationController.is_gps_selected == true
-                            ? Padding(
-                                padding: const EdgeInsets.only(
-                                    right: 10.0, top: 4.0, bottom: 4.0),
-                                child: InkWell(
-                                  child: const Image(
-                                    image: AssetImage(
-                                        'assets/images/route3_off.png'),
-                                    width: 35,
-                                    height: 35,
-                                  ),
-                                  onTap: () {
-                                    //indexController.switchPage(AppPages.TRAVEL);
-                                  },
-                                ),
-                              )
-                            : Padding(
-                                padding: const EdgeInsets.only(
-                                    right: 10.0, top: 4.0, bottom: 4.0),
-                                child: InkWell(
-                                  child: const Image(
-                                    image: AssetImage(
-                                        'assets/images/route2_on.png'),
-                                    width: 35,
-                                    height: 35,
-                                  ),
-                                  onTap: () {
-                                    //indexController.switchPage(AppPages.TRAVEL);
-                                  },
-                                ),
-                              ))),
-              ),
-            ],
-          ),
-        ),
+        // bottomNavigationBar: BottomAppBar(
+        //   child: Row(
+        //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        //     children: <Widget>[
+        //       Obx(
+        //         () => destinationController.isInRog.value == true
+        //             ? IconButton(
+        //                 onPressed: () {},
+        //                 icon: const Icon(
+        //                   Icons.run_circle,
+        //                   size: 44,
+        //                   color: Colors.green,
+        //                 ))
+        //             : IconButton(
+        //                 onPressed: () {},
+        //                 icon: const Icon(
+        //                   Icons.run_circle,
+        //                   size: 44,
+        //                   color: Colors.black12,
+        //                 )),
+        //       ),
+        //       Padding(
+        //         padding:
+        //             const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+        //         child: InkWell(
+        //             child: Obx(() => destinationController
+        //                         .isGpsSelected.value ==
+        //                     true
+        //                 ? Padding(
+        //                     padding: const EdgeInsets.only(
+        //                         right: 10.0, top: 4.0, bottom: 4.0),
+        //                     child: InkWell(
+        //                       child: const Image(
+        //                         image:
+        //                             AssetImage('assets/images/route3_off.png'),
+        //                         width: 35,
+        //                         height: 35,
+        //                       ),
+        //                       onTap: () {
+        //                         //indexController.switchPage(AppPages.TRAVEL);
+        //                       },
+        //                     ),
+        //                   )
+        //                 : Padding(
+        //                     padding: const EdgeInsets.only(
+        //                         right: 10.0, top: 4.0, bottom: 4.0),
+        //                     child: InkWell(
+        //                       child: const Image(
+        //                         image:
+        //                             AssetImage('assets/images/route2_on.png'),
+        //                         width: 35,
+        //                         height: 35,
+        //                       ),
+        //                       onTap: () {
+        //                         //indexController.switchPage(AppPages.TRAVEL);
+        //                       },
+        //                     ),
+        //                   ))),
+        //       ),
+        //     ],
+        //   ),
+        // ),
         floatingActionButton: FloatingActionButton(
           onPressed: () {
             indexController.toggleMode();
-            if (indexController.currentCat.isNotEmpty) {
-              print(indexController.currentCat[0].toString());
-            }
           },
-          tooltip: 'Increment',
+          elevation: 1.0,
           child: Obx(
-            () => indexController.mode == 0
+            () => indexController.mode.value == 0
                 ? const Image(image: AssetImage('assets/images/list2.png'))
                 : const Image(image: AssetImage('assets/images/map.png')),
           ),
-          elevation: 4.0,
         ),
         floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
         body: SafeArea(
           child: Column(
             children: [
-              // Container(
-              //   padding: const EdgeInsets.symmetric(horizontal: 8.0),
-              //   alignment: Alignment.centerLeft,
-              //   height: 50.0,
-              //   //child: SingleChildScrollView(
-              //   //  scrollDirection: Axis.horizontal,
-              //   //   child:Row(
-              //   //     mainAxisAlignment: MainAxisAlignment.start,
-              //   //     children: [
-              //   //       TextButton(child:Text("Main Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.MAINPERF);},),
-              //   //       TextButton(child:Text("Sub Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.SUBPERF);},),
-              //   //       TextButton(child:Text("Cities >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CITY);},),
-              //   //       TextButton(child:Text("Categories", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CATEGORY);},),
-              //   //     ],
-              //   //   )
-              //   // ),
-              //   child: SingleChildScrollView(
-              //     scrollDirection: Axis.horizontal,
-              //     child: Obx(() =>
-              //       Row(
-              //       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              //       children: [
-              //         indexController.is_mapController_loaded.value == false ?
-              //           Center(child: CircularProgressIndicator())
-              //         :
-              //           BreadCrumbWidget(mapController: indexController.mapController),
-              //         Container(width: 24.0,),
-              //           // Row(
-              //           //   children: [
-              //           //     indexController.currentCat.isNotEmpty ? Text(indexController.currentCat[0].toString()): Text(""),
-              //           //     indexController.currentCat.isNotEmpty ?
-              //           //     IconButton(
-              //           //       onPressed: (){
-              //           //         indexController.currentCat.clear();
-              //           //         indexController.loadLocationsBound();
-              //           //       },
-              //           //       icon: Icon(Icons.cancel, color: Colors.red,)
-              //           //     ) :
-              //           //     Container(width: 0, height: 0,)
-              //           //   ],
-              //           // )
-              //       ],
-              //     )
-              //     ),
-              //   ),
-              // ),
               Expanded(
                   child: Obx(
-                () => indexController.mode == 0
+                () => indexController.mode.value == 0
                     ? MapWidget()
                     : const ListWidget(),
               ))

lib/pages/loading/loading_page.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 
 class LoadingPage extends StatelessWidget {
-  const LoadingPage({ Key? key }) : super(key: key);
+  const LoadingPage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Container(
-          alignment: Alignment.topCenter,
-          margin: const EdgeInsets.only(top: 20),
-          child: const CircularProgressIndicator(
-            value: 0.8,
-          )
-        );
+        alignment: Alignment.center,
+        margin: const EdgeInsets.only(top: 20),
+        child: const CircularProgressIndicator(
+          value: 0.8,
+        ));
   }
 }

lib/pages/login/login_page.dart

@@ -1,11 +1,9 @@
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 
 class LoginPage extends StatelessWidget {
-
   final IndexController indexController = Get.find<IndexController>();
 
   TextEditingController emailController = TextEditingController();
@@ -17,208 +15,266 @@ class LoginPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        elevation: 0,
         backgroundColor: Colors.white,
-        appBar: AppBar(
-          elevation: 0,
-          backgroundColor: Colors.white,
-          leading:
-          IconButton( onPressed: (){
-            Navigator.pop(context);
-          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
-        ),
-      body: 
-      indexController.currentUser.isEmpty ?
-      SizedBox(
-        width: double.infinity,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Column(
-              children: [
-                Column(
-                  children: [
-                    Container(
-                      height: MediaQuery.of(context).size.height/6,
-                      decoration: const BoxDecoration(
-                        image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
-                      ),
-                    ),
-                    const SizedBox(height: 5,),
-
-                  ],
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 40
-                  ),
-                  child: Column(
+        leading: IconButton(
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
+      ),
+      body: indexController.currentUser.isEmpty
+          ? SizedBox(
+              width: double.infinity,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Column(
                     children: [
-                      makeInput(label: "email".tr, controller: emailController),
-                      makeInput(label: "password".tr, controller: passwordController, obsureText: true),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 40),
-                  child: Container(
-                    padding: const EdgeInsets.only(top: 3,left: 3),
-                    decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(40),
-                    ),
-                    child: Obx((() => 
-                      indexController.is_loading == true ? MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        
-                      },
-                      color: Colors.grey[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: const CircularProgressIndicator(),
-                    ) :
                       Column(
                         children: [
-                        MaterialButton(
-                      minWidth: double.infinity,
-                      height:40,
-                      onPressed: (){
-                        if(emailController.text.isEmpty || passwordController.text.isEmpty){
-                          Get.snackbar(
-                            "no_values".tr,
-                            "email_and_password_required".tr,
-                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
-                            snackPosition: SnackPosition.TOP,
-                            duration: const Duration(milliseconds: 800),
-                            backgroundColor: Colors.yellow,
-                            //icon:Image(image:AssetImage("assets/images/dora.png"))
-                          );
-                          return;
-                        }
-                        indexController.is_loading.value = true;
-                        indexController.login(emailController.text, passwordController.text, context);
-                      },
-                      color: Colors.indigoAccent[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: const Text("ログイン",style: TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
-                    const SizedBox(height: 5.0,),
-                    MaterialButton(
-                      minWidth: double.infinity,
-                      height:40,
-                      onPressed: (){
-                        Get.toNamed(AppPages.REGISTER);
-                      },
-                      color: Colors.redAccent,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: Text("sign_up".tr,style: const TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
-                    const SizedBox(height: 2.0,),
-                    MaterialButton(
-                      minWidth: double.infinity,
-                      height:40,
-                      onPressed: (){
-                        Get.back();
-                      },
-                      color: Colors.grey,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: Text("cancel".tr,style: const TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
+                          Container(
+                            height: MediaQuery.of(context).size.height / 6,
+                            decoration: const BoxDecoration(
+                                image: DecorationImage(
+                                    image: AssetImage(
+                                        'assets/images/login_image.jpg'))),
+                          ),
+                          const SizedBox(
+                            height: 5,
+                          ),
                         ],
-                      ) 
-                    ),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 40),
+                        child: Column(
+                          children: [
+                            makeInput(
+                                label: "email".tr, controller: emailController),
+                            makeInput(
+                                label: "password".tr,
+                                controller: passwordController,
+                                obsureText: true),
+                          ],
+                        ),
+                      ),
+                      Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 40),
+                          child: Container(
+                            padding: const EdgeInsets.only(top: 3, left: 3),
+                            decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(40),
+                            ),
+                            child: Obx(
+                              (() => indexController.isLoading.value == true
+                                  ? MaterialButton(
+                                      minWidth: double.infinity,
+                                      height: 60,
+                                      onPressed: () {},
+                                      color: Colors.grey[400],
+                                      shape: RoundedRectangleBorder(
+                                          borderRadius:
+                                              BorderRadius.circular(40)),
+                                      child: const CircularProgressIndicator(),
+                                    )
+                                  : Column(
+                                      children: [
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 40,
+                                          onPressed: () {
+                                            if (emailController.text.isEmpty ||
+                                                passwordController
+                                                    .text.isEmpty) {
+                                              Get.snackbar(
+                                                "no_values".tr,
+                                                "email_and_password_required"
+                                                    .tr,
+                                                icon: const Icon(
+                                                    Icons
+                                                        .assistant_photo_outlined,
+                                                    size: 40.0,
+                                                    color: Colors.blue),
+                                                snackPosition:
+                                                    SnackPosition.TOP,
+                                                duration: const Duration(
+                                                    milliseconds: 800),
+                                                backgroundColor: Colors.yellow,
+                                                //icon:Image(image:AssetImage("assets/images/dora.png"))
+                                              );
+                                              return;
+                                            }
+                                            indexController.isLoading.value =
+                                                true;
+                                            indexController.login(
+                                                emailController.text,
+                                                passwordController.text,
+                                                context);
+                                          },
+                                          color: Colors.indigoAccent[400],
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: const Text(
+                                            "ログイン",
+                                            style: TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        ),
+                                        const SizedBox(
+                                          height: 5.0,
+                                        ),
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 40,
+                                          onPressed: () {
+                                            Get.toNamed(AppPages.REGISTER);
+                                          },
+                                          color: Colors.redAccent,
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: Text(
+                                            "sign_up".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        ),
+                                        const SizedBox(
+                                          height: 2.0,
+                                        ),
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 40,
+                                          onPressed: () {
+                                            Get.back();
+                                          },
+                                          color: Colors.grey,
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: Text(
+                                            "cancel".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        ),
+                                      ],
+                                    )),
+                            ),
+                          )),
+                      const SizedBox(
+                        height: 5,
+                      ),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Flexible(
+                            child: Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: Text(
+                                "rogaining_user_need_tosign_up".tr,
+                                style: const TextStyle(
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Flexible(
+                            child: Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: Text(
+                                "app_developed_by_gifu_dx".tr,
+                                style: const TextStyle(
+                                    overflow: TextOverflow.ellipsis,
+                                    fontSize: 10.0),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                      const Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Flexible(
+                            child: Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Text(
+                                "※第8回と第9回は、岐阜県からの「清流の国ぎふ」SDGs推進ネットワーク連携促進補助金を受けています",
+                                style: TextStyle(
+                                  fontSize:
+                                      12, // Consider adjusting the font size if the text is too small.
+                                  // Removed overflow: TextOverflow.ellipsis to allow text wrapping.
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
                   ),
-                )
-                ),
-                const SizedBox(height: 5,),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Flexible(
-                      child: Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text("rogaining_user_need_tosign_up".tr, style: const TextStyle(
-                          overflow: TextOverflow.ellipsis,
-                        ),),
-                      ),
-                    ),
-                  ],
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Flexible(
-                      child: Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text("app_developed_by_gifu_dx".tr, style: const TextStyle(
-                          overflow: TextOverflow.ellipsis, fontSize: 10.0
-                        ),),
-                      ),
-                    ),
-                  ],
-                )
-              ],
-
+                ],
+              ),
+            )
+          : TextButton(
+              onPressed: () {
+                indexController.currentUser.clear();
+              },
+              child: const Text("Already Logged in, Click to logout"),
             ),
-          ],
-        ),
-      ):
-      Container(
-        child: TextButton(
-          onPressed: (){
-            indexController.currentUser.clear();
-          },
-          child: const Text("Already Logged in, Click to logout"),
-        ),
-      )
-      ,
     );
   }
 }
 
-Widget makeInput({label, required TextEditingController controller, obsureText = false}){
+Widget makeInput(
+    {label, required TextEditingController controller, obsureText = false}) {
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:const TextStyle(
-        fontSize: 15,
-        fontWeight: FontWeight.w400,
-        color: Colors.black87
-      ),),
-      const SizedBox(height: 5,),
+      Text(
+        label,
+        style: const TextStyle(
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+      ),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding:
+              const EdgeInsets.symmetric(vertical: 0, horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
             ),
           ),
           border: OutlineInputBorder(
-            borderSide: BorderSide(color: (Colors.grey[400])!
+            borderSide: BorderSide(color: (Colors.grey[400])!),
           ),
         ),
       ),
-      ),
-      const SizedBox(height: 30.0,)
+      const SizedBox(
+        height: 30.0,
+      )
     ],
   );
 }

lib/pages/login_popup/login_popup_page.dart

@@ -15,195 +15,232 @@ class LoginPopupPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+        elevation: 0,
         backgroundColor: Colors.white,
-        appBar: AppBar(
-          elevation: 0,
-          backgroundColor: Colors.white,
-          leading:
-          IconButton( onPressed: (){
-            Navigator.pop(context);
-          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
-        ),
-      body: 
-      indexController.currentUser.isEmpty ?
-      SizedBox(
-        width: double.infinity,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Column(
-              children: [
-                Column(
-                  children: [
-                    Container(
-                      height: MediaQuery.of(context).size.height/5,
-                      decoration: const BoxDecoration(
-                        image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
-                      ),
-                    ),
-                    const SizedBox(height: 5,),
-
-                  ],
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 40
-                  ),
-                  child: Column(
+        leading: IconButton(
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
+      ),
+      body: indexController.currentUser.isEmpty
+          ? SizedBox(
+              width: double.infinity,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Column(
                     children: [
-                      makeInput(label: "email".tr, controller: emailController),
-                      makeInput(label: "password".tr, controller: passwordController, obsureText: true),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 40),
-                  child: Container(
-                    padding: const EdgeInsets.only(top: 3,left: 3),
-                    decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(40),
-                    ),
-                    child: Obx((() => 
-                      indexController.is_loading == true ? MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        
-                      },
-                      color: Colors.grey[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: const CircularProgressIndicator(),
-                    ) :
                       Column(
                         children: [
-                        MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        if(emailController.text.isEmpty || passwordController.text.isEmpty){
-                          Get.snackbar(
-                            "no_values".tr,
-                            "email_and_password_required".tr,
-                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
-                            snackPosition: SnackPosition.TOP,
-                            duration: const Duration(milliseconds: 800),
-                            backgroundColor: Colors.yellow,
-                            //icon:Image(image:AssetImage("assets/images/dora.png"))
-                          );
-                          return;
-                        }
-                        indexController.is_loading.value = true;
-                        indexController.login(emailController.text, passwordController.text, context);
-                      },
-                      color: Colors.indigoAccent[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                          Container(
+                            height: MediaQuery.of(context).size.height / 5,
+                            decoration: const BoxDecoration(
+                                image: DecorationImage(
+                                    image: AssetImage(
+                                        'assets/images/login_image.jpg'))),
+                          ),
+                          const SizedBox(
+                            height: 5,
+                          ),
+                        ],
                       ),
-                      child: const Text("ログイン",style: TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 40),
+                        child: Column(
+                          children: [
+                            makeInput(
+                                label: "email".tr, controller: emailController),
+                            makeInput(
+                                label: "password".tr,
+                                controller: passwordController,
+                                obsureText: true),
+                          ],
+                        ),
                       ),
+                      Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 40),
+                          child: Container(
+                            padding: const EdgeInsets.only(top: 3, left: 3),
+                            decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(40),
+                            ),
+                            child: Obx(
+                              (() => indexController.isLoading.value == true
+                                  ? MaterialButton(
+                                      minWidth: double.infinity,
+                                      height: 60,
+                                      onPressed: () {},
+                                      color: Colors.grey[400],
+                                      shape: RoundedRectangleBorder(
+                                          borderRadius:
+                                              BorderRadius.circular(40)),
+                                      child: const CircularProgressIndicator(),
+                                    )
+                                  : Column(
+                                      children: [
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 60,
+                                          onPressed: () {
+                                            if (emailController.text.isEmpty ||
+                                                passwordController
+                                                    .text.isEmpty) {
+                                              Get.snackbar(
+                                                "no_values".tr,
+                                                "email_and_password_required"
+                                                    .tr,
+                                                icon: const Icon(
+                                                    Icons
+                                                        .assistant_photo_outlined,
+                                                    size: 40.0,
+                                                    color: Colors.blue),
+                                                snackPosition:
+                                                    SnackPosition.TOP,
+                                                duration: const Duration(
+                                                    milliseconds: 800),
+                                                backgroundColor: Colors.yellow,
+                                                //icon:Image(image:AssetImage("assets/images/dora.png"))
+                                              );
+                                              return;
+                                            }
+                                            indexController.isLoading.value =
+                                                true;
+                                            indexController.login(
+                                                emailController.text,
+                                                passwordController.text,
+                                                context);
+                                          },
+                                          color: Colors.indigoAccent[400],
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: const Text(
+                                            "ログイン",
+                                            style: TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        ),
+                                        const SizedBox(
+                                          height: 19.0,
+                                        ),
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 50,
+                                          onPressed: () {
+                                            Get.toNamed(AppPages.REGISTER);
+                                          },
+                                          color: Colors.redAccent,
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: Text(
+                                            "sign_up".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        ),
+                                        const SizedBox(
+                                          height: 19.0,
+                                        ),
+                                        MaterialButton(
+                                          minWidth: double.infinity,
+                                          height: 50,
+                                          onPressed: () {
+                                            Get.toNamed(AppPages.TRAVEL);
+                                          },
+                                          color: Colors.grey,
+                                          shape: RoundedRectangleBorder(
+                                              borderRadius:
+                                                  BorderRadius.circular(40)),
+                                          child: Text(
+                                            "cancel".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
+                                          ),
+                                        )
+                                      ],
+                                    )),
+                            ),
+                          )),
+                      const SizedBox(
+                        height: 20,
                       ),
-                    ),
-                    const SizedBox(height: 19.0,),
-                    MaterialButton(
-                      minWidth: double.infinity,
-                      height:50,
-                      onPressed: (){
-                        Get.toNamed(AppPages.REGISTER);
-                      },
-                      color: Colors.redAccent,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: Text("sign_up".tr,style: const TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
-                    const SizedBox(height: 19.0,),
-                    MaterialButton(
-                      minWidth: double.infinity,
-                      height:50,
-                      onPressed: (){
-                        Get.toNamed(AppPages.TRAVEL);
-                      },
-                      color: Colors.grey,
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: Text("cancel".tr,style: const TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    )
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Flexible(
+                            child: Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: Text(
+                                "rogaining_user_need_tosign_up".tr,
+                                style: const TextStyle(
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ),
+                            ),
+                          ),
                         ],
                       )
-                    ),
+                    ],
                   ),
-                )
-                ),
-                const SizedBox(height: 20,),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Flexible(
-                      child: Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text("rogaining_user_need_tosign_up".tr, style: const TextStyle(
-                          overflow: TextOverflow.ellipsis,
-                        ),),
-                      ),
-                    ),
-                  ],
-                )
-              ],
-
+                ],
+              ),
+            )
+          : TextButton(
+              onPressed: () {
+                indexController.currentUser.clear();
+              },
+              child: const Text("Already Logged in, Click to logout"),
             ),
-          ],
-        ),
-      ):
-      Container(
-        child: TextButton(
-          onPressed: (){
-            indexController.currentUser.clear();
-          },
-          child: const Text("Already Logged in, Click to logout"),
-        ),
-      )
-      ,
     );
   }
 }
 
-Widget makeInput({label, required TextEditingController controller, obsureText = false}){
+Widget makeInput(
+    {label, required TextEditingController controller, obsureText = false}) {
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:const TextStyle(
-        fontSize: 15,
-        fontWeight: FontWeight.w400,
-        color: Colors.black87
-      ),),
-      const SizedBox(height: 5,),
+      Text(
+        label,
+        style: const TextStyle(
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+      ),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding:
+              const EdgeInsets.symmetric(vertical: 0, horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
             ),
           ),
           border: OutlineInputBorder(
-            borderSide: BorderSide(color: (Colors.grey[400])!
+            borderSide: BorderSide(color: (Colors.grey[400])!),
           ),
         ),
       ),
-      ),
-      const SizedBox(height: 30.0,)
+      const SizedBox(
+        height: 30.0,
+      )
     ],
   );
 }

lib/pages/mainperf/mainperf_page.dart

@@ -1,31 +1,31 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
+// import 'package:flutter/material.dart';
+// import 'package:get/get.dart';
+// import 'package:rogapp/pages/index/index_controller.dart';
 
-class MainPerfPage extends StatelessWidget {
-  MainPerfPage({Key? key}) : super(key: key);
+// class MainPerfPage extends StatelessWidget {
+//   MainPerfPage({Key? key}) : super(key: key);
 
-  IndexController indexController = Get.find<IndexController>();
+//   IndexController indexController = Get.find<IndexController>();
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text("Select Main Perfecture"),
-      ),
-      body: ListView.builder(
-        itemCount: indexController.perfectures.length,
-        itemBuilder: (context, index){
-          return ListTile(
-            onTap: (){
-              indexController.dropdownValue = indexController.perfectures[index][0]["id"].toString();
-              indexController.populateForPerf(indexController.dropdownValue, indexController.mapController);
-              Get.back();
-            },
-            title: Text(indexController.perfectures[index][0]["adm1_ja"].toString()),
-          );
-        },
-      ),
-    );
-  }
-}
+//   @override
+//   Widget build(BuildContext context) {
+//     return Scaffold(
+//       appBar: AppBar(
+//         title: const Text("Select Main Perfecture"),
+//       ),
+//       body: ListView.builder(
+//         itemCount: indexController.perfectures.length,
+//         itemBuilder: (context, index){
+//           return ListTile(
+//             onTap: (){
+//               indexController.dropdownValue = indexController.perfectures[index][0]["id"].toString();
+//               indexController.populateForPerf(indexController.dropdownValue, indexController.mapController);
+//               Get.back();
+//             },
+//             title: Text(indexController.perfectures[index][0]["adm1_ja"].toString()),
+//           );
+//         },
+//       ),
+//     );
+//   }
+// }

lib/pages/permission/permission.dart

@@ -8,206 +8,125 @@ class PermissionHandlerScreen extends StatefulWidget {
   const PermissionHandlerScreen({Key? key}) : super(key: key);
 
   @override
-  State<PermissionHandlerScreen> createState() => _PermissionHandlerScreenState();
+  State<PermissionHandlerScreen> createState() =>
+      _PermissionHandlerScreenState();
 }
 
 class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
-  
-
-  Future<void> _showMyDialog() async {
-    return showDialog<void>(
-      context: context,
-      barrierDismissible: false, // user must tap button!
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('ロケーション許可'),
-          content: const SingleChildScrollView(
-            child: ListBody(
-              children: <Widget>[
-                Text( 'このアプリでは、位置情報の収集を行います。'),
-                Text( 'このアプリでは、開始時点で位置情報を収集します。'),
-              ],
-            ),
-          ),
-          actions: <Widget>[
-            TextButton(
-              child: const Text('わかった'),
-              onPressed: () {
-                //Navigator.of(context).pop();
-                Get.toNamed(AppPages.TRAVEL);
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
   @override
   void initState() {
-    // TODO: implement initState
     super.initState();
-    
-    //permissionServiceCall();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _checkPermissionStatus();
+    });
   }
 
-  Future<PermissionStatus> checkLocationPermission() async {
-    return await Permission.location.status;
-  }
+  _checkPermissionStatus() async {
+    PermissionStatus status = await Permission.location.status;
 
-  permissionServiceCall() async {
-    await permissionServices().then(
-      (value) {
-        if (value[Permission.location]!.isGranted ) {
-          /* ========= New Screen Added  ============= */
-
-          Get.toNamed(AppPages.TRAVEL);
-
-          // Navigator.pushReplacement(
-          //   context,
-          //   MaterialPageRoute(builder: (context) => SplashScreen()),
-          // );
-        }
-        else{
-          _showMyDialog();
-        }
-      },
-    );
-  }
-
-
-    /*Permission services*/
-  Future<Map<Permission, PermissionStatus>> permissionServices() async {
-    // You can request multiple permissions at once.
-    Map<Permission, PermissionStatus> statuses = await [
-      Permission.location,
-     
-      //add more permission to request here.
-    ].request();
-
-    if (statuses[Permission.location]!.isPermanentlyDenied) {
-      await openAppSettings().then(
-        (value) async {
-          if (value) {
-            if (await Permission.location.status.isPermanentlyDenied == true &&
-                await Permission.location.status.isGranted == false) {
-              // openAppSettings();
-              permissionServiceCall(); /* opens app settings until permission is granted */
-            }
-          }
-        },
-      );
+    if (status.isGranted == false) {
+      if (context.mounted) {
+        showAlert(context);
+      }
+    } else if (status.isPermanentlyDenied) {
+      await requestPermission();
     } else {
-      if (statuses[Permission.location]!.isDenied) {
-        permissionServiceCall();
+      if (mounted) {
+        Get.toNamed(AppPages.LOGIN);
       }
     }
-    
-    /*{Permission.camera: PermissionStatus.granted, Permission.storage: PermissionStatus.granted}*/
-    return statuses;
   }
 
-
-  requestPermission() async {
-  PermissionStatus permission = await Permission.location.status;
-  if(permission == PermissionStatus.permanentlyDenied){
-     showPermanentAlert(context);
-  }else{
-    PermissionStatus newPermission = await Permission.location.request();
-    //showAlert(context);
-
-    if (newPermission != PermissionStatus.granted) {
-      // If permission not granted, handle the issue in your own way
-      exit(0);
-    }
-    else{
-      Get.toNamed(AppPages.TRAVEL);
-    }
+  void showAlert(BuildContext context) {
+    showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+              title: const Text('ロケーション許可'),
+              content: const SingleChildScrollView(
+                child: ListBody(
+                  children: <Widget>[
+                    Text('ぎふナビ "アプリへようこそ！\n'),
+                    Text('収集データ:\n'),
+                    Text(
+                        '岐阜ナビアプリをより快適にご利用いただくために、チェックポイントでの自動チェックインのための位置情報を収集しています。また、撮影した画像やチェックインした時間を収集し、チャレンジの勝者を決定します。\n'),
+                    Text('お客様のデータの使用方法:\n'),
+                    Text(
+                        'お客様のデータは、アプリを改善し、競争力のある魅力的な体験を提供するのに役立ちます。お客様の位置情報と画像は、個人を特定できない統計データとして処理され、いかなる個人情報にもリンクされないようにしています\n'),
+                    Text('お客様の管理:\n'),
+                    Text(
+                        'お客様はご自身のデータを完全に管理することができます。アプリの設定でいつでも同意を撤回することができます。位置情報の収集に同意しなくても、ぎふナビを楽しむことはできますが、自動チェックインや競技への参加など、一部の機能が制限されることを覚えておいてください。位置情報、画像、時刻情報の利用に同意する場合は「許可」を選択してください。許可しない場合は、「許可しない」を選択してください。あなたの選択は、アプリの他の機能を使用することに影響しません。\n'),
+                  ],
+                ),
+              ),
+              actions: <Widget>[
+                ElevatedButton(
+                  child: const Text('OK'),
+                  onPressed: () {
+                    Get.back();
+                    requestPermission();
+                  },
+                ),
+              ],
+            ));
   }
 
-  // if (permission != PermissionStatus.granted) {
-    
-  // }
-  // If permission is granted or already was granted
-  return true;
-}
-
-
+  Future<void> requestPermission() async {
+    PermissionStatus permission = await Permission.location.status;
+    if (permission == PermissionStatus.permanentlyDenied) {
+      showPermanentAlert();
+    } else {
+      PermissionStatus newPermission = await Permission.location.request();
+      if (newPermission != PermissionStatus.granted) {
+        exit(0);
+      } else {
+        if (context.mounted) {
+          Get.toNamed(AppPages.LOGIN);
+        }
+      }
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    var status = Permission.location.status.then((value){
-      if(value.isGranted == false){
-        showAlert(context);
-        //requestPermission() ? Get.toNamed(AppPages.TRAVEL) : exit(0);
-        //Future.delayed(Duration.zero, () => showAlert(context));
-      }
-      else if(value.isPermanentlyDenied){
-        
-      }
-      else {
-         Get.toNamed(AppPages.TRAVEL);
-      }
-    });
-      return Scaffold(
-        body: Container(
-          child: const Text(""),
-        ),
-      );
-  }
-
-  void showPermanentAlert(BuildContext context) {
-      showDialog(
-      context: context,
-      builder: (_) => AlertDialog(
-          title: const Text('無効'),
-          content: const SingleChildScrollView(
-            child: ListBody(
-              children: <Widget>[
-                Text( '位置情報が無効になっています'),
-                Text('このアプリケーションへの位置情報アクセスが無効になっています。続行するには設定>プライバシーとセキュリティ>位置情報サービス>岐阜ナビ で有効にしてください。'),
-              ],
-            ),
-          ),
-          actions: <Widget>[
-            ElevatedButton(
-              child: const Text('OK'),
-              onPressed: () {
-              //requestPermission();
-              permissionServiceCall();
-            },
-            ),
-          ],
-        )
+    return const Scaffold(
+      body: Text(""),
     );
   }
 
-
-  void showAlert(BuildContext context) {
-      showDialog(
-      context: context,
-      builder: (_) => AlertDialog(
-          title: const Text('ロケーション許可'),
-          content: const SingleChildScrollView(
-            child: ListBody(
-              children: <Widget>[
-                Text( 'このアプリでは、位置情報の収集を行います。'),
-                Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
+  void showPermanentAlert() {
+    showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+              title: const Text('無効'),
+              content: const SingleChildScrollView(
+                child: ListBody(
+                  children: <Widget>[
+                    Text('位置情報が無効になっています'),
+                    Text(
+                        'このアプリケーションへの位置情報アクセスが無効になっています。続行するには設定>プライバシーとセキュリティ>位置情報サービス>岐阜ナビ で有効にしてください。'),
+                  ],
+                ),
+              ),
+              actions: <Widget>[
+                ElevatedButton(
+                  child: const Text('OK'),
+                  onPressed: () async {
+                    await openAppSettings().then(
+                      (value) async {
+                        if (value) {
+                          if (await Permission
+                                      .location.status.isPermanentlyDenied ==
+                                  true &&
+                              await Permission.location.status.isGranted ==
+                                  false) {
+                            requestPermission(); /* opens app settings until permission is granted */
+                          }
+                        }
+                      },
+                    );
+                  },
+                ),
               ],
-            ),
-          ),
-          actions: <Widget>[
-            ElevatedButton(
-              child: const Text('OK'),
-              onPressed: () {
-              requestPermission();
-              //permissionServiceCall();
-            },
-            ),
-          ],
-        )
-    );
+            ));
   }
-
-
 }

lib/pages/register/register_page.dart

@@ -1,12 +1,9 @@
-
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 
 class RegisterPage extends StatelessWidget {
-
   final IndexController indexController = Get.find<IndexController>();
 
   TextEditingController emailController = TextEditingController();
@@ -23,10 +20,15 @@ class RegisterPage extends StatelessWidget {
       appBar: AppBar(
         elevation: 0,
         backgroundColor: Colors.white,
-        leading:
-        IconButton( onPressed: (){
-          Navigator.pop(context);
-        },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+        leading: IconButton(
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
       ),
       body: SafeArea(
         child: SingleChildScrollView(
@@ -41,63 +43,79 @@ class RegisterPage extends StatelessWidget {
                     Column(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        const Text ("サインアップ", style: TextStyle(
-                          fontSize: 30,
-                          fontWeight: FontWeight.bold,
-                        ),),
-                        const SizedBox(height: 20,),
-                        Text("アカウントを作成し、無料です",style: TextStyle(
-                          fontSize: 15,
-                          color: Colors.grey[700],
-                        ),),
-                        const SizedBox(height: 30,)
+                        const Text(
+                          "サインアップ",
+                          style: TextStyle(
+                            fontSize: 30,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 20,
+                        ),
+                        Text(
+                          "アカウントを作成し、無料です",
+                          style: TextStyle(
+                            fontSize: 15,
+                            color: Colors.grey[700],
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 30,
+                        )
                       ],
                     ),
                     Padding(
-                      padding: const EdgeInsets.symmetric(
-                          horizontal: 40
-                      ),
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
                       child: Column(
                         children: [
                           makeInput(label: "Eメール", controller: emailController),
-                          makeInput(label: "パスワード", controller: passwordController,obsureText: true),
-                          makeInput(label: "パスワードを認証する", controller: confirmPasswordController,obsureText: true)
+                          makeInput(
+                              label: "パスワード",
+                              controller: passwordController,
+                              obsureText: true),
+                          makeInput(
+                              label: "パスワードを認証する",
+                              controller: confirmPasswordController,
+                              obsureText: true)
                         ],
                       ),
                     ),
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 40),
                       child: Container(
-                        padding: const EdgeInsets.only(top: 3,left: 3),
+                        padding: const EdgeInsets.only(top: 3, left: 3),
                         decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(40),
                             border: const Border(
                                 bottom: BorderSide(color: Colors.black),
                                 top: BorderSide(color: Colors.black),
                                 right: BorderSide(color: Colors.black),
-                                left: BorderSide(color: Colors.black)
-                            )
-                        ),
+                                left: BorderSide(color: Colors.black))),
                         child: MaterialButton(
                           minWidth: double.infinity,
-                          height:60,
-                          onPressed: (){
-                            if(passwordController.text != confirmPasswordController.text){
+                          height: 60,
+                          onPressed: () {
+                            if (passwordController.text !=
+                                confirmPasswordController.text) {
                               Get.snackbar(
                                 "No match",
-                                 "Passwords does not match",
-                                icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                "Passwords does not match",
+                                icon: const Icon(Icons.assistant_photo_outlined,
+                                    size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
                                 duration: const Duration(milliseconds: 800),
                                 backgroundColor: Colors.yellow,
                                 //icon:Image(image:AssetImage("assets/images/dora.png"))
                               );
                             }
-                            if(emailController.text.isEmpty || passwordController.text.isEmpty){
+                            if (emailController.text.isEmpty ||
+                                passwordController.text.isEmpty) {
                               Get.snackbar(
                                 "no_values".tr,
-                                 "email_and_password_required".tr,
-                                icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                "email_and_password_required".tr,
+                                icon: const Icon(Icons.assistant_photo_outlined,
+                                    size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
                                 duration: const Duration(milliseconds: 800),
                                 backgroundColor: Colors.yellow,
@@ -105,38 +123,43 @@ class RegisterPage extends StatelessWidget {
                               );
                               return;
                             }
-                            indexController.is_loading.value = true;
-                            indexController.register(emailController.text, passwordController.text, context);
+                            indexController.isLoading.value = true;
+                            indexController.register(emailController.text,
+                                passwordController.text, context);
                           },
                           color: Colors.redAccent,
                           shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(40)
+                              borderRadius: BorderRadius.circular(40)),
+                          child: Text(
+                            "sign_up".tr,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 16,
+                            ),
                           ),
-                          child: Text("sign_up".tr,style: const TextStyle(
-                            fontWeight: FontWeight.w600,fontSize: 16,
-
-                          ),),
                         ),
                       ),
                     ),
-                    const SizedBox(height: 20,),
+                    const SizedBox(
+                      height: 20,
+                    ),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         const Flexible(child: Text("すでにアカウントをお持ちですか？")),
                         TextButton(
-                          onPressed: (){
+                          onPressed: () {
                             Get.toNamed(AppPages.LOGIN);
                           },
-                          child: const Text("ログイン",style: TextStyle(
-                              fontWeight: FontWeight.w600,
-                              fontSize: 18
-                          ),),
+                          child: const Text(
+                            "ログイン",
+                            style: TextStyle(
+                                fontWeight: FontWeight.w600, fontSize: 18),
+                          ),
                         ),
                       ],
                     )
                   ],
-
                 ),
               ],
             ),
@@ -147,34 +170,38 @@ class RegisterPage extends StatelessWidget {
   }
 }
 
-Widget makeInput({label, required TextEditingController controller, obsureText = false}){
+Widget makeInput(
+    {label, required TextEditingController controller, obsureText = false}) {
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:const TextStyle(
-          fontSize: 15,
-          fontWeight: FontWeight.w400,
-          color: Colors.black87
-      ),),
-      const SizedBox(height: 5,),
+      Text(
+        label,
+        style: const TextStyle(
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+      ),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding:
+              const EdgeInsets.symmetric(vertical: 0, horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
             ),
           ),
           border: OutlineInputBorder(
-              borderSide: BorderSide(color: (Colors.grey[400])!
+            borderSide: BorderSide(color: (Colors.grey[400])!),
           ),
         ),
       ),
-      ),
-      const SizedBox(height: 30,)
-
+      const SizedBox(
+        height: 30,
+      )
     ],
   );
 }

lib/pages/search/search_controller.dart

@@ -1,23 +1,21 @@
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 
 class SearchBarController extends GetxController {
+  List<GeoJSONFeature> searchResults = <GeoJSONFeature>[].obs;
 
-List<GeoJsonFeature> searchResults = <GeoJsonFeature>[].obs;
-
-
-@override
+  @override
   void onInit() {
     IndexController indexController = Get.find<IndexController>();
-    if(indexController.locations.isNotEmpty){
-      for(int i=0; i<= indexController.locations[0].collection.length - 1; i++){
-        GeoJsonFeature p = indexController.locations[0].collection[i];
+    if (indexController.locations.isNotEmpty) {
+      for (int i = 0;
+          i <= indexController.locations[0].features.length - 1;
+          i++) {
+        GeoJSONFeature p = indexController.locations[0].features[i]!;
         searchResults.add(p);
       }
     }
     super.onInit();
   }
-
-
 }

lib/pages/search/search_page.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get.dart';
+import 'package:rogapp/model/destination.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/pages/search/search_controller.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
@@ -46,44 +48,32 @@ class SearchPage extends StatelessWidget {
         //title: const CupertinoSearchTextField(),
       ),
       body: SingleChildScrollView(
-        child: TypeAheadField(
-          textFieldConfiguration: TextFieldConfiguration(
-            autofocus: true,
-            style: DefaultTextStyle.of(context).style.copyWith(
-                  fontStyle: FontStyle.normal,
-                  fontSize: 15.0,
-                ),
-            decoration: InputDecoration(
-              border: const OutlineInputBorder(),
-              hintText: "検索",
-              prefixIcon: const Icon(Icons.search),
-              suffixIcon: IconButton(
-                icon: const Icon(Icons.clear),
-                onPressed: () {
-                  // clear the text field
-                },
-              ),
-            ),
-          ),
-          suggestionsCallback: (pattern) async {
-            return searchController.searchResults.where(
-                (GeoJsonFeature element) => element.properties!["location_name"]
-                    .toString()
-                    .contains(pattern));
-            //return await
-          },
-          itemBuilder: (context, GeoJsonFeature suggestion) {
-            return ListTile(
-              title: Text(suggestion.properties!["location_name"]),
-              subtitle: suggestion.properties!["category"] != null
-                  ? Text(suggestion.properties!["category"])
-                  : const Text(""),
-              //leading: getImage(index),
-            );
-          },
-          onSuggestionSelected: (GeoJsonFeature suggestion) {
+        child: TypeAheadField<GeoJSONFeature>(
+          // textFieldConfiguration: TextFieldConfiguration(
+          //   autofocus: true,
+          //   style: DefaultTextStyle.of(context).style.copyWith(
+          //         fontStyle: FontStyle.normal,
+          //         fontSize: 15.0,
+          //       ),
+          //   decoration: InputDecoration(
+          //     border: const OutlineInputBorder(),
+          //     hintText: "検索",
+          //     prefixIcon: const Icon(Icons.search),
+          //     suffixIcon: IconButton(
+          //       icon: const Icon(Icons.clear),
+          //       onPressed: () {
+          //         // clear the text field
+          //       },
+          //     ),
+          //   ),
+          // ),
+          onSelected: (GeoJSONFeature suggestion) {
             indexController.currentFeature.clear();
             indexController.currentFeature.add(suggestion);
+            DestinationController destinationController =
+                Get.find<DestinationController>();
+            Destination des =
+                destinationController.festuretoDestination(suggestion);
             Get.back();
             showModalBottomSheet(
                 constraints:
@@ -91,7 +81,28 @@ class SearchPage extends StatelessWidget {
                 isScrollControlled: true,
                 context: context,
                 //builder: (context) => BottomSheetWidget(),
-                builder: ((context) => BottomSheetNew()));
+                builder: ((context) => BottomSheetNew(
+                      destination: des,
+                    )));
+          },
+
+          suggestionsCallback: (pattern) async {
+            return searchController.searchResults
+                .where((GeoJSONFeature element) => element
+                    .properties!["location_name"]
+                    .toString()
+                    .contains(pattern))
+                .toList();
+            //return await
+          },
+          itemBuilder: (context, GeoJSONFeature suggestion) {
+            return ListTile(
+              title: Text(suggestion.properties!["location_name"]),
+              subtitle: suggestion.properties!["category"] != null
+                  ? Text(suggestion.properties!["category"])
+                  : const Text(""),
+              //leading: getImage(index),
+            );
           },
         ),
       ),

lib/provider/auth_provider.dart

@@ -0,0 +1,31 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/model/auth_user.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+final authUserStateProvider =
+    StateNotifierProvider<AuthUserState, AuthUser>((ref) {
+  return AuthUserState();
+});
+
+class AuthUserState extends StateNotifier<AuthUser> {
+  AuthUserState() : super(AuthUser());
+
+  Future<void> saveToDevice(String val) async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.setString("user_token", val);
+  }
+
+  Future<String?> tokenFromDevice() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    return prefs.getString("user_token");
+  }
+
+  Future<void> addLogin(AuthUser user) async {
+    state = user;
+    await saveToDevice(user.auth_token!);
+  }
+
+  void removeLogin() {
+    state = AuthUser();
+  }
+}

lib/provider/game_state_provider.dart

@@ -0,0 +1,22 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/model/game_state_instance.dart';
+
+final gameStateNotifierProvider =
+    StateNotifierProvider<GameStaticState, GameInsStatetance>((ref) {
+  return GameStaticState();
+});
+
+class GameStaticState extends StateNotifier<GameInsStatetance> {
+  GameStaticState() : super(GameInsStatetance());
+
+  @override
+  GameInsStatetance get state => super.state;
+
+  void startGame(GameInsStatetance gi) {
+    state = gi;
+  }
+
+  void doCheckin() {}
+
+  void makeGoal() {}
+}

lib/provider/map_state_provider.dart

@@ -0,0 +1,18 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/model/map_state_instance.dart';
+
+final mapStateNotifierProvider =
+    StateNotifierProvider<MapState, MapStateInstance>((ref) {
+  return MapState();
+});
+
+class MapState extends StateNotifier<MapStateInstance> {
+  MapState() : super(MapStateInstance());
+
+  @override
+  MapStateInstance get state => super.state;
+
+  void startGame(MapStateInstance mi) {
+    state = mi;
+  }
+}

lib/routes/app_pages.dart

@@ -1,11 +1,10 @@
 import 'package:get/get.dart';
 import 'package:get/get_navigation/src/routes/get_route.dart';
-import 'package:rogapp/pages/camera/camera_page.dart';
 import 'package:rogapp/pages/category/category_page.dart';
 import 'package:rogapp/pages/changepassword/change_password_page.dart';
 import 'package:rogapp/pages/city/city_page.dart';
 import 'package:rogapp/pages/destination/destination_binding.dart';
-import 'package:rogapp/pages/destination/destination_page.dart';
+import 'package:rogapp/pages/gps/gps_page.dart';
 import 'package:rogapp/pages/history/history_page.dart';
 import 'package:rogapp/pages/home/home_binding.dart';
 import 'package:rogapp/pages/home/home_page.dart';
@@ -24,13 +23,11 @@ import 'package:rogapp/pages/subperf/subperf_page.dart';
 import 'package:rogapp/spa/spa_binding.dart';
 import 'package:rogapp/spa/spa_page.dart';
 
-
 part 'app_routes.dart';
 
 class AppPages {
-
   // ignore: constant_identifier_names
-  static const INITIAL = Routes.INDEX;
+  static const INDEX = Routes.INDEX;
   // ignore: constant_identifier_names
   static const SPA = Routes.SPA;
   static const LANDING = Routes.LANDING;
@@ -50,28 +47,14 @@ class AppPages {
   static const CAMERA_PAGE = Routes.CAMERA_PAGE;
   static const PROGRESS = Routes.PROGRESS;
   static const HISTORY = Routes.HISTORY;
+  static const GPS = Routes.GPS;
 
   static final routes = [
-    // GetPage(
-    //   name: Routes.HOME,
-    //   page: () => HomePage(),
-    //   binding: HomeBinding(),
-    // ),
-    // GetPage(
-    //   name: Routes.MAP,
-    //   page: () => MapPage(),
-    //   binding: MapBinding(),
-    // )
     GetPage(
       name: Routes.INDEX,
       page: () => IndexPage(),
       //binding: IndexBinding(),
     ),
-    GetPage(
-      name: Routes.SPA,
-      page: () => const SpaPage(),
-      binding: SpaBinding(),
-    ),
     GetPage(
       name: Routes.LANDING,
       page: () => const LandingPage(),
@@ -87,21 +70,11 @@ class AppPages {
       page: () => RegisterPage(),
       //binding: SpaBinding(),
     ),
-    GetPage(
-      name: Routes.TRAVEL,
-      page: () => DestnationPage(),
-      binding: DestinationBinding(),
-    ),
     GetPage(
       name: Routes.LOADING,
       page: () => const LoadingPage(),
       //binding: DestinationBinding(),
     ),
-    GetPage(
-      name: Routes.DESTINATION_MAP,
-      page: () => DestnationPage(),
-      //binding: DestinationBinding(),
-    ),
     GetPage(
       name: Routes.HOME,
       page: () => const HomePage(),
@@ -116,30 +89,14 @@ class AppPages {
       page: () => SearchPage(),
       binding: SearchBinding(),
     ),
-    GetPage(
-      name: Routes.MAINPERF,
-      page: () => MainPerfPage(),
-    ),
-    GetPage(
-      name: Routes.SUBPERF,
-      page: () => SubPerfPage(),
-    ),
     GetPage(
       name: Routes.CITY,
       page: () => const CityPage(),
     ),
-    GetPage(
-      name: Routes.CATEOGORY,
-      page: () => const CategoryPage(),
-    ),
     GetPage(
       name: Routes.CHANGE_PASSWORD,
       page: () => ChangePasswordPage(),
     ),
-    GetPage(
-      name: Routes.CAMERA_PAGE,
-      page: () => CameraPage(),
-    ),
     GetPage(
       name: Routes.PROGRESS,
       page: () => const ProgressPage(),
@@ -147,6 +104,10 @@ class AppPages {
     GetPage(
       name: Routes.HISTORY,
       page: () => const HistoryPage(),
+    ),
+    GetPage(
+      name: Routes.GPS,
+      page: () => const GpsPage(),
     )
   ];
 }

lib/routes/app_routes.dart

@@ -25,4 +25,5 @@ abstract class Routes {
   static const CAMERA_PAGE = '/camera_page';
   static const PROGRESS = '/progress';
   static const HISTORY = '/history';
+  static const GPS = '/gp';
 }

lib/services/DatabaseService.dart

@@ -0,0 +1,55 @@
+import 'dart:async';
+
+import 'package:rogapp/model/destination.dart';
+import 'package:rogapp/utils/database_helper.dart';
+
+class DatabaseService {
+  // Private constructor
+  DatabaseService._privateConstructor();
+
+  // Static instance
+  static final DatabaseService _instance =
+      DatabaseService._privateConstructor();
+
+  // Factory constructor to return the instance
+  factory DatabaseService() {
+    return _instance;
+  }
+
+  // StreamController for updates
+  final StreamController<List<Destination>> _dbUpdateController =
+      StreamController<List<Destination>>.broadcast();
+
+  // Getter for the stream
+  Stream<List<Destination>> get destinationUpdatesStream =>
+      _dbUpdateController.stream;
+
+  // Method to fetch destinations
+  Future<List<Destination>> fetchDestinations() async {
+    // Your database fetch logic here
+    List<Destination> destinations = await _fetchFromDb();
+    _dbUpdateController.add(destinations);
+    return destinations;
+  }
+
+  // Method to update the database and emit an update through the stream
+  Future<void> updateDatabase() async {
+    // Your update logic here
+
+    // After updating, fetch the updated list and add it to the stream
+    fetchDestinations();
+  }
+
+  // Method to fetch data from the database (placeholder)
+  Future<List<Destination>> _fetchFromDb() async {
+    // Simulate fetching data with a delay
+    DatabaseHelper db = DatabaseHelper.instance;
+    List<Destination> destinations = await db.getDestinations();
+    return destinations; // Replace with your actual fetch operation
+  }
+
+  // Dispose method to close the stream controller
+  void dispose() {
+    _dbUpdateController.close();
+  }
+}

lib/services/action_service.dart

@@ -2,23 +2,21 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:rogapp/utils/const.dart';
 
-
-class ActionService{
-
-  static Future<Map<String, dynamic>>  makeAction(int userId, int locationId, bool wanttogo, bool like, bool checkin) async {
-    print("----- action is ---- $like-- $wanttogo-- $checkin");
+class ActionService {
+  static Future<Map<String, dynamic>> makeAction(int userId, int locationId,
+      bool wanttogo, bool like, bool checkin) async {
+    //print("----- action is ---- $like-- $wanttogo-- $checkin");
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
-    String url = "$serverUrl/api/makeaction/?user_id=$userId&location_id=$locationId&wanttogo=$wanttogo&like=$like&checkin=$checkin";
+    String url =
+        "$serverUrl/api/makeaction/?user_id=$userId&location_id=$locationId&wanttogo=$wanttogo&like=$like&checkin=$checkin";
     //String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
-    print('++++++++$url');
-     print("url is ------ $url");
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      }
-    );
+    //print('++++++++$url');
+    //print("url is ------ $url");
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
@@ -26,27 +24,23 @@ class ActionService{
     return cats;
   }
 
-
-  static Future<List<dynamic>?>  userAction(int userId, int locationId) async {
+  static Future<List<dynamic>?> userAction(int userId, int locationId) async {
     List<dynamic> cats = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/useraction/?user_id=$userId&location_id=$locationId';
-    print('++++++++$url');
+    String url =
+        '$serverUrl/api/useraction/?user_id=$userId&location_id=$locationId';
+    //print('++++++++$url');
     //String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
-    final response = await http.get(Uri.parse(url),
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
-
-
-
 }
-

lib/services/auth_service.dart

@@ -1,16 +1,69 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
+import 'package:rogapp/model/auth_user.dart';
 
 import '../utils/const.dart';
 
+class AuthService {
+  Future<AuthUser?> userLogin(String email, String password) async {
+    final serverUrl = ConstValues.currentServer();
+    final url = '$serverUrl/api/login/';
 
-class AuthService{
+    try {
+      final http.Response response = await http.post(
+        Uri.parse(url),
+        headers: <String, String>{
+          'Content-Type': 'application/json; charset=UTF-8',
+        },
+        body:
+            jsonEncode(<String, String>{'email': email, 'password': password}),
+      );
+      switch (response.statusCode) {
+        case 200:
+          final data = json.decode(utf8.decode(response.bodyBytes));
+          AuthUser user = AuthUser.fromMap(data["user"]);
+          final String token = data["token"];
+          user.auth_token = token;
+          return user;
+        default:
+          return null;
+        //throw Exception(response.reasonPhrase);
+      }
+    } on Exception catch (_) {
+      rethrow;
+    }
+  }
 
-  static Future<Map<String, dynamic>> changePassword(String oldpassword, String newpassword, String token) async {
+  Future<AuthUser?> userFromToken(String token) async {
+    final serverUrl = ConstValues.currentServer();
+    final url = '$serverUrl/api/user/';
+    try {
+      final http.Response response =
+          await http.get(Uri.parse(url), headers: <String, String>{
+        'Content-Type': 'application/json; charset=UTF-8',
+        'Authorization': 'Token $token'
+      });
+      switch (response.statusCode) {
+        case 200:
+          final data = json.decode(utf8.decode(response.bodyBytes));
+          AuthUser user = AuthUser.fromMap(data);
+          user.auth_token = token;
+          return user;
+        default:
+          return null;
+        //throw Exception(response.reasonPhrase);
+      }
+    } on Exception catch (_) {
+      rethrow;
+    }
+  }
+
+  static Future<Map<String, dynamic>> changePassword(
+      String oldpassword, String newpassword, String token) async {
     Map<String, dynamic> changePassword = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/change-password/';
-    print('++++++++$url');
+    //print('++++++++$url');
     final http.Response response = await http.put(
       Uri.parse(url),
       headers: <String, String>{
@@ -24,28 +77,25 @@ class AuthService{
     );
 
     if (response.statusCode == 200) {
-        changePassword = json.decode(utf8.decode(response.bodyBytes));
+      changePassword = json.decode(utf8.decode(response.bodyBytes));
     }
     return changePassword;
   }
 
-
-  static Future<Map<String, dynamic>> login(String email, String password) async {
-    print("------- in logged email $email pwd $password ###### --------");
+  static Future<Map<String, dynamic>> login(
+      String email, String password) async {
+    //print("------- in logged email $email pwd $password ###### --------");
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/login/';
-    print('++++++++$url');
+    //print('++++++++$url');
     //String url = 'http://localhost:8100/api/login/';
     final http.Response response = await http.post(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
-      body: jsonEncode(<String, String>{
-        'email': email,
-        'password': password
-      }),
+      body: jsonEncode(<String, String>{'email': email, 'password': password}),
     );
 
     if (response.statusCode == 200) {
@@ -54,41 +104,36 @@ class AuthService{
     return cats;
   }
 
-  
-  static Future<Map<String, dynamic>>  register(String email, String password) async {
+  static Future<Map<String, dynamic>> register(
+      String email, String password) async {
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/register/';
-    print('++++++++$url');
+    //print('++++++++$url');
     final http.Response response = await http.post(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
-      body: jsonEncode(<String, String>{
-        'email': email,
-        'password': password
-      }),
+      body: jsonEncode(<String, String>{'email': email, 'password': password}),
     );
-    print(response.body);
+    //print(response.body);
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
 
-  static Future<Map<String, dynamic>>  deleteUser(String token) async {
+  static Future<Map<String, dynamic>> deleteUser(String token) async {
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/delete-account/';
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token $token'
-      }
-    );
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+      'Authorization': 'Token $token'
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
@@ -96,50 +141,45 @@ class AuthService{
     return cats;
   }
 
-  
-  static Future<List<dynamic>?> UserDetails(int userid) async {
+  static Future<List<dynamic>?> userDetails(int userid) async {
     List<dynamic> cats = [];
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/userdetials?user_id=$userid';
-    print('++++++++$url');
-    print("---- UserDetails url is $url");
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    //print("---- UserDetails url is $url");
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
 
-
-
   static Future<List<dynamic>?> userForToken(String token) async {
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/user/';
-    print('++++++++$url');
-    print("---- UserDetails url is $url");
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    //print("---- UserDetails url is $url");
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-         'Authorization': 'Token $token'
+        'Authorization': 'Token $token'
       },
     );
 
     if (response.statusCode == 200) {
-
       cats = json.decode(utf8.decode(response.bodyBytes));
-      print("--- eeeeee $cats ----");
+      //print("--- eeeeee $cats ----");
     }
-    return [{"user":cats}];
+    return [
+      {"user": cats, "token": token}
+    ];
   }
-
-
-
 }
-

lib/services/cat_service.dart

@@ -3,50 +3,42 @@ import 'package:http/http.dart' as http;
 
 import '../utils/const.dart';
 
-
-class CatService{
-
-  static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4) async {
+class CatService {
+  static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2,
+      double lon2, double lat3, double lon3, double lat4, double lon4) async {
     List<dynamic> cats = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/cats/?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    String url =
+        '$serverUrl/api/cats/?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
 
-  
-  static Future<List<dynamic>?> loadCatByCity(String cityname)async {
+  static Future<List<dynamic>?> loadCatByCity(String cityname) async {
     List<dynamic> cats = [];
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/catbycity/?$cityname';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
-
-
 }
-
-
-
-
-

lib/services/destination_service.dart

@@ -8,20 +8,16 @@ import 'package:rogapp/pages/destination/destination_controller.dart';
 
 import '../utils/const.dart';
 
-
-class DestinationService{
-
-  static Future<List<dynamic>>  getDestinations(int userId) async {
+class DestinationService {
+  static Future<List<dynamic>> getDestinations(int userId) async {
     List<dynamic> cats = [];
     String serverUrl = ConstValues.currentServer();
     String url = "$serverUrl/api/destinations/?user_id=$userId";
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      }
-    );
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
@@ -29,36 +25,33 @@ class DestinationService{
     return cats;
   }
 
-  static Future<Map<String, dynamic>>  deleteDestination(int destId) async {
+  static Future<Map<String, dynamic>> deleteDestination(int destId) async {
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = "$serverUrl/api/delete_destination/?dest_id=$destId";
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      }
-    );
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
-    print("####### ---- $cats");
+    //print("####### ---- $cats");
     return cats;
   }
 
-  static Future<int>  updateOrder(int actionId, int order, String dir) async {
+  static Future<int> updateOrder(int actionId, int order, String dir) async {
     int cats = 0;
     String serverUrl = ConstValues.currentServer();
-    String url = "$serverUrl/api/updateorder/?user_action_id=$actionId&order=$order&dir=$dir";
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      }
-    );
+    String url =
+        "$serverUrl/api/updateorder/?user_action_id=$actionId&order=$order&dir=$dir";
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
@@ -66,23 +59,25 @@ class DestinationService{
     return cats;
   }
 
-  static Future<List<PointLatLng>>? getDestinationLine(List<Destination> destinations, Map<String, dynamic> mtx) async{
+  static Future<List<PointLatLng>>? getDestinationLine(
+      List<Destination> destinations, Map<String, dynamic> mtx) async {
     PolylinePoints polylinePoints = PolylinePoints();
 
-    if(destinations.isEmpty){
+    if (destinations.isEmpty) {
       return [];
     }
 
     //print("##### @@@@@ ${destinations[0].lat}");
-    PointLatLng origin = PointLatLng(destinations[0].lat!, destinations[0].lon!);
-    PointLatLng dest = PointLatLng(destinations[destinations.length -1].lat!, destinations[destinations.length -1].lon!);
-    
+    PointLatLng origin =
+        PointLatLng(destinations[0].lat!, destinations[0].lon!);
+    PointLatLng dest = PointLatLng(destinations[destinations.length - 1].lat!,
+        destinations[destinations.length - 1].lon!);
 
     List<PolylineWayPoint> wayPoints = [];
-    int i=0;
-    for(dynamic d in destinations){
-      if(i == 0 || i == (destinations.length -1)){
-        i+=1;
+    int i = 0;
+    for (dynamic d in destinations) {
+      if (i == 0 || i == (destinations.length - 1)) {
+        i += 1;
         continue;
       }
       double la = d.lat;
@@ -90,31 +85,31 @@ class DestinationService{
 
       int j = 0;
 
-      PolylineWayPoint pwp = PolylineWayPoint(location: "$la,$ln", stopOver: false);
-      
+      PolylineWayPoint pwp =
+          PolylineWayPoint(location: "$la,$ln", stopOver: false);
 
       //print("----- UUUUUU ${pwp}");
       //PointLatLng wp = PointLatLng(d["Location"]["geometry"][0][1], d["Location"]["geometry"][0][0]);
       wayPoints.add(pwp);
-      i+=1;
+      i += 1;
       j += 4;
     }
 
-    final DestinationController destinationController = Get.find<DestinationController>();
-    int travMode = destinationController.travelMode.value;
-    String _mode = "WALKING";
-    if(travMode == 1){
-      //_mode = TravelMode.driving;
-      _mode = "DRIVING";
-    }
-    else if(travMode == 2) {
-      //_mode = TravelMode.transit;
-      _mode = "TRANSIT";
-    }
-    
+    final DestinationController destinationController =
+        Get.find<DestinationController>();
+    // int travMode = destinationController.travelMode.value;
+    // String mode = "WALKING";
+    // if (travMode == 1) {
+    //   //_mode = TravelMode.driving;
+    //   mode = "DRIVING";
+    // } else if (travMode == 2) {
+    //   //_mode = TravelMode.transit;
+    //   mode = "TRANSIT";
+    // }
 
     //PolylineResult result = await polylinePoints.getRouteBetweenCoordinates("AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE", PointLatLng(35.389282, 136.498027), PointLatLng(36.285848, 137.575186));
-    Map<String, dynamic> pl = destinationController.matrix["routes"][0]["overview_polyline"];
+    Map<String, dynamic> pl =
+        destinationController.matrix["routes"][0]["overview_polyline"];
     List<PointLatLng> result = polylinePoints.decodePolyline(pl["points"]);
     //List<PointLatLng> result = polylinePoints.decodePolyline("qkyvEq`z`Yp@DBMr@XL@Td@Eb@PREd@IFe@rKIzCY|GEvCBzCHvS@xC?HnBHtBHlBFnBFhGRtDVW~BE`@ICHLk@dE_ClPgAtHu@bFsAhPg@~Ge@bFaEtg@kEpi@oCd\\w@nIw@hGe@fBy@nBqAjC{@zBgBtFOd@M@Wv@i@`BQf@ITKCuE`@yDZqBRCHa@DKG_AHwBRiBR_Fp@y@LYBY]M@KJo@v@M@cAGoGN_Cx@}Cf@}@@mM~@qF`@gCLwBj@sBrAeAhAsAtCoF|MmAbD{@fBwAdBw@p@_Ax@BFOHAl@?`@MAQCEAOIQSaBx@{Ah@eATsAHSB?d@A`D?f@IdWy@AS??V?|BCJ}@?cA?k@Au@wBqDuKQaACg@z@gELg@GK~@uEp@{A@q@y@CHwFHcG?KDqCDK^ABABEH{AE{B{@_Ho@uFIaBFQhBaC@SQSg@k@g@q@Yw@qA{De@}B]uDCsAMEWDqAFu@@^A@TDjA@vDA`CETK|AEtAIFY@o@ALpBZ~HBlCBn@EDGPu@pASJO`@Qf@?ROr@K?qDLHnEUTsDNkENYB{Ab@I^?zA}CrCkBfBw@t@@LwA`Bo@r@eGvD}BrAGGuAj@[?i@rBVi@P}@T?F?^MxDuBhDsBzAcAn@s@zCgDAI~A{A|CsC?{A?UHItA_@DCXC~J_@TUIoEvDKTm@?Y^iALIb@k@f@aAE}AA_BC{@\\Cv@CxAEj@ExCwDDc@CYFANCh@WHEIIRQhB}B|C_E\\w@Hq@JE?a@O}CGkAIwEGmDEmDAKLA^?A}@C{@?e@E_DFQNi@LcB\\eBPsADGKOEWBOH[GCPs@Pq@\\cANs@^q@jAu@fCqAf@]HCXoCV_BVmAZmBVcDBeCCgDAaB?s@RE?aCCaEAyHAoDd@EJiD@_@AaAj@A\\A?Gp@@r@oBXm@LQ?IEy@Fy@tA[n@Gj@Tz@[~ACdAAx@Lp@Kr@]hAa@HAQoCMwCSwGSiGK_CCCKaBCgCOoCOgECwGB_OB{JHkBEmC?yCDyFF{QFue@BsYByE?oAEgAByLBiL?gLBuGXsEd@cCNA?OHa@jAuCn@eAtCyDh@k@v@EvBKr@EEkACUKaC?G~@gAlCeDFBT[jFeGZAfBEh@UpBM`AEMaFjFYIhE?hEPpCJzAPt@Fj@GNUFu@N[FyBbAuB`@_@LEIOB}@HUBQFk@FcAACGQA}@Bi@F@F[Dc@D[FQHELGhBMtDGR?D");
     //PolylineResult result = await polylinePoints.getRouteBetweenCoordinates("AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE", origin,dest, travelMode: _mode, wayPoints: wayPoints);
@@ -122,7 +117,4 @@ class DestinationService{
     //print("#####@@@@@ ${result.points}");
     return result;
   }
-
-
 }
-

lib/services/external_service.dart

@@ -5,9 +5,11 @@ import 'package:intl/intl.dart';
 import 'package:rogapp/model/rog.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
+import 'package:rogapp/utils/database_gps.dart';
 import 'package:rogapp/utils/database_helper.dart';
 import 'dart:convert';
 
+import '../model/gps_data.dart';
 import '../utils/const.dart';
 
 //
@@ -17,287 +19,412 @@ import '../utils/const.dart';
 class ExternalService {
   static final ExternalService _instance = ExternalService._internal();
 
-  factory ExternalService(){
+  factory ExternalService() {
     return _instance;
   }
 
   ExternalService._internal();
 
-  String getFormatedTime(DateTime datetime){
-    return  DateFormat('yyyy-MM-dd HH:mm:ss').format(datetime);
+  String getFormatedTime(DateTime datetime) {
+    return DateFormat('yyyy-MM-dd HH:mm:ss').format(datetime);
   }
 
-  Future<Map<String, dynamic>> StartRogaining() async {
-
+  Future<Map<String, dynamic>> startRogaining() async {
     final IndexController indexController = Get.find<IndexController>();
 
-    Map<String, dynamic> _res = {};
+    Map<String, dynamic> res = {};
 
     int userId = indexController.currentUser[0]["user"]["id"];
     //print("--- Pressed -----");
-    String _team = indexController.currentUser[0]["user"]['team_name'];
+    String team = indexController.currentUser[0]["user"]['team_name'];
     //print("--- _team : ${_team}-----");
-    String _event_code = indexController.currentUser[0]["user"]["event_code"];
+    String eventCode = indexController.currentUser[0]["user"]["event_code"];
 
-    if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
+    if (indexController.connectionStatusName.value != "wifi" &&
+        indexController.connectionStatusName.value != "mobile") {
       DatabaseHelper db = DatabaseHelper.instance;
-      Rog _rog = Rog(
-        id:1,
-        team_name: _team,
-        event_code : _event_code,
-        user_id: userId,
-        cp_number: -1,
-        checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
-        image: null,
-        rog_action_type: 0
-      );
-      db.insertRogaining(_rog);
-    }
-    else {
+      Rog rog = Rog(
+          id: 1,
+          team_name: team,
+          event_code: eventCode,
+          user_id: userId,
+          cp_number: -1,
+          checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
+          image: null,
+          rog_action_type: 0);
+      db.insertRogaining(rog);
+    } else {
       String url = 'https://rogaining.sumasen.net/gifuroge/start_from_rogapp';
-      print('++++++++$url');
+      //print('++++++++$url');
       final http.Response response = await http.post(
         Uri.parse(url),
         headers: <String, String>{
           'Content-Type': 'application/json; charset=UTF-8',
         },
-        body: jsonEncode(<String, String>{
-          'team_name': _team,
-          'event_code': _event_code
-        }),
+        body: jsonEncode(
+            <String, String>{'team_name': team, 'event_code': eventCode}),
       );
 
-      print("---- start rogianing api status ---- ${response.statusCode}");
+      //print("---- start rogianing api status ---- ${response.statusCode}");
 
       if (response.statusCode == 200) {
-          _res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : $_res ----');
+        res = json.decode(utf8.decode(response.bodyBytes));
+        //print('----_res : $res ----');
       }
     }
-    return _res;
+    return res;
   }
 
-  Future<Map<String, dynamic>> makeCheckpoint(int userId, String token, String checkinTime, String teamname, int cp, String eventcode, String imageurl) async {
+  Future<Map<String, dynamic>> makeCheckpoint(
+      int userId,
+      String token,
+      String checkinTime,
+      String teamname,
+      int cp,
+      String eventcode,
+      String imageurl) async {
+    // print("~~~~ in API call function ~~~~");
+    // print("~~~~ cp is $cp ~~~~");
     //print("--cpcp-- ${cp}");
-    Map<String, dynamic> _res = {};
+    Map<String, dynamic> res = {};
     String url = 'https://rogaining.sumasen.net/gifuroge/checkin_from_rogapp';
-    print('++++++++$url');
+    //print('++++++++$url');
     final IndexController indexController = Get.find<IndexController>();
 
-    if(imageurl != null){
-
-      if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
+    if (imageurl != null) {
+      if (indexController.connectionStatusName.value != "wifi" &&
+          indexController.connectionStatusName.value != "mobile") {
         DatabaseHelper db = DatabaseHelper.instance;
-        Rog _rog = Rog(
-          id:1,
+        Rog rog = Rog(
+          id: 1,
           team_name: teamname,
-          event_code : eventcode,
+          event_code: eventcode,
           user_id: userId,
           cp_number: cp,
           checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
           image: imageurl,
           rog_action_type: 1,
         );
-        db.insertRogaining(_rog);
-      }
-      else {
+        db.insertRogaining(rog);
+      } else {
         String serverUrl = ConstValues.currentServer();
         String url1 = "$serverUrl/api/checkinimage/";
         final im1Bytes = File(imageurl).readAsBytesSync();
         String im1_64 = base64Encode(im1Bytes);
 
+        //print("~~~~ before calling api 1 ~~~~");
+
         final http.Response response = await http.post(
-            Uri.parse(url1),
-            headers: <String, String>{
-              'Content-Type': 'application/json; charset=UTF-8',
-              'Authorization': 'Token $token'
-            },
-            // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' 
-            body: jsonEncode(<String, String>{
-              'user' : userId.toString(),
-              'team_name': teamname,
-              'event_code': eventcode,
-              'checkinimage' : im1_64,
-              'checkintime' : checkinTime,
-              'cp_number' : cp.toString()
-            }),
-          );
+          Uri.parse(url1),
+          headers: <String, String>{
+            'Content-Type': 'application/json; charset=UTF-8',
+            'Authorization': 'Token $token'
+          },
+          // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
+          body: jsonEncode(<String, String>{
+            'user': userId.toString(),
+            'team_name': teamname,
+            'event_code': eventcode,
+            'checkinimage': im1_64,
+            'checkintime': checkinTime,
+            'cp_number': cp.toString()
+          }),
+        );
 
-          _res = json.decode(utf8.decode(response.bodyBytes));
+        res = json.decode(utf8.decode(response.bodyBytes));
+        //print("~~~~ api1 result $res ~~~~");
+        //print("-----@@@@@ checkin $_res -----");
 
-          print("-----@@@@@ $_res -----");
-
-          if(response.statusCode == 201){
-              //print('---- toekn is ${token} -----');
-              final http.Response response2 = await http.post(
-                Uri.parse(url),
-                headers: <String, String>{
-                  'Content-Type': 'application/json; charset=UTF-8',
-                },
-                body: jsonEncode(<String, String>{
-                  'team_name': teamname,
-                  'cp_number': cp.toString(),
-                  'event_code': eventcode,
-                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
-                }),
-              );
-              var vv = jsonEncode(<String, String>{
-                  'team_name': teamname,
-                  'cp_number': cp.toString(),
-                  'event_code': eventcode,
-                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
-                });
-              print("--json-- $vv");
-              print("--- checnin response ${response2.statusCode}----");
-              if (response2.statusCode == 200) {
-                  _res = json.decode(utf8.decode(response2.bodyBytes));
-                  print('----checkin res _res : $_res ----');
-              }
-          }
-      }
-    }
-    else{
-        if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
-          DatabaseHelper db = DatabaseHelper.instance;
-          Rog _rog = Rog(
-            id:1,
-            team_name: teamname,
-            event_code : eventcode,
-            user_id: userId,
-            cp_number: cp,
-            checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
-            image: null,
-            rog_action_type: 1,
-          );
-          db.insertRogaining(_rog);
-        }
-        else {
-          final http.Response response3 = await http.post(
-              Uri.parse(url),
-              headers: <String, String>{
-                'Content-Type': 'application/json; charset=UTF-8',
-              },
-              body: jsonEncode(<String, String>{
-                'team_name': teamname,
-                'cp_number': cp.toString(),
-                'event_code': eventcode,
-                'image': ""
-              }),
-          );
-          var vvv = jsonEncode(<String, String>{
-                  'team_name': teamname,
-                  'cp_number': cp.toString(),
-                  'event_code': eventcode,
-                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
-                });
-              print("--json-- $vvv");
-          print("--- checnin response ${response3.statusCode}----");
-          if (response3.statusCode == 200) {
-                _res = json.decode(utf8.decode(response3.bodyBytes));
-                print('----checkin res _res : $_res ----');
-          }
-        }
-    }
-    return _res;
-  }
-  
-
-  Future<Map<String, dynamic>> makeGoal(int userId, String token, String teamname, String image, String goalTime, String eventcode) async {
-    Map<String, dynamic> _res2 = {};
-
-    final IndexController indexController = Get.find<IndexController>();
-    final DestinationController destinationController = Get.find<DestinationController>();
-
-    //if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
-          DatabaseHelper db = DatabaseHelper.instance;
-          Rog _rog = Rog(
-            id:1,
-            team_name: teamname,
-            event_code : eventcode,
-            user_id: userId,
-            cp_number: -1,
-            checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
-            image: image,
-            rog_action_type: 1,
-          );
-          db.insertRogaining(_rog);
-    // }
-    // else{
-      String serverUrl = ConstValues.currentServer();
-      String url1 = "$serverUrl/api/goalimage/";
-      final im1Bytes = File(image).readAsBytesSync();
-      String im1_64 = base64Encode(im1Bytes);
-
-      final http.Response response = await http.post(
-        Uri.parse(url1),
-        headers: <String, String>{
-          'Content-Type': 'application/json; charset=UTF-8',
-          'Authorization': 'Token $token'
-        },
-        // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' 
-        body: jsonEncode(<String, String>{
-          'user' : userId.toString(),
-          'team_name': teamname,
-          'event_code': eventcode,
-          'goaltime' : goalTime,
-          'goalimage' : im1_64,
-          'cp_number' : "-1"
-        }),
-      );
-
-      String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
-      print('++++++++$url');
-      if (response.statusCode == 201) {
-          Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : $_res ----');
-          print('---- image url ${_res["goalimage"]} ----');
+        if (response.statusCode == 201) {
+          //print("~~~~ image from api1 ${res["checkinimage"].toString()} ~~~~");
+          //print('---- toekn is ${token} -----');
+          //print("~~~~ token is $token ~~~~");
+          //print("~~~~ before callling api2 ~~~~");
           final http.Response response2 = await http.post(
             Uri.parse(url),
             headers: <String, String>{
               'Content-Type': 'application/json; charset=UTF-8',
             },
             body: jsonEncode(<String, String>{
-                'team_name': teamname,
-                'event_code': eventcode,
-                'goal_time' : goalTime,
-                'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
-              }
-            ),
-        );
-        String rec = jsonEncode(<String, String>{
-                'team_name': teamname,
-                'event_code': eventcode,
-                'goal_time' : goalTime,
-                'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
-              }
-            );
-        print("-- json -- $rec");
-        print('----- response2 is $response2 --------');
-        if (response2.statusCode == 200) {
-          _res2 = json.decode(utf8.decode(response2.bodyBytes));
+              'team_name': teamname,
+              'cp_number': cp.toString(),
+              'event_code': eventcode,
+              'image': res["checkinimage"].toString().replaceAll(
+                  'http://localhost:8100', 'http://rogaining.sumasen.net')
+            }),
+          );
+          var vv = jsonEncode(<String, String>{
+            'team_name': teamname,
+            'cp_number': cp.toString(),
+            'event_code': eventcode,
+            'image': res["checkinimage"].toString().replaceAll(
+                'http://localhost:8100', 'http://rogaining.sumasen.net')
+          });
+          //print("~~~~ api 2 values $vv ~~~~");
+          //print("--json-- $vv");
+          //print("--- checnin response ${response2.statusCode}----");
+          if (response2.statusCode == 200) {
+            res = json.decode(utf8.decode(response2.bodyBytes));
+            //print('----checkin res _res : $res ----');
+            if (res["status"] == "ERROR") {
+              Get.snackbar("エラーがおきました", res["detail"]);
+            }
+          }
+        } else {
+          Get.snackbar("エラーがおきました", "サーバーに更新できませんでした");
         }
       }
-    //}
-      destinationController.resetRogaining();
-    return _res2;
+    } else {
+      if (indexController.connectionStatusName.value != "wifi" ||
+          indexController.connectionStatusName.value != "mobile") {
+        DatabaseHelper db = DatabaseHelper.instance;
+        Rog rog = Rog(
+          id: 1,
+          team_name: teamname,
+          event_code: eventcode,
+          user_id: userId,
+          cp_number: cp,
+          checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
+          image: null,
+          rog_action_type: 1,
+        );
+        db.insertRogaining(rog);
+      } else {
+        final http.Response response3 = await http.post(
+          Uri.parse(url),
+          headers: <String, String>{
+            'Content-Type': 'application/json; charset=UTF-8',
+          },
+          body: jsonEncode(<String, String>{
+            'team_name': teamname,
+            'cp_number': cp.toString(),
+            'event_code': eventcode,
+            'image': ""
+          }),
+        );
+        // var vvv = jsonEncode(<String, String>{
+        //   'team_name': teamname,
+        //   'cp_number': cp.toString(),
+        //   'event_code': eventcode,
+        //   'image': res["checkinimage"].toString().replaceAll(
+        //       'http://localhost:8100', 'http://rogaining.sumasen.net')
+        // });
+        // print("--json-- $vvv");
+        // print("--- checnin response ${response3.statusCode}----");
+        if (response3.statusCode == 200) {
+          res = json.decode(utf8.decode(response3.bodyBytes));
+          //print('----checkin res _res : $res ----');
+        }
+      }
+    }
+    //print("~~~~ done checkin ~~~~");
+    return res;
   }
 
+  Future<Map<String, dynamic>> makeGoal(int userId, String token,
+      String teamname, String image, String goalTime, String eventcode) async {
+    Map<String, dynamic> res2 = {};
 
-  static Future<Map<String, dynamic>>  usersEventCode(String teamcode, String password) async {
-    Map<String, dynamic> _res = {};
-    String url = "https://rogaining.sumasen.net/gifuroge/check_event_code?zekken_number=$teamcode&password=$password";
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
+    final IndexController indexController = Get.find<IndexController>();
+    final DestinationController destinationController =
+        Get.find<DestinationController>();
+
+    //if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
+    DatabaseHelper db = DatabaseHelper.instance;
+    Rog rog = Rog(
+      id: 1,
+      team_name: teamname,
+      event_code: eventcode,
+      user_id: userId,
+      cp_number: -1,
+      checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
+      image: image,
+      rog_action_type: 1,
+    );
+    db.insertRogaining(rog);
+    // }
+    // else{
+    String serverUrl = ConstValues.currentServer();
+    String url1 = "$serverUrl/api/goalimage/";
+    final im1Bytes = File(image).readAsBytesSync();
+    String im1_64 = base64Encode(im1Bytes);
+
+    final http.Response response = await http.post(
+      Uri.parse(url1),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-      }
+        'Authorization': 'Token $token'
+      },
+      // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
+      body: jsonEncode(<String, String>{
+        'user': userId.toString(),
+        'team_name': teamname,
+        'event_code': eventcode,
+        'goaltime': goalTime,
+        'goalimage': im1_64,
+        'cp_number': "-1"
+      }),
     );
 
-    if (response.statusCode == 200) {
-      _res = json.decode(utf8.decode(response.bodyBytes));
+    String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
+    //print('++++++++$url');
+    if (response.statusCode == 201) {
+      Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
+      // print('----_res : $res ----');
+      // print('---- image url ${res["goalimage"]} ----');
+      final http.Response response2 = await http.post(
+        Uri.parse(url),
+        headers: <String, String>{
+          'Content-Type': 'application/json; charset=UTF-8',
+        },
+        body: jsonEncode(<String, String>{
+          'team_name': teamname,
+          'event_code': eventcode,
+          'goal_time': goalTime,
+          'image': res["goalimage"].toString().replaceAll(
+              'http://localhost:8100', 'http://rogaining.sumasen.net')
+        }),
+      );
+      String rec = jsonEncode(<String, String>{
+        'team_name': teamname,
+        'event_code': eventcode,
+        'goal_time': goalTime,
+        'image': res["goalimage"]
+            .toString()
+            .replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+      });
+      //print("-- json -- $rec");
+      //print('----- response2 is $response2 --------');
+      if (response2.statusCode == 200) {
+        res2 = json.decode(utf8.decode(response2.bodyBytes));
+      }
     }
-    return _res;
+    //}
+    destinationController.resetRogaining(isgoal: true);
+    return res2;
   }
 
+  Future<bool> removeCheckin(int cp) async {
+    final IndexController indexController = Get.find<IndexController>();
+
+    //int userId = indexController.currentUser[0]["user"]["id"];
+    //print("--- Pressed -----");
+    String team = indexController.currentUser[0]["user"]['team_name'];
+    //print("--- _team : ${_team}-----");
+    String eventCode = indexController.currentUser[0]["user"]["event_code"];
+
+    if (indexController.connectionStatusName.value != "wifi" &&
+        indexController.connectionStatusName.value != "mobile") {
+      return Future.value(false);
+    } else {
+      String url =
+          'https://rogaining.sumasen.net/gifuroge/remove_checkin_from_rogapp';
+      //print('++++++++$url');
+      final http.Response response = await http.post(
+        Uri.parse(url),
+        headers: <String, String>{
+          'Content-Type': 'application/json; charset=UTF-8',
+        },
+        body: jsonEncode(<String, String>{
+          'event_code': eventCode,
+          'team_name': team,
+          'cp_number': cp.toString()
+        }),
+      );
+
+      //print("---- remove checkin ---- ${response.statusCode}");
+
+      if (response.statusCode == 200) {
+        return Future.value(true);
+        //print('----_res : $res ----');
+      }
+    }
+    return Future.value(false);
+  }
+
+  String timestampToTimeString(int timestamp) {
+    // Convert timestamp to DateTime and format it as needed
+    var dateTime = DateTime.fromMillisecondsSinceEpoch(timestamp);
+    //print("^^^^ time ${dateTime}");
+    // Format dateTime to a time string (e.g., '12:00:00')
+    // Adjust the format as needed
+    return "${dateTime.hour}:${dateTime.minute}:${dateTime.second}";
+  }
+
+  Future<bool> pushGPS() async {
+    //print("^^^^ pushed ^^^");
+    final IndexController indexController = Get.find<IndexController>();
+
+    //int userId = indexController.currentUser[0]["user"]["id"];
+    //print("--- Pressed -----");
+    String team = indexController.currentUser[0]["user"]['team_name'];
+    //print("--- _team : ${_team}-----");
+    String eventCode = indexController.currentUser[0]["user"]["event_code"];
+
+    List<GpsData> gpsDataList = [];
+
+    if (indexController.connectionStatusName.value != "wifi" &&
+        indexController.connectionStatusName.value != "mobile") {
+      return Future.value(false);
+    } else {
+      // Step 1: Fetch data from the local database
+      gpsDataList =
+          await GpsDatabaseHelper.instance.getUnsyncedGPSData(team, eventCode);
+
+      // Step 2: Transform data into the required format
+      var payload = {
+        'team_name': team,
+        'event_code': eventCode,
+        'waypoints': gpsDataList.map((gpsData) {
+          return {
+            'latitude': gpsData.lat.toString(),
+            'longitude': gpsData.lon.toString(),
+            // Convert the timestamp to a formatted time string
+            'time': timestampToTimeString(gpsData.created_at),
+          };
+        }).toList(),
+      };
+
+      //print("calling push gps step 2 ${payload}");
+
+      String urlS =
+          'https://rogaining.sumasen.net/gifuroge/get_waypoint_datas_from_rogapp';
+      //print('++++++++$url');
+      var url = Uri.parse(urlS); // Replace with your server URL
+      var response = await http.post(
+        url,
+        headers: {"Content-Type": "application/json"},
+        body: json.encode(payload),
+      );
+
+      //print("GPS Data res ${response.statusCode}");
+      if (response.statusCode == 200) {
+        // Handle success
+        // make local data as synced
+        await GpsDatabaseHelper.instance.setSyncData(gpsDataList);
+        //print("GPS Data sent successfully");
+      } else {
+        // Handle error
+        //print("Failed to send data");
+      }
+    }
+    return Future.value(false);
+  }
+
+  static Future<Map<String, dynamic>> usersEventCode(
+      String teamcode, String password) async {
+    Map<String, dynamic> res = {};
+    String url =
+        "https://rogaining.sumasen.net/gifuroge/check_event_code?zekken_number=$teamcode&password=$password";
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
+
+    if (response.statusCode == 200) {
+      res = json.decode(utf8.decode(response.bodyBytes));
+    }
+    return res;
+  }
 }

lib/services/location_line_service.dart

@@ -1,35 +1,32 @@
-import 'package:geojson/geojson.dart';
-import 'package:http/http.dart' as http;
+// import 'package:geojson/geojson.dart';
+// import 'package:http/http.dart' as http;
 
-import '../utils/const.dart';
+// import '../utils/const.dart';
 
-class LocationLineService{
+// class LocationLineService {
+//   static Future<GeoJsonFeature?> loadLocationLines() async {
+//     final geo = GeoJson();
+//     GeoJsonFeature? fs;
+//     String serverUrl = ConstValues.currentServer();
+//     String url = '$serverUrl/api/location_line/';
+//     //print('++++++++$url');
+//     final response = await http.get(
+//       Uri.parse(url),
+//       headers: <String, String>{
+//         'Content-Type': 'application/json; charset=UTF-8',
+//       },
+//     );
 
-   static Future<GeoJsonFeature?> loadLocationLines() async {
-    final geo = GeoJson();
-    GeoJsonFeature? fs;
-    String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/location_line/';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      },
-    );
+//     if (response.statusCode == 200) {
+//       geo.processedFeatures.listen((fst) {
+//         fs = fst;
+//       });
 
-    if (response.statusCode == 200) {
+//       await geo.parse(response.body, verbose: true);
 
-      geo.processedFeatures.listen((fst) {
-        fs = fst;
-      });
-
-      await geo.parse(response.body, verbose:true);
-
-      return fs;
-
-    } else {
-      throw Exception('Failed to create album.');
-    }
-  }
-
-}
+//       return fs;
+//     } else {
+//       throw Exception('Failed to create album.');
+//     }
+//   }
+// }

lib/services/location_polygon_service.dart

@@ -1,36 +1,33 @@
-import 'package:geojson/geojson.dart';
-import 'package:http/http.dart' as http;
+// import 'package:geojson/geojson.dart';
+// import 'package:http/http.dart' as http;
 
-import '../utils/const.dart';
+// import '../utils/const.dart';
 
-class LocationPolygonervice{
+// class LocationPolygonervice {
+//   static Future<GeoJsonFeature?> loadLocationLines() async {
+//     final geo = GeoJson();
+//     GeoJsonFeature? fs;
 
-   static Future<GeoJsonFeature?> loadLocationLines() async {
-    final geo = GeoJson();
-    GeoJsonFeature? fs;
+//     String serverUrl = ConstValues.currentServer();
+//     String url = '$serverUrl/api/location_polygon/';
+//     //print('++++++++$url');
+//     final response = await http.get(
+//       Uri.parse(url),
+//       headers: <String, String>{
+//         'Content-Type': 'application/json; charset=UTF-8',
+//       },
+//     );
 
-    String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/location_polygon/';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      },
-    );
+//     if (response.statusCode == 200) {
+//       geo.processedFeatures.listen((fst) {
+//         fs = fst;
+//       });
 
-    if (response.statusCode == 200) {
+//       await geo.parse(response.body, verbose: true);
 
-      geo.processedFeatures.listen((fst) {
-        fs = fst;
-      });
-
-      await geo.parse(response.body, verbose:true);
-
-      return fs;
-
-    } else {
-      throw Exception('Failed to create album.');
-    }
-  }
-
-}
+//       return fs;
+//     } else {
+//       throw Exception('Failed to create album.');
+//     }
+//   }
+// }

lib/services/location_service.dart

@@ -1,75 +1,48 @@
 import 'dart:convert';
-
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
+import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/utils/const.dart';
 
-class LocationService{
-
-  // static Future<GeoJsonFeatureCollection?> loadLocations() async {
-
-  //   final IndexController indexController = Get.find<IndexController>();
-
-  //   String server_url = ConstValues.currentServer();
-  //   String url = "";
-  //   if(indexController.currentUser.length > 0){
-  //     url = '${server_url}/api/location/?is_rog=True';
-  //   }
-  //   else {
-  //     url = '${server_url}/api/location/';
-  //   }
-  //   //String url = 'http://localhost:8100/api/location/';
-  //   final response = await http.get(Uri.parse(url),
-  //     headers: <String, String>{
-  //       'Content-Type': 'application/json; charset=UTF-8',
-  //     },
-  //   );
-
-  //   if (response.statusCode == 200) {
-
-  //   return featuresFromGeoJson(utf8.decode(response.bodyBytes));
-  //   }
-  //   return null;
-  // }
-
-  static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
+class LocationService {
+  static Future<GeoJSONFeatureCollection?> loadLocationsFor(
+      String perfecture, String cat) async {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
     String serverUrl = ConstValues.currentServer();
 
-    if(cat.isNotEmpty){
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+    if (cat.isNotEmpty) {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture + '&cat=' + cat;
+        url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture&cat=$cat';
+      } else {
+        url = '$serverUrl/api/inperf/?perf=$perfecture&cat=$cat';
       }
-      else {
-        url = '$serverUrl/api/inperf/?perf=' + perfecture + '&cat=' + cat;
+    } else {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
+        var grp = indexController.currentUser[0]['user']['event_code'];
+        url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture';
+      } else {
+        url = '$serverUrl/api/inperf/?perf=$perfecture';
       }
     }
-    else{
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
-        var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture;
-      }
-      else {
-        url = '$serverUrl/api/inperf/?perf=' + perfecture;
-      }
-    }
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-      GeoJsonFeatureCollection cc =  await featuresFromGeoJson(utf8.decode(response.bodyBytes));
+      GeoJSONFeatureCollection cc =
+          GeoJSONFeatureCollection.fromJSON(utf8.decode(response.bodyBytes));
       //print(cc);
       return cc; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
     }
@@ -80,112 +53,80 @@ class LocationService{
     List<dynamic> ext = [];
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/locsext/';
-    print('++++++++$url');
+    //print('++++++++$url');
     final response = await http.post(Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token $token'
-      },
-      body: jsonEncode(<String, String>{
-        'token': token,
-      })
-    );
+        headers: <String, String>{
+          'Content-Type': 'application/json; charset=UTF-8',
+          'Authorization': 'Token $token'
+        },
+        body: jsonEncode(<String, String>{
+          'token': token,
+        }));
 
     if (response.statusCode == 200) {
-
       ext = json.decode(utf8.decode(response.bodyBytes));
     }
     return ext;
   }
 
-
-  static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
+  static Future<GeoJSONFeatureCollection?> loadLocationsBound(
+      double lat1,
+      double lon1,
+      double lat2,
+      double lon2,
+      double lat3,
+      double lon3,
+      double lat4,
+      double lon4,
+      String cat) async {
+    //print("-------- in location for bound -------------");
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
     String serverUrl = ConstValues.currentServer();
-    if(cat.isNotEmpty){
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+    if (cat.isNotEmpty) {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture + '&cat=' + cat;
+        url =
+            '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
+      } else {
+        url =
+            '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
       }
-      else{
-        url = '$serverUrl/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
-      }
-    }
-    else{
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+    } else {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture;
-      }
-      else{
-        url = '$serverUrl/api/insubperf?subperf=' + subperfecture; 
+        //print("-------- requested user group $grp -------------");
+        url =
+            '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
+      } else {
+        url =
+            '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
       }
     }
     print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      },
-    );
-
-    if (response.statusCode == 200) {
-      GeoJsonFeatureCollection cc =  await featuresFromGeoJson(utf8.decode(response.bodyBytes));
-      //print(cc);
-      return cc; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
-    }
-    return null;
-  }
-
-
-  static Future<GeoJsonFeatureCollection?> loadLocationsBound(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4, String cat) async {
-    print("-------- in location for bound -------------");
-    final IndexController indexController = Get.find<IndexController>();
-    String url = "";
-    String serverUrl = ConstValues.currentServer();
-    if(cat.isNotEmpty){
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
-        var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
-      }
-      else{
-        url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
-      }
-    }
-    else{
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
-        var grp = indexController.currentUser[0]['user']['event_code'];
-        print("-------- requested user group $grp -------------");
-        url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-      }
-      else{
-        url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-      }
-    }
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 500) {
-      return GeoJsonFeatureCollection(); //featuresFromGeoJson(utf8.decode(response.bodyBytes));
+      return null; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
     }
 
     if (response.statusCode == 200) {
-      GeoJsonFeatureCollection cc =  await featuresFromGeoJson(utf8.decode(response.bodyBytes));
-      if(cc.collection.isEmpty){
+      DestinationController destinationController =
+          Get.find<DestinationController>();
+      GeoJSONFeatureCollection cc =
+          GeoJSONFeatureCollection.fromJSON(utf8.decode(response.bodyBytes));
+      if (cc.features.isEmpty) {
         return null;
-      }
-      else{
+      } else {
         //print("---- feature got from server is ${cc.collection[0].properties} ------");
         return cc;
       }
@@ -193,61 +134,55 @@ class LocationService{
     return null;
   }
 
-
-  static Future<GeoJsonFeatureCollection?> loadCustomLocations(String name, String cat) async {
+  static Future<GeoJSONFeatureCollection?> loadCustomLocations(
+      String name, String cat) async {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
-    if(cat == "-all-"){
+    if (cat == "-all-") {
       cat = "";
     }
     String serverUrl = ConstValues.currentServer();
-    print("loadCustomLocations url is ----- $cat");
-    if(cat.isNotEmpty){
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+    //print("loadCustomLocations url is ----- $cat");
+    if (cat.isNotEmpty) {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '$serverUrl/api/custom_area/?rog=$r&&cat=' + cat;
+        url = '$serverUrl/api/custom_area/?rog=$r&&cat=$cat';
+      } else {
+        url = '$serverUrl/api/custom_area/?&cat=$cat';
       }
-      else{
-        url = '$serverUrl/api/custom_area/?&cat=' + cat;
-      }
-    }
-    else{
-      if(indexController.currentUser.isNotEmpty){
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+    } else {
+      if (indexController.currentUser.isNotEmpty) {
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
         url = '$serverUrl/api/customarea?rog=$r&name=$name';
-      }
-      else{
+      } else {
         url = '$serverUrl/api/customarea?name=$name';
       }
     }
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 500) {
-      return GeoJsonFeatureCollection(); //featuresFromGeoJson(utf8.decode(response.bodyBytes));
+      return null; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
     }
 
     if (response.statusCode == 200) {
-      GeoJsonFeatureCollection cc =  await featuresFromGeoJson(utf8.decode(response.bodyBytes));
-      if(cc.collection.isEmpty){
+      GeoJSONFeatureCollection cc =
+          GeoJSONFeatureCollection.fromJSON(utf8.decode(response.bodyBytes));
+      if (cc.features.isEmpty) {
         return null;
-      }
-      else{
+      } else {
         return cc;
       }
     }
     return null;
   }
-
-
-
-
 }

lib/services/maxtrix_service.dart

@@ -1,73 +1,66 @@
-
 import 'dart:convert';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 
-
-class MatrixService{
-
-  static Future<Map<String, dynamic>>  getDestinations(List<Destination> destinations) async {
-
-    final DestinationController destinationController = Get.find<DestinationController>();
+class MatrixService {
+  static Future<Map<String, dynamic>> getDestinations(
+      List<Destination> destinations) async {
+    final DestinationController destinationController =
+        Get.find<DestinationController>();
 
     String locs = "";
     String origin = "";
     String destination = "";
     int i = 0;
-    for(Destination d in destinations){
+    for (Destination d in destinations) {
+      //print("---- getting matrix for $d ------------");
 
-      print("---- getting matrix for $d ------------");
-
-      if(i==0){
+      if (i == 0) {
         origin = "${d.lat}, ${d.lon}";
         i++;
         continue;
       }
 
-      if(i == (destinations.length - 1)){
+      if (i == (destinations.length - 1)) {
         destination = "${d.lat}, ${d.lon}";
         i++;
         continue;
       }
 
-      print("lat is ${d.lat}, long is ${d.lon}");
+      //print("lat is ${d.lat}, long is ${d.lon}");
       locs += "${d.lat}, ${d.lon}|";
       i++;
     }
 
     locs = "optimize:false|$locs";
 
-    String _mode = "walking";
+    String mode = "walking";
     switch (destinationController.travelMode.value) {
       case 1:
-        _mode = "driving";
+        mode = "driving";
         break;
       case 2:
-        _mode = "transit";
-      break;
+        mode = "transit";
+        break;
       default:
-        _mode = "walking";
+        mode = "walking";
         break;
     }
 
     Map<String, dynamic> cats = {};
-    String url = "https://maps.googleapis.com/maps/api/directions/json?destination=$destination&mode=$_mode&waypoints=$locs&origin=$origin&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE";
-    print('++++++++$url');
-    final http.Response response = await http.get(
-      Uri.parse(url),
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      }
-    );
+    String url =
+        "https://maps.googleapis.com/maps/api/directions/json?destination=$destination&mode=$mode&waypoints=$locs&origin=$origin&key=AIzaSyCN2xFsqFyadWwpjiFxymrxzS6G1tNzraI";
+    //print('++++++++$url');
+    final http.Response response =
+        await http.get(Uri.parse(url), headers: <String, String>{
+      'Content-Type': 'application/json; charset=UTF-8',
+    });
 
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
     return cats;
   }
-
-
 }
-

lib/services/perfecture_service.dart

@@ -2,22 +2,20 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:rogapp/utils/const.dart';
 
-
-class PerfectureService{
-
+class PerfectureService {
   static Future<List<dynamic>?> loadPerfectures() async {
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/perf_main/';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -26,35 +24,34 @@ class PerfectureService{
   static Future<List<dynamic>?> loadSubPerfectures(String area) async {
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/subperfinmain/?area=' + area;
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    String url = '$serverUrl/api/subperfinmain/?area=$area';
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
 
-
   static Future<List<dynamic>?> getMainPerfExt(String id) async {
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/mainperfext/?perf=' + id;
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    String url = '$serverUrl/api/mainperfext/?perf=$id';
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -63,16 +60,16 @@ class PerfectureService{
   static Future<List<dynamic>?> loadGifuAreas(String perf) async {
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/allgifuareas/?perf=' + perf;
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    String url = '$serverUrl/api/allgifuareas/?perf=$perf';
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -82,40 +79,35 @@ class PerfectureService{
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/customareanames';
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
 
-
   static Future<List<dynamic>?> getSubExt(String id) async {
     List<dynamic> perfs = [];
     String serverUrl = ConstValues.currentServer();
-    String url = '$serverUrl/api/perfext/?sub_perf=' + id;
-    print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    String url = '$serverUrl/api/perfext/?sub_perf=$id';
+    //print('++++++++$url');
+    final response = await http.get(
+      Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
     );
 
     if (response.statusCode == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
-
-
-
 }
-

lib/services/reacking_service.dart

@@ -1,27 +1,22 @@
-
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 import 'package:rogapp/utils/const.dart';
 
-
 class TrackingService {
-
-  static Future<Map<String, dynamic>>  addTrack(String userId, double lat, double lon) async {
+  static Future<Map<String, dynamic>> addTrack(
+      String userId, double lat, double lon) async {
     Map<String, dynamic> cats = {};
     String serverUrl = ConstValues.currentServer();
     String url = '$serverUrl/api/track/';
-    print('++++++++$url');
+    //print('++++++++$url');
     final geom = '{"type": "MULTIPOINT", "coordinates": [[$lon, $lat]]}';
     final http.Response response = await http.post(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
       },
-      body: jsonEncode(<String, String>{
-        'user_id': userId,
-        'geom': geom
-      }),
+      body: jsonEncode(<String, String>{'user_id': userId, 'geom': geom}),
     );
 
     if (response.statusCode == 200) {
@@ -29,5 +24,4 @@ class TrackingService {
     }
     return cats;
   }
-
 }

lib/utils/const.dart

@@ -10,6 +10,7 @@ class ConstValues{
   static const dev_home_ip_mserver = "http://192.168.1.10:8100";
   
   static String currentServer(){
+    //return dev_ip_server;
     return server_uri;
   }
 }

lib/utils/database_gps.dart

@@ -0,0 +1,102 @@
+import 'dart:io';
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:rogapp/model/gps_data.dart';
+import 'package:sqflite/sqflite.dart';
+
+class GpsDatabaseHelper {
+  GpsDatabaseHelper._privateConstructor();
+  static final GpsDatabaseHelper instance =
+      GpsDatabaseHelper._privateConstructor();
+  static Database? _database;
+  Future<Database> get database async => _database ??= await _initDatabase();
+
+  Future<Database> _initDatabase() async {
+    Directory documentDirectory = await getApplicationDocumentsDirectory();
+    String path = join(documentDirectory.path, 'rog.db');
+    // return  await openDatabase(
+    //   path,
+    //   version: 1,
+    //   onCreate: _onCreate,
+    // );
+    return openDatabase(
+        join(
+          await getDatabasesPath(),
+          'gps.db',
+        ),
+        version: 1,
+        onCreate: _onCreate);
+  }
+
+  Future _onCreate(Database db, int version) async {
+    await db.execute('''
+    CREATE TABLE gps(
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      team_name TEXT,
+      event_code TEXT,
+      lat REAL, 
+      lon REAL,
+      is_checkin int,
+      created_at INTEGER,
+      is_synced INTEGER DEFAULT 0
+    )
+    ''');
+  }
+
+  Future<int> insertGps(GpsData gps) async {
+    try {
+      print("---- try insering ${gps.toMap()}");
+      Database db = await instance.database;
+      int? nextOrder =
+          Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM gps'));
+      nextOrder = nextOrder ?? 0;
+      nextOrder = nextOrder + 1;
+      gps.id = nextOrder;
+      print("---- insering ${gps.toMap()}");
+      int res = await db.insert(
+        'gps',
+        gps.toMap(),
+        conflictAlgorithm: ConflictAlgorithm.replace,
+      );
+      print("------ database helper insert $res-----------::::::::");
+      return res;
+    } catch (err) {
+      print("------ error $err-----------::::::::");
+      return -1;
+    }
+  }
+
+  Future<List<GpsData>> getGPSData(String team_name, String event_code) async {
+    Database db = await instance.database;
+    var gpss = await db.query('gps',
+        where: "team_name = ? and event_code = ?",
+        whereArgs: [team_name, event_code],
+        orderBy: 'created_at');
+    List<GpsData> gpsDatas =
+        gpss.isNotEmpty ? gpss.map((e) => GpsData.fromMap(e)).toList() : [];
+    //print("--------- db list $gpsDatas");
+    return gpsDatas;
+  }
+
+  Future<List<GpsData>> getUnsyncedGPSData(
+      String team_name, String event_code) async {
+    Database db = await instance.database;
+    var gpss = await db.query('gps',
+        where: 'team_name = ? and event_code = ? and is_synced = 0',
+        whereArgs: [team_name, event_code],
+        orderBy: 'created_at');
+    return gpss.isNotEmpty ? gpss.map((e) => GpsData.fromMap(e)).toList() : [];
+  }
+
+  Future<void> setSyncData(List<GpsData> data) async {
+    Database db = await instance.database;
+    for (var record in data) {
+      await db.update(
+        'gps',
+        {'is_synced': 1},
+        where: 'id = ?',
+        whereArgs: [record.id],
+      );
+    }
+  }
+}

lib/utils/database_helper.dart

@@ -6,7 +6,7 @@ import 'package:path/path.dart';
 
 import '../model/rog.dart';
 
-class DatabaseHelper{
+class DatabaseHelper {
   DatabaseHelper._privateConstructor();
   static final DatabaseHelper instance = DatabaseHelper._privateConstructor();
 
@@ -21,7 +21,13 @@ class DatabaseHelper{
     //   version: 1,
     //   onCreate: _onCreate,
     // );
-    return openDatabase(join(await getDatabasesPath(), 'rog.db',), version: 1, onCreate: _onCreate);
+    return openDatabase(
+        join(
+          await getDatabasesPath(),
+          'rog.db',
+        ),
+        version: 1,
+        onCreate: _onCreate);
   }
 
   Future _onCreate(Database db, int version) async {
@@ -48,11 +54,16 @@ class DatabaseHelper{
       cp REAL,
       checkin_point REAL,
       buy_point REAL,
-      hidden_location INTEGER
+      hidden_location INTEGER,
+      checkin_image TEXT,
+      buypoint_image TEXT,
+      forced_checkin INTEGER,
+      recipt_times INTEGER,
+      tags TEXT
     )
     ''');
 
-  await db.execute('''
+    await db.execute('''
     CREATE TABLE rogaining(
       rog_id INTEGER PRIMARY KEY AUTOINCREMENT,
       course_id INTEGER,
@@ -65,7 +76,7 @@ class DatabaseHelper{
     )
     ''');
 
-  await db.execute('''
+    await db.execute('''
     CREATE TABLE rog(
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       team_name TEXT,
@@ -77,54 +88,41 @@ class DatabaseHelper{
       rog_action_type INTEGER
     )
     ''');
-
   }
 
   Future<List<Rog>> allRogianing() async {
     Database db = await instance.database;
     var rog = await db.query('rog');
-    List<Rog> roglist = rog.isNotEmpty ?
-      rog.map((e) => Rog.fromMap(e)).toList() : [];
-    print("--------- $rog");
+    List<Rog> roglist =
+        rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
+    //print("--------- $rog");
     return roglist;
   }
 
-
   Future<List<Rog>> getRogainingByLatLon(double lat, double lon) async {
     Database db = await instance.database;
     var rog = await db.query('rog', where: "lat = $lat and lon= $lon");
-    List<Rog> roglist = rog.isNotEmpty
-      ? rog.map((e) => Rog.fromMap(e)).toList() : [];
+    List<Rog> roglist =
+        rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
     return roglist;
   }
 
   Future clearSelection() async {
     Database db = await instance.database;
-    Map<String, dynamic> rowClear = {
-          "selected": false
-    };
-    return await db.update(
-        "destination", 
-        rowClear
-      );
+    Map<String, dynamic> rowClear = {"selected": false};
+    return await db.update("destination", rowClear);
   }
 
   Future<int> toggleSelecttion(Destination dest) async {
     Database db = await instance.database;
 
     bool val = !dest.selected!;
-    Map<String, dynamic> rowTarget = {
-          "selected": val
-      };
+    Map<String, dynamic> rowTarget = {"selected": val};
 
     await clearSelection();
 
-    return await db.update(
-        "destination", 
-        rowTarget,
-        where: 'location_id = ?',
-        whereArgs: [dest.location_id!]
-        );
+    return await db.update("destination", rowTarget,
+        where: 'location_id = ?', whereArgs: [dest.location_id!]);
   }
 
   Future<int> deleteRogaining(int id) async {
@@ -135,28 +133,27 @@ class DatabaseHelper{
     return ret;
   }
 
-
   Future<void> deleteAllRogaining() async {
     Database db = await instance.database;
     await db.delete('rog');
   }
 
-  
-  Future<bool>isRogAlreadyAvailable(int id) async{
+  Future<bool> isRogAlreadyAvailable(int id) async {
     Database db = await instance.database;
     var rog = await db.query('rog', where: "id = $id");
     return rog.isNotEmpty ? true : false;
   }
 
-  Future<int?>latestGoal() async{
+  Future<int?> latestGoal() async {
     Database db = await instance.database;
-    return Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(checkintime) FROM rog'));
-    
+    return Sqflite.firstIntValue(
+        await db.rawQuery('SELECT MAX(checkintime) FROM rog'));
   }
 
   Future<int> insertRogaining(Rog rog) async {
     Database db = await instance.database;
-    int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
+    int? nextOrder =
+        Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
     nextOrder = nextOrder ?? 0;
     nextOrder = nextOrder + 1;
     rog.id = nextOrder;
@@ -165,40 +162,41 @@ class DatabaseHelper{
       rog.toMap(),
       conflictAlgorithm: ConflictAlgorithm.replace,
     );
-    print("------ database helper insert $res-----------::::::::");
+    //print("------ database helper insert $res-----------::::::::");
     return res;
   }
 
-
   Future<List<Destination>> getDestinations() async {
     Database db = await instance.database;
     var dest = await db.query('destination', orderBy: 'list_order');
-    List<Destination> destList = dest.isNotEmpty ?
-      dest.map((e) => Destination.fromMap(e)).toList() : [];
-    print("--------- $destList");
+    List<Destination> destList =
+        dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
+    //print("--------- $destList");
     return destList;
   }
 
   Future<List<Destination>> getDestinationById(int id) async {
     Database db = await instance.database;
     var rog = await db.query('destination', where: "location_id = $id");
-    List<Destination> deslist = rog.isNotEmpty
-      ? rog.map((e) => Destination.fromMap(e)).toList() : [];
+    List<Destination> deslist =
+        rog.isNotEmpty ? rog.map((e) => Destination.fromMap(e)).toList() : [];
     return deslist;
   }
 
-
-  Future<List<Destination>> getDestinationByLatLon(double lat, double lon) async {
+  Future<List<Destination>> getDestinationByLatLon(
+      double lat, double lon) async {
     Database db = await instance.database;
-    var dest = await db.query('destination', where: "lat = $lat and lon= $lon", orderBy: 'list_order');
-    List<Destination> destList = dest.isNotEmpty
-      ? dest.map((e) => Destination.fromMap(e)).toList() : [];
+    var dest = await db.query('destination',
+        where: "lat = $lat and lon= $lon", orderBy: 'list_order');
+    List<Destination> destList =
+        dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
     return destList;
   }
 
   Future<int> deleteDestination(int locationId) async {
     Database db = await instance.database;
-    var dest = await db.delete('destination', where: "location_id = $locationId");
+    var dest =
+        await db.delete('destination', where: "location_id = $locationId");
     int ret = dest > 0 ? dest : -1;
 
     //after deleting set correct order
@@ -207,26 +205,20 @@ class DatabaseHelper{
     return ret;
   }
 
-  Future<void>setOrder() async {
+  Future<void> setOrder() async {
     Database db = await instance.database;
     var byOrder = await db.query('destination', orderBy: 'list_order');
 
     List<Destination> desDb = byOrder.isNotEmpty
-    ? byOrder.map((e) => Destination.fromMap(e)).toList() : [];
+        ? byOrder.map((e) => Destination.fromMap(e)).toList()
+        : [];
 
     int order = 1;
-    for( Destination d in desDb){
+    for (Destination d in desDb) {
+      Map<String, dynamic> rowTarget = {"list_order": order};
 
-      Map<String, dynamic> rowTarget = {
-          "list_order": order
-      };
-
-      await db.update(
-        "destination", 
-        rowTarget,
-        where: 'location_id = ?',
-        whereArgs: [d.location_id]
-      );
+      await db.update("destination", rowTarget,
+          where: 'location_id = ?', whereArgs: [d.location_id]);
 
       order += 1;
     }
@@ -237,15 +229,18 @@ class DatabaseHelper{
     await db.delete('destination');
   }
 
-  Future<bool>isAlreadyAvailable(int locationId) async{
+  Future<bool> isAlreadyAvailable(int locationId) async {
     Database db = await instance.database;
-    var dest = await db.query('destination', where: "location_id = $locationId");
+    var dest =
+        await db.query('destination', where: "location_id = $locationId");
     return dest.isNotEmpty ? true : false;
   }
 
   Future<int> insertDestination(Destination dest) async {
+    await deleteDestination(dest.location_id!);
     Database db = await instance.database;
-    int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(list_order) FROM destination'));
+    int? nextOrder = Sqflite.firstIntValue(
+        await db.rawQuery('SELECT MAX(list_order) FROM destination'));
     nextOrder = nextOrder ?? 0;
     nextOrder = nextOrder + 1;
     dest.list_order = nextOrder;
@@ -258,39 +253,50 @@ class DatabaseHelper{
     return res;
   }
 
-  Future<int> updateAction(Destination destination, bool checkin)async {
+  Future<int> updateCancelBuyPoint(Destination destination) async {
+    //print("---- updating puypint image in db -----");
     Database db = await instance.database;
-    int act = checkin == false ? 0 : 1;
-    Map<String, dynamic> row = {
-      "checkedin": act
-    };
-    return await db.update(
-      "destination", 
-      row,
-      where: 'location_id = ?',
-      whereArgs: [destination.location_id!]
-      );
+    Map<String, dynamic> row = {"buy_point": 0};
+    return await db.update("destination", row,
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
   }
 
-  Future<void> updateOrder(Destination d, int dir)async {
+  Future<int> updateBuyPoint(Destination destination, String imageUrl) async {
+    //print("---- updating puypint image in db -----");
     Database db = await instance.database;
-    var target = await db.query('destination', where: "list_order = ${d.list_order! + dir}");
-    var dest = await db.query('destination', where: "location_id = ${d.location_id}");
+    Map<String, dynamic> row = {"buypoint_image": imageUrl};
+    return await db.update("destination", row,
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
+  }
 
-    print("--- target in db is $target");
-    print("--- destine in db is $dest");
+  Future<int> updateAction(Destination destination, bool checkin) async {
+    Database db = await instance.database;
+    int act = checkin == false ? 0 : 1;
+    Map<String, dynamic> row = {"checkedin": act};
+    return await db.update("destination", row,
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
+  }
 
-    if(target.isNotEmpty){
+  Future<void> updateOrder(Destination d, int dir) async {
+    Database db = await instance.database;
+    var target = await db.query('destination',
+        where: "list_order = ${d.list_order! + dir}");
+    var dest =
+        await db.query('destination', where: "location_id = ${d.location_id}");
 
+    // print("--- target in db is $target");
+    // print("--- destine in db is $dest");
+
+    if (target.isNotEmpty) {
       List<Destination> targetIndb = target.isNotEmpty
-      ? target.map((e) => Destination.fromMap(e)).toList() : [];
+          ? target.map((e) => Destination.fromMap(e)).toList()
+          : [];
 
       List<Destination> destIndb = dest.isNotEmpty
-      ? dest.map((e) => Destination.fromMap(e)).toList() : [];
+          ? dest.map((e) => Destination.fromMap(e)).toList()
+          : [];
 
-      Map<String, dynamic> rowTarget = {
-        "list_order": d.list_order
-      };
+      Map<String, dynamic> rowTarget = {"list_order": d.list_order};
 
       Map<String, dynamic> rowDes = {
         "list_order": destIndb[0].list_order! + dir
@@ -299,19 +305,11 @@ class DatabaseHelper{
       // print("--- target destination is ${target_indb[0].location_id}");
       // print("--- destine destination is is ${dest_indb[0].location_id}");
 
-      await db.update(
-        "destination", 
-        rowTarget,
-        where: 'location_id = ?',
-        whereArgs: [targetIndb[0].location_id]
-      );
+      await db.update("destination", rowTarget,
+          where: 'location_id = ?', whereArgs: [targetIndb[0].location_id]);
 
-      await db.update(
-        "destination", 
-        rowDes,
-        where: 'location_id = ?',
-        whereArgs: [destIndb[0].location_id]
-      );
+      await db.update("destination", rowDes,
+          where: 'location_id = ?', whereArgs: [destIndb[0].location_id]);
     }
   }
 
@@ -319,6 +317,4 @@ class DatabaseHelper{
   //   Database db = await instance.database;
   //   return await Sqflite.firstIntValue(await db.rawQuery("SELECT COUNT(*) FROM incidents"));
   // }
-
 }
-

lib/utils/location_controller.dart

@@ -0,0 +1,162 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:rogapp/widgets/debug_widget.dart';
+import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
+
+class LocationController extends GetxController {
+  // Reactive variable to hold the current position
+  Rx<Position?> currentPosition = Rx<Position?>(null);
+
+  // Subscription to the position stream
+  StreamSubscription<Position>? positionStream;
+
+  final locationMarkerPositionStreamController =
+      StreamController<LocationMarkerPosition?>.broadcast();
+
+  bool isStreamPaused = false;
+
+  Stream<LocationMarkerPosition?> get locationMarkerPositionStream =>
+      locationMarkerPositionStreamController.stream;
+
+  @override
+  void onInit() {
+    super.onInit();
+    // Start listening to location updates when the controller is initialized
+    startPositionStream();
+  }
+
+  void startPositionStream() async {
+    // Check for location service and permissions before starting the stream
+    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    if (!serviceEnabled) {
+      // Use GetX's context to show a dialog
+      Get.dialog(
+        AlertDialog(
+          title: const Text('Location Services Disabled'),
+          content: const Text(
+              'Please enable location services to continue using the app.'),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('OK'),
+              onPressed: () {
+                // Close the dialog
+                Get.back();
+                // Optionally, you can direct the user to the settings page
+                // Geolocator.openLocationSettings();
+              },
+            ),
+          ],
+        ),
+        barrierDismissible: false, // User must tap button to close dialog
+      );
+      return;
+    }
+
+    LocationPermission permission = await Geolocator.checkPermission();
+    if (permission == LocationPermission.denied) {
+      permission = await Geolocator.requestPermission();
+      if (permission == LocationPermission.denied) {
+        // Show a dialog if permissions are still denied
+        Get.dialog(
+          AlertDialog(
+            title: const Text('Location Permission Denied'),
+            content: const Text(
+                'This app requires location permissions to function properly. Please enable location permissions in your device settings.'),
+            actions: <Widget>[
+              TextButton(
+                child: const Text('OK'),
+                onPressed: () {
+                  // Close the dialog
+                  Get.back();
+                  // Optionally, direct the user to the app settings
+                  // Geolocator.openAppSettings();
+                },
+              ),
+            ],
+          ),
+          barrierDismissible: false,
+        );
+        return;
+      }
+    }
+
+    if (permission == LocationPermission.deniedForever) {
+      // Show a dialog if permissions are permanently denied
+      Get.dialog(
+        AlertDialog(
+          title: const Text('Location Permission Needed'),
+          content: const Text(
+              'Location permissions have been permanently denied. Please open app settings to enable location permissions.'),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('Open Settings'),
+              onPressed: () {
+                // Close the dialog and open app settings
+                Get.back();
+                Geolocator.openAppSettings();
+              },
+            ),
+          ],
+        ),
+        barrierDismissible: false,
+      );
+      return;
+    }
+
+    // Set up the location options
+    const locationOptions =
+        LocationSettings(accuracy: LocationAccuracy.high, distanceFilter: 0);
+
+    await positionStream?.cancel();
+
+    positionStream =
+        Geolocator.getPositionStream(locationSettings: locationOptions).listen(
+      (Position? position) {
+        if (position != null) {
+          final LocationMarkerPosition locationMarkerPosition =
+              LocationMarkerPosition(
+                  latitude: position.latitude,
+                  longitude: position.longitude,
+                  accuracy: position.accuracy);
+          locationMarkerPositionStreamController.add(locationMarkerPosition);
+        } else {
+          locationMarkerPositionStreamController.add(null);
+        }
+      },
+      onError: (e) {
+        locationMarkerPositionStreamController.addError(e);
+      },
+    );
+
+    // Resume stream if it was paused previously
+    if (isStreamPaused) {
+      isStreamPaused = false;
+      positionStream!.resume();
+    }
+  }
+
+  // Method to stop the position stream
+  void stopPositionStream() {
+    if (positionStream != null) {
+      positionStream!.pause();
+      isStreamPaused = true;
+    }
+  }
+
+  // Method to resume the position stream
+  void resumePositionStream() {
+    if (positionStream != null && isStreamPaused) {
+      positionStream!.resume();
+      isStreamPaused = false;
+    }
+  }
+
+  @override
+  void onClose() {
+    // Cancel the position stream subscription when the controller is closed
+    positionStream?.cancel();
+    super.onClose();
+  }
+}

lib/utils/text_util.dart

@@ -1,42 +1,39 @@
-
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:rogapp/model/destination.dart';
 
-class TextUtils{
-
-    static String getDisplayTextFeture(GeoJsonFeature f){
-      RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-      String txt = "";
-      // if(f.properties!["cp"] > 0){
-      //   //print("-- sub--  ${f.properties!["cp"]} ----");
-      //   txt = "${f.properties!["cp"].toString().replaceAll(regex, '')}";
-      // }
-      //if(f.properties!["buy_point"] != null && f.properties!["buy_point"] > 0){
-          txt = txt + "${f.properties!["sub_loc_id"]}";
-      //}
-      return txt;
-    }
-
-
-    static String getDisplayText(Destination dp){
-      RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-      String txt = "";
-      if(dp.cp! > 0){
-        txt = dp.cp.toString().replaceAll(regex, '');
-        if(dp.checkin_point != null && dp.checkin_point! > 0){
-          txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}";
-        }
-        if(dp.buy_point != null && dp.buy_point! > 0){
-          print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");
-          txt = "#${dp.cp.toString().replaceAll(regex, '')}(${dp.checkin_point.toString().replaceAll(regex, '')}+${dp.buy_point.toString().replaceAll(regex, '')})";
-        }
-      }
-      return txt;
-    }
-
-    // static String getDisplayText(String num){
-    //   RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-    //   return "${num.replaceAll(regex, '')}";
+class TextUtils {
+  static String getDisplayTextFeture(GeoJSONFeature f) {
+    RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
+    String txt = "";
+    // if(f.properties!["cp"] > 0){
+    //   //print("-- sub--  ${f.properties!["cp"]} ----");
+    //   txt = "${f.properties!["cp"].toString().replaceAll(regex, '')}";
     // }
+    //if(f.properties!["buy_point"] != null && f.properties!["buy_point"] > 0){
+    txt = "$txt${f.properties!["sub_loc_id"]}";
+    //}
+    return txt;
+  }
 
+  static String getDisplayText(Destination dp) {
+    RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
+    String txt = "";
+    if (dp.cp! > 0) {
+      txt = dp.cp.toString().replaceAll(regex, '');
+      if (dp.checkin_point != null && dp.checkin_point! > 0) {
+        txt = "$txt{${dp.checkin_point.toString().replaceAll(regex, '')}}";
+      }
+      if (dp.buy_point != null && dp.buy_point! > 0) {
+        //print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");
+        txt =
+            "#${dp.cp.toString().replaceAll(regex, '')}(${dp.checkin_point.toString().replaceAll(regex, '')}+${dp.buy_point.toString().replaceAll(regex, '')})";
+      }
+    }
+    return txt;
+  }
+
+  // static String getDisplayText(String num){
+  //   RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
+  //   return "${num.replaceAll(regex, '')}";
+  // }
 }

lib/widgets/GameState/CheckinState.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:rogapp/widgets/GameState/Colors.dart';
+
+class LocationVisitedWidget extends StatelessWidget {
+  final int count;
+  final bool minimized;
+
+  const LocationVisitedWidget(
+      {Key? key, required this.count, this.minimized = false})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (minimized) {
+      return Container(
+        height: 40,
+        width: 40,
+        decoration: BoxDecoration(
+          color: JapaneseColors.mizu,
+          shape: BoxShape.circle,
+        ),
+        child: Center(
+          child: Text(
+            '$count',
+            style: TextStyle(
+              color: Colors.white,
+              fontWeight: FontWeight.bold,
+              fontSize: 14,
+            ),
+          ),
+        ),
+      );
+    } else {
+      return Container(
+        padding: EdgeInsets.symmetric(vertical: 8, horizontal: 8),
+        decoration: BoxDecoration(
+          color: JapaneseColors.matcha,
+          borderRadius: BorderRadius.circular(10),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.check_circle_outline, color: Colors.white, size: 24),
+            SizedBox(width: 8),
+            Text(
+              '$count チェックイン', // "X Check-ins" in Japanese
+              style: TextStyle(
+                  color: Colors.white,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 16),
+            ),
+          ],
+        ),
+      );
+    }
+  }
+}

lib/widgets/GameState/Colors.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class JapaneseColors {
+  static const Color mizu = Color(0xFFA4DDED); // Mizu (light blue)
+  static const Color matcha = Color(0xFFC5E1A5);
+  static const Color ume = Color(0xFFE1A8A8); // Ume (plum)
+  static const Color take = Color(0xFF7B8D42); // Take (bamboo)
+  static const Color sora = Color(0xFFA1CAF1);
+  static const Color indigo = Color(0xFF264653); // Aizome
+  static const Color sakuraPink = Color(0xFFFAD2E1); // Sakura-iro
+  /// Matcha (green tea)
+}

lib/widgets/GameState/ConnectionStatus.dart

@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'package:rogapp/widgets/GameState/Colors.dart';
+
+enum ConnectionStatus { none, mobile, wifi }
+
+class ConnectionStatusIndicator extends StatelessWidget {
+  final ConnectionStatus connectionStatus;
+  final bool minimized;
+
+  const ConnectionStatusIndicator({
+    Key? key,
+    required this.connectionStatus,
+    this.minimized = false,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Color backgroundColor;
+    IconData iconData;
+    String text;
+
+    switch (connectionStatus) {
+      case ConnectionStatus.none:
+        backgroundColor = JapaneseColors.ume;
+        iconData = Icons.signal_cellular_off;
+        text = 'No Connection';
+        break;
+      case ConnectionStatus.mobile:
+        backgroundColor = JapaneseColors.take;
+        iconData = Icons.signal_cellular_alt;
+        text = 'Mobile Data';
+        break;
+      case ConnectionStatus.wifi:
+        backgroundColor = JapaneseColors.sora;
+        iconData = Icons.wifi;
+        text = 'Wi-Fi';
+        break;
+      default:
+        backgroundColor = Colors.grey; // Fallback color
+        iconData = Icons.device_unknown;
+        text = 'Unknown';
+    }
+
+    return Container(
+      height: minimized ? 40 : null,
+      width: minimized ? 40 : null,
+      padding:
+          minimized ? null : EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      decoration: BoxDecoration(
+        color: backgroundColor,
+        shape: minimized ? BoxShape.circle : BoxShape.rectangle,
+        borderRadius: minimized ? null : BorderRadius.circular(10),
+      ),
+      child: minimized
+          ? Center(
+              child: Icon(iconData, color: Colors.white, size: 24),
+            )
+          : Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(iconData, color: Colors.white),
+                SizedBox(width: 8),
+                Text(
+                  text,
+                  style: TextStyle(
+                      color: Colors.white, fontWeight: FontWeight.bold),
+                ),
+              ],
+            ),
+    );
+  }
+}

lib/widgets/GameState/DashboardWidget.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:rogapp/widgets/GameState/CheckinState.dart';
+import 'package:rogapp/widgets/GameState/game_on_off.dart';
+
+class DashboardWidget extends StatelessWidget {
+  final bool gameStarted;
+  final int locationsVisited;
+  final bool isMinimized;
+
+  const DashboardWidget({
+    Key? key,
+    required this.gameStarted,
+    required this.locationsVisited,
+    this.isMinimized = false,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> widgets = [
+      GameStatusIndicator(gameStarted: gameStarted, minimized: isMinimized),
+      SizedBox(
+          height: isMinimized ? 0 : 8, width: isMinimized ? 8 : 0), // Spacing
+      LocationVisitedWidget(count: locationsVisited, minimized: isMinimized),
+    ];
+
+    return Container(
+      padding: EdgeInsets.all(isMinimized ? 8 : 16),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        boxShadow: [
+          BoxShadow(
+            color: Colors.grey.withOpacity(0.5),
+            spreadRadius: 5,
+            blurRadius: 7,
+            offset: Offset(0, 3),
+          ),
+        ],
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: isMinimized
+          ? Row(
+              mainAxisSize: MainAxisSize.min,
+              children: widgets,
+            )
+          : Column(
+              mainAxisSize: MainAxisSize.min,
+              children: widgets,
+            ),
+    );
+  }
+}

lib/widgets/GameState/game_on_off.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:rogapp/widgets/GameState/Colors.dart';
+
+class GameStatusIndicator extends StatelessWidget {
+  final bool gameStarted;
+  final bool minimized;
+
+  const GameStatusIndicator(
+      {Key? key, required this.gameStarted, this.minimized = true})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    // Icons to show based on the game status
+    IconData iconData =
+        gameStarted ? Icons.stop_circle : Icons.play_circle_filled;
+    // Text to show based on the game status
+    String text = gameStarted ? 'ゲーム開始' : 'ゲーム未開始';
+
+    // Layout for minimized view
+    if (minimized) {
+      return Container(
+        height: 40, // Square size
+        width: 40, // Square size
+        decoration: BoxDecoration(
+          color:
+              gameStarted ? JapaneseColors.indigo : JapaneseColors.sakuraPink,
+          shape: BoxShape
+              .circle, // Making it circle when minimized for a more distinct look
+        ),
+        child: Icon(iconData, color: Colors.white),
+      );
+    }
+
+    // Layout for expanded view
+    return Container(
+      padding: EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: gameStarted ? JapaneseColors.indigo : JapaneseColors.sakuraPink,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(iconData, color: Colors.white),
+          SizedBox(width: 8),
+          Text(
+            text,
+            style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/base_layer_widget.dart

@@ -1,27 +1,24 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
+// import 'package:flutter/material.dart';
+// import 'package:flutter_map/flutter_map.dart';
+// import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
 
-class BaseLayer extends StatelessWidget {
-  const BaseLayer({Key? key}) : super(key: key);
+// class BaseLayer extends StatelessWidget {
+//   const BaseLayer({Key? key}) : super(key: key);
 
-  @override
-  Widget build(BuildContext context) {
-    return TileLayer(
-                    urlTemplate: "https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png",
-                    tileProvider: FMTC.instance('OpenStreetMap (A)').getTileProvider(
-                              FMTCTileProviderSettings(
-                                behavior: CacheBehavior.values
-                                    .byName('cacheFirst'),
-                                cachedValidDuration: const Duration(
-                                        days: 14
-                                      ),
-                              ),
-                            ),
-                  );
-  }
-}
+//   @override
+//   Widget build(BuildContext context) {
+//     return TileLayer(
+//       urlTemplate: "https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png",
+//       tileProvider: FMTC.instance('OpenStreetMap (A)').getTileProvider(
+//             settings: FMTCTileProviderSettings(
+//               behavior: CacheBehavior.values.byName('cacheFirst'),
+//               cachedValidDuration: const Duration(days: 14),
+//             ),
+//           ),
+//     );
+//   }
+// }
 
-// var Esri_WorldImagery = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
-// 	attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
-// });
+// // var Esri_WorldImagery = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
+// // 	attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
+// // });

lib/widgets/bottom_sheet_controller.dart

@@ -1,11 +1,8 @@
-
-
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get_state_manager/get_state_manager.dart';
 
-class BottomSheetController extends GetxController{
-
-  List<GeoJsonFeature>? currentFeature = <GeoJsonFeature>[];
+class BottomSheetController extends GetxController {
+  List<GeoJSONFeature>? currentFeature = <GeoJSONFeature>[];
 
   BottomSheetController({this.currentFeature});
 }

lib/widgets/bottom_sheet_new.dart

@@ -1,37 +1,45 @@
+import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
-import 'package:geojson/geojson.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:rogapp/main.dart';
 import 'package:rogapp/model/destination.dart';
+import 'package:rogapp/pages/camera/camera_page.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/routes/app_pages.dart';
 import 'package:rogapp/services/external_service.dart';
 import 'package:rogapp/utils/const.dart';
 import 'package:rogapp/utils/database_helper.dart';
 import 'package:rogapp/utils/text_util.dart';
 import 'package:rogapp/widgets/bottom_sheet_controller.dart';
+import 'package:rogapp/widgets/debug_widget.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class BottomSheetNew extends GetView<BottomSheetController> {
-  BottomSheetNew({Key? key}) : super(key: key);
+  BottomSheetNew(
+      {this.isAlreadyCheckedIn = false, Key? key, required this.destination})
+      : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
   final DestinationController destinationController =
       Get.find<DestinationController>();
+  final Destination destination;
+  final bool isAlreadyCheckedIn;
 
   Image getImage() {
     String serverUrl = ConstValues.currentServer();
-    if (indexController.rog_mode == 1) {
-      //print("----- rogaining mode 1");
+
+    if (indexController.rogMode == 1) {
       if (indexController.currentDestinationFeature.isEmpty ||
           indexController.currentDestinationFeature[0].photos! == "") {
         return const Image(image: AssetImage('assets/images/empty_image.png'));
       } else {
         //print("@@@@@@@@@@@@@ rog mode -------------------- ${indexController.currentDestinationFeature[0].photos} @@@@@@@@@@@");
-        String _photo = indexController.currentDestinationFeature[0].photos!;
-        if (_photo.contains('http')) {
+        String photo = indexController.currentDestinationFeature[0].photos!;
+        if (photo.contains('http')) {
           return Image(
             image: NetworkImage(
               indexController.currentDestinationFeature[0].photos!,
@@ -44,8 +52,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
         } else {
           return Image(
             image: NetworkImage(
-              '$serverUrl/media/compressed/' +
-                  indexController.currentDestinationFeature[0].photos!,
+              '$serverUrl/media/compressed/${indexController.currentDestinationFeature[0].photos!}',
             ),
             errorBuilder: (BuildContext context, Object exception,
                 StackTrace? stackTrace) {
@@ -55,12 +62,13 @@ class BottomSheetNew extends GetView<BottomSheetController> {
         }
       }
     } else {
-      GeoJsonFeature<dynamic> gf = indexController.currentFeature[0];
+      GeoJSONFeature gf = indexController.currentFeature[0];
+      print("=== photo sss ${gf.properties!["photos"]}");
       if (gf.properties!["photos"] == null || gf.properties!["photos"] == "") {
         return const Image(image: AssetImage('assets/images/empty_image.png'));
       } else {
-        String _photo = gf.properties!["photos"];
-        if (_photo.contains('http')) {
+        String photo = gf.properties!["photos"];
+        if (photo.contains('http')) {
           return Image(
             image: NetworkImage(
               gf.properties!["photos"],
@@ -71,9 +79,11 @@ class BottomSheetNew extends GetView<BottomSheetController> {
             },
           );
         } else {
+          String imageUrl = Uri.encodeFull(
+              '$serverUrl/media/compressed/${gf.properties!["photos"]}');
           return Image(
             image: NetworkImage(
-              '$serverUrl/media/compressed/' + gf.properties!["photos"],
+              imageUrl,
             ),
             errorBuilder: (BuildContext context, Object exception,
                 StackTrace? stackTrace) {
@@ -86,7 +96,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
   }
 
   void _launchURL(url) async {
-    if (!await launch(url)) throw 'Could not launch $url';
+    if (!await launchUrl(url)) throw 'Could not launch $url';
   }
 
   bool isInDestination(String locationid) {
@@ -100,312 +110,210 @@ class BottomSheetNew extends GetView<BottomSheetController> {
     }
   }
 
-  @override
-  Widget build(BuildContext context) {
-    destinationController.skip_gps = true;
-    print('---- rog_mode ----- ${indexController.rog_mode} -----');
-    return indexController.rog_mode == 0
-        ? detailsSheet(context)
-        : destinationSheet(context);
-  }
+  Widget getActionButton(BuildContext context, Destination destination) {
+    print("getActionButton ${destinationController.rogainingCounted.value}");
+    print("getActionButton ${destinationController.distanceToStart()}");
+    print("getActionButton ${destination.cp}");
+    print("getActionButton ${DestinationController.ready_for_goal}");
 
-  // Show destination detais
-  SingleChildScrollView destinationSheet(BuildContext context) {
-    print(
-        '---- currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} -----');
+    Destination cdest = destinationController
+        .festuretoDestination(indexController.currentFeature[0]);
+    var distance = const Distance();
+    double distanceToDest = distance.as(
+        LengthUnit.Meter,
+        LatLng(
+            destinationController.currentLat, destinationController.currentLon),
+        LatLng(cdest.lat!, cdest.lon!));
 
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Container(
-              child: Row(
-                children: [
-                  MaterialButton(
+    if (destinationController.rogainingCounted.value == true &&
+        destinationController.distanceToStart() <= 500 &&
+        destination.cp == -1 &&
+        DestinationController.ready_for_goal == true) {
+      //goal
+      return ElevatedButton(
+          style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
+          onPressed: destinationController.rogainingCounted.value == true &&
+                  destinationController.distanceToStart() <= 500 &&
+                  destination.cp == -1 &&
+                  DestinationController.ready_for_goal == true
+              ? () async {
+                  destinationController.isAtGoal.value = true;
+                  destinationController.photos.clear();
+                  await showModalBottomSheet(
+                      constraints: BoxConstraints.loose(
+                          ui.Size(Get.width, Get.height * 0.75)),
+                      context: Get.context!,
+                      isScrollControlled: true,
+                      builder: ((context) => CameraPage(
+                            destination: destination,
+                          ))).whenComplete(() {
+                    destinationController.skipGps = false;
+                    destinationController.chekcs = 0;
+                    destinationController.isAtGoal.value = false;
+                  });
+                }
+              : null,
+          child: const Text(
+            "ロゲイニングを終える",
+            style: TextStyle(color: Colors.white),
+          ));
+    } else if (distanceToDest <=
+        destinationController.getForcedChckinDistance(destination)) {
+      //start
+      return ElevatedButton(
+        style: ElevatedButton.styleFrom(
+          backgroundColor: Theme.of(context).colorScheme.secondary,
+        ),
+        onPressed: () async {
+          // Check conditions to show confirmation dialog
+          if (destinationController.isInRog.value == false &&
+              destination.cp == -1 &&
+              destinationController.rogainingCounted.value == false) {
+            print("counted ${destinationController.rogainingCounted.value}");
+
+            // Show confirmation dialog
+            Get.dialog(
+              AlertDialog(
+                title: const Text("確認"), //confirm
+                content: const Text(
+                    "ロゲを開始すると、今までのロゲデータが全てクリアされます。本当に開始しますか？"), //are you sure
+                actions: <Widget>[
+                  TextButton(
+                    child: const Text("いいえ"), //no
                     onPressed: () {
-                      Get.back();
-                      //destinationController.makePrevious(indexController.currentDestinationFeature[0]);
+                      Get.back(); // Close the dialog
                     },
-                    color: Colors.blue,
-                    textColor: Colors.white,
-                    child: const Icon(
-                      Icons.arrow_back_ios,
-                      size: 14,
-                    ),
-                    padding: const EdgeInsets.all(16),
-                    shape: const CircleBorder(),
                   ),
-                  Expanded(
-                    child: Container(
-                      alignment: Alignment.center,
-                      child: Obx(() => indexController.currentUser.isNotEmpty
-                          ? Text(
-                              "${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} :  ${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} : ${indexController.currentDestinationFeature[0].name!}",
-                              style: const TextStyle(
-                                fontSize: 15.0,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            )
-                          : Text(
-                              indexController
-                                  .currentDestinationFeature[0].name!,
-                              style: const TextStyle(
-                                fontSize: 15.0,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            )),
-                    ),
+                  TextButton(
+                    child: const Text("はい"), //yes
+                    onPressed: () async {
+                      // Clear data and start game logic here
+                      destinationController.isInRog.value = true;
+                      destinationController.resetRogaining();
+                      destinationController.addToRogaining(
+                        destinationController.currentLat,
+                        destinationController.currentLon,
+                        destination.location_id!,
+                      );
+                      //saveGameState();
+                      await ExternalService().startRogaining();
+                      Get.back(); // Close the dialog and potentially navigate away
+                    },
                   ),
                 ],
               ),
-            ),
-          ),
-          Row(
-            children: [
-              Expanded(
-                  child: SizedBox(
-                height: 260.0,
-                child: Obx(() => getImage()),
-              )),
-            ],
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              Obx(
-                () => indexController.currentDestinationFeature.isNotEmpty &&
-                        destinationController.is_in_checkin.value == true &&
-                        destinationController.is_at_start.value == false
-                    ? Row(
-                        children: [
-                          ElevatedButton(
-                              onPressed: () {
-                                if (indexController.currentDestinationFeature[0]
-                                            .checkedin ==
-                                        null ||
-                                    indexController.currentDestinationFeature[0]
-                                            .checkedin ==
-                                        false) {
-                                  if (indexController
-                                          .currentDestinationFeature[0]
-                                          .hidden_location ==
-                                      0) {
-                                    destinationController.skip_gps = false;
-                                    destinationController.is_photo_shoot.value =
-                                        true;
-                                    Get.back();
-                                  } else {
-                                    destinationController.makeCheckin(
-                                        indexController
-                                            .currentDestinationFeature[0],
-                                        true,
-                                        "");
-                                    if (indexController
-                                            .currentDestinationFeature[0].cp !=
-                                        -1) {
-                                      destinationController
-                                          .rogaining_counted.value = true;
-                                    }
-                                  }
-                                } else {
-                                  destinationController.makeCheckin(
-                                      indexController
-                                          .currentDestinationFeature[0],
-                                      false,
-                                      "");
-                                }
-                                //Get.back();
-                              },
-                              child: Text(
-                                  //Checkin
-                                  indexController.currentDestinationFeature[0]
-                                                  .checkedin ==
-                                              null ||
-                                          indexController
-                                                  .currentDestinationFeature[0]
-                                                  .checkedin ==
-                                              false
-                                      ? "チェックイン"
-                                      : "チェックアウト")),
-                        ],
-                      )
-                    : Container(),
-              ),
-              Obx(
-                () => destinationController.is_at_start.value == true
-                    ? ElevatedButton(
-                        onPressed: () {
-                          destinationController.is_in_rog.value = true;
-                          destinationController.addToRogaining(
-                              destinationController.current_lat,
-                              destinationController.current_lon,
-                              indexController
-                                  .currentDestinationFeature[0].location_id!);
-                          ExternalService()
-                              .StartRogaining()
-                              .then((value) => Get.back());
-                        },
-                        child: Text(
-                            // start
-                            indexController.currentDestinationFeature[0]
-                                            .checkedin !=
-                                        null ||
-                                    indexController.currentDestinationFeature[0]
-                                            .checkedin ==
-                                        true
-                                ? "ロゲイニングを開始"
-                                : "間違った目的地..."))
-                    : Container(),
-              ),
-              Obx(
-                () => destinationController.is_at_goal.value == true &&
-                        destinationController.rogaining_counted == true
-                    ? ElevatedButton(
-                        onPressed: () {
-                          Get.toNamed(AppPages.CAMERA_PAGE);
-                          Get.back();
-                        },
-                        child: Text(
-                            //goal
-                            indexController.currentDestinationFeature[0]
-                                            .checkedin !=
-                                        null ||
-                                    indexController.currentDestinationFeature[0]
-                                            .checkedin ==
-                                        true
-                                ? "ロゲイニングを終える"
-                                : "間違った目的地 ..."))
-                    : Container(),
-              ),
-            ],
-          ),
-          Obx(
-            () => indexController.currentDestinationFeature[0].address !=
-                        null &&
-                    indexController
-                        .currentDestinationFeature[0].address!.isNotEmpty
-                ? getDetails(context, "address".tr,
-                    indexController.currentDestinationFeature[0].address! ?? '')
-                : const SizedBox(
-                    width: 0.0,
-                    height: 0,
-                  ),
-          ),
-          Obx(
-            () => indexController.currentDestinationFeature[0].phone != null &&
-                    indexController
-                        .currentDestinationFeature[0].phone!.isNotEmpty
-                ? getDetails(context, "telephone".tr,
-                    indexController.currentDestinationFeature[0].phone! ?? '')
-                : const SizedBox(
-                    width: 0.0,
-                    height: 0,
-                  ),
-          ),
-          Obx(
-            () => indexController.currentDestinationFeature[0].email != null &&
-                    indexController
-                        .currentDestinationFeature[0].email!.isNotEmpty
-                ? getDetails(context, "email".tr,
-                    indexController.currentDestinationFeature[0].email! ?? '')
-                : const SizedBox(
-                    width: 0.0,
-                    height: 0,
-                  ),
-          ),
-          Obx(
-            () => indexController.currentDestinationFeature[0].webcontents !=
-                        null &&
-                    indexController
-                        .currentDestinationFeature[0].webcontents!.isNotEmpty
-                ? getDetails(
-                    context,
-                    "web".tr,
-                    indexController.currentDestinationFeature[0].webcontents! ??
-                        '',
-                    isurl: true)
-                : const SizedBox(
-                    width: 0.0,
-                    height: 0,
-                  ),
-          ),
-          Obx(
-            () => indexController.currentDestinationFeature[0].videos != null &&
-                    indexController
-                        .currentDestinationFeature[0].videos!.isNotEmpty
-                ? getDetails(context, "video".tr,
-                    indexController.currentDestinationFeature[0].videos! ?? '',
-                    isurl: true)
-                : const SizedBox(
-                    width: 0.0,
-                    height: 0,
-                  ),
-          ),
-          const SizedBox(
-            height: 20.0,
-          ),
-          // Obx(() =>
-          //   //wantToGo(context),
+              barrierDismissible:
+                  false, // User must tap a button to close the dialog
+            );
+          } else if (destinationController.isInRog.value == true &&
+              destination.cp != -1) {
+            //print("counted ${destinationController.rogainingCounted.value}");
+            // Existing logic for other conditions
 
-          // FutureBuilder<Widget>(
-          //   future: wantToGo(context),
-          //   builder: (context, snapshot) {
-          //     return Container(
-          //       child: snapshot.data,
-          //     );
-          //   },
-          // ),
+            Get.back();
+            await destinationController.callforCheckin(destination);
+          } else {
+            return;
+          }
+        },
+        child: Text(
+          destination.cp == -1 &&
+                  destinationController.isInRog.value == false &&
+                  destinationController.rogainingCounted.value == false
+              ? "ロゲ開始"
+              : destinationController.isInRog.value == true &&
+                      destination.cp == -1
+                  ? "ゲーム中"
+                  : isAlreadyCheckedIn == true
+                      ? "ゲーム中"
+                      : destinationController.isInRog.value == true
+                          ? "チェックイン"
+                          : "始まっていない",
+          style: TextStyle(color: Theme.of(context).colorScheme.onSecondary),
+        ),
+      );
+    }
+    return Container();
+  }
 
-          // ),
-          const SizedBox(
-            height: 60.0,
-          )
-        ],
-      ),
-    );
+  @override
+  Widget build(BuildContext context) {
+    //print("to start ${destinationController.distanceToStart()}");
+
+    destinationController.skipGps = true;
+    // print('--- c use --- ${indexController.currentUser[0].values}');
+    // print('---- rog_mode ----- ${indexController.rogMode.value} -----');
+    // return indexController.rogMode.value == 0
+    //     ? detailsSheet(context)
+    //     : destinationSheet(context);
+    return detailsSheet(context);
+  }
+
+  Future<bool> isDestinationCheckedIn(Destination d) async {
+    DatabaseHelper db = DatabaseHelper.instance;
+    List<Destination> ds = await db.getDestinationByLatLon(d.lat!, d.lon!);
+
+    return ds.isNotEmpty;
   }
 
   // show add location details
   SingleChildScrollView detailsSheet(BuildContext context) {
+    Destination cdest = destinationController
+        .festuretoDestination(indexController.currentFeature[0]);
+    var distance = const Distance();
+    double distanceToDest = distance.as(
+        LengthUnit.Meter,
+        LatLng(
+            destinationController.currentLat, destinationController.currentLon),
+        LatLng(cdest.lat!, cdest.lon!));
+
+    LogManager().addLog("Distance from current point : $distanceToDest");
+    LogManager().addLog(
+        "forced distance for point : ${destinationController.getForcedChckinDistance(destination)}");
+    LogManager().addLog(
+        "current point : ${destinationController.currentLat}, ${destinationController.currentLon} - ${DateTime.now().hour}:${DateTime.now().minute}:${DateTime.now().second}:${DateTime.now().microsecond}");
+
+    //LogManager().addLog("is already checked in : $isAlreadyCheckedIn");
+    LogManager().addLog("Checkin radius : ${destination.checkin_radious}");
+    LogManager().addLog("--${destination.cp}--");
+
     return SingleChildScrollView(
       child: Column(
         children: [
           Padding(
             padding: const EdgeInsets.all(8.0),
-            child: Container(
-              child: Row(
-                children: [
-                  MaterialButton(
-                    onPressed: () {
-                      Get.back();
-                      //indexController.makePrevious(indexController.currentFeature[0]);
-                    },
-                    color: Colors.blue,
-                    textColor: Colors.white,
-                    child: const Icon(
-                      Icons.arrow_back_ios,
-                      //Icons.arrow_back_ios,
-                      size: 14,
-                    ),
-                    padding: const EdgeInsets.all(16),
-                    shape: const CircleBorder(),
+            child: Row(
+              children: [
+                MaterialButton(
+                  onPressed: () {
+                    Get.back();
+                    //indexController.makePrevious(indexController.currentFeature[0]);
+                  },
+                  color: Colors.blue,
+                  textColor: Colors.white,
+                  padding: const EdgeInsets.all(16),
+                  shape: const CircleBorder(),
+                  child: const Icon(
+                    Icons.arrow_back_ios,
+                    //Icons.arrow_back_ios,
+                    size: 14,
                   ),
-                  Expanded(
-                    child: Container(
-                      alignment: Alignment.center,
-                      child: Obx(() => Text(
-                            indexController
-                                .currentFeature[0].properties!["location_name"],
-                            style: const TextStyle(
-                              fontSize: 15.0,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          )),
-                    ),
+                ),
+                Expanded(
+                  child: Container(
+                    alignment: Alignment.center,
+                    child: Obx(() => Text(
+                          "${TextUtils.getDisplayTextFeture(indexController.currentFeature[0])} :  ${indexController.currentFeature[0].properties!["location_name"]}",
+                          // indexController
+                          //     .currentFeature[0].properties!["location_name"],
+                          style: const TextStyle(
+                            fontSize: 15.0,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        )),
                   ),
-                ],
-              ),
+                ),
+              ],
             ),
           ),
           Row(
@@ -424,73 +332,25 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       children: [
-                        Obx(
-                          () => indexController
-                                      .currentDestinationFeature.isNotEmpty &&
-                                  indexController
-                                          .currentDestinationFeature[0].cp ==
-                                      -1 &&
-                                  indexController.currentDestinationFeature[0]
-                                          .checkedin ==
-                                      false &&
-                                  destinationController.is_at_start.value ==
-                                      true
-                              ? ElevatedButton(
-                                  onPressed: () {
-                                    destinationController.is_in_rog.value =
-                                        true;
-                                    destinationController.addToRogaining(
-                                        destinationController.current_lat,
-                                        destinationController.current_lon,
-                                        indexController
-                                            .currentDestinationFeature[0]
-                                            .location_id!);
-                                    ExternalService()
-                                        .StartRogaining()
-                                        .then((value) => Get.back());
-                                  },
-                                  child: Text(
-                                      // start
-                                      indexController
-                                                      .currentDestinationFeature[
-                                                          0]
-                                                      .checkedin !=
-                                                  null ||
-                                              indexController
-                                                      .currentDestinationFeature[
-                                                          0]
-                                                      .checkedin ==
-                                                  true
-                                          ? "ロゲイニングを開始"
-                                          : "間違った目的地..."))
-                              : Container(),
-                        ),
-                        Obx(
-                          () => destinationController.is_at_goal.value ==
-                                      true &&
-                                  destinationController.rogaining_counted ==
-                                      true
-                              ? ElevatedButton(
-                                  onPressed: () {
-                                    Get.toNamed(AppPages.CAMERA_PAGE);
-                                    Get.back();
-                                  },
-                                  child: Text(
-                                      //goal
-                                      indexController
-                                                      .currentDestinationFeature[
-                                                          0]
-                                                      .checkedin !=
-                                                  null ||
-                                              indexController
-                                                      .currentDestinationFeature[
-                                                          0]
-                                                      .checkedin ==
-                                                  true
-                                          ? "ロゲイニングを終える"
-                                          : "間違った目的地 ..."))
-                              : Container(),
-                        ),
+                        // Finish or  Goal
+                        getActionButton(context, destination),
+                        //remove checkin
+                        isAlreadyCheckedIn == true && destination.cp != -1
+                            ? ElevatedButton(
+                                style: ElevatedButton.styleFrom(
+                                    backgroundColor: Colors.blueAccent),
+                                onPressed: () async {
+                                  await destinationController
+                                      .removeCheckin(destination.cp!.toInt());
+                                  destinationController
+                                      .deleteDestination(destination);
+                                  Get.back();
+                                },
+                                child: const Text(
+                                  "チェックイン取消",
+                                  style: TextStyle(color: Colors.white),
+                                )) //remove checkin
+                            : Container(),
                       ],
                     ),
                     Row(
@@ -502,74 +362,40 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                                     .colorScheme
                                     .onPrimaryContainer),
                             onPressed: () async {
+                              // print(
+                              //     "dist to start ${destinationController.distanceToStart()}");
                               Get.back();
-                              print("---- go to ----");
-                              GeoJsonFeature<GeoJsonMultiPoint> mp =
-                                  indexController.currentFeature[0]
-                                      as GeoJsonFeature<GeoJsonMultiPoint>;
+                              //print("---- go to ----");
+                              // GeoJSONMultiPoint mp = indexController
+                              //     .currentFeature[0] as GeoJSONMultiPoint;
                               Position position =
                                   await Geolocator.getCurrentPosition(
                                       desiredAccuracy:
                                           LocationAccuracy.bestForNavigation,
                                       forceAndroidLocationManager: true);
-                              print("------- position -------- $position");
+                              //print("------- position -------- $position");
                               Destination ds = Destination(
                                   lat: position.latitude,
                                   lon: position.longitude);
 
                               Destination tp = Destination(
-                                  lat: mp.geometry!.geoSerie!.geoPoints[0]
-                                      .latitude,
-                                  lon: mp.geometry!.geoSerie!.geoPoints[0]
-                                      .longitude);
+                                  lat: destination.lat, lon: destination.lon);
 
                               destinationController
                                   .destinationMatrixFromCurrentPoint([ds, tp]);
                             },
+                            //go here
                             child: Text(
                               "ここへ行く",
                               style: TextStyle(
                                   color:
                                       Theme.of(context).colorScheme.onPrimary),
                             )),
-                        SizedBox(
+                        const SizedBox(
                           width: 10,
                         ),
-                        ElevatedButton(
-                            style: ElevatedButton.styleFrom(
-                                backgroundColor:
-                                    Theme.of(context).colorScheme.secondary),
-                            onPressed: () async {
-                              final Destination dd =
-                                  destinationController.festuretoDestination(
-                                      indexController.currentFeature[0]);
-                                  print("----- name of dest  ${dd.name} ----");
-                              if (dd.cp == -1) {
-                                destinationController.is_in_rog.value = true;
-                                destinationController.addToRogaining(
-                                    destinationController.current_lat,
-                                    destinationController.current_lon,
-                                    dd.location_id!);
-                                ExternalService()
-                                    .StartRogaining()
-                                    .then((value) => Get.back());
-                              } else {
-                                destinationController.CallforCheckin(dd);
-                              }
-                            },
-                            child: Text(
-                                destinationController
-                                            .festuretoDestination(
-                                                indexController
-                                                    .currentFeature[0])
-                                            .cp ==
-                                        -1
-                                    ? "ロゲ開始"
-                                    : "チェックイン",
-                                style: TextStyle(
-                                    color: Theme.of(context)
-                                        .colorScheme
-                                        .onSecondary))),
+
+                        // forced start / checkin
                       ],
                     ),
                     Row(
@@ -580,8 +406,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                             children: [
                               indexController.currentDestinationFeature
                                           .isNotEmpty &&
-                                      destinationController
-                                              .is_in_checkin.value ==
+                                      destinationController.isInCheckin.value ==
                                           true
                                   ? Container()
                                   : FutureBuilder<Widget>(
@@ -764,14 +589,14 @@ class BottomSheetNew extends GetView<BottomSheetController> {
   }
 
   Future<Widget> wantToGo(BuildContext context) async {
-    bool _selected = false;
-    print(
-        '---target-- ${indexController.currentFeature[0].properties!["location_id"]}----');
+    bool selected = false;
+    // print(
+    //     '---target-- ${indexController.currentFeature[0].properties!["location_id"]}----');
     for (Destination d in destinationController.destinations) {
-      print('---- ${d.location_id.toString()} ----');
+      //print('---- ${d.location_id.toString()} ----');
       if (d.location_id ==
           indexController.currentFeature[0].properties!["location_id"]) {
-        _selected = true;
+        selected = true;
         break;
       }
     }
@@ -882,11 +707,12 @@ class BottomSheetNew extends GetView<BottomSheetController> {
             const SizedBox(
               width: 8.0,
             ),
-            Obx((() => indexController.rog_mode == 1
+            Obx((() => indexController.rogMode.value == 1
                 ? ElevatedButton(
                     onPressed: () async {
                       Destination dest =
                           indexController.currentDestinationFeature[0];
+                      //print("~~~~ before checking button ~~~~");
                       //print("------ curent destination is ${dest!.checkedIn}-------");
                       destinationController.makeCheckin(
                           dest, !dest.checkedin!, "");
@@ -921,8 +747,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                           ElevatedButton(
                             child: const Text("Image"),
                             onPressed: () {
-                              final ImagePicker _picker = ImagePicker();
-                              _picker
+                              final ImagePicker picker = ImagePicker();
+                              picker
                                   .pickImage(source: ImageSource.camera)
                                   .then((value) {
                                 //print("----- image---- ${value!.path}");
@@ -944,7 +770,6 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                               //print("---temp---${temp}");
                               indexController.currentAction.add([temp]);
                             }
-                            indexController.makeAction(context);
                           },
                           child: Text("checkin".tr))
                     ],
@@ -960,7 +785,6 @@ class BottomSheetNew extends GetView<BottomSheetController> {
                         //print("---temp---${temp}");
                         indexController.currentAction.add([temp]);
                       }
-                      indexController.makeAction(context);
                     },
                     child: const Icon(Icons.favorite, color: Colors.red),
                   )
@@ -982,7 +806,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
         InkWell(
           onTap: () {
             if (isurl) {
-              if (indexController.rog_mode == 0) {
+              if (indexController.rogMode.value == 0) {
                 _launchURL(indexController
                     .currentFeature[0].properties!["webcontents"]);
               } else {
@@ -991,15 +815,13 @@ class BottomSheetNew extends GetView<BottomSheetController> {
             }
           },
           child: SizedBox(
-            width: MediaQuery.of(context).size.width - (MediaQuery.of(context).size.width * 0.28),
-            child: Expanded(
-              child: Text(
-                text,
-                textDirection: TextDirection.ltr,
-                textAlign: TextAlign.justify,
-                style: TextStyle(
-                  color: isurl ? Colors.blue : Colors.black,
-                ),
+            width: MediaQuery.of(context).size.width -
+                (MediaQuery.of(context).size.width * 0.35),
+            child: Text(
+              text,
+              textAlign: TextAlign.justify,
+              style: TextStyle(
+                color: isurl ? Colors.blue : Colors.black,
               ),
             ),
           ),

lib/widgets/bottom_sheet_widget.dart

@@ -1,381 +0,0 @@
-
-import 'package:flutter/material.dart';
-import 'package:geojson/geojson.dart';
-import 'package:get/get.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class BottomSheetWidget extends StatelessWidget {
-  //const BottomSheetWidget({ Key? key }, GeoJsonFeature? pt) : super(key: key);
-
-  final IndexController indexController = Get.find<IndexController>();
-
-  BottomSheetWidget({Key? key}) : super(key: key);
-
-  Image getImage(GeoJsonFeature? gf){
-    if(gf!.properties!["photos"] == null || gf.properties!["photos"] == ""){
-      return const Image(image: AssetImage('assets/images/empty_image.png'));
-    }
-    else{
-      return Image(image: NetworkImage(
-        gf.properties!["photos"],
-        ),
-        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
-          return Image.asset("assets/images/empty_image.png");
-        },
-        );
-    }
-  }
-
-  void _launchURL(url) async {
-    if (!await launch(url)) throw 'Could not launch $url';
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          const SizedBox(height: 5.0,),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              MaterialButton(
-                onPressed: () {
-                  indexController.makePrevious(indexController.currentFeature[0]);
-                },
-                color: Colors.blue,
-                textColor: Colors.white,
-                child: const Icon(
-                  Icons.arrow_back_ios,
-                  size: 14,
-                ),
-                padding: const EdgeInsets.all(14),
-                shape: const CircleBorder(),
-              ),
-              Expanded(
-                child: Container(
-                  alignment: Alignment.center,
-                  child:  Obx(() => 
-                    Text(indexController.currentFeature[0].properties!["location_name"], style: const TextStyle(
-                    fontSize: 15.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  )
-                  ),
-                ),
-              ),
-              MaterialButton(
-                onPressed: () {
-                   indexController.makeNext(indexController.currentFeature[0]);
-                },
-                color: Colors.blue,
-                textColor: Colors.white,
-                child: const Icon(
-                  Icons.arrow_forward_ios,
-                  size: 14,
-                ),
-                padding: const EdgeInsets.all(14),
-                shape: const CircleBorder(),
-              ),
-            ],
-          ),
-          Row(
-            children:  [
-              Expanded(
-                child: SizedBox(
-                  height: 260.0,
-                  child: Obx(() => getImage(indexController.currentFeature[0])),
-                )
-              ),
-            ],
-          ),
-          Row(
-            children:  [
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 10.0),
-                  child: Column(
-                    children: [
-                      indexController.currentFeature[0].properties!["address"] != null ?
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topRight,
-                              child: Text("address".tr, style: const TextStyle(fontWeight: FontWeight.bold),)),
-                          ),
-                          const SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["address"] ?? '',
-                              style: const TextStyle(color: Colors.blue,),
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): const SizedBox(width: 0.0, height: 0,),
-                      indexController.currentFeature[0].properties!["phone"] != null ?
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Expanded(child: Container(
-                            alignment: Alignment.topRight,
-                            child: Text("telephone".tr, style: const TextStyle(fontWeight: FontWeight.bold),))),
-                          const SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["phone"] ?? '',
-                              style: const TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): const SizedBox(width: 0, height: 0,),
-                      indexController.currentFeature[0].properties!["email"] != null ?
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Expanded(child: Container(
-                            alignment: Alignment.topRight,
-                            child: Text("email".tr, style: const TextStyle(fontWeight: FontWeight.bold),))),
-                          const SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["email"] ?? '',
-                              style: const TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): const SizedBox(width: 0, height: 0,),
-                      indexController.currentFeature[0].properties!["webcontents"] != null ?
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Expanded(child: Container(
-                            alignment: Alignment.topRight,
-                            child: Text(
-                              "web".tr, style: const TextStyle(fontWeight: FontWeight.bold)))),
-                          const SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => InkWell(
-                              onTap: (){
-                                _launchURL(indexController.currentFeature[0].properties!["webcontents"]);
-                              },
-                              child: Text(indexController.currentFeature[0].properties!["webcontents"] ?? '',
-                              style: const TextStyle(color: Colors.blue,),
-                              softWrap: false,
-                              overflow: TextOverflow.fade,),
-                                                    )),
-                            ),
-                          )
-                        ],
-                      ): const SizedBox(width: 0.0, height: 0.0,),
-                      indexController.currentFeature[0].properties!["videos"] != null ?
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Expanded(child: Container(
-                            alignment: Alignment.topRight,
-                            child: Text("video".tr, style: const TextStyle(fontWeight: FontWeight.bold)))),
-                          const SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["videos"] ?? '',
-                              style: const TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): const SizedBox(width: 0.0, height: 0.0,),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 20.0,),
-          Obx(() => 
-          indexController.currentAction.isNotEmpty  ?
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: [
-              indexController.rog_mode.value == 0 ?
-              
-
-
-
-            
-                Row(
-                  mainAxisSize: MainAxisSize.max,
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: [
-                indexController.currentAction[0][0]["wanttogo"] == false ?
-                ElevatedButton(
-                onPressed: (){
-                  if(indexController.currentAction.isNotEmpty){
-                    print(indexController.currentAction[0]);
-                    indexController.currentAction[0][0]["wanttogo"] = true;
-                    Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                    indexController.currentAction.clear();
-                    print("---temp---$temp");  
-                    indexController.currentAction.add([temp]);
-                  }
-                  indexController.makeAction(context);
-                },
-                 child: Text("want_to_go".tr)
-              ) : 
-              ElevatedButton(
-                onPressed: (){
-                  if(indexController.currentAction.isNotEmpty){
-                    print(indexController.currentAction[0]);
-                    indexController.currentAction[0][0]["wanttogo"] = false;
-                    Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                    indexController.currentAction.clear();
-                    print("---temp---$temp");  
-                    indexController.currentAction.add([temp]);
-                  }
-                  indexController.makeAction(context);
-                },
-                
-                 child: IconButton(
-                   icon: Icon(Icons.favorite, color: Colors.red, semanticLabel: "want_to_go".tr,), onPressed: () { 
-
-                    },
-                 
-                 )
-              ),
-              indexController.currentAction[0][0]["like"] == false ?
-                ElevatedButton(
-                onPressed: (){
-                  if(indexController.currentAction.isNotEmpty){
-                    print(indexController.currentAction[0]);
-                    indexController.currentAction[0][0]["like"] = true;
-                    Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                    indexController.currentAction.clear();
-                    print("---temp---$temp");  
-                    indexController.currentAction.add([temp]);
-                  }
-                  indexController.makeAction(context);
-                },
-                 child: Text("like".tr)
-              ) : 
-              ElevatedButton(
-                onPressed: (){
-                  if(indexController.currentAction.isNotEmpty){
-                    print(indexController.currentAction[0]);
-                    indexController.currentAction[0][0]["like"] = false;
-                    Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                    indexController.currentAction.clear();
-                    print("---temp---$temp");  
-                    indexController.currentAction.add([temp]);
-                  }
-                  indexController.makeAction(context);
-                },
-                
-                 child: IconButton(
-                   icon: Icon(Icons.favorite, color: Colors.red, semanticLabel: "like".tr,), onPressed: () { 
-
-                    },
-                 
-                 )
-              ),
-                  ],
-                )
-
-      
-
-
-
-              :
-              const SizedBox(width: 0, height: 0,),
-              indexController.rog_mode.value == 1 ?
-              indexController.currentAction[0][0]["checkin"] == false ?
-                Column(
-                  children: [
-                    Row(
-                     mainAxisSize: MainAxisSize.max,
-                     children: [
-                       ElevatedButton(
-                        child: const Text("Image"), onPressed: (){
-                        final ImagePicker _picker = ImagePicker();
-                        _picker.pickImage(source: ImageSource.camera).then((value){
-                          print("----- image---- ${value!.path}");
-                        });
-                        },
-                    )
-                     ],
-                    ),
-                    ElevatedButton(
-                      onPressed: (){
-                        if(indexController.currentAction.isNotEmpty){
-                          print(indexController.currentAction[0]);
-                          indexController.currentAction[0][0]["checkin"] = true;
-                          Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                          indexController.currentAction.clear();
-                          print("---temp---$temp");  
-                          indexController.currentAction.add([temp]);
-                        }
-                        indexController.makeAction(context);
-                      },
-                      child: Text("checkin".tr)
-                    ) 
-                  ],
-                )
-                : 
-              ElevatedButton(
-                onPressed: (){
-                  if(indexController.currentAction.isNotEmpty){
-                    print(indexController.currentAction[0]);
-                    indexController.currentAction[0][0]["checkin"] = false;
-                    Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
-                    indexController.currentAction.clear();
-                    print("---temp---$temp");  
-                    indexController.currentAction.add([temp]);
-                  }
-                  indexController.makeAction(context);
-                },
-                
-                 child: const Icon(
-                   Icons.favorite, color: Colors.red) 
-
-                    ,
-              ):
-              const SizedBox(width: 0, height: 0,),
-            ],
-          ): Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              TextButton(
-                onPressed: (){
-                  Get.toNamed(AppPages.LOGIN);
-                  }, 
-                child: const Flexible(child: Text("その他のオプションについてはログインしてください")))
-                ],
-          ),
-          ),
-          const Row(
-            children: [
-              SizedBox(height: 60.0,),
-            ],
-          )
-        ],
-      ),
-    );
-  }
-}