re factor rog

android/app/build.gradle

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

android/app/src/main/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,31 +1,31 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+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`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 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:
-    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  image_gallery_saver:
+    :path: ".symlinks/plugins/image_gallery_saver/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
-  move_to_background:
-    :path: ".symlinks/plugins/move_to_background/ios"
-  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+  isar_flutter_libs:
+    :path: ".symlinks/plugins/isar_flutter_libs/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  share_plus:
-    :path: ".symlinks/plugins/share_plus/ios"
+  pointer_interceptor_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
-  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
-  google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9
-  GoogleMaps: 008e2c80e38605b56b560e8deb73d4194ff30bef
-  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
+  isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: 50a33e1d72bd59ee092a519a35d107502757ebed
+  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
 
-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>"; };
-		F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		D464128FC0D5DAEBC1011C26 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		D7C4F924DD034151EFC15038 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,7 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EAFC0FFB27C8DC9071E67D5D /* Pods_Runner.framework in Frameworks */,
+				084EA8A81CF8B34528999293 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -64,9 +64,9 @@
 		6C3C11D7BE49E5BED7989712 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				BEC4F75C6B655CA90D5B5E18 /* Pods-Runner.debug.xcconfig */,
-				13E5CD9612AF4CC8B90A74C3 /* Pods-Runner.release.xcconfig */,
-				F1D3FD8F51C2EAF6C3A7EE25 /* Pods-Runner.profile.xcconfig */,
+				4310B59AA1289CC3AE4DBA82 /* Pods-Runner.debug.xcconfig */,
+				37AC108B2188F1C5AA1C2C9E /* Pods-Runner.release.xcconfig */,
+				D464128FC0D5DAEBC1011C26 /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -89,7 +89,7 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				6C3C11D7BE49E5BED7989712 /* Pods */,
-				E6F2437A5B5AAF08D2998197 /* Frameworks */,
+				D3D7A1CBA3FB0154A6C84903 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -116,10 +116,10 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		E6F2437A5B5AAF08D2998197 /* Frameworks */ = {
+		D3D7A1CBA3FB0154A6C84903 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				853FC5087A11FEE54BE443C8 /* Pods_Runner.framework */,
+				D7C4F924DD034151EFC15038 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -131,15 +131,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */,
+				9ACF47601C5E8A391157E87A /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */,
-				FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */,
+				CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -214,7 +213,22 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		6B25D2836FC6A82461E36025 /* [CP] Check Pods Manifest.lock */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
+		9ACF47601C5E8A391157E87A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -236,22 +250,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-		ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */ = {
+		CD1CB185AC38B6B245F9A672 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -268,23 +267,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -360,8 +342,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -375,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 = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/AppDelegate.swift

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

ios/Runner/Info.plist

@@ -27,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>
-	<key>NSMicrophoneUsageDescription</key>
-	<string> 収録音声の保存が必要です。</string>
+	<string>「岐阜ナビはチェックポイントで撮影した写真を写真ライブラリに保存し、あなたの旅行の記録を保持し、友人と共有することができます。」</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

ios/RunnerTests/RunnerTests.swift

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

lib/common/state/game/game_binding.dart

@@ -1,12 +0,0 @@
-import 'package:get/get.dart';
-import 'package:rogapp/common/state/game/game_controller.dart';
-import 'package:rogapp/screens/auth/controller/auth_controller.dart';
-
-class GameBinding extends Bindings{
-  @override
-  void dependencies() {
-    Get.lazyPut<AuthController>(() => AuthController());
-    Get.put<GameController>(GameController());
-  }
-
-}

lib/common/state/game/game_controller.dart

@@ -1,25 +0,0 @@
-import 'package:get/get.dart';
-import 'package:rogapp/model/user.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/screens/auth/controller/auth_controller.dart';
-
-class GameController extends GetxController{
-
-  AuthController authController = Get.find<AuthController>();
-
-  @override
-  void onInit() {
-    ever(authController.authList, changeInAuth);
-    super.onInit();
-  }
-
-  void changeInAuth(List<AuthResponse> change){
-    if(change.isNotEmpty){
-      Get.toNamed(AppPages.S_HOME);
-    }
-    else{
-      Get.toNamed(AppPages.S_LOGIN);
-    }
-  }
-
-}

lib/common/ui/widgets/uis.dart

@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:rogapp/theme/theme.dart';
-
-class UIs{
-  static AppBar appBar(){
-    return AppBar(
-      title: const Icon(
-        Icons.access_alarm, 
-        size:30,
-        color: Pallete.WHITE_COLOR,
-        ),
-        automaticallyImplyLeading:false,
-        centerTitle: true,
-    );
-  }
-}

lib/features/auth/login/login_page.dart

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

lib/features/data/checkpoint.dart

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

lib/features/data/checkpoint_visitis.dart

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

lib/features/data/data_provider.dart

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

lib/features/data/game_event.dart

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

lib/features/data/user.dart

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

lib/features/data/user_location.dart

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

lib/features/home/home_page.dart

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

lib/features/initializer/app_initializer.dart

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

lib/features/initializer/camera_check.dart

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

lib/features/initializer/icheck.dart

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

lib/features/initializer/location_check.dart

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

lib/features/initializer/network_check.dart

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

lib/features/landing/denied_screen.dart

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

lib/features/landing/landing_page.dart

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

lib/features/location/location_provider.dart

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

lib/features/services/auth_repo.dart

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

lib/features/services/auth_service.dart

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

lib/features/services/checkpoint_repo.dart

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

lib/features/services/checkpoint_service.dart

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

lib/features/state/game_state.dart

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

lib/features/state/game_view_model.dart

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

lib/features/state/user_state.dart

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

lib/features/utils/const.dart

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

lib/features/utils/distance_calculator.dart

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

lib/features/utils/error_reporter.dart

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

lib/features/utils/params.dart

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

lib/main.dart

@@ -1,111 +1,47 @@
-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:permission_handler/permission_handler.dart';
-import 'package:rogapp/common/state/game/game_binding.dart';
-import 'package:rogapp/pages/index/index_binding.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/theme/theme.dart';
-import 'package:rogapp/utils/string_values.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:path/path.dart' as p;
-
-void main() async {
-  
-  WidgetsFlutterBinding.ensureInitialized();
-  
-  FlutterMapTileCaching.initialise(await RootDirectory.normalCache);
-  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(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-   const MyApp({Key? key}) : super(key: key);
-  // This widget is the root of your application.
-  @override
-  Widget build(BuildContext context) {
-    return GetMaterialApp(
-      translations: StringValues(),
-      locale: const Locale('ja', 'JP'),
-      //locale: const Locale('en', 'US'),
-      fallbackLocale: const Locale('en', 'US'),
-      title: 'ROGAINING',
-      theme: AppTheme.theme,
-      debugShowCheckedModeBanner: false,
-      defaultTransition: Transition.cupertino,
-      opaqueRoute: Get.isOpaqueRouteDefault,
-      popGesture: Get.isPopGestureEnable,
-      transitionDuration: const Duration(milliseconds: 230),
-      initialBinding: GameBinding(),
-      initialRoute: AppPages.S_LOGIN,
-      getPages: AppPages.routes,
-      enableLog: true,
-    );
-  }
-}
-
-
-
-// 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",
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:rogapp/features/landing/landing_page.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rogapp/features/utils/error_reporter.dart';
+
+void reportError(
+    ProviderContainer container, Object error, StackTrace stackTrace) {
+  // Log the error locally or report to a server
+  print('Caught an error: $error');
+  container.read(errorReportingProvider).reportError(error, stackTrace);
+}
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  final container = ProviderContainer();
+  runZonedGuarded(() {
+    runApp(UncontrolledProviderScope(container: container, child: const App()));
+    FlutterError.onError = (FlutterErrorDetails details) {
+      final error = details.exception;
+      final stackTrace = details.stack ?? StackTrace.current;
+      reportError(container, error, stackTrace);
+    };
+  }, (error, stackTrace) {
+    reportError(container, error, stackTrace ?? StackTrace.current);
+  });
+}
+
+class App extends StatelessWidget {
+  const App({super.key});
+
+  // This widget is the root of your application.
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Flutter Demo',
+      theme: ThemeData(
+        colorScheme: ColorScheme.fromSeed(
+            seedColor: const Color.fromARGB(255, 0, 35, 140)), //Samurai Blue
+        useMaterial3: true,
+      ),
+      home: const LandingPage(),
+    );
+  }
+}

lib/main_mapsix.dart

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

lib/main_nrog.dart

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

lib/model/auth_user.dart

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

lib/model/destination.dart

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

lib/model/game_state_instance.dart

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

lib/model/gps_data.dart

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

lib/model/location_response.dart

@@ -1,591 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-import 'package:unicode/unicode.dart';
-
-class LocationResponse {
-  List<Feature>? features;
-  String? type;
-
-  LocationResponse({
-    this.features,
-    this.type,
-  });
-
-  LocationResponse copyWith({
-    List<Feature>? features,
-    String? type,
-  }) {
-    return LocationResponse(
-      features: features ?? this.features,
-      type: type ?? this.type,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return {
-      'features': features?.map((x) => x.toMap()).toList(),
-      'type': type,
-    };
-  }
-
-  factory LocationResponse.fromMap(Map<String, dynamic> map) {
-    return LocationResponse(
-      features: List<Feature>.from(map['features']?.map((x) => Feature.fromMap(x)) ?? const []),
-      type: map['type'],
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory LocationResponse.fromJson(String source) =>
-      LocationResponse.fromMap(json.decode(source));
-
-  @override
-  String toString() => 'LocationResponse(features: $features, type: $type)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is LocationResponse &&
-        listEquals(other.features, features) &&
-        other.type == type;
-  }
-
-  @override
-  int get hashCode => features.hashCode ^ type.hashCode;
-}
-
-class Feature {
-  Geometry? geometry;
-  int? id;
-  Properties? properties;
-  String? type;
-  int? location_id;
-  double? latitude;
-  double? longitude;
-
-  Feature({
-    this.geometry,
-    this.id,
-    this.properties,
-    this.type,
-    this.location_id,
-    this.latitude,
-    this.longitude
-  });
-
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'id': id,
-      'geometry': geometry?.toJson(),
-      'properties': properties?.toJson(),
-      'type': type,
-      // Use the first coordinate as latitude and longitude. 
-      // You may need to adjust this based on your actual data structure.
-      'location_id': properties?.location_id,
-      'latitude': geometry?.coordinates?.first?.last,
-      'longitude': geometry?.coordinates?.first?.first,
-    };
-  }
-
-  // factory Feature.fromMap(Map<String, dynamic> map) {
-  //   return Feature(
-  //     geometry: Geometry.fromMap(map['geometry']),
-  //     id: map['id'],
-  //     properties: Properties.fromMap(map['properties']),
-  //     type: map['type'],
-  //   );
-  // }
-
-  factory Feature.fromMap(Map<String, dynamic> map) {
-    Geometry? geometry = map['geometry'] != null 
-                ? Geometry.fromMap(map['geometry'])
-                : null;
-    double? latitude = geometry?.coordinates?.isNotEmpty ?? false ? geometry!.coordinates![0][0] : null;
-    double? longitude = geometry?.coordinates?.isNotEmpty ?? false ? geometry!.coordinates![0][1] : null;
-    
-    return Feature(
-      id: map['id'] as int?,
-      geometry: Geometry.fromMap(map['geometry']),
-      properties: Properties.fromMap(map['properties']),
-      type: map['type'],
-      location_id: Properties.fromMap(map['properties']).location_id,
-      latitude: latitude,
-      longitude: longitude,
-    );
-  }
-
-
-  String toJson() => json.encode(toMap());
-
-  factory Feature.fromJson(String source) =>
-      Feature.fromMap(json.decode(source));
-
-  @override
-  String toString() {
-    return 'Feature(geometry: $geometry, id: $id, properties: $properties, type: $type)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is Feature &&
-        other.geometry == geometry &&
-        other.id == id &&
-        other.properties == properties &&
-        other.type == type;
-  }
-
-  @override
-  int get hashCode {
-    return geometry.hashCode ^ id.hashCode ^ properties.hashCode ^ type.hashCode;
-  }
-}
-
-class Geometry {
-  List<List<double>>? coordinates;
-  String? type;
-
-  Geometry({
-    this.coordinates,
-    this.type,
-  });
-
-  Geometry copyWith({
-    List<List<double>>? coordinates,
-    String? type,
-  }) {
-    return Geometry(
-       coordinates: coordinates ?? this.coordinates,
-      type: type ?? this.type,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return {
-      'coordinates': coordinates,
-      'type': type,
-    };
-  }
-
-  factory Geometry.fromMap(Map<String, dynamic> map) {
-    return Geometry(
-      coordinates: map['coordinates'] != null
-          ? List<List<double>>.from(
-              map['coordinates'].map((x) => List<double>.from(x.map((x) => x.toDouble()))))
-          : null,
-      type: map['type'],
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory Geometry.fromJson(String source) =>
-      Geometry.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'Geometry(coordinates: $coordinates, type: $type)';
-
-  @override
-  bool operator ==(covariant Geometry other) {
-    if (identical(this, other)) return true;
-
-    return listEquals(other.coordinates, coordinates) && other.type == type;
-  }
-
-  @override
-  int get hashCode => coordinates.hashCode ^ type.hashCode;
-}
-
-class Properties {
-  final int location_id;
-  final String? sub_loc_id;
-  final double? cp;
-  final String? location_name;
-  final String? category;
-  final String? subcategory;
-  final String? zip;
-  final String? address;
-  final String? prefecture;
-  final String? area;
-  final String? city;
-  final double? latitude;
-  final double? longitude;
-  final String? photos;
-  final String? videos;
-  final String? webcontents;
-  final String? status;
-  final String? portal;
-  final String? group;
-  final String? phone;
-  final String? fax;
-  final String? email;
-  final String? facility;
-  final String? remark;
-  final String? tags;
-  final dynamic? event_name;
-  final bool? event_active;
-  final bool? hidden_location;
-  final bool? auto_checkin;
-  final double? checkin_radius;
-  final double? checkin_point;
-  final double? buy_point;
-  final String? evaluation_value;
-  final bool? shop_closed;
-  final bool? shop_shutdown;
-  final String? opening_hours_mon;
-  final String? opening_hours_tue;
-  final String? opening_hours_wed;
-  final String? opening_hours_thu;
-  final String? opening_hours_fri;
-  final String? opening_hours_sat;
-  final String? opening_hours_sun;
-  final String? parammeters;
-  Properties({
-    required this.location_id,
-    this.sub_loc_id,
-    this.cp,
-    this.location_name,
-    this.category,
-    this.subcategory,
-    this.zip,
-    this.address,
-    this.prefecture,
-    this.area,
-    this.city,
-    this.latitude,
-    this.longitude,
-    this.photos,
-    this.videos,
-    this.webcontents,
-    this.status,
-    this.portal,
-    this.group,
-    this.phone,
-    this.fax,
-    this.email,
-    this.facility,
-    this.remark,
-    this.tags,
-    this.event_name,
-    this.event_active,
-    this.hidden_location,
-    this.auto_checkin,
-    this.checkin_radius,
-    this.checkin_point,
-    this.buy_point,
-    this.evaluation_value,
-    this.shop_closed,
-    this.shop_shutdown,
-    this.opening_hours_mon,
-    this.opening_hours_tue,
-    this.opening_hours_wed,
-    this.opening_hours_thu,
-    this.opening_hours_fri,
-    this.opening_hours_sat,
-    this.opening_hours_sun,
-    this.parammeters,
-  });
-
-
-String toJson() => json.encode(toMap());
-
-  Properties copyWith({
-    int? location_id,
-    String? sub_loc_id,
-    double? cp,
-    String? location_name,
-    String? category,
-    String? subcategory,
-    String? zip,
-    String? address,
-    String? prefecture,
-    String? area,
-    String? city,
-    double? latitude,
-    double? longitude,
-    String? photos,
-    String? videos,
-    String? webcontents,
-    String? status,
-    String? portal,
-    String? group,
-    String? phone,
-    String? fax,
-    String? email,
-    String? facility,
-    String? remark,
-    String? tags,
-    dynamic? event_name,
-    bool? event_active,
-    bool? hidden_location,
-    bool? auto_checkin,
-    double? checkin_radius,
-    double? checkin_point,
-    double? buy_point,
-    String? evaluation_value,
-    bool? shop_closed,
-    bool? shop_shutdown,
-    String? opening_hours_mon,
-    String? opening_hours_tue,
-    String? opening_hours_wed,
-    String? opening_hours_thu,
-    String? opening_hours_fri,
-    String? opening_hours_sat,
-    String? opening_hours_sun,
-    String? parammeters,
-  }) {
-    return Properties(
-      location_id: location_id ?? this.location_id,
-      sub_loc_id: sub_loc_id ?? this.sub_loc_id,
-      cp: cp ?? this.cp,
-      location_name: location_name ?? this.location_name,
-      category: category ?? this.category,
-      subcategory: subcategory ?? this.subcategory,
-      zip: zip ?? this.zip,
-      address: address ?? this.address,
-      prefecture: prefecture ?? this.prefecture,
-      area: area ?? this.area,
-      city: city ?? this.city,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
-      photos: photos ?? this.photos,
-      videos: videos ?? this.videos,
-      webcontents: webcontents ?? this.webcontents,
-      status: status ?? this.status,
-      portal: portal ?? this.portal,
-      group: group ?? this.group,
-      phone: phone ?? this.phone,
-      fax: fax ?? this.fax,
-      email: email ?? this.email,
-      facility: facility ?? this.facility,
-      remark: remark ?? this.remark,
-      tags: tags ?? this.tags,
-      event_name: event_name ?? this.event_name,
-      event_active: event_active ?? this.event_active,
-      hidden_location: hidden_location ?? this.hidden_location,
-      auto_checkin: auto_checkin ?? this.auto_checkin,
-      checkin_radius: checkin_radius ?? this.checkin_radius,
-      checkin_point: checkin_point ?? this.checkin_point,
-      buy_point: buy_point ?? this.buy_point,
-      evaluation_value: evaluation_value ?? this.evaluation_value,
-      shop_closed: shop_closed ?? this.shop_closed,
-      shop_shutdown: shop_shutdown ?? this.shop_shutdown,
-      opening_hours_mon: opening_hours_mon ?? this.opening_hours_mon,
-      opening_hours_tue: opening_hours_tue ?? this.opening_hours_tue,
-      opening_hours_wed: opening_hours_wed ?? this.opening_hours_wed,
-      opening_hours_thu: opening_hours_thu ?? this.opening_hours_thu,
-      opening_hours_fri: opening_hours_fri ?? this.opening_hours_fri,
-      opening_hours_sat: opening_hours_sat ?? this.opening_hours_sat,
-      opening_hours_sun: opening_hours_sun ?? this.opening_hours_sun,
-      parammeters: parammeters ?? this.parammeters,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'location_id': location_id,
-      'sub_loc_id': sub_loc_id,
-      'cp': cp,
-      'location_name': location_name,
-      'category': category,
-      'subcategory': subcategory,
-      'zip': zip,
-      'address': address,
-      'prefecture': prefecture,
-      'area': area,
-      'city': city,
-      'latitude': latitude,
-      'longitude': longitude,
-      'photos': photos,
-      'videos': videos,
-      'webcontents': webcontents,
-      'status': status,
-      'portal': portal,
-      'group': group,
-      'phone': phone,
-      'fax': fax,
-      'email': email,
-      'facility': facility,
-      'remark': remark,
-      'tags': tags,
-      'event_name': event_name,
-      'event_active': event_active,
-      'hidden_location': hidden_location,
-      'auto_checkin': auto_checkin,
-      'checkin_radius': checkin_radius,
-      'checkin_point': checkin_point,
-      'buy_point': buy_point,
-      'evaluation_value': evaluation_value,
-      'shop_closed': shop_closed,
-      'shop_shutdown': shop_shutdown,
-      'opening_hours_mon': opening_hours_mon,
-      'opening_hours_tue': opening_hours_tue,
-      'opening_hours_wed': opening_hours_wed,
-      'opening_hours_thu': opening_hours_thu,
-      'opening_hours_fri': opening_hours_fri,
-      'opening_hours_sat': opening_hours_sat,
-      'opening_hours_sun': opening_hours_sun,
-      'parammeters': parammeters,
-    };
-  }
-
-  factory Properties.fromMap(Map<String, dynamic> map) {
-    return Properties(
-      location_id: map['location_id'] as int,
-      sub_loc_id: map['sub_loc_id'] != null ? map['sub_loc_id'] as String : null,
-      cp: map['cp'] != null ? map['cp'] as double : null,
-      location_name: map['location_name'] != null ? map['location_name'] as String : null,
-      category: map['category'] != null ? map['category'] as String : null,
-      subcategory: map['subcategory'] != null ? map['subcategory'] as String : null,
-      zip: map['zip'] != null ? map['zip'] as String : null,
-      address: map['address'] != null ? map['address'] as String : null,
-      prefecture: map['prefecture'] != null ? map['prefecture'] as String : null,
-      area: map['area'] != null ? map['area'] as String : null,
-      city: map['city'] != null ? map['city'] as String : null,
-      latitude: map['latitude'] != null ? map['latitude'] as double : null,
-      longitude: map['longitude'] != null ? map['longitude'] as double : null,
-      photos: map['photos'] != null ? map['photos'] as String : null,
-      videos: map['videos'] != null ? map['videos'] as String : null,
-      webcontents: map['webcontents'] != null ? map['webcontents'] as String : null,
-      status: map['status'] != null ? map['status'] as String : null,
-      portal: map['portal'] != null ? map['portal'] as String : null,
-      group: map['group'] != null ? map['group'] as String : null,
-      phone: map['phone'] != null ? map['phone'] as String : null,
-      fax: map['fax'] != null ? map['fax'] as String : null,
-      email: map['email'] != null ? map['email'] as String : null,
-      facility: map['facility'] != null ? map['facility'] as String : null,
-      remark: map['remark'] != null ? map['remark'] as String : null,
-      tags: map['tags'] != null ? map['tags'] as String : null,
-      event_name: map['event_name'] != null ? map['event_name'] as dynamic : null,
-      event_active: map['event_active'] != null ? map['event_active'] as bool : null,
-      hidden_location: map['hidden_location'] != null ? map['hidden_location'] as bool : null,
-      auto_checkin: map['auto_checkin'] != null ? map['auto_checkin'] as bool : null,
-      checkin_radius: map['checkin_radius'] != null ? map['checkin_radius'] as double : null,
-      checkin_point: map['checkin_point'] != null ? map['checkin_point'] as double : null,
-      buy_point: map['buy_point'] != null ? map['buy_point'] as double : null,
-      evaluation_value: map['evaluation_value'] != null ? map['evaluation_value'] as String : null,
-      shop_closed: map['shop_closed'] != null ? map['shop_closed'] as bool : null,
-      shop_shutdown: map['shop_shutdown'] != null ? map['shop_shutdown'] as bool : null,
-      opening_hours_mon: map['opening_hours_mon'] != null ? map['opening_hours_mon'] as String : null,
-      opening_hours_tue: map['opening_hours_tue'] != null ? map['opening_hours_tue'] as String : null,
-      opening_hours_wed: map['opening_hours_wed'] != null ? map['opening_hours_wed'] as String : null,
-      opening_hours_thu: map['opening_hours_thu'] != null ? map['opening_hours_thu'] as String : null,
-      opening_hours_fri: map['opening_hours_fri'] != null ? map['opening_hours_fri'] as String : null,
-      opening_hours_sat: map['opening_hours_sat'] != null ? map['opening_hours_sat'] as String : null,
-      opening_hours_sun: map['opening_hours_sun'] != null ? map['opening_hours_sun'] as String : null,
-      parammeters: map['parammeters'] != null ? map['parammeters'] as String : null,
-    );
-  }
-
-  factory Properties.fromJson(String source) => Properties.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() {
-    return 'Properties(location_id: $location_id, sub_loc_id: $sub_loc_id, cp: $cp, location_name: $location_name, category: $category, subcategory: $subcategory, zip: $zip, address: $address, prefecture: $prefecture, area: $area, city: $city, latitude: $latitude, longitude: $longitude, photos: $photos, videos: $videos, webcontents: $webcontents, status: $status, portal: $portal, group: $group, phone: $phone, fax: $fax, email: $email, facility: $facility, remark: $remark, tags: $tags, event_name: $event_name, event_active: $event_active, hidden_location: $hidden_location, auto_checkin: $auto_checkin, checkin_radius: $checkin_radius, checkin_point: $checkin_point, buy_point: $buy_point, evaluation_value: $evaluation_value, shop_closed: $shop_closed, shop_shutdown: $shop_shutdown, opening_hours_mon: $opening_hours_mon, opening_hours_tue: $opening_hours_tue, opening_hours_wed: $opening_hours_wed, opening_hours_thu: $opening_hours_thu, opening_hours_fri: $opening_hours_fri, opening_hours_sat: $opening_hours_sat, opening_hours_sun: $opening_hours_sun, parammeters: $parammeters)';
-  }
-
-  @override
-  bool operator ==(covariant Properties other) {
-    if (identical(this, other)) return true;
-  
-    return 
-      other.location_id == location_id &&
-      other.sub_loc_id == sub_loc_id &&
-      other.cp == cp &&
-      other.location_name == location_name &&
-      other.category == category &&
-      other.subcategory == subcategory &&
-      other.zip == zip &&
-      other.address == address &&
-      other.prefecture == prefecture &&
-      other.area == area &&
-      other.city == city &&
-      other.latitude == latitude &&
-      other.longitude == longitude &&
-      other.photos == photos &&
-      other.videos == videos &&
-      other.webcontents == webcontents &&
-      other.status == status &&
-      other.portal == portal &&
-      other.group == group &&
-      other.phone == phone &&
-      other.fax == fax &&
-      other.email == email &&
-      other.facility == facility &&
-      other.remark == remark &&
-      other.tags == tags &&
-      other.event_name == event_name &&
-      other.event_active == event_active &&
-      other.hidden_location == hidden_location &&
-      other.auto_checkin == auto_checkin &&
-      other.checkin_radius == checkin_radius &&
-      other.checkin_point == checkin_point &&
-      other.buy_point == buy_point &&
-      other.evaluation_value == evaluation_value &&
-      other.shop_closed == shop_closed &&
-      other.shop_shutdown == shop_shutdown &&
-      other.opening_hours_mon == opening_hours_mon &&
-      other.opening_hours_tue == opening_hours_tue &&
-      other.opening_hours_wed == opening_hours_wed &&
-      other.opening_hours_thu == opening_hours_thu &&
-      other.opening_hours_fri == opening_hours_fri &&
-      other.opening_hours_sat == opening_hours_sat &&
-      other.opening_hours_sun == opening_hours_sun &&
-      other.parammeters == parammeters;
-  }
-
-  @override
-  int get hashCode {
-    return location_id.hashCode ^
-      sub_loc_id.hashCode ^
-      cp.hashCode ^
-      location_name.hashCode ^
-      category.hashCode ^
-      subcategory.hashCode ^
-      zip.hashCode ^
-      address.hashCode ^
-      prefecture.hashCode ^
-      area.hashCode ^
-      city.hashCode ^
-      latitude.hashCode ^
-      longitude.hashCode ^
-      photos.hashCode ^
-      videos.hashCode ^
-      webcontents.hashCode ^
-      status.hashCode ^
-      portal.hashCode ^
-      group.hashCode ^
-      phone.hashCode ^
-      fax.hashCode ^
-      email.hashCode ^
-      facility.hashCode ^
-      remark.hashCode ^
-      tags.hashCode ^
-      event_name.hashCode ^
-      event_active.hashCode ^
-      hidden_location.hashCode ^
-      auto_checkin.hashCode ^
-      checkin_radius.hashCode ^
-      checkin_point.hashCode ^
-      buy_point.hashCode ^
-      evaluation_value.hashCode ^
-      shop_closed.hashCode ^
-      shop_shutdown.hashCode ^
-      opening_hours_mon.hashCode ^
-      opening_hours_tue.hashCode ^
-      opening_hours_wed.hashCode ^
-      opening_hours_thu.hashCode ^
-      opening_hours_fri.hashCode ^
-      opening_hours_sat.hashCode ^
-      opening_hours_sun.hashCode ^
-      parammeters.hashCode;
-  }
-}  
- 
-

lib/model/map_state_instance.dart

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

lib/model/user.dart

@@ -1,45 +0,0 @@
-class AuthResponse {
-  final User user;
-  final String token;
-
-  AuthResponse({required this.user, required this.token});
-
-  factory AuthResponse.fromJson(Map<String, dynamic> json) {
-    return AuthResponse(
-      user: User.fromJson(json['user']),
-      token: json['token'],
-    );
-  }
-}
-
-class User {
-  final int id;
-  final String email;
-  final bool isRogaining;
-  final String group;
-  final String zekkenNumber;
-  final String eventCode;
-  final String teamName;
-
-  User({
-    required this.id,
-    required this.email,
-    required this.isRogaining,
-    required this.group,
-    required this.zekkenNumber,
-    required this.eventCode,
-    required this.teamName,
-  });
-
-  factory User.fromJson(Map<String, dynamic> json) {
-    return User(
-      id: json['id'],
-      email: json['email'],
-      isRogaining: json['is_rogaining'],
-      group: json['group'],
-      zekkenNumber: json['zekken_number'],
-      eventCode: json['event_code'],
-      teamName: json['team_name'],
-    );
-  }
-}

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

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

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);
@@ -14,150 +13,170 @@ class ChangePasswordPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomInset: false,
+        resizeToAvoidBottomInset: false,
         backgroundColor: Colors.white,
         appBar: AppBar(
           elevation: 0,
-
           backgroundColor: Colors.white,
-          leading:
-          IconButton( onPressed: (){
-            Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+          leading: IconButton(
+              onPressed: () {
+                Navigator.pop(context);
+              },
+              icon: const Icon(
+                Icons.arrow_back_ios,
+                size: 20,
+                color: Colors.black,
+              )),
         ),
-      body: 
-      Container(
-        width: double.infinity,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Column(
-              children: [
-                Column(
-                  children: [
-                    Container(
-                      child: Text("change_password".tr, style: TextStyle(fontSize: 24.0),),
-                    ),
-                    SizedBox(height: 30,),
-                  ],
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: 40
-                  ),
-                  child: Column(
+        body: SizedBox(
+          width: double.infinity,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Column(
+                children: [
+                  Column(
                     children: [
-                      makeInput(label: "old_password".tr, controller: oldPasswordController),
-                      makeInput(label: "new_password".tr, controller: newPasswordController, obsureText: true),
+                      Text(
+                        "change_password".tr,
+                        style: const TextStyle(fontSize: 24.0),
+                      ),
+                      const SizedBox(
+                        height: 30,
+                      ),
                     ],
                   ),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 40),
-                  child: Container(
-                    padding: EdgeInsets.only(top: 3,left: 3),
-                    decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(40),
-                    ),
-                    child: Obx((() => 
-                      indexController.is_loading == true ? MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        
-                      },
-                      color: Colors.grey[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: CircularProgressIndicator(),
-                    ) :
-                      Column(
-                        children: [
-                        MaterialButton(
-                      minWidth: double.infinity,
-                      height:60,
-                      onPressed: (){
-                        if(oldPasswordController.text.isEmpty || newPasswordController.text.isEmpty){
-                          Get.snackbar(
-                            "no_values".tr,
-                            "values_required".tr,
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
-                            snackPosition: SnackPosition.TOP,
-                            duration: Duration(milliseconds: 800),
-                            backgroundColor: Colors.yellow,
-                            //icon:Image(image:AssetImage("assets/images/dora.png"))
-                          );
-                          return;
-                        }
-                        indexController.is_loading.value = true;
-                        indexController.changePassword(oldPasswordController.text, newPasswordController.text, context);
-                        //indexController.login(oldPasswordController.text, newPasswordController.text, context);
-                      },
-                      color: Colors.indigoAccent[400],
-                      shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(40)
-                      ),
-                      child: Text("ログイン",style: TextStyle(
-                        fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
-                      ),
-                      ),
-                    ),
-                    SizedBox(height: 10.0,),
-                    
-                        ],
-                      ) 
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 40),
+                    child: Column(
+                      children: [
+                        makeInput(
+                            label: "old_password".tr,
+                            controller: oldPasswordController),
+                        makeInput(
+                            label: "new_password".tr,
+                            controller: newPasswordController,
+                            obsureText: true),
+                      ],
                     ),
                   ),
-                )
-                ),
-                SizedBox(height: 20,),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                   
-                  ],
-                )
-              ],
-
-            ),
-          ],
-        ),
-      )
-    );
+                  Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
+                      child: Container(
+                        padding: const EdgeInsets.only(top: 3, left: 3),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(40),
+                        ),
+                        child: Obx(
+                          (() => indexController.isLoading.value == true
+                              ? MaterialButton(
+                                  minWidth: double.infinity,
+                                  height: 60,
+                                  onPressed: () {},
+                                  color: Colors.grey[400],
+                                  shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(40)),
+                                  child: const CircularProgressIndicator(),
+                                )
+                              : Column(
+                                  children: [
+                                    MaterialButton(
+                                      minWidth: double.infinity,
+                                      height: 60,
+                                      onPressed: () {
+                                        if (oldPasswordController
+                                                .text.isEmpty ||
+                                            newPasswordController
+                                                .text.isEmpty) {
+                                          Get.snackbar(
+                                            "no_values".tr,
+                                            "values_required".tr,
+                                            icon: const Icon(
+                                                Icons.assistant_photo_outlined,
+                                                size: 40.0,
+                                                color: Colors.blue),
+                                            snackPosition: SnackPosition.TOP,
+                                            duration: const Duration(
+                                                milliseconds: 800),
+                                            backgroundColor: Colors.yellow,
+                                            //icon:Image(image:AssetImage("assets/images/dora.png"))
+                                          );
+                                          return;
+                                        }
+                                        indexController.isLoading.value = true;
+                                        indexController.changePassword(
+                                            oldPasswordController.text,
+                                            newPasswordController.text,
+                                            context);
+                                        //indexController.login(oldPasswordController.text, newPasswordController.text, context);
+                                      },
+                                      color: Colors.indigoAccent[400],
+                                      shape: RoundedRectangleBorder(
+                                          borderRadius:
+                                              BorderRadius.circular(40)),
+                                      child: const Text(
+                                        "ログイン",
+                                        style: TextStyle(
+                                            fontWeight: FontWeight.w600,
+                                            fontSize: 16,
+                                            color: Colors.white70),
+                                      ),
+                                    ),
+                                    const SizedBox(
+                                      height: 10.0,
+                                    ),
+                                  ],
+                                )),
+                        ),
+                      )),
+                  const SizedBox(
+                    height: 20,
+                  ),
+                  const Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [],
+                  )
+                ],
+              ),
+            ],
+          ),
+        ));
   }
 
-  Widget makeInput({label, required TextEditingController controller, obsureText = false}){
-  return Column(
-    crossAxisAlignment: CrossAxisAlignment.start,
-    children: [
-      Text(label,style:TextStyle(
-        fontSize: 15,
-        fontWeight: FontWeight.w400,
-        color: Colors.black87
-      ),),
-      SizedBox(height: 5,),
-      TextField(
-        controller: controller,
-        obscureText: obsureText,
-        decoration: InputDecoration(
-          contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10),
-          enabledBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: (Colors.grey[400])!,
+  Widget makeInput(
+      {label, required TextEditingController controller, obsureText = false}) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: const TextStyle(
+              fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+        ),
+        const SizedBox(
+          height: 5,
+        ),
+        TextField(
+          controller: controller,
+          obscureText: obsureText,
+          decoration: InputDecoration(
+            contentPadding:
+                const EdgeInsets.symmetric(vertical: 0, horizontal: 10),
+            enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(
+                color: (Colors.grey[400])!,
+              ),
+            ),
+            border: OutlineInputBorder(
+              borderSide: BorderSide(color: (Colors.grey[400])!),
             ),
           ),
-          border: OutlineInputBorder(
-            borderSide: BorderSide(color: (Colors.grey[400])!
-          ),
         ),
-      ),
-      ),
-      SizedBox(height: 30.0,)
-    ],
-  );
+        const SizedBox(
+          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 'dart:io';
+// import 'package:flutter/material.dart';
+// import 'package:geolocator/geolocator.dart';
+// import 'package:get/get.dart';
+// import 'package:latlong2/latlong.dart';
+// import 'package:rogapp/pages/destination/destination_controller.dart';
+// import 'package:rogapp/pages/destination_map/destination_map_page.dart';
+// import 'package:rogapp/pages/drawer/drawer_page.dart';
+// import 'package:rogapp/pages/index/index_controller.dart';
+// import 'package:rogapp/routes/app_pages.dart';
+// import 'package:rogapp/widgets/destination_widget.dart';
 
-import 'package:camera_camera/camera_camera.dart';
-import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rogapp/pages/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 XDestnationPage extends StatelessWidget {
+//   XDestnationPage({Key? key}) : super(key: key);
 
-class DestnationPage extends StatelessWidget {
-  DestnationPage({Key? key}) : super(key: key);
+//   final DestinationController destinationController =
+//       Get.find<DestinationController>();
 
-  final DestinationController destinationController = Get.find<DestinationController>();
+//   final IndexController indexController = Get.find<IndexController>();
 
-  final IndexController indexController = Get.find<IndexController>();
+//   final List<int> _items = List<int>.generate(50, (int index) => index);
 
-  final List<int> _items = List<int>.generate(50, (int index) => index);
+//   Future<void> showCurrentPosition() async {
+//     LocationPermission permission = await Geolocator.checkPermission();
+//     if (permission != LocationPermission.whileInUse ||
+//         permission != LocationPermission.always) {
+//       permission = await Geolocator.requestPermission();
+//     }
+//     Position position = await Geolocator.getCurrentPosition(
+//         desiredAccuracy: LocationAccuracy.high,
+//         forceAndroidLocationManager: true);
+//     indexController.rogMapController
+//         .move(LatLng(position.latitude, position.longitude), 14);
+//   }
 
-  Future<void> showCurrentPosition() async {
-    LocationPermission permission = await Geolocator.checkPermission();
-    if (permission != LocationPermission.whileInUse ||
-        permission != LocationPermission.always) {
-      permission = await Geolocator.requestPermission();
-    }
-    Position position = await Geolocator.getCurrentPosition(
-        desiredAccuracy: LocationAccuracy.high);
-    indexController.rogMapController?.move(LatLng(position.latitude, position.longitude), 14);
-  }
+//   Image getImage(int index) {
+//     if (destinationController.destinations[index].photos == null ||
+//         destinationController.destinations[index].photos == "") {
+//       return const Image(image: AssetImage('assets/images/empty_image.png'));
+//     } else {
+//       return Image(
+//           image:
+//               NetworkImage(destinationController.destinations[index].photos!));
+//     }
+//   }
 
-  Image getImage(int index){
-    if(destinationController.destinations[index].photos == null || destinationController.destinations[index].photos == ""){
-      return Image(image: AssetImage('assets/images/empty_image.png'));
-    }
-    else{
-      return Image(image: NetworkImage(destinationController.destinations[index].photos!));
-    }
-  }
+//   Widget getRoutingImage(int route) {
+//     switch (route) {
+//       case 0:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_9_man.png'),
+//           width: 35.0,
+//         );
+//       case 1:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_8_car.png'),
+//           width: 35.0,
+//         );
+//       case 2:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_10_train.png'),
+//           width: 35.0,
+//         );
+//       default:
+//         return const Image(
+//           image: AssetImage('assets/images/p4_9_man.png'),
+//           width: 35.0,
+//         );
+//     }
+//   }
 
-  Widget getRoutingImage(int route){
-    switch (route) {
-      case 0:
-        return Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
-      case 1:
-        return Image(image: AssetImage('assets/images/p4_8_car.png'), width: 35.0,);
-      case 2:
-        return Image(image: AssetImage('assets/images/p4_10_train.png'), width: 35.0,);
-      default:
-        return Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
-    }
-  }
-
-@override
-  Widget build(BuildContext context) {
-    final ColorScheme colorScheme = Theme.of(context).colorScheme;
-    final Color oddItemColor = colorScheme.primary.withOpacity(0.05);
-    final Color evenItemColor = colorScheme.primary.withOpacity(0.15);
-    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;
-                              //     destinationController.PopulateDestinations();
-                              //     Get.back();
-                              //   },
-                              //   ),
-                            ],
-                            
-                          ),
-                        ),
-                        isScrollControlled:false,
-                        backgroundColor: Colors.white,
-                      ); 
-                      //destinationController.PopulateDestinations();
-                    }
-                  ),
-              )
-              ,
-                IconButton(
-                  icon: const Icon(Icons.travel_explore, size: 35,), 
-                    onPressed: (){
-                      indexController.switchPage(AppPages.INITIAL);
-                    }
-                ),
-            ],
-          ),
-        ),
-        floatingActionButton: FloatingActionButton(
-            onPressed: (){
-              //print("######");
-              indexController.toggleDestinationMode();
-            },
-            tooltip: 'Increment',
-            child: Obx(() => 
-              indexController.desination_mode == 1 ?
-              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(() => 
-             ToggleButtons(
-                  disabledColor: Colors.grey.shade200,
-                  selectedColor: Colors.red,
-                children: <Widget>[
-                  Icon(Icons.explore, size: 35.0,
-                )],
-                onPressed: (int index) {
-                  destinationController.is_gps_selected.value = !destinationController.is_gps_selected.value;
-                  if(destinationController.is_gps_selected.value){
-                    destinationController.chekcs = 0;
-                    destinationController.skip_gps = false;
-                    //destinationController.resetRogaining();
-                  }
-                },
-                isSelected: [destinationController.is_gps_selected.value],
-              ),
-            ),
-            // IconButton(onPressed: (){
-            //   showCurrentPosition();
-            // },
-            // icon: Icon(Icons.location_on_outlined))
-          ],
-        ),
-        body: Obx(() => 
-          indexController.desination_mode.value == 0 ?
-                  DestinationWidget():
-                  DestinationMapPage()
-        )
-      ),
-    );
-    
-  }
-}
+//   @override
+//   Widget build(BuildContext context) {
+//     return WillPopScope(
+//       onWillPop: () async {
+//         indexController.switchPage(AppPages.INITIAL);
+//         return false;
+//       },
+//       child: Scaffold(
+//           drawer: DrawerPage(),
+//           bottomNavigationBar: BottomAppBar(
+//             child: Row(
+//               mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//               children: <Widget>[
+//                 Padding(
+//                   padding: const EdgeInsets.only(left: 13.0),
+//                   child: InkWell(
+//                       child: Obx((() => getRoutingImage(
+//                           destinationController.travelMode.value))),
+//                       onTap: () {
+//                         Get.bottomSheet(
+//                           Obx(
+//                             () => ListView(
+//                               children: [
+//                                 Padding(
+//                                   padding: const EdgeInsets.only(
+//                                       top: 30.0, bottom: 30),
+//                                   child: Center(
+//                                     child: Text(
+//                                       "select_travel_mode".tr,
+//                                       style: const TextStyle(
+//                                           fontSize: 22.0,
+//                                           color: Colors.red,
+//                                           fontWeight: FontWeight.bold),
+//                                     ),
+//                                   ),
+//                                 ),
+//                                 ListTile(
+//                                   selected:
+//                                       destinationController.travelMode.value ==
+//                                               0
+//                                           ? true
+//                                           : false,
+//                                   selectedTileColor: Colors.amber.shade200,
+//                                   leading: const Image(
+//                                     image: AssetImage(
+//                                         'assets/images/p4_9_man.png'),
+//                                   ),
+//                                   title: Text("walking".tr),
+//                                   onTap: () {
+//                                     destinationController.travelMode.value = 0;
+//                                     destinationController
+//                                         .populateDestinations();
+//                                     Get.back();
+//                                   },
+//                                 ),
+//                                 ListTile(
+//                                   selected:
+//                                       destinationController.travelMode.value ==
+//                                               1
+//                                           ? true
+//                                           : false,
+//                                   selectedTileColor: Colors.amber.shade200,
+//                                   leading: const Image(
+//                                     image: AssetImage(
+//                                         'assets/images/p4_8_car.png'),
+//                                   ),
+//                                   title: Text("driving".tr),
+//                                   onTap: () {
+//                                     destinationController.travelMode.value = 1;
+//                                     destinationController
+//                                         .populateDestinations();
+//                                     Get.back();
+//                                   },
+//                                 ),
+//                                 // ListTile(
+//                                 //   selected: destinationController.travelMode == 2 ? true : false,
+//                                 //   selectedTileColor: Colors.amber.shade200,
+//                                 //   leading: Image(image: AssetImage('assets/images/p4_10_train.png'),),
+//                                 //   title: Text("transit".tr),
+//                                 //   onTap:(){
+//                                 //     destinationController.travelMode.value = 2;
+//                                 //     destinationController.PopulateDestinations();
+//                                 //     Get.back();
+//                                 //   },
+//                                 //   ),
+//                               ],
+//                             ),
+//                           ),
+//                           isScrollControlled: false,
+//                           backgroundColor: Colors.white,
+//                         );
+//                         //destinationController.PopulateDestinations();
+//                       }),
+//                 ),
+//                 IconButton(
+//                     icon: const Icon(
+//                       Icons.travel_explore,
+//                       size: 35,
+//                     ),
+//                     onPressed: () {
+//                       indexController.switchPage(AppPages.INITIAL);
+//                     }),
+//               ],
+//             ),
+//           ),
+//           floatingActionButton: FloatingActionButton(
+//             onPressed: () {
+//               //print("######");
+//               indexController.toggleDestinationMode();
+//             },
+//             tooltip: 'Increment',
+//             elevation: 4.0,
+//             child: Obx(() => indexController.desinationMode.value == 1
+//                 ? const Image(image: AssetImage('assets/images/list2.png'))
+//                 : const Image(image: AssetImage('assets/images/map.png'))),
+//           ),
+//           floatingActionButtonLocation:
+//               FloatingActionButtonLocation.centerDocked,
+//           appBar: AppBar(
+//             automaticallyImplyLeading: true,
+//             title: Text("app_title".tr),
+//             actions: [
+//               InkWell(
+//                 onTap: () {
+//                   Get.toNamed(AppPages.CAMERA_PAGE);
+//                 },
+//                 child: destinationController.isInRog.value == true
+//                     ? Image.asset(
+//                         "assets/images/basic-walking.gif",
+//                         height: 10.0,
+//                       )
+//                     : destinationController.isAtGoal.value == true
+//                         ? IconButton(
+//                             onPressed: () {
+//                               Get.toNamed(AppPages.CAMERA_PAGE);
+//                             },
+//                             icon: const Icon(Icons.assistant_photo),
+//                           )
+//                         : IconButton(
+//                             onPressed: () {
+//                               Get.toNamed(AppPages.CAMERA_PAGE);
+//                             },
+//                             icon: const Icon(Icons.accessibility),
+//                           ),
+//               ),
+//               // Obx(() =>
+//               //   Text(indexController.connectionStatusName.value)
+//               // ),
+//               Obx(
+//                 () => ToggleButtons(
+//                   disabledColor: Colors.grey.shade200,
+//                   selectedColor: Colors.red,
+//                   onPressed: (int index) {
+//                     destinationController.isGpsSelected.value =
+//                         !destinationController.isGpsSelected.value;
+//                     if (destinationController.isGpsSelected.value) {
+//                       destinationController.chekcs = 0;
+//                       destinationController.skipGps = false;
+//                       //destinationController.resetRogaining();
+//                     }
+//                   },
+//                   isSelected: [destinationController.isGpsSelected.value],
+//                   children: const <Widget>[
+//                     Icon(
+//                       Icons.explore,
+//                       size: 35.0,
+//                     )
+//                   ],
+//                 ),
+//               ),
+//               // IconButton(onPressed: (){
+//               //   showCurrentPosition();
+//               // },
+//               // icon: Icon(Icons.location_on_outlined))
+//             ],
+//           ),
+//           body: Obx(() => indexController.desinationMode.value == 0
+//               ? DestinationWidget()
+//               : DestinationMapPage())),
+//     );
+//   }
+// }

lib/pages/destination_map/destination_map_page.dart

@@ -1,437 +1,176 @@
-
 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}");
-      List<LatLng> pts = [];
-      for(PointLatLng p in indexController.routePoints){
-        LatLng l = LatLng(p.latitude, p.longitude);
-        pts.add(l);
-      }
-      return pts;
+  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;
+  }
 
-    List<Marker>? getMarkers() {
-      List<Marker> pts = [];
-      int index = -1;
-      for (int i = 0; i < destinationController.destinations.length; i++) {
-        Destination d = destinationController.destinations[i];
-        print("^^^^ ${d} ^^^^");
-        Marker m = Marker(
+  List<Marker>? getMarkers() {
+    List<Marker> pts = [];
+    int index = -1;
+    for (int i = 0; i < destinationController.destinations.length; i++) {
+      Destination d = destinationController.destinations[i];
+      //print("^^^^ $d ^^^^");
+      Marker m = Marker(
           point: LatLng(d.lat!, d.lon!),
-          anchorPos: AnchorPos.align(AnchorAlign.center),
-          builder:(cts){
+          alignment: Alignment.center,
+          child: InkWell(
+            onTap: () {
+              //print("-- Destination is --- ${d.name} ------");
+              if (indexController.currentDestinationFeature.isNotEmpty) {
+                indexController.currentDestinationFeature.clear();
+              }
+              indexController.currentDestinationFeature.add(d);
+              //indexController.getAction();
 
-            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: Get.context!, isScrollControlled: true, 
-                     builder:((context) => BottomSheetNew())
-                    ).whenComplete((){
-                      print("---- set skip gps to false -----");
-                      destinationController.skip_gps = false;
-                    });
-                  }
-              },
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Container(
-                      width:20,
-                      height:20,
-                    decoration:  BoxDecoration(
-                      color: Colors.red,
-                      shape: BoxShape.circle,
-                      border: 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),
-                      ),
+              showModalBottomSheet(
+                  context: Get.context!,
+                  isScrollControlled: true,
+                  constraints:
+                      BoxConstraints.loose(Size(Get.width, Get.height * 0.85)),
+                  builder: ((context) => BottomSheetNew(
+                        destination: d,
+                      ))).whenComplete(() {
+                //print("---- set skip gps to false -----");
+                destinationController.skipGps = false;
+              });
+            },
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 20,
+                  height: 20,
+                  decoration: BoxDecoration(
+                    color: Colors.red,
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: Colors.white,
+                      width: d.checkin_radious != null ? d.checkin_radious! : 1,
                     ),
                   ),
-                  //Container( color: Colors.yellow, child: Text(TextUtils.getDisplayText(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
-                ],
-              ),
-            );
-          
-        });
-        
-        pts.add(m);
-      }
-      return pts;
+                  child: Center(
+                    child: Text(
+                      (i + 1).toString(),
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                  ),
+                ),
+                Container(
+                    color: Colors.yellow,
+                    child: Text(
+                      TextUtils.getDisplayText(d),
+                      style: const TextStyle(
+                          fontSize: 15.0,
+                          fontWeight: FontWeight.bold,
+                          overflow: TextOverflow.visible),
+                    )),
+              ],
+            ),
+          ));
+
+      pts.add(m);
     }
+    return pts;
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Obx((() => 
-      Stack(
-        children: [
-          // indexController.is_rog_mapcontroller_loaded.value == false ? 
-          //   Center(child: CircularProgressIndicator())
-          // :
-          // Padding(
-          //   padding: const EdgeInsets.only(left:8.0),
-          //   child: BreadCrumbWidget(mapController:indexController.rogMapController),
-          // ),
-          Padding(
-            padding: const EdgeInsets.only(top:0.0),
-            //child: TravelMap(),
-            child: 
-              TravelMap(),
-          ),
-        ],
-      )
-    ));
+    return Obx((() => Stack(
+          children: [
+            // indexController.is_rog_mapcontroller_loaded.value == false ?
+            //   Center(child: CircularProgressIndicator())
+            // :
+            // Padding(
+            //   padding: const EdgeInsets.only(left:8.0),
+            //   child: BreadCrumbWidget(mapController:indexController.rogMapController),
+            // ),
+            Padding(
+              padding: const EdgeInsets.only(top: 0.0),
+              //child: TravelMap(),
+              child: travelMap(),
+            ),
+          ],
+        )));
   }
 
-  FlutterMap TravelMap() {
+  FlutterMap travelMap() {
     return FlutterMap(
       mapController: indexController.rogMapController,
-    options: MapOptions(
-      onMapReady: (){
-            indexController.is_rog_mapcontroller_loaded.value = true;
-            subscription = indexController.rogMapController!.mapEventStream.listen((MapEvent mapEvent) {
-            if (mapEvent is MapEventMoveStart) {
-            }
+      options: MapOptions(
+        onMapReady: () {
+          indexController.isRogMapcontrollerLoaded.value = true;
+          subscription = indexController.rogMapController.mapEventStream
+              .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)]),
-      zoom: 1,
-      maxZoom: 42,
-      interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
-    ),
-    children: [
-      BaseLayer(),
-      Obx(() =>
-      indexController.routePointLenght > 0 ?
-        PolylineLayer(
-            polylines: [
-              Polyline(
-                points: getPoints()!,
-                  strokeWidth: 6.0,
-                    color: Colors.indigo
-              ),
-            ],
-        )
-        
-        :
-        Container(),
+        },
+        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,
       ),
-      CurrentLocationLayer(), 
-      MarkerLayer(
-        markers: getMarkers()!
-      ),
-    ],
-    
-  );
+      children: [
+        //const BaseLayer(),
+        Obx(
+          () => indexController.routePointLenght > 0
+              ? PolylineLayer(
+                  polylines: [
+                    Polyline(
+                        points: getPoints()!,
+                        strokeWidth: 6.0,
+                        color: Colors.indigo),
+                  ],
+                )
+              : Container(),
+        ),
+        CurrentLocationLayer(),
+        MarkerLayer(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';
@@ -8,12 +7,12 @@ import 'package:rogapp/services/auth_service.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class DrawerPage extends StatelessWidget {
-  DrawerPage({ Key? key }) : super(key: key);
+  DrawerPage({Key? key}) : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
 
   void _launchURL(url) async {
-    if (!await launch(url)) throw 'Could not launch $url';
+    if (!await launchUrl(url)) throw 'Could not launch $url';
   }
 
   @override
@@ -28,71 +27,125 @@ class DrawerPage extends StatelessWidget {
             Container(
               height: 100,
               color: Colors.amber,
-              child: Obx(() => 
-                Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: 
-                  indexController.currentUser.length == 0 ?
-                    Flexible(child: Text("drawer_title".tr, style: TextStyle(color: Colors.black, fontSize: 20),))
-                    :
-                    Text(indexController.currentUser[0]['user']['email'], style: TextStyle(color: Colors.black, fontSize: 20),),
-                ),
-              )
-              ),
+              child: Obx(() => Center(
+                    child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: indexController.currentUser.isEmpty
+                          ? Flexible(
+                              child: Text(
+                              "drawer_title".tr,
+                              style: const TextStyle(
+                                  color: Colors.black, fontSize: 20),
+                            ))
+                          : Text(
+                              indexController.currentUser[0]['user']['email'],
+                              style: const TextStyle(
+                                  color: Colors.black, fontSize: 20),
+                            ),
+                    ),
+                  )),
             ),
-            Obx(() => 
-              indexController.currentUser.length == 0 ?
-              ListTile(
-                leading: const Icon(Icons.login),
-                title: Text("login".tr),
-                onTap: (){
-                  Get.toNamed(AppPages.LOGIN);
-                },
-              ) : 
-              ListTile(
-                leading: const Icon(Icons.login),
-                title: Text("logout".tr),
-                onTap: (){
-                  indexController.logout();
-                  Get.toNamed(AppPages.TRAVEL);
-                },
-              )
-            ),
-            indexController.currentUser.length > 0 ?
-            ListTile(
-              leading: const Icon(Icons.password),
-              title: Text("change_password".tr),
-              onTap: (){
-                Get.toNamed(AppPages.CHANGE_PASSWORD);
-              },
-            ) : 
-            Container(width: 0, height: 0,),
-            indexController.currentUser.length == 0 ?
-            ListTile(
-              leading: const Icon(Icons.person),
-              title: Text("sign_up".tr),
-              onTap: (){
-                Get.toNamed(AppPages.REGISTER);
-              },
-            ) : 
-            Container(width: 0, height: 0,),
-            indexController.currentUser.length > 0 ?
-            ListTile(
-              leading: const Icon(Icons.delete_forever),
-              title: Text("delete_account".tr),
-              onTap: (){
-                String _token = indexController.currentUser[0]['token'];
-                AuthService.deleteUser(_token).then((value){
-                  if(value.isNotEmpty){
-                    indexController.logout();
-                    Get.toNamed(AppPages.TRAVEL);
-                    Get.snackbar("accounted_deleted".tr, "account_deleted_message".tr);
-                  }
-                });
-              },
-            ) : 
-            Container(width: 0, height: 0,),
+            Obx(() => indexController.currentUser.isEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.login),
+                    title: Text("login".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.LOGIN);
+                    },
+                  )
+                : ListTile(
+                    leading: const Icon(Icons.login),
+                    title: Text("logout".tr),
+                    onTap: () {
+                      indexController.logout();
+                      Get.toNamed(AppPages.LOGIN);
+                    },
+                  )),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.password),
+                    title: Text("change_password".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.CHANGE_PASSWORD);
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.person),
+                    title: Text("sign_up".tr),
+                    onTap: () {
+                      Get.toNamed(AppPages.REGISTER);
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.password),
+                    title: const Text("リセット"),
+                    onTap: () {
+                      Get.defaultDialog(
+                        title: "よろしいですか、リセットしますか?",
+                        middleText: "これにより、すべてのゲーム データが削除され、すべての状態が削除されます",
+                        textConfirm: "確認する",
+                        textCancel: "キャンセルする",
+                        onCancel: () => Get.back(),
+                        onConfirm: () {
+                          DestinationController destinationController =
+                              Get.find<DestinationController>();
+                          destinationController.resetRogaining();
+                          destinationController.deleteDBDestinations();
+                          Get.back();
+                        },
+                      );
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.delete_forever),
+                    title: Text("delete_account".tr),
+                    onTap: () {
+                      String token = indexController.currentUser[0]['token'];
+                      AuthService.deleteUser(token).then((value) {
+                        if (value.isNotEmpty) {
+                          indexController.logout();
+                          Get.toNamed(AppPages.TRAVEL);
+                          Get.snackbar("accounted_deleted".tr,
+                              "account_deleted_message".tr);
+                        }
+                      });
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.delete_forever),
+                    title: Text("ユーザーデータを削除する".tr),
+                    onTap: () {
+                      String token = indexController.currentUser[0]['token'];
+                      AuthService.deleteUser(token).then((value) {
+                        Get.snackbar("ユーザーデータを削除する",
+                            "データを削除するためにユーザーの同意が設定されています アプリとサーバーでユーザーデータが削除されました");
+                      });
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
             // ListTile(
             //   leading: const Icon(Icons.person),
             //   title: Text("profile".tr),
@@ -108,19 +161,22 @@ class DrawerPage extends StatelessWidget {
             //   title: Text("point_rank".tr),
             //   onTap: (){},
             // ),
-            indexController.currentUser.length > 0 ?
-            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,),
+            indexController.currentUser.isNotEmpty
+                ? ListTile(
+                    leading: const Icon(Icons.featured_video),
+                    title: Text("rog_web".tr),
+                    onTap: () {
+                      _launchURL("https://www.gifuai.net/?page_id=17397");
+                    },
+                  )
+                : const SizedBox(
+                    width: 0,
+                    height: 0,
+                  ),
             ListTile(
               leading: const Icon(Icons.privacy_tip),
               title: Text("privacy".tr),
-              onTap: (){
+              onTap: () {
                 _launchURL("https://rogaining.sumasen.net/api/privacy/");
               },
             )
@@ -139,4 +195,4 @@ class DrawerPage extends StatelessWidget {
       ),
     );
   }
-}
+}

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<GeoJsonFeature> currentFeature = <GeoJsonFeature>[].obs;
+  List<GeoJSONFeatureCollection> locations = <GeoJSONFeatureCollection>[].obs;
+  List<GeoJSONFeature> currentFeature = <GeoJSONFeature>[].obs;
   List<Destination> currentDestinationFeature = <Destination>[].obs;
   List<dynamic> perfectures = <dynamic>[].obs;
   List<LatLngBounds> currentBound = <LatLngBounds>[].obs;
@@ -39,646 +34,324 @@ 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 is_rog_mapcontroller_loaded = false.obs;
+  var isLoading = 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 dropdownValue = "9";
   String subDropdownValue = "-1";
   String areaDropdownValue = "-1";
   String cateogory = "-all-";
 
-  late Worker _ever;
-
   ConnectivityResult connectionStatus = ConnectivityResult.none;
   var connectionStatusName = "".obs;
   final Connectivity _connectivity = Connectivity();
   late StreamSubscription<ConnectivityResult> _connectivitySubscription;
 
-  void toggleMode(){
-    if(mode.value==0){
+  void toggleMode() {
+    if (mode.value == 0) {
       mode += 1;
-    }
-    else{
+    } else {
       mode -= 1;
     }
   }
 
-  void toggleDestinationMode(){
-    if(desination_mode.value==0){
-      desination_mode.value += 1;
-    }
-    else{
-      desination_mode.value -= 1;
+  void toggleDestinationMode() {
+    if (desinationMode.value == 0) {
+      desinationMode.value += 1;
+    } else {
+      desinationMode.value -= 1;
     }
   }
 
-  void switchPage(String page){
-    //print("######## ${currentUser[0]["user"]["id"]}");
+  void switchPage(String page) {
+    ////print("######## ${currentUser[0]["user"]["id"]}");
     switch (page) {
-      case AppPages.INITIAL :{
-        rog_mode.value = 0;
-        print("-- rog mode is ctrl is ${rog_mode.value}");
-        Get.toNamed(page);
-      }
+      case AppPages.INDEX:
+        {
+          rogMode.value = 0;
+          //print("-- rog mode is ctrl is ${rog_mode.value}");
+          Get.toNamed(page);
+        }
         break;
-      case AppPages.TRAVEL : {
-        rog_mode.value = 1;
-        //Get.back();
-        Get.off(DestnationPage(), binding: DestinationBinding());
-
-      }
-      break;
-      case AppPages.LOGIN :{
-        rog_mode.value = 2;
-        Get.toNamed(page);
-      }
-      break;
-      default:{
-        rog_mode.value = 0;
-        Get.toNamed(AppPages.INITIAL);
-      }
+      case AppPages.TRAVEL:
+        {
+          rogMode.value = 1;
+          //Get.back();
+          //Get.off(DestnationPage(), binding: DestinationBinding());
+        }
+        break;
+      case AppPages.LOGIN:
+        {
+          rogMode.value = 2;
+          Get.toNamed(page);
+        }
+        break;
+      default:
+        {
+          rogMode.value = 1;
+          Get.toNamed(AppPages.INDEX);
+        }
     }
   }
 
   @override
   void onInit() {
-    _ever = ever(rog_mode, (_) => print("$_ has been changed (ever)"));
-
-    if(perfectures.length == 0){
-      PerfectureService.loadPerfectures().then((value){
-        perfectures.add(value);
-        loadAreaFor("9");
-        
-        //loadSubPerfFor("9");
-      });
-    } 
-
-    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-
+    // _connectivitySubscription =
+    //     _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
     super.onInit();
-}
+  }
 
-@override
-void onClose() {
+  @override
+  void onClose() {
     _connectivitySubscription.cancel();
     super.onClose();
-}
+  }
 
-Future<void> _updateConnectionStatus(ConnectivityResult result) async {
-      connectionStatus = result;
-      connectionStatusName.value = result.name;
-}
+  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
+    connectionStatus = result;
+    connectionStatusName.value = result.name;
+  }
 
-Future<void> initConnectivity() async {
-    late ConnectivityResult result;
-    // Platform messages may fail, so we use a try/catch PlatformException.
-    try {
-      result = await _connectivity.checkConnectivity();
-    } on PlatformException catch (e) {
-      print('Couldn\'t check connectivity status --- $e');
-      return;
+  Future<void> initConnectivity() async {
+    // late ConnectivityResult result;
+    // // Platform messages may fail, so we use a try/catch PlatformException.
+    // try {
+    //   //result = await _connectivity.checkConnectivity();
+    // } on PlatformException catch (_) {
+    //   //print('Couldn\'t check connectivity status --- $e');
+    //   return;
+    // }
+
+    // return _updateConnectionStatus(result);
+  }
+
+  LatLngBounds boundsFromLatLngList(List<LatLng> list) {
+    double? x0, x1, y0, y1;
+    for (LatLng latLng in list) {
+      if (x0 == null || x1 == null || y0 == null || y1 == null) {
+        x0 = x1 = latLng.latitude;
+        y0 = y1 = latLng.longitude;
+      } else {
+        if (latLng.latitude > x1) x1 = latLng.latitude;
+        if (latLng.latitude < x0) x0 = latLng.latitude;
+        if (latLng.longitude > y1) y1 = latLng.longitude;
+        if (latLng.longitude < y0) y0 = latLng.longitude;
+      }
     }
 
-    return _updateConnectionStatus(result);
+    return LatLngBounds(LatLng(x1!, y1!), LatLng(x0!, y0!));
   }
 
-LatLngBounds boundsFromLatLngList(List<LatLng> list) {
-  double? x0, x1, y0, y1;
-  for (LatLng latLng in list) {
-    if (x0 == null || x1 == null || y0 == null || y1 == null) {
-      x0 = x1 = latLng.latitude;
-      y0 = y1 = latLng.longitude;
-    } else {
-      if (latLng.latitude > x1) x1 = latLng.latitude;
-      if (latLng.latitude < x0) x0 = latLng.latitude;
-      if (latLng.longitude > y1) y1 = latLng.longitude;
-      if (latLng.longitude < y0) y0 = latLng.longitude;
-    }
-  }
-
-  return LatLngBounds(LatLng(x1!, y1!), LatLng(x0!, y0!));
-}
-
-
-List<LatLng> getLocationsList(){
-  List<LatLng> locs = [];
-  for(int i=0; i<= locations[0].collection.length - 1; i++){
-    GeoJsonMultiPoint p = locations[0].collection[i].geometry as GeoJsonMultiPoint;
-
-    LatLng latLng = LatLng(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude);
-    locs.add(latLng);  
-  }
-  return locs;
-}
-
-
-void login(String email, String password, BuildContext context){
-     AuthService.login(email, password).then((value){
-      print("------- logged in user details ######## ${value} ###### --------");
-       if(value.isNotEmpty){
-          currentUser.clear();
-          currentUser.add(value);
-          is_loading.value = false;
-          Navigator.pop(context);
-          loadUserDetails();
-          loadLocationsBound();
-          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;
-        Get.snackbar(
-              "Failed",
-               "User login failed, please try again.",
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
-       }
-       
-     });
-   }
-
-   void changePassword(String oldpassword, String newpassword, BuildContext context){
-      String _token = currentUser[0]['token'];
-      //print("------- change password ######## ${currentUser[0]['token']} ###### --------");
-      AuthService.changePassword(oldpassword, newpassword, _token).then((value){
-      print("------- change password ######## ${value} ###### --------");
-       if(value.isNotEmpty){
-        is_loading.value = false;
+  void login(String email, String password, BuildContext context) {
+    AuthService.login(email, password).then((value) {
+      //print("------- logged in user details ######## $value ###### --------");
+      if (value.isNotEmpty) {
         Navigator.pop(context);
-        if(rog_mode.value == 1){
-          switchPage(AppPages.TRAVEL);
-        }
-        else{
-          switchPage(AppPages.INITIAL);
-        }
-       }else{
+        //print("--------- user details login ----- $value");
+        changeUser(value);
+      } else {
+        isLoading.value = false;
         Get.snackbar(
-              'failed'.tr,
-               'password_change_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
-       }
-       
-     });
-     is_loading.value = false;
-   }
+          "Failed",
+          "User login failed, please try again.",
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
+      }
+    });
+  }
 
-   void logout() async{
+  void changePassword(
+      String oldpassword, String newpassword, BuildContext context) {
+    String token = currentUser[0]['token'];
+    ////print("------- change password ######## ${currentUser[0]['token']} ###### --------");
+    AuthService.changePassword(oldpassword, newpassword, token).then((value) {
+      ////print("------- change password ######## $value ###### --------");
+      if (value.isNotEmpty) {
+        isLoading.value = false;
+        Navigator.pop(context);
+        if (rogMode.value == 1) {
+          switchPage(AppPages.TRAVEL);
+        } else {
+          switchPage(AppPages.INDEX);
+        }
+      } else {
+        Get.snackbar(
+          'failed'.tr,
+          'password_change_failed_please_try_again'.tr,
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
+      }
+    });
+    isLoading.value = false;
+  }
+
+  void logout() async {
     locations.clear();
     DatabaseHelper db = DatabaseHelper.instance;
-    db.deleteAllDestinations().then((value){
-      DestinationController destinationController = Get.find<DestinationController>();
-      if(destinationController != null){
-        destinationController.PopulateDestinations();
-      }
+    db.deleteAllDestinations().then((value) {
+      DestinationController destinationController =
+          Get.find<DestinationController>();
+      destinationController.populateDestinations();
     });
     currentUser.clear();
     cats.clear();
-   }
+  }
 
-   void register(String email, String password, BuildContext context){
-     AuthService.register(email, password).then((value){
-       if(value.isNotEmpty){
+  void register(String email, String password, BuildContext context) {
+    AuthService.register(email, password).then((value) {
+      if (value.isNotEmpty) {
         currentUser.clear();
         currentUser.add(value);
-        is_loading.value = false;
+        isLoading.value = false;
         Navigator.pop(context);
-        loadUserDetails();
-        Get.toNamed(AppPages.INITIAL);
-       }else{
-         is_loading.value = false;
-         Get.snackbar(
-              'failed'.tr,
-              'user_registration_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
-       }
-     });
-   }
-
-   void makeAction(BuildContext context){
-    int user_id = currentUser[0]["user"]["id"] as int;
-    int location_id = currentFeature[0].properties!["location_id"] as int;
-     bool wanttogo = currentAction[0][0]["wanttogo"];
-     bool like = currentAction[0][0]["like"];
-     bool checkin = currentAction[0][0]["checkin"];
-     if(user_id > 0){
-       ActionService.makeAction(user_id, location_id, wanttogo, like, checkin).then((value){
-       });
-     }
-     
-   }
-
-  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;
+        Get.toNamed(AppPages.INDEX);
+      } else {
+        isLoading.value = false;
+        Get.snackbar(
+          'failed'.tr,
+          'user_registration_failed_please_try_again'.tr,
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
       }
-      else {
-        _cat = 'sight_seeing'.tr;
-      }
-    }
-    return _cat;
+    });
   }
 
-  void loadCatsv2(){
-     dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController!.bounds!;
-     if(bounds.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 saveToDevice(String val) async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.setString("user_token", val);
+  }
 
-   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(){
+  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;
     loadLocationsBound();
-    //  if(subDropdownValue == "-1"){
-    //    LocationService.loadLocationsFor(dropdownValue, currentCat[0]).then((value){
-    //       locations.clear();
-    //       locations.add(value!);
-    //       is_loading.value = false;
-    //    });
-    //    print("loading main------");
-    //  } 
-    //  else{
-    //    LocationService.loadLocationsSubFor(subDropdownValue, currentCat[0]).then((value){
-    //       locations.clear();
-    //       locations.add(value!);
-    //       is_loading.value = false;
-    //    });
-    //    print("loading sub------");
-    //  }
-   }
-
-  void loadAreaFor(String perf){
-    areas.clear();
-    dynamic initVal = {'id':'-1', 'area_nm':'----'};
-    PerfectureService.loadGifuAreas(perf).then((value){
-      value!.add(initVal);
-      areas.add(value);
-    });
-  }
-
-  void loadUserDetails(){
-    if(currentUser.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();
-          }
-        }
-      });
+    if (currentUser.isNotEmpty) {
+      rogMode.value = 0;
+    } else {
+      rogMode.value = 1;
     }
+    //print('--- c rog mode --- ${rogMode.value}');
+    Get.toNamed(AppPages.INDEX);
   }
 
-
-  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;
-        }
+  loadUserDetailsForToken(String token) async {
+    AuthService.userForToken(token).then((value) {
+      ////print("----token val-- $value  ------");
+      if (value![0]["user"].isEmpty) {
+        Get.toNamed(AppPages.LOGIN);
+        return;
       }
-    }
-    return min.toString();
-  }
-
-  void loadLocationforPerf(String perf, MapController mapController) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    print(currentCat);
-    // LocationService.loadLocationsFor(perf, cat).then((value){
-    //   locations.clear();
-    //   locations.add(value!);
-    //    mapController.fitBounds(currentBound[0]);
-    // });
-    locations.clear();
-    mapController.fitBounds(currentBound[0]);
-  }
-
-  void loadLocationforSubPerf(String subperf, MapController mapController) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
-      cat = "";
-    }
-    LocationService.loadLocationsSubFor(subperf, cat).then((value){
-      locations.clear();
-      locations.add(value!);
+      changeUser(value[0], replace: false);
     });
   }
 
-  void loadCustomLocation(String customarea) async {
-    String cat = currentCat.isNotEmpty == true ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
-      cat = "";
-    }
-    print("----- ${customarea}");
-    LocationService.loadCustomLocations(customarea, cat).then((value){
-      locations.clear();
-      locations.add(value!);
-      List<LatLng> locs = getLocationsList();
-      LatLngBounds bounds = boundsFromLatLngList(locs);
-      mapController!.fitBounds(bounds);
-      setBound(bounds);
-      Future.delayed(Duration(microseconds: 400), () {
-        mapController!.fitBounds(bounds);
-      });
-      
-    });
-  }
-
-  void loadLocationsBound(){
-    if(is_custom_area_selected.value == true){
+  void loadLocationsBound() {
+    if (isCustomAreaSelected.value == true) {
       return;
     }
     locations.clear();
     String cat = currentCat.isNotEmpty ? currentCat[0] : "";
-    if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
+    if (currentCat.isNotEmpty && currentCat[0] == "-all-") {
       cat = "";
     }
-    LatLngBounds bounds = mapController!.bounds!;
+    LatLngBounds bounds = mapController.bounds!;
     currentBound.clear();
     currentBound.add(bounds);
-    //print(currentCat);
-    if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
-      LocationService.loadLocationsBound(bounds.southWest!.latitude, bounds.southWest!.longitude, bounds.northWest.latitude, bounds.northWest.longitude, bounds.northEast!.latitude, bounds.northEast!.longitude, bounds.southEast.latitude, bounds.southEast.longitude, cat).then((value){
-      //print("---value length ------ ${value!.collection.length}");
-      if(value == null){
+    ////print(currentCat);
+    LocationService.loadLocationsBound(
+            bounds.southWest.latitude,
+            bounds.southWest.longitude,
+            bounds.northWest.latitude,
+            bounds.northWest.longitude,
+            bounds.northEast.latitude,
+            bounds.northEast.longitude,
+            bounds.southEast.latitude,
+            bounds.southEast.longitude,
+            cat)
+        .then((value) {
+      ////print("---value length ------ ${value!.collection.length}");
+      if (value == null) {
         return;
       }
-      if(value != null && value.collection.isEmpty){
-        if(showPopup == false) {
+      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),
-               snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
-               );
+          "Too many Points",
+          "please zoom in",
+          icon: const Icon(Icons.assistant_photo_outlined,
+              size: 40.0, color: Colors.blue),
+          snackPosition: SnackPosition.TOP,
+          duration: const Duration(milliseconds: 800),
+          backgroundColor: Colors.yellow,
+          //icon:Image(image:AssetImage("assets/images/dora.png"))
+        );
         showPopup = false;
         //Get.showSnackbar(GetSnackBar(message: "Too many points, please zoom in",));
       }
-      if(value != null && value.collection.isNotEmpty){
-          //print("---- added---");
-          locations.add(value);
-          loadCatsv2();
-        }
-      });
-    }
-    
+      if (value.features.isNotEmpty) {
+        ////print("---- added---");
+        locations.add(value);
+      }
+    });
   }
 
-  void setBound(LatLngBounds bounds){
+  void setBound(LatLngBounds bounds) {
     currentBound.clear();
     currentBound.add(bounds);
   }
 
-  void zoomtoMainPerf(String id){
-    
-    PerfectureService.getMainPerfExt(id).then((value){
-      LatLng lat1 = LatLng(value![1], value[0]);
-      LatLng lat2 = LatLng(value[3], value[2]);
-      LatLngBounds bound = LatLngBounds(lat1, lat2);
-      mapController!.fitBounds(bound);
-      setBound(bound);
-    });
-    
-  }
+  GeoJSONFeature? getFeatureForLatLong(double lat, double long) {
+    if (locations.isNotEmpty) {
+      GeoJSONFeature? foundFeature;
 
-  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;
-          }
+      locations[0].features.forEach((i) {
+        GeoJSONMultiPoint p = i!.geometry as GeoJSONMultiPoint;
+        if (p.coordinates[0][1] == lat && p.coordinates[0][0] == long) {
+          foundFeature = i;
         }
-      }
+      });
+
+      return foundFeature;
+    }
+    return null;
   }
-
-  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){
-
-    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 >= 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,178 +1,169 @@
-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 {
-        indexController.switchPage(AppPages.INITIAL);
-        return false;
-      },
+      onWillPop: () async => false,
       child: Scaffold(
-        //drawer: const DrawerPage(),
-          appBar: AppBar(
-              leading: IconButton(
-              icon: Icon(Icons.arrow_back_ios),
-              onPressed: (){
-                indexController.switchPage(AppPages.TRAVEL);
+        drawer: DrawerPage(),
+        appBar: AppBar(
+          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);
               },
-            ),
-            //automaticallyImplyLeading: false,
-            title: Text("add_location".tr),
-            actions: [
-              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),),
-                            ),
+              child: Container(
+                height: 32,
+                width: 75,
+                decoration: BoxDecoration(
+                  color: Colors.blue,
+                  borderRadius: BorderRadius.circular(25),
                 ),
-              //CatWidget(indexController: indexController,),
-          ],
-        ),
-        bottomNavigationBar: BottomAppBar(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
-                child: InkWell(
-                  child: 
-                  Obx(() =>
-                    destinationController.is_gps_selected == true ? 
-                      Padding(
-                        padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
-                        child: InkWell(
-                          child: 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: Image(image: AssetImage('assets/images/route2_on.png'),width: 35, height: 35,),
-                          onTap: (){
-                            indexController.switchPage(AppPages.TRAVEL);
-                            },
-                        ),
-                      )
-                  )
+                child: const Center(
+                  child: Icon(Icons.search),
                 ),
               ),
-            ],
-          ),
+            ),
+            //CatWidget(indexController: indexController,),
+          ],
         ),
+        // bottomNavigationBar: BottomAppBar(
+        //   child: Row(
+        //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        //     children: <Widget>[
+        //       Obx(
+        //         () => destinationController.isInRog.value == true
+        //             ? IconButton(
+        //                 onPressed: () {},
+        //                 icon: const Icon(
+        //                   Icons.run_circle,
+        //                   size: 44,
+        //                   color: Colors.green,
+        //                 ))
+        //             : IconButton(
+        //                 onPressed: () {},
+        //                 icon: const Icon(
+        //                   Icons.run_circle,
+        //                   size: 44,
+        //                   color: Colors.black12,
+        //                 )),
+        //       ),
+        //       Padding(
+        //         padding:
+        //             const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+        //         child: InkWell(
+        //             child: Obx(() => destinationController
+        //                         .isGpsSelected.value ==
+        //                     true
+        //                 ? Padding(
+        //                     padding: const EdgeInsets.only(
+        //                         right: 10.0, top: 4.0, bottom: 4.0),
+        //                     child: InkWell(
+        //                       child: const Image(
+        //                         image:
+        //                             AssetImage('assets/images/route3_off.png'),
+        //                         width: 35,
+        //                         height: 35,
+        //                       ),
+        //                       onTap: () {
+        //                         //indexController.switchPage(AppPages.TRAVEL);
+        //                       },
+        //                     ),
+        //                   )
+        //                 : Padding(
+        //                     padding: const EdgeInsets.only(
+        //                         right: 10.0, top: 4.0, bottom: 4.0),
+        //                     child: InkWell(
+        //                       child: const Image(
+        //                         image:
+        //                             AssetImage('assets/images/route2_on.png'),
+        //                         width: 35,
+        //                         height: 35,
+        //                       ),
+        //                       onTap: () {
+        //                         //indexController.switchPage(AppPages.TRAVEL);
+        //                       },
+        //                     ),
+        //                   ))),
+        //       ),
+        //     ],
+        //   ),
+        // ),
         floatingActionButton: FloatingActionButton(
-          onPressed: (){
+          onPressed: () {
             indexController.toggleMode();
-                if(indexController.currentCat.isNotEmpty){
-        print(indexController.currentCat[0].toString());
-      }
-      
           },
-          tooltip: 'Increment',
-          child: Obx(() =>
-            indexController.mode == 0 ? 
-            Image(image: AssetImage('assets/images/list2.png'))
-            :
-            Image(image: AssetImage('assets/images/map.png')),
+          elevation: 1.0,
+          child: Obx(
+            () => indexController.mode.value == 0
+                ? const Image(image: AssetImage('assets/images/list2.png'))
+                : const Image(image: AssetImage('assets/images/map.png')),
           ),
-          elevation: 4.0,
         ),
         floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
         body: SafeArea(
           child: Column(
             children: [
-              // Container(
-              //   padding: const EdgeInsets.symmetric(horizontal: 8.0),
-              //   alignment: Alignment.centerLeft,
-              //   height: 50.0,
-              //   //child: SingleChildScrollView(
-              //   //  scrollDirection: Axis.horizontal,
-              //   //   child:Row(
-              //   //     mainAxisAlignment: MainAxisAlignment.start,
-              //   //     children: [
-              //   //       TextButton(child:Text("Main Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.MAINPERF);},),
-              //   //       TextButton(child:Text("Sub Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.SUBPERF);},),
-              //   //       TextButton(child:Text("Cities >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CITY);},),
-              //   //       TextButton(child:Text("Categories", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CATEGORY);},),
-              //   //     ],
-              //   //   )
-              //   // ),
-              //   child: SingleChildScrollView(
-              //     scrollDirection: Axis.horizontal,
-              //     child: Obx(() => 
-              //       Row(
-              //       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              //       children: [
-              //         indexController.is_mapController_loaded.value == false ? 
-              //           Center(child: CircularProgressIndicator())
-              //         :
-              //           BreadCrumbWidget(mapController: indexController.mapController),
-              //         Container(width: 24.0,),
-              //           // Row(
-              //           //   children: [
-              //           //     indexController.currentCat.isNotEmpty ? Text(indexController.currentCat[0].toString()): Text(""),
-              //           //     indexController.currentCat.isNotEmpty ?
-              //           //     IconButton(
-              //           //       onPressed: (){
-              //           //         indexController.currentCat.clear();
-              //           //         indexController.loadLocationsBound();
-              //           //       }, 
-              //           //       icon: Icon(Icons.cancel, color: Colors.red,)
-              //           //     ) :
-              //           //     Container(width: 0, height: 0,)
-              //           //   ],
-              //           // )
-              //       ],
-              //     )
-              //     ),
-              //   ),
-              // ),
               Expanded(
-                child: Obx(() => 
-                  indexController.mode == 0 ?
-                  MapWidget() :
-                  ListWidget(),
-                )
-    
-              )
+                  child: Obx(
+                () => indexController.mode.value == 0
+                    ? MapWidget()
+                    : 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

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

lib/pages/login/login_page.dart

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

lib/pages/login_popup/login_popup_page.dart

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

lib/pages/mainperf/mainperf_page.dart

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

lib/pages/permission/permission.dart

@@ -1,233 +1,132 @@
-import 'dart:ffi';
-
 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 {
-   const PermissionHandlerScreen({super.key});
+  const PermissionHandlerScreen({Key? key}) : super(key: key);
 
   @override
-  State<PermissionHandlerScreen> createState() => _PermissionHandlerScreenState();
+  State<PermissionHandlerScreen> createState() =>
+      _PermissionHandlerScreenState();
 }
 
 class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
-
   @override
-  void initState(){
+  void initState() {
     super.initState();
-    _checkPermissions();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _checkPermissionStatus();
+    });
   }
 
-void _checkPermissions() async {
-  // You can ask for multiple permissions at once.
-  Map<Permission, PermissionStatus> statuses = await [
-    Permission.location,
-    Permission.camera,
-  ].request();
+  _checkPermissionStatus() async {
+    PermissionStatus status = await Permission.location.status;
 
-  bool isCameraGranted = statuses[Permission.camera]!.isGranted;
-  bool isLocationGranted = statuses[Permission.location]!.isGranted;
-
-  if (!isCameraGranted || !isLocationGranted) {
-    bool isCameraPermanentlyDenied = statuses[Permission.camera]!.isPermanentlyDenied;
-    bool isLocationPermanentlyDenied = statuses[Permission.location]!.isPermanentlyDenied;
-
-    if (isCameraPermanentlyDenied || isLocationPermanentlyDenied) {
-      showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: const Text('Permissions not granted'),
-            content: const Text(
-                'This app needs camera and location permissions to function. Please open settings and grant permissions.'),
-            actions: <Widget>[
-              ElevatedButton(
-                child: const Text('Open settings'),
-                onPressed: () {
-                  openAppSettings();
-                },
-              ),
-            ],
-          );
-        },
-      );
+    if (status.isGranted == false) {
+      if (context.mounted) {
+        showAlert(context);
+      }
+    } else if (status.isPermanentlyDenied) {
+      await requestPermission();
     } else {
-      // ask permissions again
-      _checkPermissions();
+      if (mounted) {
+        Get.toNamed(AppPages.LOGIN);
+      }
     }
-  } else {
-    Get.toNamed(AppPages.INITIAL);
   }
-}
 
+  void showAlert(BuildContext context) {
+    showDialog(
+        context: context,
+        builder: (_) => AlertDialog(
+              title: const Text('ロケーション許可'),
+              content: const SingleChildScrollView(
+                child: ListBody(
+                  children: <Widget>[
+                    Text('ぎふナビ "アプリへようこそ！\n'),
+                    Text('収集データ:\n'),
+                    Text(
+                        '岐阜ナビアプリをより快適にご利用いただくために、チェックポイントでの自動チェックインのための位置情報を収集しています。また、撮影した画像やチェックインした時間を収集し、チャレンジの勝者を決定します。\n'),
+                    Text('お客様のデータの使用方法:\n'),
+                    Text(
+                        'お客様のデータは、アプリを改善し、競争力のある魅力的な体験を提供するのに役立ちます。お客様の位置情報と画像は、個人を特定できない統計データとして処理され、いかなる個人情報にもリンクされないようにしています\n'),
+                    Text('お客様の管理:\n'),
+                    Text(
+                        'お客様はご自身のデータを完全に管理することができます。アプリの設定でいつでも同意を撤回することができます。位置情報の収集に同意しなくても、ぎふナビを楽しむことはできますが、自動チェックインや競技への参加など、一部の機能が制限されることを覚えておいてください。位置情報、画像、時刻情報の利用に同意する場合は「許可」を選択してください。許可しない場合は、「許可しない」を選択してください。あなたの選択は、アプリの他の機能を使用することに影響しません。\n'),
+                  ],
+                ),
+              ),
+              actions: <Widget>[
+                ElevatedButton(
+                  child: const Text('OK'),
+                  onPressed: () {
+                    Get.back();
+                    requestPermission();
+                  },
+                ),
+              ],
+            ));
+  }
+
+  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: Center(
-        child: Text('Checking permissions...'),
-      ),
+      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 */
+                          }
+                        }
+                      },
+                    );
+                  },
+                ),
+              ],
+            ));
+  }
 }
-
-
-
-// import 'package:flutter/material.dart';
-// import 'package:get/get.dart';
-// import 'package:permission_handler/permission_handler.dart';
-// import 'package:rogapp/routes/app_pages.dart';
-
-// class PermissionHandlerScreen extends StatefulWidget {
-//   PermissionHandlerScreen({Key? key}) : super(key: key);
-
-//   @override
-//   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();
-    
-//     //permissionServiceCall();
-//   }
-
-//   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(""),
-//         ),
-//       );
-//   }
-
-//   void showAlert(BuildContext context) {
-//       showDialog(
-//       context: context,
-//       builder: (_) => AlertDialog(
-//           title: const Text('ロケーション許可'),
-//           content: SingleChildScrollView(
-//             child: ListBody(
-//               children: const <Widget>[
-//                 Text( 'このアプリでは、位置情報の収集を行います。'),
-//                 Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
-//               ],
-//             ),
-//           ),
-//           actions: <Widget>[
-//             TextButton(
-//               child: const Text('わかった'),
-//               onPressed: () {
-//                 permissionServiceCall();
-//               },
-//             ),
-//           ],
-//         )
-//     );
-//   }
-
-
-// }

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:
-        IconButton( onPressed: (){
-          Navigator.pop(context);
-        },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+        leading: IconButton(
+            onPressed: () {
+              Navigator.pop(context);
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios,
+              size: 20,
+              color: Colors.black,
+            )),
       ),
       body: SafeArea(
         child: SingleChildScrollView(
-          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(
-                          fontSize: 30,
-                          fontWeight: FontWeight.bold,
-                        ),),
-                        SizedBox(height: 20,),
-                        Text("アカウントを作成し、無料です",style: TextStyle(
-                          fontSize: 15,
-                          color: Colors.grey[700],
-                        ),),
-                        SizedBox(height: 30,)
+                        const Text(
+                          "サインアップ",
+                          style: TextStyle(
+                            fontSize: 30,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 20,
+                        ),
+                        Text(
+                          "アカウントを作成し、無料です",
+                          style: TextStyle(
+                            fontSize: 15,
+                            color: Colors.grey[700],
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 30,
+                        )
                       ],
                     ),
                     Padding(
-                      padding: EdgeInsets.symmetric(
-                          horizontal: 40
-                      ),
+                      padding: const EdgeInsets.symmetric(horizontal: 40),
                       child: Column(
                         children: [
                           makeInput(label: "Eメール", controller: emailController),
-                          makeInput(label: "パスワード", controller: passwordController,obsureText: true),
-                          makeInput(label: "パスワードを認証する", controller: confirmPasswordController,obsureText: true)
+                          makeInput(
+                              label: "パスワード",
+                              controller: passwordController,
+                              obsureText: true),
+                          makeInput(
+                              label: "パスワードを認証する",
+                              controller: confirmPasswordController,
+                              obsureText: true)
                         ],
                       ),
                     ),
                     Padding(
-                      padding: 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){
+                          height: 60,
+                          onPressed: () {
+                            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),
+                                "Passwords does not match",
+                                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),
+                                "email_and_password_required".tr,
+                                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.register(emailController.text, passwordController.text, context);
+                            indexController.isLoading.value = true;
+                            indexController.register(emailController.text,
+                                passwordController.text, context);
                           },
                           color: Colors.redAccent,
                           shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(40)
+                              borderRadius: BorderRadius.circular(40)),
+                          child: Text(
+                            "sign_up".tr,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 16,
+                            ),
                           ),
-                          child: Text("sign_up".tr,style: 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: (){
+                          onPressed: () {
                             Get.toNamed(AppPages.LOGIN);
                           },
-                          child: Text("ログイン",style: TextStyle(
-                              fontWeight: FontWeight.w600,
-                              fontSize: 18
-                          ),),
+                          child: const Text(
+                            "ログイン",
+                            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(
-          fontSize: 15,
-          fontWeight: FontWeight.w400,
-          color: Colors.black87
-      ),),
-      SizedBox(height: 5,),
+      Text(
+        label,
+        style: const TextStyle(
+            fontSize: 15, fontWeight: FontWeight.w400, color: Colors.black87),
+      ),
+      const SizedBox(
+        height: 5,
+      ),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: 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])!),
           ),
         ),
       ),
-      ),
-      SizedBox(height: 30,)
-
+      const SizedBox(
+        height: 30,
+      )
     ],
   );
 }

lib/pages/search/search_controller.dart

@@ -1,26 +1,21 @@
-import 'package:flutter/material.dart';
-import 'package:geojson/geojson.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: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
+  @override
   void onInit() {
     IndexController indexController = Get.find<IndexController>();
-    if(indexController.locations.isNotEmpty){
-      for(int i=0; i<= indexController.locations[0].collection.length - 1; i++){
-        GeoJsonFeature p = indexController.locations[0].collection[i];
+    if (indexController.locations.isNotEmpty) {
+      for (int i = 0;
+          i <= indexController.locations[0].features.length - 1;
+          i++) {
+        GeoJSONFeature p = indexController.locations[0].features[i]!;
         searchResults.add(p);
       }
     }
     super.onInit();
   }
-
-
-}
+}

lib/pages/search/search_page.dart

@@ -1,29 +1,32 @@
-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';
 
 class SearchPage extends StatelessWidget {
-   SearchPage({Key? key}) : super(key: key);
+  SearchPage({Key? key}) : super(key: key);
 
   SearchBarController searchController = Get.find<SearchBarController>();
   IndexController indexController = Get.find<IndexController>();
 
-  Image getImage(int index){
-    if(searchController.searchResults[index].properties!["photos"] == null || searchController.searchResults[index].properties!["photos"] == ""){
-      return Image(image: AssetImage('assets/images/empty_image.png'));
-    }
-    else{
+  Image getImage(int index) {
+    if (searchController.searchResults[index].properties!["photos"] == null ||
+        searchController.searchResults[index].properties!["photos"] == "") {
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
+    } else {
       return Image(
-        image: NetworkImage(searchController.searchResults[index].properties!["photos"]),
-        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+        image: NetworkImage(
+            searchController.searchResults[index].properties!["photos"]),
+        errorBuilder:
+            (BuildContext context, Object exception, StackTrace? stackTrace) {
           return Image.asset("assets/images/empty_image.png");
         },
-        );
+      );
     }
   }
 
@@ -34,42 +37,76 @@ class SearchPage extends StatelessWidget {
         elevation: 0,
         backgroundColor: Colors.white,
         leading: IconButton(
-          onPressed:(){
-            Navigator.pop(context);
-        },
-        icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black,)),
-        title: TypeAheadField(
-          textFieldConfiguration: TextFieldConfiguration(
-            autofocus: true,
-          ),
-          suggestionsCallback: (pattern) async{
-            return searchController.searchResults.where((GeoJsonFeature element) => element.properties!["location_name"].toString().contains(pattern));
-            //return await 
+            onPressed: () {
+              Get.back();
+            },
+            icon: const Icon(
+              Icons.arrow_back_ios_new,
+              color: Colors.black,
+            )),
+        centerTitle: true,
+        //title: const CupertinoSearchTextField(),
+      ),
+      body: SingleChildScrollView(
+        child: TypeAheadField<GeoJSONFeature>(
+          // textFieldConfiguration: TextFieldConfiguration(
+          //   autofocus: true,
+          //   style: DefaultTextStyle.of(context).style.copyWith(
+          //         fontStyle: FontStyle.normal,
+          //         fontSize: 15.0,
+          //       ),
+          //   decoration: InputDecoration(
+          //     border: const OutlineInputBorder(),
+          //     hintText: "検索",
+          //     prefixIcon: const Icon(Icons.search),
+          //     suffixIcon: IconButton(
+          //       icon: const Icon(Icons.clear),
+          //       onPressed: () {
+          //         // clear the text field
+          //       },
+          //     ),
+          //   ),
+          // ),
+          onSelected: (GeoJSONFeature suggestion) {
+            indexController.currentFeature.clear();
+            indexController.currentFeature.add(suggestion);
+            DestinationController destinationController =
+                Get.find<DestinationController>();
+            Destination des =
+                destinationController.festuretoDestination(suggestion);
+            Get.back();
+            showModalBottomSheet(
+                constraints:
+                    BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
+                isScrollControlled: true,
+                context: context,
+                //builder: (context) => BottomSheetWidget(),
+                builder: ((context) => BottomSheetNew(
+                      destination: des,
+                    )));
           },
-          itemBuilder: (context, GeoJsonFeature suggestion){
+
+          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"]) : Text(""),
+              subtitle: suggestion.properties!["category"] != null
+                  ? Text(suggestion.properties!["category"])
+                  : const Text(""),
               //leading: getImage(index),
             );
           },
-          onSuggestionSelected: (GeoJsonFeature suggestion){
-              indexController.currentFeature.clear();
-              indexController.currentFeature.add(suggestion);
-              Get.back();
-              showModalBottomSheet(
-                          isScrollControlled: true,
-                          context: context,
-                          //builder: (context) => BottomSheetWidget(),
-                          builder:((context) => BottomSheetNew())
-                        );
-          },
         ),
-        //title: const CupertinoSearchTextField(),
-         
       ),
-      //body: 
-      // Obx(() => 
+      // Obx(() =>
       //   ListView.builder(
       //   itemCount: searchController.searchResults.length,
       //   itemBuilder: (context, index){
@@ -94,4 +131,4 @@ class SearchPage extends StatelessWidget {
       // )
     );
   }
-}
+}

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,12 @@
 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';
 
 import 'package:rogapp/pages/index/index_page.dart';
@@ -19,25 +20,14 @@ import 'package:rogapp/pages/register/register_page.dart';
 import 'package:rogapp/pages/search/search_binding.dart';
 import 'package:rogapp/pages/search/search_page.dart';
 import 'package:rogapp/pages/subperf/subperf_page.dart';
-import 'package:rogapp/screens/auth/views/login/login_screen.dart';
-import 'package:rogapp/screens/auth/views/register/register_screen.dart';
-import 'package:rogapp/screens/home/home_screen.dart';
 import 'package:rogapp/spa/spa_binding.dart';
 import 'package:rogapp/spa/spa_page.dart';
 
-import '../screens/home/home_binding.dart';
-
-
 part 'app_routes.dart';
 
 class AppPages {
-
-  static const S_HOME = Routes.S_HOME;
-  static const S_LOGIN = Routes.S_LOGIN;
-  static const S_REGISTER= Routes.S_REGISTER;
-
   // 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;
@@ -56,45 +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.S_HOME,
-      page: () => HomeScreen(),
-      binding: HomeBinding()
-    ),
-    GetPage(
-      name: Routes.S_LOGIN,
-      page: () => LoginScreen(),
-      //binding: IndexBinding(),
-    ),
-    GetPage(
-      name: Routes.S_REGISTER,
-      page: () => RegisterScreen(),
-    ),
     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(
@@ -107,62 +70,44 @@ class AppPages {
       page: () => RegisterPage(),
       //binding: SpaBinding(),
     ),
-    GetPage(
-      name: Routes.TRAVEL,
-      page: () => DestnationPage(),
-      binding: DestinationBinding(),
-    ),
     GetPage(
       name: Routes.LOADING,
-      page: () => LoadingPage(),
-      //binding: DestinationBinding(),
-    ),
-    GetPage(
-      name: Routes.DESTINATION_MAP,
-      page: () => DestnationPage(),
+      page: () => const LoadingPage(),
       //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(),
-    ),
-    GetPage(
-      name: Routes.CATEOGORY,
-      page: () => CategoryPage(),
+      page: () => const CityPage(),
     ),
     GetPage(
       name: Routes.CHANGE_PASSWORD,
       page: () => ChangePasswordPage(),
     ),
     GetPage(
-      name: Routes.CAMERA_PAGE,
-      page: () => CameraPage(),
+      name: Routes.PROGRESS,
+      page: () => const ProgressPage(),
     ),
     GetPage(
-      name: Routes.PROGRESS,
-      page: () => ProgressPage(),
+      name: Routes.HISTORY,
+      page: () => const HistoryPage(),
+    ),
+    GetPage(
+      name: Routes.GPS,
+      page: () => const GpsPage(),
     )
   ];
-}
+}

lib/routes/app_routes.dart

@@ -1,9 +1,6 @@
 part of 'app_pages.dart';
 
 abstract class Routes {
-  static const S_HOME = '/s_home';
-  static const S_LOGIN = '/s_login';
-  static const S_REGISTER = '/s_register';
   // Main Menu Route
   // static const HOME = '/';
   // static const MAP = '/map';
@@ -27,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/screens/auth/common/uis/auth_text_field.dart

@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:rogapp/theme/pallete.dart';
-
-class AuthTextField extends StatelessWidget {
-  final TextEditingController controller;
-  final String hinttext;
-  final bool isObsque;
-  const AuthTextField({super.key, required this.controller, required this.hinttext, this.isObsque = false});
-
-  @override
-  Widget build(BuildContext context) {
-    return TextFormField(
-      controller: controller,
-      decoration: InputDecoration(
-        focusedBorder: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(5),
-          borderSide: const BorderSide(
-            color: Pallete.BLUE_COLOR,
-            width: 2
-          )
-        ),
-        enabledBorder: OutlineInputBorder(
-          borderRadius: BorderRadius.circular(5),
-          borderSide: const BorderSide(
-            color: Pallete.BROWN_COLOR,
-          )
-        ),
-        contentPadding: const EdgeInsets.all(22),
-        hintText: hinttext,
-        hintStyle: const TextStyle(
-          fontSize: 18,
-        )
-      ),
-    );
-  }
-}

lib/screens/auth/common/uis/rounded_small_button.dart

@@ -1,30 +0,0 @@
-
-import 'package:rogapp/theme/theme.dart';
-import 'package:flutter/material.dart';
-
-class RoundedSmallButton extends StatelessWidget {
-  final VoidCallback onTap;
-  final String label;
-  final Color backgroundColor;
-  final Color textColor; 
-
-  const RoundedSmallButton({
-    super.key, 
-    required this.onTap, 
-    required this.label,
-    this.backgroundColor =  Pallete.WHITE_COLOR,
-    this.textColor = Pallete.BACKGROUND_COLOR,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      child: Chip(
-        label: Text(label, style: TextStyle(color: textColor, fontSize: 16),),
-        backgroundColor: backgroundColor,
-        labelPadding:const EdgeInsets.symmetric(horizontal: 10, vertical: 3),
-      ),
-    );
-  }
-}

lib/screens/auth/controller/auth_controller.dart

@@ -1,45 +0,0 @@
-import 'dart:convert' as convert;
-
-import 'package:get/get.dart';
-import 'package:rogapp/model/user.dart';
-import 'package:rogapp/utils/const.dart';
-import 'package:http/http.dart' as http;
-
-class AuthController extends GetxController{
-  var isLoading = false.obs;
-  var authList = List<AuthResponse>.empty(growable: true).obs;
-
-  void signinUser(String email, String password) async {
-    try{
-      isLoading(true);
-      String serverUrl = ConstValues.currentServer();
-      String url = '$serverUrl/api/login/';
-      final http.Response response = await http.post(
-        Uri.parse(url),
-        headers: <String, String>{
-          'Content-Type': 'application/json; charset=UTF-8',
-        },
-        body: convert.jsonEncode(<String, String>{
-          'email': email,
-          'password': password
-        }),
-      );
-      if (response.statusCode == 200) {
-        print(response.body);
-        AuthResponse authResponse = AuthResponse.fromJson(convert.jsonDecode(convert.utf8.decode(response.body.codeUnits)));
-        print(authResponse.user.eventCode.toString());
-        authList.assign(authResponse);
-      }
-      else{
-        throw("Unable to Login, please check your creadentials");
-      }
-    }
-    catch(e){
-      Get.snackbar("Error", e.toString(), snackPosition: SnackPosition.BOTTOM);
-    }
-    finally{
-      isLoading(false);
-    }
-  }
-
-}

lib/screens/auth/views/login/login_controller.dart

@@ -1,5 +0,0 @@
-import 'package:get/get.dart';
-
-class LoginController extends GetxController{
-  
-}

lib/screens/auth/views/login/login_screen.dart

@@ -1,75 +0,0 @@
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:rogapp/common/ui/widgets/uis.dart';
-import 'package:rogapp/routes/app_pages.dart';
-import 'package:rogapp/screens/auth/common/uis/auth_text_field.dart';
-import 'package:rogapp/screens/auth/common/uis/rounded_small_button.dart';
-import 'package:rogapp/screens/auth/controller/auth_controller.dart';
-import 'package:rogapp/theme/theme.dart';
-
-class LoginScreen extends StatelessWidget {
-  final emailController = TextEditingController();
-  final passwordController = TextEditingController();
-  LoginScreen({super.key});
-
-  final AuthController authController = Get.find<AuthController>();
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: UIs.appBar(),
-      body: Obx((){
-        if(authController.isLoading.value) {
-          return const Center(child: CircularProgressIndicator(),);
-        } else {
-          return Center(
-        child: SingleChildScrollView(
-          child: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Column(
-              children: [
-                Container(
-                  height: MediaQuery.of(context).size.height/6,
-                  decoration: const BoxDecoration(
-                    image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
-                  ),
-                ),
-                const SizedBox(height: 5,),
-                AuthTextField(controller: emailController, hinttext: 'Email',),
-                const SizedBox(height: 25,),
-                AuthTextField(controller: passwordController, hinttext: 'Password',),
-                const SizedBox(height: 40,),
-                Align(
-                  alignment: Alignment.topRight,
-                  child: RoundedSmallButton(onTap: (){
-                    authController.signinUser(emailController.text, passwordController.text);
-                  }, 
-                  label: 'Done',),
-                ),
-                const SizedBox(height: 40,),
-                RichText(
-                  text: TextSpan(
-                    text: "Don't have an account?",
-                    style: const TextStyle(fontSize: 16, color: Pallete.BROWN_COLOR),
-                    children: [
-                      TextSpan(
-                        text: " Signup",
-                        style: const TextStyle(color: Pallete.BLUE_COLOR, fontSize: 16),
-                        recognizer: TapGestureRecognizer()..onTap = (){
-                          Get.toNamed(AppPages.S_REGISTER);
-                        },
-                      ),
-                    ]
-                )
-              )
-              ],
-            ),
-          ),
-        ),
-      );
-        }
-      }),
-    );
-  }
-}

lib/screens/auth/views/register/register_screen.dart

@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-
-class RegisterScreen extends StatelessWidget {
-  const RegisterScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container();
-  }
-}

lib/screens/home/home_binding.dart

@@ -1,12 +0,0 @@
-import 'package:get/get.dart';
-import 'package:rogapp/screens/home/home_controller.dart';
-import 'package:rogapp/screens/home/location_controller.dart';
-
-class HomeBinding extends Bindings{
-  @override
-  void dependencies() {
-    Get.put(HomeController());
-    Get.put(LocationController());
-  }
-
-}

lib/screens/home/home_controller.dart

@@ -1,124 +0,0 @@
-import 'dart:async';
-
-import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rogapp/model/location_response.dart';
-import 'package:rogapp/screens/auth/controller/auth_controller.dart';
-import 'package:rogapp/screens/home/location_controller.dart';
-import 'package:rogapp/utils/const.dart';
-import 'package:http/http.dart' as http; 
-import 'dart:convert' as convert;
-
-import 'package:rogapp/utils/db_helper.dart';
-
-class HomeController extends GetxController{
-  var isLoading = false.obs;
-  List<LatLngBounds> currentBound = <LatLngBounds>[].obs;
-  List<Feature> currentFeaturesforBound = <Feature>[].obs;
-  List<Feature> currentFeature = <Feature>[].obs;
-  MapController mapController = MapController();
-
-  late StreamSubscription<ConnectivityResult> _connectivitySubscription;
-  ConnectivityResult connectionStatus = ConnectivityResult.none;
-  var connectionStatusName = "".obs;
-  final Connectivity _connectivity = Connectivity();
-
-  AuthController authController = Get.find<AuthController>();
-  DatabaseHelper dbaseHelper = DatabaseHelper.instance;
-
-  @override
-  void onInit() {
-    super.onInit();
-    _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-     dbaseHelper.deleteAll().then((value){
-      fetchBoundForuser(authController.authList[0].token);
-      loadLocationsForBound().then((_){
-        fetchLocalLocationForBound(mapController.bounds!);
-      });
-     });
-  }
-
-  Future<void> _updateConnectionStatus(ConnectivityResult result) async {
-      connectionStatus = result;
-      connectionStatusName.value = result.name;
-  }
-
-  void fetchLocalLocationForBound(LatLngBounds bound) async {
-    final locations = await dbaseHelper.getFeaturesWithinBounds(bound);
-    currentFeaturesforBound.assignAll(locations);
-    print("loading locations ${currentFeaturesforBound.length} ------");
-  }
-
-  Future<void> loadLocationsForBound() async {
-    LatLngBounds bounds = mapController.bounds!;
-    String serverUrl = ConstValues.currentServer();
-    try{
-      isLoading(true);
-      if(bounds.southWest != null && bounds.northEast != null){
-          bool _rog = authController.authList[0].user.isRogaining;
-          String r = _rog == true ? 'True': 'False';
-          var grp = authController.authList[0].user.eventCode;
-          final url = '$serverUrl/api/inbound?rog=${r}&grp=$grp&ln1=${bounds.southWest!.longitude}&la1=${bounds.southWest!.latitude}&ln2=${bounds.northWest.longitude}&la2=${bounds.northWest.latitude}&ln3=${bounds.northEast!.longitude}&la3=${bounds.northEast!.latitude}&ln4=${bounds.southEast.longitude}&la4=${bounds.southEast.latitude}';
-          final response = await http.get(Uri.parse(url),
-            headers: <String, String>{
-              'Content-Type': 'application/json; charset=UTF-8',
-            },
-          );
-          if (response.statusCode == 200) {
-            // Parse JSON response
-            LocationResponse locationResponse = LocationResponse.fromMap(convert.jsonDecode(convert.utf8.decode(response.body.codeUnits)));
-
-            // For each feature in the location response
-            for (var feature in locationResponse.features!) {
-              await dbaseHelper.insertFeature(feature.toMap());
-            }
-          }
-          else{
-            throw("Unable to load locations, please try again ...");
-          }
-      }
-    }
-    catch(e, st){
-      Get.snackbar("Error", e.toString(), snackPosition: SnackPosition.BOTTOM);
-    }
-    finally{
-      isLoading(false);
-    }    
-  }
-
-  void fetchBoundForuser(String usertoken) async {
-    try{
-      isLoading(true);
-      String serverUrl = ConstValues.currentServer();
-      String url = '$serverUrl/api/locsext/';
-      final http.Response response = await http.post(
-        Uri.parse(url),
-         headers: <String, String>{
-        'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token $usertoken'
-      },
-      body: convert.jsonEncode(<String, String>{
-          'token': usertoken,
-        }),
-      );
-      if (response.statusCode == 200) {
-        final ext = convert.json.decode(convert.utf8.decode(response.body.codeUnits));
-        LatLngBounds bnds = LatLngBounds(LatLng(ext[1], ext[0]), LatLng(ext[3], ext[2]));
-        currentBound.assign(bnds);
-        mapController.fitBounds(bnds);
-      }
-      else{
-        throw("Unable to query current bound, please try again ...");
-      }
-    }
-    catch(e){
-      Get.snackbar("Error", e.toString(), snackPosition: SnackPosition.BOTTOM);
-    }
-    finally{
-      isLoading(false);
-    }
-  }
-
-}

lib/screens/home/home_screen.dart

@@ -1,183 +0,0 @@
-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:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rogapp/common/ui/widgets/uis.dart';
-import 'package:rogapp/model/location_response.dart';
-import 'package:rogapp/screens/home/home_controller.dart';
-import 'package:rogapp/screens/home/location_controller.dart';
-import 'package:rogapp/theme/theme.dart';
-import 'package:rogapp/utils/db_helper.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:sqflite/sqflite.dart';
-
-class HomeScreen extends StatelessWidget {
-  HomeScreen({super.key});
-  StreamSubscription? subscription;
-  final HomeController homeController = Get.find<HomeController>();
-  final LocationController locationController = Get.find<LocationController>();
-
-  final double zoomThreshold = 0.08;
-  final double boundsThreshold = 0.0005;
-
-  LatLngBounds? lastBounds;
-  double? lastZoom;
-
-
-  Widget getMarkerShape(Feature i, BuildContext context){
-    
-    //print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
-    RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-    return Row(
-                                      mainAxisAlignment: MainAxisAlignment.start,
-                                      children: [
-                                        InkWell(
-                                          onTap: () {    
-                                                  homeController.currentFeature.assign(i);                                        
-                                                  if(homeController.currentFeature != null) {
-                                                    showModalBottomSheet(
-                                                      context: context, 
-                                                      isScrollControlled: true, 
-                                                      isDismissible: true,
-                                                      builder:((context) => BottomSheetNew())
-                                                      //builder:((context) => BottomSheetWidget())
-                                                    ).whenComplete((){
-                                                      locationController.skip_gps = false;
-                                                    });
-                                                  }
-
-
-
-
-                                          },
-                                          child: 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,
-                                                  width: 3,
-                                                  style: BorderStyle.solid
-                                                )
-                                              ),
-                                              child: Stack(
-                                                alignment: Alignment.center,
-                                                children: [
-                                                  Icon(Icons.circle,size: 6.0,),
-                                                  i.properties!.cp == -1 ?
-                                                    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,)):
-                                                    Container(color: Colors.transparent,),
-                                                ],
-                                              )
-                                            ),
-                                        ),
-                                          Container(color: Colors.white, child: Text(TextUtils.getDisplayTextForFeature(i), style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,))),
-                                      ],
-                                    );
-  }
-
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        actions: [
-          TextButton(onPressed: () async {
-            DatabaseHelper dbaseHelper = DatabaseHelper.instance;
-              final res = await dbaseHelper.getFeatureByLatLon(35.807369, 137.240684);
-              print(res[0].toString());
-          }, 
-          child: const Text("Click", style: TextStyle(color: Colors.white),))
-        ],
-      ),
-      body: Obx(() => 
-        FlutterMap(
-            mapController: homeController.mapController,
-          options: MapOptions(
-            onMapReady: (){
-                  homeController.mapController!.mapEventStream.listen((MapEvent mapEvent) {
-                  if (mapEvent is MapEventMoveStart) {
-                  }
-                  if (mapEvent is MapEventMoveEnd) {
-                    LatLngBounds bounds = homeController.mapController!.bounds!;
-                    homeController.currentBound.assign(bounds);
-                    final _cz = homeController.mapController.zoom;
-                  }
-                });
-            } ,
-            onPositionChanged: (position, hasGesture){
-              if (hasGesture) { 
-                LatLngBounds currentBounds = position.bounds!;
-
-                if (lastBounds != null && lastZoom != null) {
-                  // Compute difference between last bounds and current bounds
-                  double boundsDifference = lastBounds!.north - currentBounds.north +
-                                            lastBounds!.south - currentBounds.south +
-                                            lastBounds!.east - currentBounds.east +
-                                            lastBounds!.west - currentBounds.west;
-
-                  // Compute difference between last zoom and current zoom
-                  double zoomDifference = lastZoom! - position.zoom!;
-
-                  if (boundsDifference.abs() > boundsThreshold || zoomDifference.abs() > zoomThreshold) {
-                    LatLngBounds bounds = homeController.mapController!.bounds!;
-                    homeController.currentBound.assign(bounds);
-                    print('----threshold reached ---');
-                    homeController.fetchLocalLocationForBound(bounds);
-                    //loadData(position.bounds); // Load new data when either threshold is exceeded
-                  }
-                } else {
-                  LatLngBounds bounds = homeController.mapController!.bounds!;
-                  homeController.currentBound.assign(bounds);
-                  homeController.fetchLocalLocationForBound(bounds);
-                  //loadData(position.bounds); // Load new data if this is the first time
-                }
-
-                lastBounds = currentBounds; // Update the last bounds
-                lastZoom = position.zoom; // Update the last zoom
-
-              }
-            },
-            bounds: homeController.currentBound.isNotEmpty ? homeController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
-            zoom: 14,
-            maxZoom:18.4,
-            interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
-          ),
-          children: [
-            const BaseLayer(),
-            CurrentLocationLayer(), 
-            homeController.currentFeaturesforBound.isNotEmpty ?
-            MarkerLayer(
-              markers:homeController.currentFeaturesforBound.map((i) {
-                RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-                    return Marker(
-                      anchorPos: AnchorPos.exactly(Anchor(108.0, 18.0)),
-                      height: 32.0,
-                      width: 120.0,
-                      point: LatLng(i.latitude!, i.longitude!),
-                      builder: (ctx){
-                        return getMarkerShape(i, context);
-                      },
-                    );
-              }).toList(),
-              )
-              :
-              Center(child: CircularProgressIndicator()),
-          ],
-          
-        )
-      ),
-    );
-  }
-}

lib/screens/home/location_controller.dart

@@ -1,318 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
-import 'package:rogapp/model/location_response.dart';
-import 'package:rogapp/pages/camera/camera_page.dart';
-import 'package:rogapp/screens/auth/controller/auth_controller.dart';
-import 'package:rogapp/screens/home/home_controller.dart';
-import 'package:rogapp/utils/checkin_db_helper.dart';
-import 'package:rogapp/widgets/bottom_sheet_new.dart';
-
-class LocationController extends GetxController{
-
-  HomeController homeController = Get.find<HomeController>();
-  AuthController authController = Get.find<AuthController>();
-  CheckinDBHelper checkinDBHelper = CheckinDBHelper.instance;
-  
-
-  late LocationSettings locationSettings;
-  List<String> locationPermission = <String>[" -- starting -- "].obs;
-  double current_lat = 0.0;
-  double current_lon = 0.0;
-  var is_gps_selected = true.obs;
-  var is_checkingIn = false.obs;
-  var moveMapwithGPS = false.obs;
-  bool skip_gps = false;
-  var is_photo_shoot = false.obs;
-  final photos = <File>[].obs;
-  Timer? _timer;
-  int _start = 0;
-  int chekcs = 0;
-  var rogaining_counted = false.obs;
-
-  var is_in_checkin = false.obs;
-  var is_in_rog = false.obs;
-  var is_at_start = false.obs;
-  var is_at_goal = false.obs;
-  DateTime last_goal_at = DateTime.now().subtract(Duration(days:1));
-   bool skip_10s = false;
-
-  bool checking_in = false;
-  BuildContext? context;
-
-  @override
-  void onInit() {
-    initGPS();
-    super.onInit();
-  }
-
-  void checkPermission() async {
-    LocationPermission permission = await Geolocator.checkPermission();
-    if (permission != LocationPermission.whileInUse ||
-        permission != LocationPermission.always) {
-          locationPermission.clear();
-          locationPermission.add(permission.name);
-      permission = await Geolocator.requestPermission();
-    }
-  }
-
-
-  void initGPS(){
-    checkPermission();
-    
-    //print("------ in iniit");
-
-    if (defaultTargetPlatform == TargetPlatform.android) {
-      locationSettings = AndroidSettings(
-        accuracy: LocationAccuracy.bestForNavigation,
-        distanceFilter: 0,
-        forceLocationManager: true,
-        intervalDuration: const Duration(seconds: 1),
-        foregroundNotificationConfig: const ForegroundNotificationConfig(
-            notificationText:
-            "Thi app will continue to receive your location even when you aren't using it",
-            notificationTitle: "Running in Background",
-            enableWakeLock: true,
-        )
-      );
-    } else if (defaultTargetPlatform == TargetPlatform.iOS || defaultTargetPlatform == TargetPlatform.macOS) {
-      locationSettings = AppleSettings(
-        accuracy: LocationAccuracy.bestForNavigation,
-        activityType: ActivityType.fitness,
-        distanceFilter: 0,
-        pauseLocationUpdatesAutomatically: false,
-        // Only set to true if our app will be started up in the background.
-        showBackgroundLocationIndicator: true
-      );
-    } else {
-        locationSettings = const LocationSettings(
-        accuracy: LocationAccuracy.high,
-        distanceFilter: 0,
-      );
-    }
-
-    try {
-
-      StreamSubscription<Position> positionStream = Geolocator.getPositionStream(locationSettings: locationSettings).listen(
-
-      (Position? position) {
-        current_lat = position != null ? position.latitude : 0;
-        current_lon = position != null ? position.longitude : 0;
-
-        print('current GPS point is - $current_lat, $current_lon');
-
-        if(is_gps_selected.value){
-          double czoom = homeController.mapController.zoom;
-          if(moveMapwithGPS.value){
-            homeController.mapController.move(LatLng(position!.latitude, position!.longitude), czoom);
-          }
-          
-
-            //gps.clear();
-            //gps.add("-- lat : ${position.latitude}, lon : ${position.longitude} --");
-            if(is_checkingIn.value ==false || skip_gps == false){
-              print("--- calling checkFoCheckin ---");
-              checkFoCheckin();
-            }
-            //checkForCheckin(position!.latitude, position.longitude);
-          
-        }
-          //print(position == null ? 'Unknown' : 'current position is ${position.latitude.toString()}, ${position.longitude.toString()}');
-      });
-    } catch (err){
-      locationPermission.clear();
-      locationPermission.add(err.toString());
-    }
-
-    //ever(indexController.connectionStatusName, connectionChanged);
-  }
-
-  void checkFoCheckin(){
-    
-    for(final f in homeController.currentFeaturesforBound){
-
-        if(skip_gps) return;
-
-        var distance = Distance();
-        var dist = distance.as(LengthUnit.Meter, LatLng(f.latitude!, f.longitude!), LatLng(current_lat, current_lon));
-
-        if(dist <= 250 && is_checkingIn.value == false){
-            startTimer(f, dist);
-        }
-
-    }
-  }
-
-  void startTimer(Feature d, double distance) async {
-    skip_gps = true;
-    print("---- in startTimer ----");
-    double checkin_radious = d.properties!.checkin_radius ?? double.infinity;
-    bool auto_checkin = d.properties!.auto_checkin == 0 ? false : true;
-    bool location_already_checked_in = await checkinDBHelper.exists(d.location_id!);
-    bool isUser_logged_in = authController.authList.length > 0 ? true : false;
-    //make current destination
-    print("---- locationid : ${d.location_id} checkin radius ---- ${checkin_radious} --- distance : ${distance} ----");
-    print("---- distance ${distance} ----");
-    if(checkin_radious >= distance){
-      //currentSelectedDestinations.add(d);
-      homeController.currentFeature.assign(d);
-    }
-    else {
-      skip_gps = false;
-      return;
-    }
-
-    if(is_photo_shoot.value == true){
-      photos.clear();
-      showModalBottomSheet(context: Get.context!, isScrollControlled: true,
-          builder:((context) => CameraPage())
-                ).whenComplete((){
-                  skip_gps = false;
-                  chekcs = 0;
-                  is_in_checkin.value = false;
-            });
-      return;
-    }
-
-    List<Feature> ds = homeController.currentFeature;
-    if(ds.isNotEmpty){
-      if(d.properties!.cp == -1 && DateTime.now().difference(last_goal_at).inHours >= 24){
-        chekcs = 1;
-        //start
-              print("---- in start -----");
-              chekcs = 1;
-              is_in_checkin.value = true;
-              is_at_start.value = true;
-              showModalBottomSheet(context: Get.context!, isScrollControlled: true, 
-                  builder:((context) => BottomSheetNew())
-                ).whenComplete((){
-                  skip_gps = false;
-                  chekcs = 0;
-                  is_at_start.value = false;
-                  is_in_checkin.value = false;
-                });
-      }
-      else if(is_in_rog.value == true)
-      {
-        print("----- in location popup checkin   cp - ${d.properties!.cp}----");
-        chekcs = 2;
-        is_in_checkin.value = true;
-        showModalBottomSheet(context: Get.context!, isScrollControlled: true,
-          builder:((context) => BottomSheetNew())
-        ).whenComplete((){
-          skip_gps = false;
-          chekcs =0;
-          is_in_checkin.value = false;
-        });
-      }
-    }
-
-        print("---- location checkin radious ${d.properties!.checkin_radius} ----");          
-        print("---- already checked in ${location_already_checked_in} ----");
-          if(checkin_radious >= distance && location_already_checked_in == false){
-            if(auto_checkin){
-              if(!checking_in){
-                makeCheckin(d, true,"");
-                if(d.properties!.cp != -1){
-                  rogaining_counted.value =true;
-                }
-                skip_gps = false;
-              }
-            }
-            else{
-              print("--- hidden loc ${d.properties!.hidden_location} ----");
-              // ask for checkin
-              if(d.properties!.hidden_location != null && d.properties!.hidden_location == 0 && d.properties!.cp != -1){
-                chekcs = 3;
-                is_in_checkin.value = true;
-                photos.clear();
-                showModalBottomSheet(context: Get.context!, isScrollControlled: true,
-                  builder:((context) => CameraPage(destination: d,))
-                ).whenComplete((){
-                  skip_gps = false;
-                  rogaining_counted.value =true;
-                  chekcs = 0;
-                  is_in_checkin.value = false;
-                });
-              }
-              else if(is_in_rog.value == true && d.properties!.cp != -1){
-                chekcs = 4;
-                is_in_checkin.value = true;
-                showMaterialModalBottomSheet(
-                        expand: true,
-                        context: Get.context!,
-                        backgroundColor: Colors.transparent,
-                        builder: (context) => BottomSheetNew()
-                      ).whenComplete(() {
-                          skip_gps = false;
-                          chekcs = 0;
-                          is_in_checkin.value = false;
-                      });
-                // showModalBottomSheet(context: Get.context!, isScrollControlled: true,
-                //   builder:((context) => BottomSheetNew())
-                // ).whenComplete((){
-                //   skip_gps = false;
-                //   chekcs = 0;
-                //   is_in_checkin.value = false;
-                // });
-              }
-              
-            }
-          }
-          if(isUser_logged_in && d.properties!.cp == -1 && location_already_checked_in && skip_10s == false){
-            //check for rogaining
-            if(is_at_goal.value == false && rogaining_counted.value){
-                //goal
-                print("---- in goal -----");
-                chekcs = 5;
-                is_at_goal.value = true;
-                photos.clear();
-                showModalBottomSheet(context: Get.context!, isScrollControlled: true, 
-                  builder:((context) => CameraPage(destination: d,))
-                ).whenComplete((){
-                  skip_gps = false;
-                  chekcs = 0;
-                  is_at_goal.value = false;
-                });
-            }
-            else if(is_in_rog.value == false && DateTime.now().difference(last_goal_at).inHours >= 24){
-              //start
-              print("---- in start -----");
-              chekcs = 6;
-              is_at_start.value = true;
-              showModalBottomSheet(context: Get.context!, isScrollControlled: true, 
-                  builder:((context) => BottomSheetNew())
-                ).whenComplete((){
-                  print("----- finished start -------");
-                  skip_gps = false;
-                  chekcs = 0;
-                  is_at_start.value = false;
-                });
-            }
-          }
-        print("==== _chekcs ${chekcs} ====");
-        if(chekcs == 0){
-          skip_gps = false;
-        }
-  }
-
-   void makeCheckin(Feature destination, bool action, String imageurl) async {
-    
-   }
-
-   void addToRogaining(double lat, double lon, int destination_id) async {
-
-   }
-
-   void destinationMatrixFromCurrentPoint(List<Feature> ls){
-
-   }
-
-
-}

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