update

android/app/build.gradle

@@ -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/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <application
         android:label="岐阜ナビ"
         android:name="${applicationName}"

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() {
+}

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

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

@@ -4,175 +4,112 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
-  - DKImagePickerController/Core (4.3.4):
-    - DKImagePickerController/ImageDataManager
-    - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.4):
-    - DKImagePickerController/Core
-    - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Preview
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Resource
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
-    - SDWebImage
-    - SwiftyGif
-  - file_picker (0.0.1):
-    - DKImagePickerController/PhotoGallery
-    - Flutter
   - Flutter (1.0.0)
   - flutter_compass (0.0.1):
     - Flutter
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
-  - flutter_local_notifications (0.0.1):
-    - Flutter
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - 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
-  - GoogleMaps (4.1.0):
-    - GoogleMaps/Maps (= 4.1.0)
-  - GoogleMaps/Base (4.1.0)
-  - GoogleMaps/Maps (4.1.0):
-    - GoogleMaps/Base
   - image_picker_ios (0.0.1):
     - Flutter
-  - move_to_background (0.0.1):
+  - isar_flutter_libs (1.0.0):
     - Flutter
-  - path_provider_ios (0.0.1):
+  - path_provider_foundation (0.0.1):
     - Flutter
-  - permission_handler_apple (9.0.4):
+    - FlutterMacOS
+  - permission_handler_apple (9.1.1):
+    - Flutter
+  - pointer_interceptor_ios (0.0.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
-  - SDWebImage (5.15.5):
-    - SDWebImage/Core (= 5.15.5)
-  - SDWebImage/Core (5.15.5)
-  - share_plus (0.0.1):
-    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
-  - SwiftyGif (5.4.4)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
-  - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
   - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/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`)
-  - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
+  - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/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`)
 
 SPEC REPOS:
   trunk:
-    - DKImagePickerController
-    - DKPhotoGallery
     - FMDB
-    - GoogleMaps
     - ReachabilitySwift
-    - SDWebImage
-    - SwiftyGif
 
 EXTERNAL SOURCES:
   camera_avfoundation:
     :path: ".symlinks/plugins/camera_avfoundation/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  file_picker:
-    :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
   flutter_compass:
     :path: ".symlinks/plugins/flutter_compass/ios"
   flutter_keyboard_visibility:
     :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
-  google_maps_flutter_ios:
+  image_gallery_saver:
-    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+    :path: ".symlinks/plugins/image_gallery_saver/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
-  move_to_background:
+  isar_flutter_libs:
-    :path: ".symlinks/plugins/move_to_background/ios"
+    :path: ".symlinks/plugins/isar_flutter_libs/ios"
-  path_provider_ios:
+  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  share_plus:
+  pointer_interceptor_ios:
-    :path: ".symlinks/plugins/share_plus/ios"
+    :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9
+  camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e
-  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
+  geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
-  google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
-  GoogleMaps: 008e2c80e38605b56b560e8deb73d4194ff30bef
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
-  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
+  isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: a1c2f8dde3796ecc1697a15e7c75eb5205d8a740
+PODFILE CHECKSUM: fd4b34215e7c57e79d347e509d4d64bfebe797fc
 
-COCOAPODS: 1.12.0
+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>"; };
+		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>"; };
-		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>"; };
+		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 */,
+				4310B59AA1289CC3AE4DBA82 /* Pods-Runner.debug.xcconfig */,
-				13E5CD9612AF4CC8B90A74C3 /* Pods-Runner.release.xcconfig */,
+				37AC108B2188F1C5AA1C2C9E /* Pods-Runner.release.xcconfig */,
-				F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.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 */,
+				CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */,
-				FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				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 */ = {
+		CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */ = {
-			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 */ = {
 			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,16 +358,20 @@
 			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;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				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";
@@ -438,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;
@@ -487,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;
@@ -504,16 +492,20 @@
 			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;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				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;
@@ -527,16 +519,20 @@
 			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;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				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 = "1300"
+   LastUpgradeVersion = "1430"
    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,25 +27,25 @@
 	<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>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSCameraUsageDescription</key>
-	<string>ロゲイニングのゴールでは写真撮影が必要です。</string>
+	<string>「岐阜ナビはチェックポイントで撮影した写真を写真ライブラリに保存し、あなたの旅行の記録を保持し、友人と共有することができます。」</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<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/main.dart

@@ -1,22 +1,42 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
 import 'package:get/get.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:permission_handler/permission_handler.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:path/path.dart' as p;
+// 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();
 
-  FlutterMapTileCaching.initialise(await RootDirectory.normalCache);
+  await FlutterMapTileCaching.initialise();
   final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
   await instanceA.manage.createAsync();
   await instanceA.metadata.addAsync(
@@ -31,13 +51,75 @@ void main() async {
     key: 'behaviour',
     value: 'cacheFirst',
   );
-
+  runApp(const MyApp());
-  runApp(MyApp());
 }
 
-class MyApp extends StatelessWidget {
+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(
@@ -47,9 +129,9 @@ class MyApp extends StatelessWidget {
       fallbackLocale: const Locale('en', 'US'),
       title: 'ROGAINING',
       theme: ThemeData(
-        primarySwatch: Colors.blue,
+        colorScheme: ColorScheme.fromSeed(
-        visualDensity: VisualDensity.adaptivePlatformDensity,
+            seedColor: const Color.fromARGB(255, 36, 135, 221)),
-        textTheme: GoogleFonts.muliTextTheme(),
+        useMaterial3: true,
       ),
       debugShowCheckedModeBanner: false,
       defaultTransition: Transition.cupertino,
@@ -63,51 +145,3 @@ class MyApp extends StatelessWidget {
     );
   }
 }
-
-
-
-// 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_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,5 +1,3 @@
-
-
 class Destination {
   String? name;
   String? address;
@@ -23,9 +21,14 @@ class Destination {
   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({
+  Destination(
-        this.name,
+      {this.name,
       this.address,
       this.phone,
       this.email,
@@ -46,13 +49,19 @@ class Destination {
       this.cp,
       this.checkin_point,
       this.buy_point,
-        this.hidden_location
+      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) {
-
     bool selec = json['selected'] == 0 ? false : true;
     bool checkin = json['checkedin'] == 0 ? false : true;
+    bool forcedCheckin = json['forced_checkin'] == 0 ? false : true;
+
+    //print("-----tags model----- ${json}");
 
     return Destination(
         name: json['name'],
@@ -76,13 +85,18 @@ class Destination {
         cp: json['cp'],
         checkin_point: json['checkin_point'],
         buy_point: json['buy_point'],
-          hidden_location: json['hidden_location']
+        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,
@@ -105,9 +119,12 @@ class Destination {
       'cp': cp,
       'checkin_point': checkin_point,
       'buy_point': buy_point,
-          'hidden_location' : hidden_location
+      '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,118 +7,276 @@ 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;
+  bool? manulaCheckin = false;
-  CameraPage({Key? key, this.destination}) : super(key: key);
+  bool? buyPointPhoto = false;
-  DestinationController destinationController = Get.find<DestinationController>();
+  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 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(
+        mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
           ElevatedButton(
               onPressed: () {
-                  destinationController.openCamera(context);
+                destinationController.openCamera(context, destination);
               },
-                child: Text("take_photo of the clock".tr)
+              child: const Text("撮影")),
-              ),
+          Obx(() => destinationController.photos.isNotEmpty
-              Obx(() => 
+              ? ElevatedButton(
-              destinationController.photos.isNotEmpty ?
+                  style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
-              ElevatedButton(
+                  onPressed: () async {
-                style: ElevatedButton.styleFrom(
+                    await destinationController.makeCheckin(destination, true,
-                  primary: Colors.red
+                        destinationController.photos[0].path);
-                ),
-                onPressed: (){
-                  int user_id = 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);
-                  
-                  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;
+                    destinationController.rogainingCounted.value = true;
-                      Get.snackbar("目標が保存されました", "目標が正常に追加されました");
+                    destinationController.skipGps = false;
-                      destinationController.resetRogaining();
+                    destinationController.isPhotoShoot.value = false;
-                    }
+                    Get.snackbar("チェックインしました。",
-                    else{
+                        "${destination.sub_loc_id} : ${destination.name}");
-                      print("---- status ${value['status']} ---- ");
-                      Get.snackbar("目標が追加されていません", "please_try_again");
-                    }
-                  });
                   },
-                child: Text("finish_goal".tr)
+                  child: const Text("チェックイン"))
-              ):
+              : Container())
-              Container()
-              )
         ],
       );
     }
-    else{
+
+    if (destinationController.isAtGoal.value &&
+        destinationController.isInRog.value &&
+        destination.cp == -1) {
+      //goal
       return Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
-              Obx(() => 
           ElevatedButton(
               onPressed: () {
-                  destinationController.openCamera(context);
+                if (settingGoal.value == false) {
+                  destinationController.openCamera(context, destination);
+                }
               },
-                child: destinationController.photos.length > 0 ? Text("再撮影") : Text("撮影")
+              child: Text("take_photo of the clock".tr)),
-              )
+          Obx(() => destinationController.photos.isNotEmpty
-              ),
+              ? settingGoal.value == false
-              Obx(() => 
+                  ? ElevatedButton(
-              destinationController.photos.isNotEmpty ?
+                      style:
-              ElevatedButton(
+                          ElevatedButton.styleFrom(backgroundColor: Colors.red),
-                style: ElevatedButton.styleFrom(
+                      onPressed: () async {
-                  primary: Colors.red
+                        // print(
-                ),
+                        //     "----- user isss ${indexController.currentUser[0]} -----");
-                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){
+                        settingGoal.value = true;
-                  //   print("---called ext api ${value['status']} ------");
+                        try {
-                  //   if(value['status'] == 'OK'){
+                          int userId =
-                  //     Get.back();
+                              indexController.currentUser[0]["user"]["id"];
-                  //     destinationController.skip_gps = false;
+                          //print("--- Pressed -----");
-                  //     Get.snackbar("Checked in", "Checked in successfuly");
+                          String team = indexController.currentUser[0]["user"]
-                  //   }
+                              ['team_name'];
-                  //   else{
+                          //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("Checkin not added", "please_try_again");
+                              Get.snackbar("目標が追加されていません", "please_try_again");
-                  //   }
+                            }
-                  // });
+                          });
+                        } on Exception catch (_) {
+                          settingGoal.value = false;
+                        } finally {
+                          settingGoal.value = false;
+                        }
                       },
-                child: Text("チェックイン")
+                      child: Text("finish_goal".tr))
-              ):
+                  : const Center(
-              Container()
+                      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())
         ],
       );
     }
@@ -130,126 +288,229 @@ 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: 
+        appBar: destinationController.isInRog.value &&
-      destinationController.is_in_rog.value && destinationController.rogaining_counted.value == true ?
+                destinationController.rogainingCounted.value == true
-      AppBar(
+            ? AppBar(
-        title: destination!.cp == -1 ? 
+                automaticallyImplyLeading: false,
-          Text("finishing_rogaining".tr)
+                title: destination.cp == -1
-        :
+                    ? Text("finishing_rogaining".tr)
-          Text("cp_pls_take_photo".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(Duration(seconds: 10), (Timer t){
+                    timer =
+                        Timer.periodic(const Duration(seconds: 10), (Timer t) {
                       destinationController.skip_10s = false;
                     });
                   },
                 ),
                 centerTitle: true,
               )
-      :
+            : AppBar(
-      AppBar(
+                automaticallyImplyLeading: false,
-        title: Text("チェックポイント"),
+                title: Text("${destination.sub_loc_id} : ${destination.name}"),
               ),
-      body: Column(
+        body: SingleChildScrollView(
+          child: Column(
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
               Padding(
-            padding: EdgeInsets.all(8.0),
+                padding: const EdgeInsets.all(8.0),
                 child: Center(
-              child: Obx(() => 
+                  child: Obx(
-                Container(
+                    () => Container(
                       width: MediaQuery.of(context).size.width,
                       height: 370,
                       decoration: BoxDecoration(
-                  image:
+                          image: DecorationImage(
-                    DecorationImage(
+                              image: destinationController.photos.isEmpty
-                    image: getFinishImage(),
+                                  ? getDisplayImage(destination).image
-                    fit: BoxFit.cover
+                                  : 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 {
-    else {
       return StartRogaining();
     }
-
   }
 }
 
 class StartRogaining extends StatelessWidget {
   StartRogaining({Key? key}) : super(key: key);
 
-  DestinationController destinationController = Get.find<DestinationController>();
+  DestinationController destinationController =
+      Get.find<DestinationController>();
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("Not started yet".tr,),
+        automaticallyImplyLeading: false,
+        title: Text(
+          "Not started yet".tr,
         ),
-      body: Container(
+      ),
-      child: Center(
+      body: Center(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Text("You have not started rogaining yet.".tr, style: TextStyle(fontSize: 24)),
+            Text("You have not started rogaining yet.".tr,
-            SizedBox(height: 40.0,),
+                style: const TextStyle(fontSize: 24)),
+            const SizedBox(
+              height: 40.0,
+            ),
             ElevatedButton(
               onPressed: () {
                 Get.back();
-                destinationController.skip_gps = false;
+                destinationController.skipGps = false;
               },
-              child: Text("Back"),
+              child: const Text("Back"),
             ),
           ],
         ),
       ),
-    ),
     );
   }
 }
 
-class NotAtGoal extends StatelessWidget {
+class BuyPointCamera extends StatelessWidget {
-  NotAtGoal({Key? key}) : super(key: key);
+  BuyPointCamera({Key? key, required this.destination}) : super(key: key);
 
-  DestinationController destinationController = Get.find<DestinationController>();
+  Destination destination;
+
+  DestinationController destinationController =
+      Get.find<DestinationController>();
 
   @override
   Widget build(BuildContext context) {
+    //print("in camera purchase 1 ${destinationController.isInRog.value}");
+
     return Scaffold(
       appBar: AppBar(
-        title: Text("Not reached the goal yet".tr,),
+        automaticallyImplyLeading: false,
+        title: Text(
+          "${destination.sub_loc_id} : ${destination.name}",
         ),
-      body: Container(
+      ),
-      child: Center(
+      body: Column(
-        child: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
-          mainAxisAlignment: MainAxisAlignment.center,
+        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: getReceiptImage(), fit: BoxFit.cover)),
+                ),
+              ),
+            ),
+          ),
+          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: [
-            Text("You have not reached the goal yet.".tr, style: TextStyle(fontSize: 24)),
-            SizedBox(height: 40.0,),
                       ElevatedButton(
                           onPressed: () {
-                Get.back();
+                            // print(
-                destinationController.skip_gps = false;
+                            //     "in camera purchase 2 ${destinationController.isInRog.value}");
+                            destinationController.openCamera(
+                                context, destination);
                           },
-              child: Text("Back"),
+                          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())
             ],
           ),
-      ),
+        ],
       ),
     );
   }

lib/pages/changepassword/change_password_page.dart

@@ -1,7 +1,6 @@
 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 ChangePasswordPage extends StatelessWidget {
   ChangePasswordPage({Key? key}) : super(key: key);
@@ -18,15 +17,18 @@ class ChangePasswordPage extends StatelessWidget {
         backgroundColor: Colors.white,
         appBar: AppBar(
           elevation: 0,
-
           backgroundColor: Colors.white,
-          leading:
+          leading: IconButton(
-          IconButton( onPressed: (){
+              onPressed: () {
                 Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+              },
+              icon: const Icon(
+                Icons.arrow_back_ios,
+                size: 20,
+                color: Colors.black,
+              )),
         ),
-      body: 
+        body: SizedBox(
-      Container(
           width: double.infinity,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
@@ -36,128 +38,145 @@ class ChangePasswordPage extends StatelessWidget {
                 children: [
                   Column(
                     children: [
-                    Container(
+                      Text(
-                      child: Text("change_password".tr, style: TextStyle(fontSize: 24.0),),
+                        "change_password".tr,
+                        style: const TextStyle(fontSize: 24.0),
+                      ),
+                      const SizedBox(
+                        height: 30,
                       ),
-                    SizedBox(height: 30,),
                     ],
                   ),
                   Padding(
-                  padding: EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(horizontal: 40),
-                    horizontal: 40
-                  ),
                     child: Column(
                       children: [
-                      makeInput(label: "old_password".tr, controller: oldPasswordController),
+                        makeInput(
-                      makeInput(label: "new_password".tr, controller: newPasswordController, obsureText: true),
+                            label: "old_password".tr,
+                            controller: oldPasswordController),
+                        makeInput(
+                            label: "new_password".tr,
+                            controller: newPasswordController,
+                            obsureText: true),
                       ],
                     ),
                   ),
                   Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 40),
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
                       child: Container(
-                    padding: EdgeInsets.only(top: 3,left: 3),
+                        padding: const EdgeInsets.only(top: 3, left: 3),
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(40),
                         ),
-                    child: Obx((() => 
+                        child: Obx(
-                      indexController.is_loading == true ? MaterialButton(
+                          (() => indexController.isLoading.value == true
+                              ? MaterialButton(
                                   minWidth: double.infinity,
                                   height: 60,
-                      onPressed: (){
+                                  onPressed: () {},
-                        
-                      },
                                   color: Colors.grey[400],
                                   shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                      borderRadius: BorderRadius.circular(40)),
-                      ),
+                                  child: const CircularProgressIndicator(),
-                      child: CircularProgressIndicator(),
+                                )
-                    ) :
+                              : Column(
-                      Column(
                                   children: [
                                     MaterialButton(
                                       minWidth: double.infinity,
                                       height: 60,
                                       onPressed: () {
-                        if(oldPasswordController.text.isEmpty || newPasswordController.text.isEmpty){
+                                        if (oldPasswordController
+                                                .text.isEmpty ||
+                                            newPasswordController
+                                                .text.isEmpty) {
                                           Get.snackbar(
                                             "no_values".tr,
                                             "values_required".tr,
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                            icon: const Icon(
+                                                Icons.assistant_photo_outlined,
+                                                size: 40.0,
+                                                color: Colors.blue),
                                             snackPosition: SnackPosition.TOP,
-                            duration: Duration(milliseconds: 800),
+                                            duration: const Duration(
+                                                milliseconds: 800),
                                             backgroundColor: Colors.yellow,
                                             //icon:Image(image:AssetImage("assets/images/dora.png"))
                                           );
                                           return;
                                         }
-                        indexController.is_loading.value = true;
+                                        indexController.isLoading.value = true;
-                        indexController.changePassword(oldPasswordController.text, newPasswordController.text, context);
+                                        indexController.changePassword(
+                                            oldPasswordController.text,
+                                            newPasswordController.text,
+                                            context);
                                         //indexController.login(oldPasswordController.text, newPasswordController.text, context);
                                       },
                                       color: Colors.indigoAccent[400],
                                       shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                          borderRadius:
-                      ),
+                                              BorderRadius.circular(40)),
-                      child: Text("ログイン",style: TextStyle(
+                                      child: const Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                        "ログイン",
+                                        style: TextStyle(
+                                            fontWeight: FontWeight.w600,
+                                            fontSize: 16,
+                                            color: Colors.white70),
                                       ),
                                     ),
+                                    const SizedBox(
+                                      height: 10.0,
                                     ),
-                    SizedBox(height: 10.0,),
-                    
                                   ],
-                      ) 
+                                )),
                         ),
+                      )),
+                  const SizedBox(
+                    height: 20,
                   ),
-                )
+                  const Row(
-                ),
-                SizedBox(height: 20,),
-                Row(
                     mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
+                    children: [],
-                   
-                  ],
                   )
                 ],
-
               ),
             ],
           ),
-      )
+        ));
-    );
   }
 
-  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:TextStyle(
+        Text(
-        fontSize: 15,
+          label,
-        fontWeight: FontWeight.w400,
+          style: const TextStyle(
-        color: Colors.black87
+              fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
-      ),),
+        ),
-      SizedBox(height: 5,),
+        const SizedBox(
+          height: 5,
+        ),
         TextField(
           controller: controller,
           obscureText: obsureText,
           decoration: InputDecoration(
-          contentPadding: 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(
-      SizedBox(height: 30.0,)
+          height: 30.0,
+        )
       ],
     );
   }
-
-
 }

lib/pages/destination/destination_binding.dart

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

lib/pages/destination/destination_page.dart

@@ -1,217 +1,252 @@
-import 'dart:developer';
+// import 'package:flutter/material.dart';
-import 'dart:io';
+// 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:camera_camera/camera_camera.dart';
+// class XDestnationPage extends StatelessWidget {
-import 'package:flutter/material.dart';
+//   XDestnationPage({Key? key}) : super(key: key);
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rogapp/pages/camera/camera_page.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/services/external_service.dart';
-import 'package:rogapp/widgets/destination_widget.dart';
-import 'package:timeline_tile/timeline_tile.dart';
 
-class DestnationPage extends StatelessWidget {
+//   final DestinationController destinationController =
-  DestnationPage({Key? key}) : super(key: key);
+//       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 {
+//   Image getImage(int index) {
-    LocationPermission permission = await Geolocator.checkPermission();
+//     if (destinationController.destinations[index].photos == null ||
-    if (permission != LocationPermission.whileInUse ||
+//         destinationController.destinations[index].photos == "") {
-        permission != LocationPermission.always) {
+//       return const Image(image: AssetImage('assets/images/empty_image.png'));
-      permission = await Geolocator.requestPermission();
+//     } else {
-    }
+//       return Image(
-    Position position = await Geolocator.getCurrentPosition(
+//           image:
-        desiredAccuracy: LocationAccuracy.high);
+//               NetworkImage(destinationController.destinations[index].photos!));
-    indexController.rogMapController?.move(LatLng(position.latitude, position.longitude), 14);
+//     }
-  }
+//   }
 
-  Image getImage(int index){
+//   Widget getRoutingImage(int route) {
-    if(destinationController.destinations[index].photos == null || destinationController.destinations[index].photos == ""){
+//     switch (route) {
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+//       case 0:
-    }
+//         return const Image(
-    else{
+//           image: AssetImage('assets/images/p4_9_man.png'),
-      return Image(image: NetworkImage(destinationController.destinations[index].photos!));
+//           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){
+//   @override
-    switch (route) {
+//   Widget build(BuildContext context) {
-      case 0:
+//     return WillPopScope(
-        return Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
+//       onWillPop: () async {
-      case 1:
+//         indexController.switchPage(AppPages.INITIAL);
-        return Image(image: AssetImage('assets/images/p4_8_car.png'), width: 35.0,);
+//         return false;
-      case 2:
+//       },
-        return Image(image: AssetImage('assets/images/p4_10_train.png'), width: 35.0,);
+//       child: Scaffold(
-      default:
+//           drawer: DrawerPage(),
-        return Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
+//           bottomNavigationBar: BottomAppBar(
-    }
+//             child: Row(
-  }
+//               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-
+//               children: <Widget>[
-@override
+//                 Padding(
-  Widget build(BuildContext context) {
+//                   padding: const EdgeInsets.only(left: 13.0),
-    final ColorScheme colorScheme = Theme.of(context).colorScheme;
+//                   child: InkWell(
-    final Color oddItemColor = colorScheme.primary.withOpacity(0.05);
+//                       child: Obx((() => getRoutingImage(
-    final Color evenItemColor = colorScheme.primary.withOpacity(0.15);
+//                           destinationController.travelMode.value))),
-    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: TextStyle(fontSize: 22.0, color:Colors.red, fontWeight:FontWeight.bold),),),
-                              ),
-                              ListTile(
-                                selected: destinationController.travelMode == 0 ? true : false,
-                                selectedTileColor: Colors.amber.shade200,
-                                leading: 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: 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;
+//                         Get.bottomSheet(
-                              //     destinationController.PopulateDestinations();
+//                           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
-                        isScrollControlled:false,
+//                                           ? true
-                        backgroundColor: Colors.white,
+//                                           : false,
-                      ); 
+//                                   selectedTileColor: Colors.amber.shade200,
-                      //destinationController.PopulateDestinations();
+//                                   leading: const Image(
-                    }
+//                                     image: AssetImage(
-                  ),
+//                                         'assets/images/p4_8_car.png'),
-              )
-              ,
-                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 ?
-              Image(image: AssetImage('assets/images/list2.png'))
-              :
-              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: Icon(Icons.assistant_photo),
-                  )
-                :
-                  IconButton(
-                    onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, 
-                    icon: Icon(Icons.accessibility),
-                  ),
-            ),
-            // Obx(() => 
-            //   Text(indexController.connectionStatusName.value)
 //                                   ),
-            Obx(() => 
+//                                   title: Text("driving".tr),
-             ToggleButtons(
+//                                   onTap: () {
-                  disabledColor: Colors.grey.shade200,
+//                                     destinationController.travelMode.value = 1;
-                  selectedColor: Colors.red,
+//                                     destinationController
-                children: <Widget>[
+//                                         .populateDestinations();
-                  Icon(Icons.explore, size: 35.0,
+//                                     Get.back();
-                )],
-                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))
+//                                 ),
-          ],
+//                                 // ListTile(
-        ),
+//                                 //   selected: destinationController.travelMode == 2 ? true : false,
-        body: Obx(() => 
+//                                 //   selectedTileColor: Colors.amber.shade200,
-          indexController.desination_mode.value == 0 ?
+//                                 //   leading: Image(image: AssetImage('assets/images/p4_10_train.png'),),
-                  DestinationWidget():
+//                                 //   title: Text("transit".tr),
-                  DestinationMapPage()
+//                                 //   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,38 +1,31 @@
-
 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_map_tile_caching/flutter_map_tile_caching.dart';
 import 'package:flutter_polyline_points/flutter_polyline_points.dart';
-import 'package:geojson/geojson.dart';
-import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:latlong2/latlong.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/services/destination_service.dart';
 import 'package:rogapp/utils/text_util.dart';
 import 'package:rogapp/widgets/base_layer_widget.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
-import 'package:rogapp/widgets/bottom_sheet_widget.dart';
-import 'package:rogapp/widgets/bread_crum_widget.dart';
-
 
 class DestinationMapPage extends StatelessWidget {
   DestinationMapPage({Key? key}) : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
 
-  final DestinationController destinationController = Get.find<DestinationController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
   StreamSubscription? subscription;
   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);
@@ -46,29 +39,30 @@ 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),
+          alignment: Alignment.center,
-          builder:(cts){
+          child: InkWell(
-
-            return InkWell(
             onTap: () {
-                  print("-- Destination is --- ${d.name} ------");
+              //print("-- Destination is --- ${d.name} ------");
-                  if(d != null){
+              if (indexController.currentDestinationFeature.isNotEmpty) {
-                    if(indexController.currentDestinationFeature.length > 0) {
                 indexController.currentDestinationFeature.clear();
               }
               indexController.currentDestinationFeature.add(d);
               //indexController.getAction();
 
-                    showModalBottomSheet(context: Get.context!, isScrollControlled: true, 
+              showModalBottomSheet(
-                     builder:((context) => BottomSheetNew())
+                  context: Get.context!,
-                    ).whenComplete((){
+                  isScrollControlled: true,
-                      print("---- set skip gps to false -----");
+                  constraints:
-                      destinationController.skip_gps = false;
+                      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,
@@ -79,24 +73,30 @@ class DestinationMapPage extends StatelessWidget {
                   decoration: BoxDecoration(
                     color: Colors.red,
                     shape: BoxShape.circle,
-                      border: new Border.all(
+                    border: Border.all(
                       color: Colors.white,
                       width: d.checkin_radious != null ? d.checkin_radious! : 1,
                     ),
                   ),
-                    child: new Center(
+                  child: Center(
-                      child: new Text(
+                    child: Text(
                       (i + 1).toString(),
-                        style: TextStyle(color: Colors.white),
+                      style: const TextStyle(color: Colors.white),
                     ),
                   ),
                 ),
-                  Container( color: Colors.yellow, child: Text(TextUtils.getDisplayText(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
+                Container(
+                    color: Colors.yellow,
+                    child: Text(
+                      TextUtils.getDisplayText(d),
+                      style: const TextStyle(
+                          fontSize: 15.0,
+                          fontWeight: FontWeight.bold,
+                          overflow: TextOverflow.visible),
+                    )),
               ],
             ),
-            );
+          ));
-          
-        });
 
       pts.add(m);
     }
@@ -105,8 +105,7 @@ class DestinationMapPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Obx((() => 
+    return Obx((() => Stack(
-      Stack(
           children: [
             // indexController.is_rog_mapcontroller_loaded.value == false ?
             //   Center(child: CircularProgressIndicator())
@@ -118,320 +117,60 @@ class DestinationMapPage extends StatelessWidget {
             Padding(
               padding: const EdgeInsets.only(top: 0.0),
               //child: TravelMap(),
-            child: 
+              child: travelMap(),
-              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) {
+          subscription = indexController.rogMapController.mapEventStream
-            if (mapEvent is MapEventMoveStart) {
+              .listen((MapEvent mapEvent) {
-            }
+            if (mapEvent is MapEventMoveStart) {}
             if (mapEvent is MapEventMoveEnd) {
               //destinationController.is_gps_selected.value = true;
               //indexController.mapController!.move(c.center, c.zoom);
-              LatLngBounds bounds = indexController.rogMapController!.bounds!;
+              LatLngBounds bounds = indexController.rogMapController.bounds!;
               indexController.currentBound.clear();
               indexController.currentBound.add(bounds);
-              if(indexController.currentUser.length <= 0){
+              if (indexController.currentUser.isEmpty) {
                 indexController.loadLocationsBound();
               }
             }
           });
         },
-      bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
+        bounds: indexController.currentBound.isNotEmpty
+            ? indexController.currentBound[0]
+            : LatLngBounds.fromPoints([
+                LatLng(35.03999881162295, 136.40587119778962),
+                LatLng(36.642756778706904, 137.95226720406063)
+              ]),
         zoom: 1,
         maxZoom: 42,
         interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
       ),
       children: [
-      BaseLayer(),
+        const BaseLayer(),
-      Obx(() =>
+        Obx(
-      indexController.routePointLenght > 0 ?
+          () => indexController.routePointLenght > 0
-        PolylineLayer(
+              ? PolylineLayer(
                   polylines: [
                     Polyline(
                         points: getPoints()!,
                         strokeWidth: 6.0,
-                    color: Colors.indigo
+                        color: Colors.indigo),
-              ),
                   ],
                 )
-        
+              : Container(),
-        :
-        Container(),
         ),
         CurrentLocationLayer(),
-      MarkerLayer(
+        MarkerLayer(markers: getMarkers()!),
-        markers: getMarkers()!
-      ),
       ],
-    
     );
   }
 }
-
-
-
-
-// class DestinationMapPage extends StatefulWidget {
-//   DestinationMapPage({ Key? key }) : super(key: key);
-
-
-//   @override
-//   State<DestinationMapPage> createState() => _DestinationMapPageState();
-// }
-
-//class _DestinationMapPageState extends State<DestinationMapPage> {
-  // final IndexController indexController = Get.find<IndexController>();
-
-  // final DestinationController destinationController = Get.find<DestinationController>();
-  // StreamSubscription? subscription;
-  // final PopupController _popupLayerController = PopupController();
-
-  //   List<LatLng>? getPoints(List<PointLatLng> ptts){
-  //     //print("##### --- route point ${indexController.routePoints.length}");
-  //     List<LatLng> pts = [];
-  //     for(PointLatLng p in ptts){
-  //       LatLng l = LatLng(p.latitude, p.longitude);
-  //       pts.add(l);
-  //     }
-  //     return pts;
-  //   }
-
-  //   String getDisplaytext(Destination dp){
-  //     String txt = "";
-  //     if(dp.cp! > 0){
-  //       txt = "${dp.cp}";
-  //       if(dp.checkin_point != null && dp.checkin_point! > 0){
-  //         txt = txt + "{${dp.checkin_point}}";
-  //       }
-  //       if(dp.buy_point != null && dp.buy_point! > 0){
-  //         txt = txt + "[${dp.buy_point}]";
-  //       }
-  //     }
-  //     return txt;
-  //   }
-
-  //   List<Marker>? getMarkers() {
-  //     List<Marker> pts = [];
-  //     int index = -1;
-  //     for (int i = 0; i < destinationController.destinations.length; i++) {
-  //       Destination d = destinationController.destinations[i];
-  //     //for(Destination d in destinationController.destinations){
-  //       //print("-----lat ${lat}, ----- lon ${lan}");
-  //       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(d != null){
-  //                   if(indexController.currentDestinationFeature.length > 0) {
-  //                     indexController.currentDestinationFeature.clear();
-  //                   }
-  //                   indexController.currentDestinationFeature.add(d);
-  //                   //indexController.getAction();
-            
-  //                   showModalBottomSheet(context: context, isScrollControlled: true, 
-  //                    //builder:((context) => BottomSheetWidget())
-  //                    builder:((context) => BottomSheetNew())
-  //                   );
-  //                 }
-  //             },
-  //             child: Row(
-  //               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-  //               children: [
-  //                 Container(
-  //                     width:20,
-  //                     height:20,
-  //                   decoration:  BoxDecoration(
-  //                     color: Colors.red,
-  //                     shape: BoxShape.circle,
-  //                     border: new Border.all(
-  //                       color: Colors.white,
-  //                       width: d.checkin_radious != null ? d.checkin_radious! : 1,
-  //                     ),
-  //                   ),
-  //                   child: new Center(
-  //                     child: new Text(
-  //                       (i + 1).toString(),
-  //                       style: TextStyle(color: Colors.white),
-  //                     ),
-  //                   ),
-  //                 ),
-  //                 Container( color: Colors.yellow, child: Text(getDisplaytext(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
-  //               ],
-  //             ),
-  //           );
-
-  //         //return Icon(Icons.pin_drop);
-  //         // return IconButton(
-  //         //   onPressed: ()async {
-  //         //         Destination? fs = await destinationController.getDEstinationForLatLong(d.lat!, d.lon!);
-  //         //         print("-- Destination is --- ${fs!.name} ------");
-  //         //         if(fs != null){
-  //         //           if(indexController.currentDestinationFeature.length > 0) {
-  //         //             indexController.currentDestinationFeature.clear();
-  //         //           }
-  //         //           indexController.currentDestinationFeature.add(fs);
-  //         //           //indexController.getAction();
-            
-  //         //           showModalBottomSheet(context: context, isScrollControlled: true, 
-  //         //            //builder:((context) => BottomSheetWidget())
-  //         //            builder:((context) => BottomSheetNew())
-  //         //           );
-  //         //         }
-  //         //     },
-  //         //     icon: Container(
-  //         //       width: 60,
-  //         //       height: 60,
-  //         //       decoration: BoxDecoration(
-  //         //         borderRadius: BorderRadius.circular(d.checkin_radious ?? 0),
-  //         //         color: Colors.transparent,
-  //         //         border: BoxBorder()
-  //         //       ),
-  //         //         child: Icon(Icons.pin_drop)
-  //         //         )
-  //         //       );
-          
-  //       });
-        
-  //       pts.add(m);
-  //     }
-  //     return pts;
-  //   }
-
-  // @override
-  // void initState() {
-
-  //   //indexController.routePoints.clear();
-  //   DestinationService.getDestinationLine(destinationController.destinations)?.then((value){
-  //     //print("---- loading destination points ------ ${value}");
-  //     setState(() {
-  //       indexController.routePoints = value;
-  //     });
-  //   });
-  //   super.initState();
-  // }
-
-  // void reload(){
-  //   setState(() {
-      
-  //   });
-  // }
-
-  // @override
-  // Widget build(BuildContext context) {
-  //   return Obx((() => 
-  //     Stack(
-  //       children: [
-  //         indexController.is_rog_mapcontroller_loaded.value == false ? 
-  //           Center(child: CircularProgressIndicator())
-  //         :
-  //         BreadCrumbWidget(mapController:indexController.rogMapController),
-  //         Padding(
-  //           padding: const EdgeInsets.only(top:50.0),
-  //           //child: TravelMap(),
-  //           child: 
-  //             TravelMap(indexController.routePoints),
-  //         ),
-  //         // Positioned(
-  //         //   bottom: 200,
-  //         //   left: 10,
-  //         //   child: Container(
-  //         //     color: Colors.white,
-  //         //     child: Row(
-  //         //       children: [
-  //         //         Text(destinationController.gps[0]),
-  //         //         Text(destinationController.locationPermission[0])
-  //         //       ],
-  //         //     ),
-  //         //   )
-  //         // ),
-  //       ],
-  //     )
-  //   ));
-  // }
-
-  // FlutterMap TravelMap(List<PointLatLng> ptts) {
-  //   return FlutterMap(
-  //   options: MapOptions(
-  //     onMapCreated: (c){
-  //       indexController.rogMapController = c;
-  //       indexController.rogMapController!.onReady.then((_) {
-  //           indexController.is_rog_mapcontroller_loaded.value = true;
-  //           subscription = indexController.rogMapController!.mapEventStream.listen((MapEvent mapEvent) {
-  //           if (mapEvent is MapEventMoveStart) {
-  //                               //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
-  //                               // do something
-  //           }
-  //           if (mapEvent is MapEventMoveEnd) {
-  //             destinationController.isSelected.value = false;
-  //                               //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
-  //             //indexController.loadLocationsBound();
-  //           }
-  //         });
-  //       });
-  //     } ,
-  //     bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
-  //     zoom: 1,
-  //     maxZoom: 42,
-  //     interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
-  //     //plugins: [LocationMarkerPlugin(),]
-  //   ),
-  //   children: [
-  //     TileLayerWidget(
-  //       options: TileLayerOptions(
-  //         urlTemplate: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
-  //         subdomains: ['a', 'b', 'c'],
-  //       ),
-  //     ),
-  //     //Obx(() =>
-  //     indexController.routePoints.length > 0 ?
-  //       PolylineLayerWidget(
-  //         options: PolylineLayerOptions(
-  //           polylines: [
-  //             Polyline(
-  //               points: getPoints(ptts)!,
-  //                 strokeWidth: 6.0,
-  //                   color: Colors.indigo
-  //             ),
-  //           ],
-  //         ),
-  //       )
-  //       :
-  //       Container(),
-  //     //),
-  //     // PopupMarkerLayerWidget(
-  //     //   options: PopupMarkerLayerOptions(
-  //     //     popupController: _popupLayerController,
-  //     //     markers: _markers,
-  //     //     markerRotateAlignment:
-  //     //         PopupMarkerLayerOptions.rotationAlignmentFor(AnchorAlign.top),
-  //     //     popupBuilder: (BuildContext context, Marker marker) =>
-            
-  //     //         examplePopup(marker),
-  //     //   ),
-  //     // ),
-  //     LocationMarkerLayerWidget(), 
-  //     MarkerLayerWidget(
-  //       options: MarkerLayerOptions(
-  //         markers: getMarkers()!
-  //       ),
-  //     ),
-  //   ],
-    
-  // );
-  // }
-//}

lib/pages/drawer/drawer_page.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
@@ -13,7 +12,7 @@ class DrawerPage extends StatelessWidget {
   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
@@ -28,71 +27,125 @@ class DrawerPage extends StatelessWidget {
             Container(
               height: 100,
               color: Colors.amber,
-              child: Obx(() => 
+              child: Obx(() => Center(
-                Center(
                     child: Padding(
                       padding: const EdgeInsets.all(8.0),
-                  child: 
+                      child: indexController.currentUser.isEmpty
-                  indexController.currentUser.length == 0 ?
+                          ? Flexible(
-                    Flexible(child: Text("drawer_title".tr, style: TextStyle(color: Colors.black, fontSize: 20),))
+                              child: Text(
-                    :
+                              "drawer_title".tr,
-                    Text(indexController.currentUser[0]['user']['email'], style: TextStyle(color: Colors.black, fontSize: 20),),
+                              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.length == 0 ?
+            ),
-              ListTile(
+            Obx(() => indexController.currentUser.isEmpty
+                ? ListTile(
                     leading: const Icon(Icons.login),
                     title: Text("login".tr),
                     onTap: () {
                       Get.toNamed(AppPages.LOGIN);
                     },
-              ) : 
+                  )
-              ListTile(
+                : ListTile(
                     leading: const Icon(Icons.login),
                     title: Text("logout".tr),
                     onTap: () {
                       indexController.logout();
-                  Get.toNamed(AppPages.TRAVEL);
+                      Get.toNamed(AppPages.LOGIN);
                     },
-              )
+                  )),
-            ),
+            indexController.currentUser.isNotEmpty
-            indexController.currentUser.length > 0 ?
+                ? ListTile(
-            ListTile(
                     leading: const Icon(Icons.password),
                     title: Text("change_password".tr),
                     onTap: () {
                       Get.toNamed(AppPages.CHANGE_PASSWORD);
                     },
-            ) : 
+                  )
-            Container(width: 0, height: 0,),
+                : const SizedBox(
-            indexController.currentUser.length == 0 ?
+                    width: 0,
-            ListTile(
+                    height: 0,
+                  ),
+            indexController.currentUser.isEmpty
+                ? ListTile(
                     leading: const Icon(Icons.person),
                     title: Text("sign_up".tr),
                     onTap: () {
                       Get.toNamed(AppPages.REGISTER);
                     },
-            ) : 
+                  )
-            Container(width: 0, height: 0,),
+                : const SizedBox(
-            indexController.currentUser.length > 0 ?
+                    width: 0,
-            ListTile(
+                    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'];
+                      String token = indexController.currentUser[0]['token'];
-                AuthService.deleteUser(_token).then((value){
+                      AuthService.deleteUser(token).then((value) {
                         if (value.isNotEmpty) {
                           indexController.logout();
                           Get.toNamed(AppPages.TRAVEL);
-                    Get.snackbar("accounted_deleted".tr, "account_deleted_message".tr);
+                          Get.snackbar("accounted_deleted".tr,
+                              "account_deleted_message".tr);
                         }
                       });
                     },
-            ) : 
+                  )
-            Container(width: 0, height: 0,),
+                : 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),
@@ -108,15 +161,18 @@ class DrawerPage extends StatelessWidget {
             //   title: Text("point_rank".tr),
             //   onTap: (){},
             // ),
-            indexController.currentUser.length > 0 ?
+            indexController.currentUser.isNotEmpty
-            ListTile(
+                ? ListTile(
                     leading: const Icon(Icons.featured_video),
                     title: Text("rog_web".tr),
                     onTap: () {
                       _launchURL("https://www.gifuai.net/?page_id=17397");
                     },
-            ) : 
+                  )
-            Container(width: 0, height: 0,),
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
             ListTile(
               leading: const Icon(Icons.privacy_tip),
               title: Text("privacy".tr),

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

@@ -0,0 +1,150 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:rogapp/model/destination.dart';
+import 'package:rogapp/utils/database_helper.dart';
+
+class HistoryPage extends StatefulWidget {
+  const HistoryPage({super.key});
+
+  @override
+  State<HistoryPage> createState() => _HistoryPageState();
+}
+
+class _HistoryPageState extends State<HistoryPage> {
+  DatabaseHelper db = DatabaseHelper.instance;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text("通過履歴"),
+      ),
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            FutureBuilder(
+                future: db.getDestinations(),
+                builder: (BuildContext context,
+                    AsyncSnapshot<List<Destination>> snapshot) {
+                  if (snapshot.connectionState == ConnectionState.done) {
+                    if (snapshot.hasError) {
+                      return Center(
+                        child: Text(
+                          '${snapshot.error} occurred',
+                          style: const TextStyle(fontSize: 18),
+                        ),
+                      );
+                    } else if (snapshot.hasData) {
+                      final dests = snapshot.data;
+                      if (dests!.isNotEmpty) {
+                        //print("----- history -----");
+                        return SizedBox(
+                            width: MediaQuery.of(context).size.width,
+                            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:
+                                          "${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 const Center(child: Text("No checkin yet"));
+                      }
+                    }
+                  } else if (snapshot.connectionState ==
+                      ConnectionState.waiting) {
+                    return const Center(
+                      child: CircularProgressIndicator(),
+                    );
+                  }
+                  return Container();
+                }),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+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/home/home_page.dart

@@ -3,6 +3,8 @@ import 'package:get/get.dart';
 import 'package:rogapp/pages/search/search_page.dart';
 
 class HomePage extends GetView{
+  const HomePage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/pages/index/index_binding.dart

@@ -1,12 +1,13 @@
-
-import 'package:flutter_map/plugin_api.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/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,26 +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<GeoJSONFeatureCollection> locations = <GeoJSONFeatureCollection>[].obs;
-  List<GeoJsonFeature> currentFeature = <GeoJsonFeature>[].obs;
+  List<GeoJSONFeature> currentFeature = <GeoJSONFeature>[].obs;
   List<Destination> currentDestinationFeature = <Destination>[].obs;
   List<dynamic> perfectures = <dynamic>[].obs;
   List<LatLngBounds> currentBound = <LatLngBounds>[].obs;
@@ -39,33 +34,34 @@ class IndexController extends GetxController {
   List<PointLatLng> routePoints = <PointLatLng>[].obs;
   var routePointLenght = 0.obs;
 
-  var is_loading = false.obs;
+  double currentLat = 0.0, currentLon = 0.0;
 
-  var is_mapController_loaded = false.obs;
+  var isLoading = false.obs;
-  var is_rog_mapcontroller_loaded = false.obs;
 
-  var is_custom_area_selected = false.obs;
+  var isRogMapcontrollerLoaded = 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();
@@ -74,64 +70,54 @@ class IndexController extends GetxController {
   void toggleMode() {
     if (mode.value == 0) {
       mode += 1;
-    }
+    } else {
-    else{
       mode -= 1;
     }
   }
 
   void toggleDestinationMode() {
-    if(desination_mode.value==0){
+    if (desinationMode.value == 0) {
-      desination_mode.value += 1;
+      desinationMode.value += 1;
-    }
+    } else {
-    else{
+      desinationMode.value -= 1;
-      desination_mode.value -= 1;
     }
   }
 
   void switchPage(String page) {
-    //print("######## ${currentUser[0]["user"]["id"]}");
+    ////print("######## ${currentUser[0]["user"]["id"]}");
     switch (page) {
-      case AppPages.INITIAL :{
+      case AppPages.INDEX:
-        rog_mode.value = 0;
+        {
-        print("-- rog mode is ctrl is ${rog_mode.value}");
+          rogMode.value = 0;
+          //print("-- rog mode is ctrl is ${rog_mode.value}");
           Get.toNamed(page);
         }
         break;
-      case AppPages.TRAVEL : {
+      case AppPages.TRAVEL:
-        rog_mode.value = 1;
+        {
+          rogMode.value = 1;
           //Get.back();
-        Get.off(DestnationPage(), binding: DestinationBinding());
+          //Get.off(DestnationPage(), binding: DestinationBinding());
-
         }
         break;
-      case AppPages.LOGIN :{
+      case AppPages.LOGIN:
-        rog_mode.value = 2;
+        {
+          rogMode.value = 2;
           Get.toNamed(page);
         }
         break;
-      default:{
+      default:
-        rog_mode.value = 0;
+        {
-        Get.toNamed(AppPages.INITIAL);
+          rogMode.value = 1;
+          Get.toNamed(AppPages.INDEX);
         }
     }
   }
 
   @override
   void onInit() {
-    _ever = ever(rog_mode, (_) => print("$_ has been changed (ever)"));
+    _connectivitySubscription =
-
+        _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-    if(perfectures.length == 0){
-      PerfectureService.loadPerfectures().then((value){
-        perfectures.add(value);
-        loadAreaFor("9");
-        
-        //loadSubPerfFor("9");
-      });
-    } 
-
-    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-
     super.onInit();
   }
 
@@ -151,8 +137,8 @@ Future<void> initConnectivity() async {
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
       result = await _connectivity.checkConnectivity();
-    } on PlatformException catch (e) {
+    } on PlatformException catch (_) {
-      print('Couldn\'t check connectivity status --- $e');
+      //print('Couldn\'t check connectivity status --- $e');
       return;
     }
 
@@ -176,102 +162,64 @@ LatLngBounds boundsFromLatLngList(List<LatLng> list) {
     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) {
-          currentUser.clear();
-          currentUser.add(value);
-          is_loading.value = false;
         Navigator.pop(context);
-          loadUserDetails();
+        //print("--------- user details login ----- $value");
-          loadLocationsBound();
+        changeUser(value);
-          cats.clear();
-          if(currentFeature.isNotEmpty){
-            getAction();
-          }
-
-          if(currentUser.length > 0){
-            rog_mode.value = 0  ;
-          }
-          else{
-            rog_mode.value = 1;
-          }
-
-          if(rog_mode.value == 1){
-            switchPage(AppPages.TRAVEL);
-          }
-          else{
-            switchPage(AppPages.INITIAL);
-          }
-          //Get.toNamed(AppPages.INITIAL);
       } else {
-        is_loading.value = false;
+        isLoading.value = false;
         Get.snackbar(
           "Failed",
           "User login failed, please try again.",
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
           snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+          duration: const Duration(milliseconds: 800),
           backgroundColor: Colors.yellow,
           //icon:Image(image:AssetImage("assets/images/dora.png"))
         );
       }
-       
     });
   }
 
-   void changePassword(String oldpassword, String newpassword, BuildContext context){
+  void changePassword(
-      String _token = currentUser[0]['token'];
+      String oldpassword, String newpassword, BuildContext context) {
-      //print("------- change password ######## ${currentUser[0]['token']} ###### --------");
+    String token = currentUser[0]['token'];
-      AuthService.changePassword(oldpassword, newpassword, _token).then((value){
+    ////print("------- change password ######## ${currentUser[0]['token']} ###### --------");
-      print("------- change password ######## ${value} ###### --------");
+    AuthService.changePassword(oldpassword, newpassword, token).then((value) {
+      ////print("------- change password ######## $value ###### --------");
       if (value.isNotEmpty) {
-        is_loading.value = false;
+        isLoading.value = false;
         Navigator.pop(context);
-        if(rog_mode.value == 1){
+        if (rogMode.value == 1) {
           switchPage(AppPages.TRAVEL);
-        }
+        } else {
-        else{
+          switchPage(AppPages.INDEX);
-          switchPage(AppPages.INITIAL);
         }
       } else {
         Get.snackbar(
           'failed'.tr,
           'password_change_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
           snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+          duration: const Duration(milliseconds: 800),
           backgroundColor: Colors.yellow,
           //icon:Image(image:AssetImage("assets/images/dora.png"))
         );
       }
-       
     });
-     is_loading.value = false;
+    isLoading.value = false;
   }
 
   void logout() async {
     locations.clear();
     DatabaseHelper db = DatabaseHelper.instance;
     db.deleteAllDestinations().then((value) {
-      DestinationController destinationController = Get.find<DestinationController>();
+      DestinationController destinationController =
-      if(destinationController != null){
+          Get.find<DestinationController>();
-        destinationController.PopulateDestinations();
+      destinationController.populateDestinations();
-      }
     });
     currentUser.clear();
     cats.clear();
@@ -282,18 +230,17 @@ void login(String email, String password, BuildContext context){
       if (value.isNotEmpty) {
         currentUser.clear();
         currentUser.add(value);
-        is_loading.value = false;
+        isLoading.value = false;
         Navigator.pop(context);
-        loadUserDetails();
+        Get.toNamed(AppPages.INDEX);
-        Get.toNamed(AppPages.INITIAL);
       } else {
-         is_loading.value = false;
+        isLoading.value = false;
         Get.snackbar(
           'failed'.tr,
           'user_registration_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
           snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+          duration: const Duration(milliseconds: 800),
           backgroundColor: Colors.yellow,
           //icon:Image(image:AssetImage("assets/images/dora.png"))
         );
@@ -301,191 +248,42 @@ void login(String email, String password, BuildContext context){
     });
   }
 
-   void makeAction(BuildContext context){
+  void saveToDevice(String val) async {
-    int user_id = currentUser[0]["user"]["id"] as int;
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    int location_id = currentFeature[0].properties!["location_id"] as int;
+    await prefs.setString("user_token", val);
-     bool wanttogo = currentAction[0][0]["wanttogo"];
-     bool like = currentAction[0][0]["like"];
-     bool checkin = currentAction[0][0]["checkin"];
-     if(user_id > 0){
-       ActionService.makeAction(user_id, location_id, wanttogo, like, checkin).then((value){
-       });
   }
 
+  void changeUser(Map<String, dynamic> value, {bool replace = true}) {
+    //print("---- change user to $value -----");
+    currentUser.clear();
+    currentUser.add(value);
+    if (replace) {
+      saveToDevice(currentUser[0]["token"]);
     }
-
+    isLoading.value = false;
-  String getCatText(){
-    String _cat = 'all'.tr;
-    if(currentUser.length > 0){
-      Map<String, dynamic> _urs = currentUser[0];
-      print('-- is_rogaining :-- ${_urs['user']['is_rogaining']} ------');
-      if(_urs['user']['is_rogaining'] == true){
-        _cat = 'rogaining'.tr;
-      }
-      else {
-        _cat = 'sight_seeing'.tr;
-      }
-    }
-    return _cat;
-  }
-
-  void loadCatsv2(){
-     dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController!.bounds!;
-     if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != 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.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != 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"){
+    if (currentUser.isNotEmpty) {
-    //    LocationService.loadLocationsFor(dropdownValue, currentCat[0]).then((value){
+      rogMode.value = 0;
-    //       locations.clear();
+    } else {
-    //       locations.add(value!);
+      rogMode.value = 1;
-    //       is_loading.value = false;
+    }
-    //    });
+    //print('--- c rog mode --- ${rogMode.value}');
-    //    print("loading main------");
+    Get.toNamed(AppPages.INDEX);
-    //  } 
-    //  else{
-    //    LocationService.loadLocationsSubFor(subDropdownValue, currentCat[0]).then((value){
-    //       locations.clear();
-    //       locations.add(value!);
-    //       is_loading.value = false;
-    //    });
-    //    print("loading sub------");
-    //  }
   }
 
-  void loadAreaFor(String perf){
+  loadUserDetailsForToken(String token) async {
-    areas.clear();
+    AuthService.userForToken(token).then((value) {
-    dynamic initVal = {'id':'-1', 'area_nm':'----'};
+      ////print("----token val-- $value  ------");
-    PerfectureService.loadGifuAreas(perf).then((value){
+      if (value![0]["user"].isEmpty) {
-      value!.add(initVal);
+        Get.toNamed(AppPages.LOGIN);
-      areas.add(value);
+        return;
-    });
       }
-
+      changeUser(value[0], replace: false);
-  void loadUserDetails(){
-    if(currentUser.length > 0){
-      int user_id = currentUser[0]["user"]["id"] as int;
-      AuthService.UserDetails(user_id).then((value){
-        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.length > 0){
-      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;
-        }
-      }
-    }
-    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!);
-    });
-  }
-
-  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(Duration(microseconds: 400), () {
-        mapController!.fitBounds(bounds);
-      });
-      
     });
   }
 
   void loadLocationsBound() {
-    if(is_custom_area_selected.value == true){
+    if (isCustomAreaSelected.value == true) {
       return;
     }
     locations.clear();
@@ -493,192 +291,67 @@ void login(String email, String password, BuildContext context){
     if (currentCat.isNotEmpty && currentCat[0] == "-all-") {
       cat = "";
     }
-    LatLngBounds bounds = mapController!.bounds!;
+    LatLngBounds bounds = mapController.bounds!;
     currentBound.clear();
     currentBound.add(bounds);
-    //print(currentCat);
+    ////print(currentCat);
-    if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
+    LocationService.loadLocationsBound(
-      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){
+            bounds.southWest.latitude,
-      //print("---value length ------ ${value!.collection.length}");
+            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 != null && value.collection.isEmpty){
+      if (value.features.isEmpty) {
         if (showPopup == false) {
           return;
         }
         Get.snackbar(
           "Too many Points",
           "please zoom in",
-               icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+          icon: const Icon(Icons.assistant_photo_outlined,
+              size: 40.0, color: Colors.blue),
           snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+          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 != null && value.collection.isNotEmpty){
+      if (value.features.isNotEmpty) {
-          //print("---- added---");
+        ////print("---- added---");
         locations.add(value);
-          loadCatsv2();
       }
     });
   }
 
-  }
-
   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){
+      locations[0].features.forEach((i) {
-      LatLng lat1 = LatLng(value![1], value[0]);
+        GeoJSONMultiPoint p = i!.geometry as GeoJSONMultiPoint;
-      LatLng lat2 = LatLng(value[3], value[2]);
+        if (p.coordinates[0][1] == lat && p.coordinates[0][0] == long) {
-      LatLngBounds bound = LatLngBounds(lat1, lat2);
+          foundFeature = i;
-      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.length > 0){
-          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;
-          }
-        }
-      }
-  }
-
-  void getAction(){
-    //print(currentUser[0]["user"]["id"]);
-    //print(currentFeature[0].properties!["location_id"]);
-    if(currentUser.length == 0){
-      return;
-    }
-    int user_id = currentUser[0]["user"]["id"] as int;
-    print("---- loc id ${currentFeature[0].properties}");
-    int location_id = currentFeature[0].properties!["location_id"] as int;
-    ActionService.userAction(user_id, location_id).then((value){
-      print("------${value}");
-      if(value != null && value.length > 0){
-        currentAction.clear();
-        currentAction.add(value);
-        print("------${currentAction[0]}");
-      }else{
-        List<dynamic> initval = [{"user": user_id, "location": location_id, "wanttogo": false, "like": false, "checkin": false}];
-        currentAction.clear();
-        currentAction.add(initval);
         }
       });
-  }
 
-  void makeNext(GeoJsonFeature fs){
+      return foundFeature;
-
-    if(rog_mode == 1){
-      DestinationController destinationController = Get.find<DestinationController>();
     }
-    else {
+    return null;
-      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.length > 0){
-            currentFeature.clear();
-          }
-          if(i >= locations[0].collection.length - 1 ){
-            currentFeature.add(locations[0].collection[0] as GeoJsonFeature);
-            getAction();
-          }
-          else{
-            currentFeature.add(locations[0].collection[i + 1] as GeoJsonFeature);
-            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.length > 0){
-              currentFeature.clear();
-            }
-            if(i == 0 ){
-              currentFeature.add(locations[0].collection[locations[0].collection.length -1] as GeoJsonFeature);
-              getAction();
-            }
-            else{
-              currentFeature.add(locations[0].collection[i - 1] as GeoJsonFeature);
-              getAction();
-            }
-        }
-      }
-    }
-  }
-
-
-
 }

lib/pages/index/index_page.dart

@@ -1,46 +1,63 @@
-import 'dart:ui';
-
 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/maxtrix_service.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/bread_crum_widget.dart';
-import 'package:rogapp/widgets/cat_widget.dart';
 import 'package:rogapp/widgets/list_widget.dart';
 import 'package:rogapp/widgets/map_widget.dart';
 
-import 'package:flutter_polyline_points/flutter_polyline_points.dart';
-
 class IndexPage extends GetView<IndexController> {
   IndexPage({Key? key}) : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
-  final DestinationController destinationController = Get.find<DestinationController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
 
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
-      onWillPop: () async {
+      onWillPop: () async => false,
-        indexController.switchPage(AppPages.INITIAL);
-        return false;
-      },
       child: Scaffold(
-        //drawer: const DrawerPage(),
+        drawer: DrawerPage(),
         appBar: AppBar(
-              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);
+                },
+                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);
@@ -51,128 +68,102 @@ class IndexPage extends GetView<IndexController> {
                 decoration: BoxDecoration(
                   color: Colors.blue,
                   borderRadius: BorderRadius.circular(25),
-                    
                 ),
-                  child: const Center(child: Icon(Icons.search),),
+                child: const Center(
+                  child: Icon(Icons.search),
+                ),
               ),
             ),
             //CatWidget(indexController: indexController,),
           ],
         ),
-        bottomNavigationBar: BottomAppBar(
+        // bottomNavigationBar: BottomAppBar(
-          child: Row(
+        //   child: Row(
-            mainAxisAlignment: MainAxisAlignment.end,
+        //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
+        //     children: <Widget>[
-              Padding(
+        //       Obx(
-                padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+        //         () => destinationController.isInRog.value == true
-                child: InkWell(
+        //             ? IconButton(
-                  child: 
+        //                 onPressed: () {},
-                  Obx(() =>
+        //                 icon: const Icon(
-                    destinationController.is_gps_selected == true ? 
+        //                   Icons.run_circle,
-                      Padding(
+        //                   size: 44,
-                        padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+        //                   color: Colors.green,
-                        child: InkWell(
+        //                 ))
-                          child: Image(image: AssetImage('assets/images/route3_off.png'), width: 35, height: 35,),
+        //             : IconButton(
-                          onTap: (){
+        //                 onPressed: () {},
-                            indexController.switchPage(AppPages.TRAVEL);
+        //                 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(
+        //       Padding(
-                          child: Image(image: AssetImage('assets/images/route2_on.png'),width: 35, height: 35,),
+        //         padding:
-                          onTap: (){
+        //             const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
-                            indexController.switchPage(AppPages.TRAVEL);
+        //         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(() =>
+          child: Obx(
-            indexController.mode == 0 ? 
+            () => indexController.mode.value == 0
-            Image(image: AssetImage('assets/images/list2.png'))
+                ? const Image(image: AssetImage('assets/images/list2.png'))
-            :
+                : const Image(image: AssetImage('assets/images/map.png')),
-            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(() => 
+                  child: Obx(
-                  indexController.mode == 0 ?
+                () => indexController.mode.value == 0
-                  MapWidget() :
+                    ? MapWidget()
-                  ListWidget(),
+                    : const ListWidget(),
-                )
+              ))
-    
-              )
             ],
           ),
         ),
       ),
     );
   }
-
 }

lib/pages/landing/landing_page.dart

@@ -17,18 +17,18 @@ class _LandingPageState extends State<LandingPage> {
         child: Container(
           width: double.infinity,
           height: MediaQuery.of(context).size.height,
-          padding: EdgeInsets.symmetric(horizontal: 30,vertical: 30),
+          padding: const EdgeInsets.symmetric(horizontal: 30,vertical: 30),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Column(
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Text(
+                  const Text(
                     "こんにちは!",
                     style: TextStyle(fontWeight: FontWeight.bold, fontSize: 40),
                   ),
-                  SizedBox(height: 30,),
+                  const SizedBox(height: 30,),
                   Text("ログインを有効にして本人確認を行うと、サーバーが改善されます",
                       textAlign: TextAlign.center,
                       style: TextStyle(
@@ -38,11 +38,11 @@ class _LandingPageState extends State<LandingPage> {
                   ),
                   Container(
                     height: MediaQuery.of(context).size.height/3,
-                    decoration: BoxDecoration(
+                    decoration: const BoxDecoration(
                       image:DecorationImage(image: AssetImage('assets/images/gradient_japanese_temple.jpg'))
                     ),
                   ),
-                  SizedBox(height: 20.0,),
+                  const SizedBox(height: 20.0,),
                   MaterialButton(
                     minWidth: double.infinity,
                     height:60,
@@ -51,18 +51,18 @@ class _LandingPageState extends State<LandingPage> {
                     },
                     color: Colors.indigoAccent[400],
                     shape: RoundedRectangleBorder(
-                      side: BorderSide(
+                      side: const BorderSide(
                         color: Colors.black,
                       ),
                       borderRadius: BorderRadius.circular(40)
                     ),
-                    child: Text("ログイン",style: TextStyle(
+                    child: const Text("ログイン",style: TextStyle(
                       fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
 
                     ),
                     ),
                   ),
-                  SizedBox(height: 15.0,),
+                  const SizedBox(height: 15.0,),
 
                   MaterialButton(
                       minWidth: double.infinity,
@@ -74,7 +74,7 @@ class _LandingPageState extends State<LandingPage> {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("サインアップ",style: TextStyle(
+                      child: const Text("サインアップ",style: TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,
 
                       ),),

lib/pages/loading/loading_page.dart

@@ -6,11 +6,10 @@ class LoadingPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-          alignment: Alignment.topCenter,
+        alignment: Alignment.center,
-          margin: EdgeInsets.only(top: 20),
+        margin: const EdgeInsets.only(top: 20),
-          child: CircularProgressIndicator(
+        child: const CircularProgressIndicator(
           value: 0.8,
-          )
+        ));
-        );
   }
 }

lib/pages/login/login_page.dart

@@ -1,16 +1,16 @@
-
 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();
   TextEditingController passwordController = TextEditingController();
 
+  LoginPage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -19,14 +19,18 @@ class LoginPage extends StatelessWidget {
       appBar: AppBar(
         elevation: 0,
         backgroundColor: Colors.white,
-          leading:
+        leading: IconButton(
-          IconButton( onPressed: (){
+            onPressed: () {
               Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
       ),
-      body: 
+      body: indexController.currentUser.isEmpty
-      indexController.currentUser.length == 0 ?
+          ? SizedBox(
-      Container(
               width: double.infinity,
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
@@ -37,76 +41,97 @@ class LoginPage extends StatelessWidget {
                         children: [
                           Container(
                             height: MediaQuery.of(context).size.height / 6,
-                      decoration: BoxDecoration(
+                            decoration: const BoxDecoration(
-                        image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
+                                image: DecorationImage(
+                                    image: AssetImage(
+                                        'assets/images/login_image.jpg'))),
                           ),
+                          const SizedBox(
+                            height: 5,
                           ),
-                    SizedBox(height: 5,),
-
                         ],
                       ),
                       Padding(
-                  padding: EdgeInsets.symmetric(
+                        padding: const EdgeInsets.symmetric(horizontal: 40),
-                    horizontal: 40
-                  ),
                         child: Column(
                           children: [
-                      makeInput(label: "email".tr, controller: emailController),
+                            makeInput(
-                      makeInput(label: "password".tr, controller: passwordController, obsureText: true),
+                                label: "email".tr, controller: emailController),
+                            makeInput(
+                                label: "password".tr,
+                                controller: passwordController,
+                                obsureText: true),
                           ],
                         ),
                       ),
                       Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 40),
+                          padding: const EdgeInsets.symmetric(horizontal: 40),
                           child: Container(
-                    padding: EdgeInsets.only(top: 3,left: 3),
+                            padding: const EdgeInsets.only(top: 3, left: 3),
                             decoration: BoxDecoration(
                               borderRadius: BorderRadius.circular(40),
                             ),
-                    child: Obx((() => 
+                            child: Obx(
-                      indexController.is_loading == true ? MaterialButton(
+                              (() => indexController.isLoading.value == true
+                                  ? MaterialButton(
                                       minWidth: double.infinity,
                                       height: 60,
-                      onPressed: (){
+                                      onPressed: () {},
-                        
-                      },
                                       color: Colors.grey[400],
                                       shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                          borderRadius:
-                      ),
+                                              BorderRadius.circular(40)),
-                      child: CircularProgressIndicator(),
+                                      child: const CircularProgressIndicator(),
-                    ) :
+                                    )
-                      Column(
+                                  : Column(
                                       children: [
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 40,
                                           onPressed: () {
-                        if(emailController.text.isEmpty || passwordController.text.isEmpty){
+                                            if (emailController.text.isEmpty ||
+                                                passwordController
+                                                    .text.isEmpty) {
                                               Get.snackbar(
                                                 "no_values".tr,
-                            "email_and_password_required".tr,
+                                                "email_and_password_required"
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                                    .tr,
-                            snackPosition: SnackPosition.TOP,
+                                                icon: const Icon(
-                            duration: Duration(milliseconds: 800),
+                                                    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.isLoading.value =
-                        indexController.login(emailController.text, passwordController.text, context);
+                                                true;
+                                            indexController.login(
+                                                emailController.text,
+                                                passwordController.text,
+                                                context);
                                           },
                                           color: Colors.indigoAccent[400],
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("ログイン",style: TextStyle(
+                                          child: const Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "ログイン",
+                                            style: TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         ),
+                                        const SizedBox(
+                                          height: 5.0,
                                         ),
-                    SizedBox(height: 5.0,),
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 40,
@@ -115,14 +140,19 @@ class LoginPage extends StatelessWidget {
                                           },
                                           color: Colors.redAccent,
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("sign_up".tr,style: TextStyle(
+                                          child: Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "sign_up".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         ),
+                                        const SizedBox(
+                                          height: 2.0,
                                         ),
-                    SizedBox(height: 2.0,),
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 40,
@@ -131,29 +161,35 @@ class LoginPage extends StatelessWidget {
                                           },
                                           color: Colors.grey,
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("cancel".tr,style: TextStyle(
+                                          child: Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "cancel".tr,
-                      ),
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         ),
                                       ],
-                      ) 
+                                    )),
                             ),
+                          )),
+                      const SizedBox(
+                        height: 5,
                       ),
-                )
-                ),
-                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: TextStyle(
+                              child: Text(
+                                "rogaining_user_need_tosign_up".tr,
+                                style: const TextStyle(
                                   overflow: TextOverflow.ellipsis,
-                        ),),
+                                ),
+                              ),
                             ),
                           ),
                         ],
@@ -164,59 +200,81 @@ class LoginPage extends StatelessWidget {
                           Flexible(
                             child: Padding(
                               padding: const EdgeInsets.all(8.0),
-                        child: Text("app_developed_by_gifu_dx".tr, style: TextStyle(
+                              child: Text(
-                          overflow: TextOverflow.ellipsis, fontSize: 10.0
+                                "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.
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                ],
+              ),
             )
-              ],
+          : TextButton(
-
-            ),
-          ],
-        ),
-      ):
-      Container(
-        child: TextButton(
               onPressed: () {
                 indexController.currentUser.clear();
               },
-          child: Text("Already Logged in, Click to logout"),
+              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:TextStyle(
+      Text(
-        fontSize: 15,
+        label,
-        fontWeight: FontWeight.w400,
+        style: const TextStyle(
-        color: Colors.black87
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
-      ),),
+      ),
-      SizedBox(height: 5,),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: 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(
-      SizedBox(height: 30.0,)
+        height: 30.0,
+      )
     ],
   );
 }

lib/pages/login_popup/login_popup_page.dart

@@ -19,14 +19,18 @@ class LoginPopupPage extends StatelessWidget {
       appBar: AppBar(
         elevation: 0,
         backgroundColor: Colors.white,
-          leading:
+        leading: IconButton(
-          IconButton( onPressed: (){
+            onPressed: () {
               Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
       ),
-      body: 
+      body: indexController.currentUser.isEmpty
-      indexController.currentUser.length == 0 ?
+          ? SizedBox(
-      Container(
               width: double.infinity,
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
@@ -37,76 +41,97 @@ class LoginPopupPage extends StatelessWidget {
                         children: [
                           Container(
                             height: MediaQuery.of(context).size.height / 5,
-                      decoration: BoxDecoration(
+                            decoration: const BoxDecoration(
-                        image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
+                                image: DecorationImage(
+                                    image: AssetImage(
+                                        'assets/images/login_image.jpg'))),
                           ),
+                          const SizedBox(
+                            height: 5,
                           ),
-                    SizedBox(height: 5,),
-
                         ],
                       ),
                       Padding(
-                  padding: EdgeInsets.symmetric(
+                        padding: const EdgeInsets.symmetric(horizontal: 40),
-                    horizontal: 40
-                  ),
                         child: Column(
                           children: [
-                      makeInput(label: "email".tr, controller: emailController),
+                            makeInput(
-                      makeInput(label: "password".tr, controller: passwordController, obsureText: true),
+                                label: "email".tr, controller: emailController),
+                            makeInput(
+                                label: "password".tr,
+                                controller: passwordController,
+                                obsureText: true),
                           ],
                         ),
                       ),
                       Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 40),
+                          padding: const EdgeInsets.symmetric(horizontal: 40),
                           child: Container(
-                    padding: EdgeInsets.only(top: 3,left: 3),
+                            padding: const EdgeInsets.only(top: 3, left: 3),
                             decoration: BoxDecoration(
                               borderRadius: BorderRadius.circular(40),
                             ),
-                    child: Obx((() => 
+                            child: Obx(
-                      indexController.is_loading == true ? MaterialButton(
+                              (() => indexController.isLoading.value == true
+                                  ? MaterialButton(
                                       minWidth: double.infinity,
                                       height: 60,
-                      onPressed: (){
+                                      onPressed: () {},
-                        
-                      },
                                       color: Colors.grey[400],
                                       shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                          borderRadius:
-                      ),
+                                              BorderRadius.circular(40)),
-                      child: CircularProgressIndicator(),
+                                      child: const CircularProgressIndicator(),
-                    ) :
+                                    )
-                      Column(
+                                  : Column(
                                       children: [
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 60,
                                           onPressed: () {
-                        if(emailController.text.isEmpty || passwordController.text.isEmpty){
+                                            if (emailController.text.isEmpty ||
+                                                passwordController
+                                                    .text.isEmpty) {
                                               Get.snackbar(
                                                 "no_values".tr,
-                            "email_and_password_required".tr,
+                                                "email_and_password_required"
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                                    .tr,
-                            snackPosition: SnackPosition.TOP,
+                                                icon: const Icon(
-                            duration: Duration(milliseconds: 800),
+                                                    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.isLoading.value =
-                        indexController.login(emailController.text, passwordController.text, context);
+                                                true;
+                                            indexController.login(
+                                                emailController.text,
+                                                passwordController.text,
+                                                context);
                                           },
                                           color: Colors.indigoAccent[400],
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("ログイン",style: TextStyle(
+                                          child: const Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "ログイン",
+                                            style: TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         ),
+                                        const SizedBox(
+                                          height: 19.0,
                                         ),
-                    SizedBox(height: 19.0,),
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 50,
@@ -115,14 +140,19 @@ class LoginPopupPage extends StatelessWidget {
                                           },
                                           color: Colors.redAccent,
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("sign_up".tr,style: TextStyle(
+                                          child: Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "sign_up".tr,
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         ),
+                                        const SizedBox(
+                                          height: 19.0,
                                         ),
-                    SizedBox(height: 19.0,),
                                         MaterialButton(
                                           minWidth: double.infinity,
                                           height: 50,
@@ -131,79 +161,86 @@ class LoginPopupPage extends StatelessWidget {
                                           },
                                           color: Colors.grey,
                                           shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
+                                              borderRadius:
-                      ),
+                                                  BorderRadius.circular(40)),
-                      child: Text("cancel".tr,style: TextStyle(
+                                          child: Text(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
+                                            "cancel".tr,
-                      ),
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 16,
+                                                color: Colors.white70),
                                           ),
                                         )
                                       ],
-                      ) 
+                                    )),
                             ),
+                          )),
+                      const SizedBox(
+                        height: 20,
                       ),
-                )
-                ),
-                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: TextStyle(
+                              child: Text(
+                                "rogaining_user_need_tosign_up".tr,
+                                style: const TextStyle(
                                   overflow: TextOverflow.ellipsis,
-                        ),),
+                                ),
+                              ),
                             ),
                           ),
                         ],
                       )
                     ],
-
                   ),
                 ],
               ),
-      ):
+            )
-      Container(
+          : TextButton(
-        child: TextButton(
               onPressed: () {
                 indexController.currentUser.clear();
               },
-          child: Text("Already Logged in, Click to logout"),
+              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:TextStyle(
+      Text(
-        fontSize: 15,
+        label,
-        fontWeight: FontWeight.w400,
+        style: const TextStyle(
-        color: Colors.black87
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
-      ),),
+      ),
-      SizedBox(height: 5,),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: 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(
-      SizedBox(height: 30.0,)
+        height: 30.0,
+      )
     ],
   );
 }

lib/pages/mainperf/mainperf_page.dart

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

lib/pages/permission/permission.dart

@@ -2,129 +2,39 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:rogapp/routes/app_pages.dart';
+import 'dart:io';
 
 class PermissionHandlerScreen extends StatefulWidget {
-  PermissionHandlerScreen({Key? key}) : super(key: key);
+  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: SingleChildScrollView(
-            child: ListBody(
-              children: const <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();
-    
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-    //permissionServiceCall();
+      _checkPermissionStatus();
-  }
-
-  Future<PermissionStatus> checkLocationPermission() async {
-    return await Permission.location.status;
-  }
-
-  permissionServiceCall() async {
-    await permissionServices().then(
-      (value) {
-        if (value != null) {
-          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 */
-            }
-          }
-        },
-      );
-    } else {
-      if (statuses[Permission.location]!.isDenied) {
-        permissionServiceCall();
-      }
-    }
-    
-    /*{Permission.camera: PermissionStatus.granted, Permission.storage: PermissionStatus.granted}*/
-    return statuses;
-  }
-
-
-
-  @override
-  Widget build(BuildContext context) {
-    var status = Permission.location.status.then((value){
-      if(value.isGranted == false){
-        Future.delayed(Duration.zero, () => showAlert(context));
-      }
-      else {
-         Get.toNamed(AppPages.TRAVEL);
-      }
     });
-      return Scaffold(
+  }
-        body: Container(
+
-          child: Text(""),
+  _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) {
+        Get.toNamed(AppPages.LOGIN);
+      }
+    }
   }
 
   void showAlert(BuildContext context) {
@@ -132,25 +42,91 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
         context: context,
         builder: (_) => AlertDialog(
               title: const Text('ロケーション許可'),
-          content: SingleChildScrollView(
+              content: const SingleChildScrollView(
                 child: ListBody(
-              children: const <Widget>[
+                  children: <Widget>[
-                Text( 'このアプリでは、位置情報の収集を行います。'),
+                    Text('ぎふナビ "アプリへようこそ！\n'),
-                Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
+                    Text('収集データ:\n'),
+                    Text(
+                        '岐阜ナビアプリをより快適にご利用いただくために、チェックポイントでの自動チェックインのための位置情報を収集しています。また、撮影した画像やチェックインした時間を収集し、チャレンジの勝者を決定します。\n'),
+                    Text('お客様のデータの使用方法:\n'),
+                    Text(
+                        'お客様のデータは、アプリを改善し、競争力のある魅力的な体験を提供するのに役立ちます。お客様の位置情報と画像は、個人を特定できない統計データとして処理され、いかなる個人情報にもリンクされないようにしています\n'),
+                    Text('お客様の管理:\n'),
+                    Text(
+                        'お客様はご自身のデータを完全に管理することができます。アプリの設定でいつでも同意を撤回することができます。位置情報の収集に同意しなくても、ぎふナビを楽しむことはできますが、自動チェックインや競技への参加など、一部の機能が制限されることを覚えておいてください。位置情報、画像、時刻情報の利用に同意する場合は「許可」を選択してください。許可しない場合は、「許可しない」を選択してください。あなたの選択は、アプリの他の機能を使用することに影響しません。\n'),
                   ],
                 ),
               ),
               actions: <Widget>[
-            TextButton(
+                ElevatedButton(
-              child: const Text('わかった'),
+                  child: const Text('OK'),
                   onPressed: () {
-                permissionServiceCall();
+                    Get.back();
+                    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) {
+          Get.toNamed(AppPages.LOGIN);
+        }
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return const Scaffold(
+      body: 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 */
+                          }
+                        }
+                      },
+                    );
+                  },
+                ),
+              ],
+            ));
+  }
 }

lib/pages/progress/progress.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/key.dart';
-import 'package:flutter/src/widgets/container.dart';
-import 'package:flutter/src/widgets/framework.dart';
 
 class ProgressPage extends StatelessWidget {
   const ProgressPage({Key? key}) : super(key: key);
@@ -10,7 +7,7 @@ class ProgressPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       color: Colors.transparent,
-      child: Center(
+      child: const Center(
         child: CircularProgressIndicator(),
       ),
     );

lib/pages/register/register_page.dart

@@ -1,18 +1,17 @@
-
-
 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();
   TextEditingController passwordController = TextEditingController();
   TextEditingController confirmPasswordController = TextEditingController();
 
+  RegisterPage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -21,14 +20,19 @@ class RegisterPage extends StatelessWidget {
       appBar: AppBar(
         elevation: 0,
         backgroundColor: Colors.white,
-        leading:
+        leading: IconButton(
-        IconButton( onPressed: (){
+            onPressed: () {
               Navigator.pop(context);
-        },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
       ),
       body: SafeArea(
         child: SingleChildScrollView(
-          child: Container(
+          child: SizedBox(
             height: MediaQuery.of(context).size.height,
             width: double.infinity,
             child: Column(
@@ -39,102 +43,123 @@ class RegisterPage extends StatelessWidget {
                     Column(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        Text ("サインアップ", style: TextStyle(
+                        const Text(
+                          "サインアップ",
+                          style: TextStyle(
                             fontSize: 30,
                             fontWeight: FontWeight.bold,
-                        ),),
+                          ),
-                        SizedBox(height: 20,),
+                        ),
-                        Text("アカウントを作成し、無料です",style: TextStyle(
+                        const SizedBox(
+                          height: 20,
+                        ),
+                        Text(
+                          "アカウントを作成し、無料です",
+                          style: TextStyle(
                             fontSize: 15,
                             color: Colors.grey[700],
-                        ),),
+                          ),
-                        SizedBox(height: 30,)
+                        ),
+                        const SizedBox(
+                          height: 30,
+                        )
                       ],
                     ),
                     Padding(
-                      padding: EdgeInsets.symmetric(
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
-                          horizontal: 40
-                      ),
                       child: Column(
                         children: [
                           makeInput(label: "Eメール", controller: emailController),
-                          makeInput(label: "パスワード", controller: passwordController,obsureText: true),
+                          makeInput(
-                          makeInput(label: "パスワードを認証する", controller: confirmPasswordController,obsureText: true)
+                              label: "パスワード",
+                              controller: passwordController,
+                              obsureText: true),
+                          makeInput(
+                              label: "パスワードを認証する",
+                              controller: confirmPasswordController,
+                              obsureText: true)
                         ],
                       ),
                     ),
                     Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 40),
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
                       child: Container(
-                        padding: EdgeInsets.only(top: 3,left: 3),
+                        padding: const EdgeInsets.only(top: 3, left: 3),
                         decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(40),
-                            border: Border(
+                            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){
+                            if (passwordController.text !=
+                                confirmPasswordController.text) {
                               Get.snackbar(
                                 "No match",
                                 "Passwords does not match",
-                                icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                icon: const Icon(Icons.assistant_photo_outlined,
+                                    size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
-                                duration: Duration(milliseconds: 800),
+                                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: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                icon: const Icon(Icons.assistant_photo_outlined,
+                                    size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
-                                duration: Duration(milliseconds: 800),
+                                duration: const Duration(milliseconds: 800),
                                 backgroundColor: Colors.yellow,
                                 //icon:Image(image:AssetImage("assets/images/dora.png"))
                               );
                               return;
                             }
-                            indexController.is_loading.value = true;
+                            indexController.isLoading.value = true;
-                            indexController.register(emailController.text, passwordController.text, context);
+                            indexController.register(emailController.text,
+                                passwordController.text, context);
                           },
                           color: Colors.redAccent,
                           shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(40)
+                              borderRadius: BorderRadius.circular(40)),
-                          ),
+                          child: Text(
-                          child: Text("sign_up".tr,style: TextStyle(
+                            "sign_up".tr,
-                            fontWeight: FontWeight.w600,fontSize: 16,
+                            style: const TextStyle(
-
+                              fontWeight: FontWeight.w600,
-                          ),),
+                              fontSize: 16,
                             ),
                           ),
                         ),
-                    SizedBox(height: 20,),
+                      ),
+                    ),
+                    const SizedBox(
+                      height: 20,
+                    ),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Flexible(child: Text("すでにアカウントをお持ちですか？")),
+                        const Flexible(child: Text("すでにアカウントをお持ちですか？")),
                         TextButton(
                           onPressed: () {
                             Get.toNamed(AppPages.LOGIN);
                           },
-                          child: Text("ログイン",style: TextStyle(
+                          child: const Text(
-                              fontWeight: FontWeight.w600,
+                            "ログイン",
-                              fontSize: 18
+                            style: TextStyle(
-                          ),),
+                                fontWeight: FontWeight.w600, fontSize: 18),
+                          ),
                         ),
                       ],
                     )
                   ],
-
                 ),
               ],
             ),
@@ -145,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:TextStyle(
+      Text(
-          fontSize: 15,
+        label,
-          fontWeight: FontWeight.w400,
+        style: const TextStyle(
-          color: Colors.black87
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
-      ),),
+      ),
-      SizedBox(height: 5,),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: 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(
-      SizedBox(height: 30,)
+        height: 30,
-
+      )
     ],
   );
 }

lib/pages/search/search_controller.dart

@@ -1,26 +1,21 @@
-import 'package:flutter/material.dart';
+import 'package:geojson_vi/geojson_vi.dart';
-import 'package:geojson/geojson.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
-import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 
 class SearchBarController extends GetxController {
-
+  List<GeoJSONFeature> searchResults = <GeoJSONFeature>[].obs;
-List<GeoJsonFeature> searchResults = <GeoJsonFeature>[].obs;
-
 
   @override
   void onInit() {
     IndexController indexController = Get.find<IndexController>();
     if (indexController.locations.isNotEmpty) {
-      for(int i=0; i<= indexController.locations[0].collection.length - 1; i++){
+      for (int i = 0;
-        GeoJsonFeature p = indexController.locations[0].collection[i];
+          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,8 +1,9 @@
-import 'package:flutter/cupertino.dart';
 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';
@@ -14,13 +15,15 @@ class SearchPage extends StatelessWidget {
   IndexController indexController = Get.find<IndexController>();
 
   Image getImage(int index) {
-    if(searchController.searchResults[index].properties!["photos"] == null || searchController.searchResults[index].properties!["photos"] == ""){
+    if (searchController.searchResults[index].properties!["photos"] == null ||
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+        searchController.searchResults[index].properties!["photos"] == "") {
-    }
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
-    else{
+    } else {
       return Image(
-        image: NetworkImage(searchController.searchResults[index].properties!["photos"]),
+        image: NetworkImage(
-        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+            searchController.searchResults[index].properties!["photos"]),
+        errorBuilder:
+            (BuildContext context, Object exception, StackTrace? stackTrace) {
           return Image.asset("assets/images/empty_image.png");
         },
       );
@@ -35,40 +38,74 @@ class SearchPage extends StatelessWidget {
         backgroundColor: Colors.white,
         leading: IconButton(
             onPressed: () {
-            Navigator.pop(context);
+              Get.back();
             },
-        icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black,)),
+            icon: const Icon(
-        title: TypeAheadField(
+              Icons.arrow_back_ios_new,
-          textFieldConfiguration: TextFieldConfiguration(
+              color: Colors.black,
-            autofocus: true,
+            )),
+        centerTitle: true,
+        //title: const CupertinoSearchTextField(),
       ),
-          suggestionsCallback: (pattern) async{
+      body: SingleChildScrollView(
-            return searchController.searchResults.where((GeoJsonFeature element) => element.properties!["location_name"].toString().contains(pattern));
+        child: TypeAheadField<GeoJSONFeature>(
-            //return await 
+          // textFieldConfiguration: TextFieldConfiguration(
-          },
+          //   autofocus: true,
-          itemBuilder: (context, GeoJsonFeature suggestion){
+          //   style: DefaultTextStyle.of(context).style.copyWith(
-            return ListTile(
+          //         fontStyle: FontStyle.normal,
-              title: Text(suggestion.properties!["location_name"]),
+          //         fontSize: 15.0,
-              subtitle: suggestion.properties!["category"] != null ? Text(suggestion.properties!["category"]) : Text(""),
+          //       ),
-              //leading: getImage(index),
+          //   decoration: InputDecoration(
-            );
+          //     border: const OutlineInputBorder(),
-          },
+          //     hintText: "検索",
-          onSuggestionSelected: (GeoJsonFeature suggestion){
+          //     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:
+                    BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
                 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),
             );
           },
         ),
-        //title: const CupertinoSearchTextField(),
-         
       ),
-      //body: 
       // Obx(() =>
       //   ListView.builder(
       //   itemCount: searchController.searchResults.length,

lib/pages/subperf/subperf_page.dart

@@ -11,7 +11,7 @@ class SubPerfPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("Select Sub Perfecture"),
+        title: const Text("Select Sub Perfecture"),
       ),
       body: ListView.builder(
         itemCount: indexController.subPerfs.length,

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,11 @@
 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';
 
@@ -23,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;
@@ -48,31 +46,18 @@ class AppPages {
   static const CHANGE_PASSWORD = Routes.CHANGE_PASSWORD;
   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: () => LandingPage(),
+      page: () => const LandingPage(),
       //binding: SpaBinding(),
     ),
     GetPage(
@@ -85,62 +70,44 @@ class AppPages {
       page: () => RegisterPage(),
       //binding: SpaBinding(),
     ),
-    GetPage(
-      name: Routes.TRAVEL,
-      page: () => DestnationPage(),
-      binding: DestinationBinding(),
-    ),
     GetPage(
       name: Routes.LOADING,
-      page: () => LoadingPage(),
+      page: () => const LoadingPage(),
-      //binding: DestinationBinding(),
-    ),
-    GetPage(
-      name: Routes.DESTINATION_MAP,
-      page: () => DestnationPage(),
       //binding: DestinationBinding(),
     ),
     GetPage(
       name: Routes.HOME,
-      page: () => HomePage(),
+      page: () => const HomePage(),
       binding: HomeBinding(),
     ),
     GetPage(
       name: Routes.PERMISSION,
-      page: () => PermissionHandlerScreen(),
+      page: () => const PermissionHandlerScreen(),
     ),
     GetPage(
       name: Routes.SEARCH,
       page: () => SearchPage(),
       binding: SearchBinding(),
     ),
-    GetPage(
-      name: Routes.MAINPERF,
-      page: () => MainPerfPage(),
-    ),
-    GetPage(
-      name: Routes.SUBPERF,
-      page: () => SubPerfPage(),
-    ),
     GetPage(
       name: Routes.CITY,
-      page: () => CityPage(),
+      page: () => const CityPage(),
-    ),
-    GetPage(
-      name: Routes.CATEOGORY,
-      page: () => CategoryPage(),
     ),
     GetPage(
       name: Routes.CHANGE_PASSWORD,
       page: () => ChangePasswordPage(),
     ),
     GetPage(
-      name: Routes.CAMERA_PAGE,
+      name: Routes.PROGRESS,
-      page: () => CameraPage(),
+      page: () => const ProgressPage(),
     ),
     GetPage(
-      name: Routes.PROGRESS,
+      name: Routes.HISTORY,
-      page: () => ProgressPage(),
+      page: () => const HistoryPage(),
+    ),
+    GetPage(
+      name: Routes.GPS,
+      page: () => const GpsPage(),
     )
   ];
 }

lib/routes/app_routes.dart

@@ -24,4 +24,6 @@ abstract class Routes {
   static const CHANGE_PASSWORD = '/change_password';
   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,
-  static Future<Map<String, dynamic>>  makeAction(int user_id, int location_id, bool wanttogo, bool like, bool checkin) async {
+      bool wanttogo, bool like, bool checkin) async {
-    print("----- action is ---- ${like}-- ${wanttogo}-- ${checkin}");
+    //print("----- action is ---- $like-- $wanttogo-- $checkin");
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/makeaction/?user_id=${user_id}&location_id=${location_id}&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');
-     print("url is ------ ${url}");
+    //print("url is ------ $url");
-    final http.Response response = await http.get(
+    final http.Response response =
-      Uri.parse(url),
+        await http.get(Uri.parse(url), headers: <String, String>{
-      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 user_id, int location_id) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/useraction/?user_id=${user_id}&location_id=${location_id}';
+    String url =
-    print('++++++++${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,21 +1,74 @@
 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/';
 
-  static Future<Map<String, dynamic>> changePassword(String oldpassword, String newpassword, String token) async {
+    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;
+    }
+  }
+
+  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 server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/change-password/';
+    String url = '$serverUrl/api/change-password/';
-    print('++++++++${url}');
+    //print('++++++++$url');
     final http.Response response = await http.put(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token ${token}'
+        'Authorization': 'Token $token'
       },
       body: jsonEncode(<String, String>{
         'old_password': oldpassword,
@@ -29,23 +82,20 @@ class AuthService{
     return changePassword;
   }
 
-
+  static Future<Map<String, dynamic>> login(
-  static Future<Map<String, dynamic>> login(String email, String password) async {
+      String email, String password) async {
-    print("------- in logged email ${email} pwd ${password} ###### --------");
+    //print("------- in logged email $email pwd $password ###### --------");
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/login/';
+    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>{
+      body: jsonEncode(<String, String>{'email': email, 'password': password}),
-        'email': email,
-        'password': password
-      }),
     );
 
     if (response.statusCode == 200) {
@@ -54,23 +104,20 @@ class AuthService{
     return cats;
   }
 
-  
+  static Future<Map<String, dynamic>> register(
-  static Future<Map<String, dynamic>>  register(String email, String password) async {
+      String email, String password) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/register/';
+    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>{
+      body: jsonEncode(<String, String>{'email': email, 'password': password}),
-        'email': email,
-        'password': password
-      }),
     );
-
+    //print(response.body);
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
@@ -79,16 +126,14 @@ class AuthService{
 
   static Future<Map<String, dynamic>> deleteUser(String token) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/delete-account/';
+    String url = '$serverUrl/api/delete-account/';
-    print('++++++++${url}');
+    //print('++++++++$url');
-    final http.Response response = await http.get(
+    final http.Response response =
-      Uri.parse(url),
+        await http.get(Uri.parse(url), headers: <String, String>{
-      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));
@@ -96,30 +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 server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/userdetials?user_id=${userid}';
+    String url = '$serverUrl/api/userdetials?user_id=$userid';
-    print('++++++++${url}');
+    //print('++++++++$url');
-    print("---- UserDetails url is ${url}");
+    //print("---- UserDetails url is $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 == 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),
+      headers: <String, String>{
+        'Content-Type': 'application/json; charset=UTF-8',
+        'Authorization': 'Token $token'
+      },
+    );
 
-
+    if (response.statusCode == 200) {
-
+      cats = json.decode(utf8.decode(response.bodyBytes));
-
+      //print("--- eeeeee $cats ----");
-
+    }
+    return [
+      {"user": cats, "token": token}
+    ];
+  }
 }
-

lib/services/cat_service.dart

@@ -1,53 +1,44 @@
 import 'dart:convert';
-import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 
 import '../utils/const.dart';
 
-
 class CatService {
-
+  static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2,
-  static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4) async {
+      double lon2, double lat3, double lon3, double lat4, double lon4) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
+    String url =
-    print('++++++++${url}');
+        '$serverUrl/api/cats/?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-    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;
   }
 
-  
   static Future<List<dynamic>?> loadCatByCity(String cityname) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/catbycity/?${cityname}';
+    String url = '$serverUrl/api/catbycity/?$cityname';
-    print('++++++++${url}');
+    //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 == 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 {
-  static Future<List<dynamic>>  getDestinations(int user_id) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/destinations/?user_id=${user_id}";
+    String url = "$serverUrl/api/destinations/?user_id=$userId";
-    print('++++++++${url}');
+    //print('++++++++$url');
-    final http.Response response = await http.get(
+    final http.Response response =
-      Uri.parse(url),
+        await http.get(Uri.parse(url), headers: <String, String>{
-      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 dest_id) async {
+  static Future<Map<String, dynamic>> deleteDestination(int destId) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/delete_destination/?dest_id=${dest_id}";
+    String url = "$serverUrl/api/delete_destination/?dest_id=$destId";
-    print('++++++++${url}');
+    //print('++++++++$url');
-    final http.Response response = await http.get(
+    final http.Response response =
-      Uri.parse(url),
+        await http.get(Uri.parse(url), headers: <String, String>{
-      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 action_id, int order, String dir) async {
+  static Future<int> updateOrder(int actionId, int order, String dir) async {
     int cats = 0;
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
+    String url =
-    print('++++++++${url}');
+        "$serverUrl/api/updateorder/?user_action_id=$actionId&order=$order&dir=$dir";
-    final http.Response response = await http.get(
+    //print('++++++++$url');
-      Uri.parse(url),
+    final http.Response response =
-      headers: <String, String>{
+        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,17 +59,19 @@ 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.length <= 0){
+    if (destinations.isEmpty) {
       return [];
     }
 
     //print("##### @@@@@ ${destinations[0].lat}");
-    PointLatLng origin = PointLatLng(destinations[0].lat!, destinations[0].lon!);
+    PointLatLng origin =
-    PointLatLng dest = PointLatLng(destinations[destinations.length -1].lat!, destinations[destinations.length -1].lon!);
+        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;
@@ -90,8 +85,8 @@ 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]);
@@ -100,21 +95,21 @@ class DestinationService{
       j += 4;
     }
 
-    final DestinationController destinationController = Get.find<DestinationController>();
+    final DestinationController destinationController =
-    int trav_mode = destinationController.travelMode.value;
+        Get.find<DestinationController>();
-    String _mode = "WALKING";
+    // int travMode = destinationController.travelMode.value;
-    if(trav_mode == 1){
+    // String mode = "WALKING";
-      //_mode = TravelMode.driving;
+    // if (travMode == 1) {
-      _mode = "DRIVING";
+    //   //_mode = TravelMode.driving;
-    }
+    //   mode = "DRIVING";
-    else if(trav_mode == 2) {
+    // } else if (travMode == 2) {
-      //_mode = TravelMode.transit;
+    //   //_mode = TravelMode.transit;
-      _mode = "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

@@ -2,14 +2,14 @@ import 'dart:io';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
-import 'package:rogapp/model/destination.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 'package:sqflite/sqlite_api.dart';
 import 'dart:convert';
 
+import '../model/gps_data.dart';
 import '../utils/const.dart';
 
 //
@@ -29,107 +29,117 @@ class ExternalService {
     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 user_id = indexController.currentUser[0]["user"]["id"];
+    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(
+      Rog rog = Rog(
           id: 1,
-        team_name: _team,
+          team_name: team,
-        event_code : _event_code,
+          event_code: eventCode,
-        user_id: user_id,
+          user_id: userId,
           cp_number: -1,
           checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
           image: null,
-        rog_action_type: 0
+          rog_action_type: 0);
-      );
+      db.insertRogaining(rog);
-      db.insertRogaining(_rog);
+    } else {
-    }
+      String url = 'https://rogaining.sumasen.net/gifuroge/start_from_rogapp';
-    else {
+      //print('++++++++$url');
-      String url = 'https://natnats.mobilous.com/start_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>{
+        body: jsonEncode(
-          'team_name': _team,
+            <String, String>{'team_name': team, 'event_code': eventCode}),
-          'event_code': _event_code
-        }),
       );
 
-      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));
+        res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : ${_res} ----');
+        //print('----_res : $res ----');
       }
     }
-    return _res;
+    return res;
   }
 
-  Future<Map<String, dynamic>> makeCheckpoint(int user_id, String token, String checkin_time, String teamname, int cp, String eventcode, String imageurl) async {
+  Future<Map<String, dynamic>> makeCheckpoint(
-    Map<String, dynamic> _res = {};
+      int userId,
-    String url = 'https://natnats.mobilous.com/checkin_from_rogapp';
+      String token,
-    print('++++++++${url}');
+      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 = {};
+    String url = 'https://rogaining.sumasen.net/gifuroge/checkin_from_rogapp';
+    //print('++++++++$url');
     final IndexController indexController = Get.find<IndexController>();
 
     if (imageurl != null) {
-
+      if (indexController.connectionStatusName.value != "wifi" &&
-      if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
+          indexController.connectionStatusName.value != "mobile") {
         DatabaseHelper db = DatabaseHelper.instance;
-        Rog _rog = Rog(
+        Rog rog = Rog(
           id: 1,
           team_name: teamname,
           event_code: eventcode,
-          user_id: user_id,
+          user_id: userId,
           cp_number: cp,
           checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
           image: imageurl,
           rog_action_type: 1,
         );
-        db.insertRogaining(_rog);
+        db.insertRogaining(rog);
-      }
+      } else {
-      else {
+        String serverUrl = ConstValues.currentServer();
-        String server_url = ConstValues.currentServer();
+        String url1 = "$serverUrl/api/checkinimage/";
-        String url1 = "${server_url}/api/checkinimage/";
+        final im1Bytes = File(imageurl).readAsBytesSync();
-        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}'
+            'Authorization': 'Token $token'
           },
           // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
           body: jsonEncode(<String, String>{
-              'user' : user_id.toString(),
+            'user': userId.toString(),
             'team_name': teamname,
             'event_code': eventcode,
             'checkinimage': im1_64,
-              'checkintime' : checkin_time,
+            '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("-----@@@@@ ${_res} -----");
+        //print("-----@@@@@ checkin $_res -----");
 
         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>{
@@ -139,33 +149,47 @@ class ExternalService {
               'team_name': teamname,
               'cp_number': cp.toString(),
               'event_code': eventcode,
-                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+              'image': res["checkinimage"].toString().replaceAll(
+                  'http://localhost:8100', 'http://rogaining.sumasen.net')
             }),
           );
-              print("--- checnin response ${response2.statusCode}----");
+          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));
+            res = json.decode(utf8.decode(response2.bodyBytes));
-                  print('----checkin res _res : ${_res} ----');
+            //print('----checkin res _res : $res ----');
+            if (res["status"] == "ERROR") {
+              Get.snackbar("エラーがおきました", res["detail"]);
             }
           }
+        } else {
+          Get.snackbar("エラーがおきました", "サーバーに更新できませんでした");
         }
       }
-    else{
+    } else {
-        if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
+      if (indexController.connectionStatusName.value != "wifi" ||
+          indexController.connectionStatusName.value != "mobile") {
         DatabaseHelper db = DatabaseHelper.instance;
-          Rog _rog = Rog(
+        Rog rog = Rog(
           id: 1,
           team_name: teamname,
           event_code: eventcode,
-            user_id: user_id,
+          user_id: userId,
           cp_number: cp,
           checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
           image: null,
           rog_action_type: 1,
         );
-          db.insertRogaining(_rog);
+        db.insertRogaining(rog);
-        }
+      } else {
-        else {
         final http.Response response3 = await http.post(
           Uri.parse(url),
           headers: <String, String>{
@@ -178,66 +202,76 @@ class ExternalService {
             'image': ""
           }),
         );
-          print("--- checnin response ${response3.statusCode}----");
+        // 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));
+          res = json.decode(utf8.decode(response3.bodyBytes));
-                print('----checkin res _res : ${_res} ----');
+          //print('----checkin res _res : $res ----');
         }
       }
     }
-    return _res;
+    //print("~~~~ done checkin ~~~~");
+    return res;
   }
 
-
+  Future<Map<String, dynamic>> makeGoal(int userId, String token,
-  Future<Map<String, dynamic>> makeGoal(int user_id, String token, String teamname, String image, String goal_time, String eventcode) async {
+      String teamname, String image, String goalTime, String eventcode) async {
-    Map<String, dynamic> _res2 = {};
+    Map<String, dynamic> res2 = {};
 
     final IndexController indexController = Get.find<IndexController>();
-    final DestinationController destinationController = Get.find<DestinationController>();
+    final DestinationController destinationController =
+        Get.find<DestinationController>();
 
     //if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
     DatabaseHelper db = DatabaseHelper.instance;
-          Rog _rog = Rog(
+    Rog rog = Rog(
       id: 1,
       team_name: teamname,
       event_code: eventcode,
-            user_id: user_id,
+      user_id: userId,
       cp_number: -1,
       checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
       image: image,
       rog_action_type: 1,
     );
-          db.insertRogaining(_rog);
+    db.insertRogaining(rog);
     // }
     // else{
-      String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-      String url1 = "${server_url}/api/goalimage/";
+    String url1 = "$serverUrl/api/goalimage/";
-      final im1Bytes = File(image!).readAsBytesSync();
+    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}'
+        'Authorization': 'Token $token'
       },
       // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
       body: jsonEncode(<String, String>{
-          'user' : user_id.toString(),
+        'user': userId.toString(),
         'team_name': teamname,
         'event_code': eventcode,
-          'goaltime' : goal_time,
+        'goaltime': goalTime,
         'goalimage': im1_64,
         'cp_number': "-1"
       }),
     );
 
-      String url = 'https://natnats.mobilous.com/goal_from_rogapp';
+    String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
-      print('++++++++${url}');
+    //print('++++++++$url');
     if (response.statusCode == 201) {
-          Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes));
+      Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : ${_res} ----');
+      // print('----_res : $res ----');
-          print('---- image url ${_res["goalimage"]} ----');
+      // print('---- image url ${res["goalimage"]} ----');
       final http.Response response2 = await http.post(
         Uri.parse(url),
         headers: <String, String>{
@@ -246,37 +280,151 @@ class ExternalService {
         body: jsonEncode(<String, String>{
           'team_name': teamname,
           'event_code': eventcode,
-                'goal_time' : goal_time,
+          'goal_time': goalTime,
-                'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+          'image': res["goalimage"].toString().replaceAll(
-              }
+              'http://localhost:8100', 'http://rogaining.sumasen.net')
-            ),
+        }),
       );
-        print('----- response2 is ${response2} --------');
+      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));
+        res2 = json.decode(utf8.decode(response2.bodyBytes));
       }
     }
     //}
-      destinationController.resetRogaining();
+    destinationController.resetRogaining(isgoal: true);
-    return _res2;
+    return res2;
   }
 
+  Future<bool> removeCheckin(int cp) async {
+    final IndexController indexController = Get.find<IndexController>();
 
-  static Future<Map<String, dynamic>>  usersEventCode(String teamcode, String password) async {
+    //int userId = indexController.currentUser[0]["user"]["id"];
-    Map<String, dynamic> _res = {};
+    //print("--- Pressed -----");
-    String url = "https://natnats.mobilous.com/check_event_code?zekken_number=${teamcode}&password=${password}";
+    String team = indexController.currentUser[0]["user"]['team_name'];
-    print('++++++++${url}');
+    //print("--- _team : ${_team}-----");
-    final http.Response response = await http.get(
+    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) {
-      _res = json.decode(utf8.decode(response.bodyBytes));
+        return Future.value(true);
+        //print('----_res : $res ----');
       }
-    return _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:geojson/geojson.dart';
-import 'package:http/http.dart' as http;
+// 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 {
+//     if (response.statusCode == 200) {
-    final geo = GeoJson();
+//       geo.processedFeatures.listen((fst) {
-    GeoJsonFeature? fs;
+//         fs = fst;
-    String server_url = ConstValues.currentServer();
+//       });
-    String url = '${server_url}/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) {
+//       await geo.parse(response.body, verbose: true);
 
-      geo.processedFeatures.listen((fst) {
+//       return fs;
-        fs = fst;
+//     } else {
-      });
+//       throw Exception('Failed to create album.');
-
+//     }
-      await geo.parse(response.body, verbose:true);
+//   }
-
+// }
-      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:geojson/geojson.dart';
-import 'package:http/http.dart' as http;
+// 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 {
+//     String serverUrl = ConstValues.currentServer();
-    final geo = GeoJson();
+//     String url = '$serverUrl/api/location_polygon/';
-    GeoJsonFeature? fs;
+//     //print('++++++++$url');
+//     final response = await http.get(
+//       Uri.parse(url),
+//       headers: <String, String>{
+//         'Content-Type': 'application/json; charset=UTF-8',
+//       },
+//     );
 
-    String server_url = ConstValues.currentServer();
+//     if (response.statusCode == 200) {
-    String url = '${server_url}/api/location_polygon/';
+//       geo.processedFeatures.listen((fst) {
-    print('++++++++${url}');
+//         fs = fst;
-    final response = await http.get(Uri.parse(url),
+//       });
-      headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-      },
-    );
 
-    if (response.statusCode == 200) {
+//       await geo.parse(response.body, verbose: true);
 
-      geo.processedFeatures.listen((fst) {
+//       return fs;
-        fs = fst;
+//     } else {
-      });
+//       throw Exception('Failed to create album.');
-
+//     }
-      await geo.parse(response.body, verbose:true);
+//   }
-
+// }
-      return fs;
-
-    } else {
-      throw Exception('Failed to create album.');
-    }
-  }
-
-}

lib/services/location_service.dart

@@ -1,75 +1,48 @@
 import 'dart:convert';
-
+import 'package:geojson_vi/geojson_vi.dart';
-import 'package:geojson/geojson.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?> loadLocationsFor(
-  // static Future<GeoJsonFeatureCollection?> loadLocations() async {
+      String perfecture, String cat) 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 {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
 
     if (cat.isNotEmpty) {
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/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 {
+    } else {
-        url = '${server_url}/api/inperf/?perf=' + perfecture + '&cat=' + cat;
-      }
-    }
-    else{
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture;
+        url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture';
-      }
+      } else {
-      else {
+        url = '$serverUrl/api/inperf/?perf=$perfecture';
-        url = '${server_url}/api/inperf/?perf=' + perfecture;
       }
     }
-    print('++++++++${url}');
+    //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 == 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));
     }
@@ -78,114 +51,82 @@ class LocationService{
 
   static Future<List<dynamic>?> getLocationsExt(String token) async {
     List<dynamic> ext = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/locsext/';
+    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}'
+          '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?> loadLocationsBound(
-  static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
+      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 server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
     if (cat.isNotEmpty) {
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/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{
+    } else {
-        url = '${server_url}/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
-      }
-    }
-    else{
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/insubperf?rog=${r}&subperf=' + subperfecture;
+        //print("-------- requested user group $grp -------------");
-      }
+        url =
-      else{
+            '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-        url = '${server_url}/api/insubperf?subperf=' + subperfecture; 
+      } else {
+        url =
+            '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
       }
     }
-    print('++++++++${url}');
+    //print('++++++++$url');
-    final response = await http.get(Uri.parse(url),
+    final response = await http.get(
-      headers: <String, String>{
+      Uri.parse(url),
-        '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 server_url = 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 = '${server_url}/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 = '${server_url}/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 = '${server_url}/api/inbound?rog=${r}&grp=$grp&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
-      }
-      else{
-        url = '${server_url}/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 == 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));
+      DestinationController destinationController =
-      if(cc.collection.isEmpty){
+          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(
-  static Future<GeoJsonFeatureCollection?> loadCustomLocations(String name, String cat) async {
+      String name, String cat) async {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
     if (cat == "-all-") {
       cat = "";
     }
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    print("loadCustomLocations url is ----- ${cat}");
+    //print("loadCustomLocations url is ----- $cat");
     if (cat.isNotEmpty) {
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/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{
+    } else {
-        url = '${server_url}/api/custom_area/?&cat=' + cat;
-      }
-    }
-    else{
       if (indexController.currentUser.isNotEmpty) {
-        bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
+        bool rog = indexController.currentUser[0]['user']['is_rogaining'];
-        String r = _rog == true ? 'True': 'False';
+        String r = rog == true ? 'True' : 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/customarea?rog=${r}&name=${name}';
+        url = '$serverUrl/api/customarea?rog=$r&name=$name';
-      }
+      } else {
-      else{
+        url = '$serverUrl/api/customarea?name=$name';
-        url = '${server_url}/api/customarea?name=${name}';
       }
     }
-    print('++++++++${url}');
+    //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));
+      GeoJSONFeatureCollection cc =
-      if(cc.collection.isEmpty){
+          GeoJSONFeatureCollection.fromJSON(utf8.decode(response.bodyBytes));
+      if (cc.features.isEmpty) {
         return null;
-      }
+      } else {
-      else{
         return cc;
       }
     }
     return null;
   }
-
-
-
-
 }

lib/services/maxtrix_service.dart

@@ -1,24 +1,21 @@
-
 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(
-  static Future<Map<String, dynamic>>  getDestinations(List<Destination> destinations) async {
+      List<Destination> destinations) async {
-
+    final DestinationController destinationController =
-    final DestinationController destinationController = Get.find<DestinationController>();
+        Get.find<DestinationController>();
 
     String locs = "";
     String origin = "";
     String destination = "";
     int i = 0;
     for (Destination d in destinations) {
-
+      //print("---- getting matrix for $d ------------");
-      print("---- getting matrix for ${d} ------------");
 
       if (i == 0) {
         origin = "${d.lat}, ${d.lon}";
@@ -32,42 +29,38 @@ class MatrixService{
         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}";
+    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";
+        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";
+    String url =
-    print('++++++++${url}');
+        "https://maps.googleapis.com/maps/api/directions/json?destination=$destination&mode=$mode&waypoints=$locs&origin=$origin&key=AIzaSyCN2xFsqFyadWwpjiFxymrxzS6G1tNzraI";
-    final http.Response response = await http.get(
+    //print('++++++++$url');
-      Uri.parse(url),
+    final http.Response response =
-      headers: <String, String>{
+        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 {
-
   static Future<List<dynamic>?> loadPerfectures() async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/perf_main/';
+    String url = '$serverUrl/api/perf_main/';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -25,36 +23,35 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadSubPerfectures(String area) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/subperfinmain/?area=' + area;
+    String url = '$serverUrl/api/subperfinmain/?area=$area';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
 
-
   static Future<List<dynamic>?> getMainPerfExt(String id) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/mainperfext/?perf=' + id;
+    String url = '$serverUrl/api/mainperfext/?perf=$id';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -62,17 +59,17 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadGifuAreas(String perf) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/allgifuareas/?perf=' + perf;
+    String url = '$serverUrl/api/allgifuareas/?perf=$perf';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
@@ -80,42 +77,37 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadCustomAreas() async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/customareanames';
+    String url = '$serverUrl/api/customareanames';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
 
-
   static Future<List<dynamic>?> getSubExt(String id) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/perfext/?sub_perf=' + id;
+    String url = '$serverUrl/api/perfext/?sub_perf=$id';
-    print('++++++++${url}');
+    //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 == 200) {
-
       perfs = json.decode(utf8.decode(response.bodyBytes));
     }
     return perfs;
   }
-
-
-
 }
-

lib/services/reacking_service.dart

@@ -1,28 +1,22 @@
-
 import 'dart:convert';
 
-import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:rogapp/utils/const.dart';
 
-
 class TrackingService {
-
+  static Future<Map<String, dynamic>> addTrack(
-  static Future<Map<String, dynamic>>  addTrack(String user_id, double lat, double lon) async {
+      String userId, double lat, double lon) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/track/';
+    String url = '$serverUrl/api/track/';
-    print('++++++++${url}');
+    //print('++++++++$url');
-    final geom = '{"type": "MULTIPOINT", "coordinates": [[${lon}, ${lat}]]}';
+    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>{
+      body: jsonEncode(<String, String>{'user_id': userId, 'geom': geom}),
-        'user_id': user_id,
-        'geom': geom
-      }),
     );
 
     if (response.statusCode == 200) {
@@ -30,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

@@ -1,6 +1,5 @@
 import 'dart:io';
 import 'package:path_provider/path_provider.dart';
-import 'package:rogapp/model/Rogaining.dart';
 import 'package:rogapp/model/destination.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
@@ -22,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 {
@@ -49,7 +54,12 @@ 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
     )
     ''');
 
@@ -78,128 +88,115 @@ 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 ?
+    List<Rog> roglist =
-      rog.map((e) => Rog.fromMap(e)).toList() : [];
+        rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
-    print("--------- ${rog}");
+    //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}");
+    var rog = await db.query('rog', where: "lat = $lat and lon= $lon");
-    List<Rog> roglist = rog.isNotEmpty
+    List<Rog> roglist =
-      ? rog.map((e) => Rog.fromMap(e)).toList() : [];
+        rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
     return roglist;
   }
 
   Future clearSelection() async {
     Database db = await instance.database;
-    Map<String, dynamic> row_clear = {
+    Map<String, dynamic> rowClear = {"selected": false};
-          "selected": false
+    return await db.update("destination", rowClear);
-    };
-    return await db.update(
-        "destination", 
-        row_clear
-      );
   }
 
   Future<int> toggleSelecttion(Destination dest) async {
     Database db = await instance.database;
 
     bool val = !dest.selected!;
-    Map<String, dynamic> row_target = {
+    Map<String, dynamic> rowTarget = {"selected": val};
-          "selected": val
-      };
 
     await clearSelection();
 
-    return await db.update(
+    return await db.update("destination", rowTarget,
-        "destination", 
+        where: 'location_id = ?', whereArgs: [dest.location_id!]);
-        row_target,
-        where: 'location_id = ?',
-        whereArgs: [dest.location_id!]
-        );
   }
 
   Future<int> deleteRogaining(int id) async {
     Database db = await instance.database;
-    var rog = await db.delete('rog', where: "id = ${id}");
+    var rog = await db.delete('rog', where: "id = $id");
     int ret = rog > 0 ? rog : -1;
 
     return ret;
   }
 
-
   Future<void> deleteAllRogaining() async {
     Database db = await instance.database;
     await db.delete('rog');
   }
 
-  
   Future<bool> isRogAlreadyAvailable(int id) async {
     Database db = await instance.database;
-    var rog = await db.query('rog', where: "id = ${id}");
+    var rog = await db.query('rog', where: "id = $id");
-    return rog.length > 0 ? true : false;
+    return rog.isNotEmpty ? true : false;
   }
 
   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? next_order = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
+    int? nextOrder =
-    next_order = next_order==null ? 0 : next_order;
+        Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
-    next_order = next_order + 1;
+    nextOrder = nextOrder ?? 0;
-    rog.id = next_order;
+    nextOrder = nextOrder + 1;
+    rog.id = nextOrder;
     int res = await db.insert(
       'rog',
       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 ?
+    List<Destination> destList =
-      dest.map((e) => Destination.fromMap(e)).toList() : [];
+        dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
-    print("--------- ${destList}");
+    //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}");
+    var rog = await db.query('destination', where: "location_id = $id");
-    List<Destination> deslist = rog.isNotEmpty
+    List<Destination> deslist =
-      ? rog.map((e) => Destination.fromMap(e)).toList() : [];
+        rog.isNotEmpty ? rog.map((e) => Destination.fromMap(e)).toList() : [];
     return deslist;
   }
 
-
+  Future<List<Destination>> getDestinationByLatLon(
-  Future<List<Destination>> getDestinationByLatLon(double lat, double lon) async {
+      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');
+    var dest = await db.query('destination',
-    List<Destination> destList = dest.isNotEmpty
+        where: "lat = $lat and lon= $lon", orderBy: 'list_order');
-      ? dest.map((e) => Destination.fromMap(e)).toList() : [];
+    List<Destination> destList =
+        dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
     return destList;
   }
 
-  Future<int> deleteDestination(int location_id) async {
+  Future<int> deleteDestination(int locationId) async {
     Database db = await instance.database;
-    var dest = await db.delete('destination', where: "location_id = ${location_id}");
+    var dest =
+        await db.delete('destination', where: "location_id = $locationId");
     int ret = dest > 0 ? dest : -1;
 
     //after deleting set correct order
@@ -212,22 +209,16 @@ class DatabaseHelper{
     Database db = await instance.database;
     var byOrder = await db.query('destination', orderBy: 'list_order');
 
-    List<Destination> des_db = byOrder.isNotEmpty
+    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 des_db){
+    for (Destination d in desDb) {
+      Map<String, dynamic> rowTarget = {"list_order": order};
 
-      Map<String, dynamic> row_target = {
+      await db.update("destination", rowTarget,
-          "list_order": order
+          where: 'location_id = ?', whereArgs: [d.location_id]);
-      };
-
-      await db.update(
-        "destination", 
-        row_target,
-        where: 'location_id = ?',
-        whereArgs: [d.location_id]
-      );
 
       order += 1;
     }
@@ -238,18 +229,21 @@ class DatabaseHelper{
     await db.delete('destination');
   }
 
-  Future<bool>isAlreadyAvailable(int location_id) async{
+  Future<bool> isAlreadyAvailable(int locationId) async {
     Database db = await instance.database;
-    var dest = await db.query('destination', where: "location_id = ${location_id}");
+    var dest =
-    return dest.length > 0 ? true : false;
+        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? next_order = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(list_order) FROM destination'));
+    int? nextOrder = Sqflite.firstIntValue(
-    next_order = next_order==null ? 0 : next_order;
+        await db.rawQuery('SELECT MAX(list_order) FROM destination'));
-    next_order = next_order + 1;
+    nextOrder = nextOrder ?? 0;
-    dest.list_order = next_order;
+    nextOrder = nextOrder + 1;
+    dest.list_order = nextOrder;
     int res = await db.insert(
       'destination',
       dest.toMap(),
@@ -259,60 +253,63 @@ class DatabaseHelper{
     return res;
   }
 
+  Future<int> updateCancelBuyPoint(Destination destination) async {
+    //print("---- updating puypint image in db -----");
+    Database db = await instance.database;
+    Map<String, dynamic> row = {"buy_point": 0};
+    return await db.update("destination", row,
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
+  }
+
+  Future<int> updateBuyPoint(Destination destination, String imageUrl) async {
+    //print("---- updating puypint image in db -----");
+    Database db = await instance.database;
+    Map<String, dynamic> row = {"buypoint_image": imageUrl};
+    return await db.update("destination", row,
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
+  }
+
   Future<int> updateAction(Destination destination, bool checkin) async {
     Database db = await instance.database;
     int act = checkin == false ? 0 : 1;
-    Map<String, dynamic> row = {
+    Map<String, dynamic> row = {"checkedin": act};
-      "checkedin": act
+    return await db.update("destination", row,
-    };
+        where: 'location_id = ?', whereArgs: [destination.location_id!]);
-    return await db.update(
-      "destination", 
-      row,
-      where: 'location_id = ?',
-      whereArgs: [destination.location_id!]
-      );
   }
 
   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 target = await db.query('destination',
-    var dest = await db.query('destination', where: "location_id = ${d.location_id}");
+        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("--- target in db is $target");
-    print("--- destine in db is ${dest}");
+    // print("--- destine in db is $dest");
 
     if (target.isNotEmpty) {
+      List<Destination> targetIndb = target.isNotEmpty
+          ? target.map((e) => Destination.fromMap(e)).toList()
+          : [];
 
-      List<Destination> target_indb = target.isNotEmpty
+      List<Destination> destIndb = dest.isNotEmpty
-      ? target.map((e) => Destination.fromMap(e)).toList() : [];
+          ? dest.map((e) => Destination.fromMap(e)).toList()
+          : [];
 
-      List<Destination> dest_indb = dest.isNotEmpty
+      Map<String, dynamic> rowTarget = {"list_order": d.list_order};
-      ? dest.map((e) => Destination.fromMap(e)).toList() : [];
 
-      Map<String, dynamic> row_target = {
+      Map<String, dynamic> rowDes = {
-        "list_order": d.list_order
+        "list_order": destIndb[0].list_order! + dir
-      };
-
-      Map<String, dynamic> row_des = {
-        "list_order": dest_indb[0].list_order! + dir
       };
 
       // print("--- target destination is ${target_indb[0].location_id}");
       // print("--- destine destination is is ${dest_indb[0].location_id}");
 
-      await db.update(
+      await db.update("destination", rowTarget,
-        "destination", 
+          where: 'location_id = ?', whereArgs: [targetIndb[0].location_id]);
-        row_target,
-        where: 'location_id = ?',
-        whereArgs: [target_indb[0]!.location_id]
-      );
 
-      await db.update(
+      await db.update("destination", rowDes,
-        "destination", 
+          where: 'location_id = ?', whereArgs: [destIndb[0].location_id]);
-        row_des,
-        where: 'location_id = ?',
-        whereArgs: [dest_indb[0]!.location_id]
-      );
     }
   }
 
@@ -320,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,10 +1,8 @@
-
+import 'package:geojson_vi/geojson_vi.dart';
-import 'package:geojson/geojson.dart';
 import 'package:rogapp/model/destination.dart';
 
 class TextUtils {
-
+  static String getDisplayTextFeture(GeoJSONFeature f) {
-    static String getDisplayTextFeture(GeoJsonFeature f){
     RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
     String txt = "";
     // if(f.properties!["cp"] > 0){
@@ -12,23 +10,23 @@ class TextUtils{
     //   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"]}";
+    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, '')}";
+      txt = dp.cp.toString().replaceAll(regex, '');
       if (dp.checkin_point != null && dp.checkin_point! > 0) {
-          txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}";
+        txt = "$txt{${dp.checkin_point.toString().replaceAll(regex, '')}}";
       }
       if (dp.buy_point != null && dp.buy_point! > 0) {
-          print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");
+        //print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");
-          txt = "#${dp.cp.toString().replaceAll(regex, '')}(${dp.checkin_point.toString().replaceAll(regex, '')}+${dp.buy_point.toString().replaceAll(regex, '')})";
+        txt =
+            "#${dp.cp.toString().replaceAll(regex, '')}(${dp.checkin_point.toString().replaceAll(regex, '')}+${dp.buy_point.toString().replaceAll(regex, '')})";
       }
     }
     return txt;
@@ -38,5 +36,4 @@ class TextUtils{
   //   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

@@ -10,12 +10,9 @@ class BaseLayer extends StatelessWidget {
     return TileLayer(
       urlTemplate: "https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png",
       tileProvider: FMTC.instance('OpenStreetMap (A)').getTileProvider(
-                              FMTCTileProviderSettings(
+            settings: FMTCTileProviderSettings(
-                                behavior: CacheBehavior.values
+              behavior: CacheBehavior.values.byName('cacheFirst'),
-                                    .byName('cacheFirst'),
+              cachedValidDuration: const Duration(days: 14),
-                                cachedValidDuration: Duration(
-                                        days: 14
-                                      ),
             ),
           ),
     );

lib/widgets/bottom_sheet_controller.dart

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

lib/widgets/bottom_sheet_widget.dart

@@ -1,380 +0,0 @@
-import 'dart:io';
-
-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>();
-
-  Image getImage(GeoJsonFeature? gf){
-    if(gf!.properties!["photos"] == null || gf.properties!["photos"] == ""){
-      return 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: [
-          SizedBox(height: 5.0,),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              MaterialButton(
-                onPressed: () {
-                  indexController.makePrevious(indexController.currentFeature[0]);
-                },
-                color: Colors.blue,
-                textColor: Colors.white,
-                child: Icon(
-                  Icons.arrow_back_ios,
-                  size: 14,
-                ),
-                padding: EdgeInsets.all(14),
-                shape: CircleBorder(),
-              ),
-              Expanded(
-                child: Container(
-                  alignment: Alignment.center,
-                  child:  Obx(() => 
-                    Text(indexController.currentFeature[0].properties!["location_name"], style: TextStyle(
-                    fontSize: 15.0,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  )
-                  ),
-                ),
-              ),
-              MaterialButton(
-                onPressed: () {
-                   indexController.makeNext(indexController.currentFeature[0]);
-                },
-                color: Colors.blue,
-                textColor: Colors.white,
-                child: Icon(
-                  Icons.arrow_forward_ios,
-                  size: 14,
-                ),
-                padding: EdgeInsets.all(14),
-                shape: 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: TextStyle(fontWeight: FontWeight.bold),)),
-                          ),
-                          SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["address"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): Container(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: TextStyle(fontWeight: FontWeight.bold),))),
-                          SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["phone"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): Container(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: TextStyle(fontWeight: FontWeight.bold),))),
-                          SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["email"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): Container(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: TextStyle(fontWeight: FontWeight.bold)))),
-                          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: TextStyle(color: Colors.blue,),
-                              softWrap: false,
-                              overflow: TextOverflow.fade,),
-                                                    )),
-                            ),
-                          )
-                        ],
-                      ): Container(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: TextStyle(fontWeight: FontWeight.bold)))),
-                          SizedBox(width: 12.0,),
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.topLeft,
-                              child: Obx(() => Text(indexController.currentFeature[0].properties!["videos"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
-                              overflow: TextOverflow.ellipsis,)
-                              ),
-                            ),
-                          )
-                        ],
-                      ): Container(width: 0.0, height: 0.0,),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-          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: () { 
-
-                    },
-                 
-                 )
-              ),
-                  ],
-                )
-
-      
-
-
-
-              :
-              Container(width: 0, height: 0,),
-              indexController.rog_mode.value == 1 ?
-              indexController.currentAction[0][0]["checkin"] == false ?
-                Column(
-                  children: [
-                    Row(
-                     mainAxisSize: MainAxisSize.max,
-                     children: [
-                       ElevatedButton(
-                        child: 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: Icon(
-                   Icons.favorite, color: Colors.red) 
-
-                    ,
-              ):
-              Container(width: 0, height: 0,),
-            ],
-          ): Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              TextButton(
-                onPressed: (){
-                  Get.toNamed(AppPages.LOGIN);
-                  }, 
-                child: Flexible(child: Text("その他のオプションについてはログインしてください")))
-                ],
-          ),
-          ),
-          Row(
-            children: [
-              SizedBox(height: 60.0,),
-            ],
-          )
-        ],
-      ),
-    );
-  }
-}

lib/widgets/bread_crum_widget.dart

@@ -1,34 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:get/get.dart';
-import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/widgets/perfecture_widget.dart';
-
-class BreadCrumbWidget extends StatelessWidget {
-  BreadCrumbWidget({Key? key, this.mapController}) : super(key: key);
-
-  final MapController? mapController;
-
-  final IndexController indexController = Get.find<IndexController>();
-
-
-  @override
-  Widget build(BuildContext context) {
-    print("------ map controller is ${mapController}------------");
-    return 
-      Obx(()=> 
-        indexController.perfectures.isNotEmpty && mapController != null  ?
-        BreadCrumb.builder(
-          itemCount: indexController.perfectures.length, 
-          builder: (index){
-            return
-              BreadCrumbItem(
-                content: PerfectureWidget(indexController: indexController, mapController: mapController!) //Text('Item$index')
-              );
-          }
-        ): 
-        const Text("Empty")
-      );
-  }
-}

lib/widgets/c_form_text_field.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+
+class CFormTextField extends StatelessWidget {
+  const CFormTextField({
+    super.key,
+    required this.cFocus,
+    required TextEditingController cController,
+  }) : cTextEditingController = cController;
+
+  final FocusNode cFocus;
+  final TextEditingController cTextEditingController;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      autocorrect: false,
+      autofocus: true,
+      focusNode: cFocus,
+      controller: cTextEditingController,
+      keyboardType: TextInputType.emailAddress,
+      textInputAction: TextInputAction.done,
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return "Need a valied email address";
+        }
+        return null;
+      },
+      decoration: InputDecoration(
+          //filled: true,
+          //fillColor: Theme.of(context).colorScheme.primaryContainer,
+          hintText: "Enter email address",
+          labelText: "Email",
+          labelStyle: TextStyle(
+              color: Theme.of(context).colorScheme.onPrimaryContainer,
+              fontSize: 16),
+          prefixIcon: const Icon(Icons.email_outlined),
+          suffixIcon: cTextEditingController.text.isNotEmpty
+              ? IconButton(
+                  onPressed: () {
+                    cTextEditingController.clear();
+                  },
+                  icon: const Icon(Icons.clear))
+              : Container(
+                  width: 0,
+                ),
+          enabledBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(16),
+              borderSide: BorderSide(
+                  width: 1, color: Theme.of(context).colorScheme.secondary)),
+          focusedBorder: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(16),
+              borderSide: BorderSide(
+                  width: 2, color: Theme.of(context).colorScheme.primary))),
+    );
+  }
+}

lib/widgets/c_password_text_filed.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+
+class CPasswordTextField extends StatefulWidget {
+  const CPasswordTextField(
+      {super.key, required this.cFocusNode, required this.cController});
+
+  final FocusNode cFocusNode;
+  final TextEditingController cController;
+
+  @override
+  State<CPasswordTextField> createState() => _CPasswordTextFieldState();
+}
+
+class _CPasswordTextFieldState extends State<CPasswordTextField> {
+  var _isVisible = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+        controller: widget.cController,
+        textInputAction: TextInputAction.go,
+        obscureText: !_isVisible,
+        validator: (value) {
+          if (value == null || value.isEmpty || value.length < 5) {
+            return "Need a valied password with more than 4 charectors";
+          }
+          return null;
+        },
+        decoration: InputDecoration(
+            //filled: true,
+            //fillColor: Theme.of(context).colorScheme.tertiaryContainer,
+            hintText: "Enter password",
+            labelText: "Password",
+            labelStyle: TextStyle(
+                color: Theme.of(context).colorScheme.primary, fontSize: 16),
+            suffixIcon: IconButton(
+                onPressed: () {
+                  setState(() {
+                    _isVisible = !_isVisible;
+                  });
+                },
+                icon: _isVisible
+                    ? const Icon(Icons.visibility)
+                    : const Icon(Icons.visibility_off)),
+            enabledBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(16),
+                borderSide: BorderSide(
+                    width: 1, color: Theme.of(context).colorScheme.secondary)),
+            focusedBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(16),
+                borderSide: BorderSide(
+                    width: 2, color: Theme.of(context).colorScheme.primary))));
+  }
+}

lib/widgets/cat_widget.dart

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/services/location_service.dart';
-
-class CatWidget extends StatefulWidget {
-  CatWidget({ Key? key, required this.indexController, }) : super(key: key);
-
-  IndexController indexController;
-
-  @override
-  State<CatWidget> createState() => _CatWidgetState();
-}
-
-class _CatWidgetState extends State<CatWidget> {
-  String defaultValue = "---";
-
-  @override
-  Widget build(BuildContext context) {
-    return 
-    PopupMenuButton(
-      onSelected: (value) {
-        widget.indexController.currentCat.clear();
-        widget.indexController.currentCat.add(value.toString());
-        widget.indexController.refreshLocationForCat();
-        setState(() {
-          print(value);
-          //widget.indexController.is_loading.value = true;
-          defaultValue = value.toString();
-        });
-      },
-        itemBuilder: (BuildContext context){
-          List<PopupMenuItem> itms = <PopupMenuItem>[];
-          for(dynamic d in widget.indexController.cats[0]){
-            PopupMenuItem itm = PopupMenuItem(child:  Text(d['category'].toString()), value: d['category'].toString());
-            itms.add(itm);
-          }
-          return itms;
-        }
-          
-      );
-  }
-}
-
-
-// widget.indexController.cats.map((e) => 
-//             PopupMenuItem(
-//               value: defaultValue,
-//              child: Text(e[0]['category'].toString()),
-//            )
-//           ).toList(),

lib/widgets/current_position_widget.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
+
+class CurrentPosition extends StatefulWidget {
+  const CurrentPosition({super.key});
+
+  @override
+  State<CurrentPosition> createState() => _CurrentPositionState();
+}
+
+class _CurrentPositionState extends State<CurrentPosition> {
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+          color: Colors.grey, borderRadius: BorderRadius.circular(20.0)),
+      child: IconButton(
+        onPressed: () {
+          destinationController.centerMapToCurrentLocation();
+        },
+        icon: const Icon(
+          Icons.location_searching,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+}

lib/widgets/debug_widget.dart

@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+
+class LogManager {
+  static final LogManager _instance = LogManager._internal();
+
+  factory LogManager() {
+    return _instance;
+  }
+
+  LogManager._internal();
+
+  List<String> _logs = [];
+  List<VoidCallback> _listeners = [];
+
+  List<String> get logs => _logs;
+
+  void addLog(String log) {
+    _logs.add(log);
+    _notifyListeners(); // Notify all listeners
+  }
+
+  void clearLogs() {
+    _logs.clear();
+    _notifyListeners(); // Notify all listeners
+  }
+
+  void addListener(VoidCallback listener) {
+    _listeners.add(listener);
+  }
+
+  void removeListener(VoidCallback listener) {
+    _listeners.remove(listener);
+  }
+
+  void _notifyListeners() {
+    for (var listener in _listeners) {
+      listener();
+    }
+  }
+}
+
+class DebugWidget extends StatefulWidget {
+  const DebugWidget({super.key});
+
+  @override
+  State<DebugWidget> createState() => _DebugWidgetState();
+}
+
+class _DebugWidgetState extends State<DebugWidget> {
+  final LogManager logManager = LogManager();
+
+  @override
+  void initState() {
+    super.initState();
+    logManager.addListener(_updateLogs);
+  }
+
+  @override
+  void dispose() {
+    logManager.removeListener(_updateLogs);
+    super.dispose();
+  }
+
+  void _updateLogs() {
+    Future.delayed(Duration.zero, () {
+      if (mounted) {
+        setState(() {});
+      }
+    });
+  }
+
+  void toggleExpanded() {
+    setState(() {
+      isExpanded = !isExpanded;
+    });
+  }
+
+  void clearLogs() {
+    logManager.clearLogs();
+  }
+
+  bool isExpanded = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      left: 0,
+      right: 0,
+      bottom: 0,
+      child: GestureDetector(
+        onTap: toggleExpanded,
+        child: AnimatedContainer(
+          duration: Duration(milliseconds: 200),
+          color: Colors.black54,
+          height: isExpanded ? 450.0 : 50.0, // Adjust sizes as needed
+          child: Column(
+            children: [
+              // Top bar with clear button
+              if (isExpanded)
+                Container(
+                  padding: EdgeInsets.symmetric(horizontal: 10.0),
+                  color: Colors.blueGrey, // Adjust color as needed
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text('Debug Logs', style: TextStyle(color: Colors.white)),
+                      IconButton(
+                        icon: Icon(Icons.clear, color: Colors.white),
+                        onPressed: clearLogs,
+                      ),
+                    ],
+                  ),
+                ),
+
+              // Log messages
+              Expanded(
+                child: SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: logManager.logs.reversed
+                        .map((log) => Text(
+                            "${DateTime.now().hour}:${DateTime.now().minute}:${DateTime.now().second}:${DateTime.now().microsecond} - $log",
+                            style: const TextStyle(color: Colors.white)))
+                        .toList(),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/destination_widget.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:geojson/geojson.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
@@ -7,45 +6,47 @@ import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/utils/const.dart';
 import 'package:rogapp/utils/database_helper.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
-import 'package:rogapp/widgets/bottom_sheet_widget.dart';
-import 'package:sqflite/sqlite_api.dart';
 import 'package:timeline_tile/timeline_tile.dart';
 
 class DestinationWidget extends StatelessWidget {
   DestinationWidget({Key? key}) : super(key: key);
 
-  final DestinationController destinationController = Get.find<DestinationController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
 
   final IndexController indexController = Get.find<IndexController>();
 
   final List<int> _items = List<int>.generate(50, (int index) => index);
 
   Image getImage(int index) {
-    if(destinationController.destinations[index].photos== null || destinationController.destinations[index].photos == ""){
+    if (destinationController.destinations[index].photos == null ||
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+        destinationController.destinations[index].photos == "") {
-    }
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
-    else{
+    } else {
-      print("------- image is ${destinationController.destinations[index].photos!}------");
+      // print(
-      String _photo = destinationController.destinations[index].photos!;
+      //     "------- image is ${destinationController.destinations[index].photos!}------");
-        if(_photo.contains('http')){
+      String photo = destinationController.destinations[index].photos!;
-          return Image(image: NetworkImage(
+      if (photo.contains('http')) {
-            destinationController.destinations[index].photos!),
+        return Image(
-            errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+          image:
+              NetworkImage(destinationController.destinations[index].photos!),
+          errorBuilder:
+              (BuildContext context, Object exception, StackTrace? stackTrace) {
             return Image.asset("assets/images/empty_image.png");
           },
         );
-        }
+      } else {
-        else {
+        String serverUrl = ConstValues.currentServer();
-          String server_url = ConstValues.currentServer();
         //print("==== photo is ${server_url + '/media/compressed/' + destinationController.destinations[index].photos!} ===");
-          return Image(image: NetworkImage(
+        return Image(
-             '${server_url}/media/compressed/' + destinationController.destinations[index].photos!),
+          image: NetworkImage(
-            errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+              '$serverUrl/media/compressed/${destinationController.destinations[index].photos!}'),
+          errorBuilder:
+              (BuildContext context, Object exception, StackTrace? stackTrace) {
             return Image.asset("assets/images/empty_image.png");
           },
         );
       }
-      
     }
   }
 
@@ -63,10 +64,10 @@ class DestinationWidget extends StatelessWidget {
   // }
 
   void doDelete() {
-    destinationController.currentSelectedDestinations.forEach((element) {
+    for (var element in destinationController.currentSelectedDestinations) {
       destinationController.deleteDestination(element);
       destinationController.resetRogaining();
-    });
+    }
     // destinationController.destination_index_data.forEach((element) {
     //   //print(element["index"]);
     //   destinationController.deleteDestination(element["index"]);
@@ -75,7 +76,7 @@ class DestinationWidget extends StatelessWidget {
   }
 
   void moveUp() {
-    Destination? d = null;
+    Destination? d;
     for (Destination ad in destinationController.destinations) {
       if (ad.selected == true) {
         d = ad;
@@ -83,13 +84,13 @@ class DestinationWidget extends StatelessWidget {
       }
     }
     if (d != null) {
-      print("--- selected destination is ${d.list_order}");
+      //print("--- selected destination is ${d.list_order}");
       destinationController.makeOrder(d, -1);
     }
   }
 
   void moveDown() {
-    Destination? d = null;
+    Destination? d;
     for (Destination ad in destinationController.destinations) {
       if (ad.selected == true) {
         d = ad;
@@ -97,7 +98,7 @@ class DestinationWidget extends StatelessWidget {
       }
     }
     if (d != null) {
-      print("--- selected destination is ${d.list_order}");
+      //print("--- selected destination is ${d.list_order}");
       destinationController.makeOrder(d, 1);
     }
   }
@@ -107,8 +108,8 @@ class DestinationWidget extends StatelessWidget {
         title: "are_you_sure_want_to_delete_all".tr,
         middleText: "all_added_destination_will_be_deleted".tr,
         backgroundColor: Colors.blue.shade300,
-      titleStyle: TextStyle(color: Colors.white),
+        titleStyle: const TextStyle(color: Colors.white),
-      middleTextStyle: TextStyle(color: Colors.white),
+        middleTextStyle: const TextStyle(color: Colors.white),
         textConfirm: "confirm".tr,
         textCancel: "cancel".tr,
         cancelTextColor: Colors.white,
@@ -116,16 +117,15 @@ class DestinationWidget extends StatelessWidget {
         buttonColor: Colors.white,
         barrierDismissible: false,
         radius: 10,
-      content: Column(
+        content: const Column(
-          children:   [
+          children: [],
-                      ],
         ),
         onConfirm: () {
           destinationController.deleteAllDestinations();
           Get.back();
-        Get.snackbar("deleted".tr, "all_destinations_are_deleted_successfully".tr);              
+          Get.snackbar(
-        }
+              "deleted".tr, "all_destinations_are_deleted_successfully".tr);
-                            );
+        });
   }
 
   void interChange() {
@@ -138,34 +138,35 @@ class DestinationWidget extends StatelessWidget {
     // });
   }
 
-  Future getIsLocationAvilable(int location_id) async {
+  Future getIsLocationAvilable(int locationId) async {
     DatabaseHelper db = DatabaseHelper.instance;
-    return await db.isAlreadyAvailable(location_id);
+    return await db.isAlreadyAvailable(locationId);
   }
 
   @override
   Widget build(BuildContext context) {
+    //print(
+    //    "------ destination widget------ ${destinationController.destinationCount.value} ----------");
 
-    print("------ destination widget------ ${destinationController.destinationCount.value} ----------");
+    return Obx(() => Stack(
-
-    return 
-        Obx(() => 
-          Stack(
           children: [
             Padding(
               padding: const EdgeInsets.only(top: 45.0),
               child: ListView.builder(
                   itemCount: destinationController.destinationCount.value,
                   itemBuilder: (BuildContext context, int index) {
-                  return
+                    return TimelineTile(
-                    TimelineTile(
                       alignment: TimelineAlign.manual,
                       lineXY: 0.2,
                       isFirst: index == 0 ? true : false,
                       indicatorStyle: IndicatorStyle(
                         indicator: CircleAvatar(
-                        child: Text(destinationController.destinations[index].list_order.toString(), style: TextStyle(color: Colors.white),),
                           backgroundColor: Colors.red,
+                          child: Text(
+                            destinationController.destinations[index].list_order
+                                .toString(),
+                            style: const TextStyle(color: Colors.white),
+                          ),
                         ),
                       ),
                       key: Key(index.toString()),
@@ -177,50 +178,74 @@ class DestinationWidget extends StatelessWidget {
                           child: ListTile(
                             onTap: () async {
                               {
-                              Destination? fs = destinationController.destinations[index];
+                                Destination? fs =
-                                print("----fsf-----${index}");
+                                    destinationController.destinations[index];
-                                if(fs != null){
+                                //print("----fsf-----$index");
-                                  
+                                if (indexController
-                                  if(indexController.currentDestinationFeature.isNotEmpty) {
+                                    .currentDestinationFeature.isNotEmpty) {
-                                    indexController.currentDestinationFeature.clear();
+                                  indexController.currentDestinationFeature
+                                      .clear();
                                 }
-                                  indexController.currentDestinationFeature.add(fs);
+                                indexController.currentDestinationFeature
-                                  print("--- ndexController.currentDestinationFeature ----- ${ indexController.currentDestinationFeature[0].name} ----");
+                                    .add(fs);
+                                // print(
+                                //     "--- ndexController.currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} ----");
                                 //indexController.getAction();
 
-                                  showModalBottomSheet(context: context, isScrollControlled: true, 
+                                showModalBottomSheet(
+                                    constraints: BoxConstraints.loose(
+                                        Size(Get.width, Get.height * 0.85)),
+                                    context: context,
+                                    isScrollControlled: true,
                                     //builder:((context) => BottomSheetWidget())
-                                    builder:((context) => BottomSheetNew())
+                                    builder: ((context) => BottomSheetNew(
-                                  );
+                                          destination: fs,
+                                        )));
                               }
-                            };
                             },
                             onLongPress: () {
-                            destinationController.toggleSelection(destinationController.destinations[index]); 
+                              destinationController.toggleSelection(
+                                  destinationController.destinations[index]);
                             },
                             selectedTileColor: Colors.amberAccent,
-                          selected:destinationController.destinations[index].selected!,
+                            selected: destinationController
+                                .destinations[index].selected!,
                             leading: getImage(index),
-                          title: Text(destinationController.destinations[index].name!),
+                            title: Text(destinationController
-                          subtitle: Text(destinationController.destinations[index].category!),
+                                .destinations[index].name!),
+                            subtitle: Text(destinationController
+                                .destinations[index].category!),
                           ),
                         ),
                       ),
-                    startChild: 
+                      startChild: index > 0 &&
-                      index > 0 && destinationController.matrix["routes"][0]["legs"] != null ?
+                              destinationController.matrix["routes"][0]
-                      Column(
+                                      ["legs"] !=
+                                  null
+                          ? Column(
                               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                               children: [
-                          Text(destinationController.matrix["routes"][0]["legs"][index -1]["distance"] != null ? destinationController.matrix["routes"][0]["legs"][index-1]["distance"]["text"].toString(): ''),
+                                Text(destinationController.matrix["routes"][0]
-                          Text(destinationController.matrix["routes"][0]["legs"][index -1]["duration"] != null ? destinationController.matrix["routes"][0]["legs"][index-1]["duration"]["text"].toString() : '')
+                                            ["legs"][index - 1]["distance"] !=
+                                        null
+                                    ? destinationController.matrix["routes"][0]
+                                            ["legs"][index - 1]["distance"]
+                                            ["text"]
+                                        .toString()
+                                    : ''),
+                                Text(destinationController.matrix["routes"][0]
+                                            ["legs"][index - 1]["duration"] !=
+                                        null
+                                    ? destinationController.matrix["routes"][0]
+                                            ["legs"][index - 1]["duration"]
+                                            ["text"]
+                                        .toString()
+                                    : '')
                               ],
-                      ):
+                            )
-                      Container()
+                          : Container(),
-                      ,
                     );
-                  
+                  }),
-                }
-              ),
             ),
             Container(
               decoration: BoxDecoration(
@@ -229,7 +254,7 @@ class DestinationWidget extends StatelessWidget {
                     color: Colors.grey.withOpacity(0.3),
                     spreadRadius: 5,
                     blurRadius: 3,
-                      offset: Offset(0, 7), // changes position of shadow
+                    offset: const Offset(0, 7), // changes position of shadow
                   ),
                 ],
               ),
@@ -239,22 +264,31 @@ class DestinationWidget extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   IconButton(
-                      icon:Icon(Icons.delete_forever),
+                    icon: const Icon(Icons.delete_forever),
                     //onPressed: (){doDelete();},
                     onPressed: clearall,
                   ),
                   IconButton(
-                      icon:Icon(Icons.cancel),
+                    icon: const Icon(Icons.cancel),
                     //onPressed: (){doDelete();},
-                     onPressed: destinationController.currentSelectedDestinations.length > 0 ? doDelete : null,
+                    onPressed: destinationController
+                            .currentSelectedDestinations.isNotEmpty
+                        ? doDelete
+                        : null,
                   ),
                   IconButton(
-                      icon:Icon(Icons.move_up),
+                    icon: const Icon(Icons.move_up),
-                      onPressed: destinationController.currentSelectedDestinations.length > 0 ? moveUp : null,
+                    onPressed: destinationController
+                            .currentSelectedDestinations.isNotEmpty
+                        ? moveUp
+                        : null,
                   ),
                   IconButton(
-                      icon:Icon(Icons.move_down),
+                    icon: const Icon(Icons.move_down),
-                      onPressed: destinationController.currentSelectedDestinations.length > 0 ? moveDown : null,
+                    onPressed: destinationController
+                            .currentSelectedDestinations.isNotEmpty
+                        ? moveDown
+                        : null,
                   ),
                   // IconButton(
                   //   icon:Icon(Icons.sync),
@@ -264,7 +298,6 @@ class DestinationWidget extends StatelessWidget {
               ),
             )
           ],
-        )
+        ));
-        );
   }
 }

lib/widgets/game_state_view.dart

@@ -0,0 +1,210 @@
+import 'dart:ffi';
+import 'dart:math';
+
+import 'package:flutter/material.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/services/DatabaseService.dart';
+import 'package:rogapp/utils/database_helper.dart';
+import 'package:rogapp/widgets/GameState/CheckinState.dart';
+import 'package:rogapp/widgets/GameState/ConnectionStatus.dart';
+import 'package:rogapp/widgets/GameState/DashboardWidget.dart';
+import 'package:rogapp/widgets/GameState/game_on_off.dart';
+
+class GameStateManager {
+  static final GameStateManager _instance = GameStateManager._internal();
+
+  factory GameStateManager() {
+    return _instance;
+  }
+
+  GameStateManager._internal();
+
+  List<String> _logs = [];
+  List<VoidCallback> _listeners = [];
+
+  List<String> get logs => _logs;
+
+  void addLog(String log) {
+    _logs.add(log);
+    _notifyListeners(); // Notify all listeners
+  }
+
+  void clearLogs() {
+    _logs.clear();
+    _notifyListeners(); // Notify all listeners
+  }
+
+  void addListener(VoidCallback listener) {
+    _listeners.add(listener);
+  }
+
+  void removeListener(VoidCallback listener) {
+    _listeners.remove(listener);
+  }
+
+  void _notifyListeners() {
+    for (var listener in _listeners) {
+      listener();
+    }
+  }
+}
+
+class GameStateWidget extends StatefulWidget {
+  const GameStateWidget({super.key});
+
+  @override
+  State<GameStateWidget> createState() => _GameStateWidgetState();
+}
+
+class _GameStateWidgetState extends State<GameStateWidget> {
+  final GameStateManager gameStateManager = GameStateManager();
+
+  final IndexController indexController = Get.find<IndexController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
+
+  @override
+  void initState() {
+    super.initState();
+    gameStateManager.addListener(_updateLogs);
+  }
+
+  @override
+  void dispose() {
+    gameStateManager.removeListener(_updateLogs);
+    super.dispose();
+  }
+
+  void _updateLogs() {
+    Future.delayed(Duration.zero, () {
+      if (mounted) {
+        setState(() {});
+      }
+    });
+  }
+
+  void toggleExpanded() {
+    setState(() {
+      isExpanded = !isExpanded;
+    });
+  }
+
+  void clearLogs() {
+    gameStateManager.clearLogs();
+  }
+
+  bool isExpanded = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final DatabaseService dbService = DatabaseService();
+    return Container(
+      width: MediaQuery.of(context).size.width,
+      decoration: BoxDecoration(color: Colors.black12),
+      child: GestureDetector(
+        onTap: toggleExpanded,
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 200),
+          color: isExpanded ? Colors.black54 : Colors.black12,
+          height: isExpanded ? 160.0 : 48.0, // Adjust sizes as needed
+          child: Column(
+            children: [
+              // Top bar with clear button
+              if (isExpanded)
+                Container(
+                  padding: EdgeInsets.symmetric(horizontal: 10.0),
+                  color: Colors.blueGrey, // Adjust color as needed
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text('ゲームステータス', style: TextStyle(color: Colors.white)),
+                      IconButton(
+                        icon: Icon(Icons.clear, color: Colors.white),
+                        onPressed: toggleExpanded,
+                      ),
+                    ],
+                  ),
+                ),
+
+              // Log messages
+              Expanded(
+                child: SingleChildScrollView(
+                  child: Wrap(
+                    alignment: WrapAlignment.spaceEvenly,
+                    children: [
+                      Obx(() => Padding(
+                            padding: const EdgeInsets.all(4.0),
+                            child: GameStatusIndicator(
+                              gameStarted: destinationController.isInRog.value,
+                              minimized: !isExpanded,
+                            ),
+                          )),
+                      Padding(
+                        padding: const EdgeInsets.all(4.0),
+                        child: StreamBuilder<List<Destination>>(
+                          stream: dbService.destinationUpdatesStream,
+                          builder: (context, snapshot) {
+                            if (snapshot.connectionState ==
+                                ConnectionState.waiting) {
+                              return const CircularProgressIndicator();
+                            } else if (snapshot.hasError) {
+                              return LocationVisitedWidget(
+                                count: 0,
+                                minimized: !isExpanded,
+                              );
+                            } else if (snapshot.hasData) {
+                              return LocationVisitedWidget(
+                                count: snapshot.data!.length,
+                                minimized: !isExpanded,
+                              );
+                            } else {
+                              return LocationVisitedWidget(
+                                count: 0,
+                                minimized: !isExpanded,
+                              );
+                            }
+                          },
+                        ),
+
+                        // child: LocationVisitedWidget(
+                        //   count:
+                        //   minimized: !isExpanded,
+                        // ),
+                      ),
+                      Padding(
+                        padding: const EdgeInsets.all(4.0),
+                        child: Obx(() => ConnectionStatusIndicator(
+                            connectionStatus: (indexController
+                                            .connectionStatusName.value ==
+                                        "wifi" ||
+                                    indexController
+                                            .connectionStatusName.value ==
+                                        "mobile")
+                                ? indexController.connectionStatusName.value ==
+                                        "wifi"
+                                    ? ConnectionStatus.wifi
+                                    : ConnectionStatus.mobile
+                                : ConnectionStatus.none,
+                            minimized: !isExpanded)),
+                      ) // Expanded view
+                    ],
+                  ),
+                  // child: Obx(
+                  //   () => DashboardWidget(
+                  //     gameStarted: destinationController.isInRog.value,
+                  //     locationsVisited: 3,
+                  //     isMinimized: false,
+                  //   ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/list_widget.dart

@@ -1,84 +1,189 @@
 import 'package:flutter/material.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/services/maxtrix_service.dart';
 import 'package:rogapp/utils/const.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
-import 'package:rogapp/widgets/bottom_sheet_widget.dart';
 
-class ListWidget extends StatelessWidget {
+class ListWidget extends StatefulWidget {
-  ListWidget({ Key? key }) : super(key: key);
+  const ListWidget({Key? key}) : super(key: key);
 
+  @override
+  State<ListWidget> createState() => _ListWidgetState();
+}
+
+class _ListWidgetState extends State<ListWidget> {
   final IndexController indexController = Get.find<IndexController>();
-  final DestinationController destinationController = Get.find<DestinationController>();
+
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
 
   Image getImage(int index) {
-    if(indexController.locations[0].collection[index].properties!["photos"] == null || indexController.locations[0].collection[index].properties!["photos"] == ""){
+    if (indexController.locations[0].features[index]!.properties!["photos"] ==
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+            null ||
-    }
+        indexController.locations[0].features[index]!.properties!["photos"] ==
-    else{
+            "") {
-      print("==== photo index is ${index} ===");
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
-      String server_url = ConstValues.currentServer();
+    } else {
-      GeoJsonFeature<dynamic> gf = indexController.locations[0].collection[index];
+      //print("==== photo index is $index ===");
-      String _photo = gf!.properties!["photos"];
+      String serverUrl = ConstValues.currentServer();
+      GeoJSONFeature gf = indexController.locations[0].features[index]!;
+      String photo = gf.properties!["photos"];
       return Image(
-        image: NetworkImage(
+        image: NetworkImage('$serverUrl/media/compressed/$photo'),
-          '${server_url}/media/compressed/' + _photo
+        errorBuilder:
-          ),
+            (BuildContext context, Object exception, StackTrace? stackTrace) {
-        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
           return Image.asset("assets/images/empty_image.png");
         },
       );
     }
   }
 
-  void changeCurrentFeature(GeoJsonFeature fs){
+  void changeCurrentFeature(GeoJSONFeature fs) {
-    if(indexController.currentFeature.length > 0){
+    if (indexController.currentFeature.isNotEmpty) {
       indexController.currentFeature.clear();
     }
     indexController.currentFeature.add(fs);
   }
 
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Destination createDestination(GeoJSONFeature feature) {
+    final props = feature.properties;
+    GeoJSONMultiPoint pt = feature.geometry as GeoJSONMultiPoint;
+
+    return Destination(
+      cp: props!['cp'],
+      lat: pt.coordinates[0][1],
+      lon: pt.coordinates[0][0],
+    );
+  }
+
+  Future<String> matrixDistance(int i) async {
+    // Create two destinations directly from indexController.locations[0].collection
+    Destination desCurr = Destination(
+        lat: indexController.currentLat, lon: indexController.currentLon);
+    //Destination dest1 = createDestination(indexController.locations[0].collection[0]);
+    Destination dest2 =
+        createDestination(indexController.locations[0].features[i]!);
+
+    // Get the distance between these two destinations
+    final res = await MatrixService.getDestinations([desCurr, dest2]);
+
+    return res["routes"][0]["legs"][0]["distance"]["text"];
+    //print("matrix result is ${i} : ${res["routes"][0]["legs"][0]["distance"]["text"]} ");
+  }
+
+  Future<void> _pullRefresh() async {
+    //print("pull to refesh");
+    indexController.locations[0].features.sort((a, b) =>
+        (a!.properties!['cp'] as Comparable)
+            .compareTo(b!.properties!['cp'] as Comparable));
+    setState(() {});
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Obx(() =>
+    return Obx(
-              indexController.locations.length > 0 ?
+      () => indexController.locations.isNotEmpty
-              ListView.builder(
+          ? RefreshIndicator(
-              itemCount: indexController.locations[0].collection.length,
+              onRefresh: _pullRefresh,
+              child: ListView.builder(
+                itemCount: indexController.locations[0].features.length,
                 shrinkWrap: true,
                 itemBuilder: (_, index) {
-                bool _is_found = false;
+                  bool isFound = false;
                   for (Destination d in destinationController.destinations) {
-                  if(indexController.locations[0].collection[index].properties!['location_id'] == d.location_id){
+                    if (indexController.locations[0].features[index]!
-                    _is_found = true;
+                            .properties!['location_id'] ==
+                        d.location_id) {
+                      isFound = true;
                       break;
                     }
                   }
                   return Card(
                     child: ListTile(
-                    selected: _is_found,
+                        selected: isFound,
-                    
                         selectedTileColor: Colors.yellow.shade200,
                         onTap: () {
-                      GeoJsonFeature gf = indexController.locations[0].collection[index];
+                          GeoJSONFeature gf =
+                              indexController.locations[0].features[index]!;
+                          Destination des =
+                              destinationController.festuretoDestination(gf);
                           changeCurrentFeature(gf);
                           showModalBottomSheet(
+                              constraints: BoxConstraints.loose(
+                                  Size(Get.width, Get.height * 0.85)),
                               isScrollControlled: true,
                               context: context,
                               //builder: (context) => BottomSheetWidget(),
-                          builder:((context) => BottomSheetNew())
+                              builder: ((context) => BottomSheetNew(
-                        );
+                                    destination: des,
+                                  )));
                         },
                         leading: getImage(index),
-                    title: indexController.locations[0].collection[index].properties!['location_name'] != null ? Text(indexController.locations[0].collection[index].properties!['location_name'].toString()) : Text(""),
+                        title: indexController.locations[0].features[index]!
-                    subtitle: indexController.locations[0].collection[index].properties!['category'] != null ? Text(indexController.locations[0].collection[index].properties!['category']) : Text(""),
+                                    .properties!['location_name'] !=
-                    trailing: indexController.locations[0].collection[index].properties!['sub_loc_id'] != null ? Text(indexController.locations[0].collection[index].properties!['sub_loc_id']) : Text(""),
+                                null
+                            ? Text(indexController.locations[0].features[index]!
+                                .properties!['location_name']
+                                .toString())
+                            : const Text(""),
+                        subtitle: indexController.locations[0].features[index]!
+                                    .properties!['category'] !=
+                                null
+                            ? Text(indexController.locations[0].features[index]!
+                                .properties!['category'])
+                            : const Text(""),
+                        trailing: Column(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          children: [
+                            indexController.locations[0].features[index]!
+                                        .properties!['sub_loc_id'] !=
+                                    null
+                                ? Text(indexController.locations[0]
+                                    .features[index]!.properties!['sub_loc_id'])
+                                : const Text(""),
+                            SizedBox(
+                              width: 100,
+                              child: FutureBuilder<String>(
+                                future: matrixDistance(index),
+                                builder: (context, snapshot) {
+                                  if (snapshot.connectionState ==
+                                      ConnectionState.waiting) {
+                                    return const Center(
+                                      child: CircularProgressIndicator(),
+                                    );
+                                  }
+                                  if (snapshot.hasError) {
+                                    return const Text("-");
+                                  } else {
+                                    return Text(
+                                      snapshot.data ?? '',
+                                      style: const TextStyle(
+                                          color: Colors.red,
+                                          fontWeight: FontWeight.bold),
+                                    );
+                                  }
+                                },
                               ),
+                            )
+                          ],
+                        )),
                   );
                 },
-            ) : Container(width: 0, height: 0,),
+              ),
+            )
+          : const SizedBox(
+              width: 0,
+              height: 0,
+            ),
     );
   }
 }

lib/widgets/map_widget.dart

@@ -1,164 +1,302 @@
 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_cluster/flutter_map_marker_cluster.dart';
-import 'package:geojson/geojson.dart';
+import 'package:flutter_polyline_points/flutter_polyline_points.dart';
+import 'package:geojson_vi/geojson_vi.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
 import 'package:latlong2/latlong.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/utils/database_helper.dart';
+import 'package:rogapp/utils/location_controller.dart';
 import 'package:rogapp/utils/text_util.dart';
 import 'package:rogapp/widgets/base_layer_widget.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
-import 'package:rogapp/widgets/bottom_sheet_widget.dart';
+import 'package:rogapp/widgets/current_position_widget.dart';
-
+import 'package:rogapp/widgets/game_state_view.dart';
-class MapWidget extends StatelessWidget {
-
-  final IndexController indexController = Get.find<IndexController>();
-  final DestinationController destinationController = Get.find<DestinationController>();
 
+class MapWidget extends StatefulWidget {
   MapWidget({Key? key}) : super(key: key);
 
-  StreamSubscription? subscription;
+  @override
+  State<MapWidget> createState() => _MapWidgetState();
+}
 
-  Widget getMarkerShape(GeoJsonFeature i, BuildContext context){
+class _MapWidgetState extends State<MapWidget> {
-    GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
+  final IndexController indexController = Get.find<IndexController>();
+
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
+  final LocationController locationController = Get.find<LocationController>();
+
+  StreamSubscription? subscription;
+  Timer? _timer;
+
+  Widget getMarkerShape(GeoJSONFeature i, BuildContext context) {
+    GeoJSONMultiPoint p = i.geometry as GeoJSONMultiPoint;
     //print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
-    RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
+    //RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-    return Row(
+    return InkWell(
-                                      mainAxisAlignment: MainAxisAlignment.start,
-                                      children: [
-                                        InkWell(
       onTap: () {
-                                                  GeoJsonFeature? fs = indexController.getFeatureForLatLong(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude);
+        GeoJSONFeature? fs = indexController.getFeatureForLatLong(
-                                                  print("------- fs ${fs}------");
+            p.coordinates[0][1], p.coordinates[0][0]);
+        //print("------- fs $fs------");
         if (fs != null) {
           indexController.currentFeature.clear();
           indexController.currentFeature.add(fs);
           //print("----- fs is ${fs.properties!['photos']}");
-                                                    indexController.getAction();
 
+          Destination des = destinationController.festuretoDestination(fs);
+
+          DatabaseHelper db = DatabaseHelper.instance;
+          db.getDestinationByLatLon(des.lat!, des.lon!).then((value) {
+            destinationController.shouldShowBottomSheet = false;
             showModalBottomSheet(
+                constraints:
+                    BoxConstraints.loose(Size(Get.width, Get.height * 0.85)),
                 context: context,
                 isScrollControlled: true,
                 isDismissible: true,
-                                                      builder:((context) => BottomSheetNew())
+                builder: ((context) => BottomSheetNew(
+                    destination: des, isAlreadyCheckedIn: value.isNotEmpty))
                 //builder:((context) => BottomSheetWidget())
                 ).whenComplete(() {
-                                                      destinationController.skip_gps = false;
+              destinationController.shouldShowBottomSheet = true;
+              destinationController.skipGps = false;
+            });
           });
         }
-
-
-
-
       },
-                                          child: Container(
+      child: Stack(
+        fit: StackFit.expand,
+        //mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Container(
               height: 32,
               width: 32,
               decoration: BoxDecoration(
                   shape: BoxShape.circle,
                   color: Colors.transparent,
                   border: Border.all(
-                                                  color: i.properties!['buy_point'] > 0 ? Colors.blue : Colors.red,
+                      color: i.properties!['buy_point'] > 0
+                          ? Colors.blue
+                          : Colors.red,
                       width: 3,
-                                                  style: BorderStyle.solid
+                      style: BorderStyle.solid)),
-                                                )
-                                              ),
               child: Stack(
                 alignment: Alignment.center,
                 children: [
-                                                  Icon(Icons.circle,size: 6.0,),
+                  const Icon(
-                                                  i.properties!['cp'] == -1 ?
+                    Icons.circle,
-                                                    Transform.rotate(
+                    size: 6.0,
+                  ),
+                  i.properties!['cp'] == -1
+                      ? Transform.translate(
+                          offset: Offset(18, 0),
+                          child: Transform.rotate(
                               alignment: Alignment.centerLeft,
                               origin: Offset.fromDirection(1, 26),
                               angle: 270 * pi / 180,
-                                                      child: Icon(Icons.play_arrow_outlined, color: Colors.red, size: 70,)):
+                              child: const Icon(
-                                                    Container(color: Colors.transparent,),
+                                Icons.play_arrow_outlined,
-                                                ],
+                                color: Colors.red,
+                                size: 70,
+                              )),
                         )
+                      : Container(
+                          color: Colors.transparent,
                         ),
-                                        ),
-                                          Container(color: Colors.white, child: Text(TextUtils.getDisplayTextFeture(i), style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,))),
                 ],
+              )),
+          Transform.translate(
+            offset: Offset(45, 0),
+            child: Align(
+              alignment: Alignment.center,
+              child: Container(
+                  color: Colors.purple.withOpacity(0.2),
+                  // child: Text(TextUtils.getDisplayTextFeture(i),
+                  //     style: const TextStyle(
+                  //       fontSize: 16,
+                  //       fontWeight: FontWeight.bold,
+                  //       color: Colors.red,
+                  //     ))),
+                  child: Stack(
+                    children: <Widget>[
+                      // Text with white outline
+                      Text(
+                        TextUtils.getDisplayTextFeture(i),
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w700,
+                          foreground: Paint()
+                            ..style = PaintingStyle.stroke
+                            ..strokeWidth = 1
+                            ..color = Colors.white,
+                        ),
+                      ),
+                      // Text with black fill
+                      Text(
+                        TextUtils.getDisplayTextFeture(i),
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w700,
+                          color: Colors.black,
+                        ),
+                      ),
+                    ],
+                  )),
+            ),
+          )
+        ],
+      ),
     );
   }
 
+  List<LatLng>? getPoints() {
+    //print("##### --- route point ${indexController.routePoints.length}");
+    List<LatLng> pts = [];
+    for (PointLatLng p in indexController.routePoints) {
+      LatLng l = LatLng(p.latitude, p.longitude);
+      pts.add(l);
+    }
+    return pts;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _startIdleTimer();
+  }
+
+  void _startIdleTimer() {
+    _timer = Timer(const Duration(milliseconds: (1000 * 10)), _centerMapOnUser);
+  }
+
+  void _resetTimer() {
+    _timer?.cancel();
+    _startIdleTimer();
+  }
+
+  void _centerMapOnUser() {
+    print("showBottomSheet ${destinationController.shouldShowBottomSheet}");
+    //if (destinationController.shouldShowBottomSheet) {
+    destinationController.centerMapToCurrentLocation();
+    //}
+  }
+
   @override
   Widget build(BuildContext context) {
+    // print(
+    //     "---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
 
-    print("---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
+    final PopupController popupController = PopupController();
-
-    final PopupController _popupController = PopupController();
     return Stack(
       children: [
-                    Obx(() => 
+        Obx(() => indexController.isLoading.value == true
-                      indexController.is_loading == true ? Padding(
+            ? const Padding(
-                        padding: const EdgeInsets.only(top: 60.0),
+                padding: EdgeInsets.only(top: 60.0),
                 child: CircularProgressIndicator(),
-                      ):
+              )
-                      FlutterMap(
+            : FlutterMap(
                 mapController: indexController.mapController,
                 options: MapOptions(
                   maxZoom: 18.4,
                   onMapReady: () {
-                            indexController.is_mapController_loaded.value = true;
+                    subscription = indexController.mapController.mapEventStream
-                            subscription = indexController.mapController.mapEventStream.listen((MapEvent mapEvent) {
+                        .listen((MapEvent mapEvent) {
                       if (mapEvent is MapEventMoveStart) {
-                                  //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
+                        // print(DateTime.now().toString() +
+                        //     ' [MapEventMoveStart] START');
                         // do something
                       }
-                                if (mapEvent is MapEventMoveEnd && indexController.currentUser. length <= 0) {
+                      if (mapEvent is MapEventMoveEnd) {}
-                                  //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
-                                  indexController.loadLocationsBound();
-                                  //indexController.rogMapController!.move(c.center, c.zoom);
-                                }
                     });
-
                   },
                   //center: LatLng(37.15319600454702, 139.58765950528198),
-                          bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
+                  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,
+                  interactiveFlags:
-                          
+                      InteractiveFlag.pinchZoom | InteractiveFlag.drag,
-                          onPositionChanged: (MapPosition pos, isvalue){
 
+                  onPositionChanged: (MapPosition pos, hasGesture) {
+                    //print("map position changed ${pos.center!.latitude}");
+                    if (hasGesture) {
+                      _resetTimer();
+                    }
+                    indexController.currentBound = [pos.bounds!];
                   },
-                          onTap: (_, __) =>
+                  onTap: (_, __) => popupController
-                              _popupController
                       .hideAllPopups(), // Hide popup when the map is tapped.
                 ),
                 children: [
-                          BaseLayer(),
+                  const BaseLayer(),
-                          CurrentLocationLayer(),
+                  Obx(
-                          indexController.locations.isNotEmpty && indexController.locations[0].collection.isNotEmpty ?
+                    () => indexController.routePointLenght > 0
-                          MarkerLayer(
+                        ? PolylineLayer(
-                            markers:indexController.locations[0].collection.map((i) {
+                            polylines: [
-                                      print("i si ${i.properties!['location_id']}");
+                              Polyline(
+                                  points: getPoints()!,
+                                  strokeWidth: 6.0,
+                                  color: Colors.indigo),
+                            ],
+                          )
+                        : Container(),
+                  ),
+                  CurrentLocationLayer(
+                    positionStream: locationController
+                        .locationMarkerPositionStreamController.stream,
+                    alignDirectionOnUpdate: AlignOnUpdate.never,
+                    turnOnHeadingUpdate: TurnOnHeadingUpdate.never,
+                    style: const LocationMarkerStyle(
+                      marker: DefaultLocationMarker(
+                        child: Icon(
+                          Icons.navigation,
+                          color: Colors.yellowAccent,
+                        ),
+                      ),
+                      markerSize: Size(27, 27),
+                      markerDirection: MarkerDirection.heading,
+                    ),
+                  ),
+                  indexController.locations.isNotEmpty &&
+                          indexController.locations[0].features.isNotEmpty
+                      ? MarkerLayer(
+                          markers:
+                              indexController.locations[0].features.map((i) {
+                            //print("i si ${i.properties!['location_id']}");
 
                             RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-                                      GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
+                            GeoJSONMultiPoint p =
-                                      print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
+                                i!.geometry as GeoJSONMultiPoint;
+                            //print(
+                            //    "lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
                             return Marker(
-                                        anchorPos: AnchorPos.exactly(Anchor(108.0, 18.0)),
+                                alignment: Alignment.center,
-                                        height: 32.0,
+                                height: 27.0,
-                                        width: 120.0,
+                                width: 127.0,
-                                        point: LatLng(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude),
+                                point: LatLng(
-                                        builder: (ctx){
+                                    p.coordinates[0][1], p.coordinates[0][0]),
-                                          return getMarkerShape(i, context);
+                                child: getMarkerShape(i, context));
-                                        },
-                                      );
                           }).toList(),
                         )
-                          :
+                      : const Center(child: CircularProgressIndicator()),
-                          Center(child: CircularProgressIndicator())
-                          ,
                 ],
-                    )
+              )),
-                    )
+        const Positioned(top: 0, left: 0, child: GameStateWidget()),
+        const Positioned(bottom: 10, right: 10, child: CurrentPosition())
+        // const Positioned(
+        //   bottom: 10,
+        //   left: 0,
+        //   child: DebugWidget(),
+        // )
       ],
     );
   }

lib/widgets/perfecture_widget.dart

@@ -1,240 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:get/get.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/widgets/cat_widget.dart';
-
-
-class PerfectureWidget  extends StatefulWidget {
-
-  IndexController indexController;
-  MapController mapController;
-
-
-  PerfectureWidget({Key? key, required this.indexController, required this.mapController}) : super(key: key){
-     //indexController.zoomtoMainPerf("9", mapController);
-  }
-
-  @override
-  State<PerfectureWidget> createState() => _PerfectureWidgetState();
-}
-
-class _PerfectureWidgetState extends State<PerfectureWidget> {
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-
-  bool isNumeric(String s) {
-    if (s == null) {
-      return false;
-    }
-    return double.tryParse(s) != null;
-  }
-   
-
-  List<DropdownMenuItem<String>> getDropdownItems() {
-    List<DropdownMenuItem<String>> dropDownItems = [];
-
-    for (Map<String, dynamic> currency in widget.indexController.perfectures[0]) {
-      //print(currency["id"].toString());
-      var newDropdown = DropdownMenuItem(
-        child: Text(currency["adm1_ja"].toString()),
-        value: currency["id"].toString(),
-      );
-
-      dropDownItems.add(newDropdown);
-    }
-    return dropDownItems;
-  }
-
-  List<DropdownMenuItem<String>> getSubDropdownItems() {
-    List<DropdownMenuItem<String>> dropDownItems = [];
-
-    if(widget.indexController.subPerfs.isNotEmpty){
-
-      for (Map<String, dynamic> currency in widget.indexController.subPerfs[0]) {
-        var newDropdown = DropdownMenuItem(
-          child: Text(currency["adm2_ja"].toString()),
-          value: currency["id"].toString(),
-        );
-        dropDownItems.add(newDropdown);
-      }
-    }
-    return dropDownItems;
-  }
-
-  List<DropdownMenuItem<String>> getCustomArea(){
-    List<DropdownMenuItem<String>> dropDownItems = [];
-    if(widget.indexController.areas.isNotEmpty){
-
-      for (Map<String, dynamic> currency in widget.indexController.areas[0]) {
-        var newDropdown = DropdownMenuItem(
-          child: Text(currency["area_nm"].toString()),
-          value: currency["id"].toString(),
-        );
-        dropDownItems.add(newDropdown);
-        
-      }
-      
-    }
-
-    if(widget.indexController.customAreas.isNotEmpty){
-
-      for (Map<String, dynamic> currency in widget.indexController.customAreas[0]) {
-        var newDropdown = DropdownMenuItem(
-          child: Text(currency["event_name"].toString()),
-          value: currency["event_name"].toString(),
-        );
-
-        dropDownItems.add(newDropdown);
-      }
-      
-    }
-
-    return dropDownItems;
-  }
-
-  List<DropdownMenuItem<String>> getCategory(){
-    List<DropdownMenuItem<String>> dropDownItems = [];
-
-    dropDownItems.clear();
-
-    //print("--------cats ------############### ${widget.indexController.cats.toString()} -------------");
-    for(dynamic d in widget.indexController.cats){
-      //print("-------- ddd ------############### ${d} --------dddd-----");
-      var newDropdown = DropdownMenuItem(child: Text(d['category'].toString()), value: d['category'].toString());
-        //print("--------cats ------############### ${d['category'].toString()} -------------");
-        dropDownItems.add(newDropdown);
-    }
-
-    //return [];
-
-    return dropDownItems;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-
-    return Obx(() =>
-      Row(
-        children: [
-          DropdownButton<String>(
-      value: widget.indexController.dropdownValue,
-      icon: const Icon(Icons.arrow_downward),
-      elevation: 16,
-      style: const TextStyle(color: Colors.deepPurple),
-      underline: Container(
-        height: 2,
-        color: Colors.deepPurpleAccent,
-      ),
-      onChanged: (String? newValue) {
-        //setState(() {
-          if(newValue != null){
-            widget.indexController.is_loading.value = true;
-            widget.indexController.dropdownValue = newValue;
-            widget.indexController.populateForPerf(newValue, widget.mapController);
-          }
-        //});
-      },
-        items: getDropdownItems()
-      ),
-      
-      // Gifu areas
-      widget.indexController.areas.isNotEmpty ? 
-      DropdownButton<String>(
-        value: widget.indexController.areaDropdownValue,
-        icon: const Icon(Icons.arrow_downward),
-        elevation: 16,
-        style: const TextStyle(color: Colors.deepPurple),
-          hint: const Text("select"),
-          underline: Container(
-            height: 2,
-            color: Colors.deepPurpleAccent,
-            ),
-        onChanged: (String? newValue) {
-        if (isNumeric(newValue!)){
-         widget.indexController.is_custom_area_selected.value = false;
-        }
-        else{
-          widget.indexController.loadCustomLocation(newValue);
-          widget.indexController.is_custom_area_selected.value = true;
-          widget.indexController.subPerfs.clear();
-          widget.indexController.cats.clear();
-        }
-        setState(() {
-            widget.indexController.locations.clear();
-            if(newValue != null){
-              widget.indexController.is_loading.value = true;
-              widget.indexController.areaDropdownValue = newValue;
-              widget.indexController.populateSubPerForArea(newValue, widget.mapController);
-            }
-          });
-        },
-        items: getCustomArea(),
-      ): const Text(""),
-      
-      widget.indexController.subPerfs.isNotEmpty ?
-      DropdownButton<String>(
-      value: widget.indexController.subDropdownValue,
-      icon: const Icon(Icons.arrow_downward),
-      elevation: 16,
-      style: const TextStyle(color: Colors.deepPurple),
-      hint: const Text("select"),
-      underline: Container(
-        height: 2,
-        color: Colors.deepPurpleAccent,
-      ),
-      onChanged: (String? newValue) {
-        setState(() {
-          if(newValue != null){
-            //widget.indexController.is_loading.value = true;
-            //widget.indexController.populateForSubPerf(newValue, widget.mapController);
-            //widget.indexController.loadLocationforSubPerf(newValue, widget.mapController);
-            widget.indexController.subDropdownValue = newValue;
-            widget.indexController.loadCatForCity(newValue);
-          }
-        });
-      },
-      items:
-        getSubDropdownItems()
-      ) :
-      const Text(""),
-       //CatWidget(indexController: widget.indexController,),
-      widget.indexController.cats.length > 0 ?
-      DropdownButton<String>(
-        value: widget.indexController.getCatText(),
-        icon: const Icon(Icons.arrow_downward),
-        elevation: 16,
-        style: const TextStyle(color: Colors.deepPurple),
-        hint: const Text("select"),
-        underline: Container(
-          height: 2,
-          color: Colors.deepPurpleAccent,
-        ),
-        onChanged: (String? newValue) {
-          setState(() {
-            if(newValue != null){
-              widget.indexController.is_loading.value = true;
-              widget.indexController.cateogory = newValue;
-              widget.indexController.currentCat.clear();
-              widget.indexController.currentCat.add(newValue);
-              widget.indexController.populateForSubPerf(widget.indexController.subDropdownValue, widget.mapController);
-              //widget.indexController.loadLocationforSubPerf(newValue, widget.mapController);
-              //widget.indexController.subDropdownValue = newValue;
-            }
-          });
-        },
-        items:
-          getCategory(),
-      )
-      :
-      Container(),
-
-        ],
-      ),
-    );
-  }
-}

linux/.gitignore

@@ -0,0 +1 @@
+flutter/ephemeral

linux/CMakeLists.txt

@@ -0,0 +1,139 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.10)
+project(runner LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "rog_app")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
+set(APPLICATION_ID "com.dvox.rog_app")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(SET CMP0063 NEW)
+
+# Load bundled libraries from the lib/ directory relative to the binary.
+set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
+
+# Root filesystem for cross-building.
+if(FLUTTER_TARGET_PLATFORM_SYSROOT)
+  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+# Define build configuration options.
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE
+    STRING "Flutter build mode" FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+    "Debug" "Profile" "Release")
+endif()
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_14)
+  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
+  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+
+add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
+
+# Define the application target. To change its name, change BINARY_NAME above,
+# not the value here, or `flutter run` will no longer work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME}
+  "main.cc"
+  "my_application.cc"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add dependency libraries. Add any application-specific dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
+
+# Only the install-generated bundle's copy of the executable will launch
+# correctly, since the resources must in the right relative locations. To avoid
+# people trying to run the unbundled copy, put it in a subdirectory instead of
+# the default top-level location.
+set_target_properties(${BINARY_NAME}
+  PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+)
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# By default, "installing" just makes a relocatable bundle in the build
+# directory.
+set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+# Start with a clean build bundle directory every time.
+install(CODE "
+  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
+  " COMPONENT Runtime)
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endforeach(bundled_library)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()

linux/flutter/CMakeLists.txt

@@ -0,0 +1,88 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.10)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+
+# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
+# which isn't available in 3.10.
+function(list_prepend LIST_NAME PREFIX)
+    set(NEW_LIST "")
+    foreach(element ${${LIST_NAME}})
+        list(APPEND NEW_LIST "${PREFIX}${element}")
+    endforeach(element)
+    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
+endfunction()
+
+# === Flutter Library ===
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "fl_basic_message_channel.h"
+  "fl_binary_codec.h"
+  "fl_binary_messenger.h"
+  "fl_dart_project.h"
+  "fl_engine.h"
+  "fl_json_message_codec.h"
+  "fl_json_method_codec.h"
+  "fl_message_codec.h"
+  "fl_method_call.h"
+  "fl_method_channel.h"
+  "fl_method_codec.h"
+  "fl_method_response.h"
+  "fl_plugin_registrar.h"
+  "fl_plugin_registry.h"
+  "fl_standard_message_codec.h"
+  "fl_standard_method_codec.h"
+  "fl_string_codec.h"
+  "fl_value.h"
+  "fl_view.h"
+  "flutter_linux.h"
+)
+list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
+target_link_libraries(flutter INTERFACE
+  PkgConfig::GTK
+  PkgConfig::GLIB
+  PkgConfig::GIO
+)
+add_dependencies(flutter flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
+      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+)

linux/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,23 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <file_selector_linux/file_selector_plugin.h>
+#include <isar_flutter_libs/isar_flutter_libs_plugin.h>
+#include <url_launcher_linux/url_launcher_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
+  g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin");
+  isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+}

linux/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

linux/flutter/generated_plugins.cmake

@@ -0,0 +1,26 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_linux
+  isar_flutter_libs
+  url_launcher_linux
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

linux/main.cc

@@ -0,0 +1,6 @@
+#include "my_application.h"
+
+int main(int argc, char** argv) {
+  g_autoptr(MyApplication) app = my_application_new();
+  return g_application_run(G_APPLICATION(app), argc, argv);
+}

linux/my_application.cc

@@ -0,0 +1,104 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.h"
+
+struct _MyApplication {
+  GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
+};
+
+G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
+
+// Implements GApplication::activate.
+static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
+  GtkWindow* window =
+      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "rog_app");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "rog_app");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_widget_show(GTK_WIDGET(window));
+
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+
+  FlView* view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(view));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+
+  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+
+  gtk_widget_grab_focus(GTK_WIDGET(view));
+}
+
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
+static void my_application_class_init(MyApplicationClass* klass) {
+  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
+}
+
+static void my_application_init(MyApplication* self) {}
+
+MyApplication* my_application_new() {
+  return MY_APPLICATION(g_object_new(my_application_get_type(),
+                                     "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     nullptr));
+}

linux/my_application.h

@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+                     GtkApplication)
+
+/**
+ * my_application_new:
+ *
+ * Creates a new Flutter-based application.
+ *
+ * Returns: a new #MyApplication.
+ */
+MyApplication* my_application_new();
+
+#endif  // FLUTTER_MY_APPLICATION_H_

macos/.gitignore

@@ -0,0 +1,7 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/dgph
+**/xcuserdata/