fixed forced start

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/build.gradle

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

android/gradle/wrapper/gradle-wrapper.properties

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

ios/Podfile.lock

@@ -4,47 +4,11 @@ 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)
@@ -52,127 +16,102 @@ PODS:
     - Flutter
   - google_maps_flutter_ios (0.0.1):
     - Flutter
-    - GoogleMaps
+    - GoogleMaps (< 8.0)
-  - GoogleMaps (4.1.0):
+  - GoogleMaps (5.2.0):
-    - GoogleMaps/Maps (= 4.1.0)
+    - GoogleMaps/Maps (= 5.2.0)
-  - GoogleMaps/Base (4.1.0)
+  - GoogleMaps/Base (5.2.0)
-  - GoogleMaps/Maps (4.1.0):
+  - GoogleMaps/Maps (5.2.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
   - 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_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
+  - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
   - 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_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
-  move_to_background:
+  isar_flutter_libs:
-    :path: ".symlinks/plugins/move_to_background/ios"
+    :path: ".symlinks/plugins/isar_flutter_libs/ios"
-  path_provider_ios:
+  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  share_plus:
-    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9
+  camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
-  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
-  google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9
+  google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
-  GoogleMaps: 008e2c80e38605b56b560e8deb73d4194ff30bef
+  GoogleMaps: 025272d5876d3b32604e5c080dc25eaf68764693
-  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
+  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
+  isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
 PODFILE CHECKSUM: a1c2f8dde3796ecc1697a15e7c75eb5205d8a740
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -379,6 +379,7 @@
 				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -508,6 +509,7 @@
 				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -531,6 +533,7 @@
 				DEVELOPMENT_TEAM = D5SL68ATB9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -38,6 +38,8 @@
 	<string>プロフィールに動画を投稿してください。</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>写真ライブラリへのアクセス警告</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Need to save image in phone Album</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

lib/main.dart

@@ -1,43 +1,83 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
 import 'package:get/get.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:rogapp/pages/index/index_binding.dart';
+import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 import 'package:rogapp/utils/string_values.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+// import 'package:is_lock_screen/is_lock_screen.dart';
-import 'package:path/path.dart' as p;
 
 void main() async {
-  
   WidgetsFlutterBinding.ensureInitialized();
 
-  FlutterMapTileCaching.initialise(await RootDirectory.normalCache);
+  await FlutterMapTileCaching.initialise();
   final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
-    await instanceA.manage.createAsync();
+  await instanceA.manage.createAsync();
-    await instanceA.metadata.addAsync(
+  await instanceA.metadata.addAsync(
-      key: 'sourceURL',
+    key: 'sourceURL',
-      value: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
+    value: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png',
-    );
+  );
-    await instanceA.metadata.addAsync(
+  await instanceA.metadata.addAsync(
-      key: 'validDuration',
+    key: 'validDuration',
-      value: '14',
+    value: '14',
-    );
+  );
-    await instanceA.metadata.addAsync(
+  await instanceA.metadata.addAsync(
-      key: 'behaviour',
+    key: 'behaviour',
-      value: 'cacheFirst',
+    value: 'cacheFirst',
-    );
+  );
 
-  runApp(MyApp());
+  runApp(const MyApp());
 }
 
-class MyApp extends StatelessWidget {
+class MyApp extends StatefulWidget {
-   const MyApp({Key? key}) : super(key: key);
+  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();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+      switch (state) {
+        case AppLifecycleState.resumed:
+          print("RESUMED");
+          DestinationController destinationController = Get.find<DestinationController>();
+          if(destinationController.positionStream == null){
+            destinationController.startGPSTimer();
+          }
+          break;
+        case AppLifecycleState.inactive:
+          print("INACTIVE");
+          break;
+        case AppLifecycleState.paused:
+          print("PAUSED");
+          break;
+        case AppLifecycleState.detached:
+          print("DETACHED");
+          break;
+        case AppLifecycleState.hidden:
+          print("DETACHED");
+          break;
+      }
+    }
+
   @override
   Widget build(BuildContext context) {
     return GetMaterialApp(
@@ -47,9 +87,9 @@ class MyApp extends StatelessWidget {
       fallbackLocale: const Locale('en', 'US'),
       title: 'ROGAINING',
       theme: ThemeData(
-        primarySwatch: Colors.blue,
+        colorScheme:
-        visualDensity: VisualDensity.adaptivePlatformDensity,
+            ColorScheme.fromSeed(seedColor: Color.fromARGB(255, 36, 135, 221)),
-        textTheme: GoogleFonts.muliTextTheme(),
+        useMaterial3: true,
       ),
       debugShowCheckedModeBanner: false,
       defaultTransition: Transition.cupertino,

lib/pages/camera/camera_page.dart

@@ -14,6 +14,8 @@ class CameraPage extends StatelessWidget {
   DestinationController destinationController = Get.find<DestinationController>();
   IndexController indexController = Get.find<IndexController>();
 
+  var settingGoal = false.obs;
+
   Timer? timer;
 
   ImageProvider getFinishImage(){
@@ -21,55 +23,74 @@ class CameraPage extends StatelessWidget {
       return FileImage(destinationController.photos[0]);
     }
     else{
-      return AssetImage('assets/images/empty_image.png');
+      return const AssetImage('assets/images/empty_image.png');
     }
   }
 
-  Widget getAction(BuildContext context){
+  Widget getAction(BuildContext context) {
     if(destinationController.is_at_goal.value && destinationController.is_in_rog.value){
       return Row(
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
               ElevatedButton(
                 onPressed: (){
-                  destinationController.openCamera(context);
+                  if(settingGoal.value ==false){
+                    destinationController.openCamera(context);
+                  }
                 }, 
                 child: Text("take_photo of the clock".tr)
               ),
               Obx(() => 
               destinationController.photos.isNotEmpty ?
-              ElevatedButton(
+                settingGoal.value == false ?
-                style: ElevatedButton.styleFrom(
+                  ElevatedButton(
-                  primary: Colors.red
+                    style: ElevatedButton.styleFrom(
-                ),
+                      backgroundColor: Colors.red
-                onPressed: (){
+                    ),
-                  int user_id = indexController.currentUser[0]["user"]["id"];
+                    onPressed: () async {
-                  //print("--- Pressed -----");
+                      settingGoal.value = true;
-                  String _team = indexController.currentUser[0]["user"]['team_name'];
+                      try{
-                  //print("--- _team : ${_team}-----");
+                        int userId = indexController.currentUser[0]["user"]["id"];
-                  String _event_code = indexController.currentUser[0]["user"]["event_code"];
+                        //print("--- Pressed -----");
-                  //print("--- _event_code : ${_event_code}-----");
+                        String _team = indexController.currentUser[0]["user"]['team_name'];
-                  String _token = indexController.currentUser[0]["token"];
+                        //print("--- _team : ${_team}-----");
-                  //print("--- _token : ${_token}-----");
+                        String _event_code = indexController.currentUser[0]["user"]["event_code"];
-                  DateTime now = DateTime.now();
+                        //print("--- _event_code : ${_event_code}-----");
-                  String formattedDate = DateFormat('yyyy-MM-dd HH:mm:ss').format(now);
+                        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){
+                        await ExternalService().makeGoal(userId, _token, _team, destinationController.photos[0].path, formattedDate, _event_code).then((value){
-                    print("---called ext api ${value['status']} ------");
+                          print("---called ext api ${value['status']} ------");
-                    if(value['status'] == 'OK'){
+                          if(value['status'] == 'OK'){
-                      Get.back();
+                            Get.back();
-                      destinationController.skip_gps = false;
+                            destinationController.skip_gps = false;
-                      Get.snackbar("目標が保存されました", "目標が正常に追加されました");
+                            Get.snackbar("目標が保存されました", "目標が正常に追加されました");
-                      destinationController.resetRogaining();
+                            destinationController.resetRogaining();
-                    }
+                          }
-                    else{
+                          else{
-                      print("---- status ${value['status']} ---- ");
+                            print("---- status ${value['status']} ---- ");
-                      Get.snackbar("目標が追加されていません", "please_try_again");
+                            Get.snackbar("目標が追加されていません", "please_try_again");
-                    }
+                          }
-                  });
+                        });
-                }, 
+                      }
-                child: Text("finish_goal".tr)
+                      on Exception catch(_){
-              ):
+                        settingGoal.value = false;
+                      }
+                      finally{
+                        settingGoal.value = false;
+                      }
+                    }, 
+                    child:Text("finish_goal".tr)
+                  )
+                :
+                Container(
+                  child: const Center(
+                    child: CircularProgressIndicator(),
+                  ),
+                ) 
+              :
               Container()
               )
             ],
@@ -84,14 +105,14 @@ class CameraPage extends StatelessWidget {
                 onPressed: (){
                   destinationController.openCamera(context);
                 }, 
-                child: destinationController.photos.length > 0 ? Text("再撮影") : Text("撮影")
+                child: destinationController.photos.isNotEmpty ? const Text("再撮影") : const Text("撮影")
               )
               ),
               Obx(() => 
               destinationController.photos.isNotEmpty ?
               ElevatedButton(
                 style: ElevatedButton.styleFrom(
-                  primary: Colors.red
+                  backgroundColor: Colors.red
                 ),
                 onPressed: (){
                   print("##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
@@ -115,7 +136,7 @@ class CameraPage extends StatelessWidget {
                   //   }
                   // });
                 }, 
-                child: Text("チェックイン")
+                child: const Text("チェックイン")
               ):
               Container()
               )
@@ -145,7 +166,7 @@ class CameraPage extends StatelessWidget {
           onPressed: (){
             Navigator.of(context).pop();
             destinationController.skip_10s = true;
-              timer = Timer.periodic(Duration(seconds: 10), (Timer t){
+              timer = Timer.periodic(const Duration(seconds: 10), (Timer t){
                 destinationController.skip_10s = false;
               });
           },
@@ -154,13 +175,13 @@ class CameraPage extends StatelessWidget {
       )
       :
       AppBar(
-        title: Text("チェックポイント"),
+        title: const Text("チェックポイント"),
       ),
       body: Column(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
           Padding(
-            padding: EdgeInsets.all(8.0),
+            padding: const EdgeInsets.all(8.0),
             child: Center(
               child: Obx(() => 
                 Container(
@@ -205,14 +226,14 @@ class StartRogaining extends StatelessWidget {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Text("You have not started rogaining yet.".tr, style: TextStyle(fontSize: 24)),
+            Text("You have not started rogaining yet.".tr, style: const TextStyle(fontSize: 24)),
-            SizedBox(height: 40.0,),
+            const SizedBox(height: 40.0,),
             ElevatedButton(
               onPressed: (){
                 Get.back();
                 destinationController.skip_gps = false;
               },
-              child: Text("Back"),
+              child: const Text("Back"),
             ),
           ],
         ),
@@ -238,14 +259,14 @@ class NotAtGoal extends StatelessWidget {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Text("You have not reached the goal yet.".tr, style: TextStyle(fontSize: 24)),
+            Text("You have not reached the goal yet.".tr, style: const TextStyle(fontSize: 24)),
-            SizedBox(height: 40.0,),
+            const SizedBox(height: 40.0,),
             ElevatedButton(
               onPressed: (){
                 Get.back();
                 destinationController.skip_gps = false;
               },
-              child: Text("Back"),
+              child: const Text("Back"),
             ),
           ],
         ),

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);
@@ -23,10 +22,10 @@ class ChangePasswordPage extends StatelessWidget {
           leading:
           IconButton( onPressed: (){
             Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
         ),
       body: 
-      Container(
+      SizedBox(
         width: double.infinity,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -37,13 +36,13 @@ class ChangePasswordPage extends StatelessWidget {
                 Column(
                   children: [
                     Container(
-                      child: Text("change_password".tr, style: TextStyle(fontSize: 24.0),),
+                      child: Text("change_password".tr, style: const TextStyle(fontSize: 24.0),),
                     ),
-                    SizedBox(height: 30,),
+                    const SizedBox(height: 30,),
                   ],
                 ),
                 Padding(
-                  padding: EdgeInsets.symmetric(
+                  padding: const EdgeInsets.symmetric(
                     horizontal: 40
                   ),
                   child: Column(
@@ -54,9 +53,9 @@ class ChangePasswordPage extends StatelessWidget {
                   ),
                 ),
                 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),
                     ),
@@ -71,7 +70,7 @@ class ChangePasswordPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: CircularProgressIndicator(),
+                      child: const CircularProgressIndicator(),
                     ) :
                       Column(
                         children: [
@@ -83,9 +82,9 @@ class ChangePasswordPage extends StatelessWidget {
                           Get.snackbar(
                             "no_values".tr,
                             "values_required".tr,
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                             snackPosition: SnackPosition.TOP,
-                            duration: Duration(milliseconds: 800),
+                            duration: const Duration(milliseconds: 800),
                             backgroundColor: Colors.yellow,
                             //icon:Image(image:AssetImage("assets/images/dora.png"))
                           );
@@ -99,12 +98,12 @@ class ChangePasswordPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("ログイン",style: TextStyle(
+                      child: const Text("ログイン",style: TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
                     ),
-                    SizedBox(height: 10.0,),
+                    const SizedBox(height: 10.0,),
                     
                         ],
                       ) 
@@ -112,8 +111,8 @@ class ChangePasswordPage extends StatelessWidget {
                   ),
                 )
                 ),
-                SizedBox(height: 20,),
+                const SizedBox(height: 20,),
-                Row(
+                const Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                    
@@ -132,17 +131,17 @@ class ChangePasswordPage extends StatelessWidget {
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:TextStyle(
+      Text(label,style:const TextStyle(
         fontSize: 15,
         fontWeight: FontWeight.w400,
         color: Colors.black87
       ),),
-      SizedBox(height: 5,),
+      const SizedBox(height: 5,),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
@@ -154,7 +153,7 @@ class ChangePasswordPage extends StatelessWidget {
         ),
       ),
       ),
-      SizedBox(height: 30.0,)
+      const SizedBox(height: 30.0,)
     ],
   );
 }

lib/pages/destination/destination_binding.dart

@@ -1,6 +1,5 @@
 import 'package:get/get.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
-import 'package:rogapp/pages/index/index_controller.dart';
 
 class DestinationBinding extends Bindings {
   @override

lib/pages/destination/destination_page.dart

@@ -1,20 +1,14 @@
-import 'dart:developer';
-import 'dart:io';
 
-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 DestnationPage extends StatelessWidget {
   DestnationPage({Key? key}) : super(key: key);
@@ -32,13 +26,13 @@ class DestnationPage extends StatelessWidget {
       permission = await Geolocator.requestPermission();
     }
     Position position = await Geolocator.getCurrentPosition(
-        desiredAccuracy: LocationAccuracy.high);
+        desiredAccuracy: LocationAccuracy.high, forceAndroidLocationManager: true);
-    indexController.rogMapController?.move(LatLng(position.latitude, position.longitude), 14);
+    indexController.rogMapController.move(LatLng(position.latitude, position.longitude), 14);
   }
 
   Image getImage(int index){
     if(destinationController.destinations[index].photos == null || destinationController.destinations[index].photos == ""){
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
     }
     else{
       return Image(image: NetworkImage(destinationController.destinations[index].photos!));
@@ -48,21 +42,18 @@ class DestnationPage extends StatelessWidget {
   Widget getRoutingImage(int route){
     switch (route) {
       case 0:
-        return Image(image: AssetImage('assets/images/p4_9_man.png'), width: 35.0,);
+        return const 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,);
+        return const 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,);
+        return const 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,);
+        return const 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);
@@ -85,12 +76,12 @@ class DestnationPage extends StatelessWidget {
                             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),),),
+                                child: Center(child: Text("select_travel_mode".tr, style: const TextStyle(fontSize: 22.0, color:Colors.red, fontWeight:FontWeight.bold),),),
                               ),
                               ListTile(
                                 selected: destinationController.travelMode == 0 ? true : false,
                                 selectedTileColor: Colors.amber.shade200,
-                                leading: Image(image: AssetImage('assets/images/p4_9_man.png'),),
+                                leading: const Image(image: AssetImage('assets/images/p4_9_man.png'),),
                                 title: Text("walking".tr),
                                 onTap:(){
                                   destinationController.travelMode.value = 0;
@@ -101,7 +92,7 @@ class DestnationPage extends StatelessWidget {
                               ListTile(
                                 selected: destinationController.travelMode == 1 ? true : false,
                                 selectedTileColor: Colors.amber.shade200,
-                                leading: Image(image: AssetImage('assets/images/p4_8_car.png'),),
+                                leading: const Image(image: AssetImage('assets/images/p4_8_car.png'),),
                                 title: Text("driving".tr),
                                 onTap:(){
                                   destinationController.travelMode.value = 1;
@@ -149,9 +140,9 @@ class DestnationPage extends StatelessWidget {
             tooltip: 'Increment',
             child: Obx(() => 
               indexController.desination_mode == 1 ?
-              Image(image: AssetImage('assets/images/list2.png'))
+              const Image(image: AssetImage('assets/images/list2.png'))
               :
-              Image(image: AssetImage('assets/images/map.png'))
+              const Image(image: AssetImage('assets/images/map.png'))
             ),
             elevation: 4.0,
           ),
@@ -170,12 +161,12 @@ class DestnationPage extends StatelessWidget {
                 destinationController.is_at_goal == true ?
                   IconButton(
                     onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, 
-                    icon: Icon(Icons.assistant_photo),
+                    icon: const Icon(Icons.assistant_photo),
                   )
                 :
                   IconButton(
                     onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, 
-                    icon: Icon(Icons.accessibility),
+                    icon: const Icon(Icons.accessibility),
                   ),
             ),
             // Obx(() => 
@@ -185,7 +176,7 @@ class DestnationPage extends StatelessWidget {
              ToggleButtons(
                   disabledColor: Colors.grey.shade200,
                   selectedColor: Colors.red,
-                children: <Widget>[
+                children: const <Widget>[
                   Icon(Icons.explore, size: 35.0,
                 )],
                 onPressed: (int index) {

lib/pages/destination_map/destination_map_page.dart

@@ -1,437 +1,177 @@
-
 import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.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(){
+  List<LatLng>? getPoints() {
-      print("##### --- route point ${indexController.routePoints.length}");
+    print("##### --- route point ${indexController.routePoints.length}");
-      List<LatLng> pts = [];
+    List<LatLng> pts = [];
-      for(PointLatLng p in indexController.routePoints){
+    for (PointLatLng p in indexController.routePoints) {
-        LatLng l = LatLng(p.latitude, p.longitude);
+      LatLng l = LatLng(p.latitude, p.longitude);
-        pts.add(l);
+      pts.add(l);
-      }
-      return pts;
     }
+    return pts;
+  }
 
-    List<Marker>? getMarkers() {
+  List<Marker>? getMarkers() {
-      List<Marker> pts = [];
+    List<Marker> pts = [];
-      int index = -1;
+    int index = -1;
-      for (int i = 0; i < destinationController.destinations.length; i++) {
+    for (int i = 0; i < destinationController.destinations.length; i++) {
-        Destination d = destinationController.destinations[i];
+      Destination d = destinationController.destinations[i];
-        print("^^^^ ${d} ^^^^");
+      print("^^^^ $d ^^^^");
-        Marker m = Marker(
+      Marker m = Marker(
           point: LatLng(d.lat!, d.lon!),
           anchorPos: AnchorPos.align(AnchorAlign.center),
-          builder:(cts){
+          builder: (cts) {
-
             return InkWell(
-              onTap: (){
+              onTap: () {
-                  print("-- Destination is --- ${d.name} ------");
+                print("-- Destination is --- ${d.name} ------");
-                  if(d != null){
+                if (indexController.currentDestinationFeature.isNotEmpty) {
-                    if(indexController.currentDestinationFeature.length > 0) {
+                  indexController.currentDestinationFeature.clear();
-                      indexController.currentDestinationFeature.clear();
+                }
-                    }
+                indexController.currentDestinationFeature.add(d);
-                    indexController.currentDestinationFeature.add(d);
+                //indexController.getAction();
-                    //indexController.getAction();
 
-                    showModalBottomSheet(context: Get.context!, isScrollControlled: true, 
+                showModalBottomSheet(
-                     builder:((context) => BottomSheetNew())
+                    context: Get.context!,
-                    ).whenComplete((){
+                    isScrollControlled: true,
-                      print("---- set skip gps to false -----");
+                    constraints: BoxConstraints.loose(
-                      destinationController.skip_gps = false;
+                        Size(Get.width, Get.height * 0.75)),
-                    });
+                    builder: ((context) => BottomSheetNew())).whenComplete(() {
-                  }
+                  print("---- set skip gps to false -----");
+                  destinationController.skip_gps = false;
+                });
               },
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Container(
-                      width:20,
+                    width: 20,
-                      height:20,
+                    height: 20,
-                    decoration:  BoxDecoration(
+                    decoration: BoxDecoration(
                       color: Colors.red,
                       shape: BoxShape.circle,
-                      border: new Border.all(
+                      border: Border.all(
                         color: Colors.white,
-                        width: d.checkin_radious != null ? d.checkin_radious! : 1,
+                        width:
+                            d.checkin_radious != null ? d.checkin_radious! : 1,
                       ),
                     ),
-                    child: new Center(
+                    child: Center(
-                      child: new Text(
+                      child: Text(
                         (i + 1).toString(),
-                        style: TextStyle(color: Colors.white),
+                        style: const TextStyle(color: Colors.white),
                       ),
                     ),
                   ),
-                  Container( color: Colors.yellow, child: Text(TextUtils.getDisplayText(d), style: TextStyle(fontSize: 15.0, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),)),
+                  Container(
+                      color: Colors.yellow,
+                      child: Text(
+                        TextUtils.getDisplayText(d),
+                        style: const TextStyle(
+                            fontSize: 15.0,
+                            fontWeight: FontWeight.bold,
+                            overflow: TextOverflow.visible),
+                      )),
                 ],
               ),
             );
+          });
 
-        });
+      pts.add(m);
-        
-        pts.add(m);
-      }
-      return pts;
     }
+    return pts;
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Obx((() => 
+    return Obx((() => Stack(
-      Stack(
+          children: [
-        children: [
+            // indexController.is_rog_mapcontroller_loaded.value == false ?
-          // indexController.is_rog_mapcontroller_loaded.value == false ? 
+            //   Center(child: CircularProgressIndicator())
-          //   Center(child: CircularProgressIndicator())
+            // :
-          // :
+            // Padding(
-          // Padding(
+            //   padding: const EdgeInsets.only(left:8.0),
-          //   padding: const EdgeInsets.only(left:8.0),
+            //   child: BreadCrumbWidget(mapController:indexController.rogMapController),
-          //   child: BreadCrumbWidget(mapController:indexController.rogMapController),
+            // ),
-          // ),
+            Padding(
-          Padding(
+              padding: const EdgeInsets.only(top: 0.0),
-            padding: const EdgeInsets.only(top:0.0),
+              //child: TravelMap(),
-            //child: TravelMap(),
+              child: TravelMap(),
-            child: 
+            ),
-              TravelMap(),
+          ],
-          ),
+        )));
-        ],
-      )
-    ));
   }
 
   FlutterMap TravelMap() {
     return FlutterMap(
       mapController: indexController.rogMapController,
-    options: MapOptions(
+      options: MapOptions(
-      onMapReady: (){
+        onMapReady: () {
-            indexController.is_rog_mapcontroller_loaded.value = true;
+          indexController.is_rog_mapcontroller_loaded.value = true;
-            subscription = indexController.rogMapController!.mapEventStream.listen((MapEvent mapEvent) {
+          subscription = indexController.rogMapController.mapEventStream
-            if (mapEvent is MapEventMoveStart) {
+              .listen((MapEvent mapEvent) {
-            }
+            if (mapEvent is MapEventMoveStart) {}
             if (mapEvent is MapEventMoveEnd) {
               //destinationController.is_gps_selected.value = true;
               //indexController.mapController!.move(c.center, c.zoom);
-              LatLngBounds bounds = indexController.rogMapController!.bounds!;
+              LatLngBounds bounds = indexController.rogMapController.bounds!;
               indexController.currentBound.clear();
               indexController.currentBound.add(bounds);
-              if(indexController.currentUser.length <= 0){
+              if (indexController.currentUser.isEmpty) {
                 indexController.loadLocationsBound();
               }
             }
           });
-      } ,
+        },
-      bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
+        bounds: indexController.currentBound.isNotEmpty
-      zoom: 1,
+            ? indexController.currentBound[0]
-      maxZoom: 42,
+            : LatLngBounds.fromPoints([
-      interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
+                LatLng(35.03999881162295, 136.40587119778962),
-    ),
+                LatLng(36.642756778706904, 137.95226720406063)
-    children: [
+              ]),
-      BaseLayer(),
+        zoom: 1,
-      Obx(() =>
+        maxZoom: 42,
-      indexController.routePointLenght > 0 ?
+        interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
-        PolylineLayer(
-            polylines: [
-              Polyline(
-                points: getPoints()!,
-                  strokeWidth: 6.0,
-                    color: Colors.indigo
-              ),
-            ],
-        )
-        
-        :
-        Container(),
       ),
-      CurrentLocationLayer(), 
+      children: [
-      MarkerLayer(
+        const BaseLayer(),
-        markers: getMarkers()!
+        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,7 +1,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/routes/app_pages.dart';
 import 'package:rogapp/services/auth_service.dart';
@@ -33,16 +32,16 @@ class DrawerPage extends StatelessWidget {
                 child: Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: 
-                  indexController.currentUser.length == 0 ?
+                  indexController.currentUser.isEmpty ?
-                    Flexible(child: Text("drawer_title".tr, style: TextStyle(color: Colors.black, fontSize: 20),))
+                    Flexible(child: Text("drawer_title".tr, style: const TextStyle(color: Colors.black, fontSize: 20),))
                     :
-                    Text(indexController.currentUser[0]['user']['email'], style: 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 ?
+              indexController.currentUser.isEmpty ?
               ListTile(
                 leading: const Icon(Icons.login),
                 title: Text("login".tr),
@@ -55,11 +54,11 @@ class DrawerPage extends StatelessWidget {
                 title: Text("logout".tr),
                 onTap: (){
                   indexController.logout();
-                  Get.toNamed(AppPages.TRAVEL);
+                  Get.toNamed(AppPages.LOGIN);
                 },
               )
             ),
-            indexController.currentUser.length > 0 ?
+            indexController.currentUser.isNotEmpty ?
             ListTile(
               leading: const Icon(Icons.password),
               title: Text("change_password".tr),
@@ -67,8 +66,8 @@ class DrawerPage extends StatelessWidget {
                 Get.toNamed(AppPages.CHANGE_PASSWORD);
               },
             ) : 
-            Container(width: 0, height: 0,),
+            const SizedBox(width: 0, height: 0,),
-            indexController.currentUser.length == 0 ?
+            indexController.currentUser.isEmpty ?
             ListTile(
               leading: const Icon(Icons.person),
               title: Text("sign_up".tr),
@@ -76,8 +75,8 @@ class DrawerPage extends StatelessWidget {
                 Get.toNamed(AppPages.REGISTER);
               },
             ) : 
-            Container(width: 0, height: 0,),
+            const SizedBox(width: 0, height: 0,),
-            indexController.currentUser.length > 0 ?
+            indexController.currentUser.isNotEmpty ?
             ListTile(
               leading: const Icon(Icons.delete_forever),
               title: Text("delete_account".tr),
@@ -92,7 +91,7 @@ class DrawerPage extends StatelessWidget {
                 });
               },
             ) : 
-            Container(width: 0, height: 0,),
+            const SizedBox(width: 0, height: 0,),
             // ListTile(
             //   leading: const Icon(Icons.person),
             //   title: Text("profile".tr),
@@ -108,7 +107,7 @@ class DrawerPage extends StatelessWidget {
             //   title: Text("point_rank".tr),
             //   onTap: (){},
             // ),
-            indexController.currentUser.length > 0 ?
+            indexController.currentUser.isNotEmpty ?
             ListTile(
               leading: const Icon(Icons.featured_video),
               title: Text("rog_web".tr),
@@ -116,7 +115,7 @@ class DrawerPage extends StatelessWidget {
                 _launchURL("https://www.gifuai.net/?page_id=17397");
               },
             ) : 
-            Container(width: 0, height: 0,),
+            const SizedBox(width: 0, height: 0,),
             ListTile(
               leading: const Icon(Icons.privacy_tip),
               title: Text("privacy".tr),

lib/pages/history/history_page.dart

@@ -0,0 +1,76 @@
+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: Text("History"),
+      ),
+      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: TextStyle(fontSize: 18),
+                        ),
+                      );
+                    } else if (snapshot.hasData) {
+                      final dests = snapshot.data;
+                      if (dests!.length > 0) {
+                        print("----- history -----");
+                        return Container(
+                            width: MediaQuery.of(context).size.width,
+                            height: 150,
+                            child: Expanded(
+                              child: ListView.builder(
+                                  itemCount: dests.length,
+                                  itemBuilder: (ctx, index) {
+                                    return ListTile(
+                                      title: Text(dests[index].name ?? ""),
+                                      subtitle:
+                                          Text(dests[index].address ?? ""),
+                                      leading: dests[0].photos != null
+                                          ? Container(width: 100, height: 100, child: Image.file(File(dests[0].photos!)))
+                                          : Container(),
+                                    );
+                                  }),
+                            ));
+                      } else {
+                        return Center(child: Text("No checkin yet"));
+                      }
+                    }
+                  } else if (snapshot.connectionState ==
+                      ConnectionState.waiting) {
+                    return Center(
+                      child: CircularProgressIndicator(),
+                    );
+                  }
+                  return Container();
+                }),
+          ],
+        ),
+      ),
+    );
+  }
+}

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,7 +1,5 @@
 
-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';
 
 class IndexBinding extends Bindings {

lib/pages/index/index_controller.dart

@@ -20,6 +20,7 @@ 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;
@@ -39,6 +40,8 @@ class IndexController extends GetxController {
   List<PointLatLng> routePoints = <PointLatLng>[].obs;
   var routePointLenght = 0.obs;
 
+  double current_lat = 0.0, current_lon = 0.0;
+
   var is_loading = false.obs;
 
   var is_mapController_loaded = false.obs;
@@ -49,6 +52,8 @@ class IndexController extends GetxController {
   MapController mapController = MapController();
   MapController rogMapController = MapController();
 
+  String? userToken;
+
   var mode = 0.obs;
 
   // master mode, rog or selection
@@ -117,11 +122,12 @@ class IndexController extends GetxController {
     }
   }
 
+
   @override
   void onInit() {
     _ever = ever(rog_mode, (_) => print("$_ has been changed (ever)"));
 
-    if(perfectures.length == 0){
+    if(perfectures.isEmpty){
       PerfectureService.loadPerfectures().then((value){
         perfectures.add(value);
         loadAreaFor("9");
@@ -131,7 +137,6 @@ class IndexController extends GetxController {
     } 
 
     _connectivitySubscription = _connectivity.onConnectivityChanged.listen(_updateConnectionStatus);
-
     super.onInit();
 }
 
@@ -189,56 +194,33 @@ List<LatLng> getLocationsList(){
 }
 
 
-void login(String email, String password, BuildContext context){
+  void login(String email, String password, BuildContext context) {
-     AuthService.login(email, password).then((value){
+    AuthService.login(email, password).then((value) {
-      print("------- logged in user details ######## ${value} ###### --------");
+      print("------- logged in user details ######## $value ###### --------");
-       if(value.isNotEmpty){
+      if (value.isNotEmpty) {
-          currentUser.clear();
+        Navigator.pop(context);
-          currentUser.add(value);
+        print("--------- user details login ----- $value");
-          is_loading.value = false;
+        changeUser(value);
-          Navigator.pop(context);
+      } else {
-          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",
+          "Failed",
-               "User login failed, please try again.",
+          "User login failed, please try again.",
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+          icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
-               snackPosition: SnackPosition.TOP,
+          snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+          duration: const Duration(milliseconds: 800),
-               backgroundColor: Colors.yellow,
+          backgroundColor: Colors.yellow,
-               //icon:Image(image:AssetImage("assets/images/dora.png"))
+          //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} ###### --------");
+      print("------- change password ######## $value ###### --------");
        if(value.isNotEmpty){
         is_loading.value = false;
         Navigator.pop(context);
@@ -252,9 +234,9 @@ void login(String email, String password, BuildContext context){
         Get.snackbar(
               'failed'.tr,
                'password_change_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+               icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
                snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+               duration: const Duration(milliseconds: 800),
                backgroundColor: Colors.yellow,
                //icon:Image(image:AssetImage("assets/images/dora.png"))
                );
@@ -269,9 +251,7 @@ void login(String email, String password, BuildContext context){
     DatabaseHelper db = DatabaseHelper.instance;
     db.deleteAllDestinations().then((value){
       DestinationController destinationController = Get.find<DestinationController>();
-      if(destinationController != null){
+      destinationController.PopulateDestinations();
-        destinationController.PopulateDestinations();
-      }
     });
     currentUser.clear();
     cats.clear();
@@ -291,9 +271,9 @@ void login(String email, String password, BuildContext context){
          Get.snackbar(
               'failed'.tr,
               'user_registration_failed_please_try_again'.tr,
-               icon: Icon(Icons.error, size: 40.0, color: Colors.blue),
+               icon: const Icon(Icons.error, size: 40.0, color: Colors.blue),
                snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+               duration: const Duration(milliseconds: 800),
                backgroundColor: Colors.yellow,
                //icon:Image(image:AssetImage("assets/images/dora.png"))
                );
@@ -302,13 +282,13 @@ void login(String email, String password, BuildContext context){
    }
 
    void makeAction(BuildContext context){
-    int user_id = currentUser[0]["user"]["id"] as int;
+    int userId = currentUser[0]["user"]["id"] as int;
-    int location_id = currentFeature[0].properties!["location_id"] as int;
+    int locationId = currentFeature[0].properties!["location_id"] as int;
      bool wanttogo = currentAction[0][0]["wanttogo"];
      bool like = currentAction[0][0]["like"];
      bool checkin = currentAction[0][0]["checkin"];
-     if(user_id > 0){
+     if(userId > 0){
-       ActionService.makeAction(user_id, location_id, wanttogo, like, checkin).then((value){
+       ActionService.makeAction(userId, locationId, wanttogo, like, checkin).then((value){
        });
      }
      
@@ -316,7 +296,7 @@ void login(String email, String password, BuildContext context){
 
   String getCatText(){
     String _cat = 'all'.tr;
-    if(currentUser.length > 0){
+    if(currentUser.isNotEmpty){
       Map<String, dynamic> _urs = currentUser[0];
       print('-- is_rogaining :-- ${_urs['user']['is_rogaining']} ------');
       if(_urs['user']['is_rogaining'] == true){
@@ -331,8 +311,8 @@ void login(String email, String password, BuildContext context){
 
   void loadCatsv2(){
      dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController!.bounds!;
+     LatLngBounds bounds = mapController.bounds!;
-     if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
+     if(bounds.southWest != null && bounds.northEast != null ){
        CatService.loadCats(bounds.southWest!.latitude, bounds.southWest!.longitude, bounds.northWest.latitude, bounds.northWest.longitude, bounds.northEast!.latitude, bounds.northEast!.longitude, bounds.southEast.latitude, bounds.southEast.longitude).then((value) {
           cats.clear();
           cats.add(initVal);
@@ -347,8 +327,8 @@ void login(String email, String password, BuildContext context){
 
    void loadCatForCity(String city){
     dynamic initVal = {'category':getCatText()};
-     LatLngBounds bounds = mapController!.bounds!;
+     LatLngBounds bounds = mapController.bounds!;
-     if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
+     if(bounds.southWest != null && bounds.northEast != null ){
        CatService.loadCatByCity(city).then((value) {
           cats.clear();
           cats.add(initVal);
@@ -393,12 +373,12 @@ void login(String email, String password, BuildContext context){
   }
 
   void loadUserDetails(){
-    if(currentUser.length > 0){
+    if(currentUser.isNotEmpty){
-      int user_id = currentUser[0]["user"]["id"] as int;
+      int userId = currentUser[0]["user"]["id"] as int;
-      AuthService.UserDetails(user_id).then((value){
+      AuthService.UserDetails(userId).then((value){
-        print("--------- user details ----- ${value}");
+        print("--------- user details ----- $value");
         if(value != null && value.isNotEmpty){
-          bool paid = value![0]["paid"] as bool;
+          bool paid = value[0]["paid"] as bool;
           if(paid){
             loadCustomAreas();
           }
@@ -407,11 +387,63 @@ void login(String email, String password, BuildContext context){
     }
   }
 
+  void saveToDevice(String val) async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    await prefs.setString("user_token", val);
+  }
+
+  void changeUser(Map<String, dynamic> value, {bool replace = true}) {
+    print("---- change user to ${value} -----");
+    currentUser.clear();
+    currentUser.add(value);
+    if(replace){
+      saveToDevice(currentUser[0]["token"]);
+    }
+    is_loading.value = false;
+    loadUserDetails();
+    loadLocationsBound();
+    cats.clear();
+    if (currentFeature.isNotEmpty) {
+      getAction();
+    }
+
+    if (currentUser.isNotEmpty) {
+      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);
+  }
+
+  loadUserDetailsForToken(String token) async {
+      AuthService.userForToken(token).then((value) {
+        print("----token val-- $value  ------");
+        if(value![0]["user"].isEmpty){
+          Get.toNamed(AppPages.LOGIN);
+          return;
+        }
+        changeUser(value[0], replace:false);
+        print("--------- user details ----- $value");
+        // if (value != null && value.isNotEmpty) {
+        //   bool paid = value[0]["paid"] as bool;
+        //   if (paid) {
+        //     loadCustomAreas();
+        //   }
+        // }
+      });
+  }
+
 
   void loadCustomAreas(){
     customAreas.clear();
     PerfectureService.loadCustomAreas().then((value){
-      print("--- loading custom areas ${value}");
+      print("--- loading custom areas $value");
       customAreas.add(value);
     });
   }
@@ -429,7 +461,7 @@ void login(String email, String password, BuildContext context){
 
   String getSubInitialVal(){
     int min = 0;
-    if(subPerfs.length > 0){
+    if(subPerfs.isNotEmpty){
       min = int.parse(subPerfs[0][0]['id'].toString());
       for(var sub in subPerfs[0]){
         int x = int.parse(sub['id'].toString()); // as int;
@@ -469,16 +501,16 @@ void login(String email, String password, BuildContext context){
     if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
       cat = "";
     }
-    print("----- ${customarea}");
+    print("----- $customarea");
     LocationService.loadCustomLocations(customarea, cat).then((value){
       locations.clear();
       locations.add(value!);
       List<LatLng> locs = getLocationsList();
       LatLngBounds bounds = boundsFromLatLngList(locs);
-      mapController!.fitBounds(bounds);
+      mapController.fitBounds(bounds);
       setBound(bounds);
-      Future.delayed(Duration(microseconds: 400), () {
+      Future.delayed(const Duration(microseconds: 400), () {
-        mapController!.fitBounds(bounds);
+        mapController.fitBounds(bounds);
       });
       
     });
@@ -493,33 +525,33 @@ void login(String email, String password, BuildContext context){
     if(currentCat.isNotEmpty && currentCat[0] == "-all-"){
       cat = "";
     }
-    LatLngBounds bounds = mapController!.bounds!;
+    LatLngBounds bounds = mapController.bounds!;
     currentBound.clear();
     currentBound.add(bounds);
     //print(currentCat);
-    if(bounds.southEast != null && bounds.southWest != null && bounds.northEast != null && bounds.southEast != null ){
+    if(bounds.southWest != null && bounds.northEast != null ){
       LocationService.loadLocationsBound(bounds.southWest!.latitude, bounds.southWest!.longitude, bounds.northWest.latitude, bounds.northWest.longitude, bounds.northEast!.latitude, bounds.northEast!.longitude, bounds.southEast.latitude, bounds.southEast.longitude, cat).then((value){
       //print("---value length ------ ${value!.collection.length}");
       if(value == null){
         return;
       }
-      if(value != null && value.collection.isEmpty){
+      if(value.collection.isEmpty){
         if(showPopup == false) {
           return;
         }
         Get.snackbar(
               "Too many Points",
                "please zoom in",
-               icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+               icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                snackPosition: SnackPosition.TOP,
-               duration: Duration(milliseconds: 800),
+               duration: const Duration(milliseconds: 800),
                backgroundColor: Colors.yellow,
                //icon:Image(image:AssetImage("assets/images/dora.png"))
                );
         showPopup = false;
         //Get.showSnackbar(GetSnackBar(message: "Too many points, please zoom in",));
       }
-      if(value != null && value.collection.isNotEmpty){
+      if(value.collection.isNotEmpty){
           //print("---- added---");
           locations.add(value);
           loadCatsv2();
@@ -540,7 +572,7 @@ void login(String email, String password, BuildContext context){
       LatLng lat1 = LatLng(value![1], value[0]);
       LatLng lat2 = LatLng(value[3], value[2]);
       LatLngBounds bound = LatLngBounds(lat1, lat2);
-      mapController!.fitBounds(bound);
+      mapController.fitBounds(bound);
       setBound(bound);
     });
     
@@ -554,7 +586,7 @@ void login(String email, String password, BuildContext context){
       LatLng lat1 = LatLng(value![1], value[0]);
       LatLng lat2 = LatLng(value[3], value[2]);
       LatLngBounds bound = LatLngBounds(lat1, lat2);
-      mapController!.fitBounds(bound);
+      mapController.fitBounds(bound);
       setBound(bound);
     });
     
@@ -584,7 +616,7 @@ void login(String email, String password, BuildContext context){
 
   
   GeoJsonFeature? getFeatureForLatLong(double lat, double long){
-      if(locations.length > 0){
+      if(locations.isNotEmpty){
           for(GeoJsonFeature i in locations[0].collection){
             GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
             if(p.geoSerie!.geoPoints[0].latitude == lat && p.geoSerie!.geoPoints[0].longitude  == long){
@@ -592,25 +624,26 @@ void login(String email, String password, BuildContext context){
           }
         }
       }
+      return null;
   }
 
   void getAction(){
     //print(currentUser[0]["user"]["id"]);
     //print(currentFeature[0].properties!["location_id"]);
-    if(currentUser.length == 0){
+    if(currentUser.isEmpty){
       return;
     }
-    int user_id = currentUser[0]["user"]["id"] as int;
+    int userId = currentUser[0]["user"]["id"] as int;
     print("---- loc id ${currentFeature[0].properties}");
-    int location_id = currentFeature[0].properties!["location_id"] as int;
+    int locationId = currentFeature[0].properties!["location_id"] as int;
-    ActionService.userAction(user_id, location_id).then((value){
+    ActionService.userAction(userId, locationId).then((value){
-      print("------${value}");
+      print("------$value");
-      if(value != null && value.length > 0){
+      if(value != null && value.isNotEmpty){
         currentAction.clear();
         currentAction.add(value);
         print("------${currentAction[0]}");
       }else{
-        List<dynamic> initval = [{"user": user_id, "location": location_id, "wanttogo": false, "like": false, "checkin": false}];
+        List<dynamic> initval = [{"user": userId, "location": locationId, "wanttogo": false, "like": false, "checkin": false}];
         currentAction.clear();
         currentAction.add(initval);
       }
@@ -630,15 +663,15 @@ void login(String email, String password, BuildContext context){
 
       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){
+          if(currentFeature.isNotEmpty){
             currentFeature.clear();
           }
           if(i >= locations[0].collection.length - 1 ){
-            currentFeature.add(locations[0].collection[0] as GeoJsonFeature);
+            currentFeature.add(locations[0].collection[0]);
             getAction();
           }
           else{
-            currentFeature.add(locations[0].collection[i + 1] as GeoJsonFeature);
+            currentFeature.add(locations[0].collection[i + 1]);
             getAction();
           }
       }
@@ -663,15 +696,15 @@ void login(String email, String password, BuildContext context){
 
         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){
+            if(currentFeature.isNotEmpty){
               currentFeature.clear();
             }
             if(i == 0 ){
-              currentFeature.add(locations[0].collection[locations[0].collection.length -1] as GeoJsonFeature);
+              currentFeature.add(locations[0].collection[locations[0].collection.length -1]);
               getAction();
             }
             else{
-              currentFeature.add(locations[0].collection[i - 1] as GeoJsonFeature);
+              currentFeature.add(locations[0].collection[i - 1]);
               getAction();
             }
         }

lib/pages/index/index_page.dart

@@ -1,62 +1,66 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/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/utils/database_helper.dart';
-import 'package:rogapp/widgets/bread_crum_widget.dart';
-import 'package:rogapp/widgets/cat_widget.dart';
 import 'package:rogapp/widgets/list_widget.dart';
 import 'package:rogapp/widgets/map_widget.dart';
 
-import 'package:flutter_polyline_points/flutter_polyline_points.dart';
-
 class IndexPage extends GetView<IndexController> {
   IndexPage({Key? key}) : super(key: key);
 
   final IndexController indexController = Get.find<IndexController>();
-  final DestinationController destinationController = Get.find<DestinationController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
 
   @override
   Widget build(BuildContext context) {
     return WillPopScope(
-      onWillPop: () async {
+      onWillPop: () async => false,
-        indexController.switchPage(AppPages.INITIAL);
-        return false;
-      },
       child: Scaffold(
-        //drawer: const DrawerPage(),
+        drawer: DrawerPage(),
-          appBar: AppBar(
+        appBar: AppBar(
-              leading: IconButton(
+          //  automaticallyImplyLeading: false,
-              icon: Icon(Icons.arrow_back_ios),
+          //   leading: IconButton(
-              onPressed: (){
+          //   icon: Icon(Icons.arrow_back_ios),
-                indexController.switchPage(AppPages.TRAVEL);
+          //   onPressed: (){
+          //     indexController.switchPage(AppPages.TRAVEL);
+          //   },
+          // ),
+          //automaticallyImplyLeading: false,
+          title: Text("add_location".tr),
+          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(
-            //automaticallyImplyLeading: false,
+                height: 32,
-            title: Text("add_location".tr),
+                width: 75,
-            actions: [
+                decoration: BoxDecoration(
-              InkWell(
+                  color: Colors.blue,
-                  onTap: (){
+                  borderRadius: BorderRadius.circular(25),
-                     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,),
+                child: const Center(
+                  child: Icon(Icons.search),
+                ),
+              ),
+            ),
+            //CatWidget(indexController: indexController,),
           ],
         ),
         bottomNavigationBar: BottomAppBar(
@@ -64,49 +68,57 @@ class IndexPage extends GetView<IndexController> {
             mainAxisAlignment: MainAxisAlignment.end,
             children: <Widget>[
               Padding(
-                padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+                padding:
+                    const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
                 child: InkWell(
-                  child: 
+                    child:
-                  Obx(() =>
+                        Obx(() => destinationController.is_gps_selected == true
-                    destinationController.is_gps_selected == true ? 
+                            ? Padding(
-                      Padding(
+                                padding: const EdgeInsets.only(
-                        padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+                                    right: 10.0, top: 4.0, bottom: 4.0),
-                        child: InkWell(
+                                child: InkWell(
-                          child: Image(image: AssetImage('assets/images/route3_off.png'), width: 35, height: 35,),
+                                  child: const Image(
-                          onTap: (){
+                                    image: AssetImage(
-                            indexController.switchPage(AppPages.TRAVEL);
+                                        'assets/images/route3_off.png'),
-                          },
+                                    width: 35,
-                        ),
+                                    height: 35,
-                      ) :
+                                  ),
-                      Padding(
+                                  onTap: () {
-                        padding: const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
+                                    //indexController.switchPage(AppPages.TRAVEL);
-                        child: InkWell(
+                                  },
-                          child: Image(image: AssetImage('assets/images/route2_on.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){
+            if (indexController.currentCat.isNotEmpty) {
-        print(indexController.currentCat[0].toString());
+              print(indexController.currentCat[0].toString());
-      }
+            }
-      
           },
           tooltip: 'Increment',
-          child: Obx(() =>
+          child: Obx(
-            indexController.mode == 0 ? 
+            () => indexController.mode == 0
-            Image(image: AssetImage('assets/images/list2.png'))
+                ? const Image(image: AssetImage('assets/images/list2.png'))
-            :
+                : const Image(image: AssetImage('assets/images/map.png')),
-            Image(image: AssetImage('assets/images/map.png')),
           ),
           elevation: 4.0,
         ),
@@ -161,18 +173,15 @@ class IndexPage extends GetView<IndexController> {
               //   ),
               // ),
               Expanded(
-                child: Obx(() => 
+                  child: Obx(
-                  indexController.mode == 0 ?
+                () => indexController.mode == 0
-                  MapWidget() :
+                    ? MapWidget()
-                  ListWidget(),
+                    : const ListWidget(),
-                )
+              ))
-    
-              )
             ],
           ),
         ),
       ),
     );
   }
-
 }

lib/pages/landing/landing_page.dart

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

lib/pages/loading/loading_page.dart

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

lib/pages/login/login_page.dart

@@ -11,6 +11,8 @@ class LoginPage extends StatelessWidget {
   TextEditingController emailController = TextEditingController();
   TextEditingController passwordController = TextEditingController();
 
+  LoginPage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -22,11 +24,11 @@ class LoginPage extends StatelessWidget {
           leading:
           IconButton( onPressed: (){
             Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
         ),
       body: 
-      indexController.currentUser.length == 0 ?
+      indexController.currentUser.isEmpty ?
-      Container(
+      SizedBox(
         width: double.infinity,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -37,16 +39,16 @@ class LoginPage extends StatelessWidget {
                   children: [
                     Container(
                       height: MediaQuery.of(context).size.height/6,
-                      decoration: BoxDecoration(
+                      decoration: const BoxDecoration(
                         image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
                       ),
                     ),
-                    SizedBox(height: 5,),
+                    const SizedBox(height: 5,),
 
                   ],
                 ),
                 Padding(
-                  padding: EdgeInsets.symmetric(
+                  padding: const EdgeInsets.symmetric(
                     horizontal: 40
                   ),
                   child: Column(
@@ -57,9 +59,9 @@ class LoginPage extends StatelessWidget {
                   ),
                 ),
                 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),
                     ),
@@ -74,7 +76,7 @@ class LoginPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: CircularProgressIndicator(),
+                      child: const CircularProgressIndicator(),
                     ) :
                       Column(
                         children: [
@@ -86,9 +88,9 @@ class LoginPage extends StatelessWidget {
                           Get.snackbar(
                             "no_values".tr,
                             "email_and_password_required".tr,
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                             snackPosition: SnackPosition.TOP,
-                            duration: Duration(milliseconds: 800),
+                            duration: const Duration(milliseconds: 800),
                             backgroundColor: Colors.yellow,
                             //icon:Image(image:AssetImage("assets/images/dora.png"))
                           );
@@ -101,12 +103,12 @@ class LoginPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("ログイン",style: TextStyle(
+                      child: const Text("ログイン",style: TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
                     ),
-                    SizedBox(height: 5.0,),
+                    const SizedBox(height: 5.0,),
                     MaterialButton(
                       minWidth: double.infinity,
                       height:40,
@@ -117,12 +119,12 @@ class LoginPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("sign_up".tr,style: TextStyle(
+                      child: Text("sign_up".tr,style: const TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
                     ),
-                    SizedBox(height: 2.0,),
+                    const SizedBox(height: 2.0,),
                     MaterialButton(
                       minWidth: double.infinity,
                       height:40,
@@ -133,7 +135,7 @@ class LoginPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("cancel".tr,style: TextStyle(
+                      child: Text("cancel".tr,style: const TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
@@ -144,14 +146,14 @@ class LoginPage extends StatelessWidget {
                   ),
                 )
                 ),
-                SizedBox(height: 5,),
+                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: TextStyle(
+                        child: Text("rogaining_user_need_tosign_up".tr, style: const TextStyle(
                           overflow: TextOverflow.ellipsis,
                         ),),
                       ),
@@ -164,7 +166,7 @@ class LoginPage extends StatelessWidget {
                     Flexible(
                       child: Padding(
                         padding: const EdgeInsets.all(8.0),
-                        child: Text("app_developed_by_gifu_dx".tr, style: TextStyle(
+                        child: Text("app_developed_by_gifu_dx".tr, style: const TextStyle(
                           overflow: TextOverflow.ellipsis, fontSize: 10.0
                         ),),
                       ),
@@ -182,7 +184,7 @@ class LoginPage extends StatelessWidget {
           onPressed: (){
             indexController.currentUser.clear();
           },
-          child: Text("Already Logged in, Click to logout"),
+          child: const Text("Already Logged in, Click to logout"),
         ),
       )
       ,
@@ -194,17 +196,17 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:TextStyle(
+      Text(label,style:const TextStyle(
         fontSize: 15,
         fontWeight: FontWeight.w400,
         color: Colors.black87
       ),),
-      SizedBox(height: 5,),
+      const SizedBox(height: 5,),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
@@ -216,7 +218,7 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
         ),
       ),
       ),
-      SizedBox(height: 30.0,)
+      const SizedBox(height: 30.0,)
     ],
   );
 }

lib/pages/login_popup/login_popup_page.dart

@@ -22,11 +22,11 @@ class LoginPopupPage extends StatelessWidget {
           leading:
           IconButton( onPressed: (){
             Navigator.pop(context);
-          },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+          },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
         ),
       body: 
-      indexController.currentUser.length == 0 ?
+      indexController.currentUser.isEmpty ?
-      Container(
+      SizedBox(
         width: double.infinity,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -37,16 +37,16 @@ class LoginPopupPage extends StatelessWidget {
                   children: [
                     Container(
                       height: MediaQuery.of(context).size.height/5,
-                      decoration: BoxDecoration(
+                      decoration: const BoxDecoration(
                         image:DecorationImage(image: AssetImage('assets/images/login_image.jpg'))
                       ),
                     ),
-                    SizedBox(height: 5,),
+                    const SizedBox(height: 5,),
 
                   ],
                 ),
                 Padding(
-                  padding: EdgeInsets.symmetric(
+                  padding: const EdgeInsets.symmetric(
                     horizontal: 40
                   ),
                   child: Column(
@@ -57,9 +57,9 @@ class LoginPopupPage extends StatelessWidget {
                   ),
                 ),
                 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),
                     ),
@@ -74,7 +74,7 @@ class LoginPopupPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: CircularProgressIndicator(),
+                      child: const CircularProgressIndicator(),
                     ) :
                       Column(
                         children: [
@@ -86,9 +86,9 @@ class LoginPopupPage extends StatelessWidget {
                           Get.snackbar(
                             "no_values".tr,
                             "email_and_password_required".tr,
-                            icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                            icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                             snackPosition: SnackPosition.TOP,
-                            duration: Duration(milliseconds: 800),
+                            duration: const Duration(milliseconds: 800),
                             backgroundColor: Colors.yellow,
                             //icon:Image(image:AssetImage("assets/images/dora.png"))
                           );
@@ -101,12 +101,12 @@ class LoginPopupPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("ログイン",style: TextStyle(
+                      child: const Text("ログイン",style: TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
                     ),
-                    SizedBox(height: 19.0,),
+                    const SizedBox(height: 19.0,),
                     MaterialButton(
                       minWidth: double.infinity,
                       height:50,
@@ -117,12 +117,12 @@ class LoginPopupPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("sign_up".tr,style: TextStyle(
+                      child: Text("sign_up".tr,style: const TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
                     ),
-                    SizedBox(height: 19.0,),
+                    const SizedBox(height: 19.0,),
                     MaterialButton(
                       minWidth: double.infinity,
                       height:50,
@@ -133,7 +133,7 @@ class LoginPopupPage extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(40)
                       ),
-                      child: Text("cancel".tr,style: TextStyle(
+                      child: Text("cancel".tr,style: const TextStyle(
                         fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70
                       ),
                       ),
@@ -144,14 +144,14 @@ class LoginPopupPage extends StatelessWidget {
                   ),
                 )
                 ),
-                SizedBox(height: 20,),
+                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: TextStyle(
+                        child: Text("rogaining_user_need_tosign_up".tr, style: const TextStyle(
                           overflow: TextOverflow.ellipsis,
                         ),),
                       ),
@@ -169,7 +169,7 @@ class LoginPopupPage extends StatelessWidget {
           onPressed: (){
             indexController.currentUser.clear();
           },
-          child: Text("Already Logged in, Click to logout"),
+          child: const Text("Already Logged in, Click to logout"),
         ),
       )
       ,
@@ -181,17 +181,17 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:TextStyle(
+      Text(label,style:const TextStyle(
         fontSize: 15,
         fontWeight: FontWeight.w400,
         color: Colors.black87
       ),),
-      SizedBox(height: 5,),
+      const SizedBox(height: 5,),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
@@ -203,7 +203,7 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
         ),
       ),
       ),
-      SizedBox(height: 30.0,)
+      const SizedBox(height: 30.0,)
     ],
   );
 }

lib/pages/mainperf/mainperf_page.dart

@@ -11,7 +11,7 @@ class MainPerfPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text("Select Main Perfecture"),
+        title: const Text("Select Main Perfecture"),
       ),
       body: ListView.builder(
         itemCount: indexController.perfectures.length,
@@ -19,7 +19,7 @@ class MainPerfPage extends StatelessWidget {
           return ListTile(
             onTap: (){
               indexController.dropdownValue = indexController.perfectures[index][0]["id"].toString();
-              indexController.populateForPerf(indexController.dropdownValue, indexController.mapController!);
+              indexController.populateForPerf(indexController.dropdownValue, indexController.mapController);
               Get.back();
             },
             title: Text(indexController.perfectures[index][0]["adm1_ja"].toString()),

lib/pages/permission/permission.dart

@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:rogapp/routes/app_pages.dart';
+import 'dart:io';
 
 class PermissionHandlerScreen extends StatefulWidget {
-  PermissionHandlerScreen({Key? key}) : super(key: key);
+  const PermissionHandlerScreen({Key? key}) : super(key: key);
 
   @override
   State<PermissionHandlerScreen> createState() => _PermissionHandlerScreenState();
@@ -20,9 +21,9 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
       builder: (BuildContext context) {
         return AlertDialog(
           title: const Text('ロケーション許可'),
-          content: SingleChildScrollView(
+          content: const SingleChildScrollView(
             child: ListBody(
-              children: const <Widget>[
+              children: <Widget>[
                 Text( 'このアプリでは、位置情報の収集を行います。'),
                 Text( 'このアプリでは、開始時点で位置情報を収集します。'),
               ],
@@ -57,20 +58,18 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
   permissionServiceCall() async {
     await permissionServices().then(
       (value) {
-        if (value != null) {
+        if (value[Permission.location]!.isGranted ) {
-          if (value[Permission.location]!.isGranted ) {
+          /* ========= New Screen Added  ============= */
-            /* ========= New Screen Added  ============= */
 
-            Get.toNamed(AppPages.TRAVEL);
+          Get.toNamed(AppPages.TRAVEL);
 
-            // Navigator.pushReplacement(
+          // Navigator.pushReplacement(
-            //   context,
+          //   context,
-            //   MaterialPageRoute(builder: (context) => SplashScreen()),
+          //   MaterialPageRoute(builder: (context) => SplashScreen()),
-            // );
+          // );
-          }
+        }
-          else{
+        else{
-            _showMyDialog();
+          _showMyDialog();
-          }
         }
       },
     );
@@ -109,12 +108,42 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
   }
 
 
+  requestPermission() async {
+  PermissionStatus permission = await Permission.location.status;
+  if(permission == PermissionStatus.permanentlyDenied){
+     showPermanentAlert(context);
+  }else{
+    PermissionStatus newPermission = await Permission.location.request();
+    //showAlert(context);
+
+    if (newPermission != PermissionStatus.granted) {
+      // If permission not granted, handle the issue in your own way
+      exit(0);
+    }
+    else{
+      Get.toNamed(AppPages.TRAVEL);
+    }
+  }
+
+  // if (permission != PermissionStatus.granted) {
+    
+  // }
+  // If permission is granted or already was granted
+  return true;
+}
+
+
 
   @override
   Widget build(BuildContext context) {
     var status = Permission.location.status.then((value){
       if(value.isGranted == false){
-        Future.delayed(Duration.zero, () => showAlert(context));
+        showAlert(context);
+        //requestPermission() ? Get.toNamed(AppPages.TRAVEL) : exit(0);
+        //Future.delayed(Duration.zero, () => showAlert(context));
+      }
+      else if(value.isPermanentlyDenied){
+        
       }
       else {
          Get.toNamed(AppPages.TRAVEL);
@@ -122,30 +151,58 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
     });
       return Scaffold(
         body: Container(
-          child: Text(""),
+          child: const Text(""),
         ),
       );
   }
 
+  void showPermanentAlert(BuildContext context) {
+      showDialog(
+      context: context,
+      builder: (_) => AlertDialog(
+          title: const Text('無効'),
+          content: const SingleChildScrollView(
+            child: ListBody(
+              children: <Widget>[
+                Text( '位置情報が無効になっています'),
+                Text('このアプリケーションへの位置情報アクセスが無効になっています。続行するには設定>プライバシーとセキュリティ>位置情報サービス>岐阜ナビ で有効にしてください。'),
+              ],
+            ),
+          ),
+          actions: <Widget>[
+            ElevatedButton(
+              child: const Text('OK'),
+              onPressed: () {
+              //requestPermission();
+              permissionServiceCall();
+            },
+            ),
+          ],
+        )
+    );
+  }
+
+
   void showAlert(BuildContext context) {
       showDialog(
       context: context,
       builder: (_) => AlertDialog(
           title: const Text('ロケーション許可'),
-          content: SingleChildScrollView(
+          content: const SingleChildScrollView(
             child: ListBody(
-              children: const <Widget>[
+              children: <Widget>[
                 Text( 'このアプリでは、位置情報の収集を行います。'),
                 Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
               ],
             ),
           ),
           actions: <Widget>[
-            TextButton(
+            ElevatedButton(
-              child: const Text('わかった'),
+              child: const Text('OK'),
               onPressed: () {
-                permissionServiceCall();
+              requestPermission();
-              },
+              //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

@@ -13,6 +13,8 @@ class RegisterPage extends StatelessWidget {
   TextEditingController passwordController = TextEditingController();
   TextEditingController confirmPasswordController = TextEditingController();
 
+  RegisterPage({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -24,11 +26,11 @@ class RegisterPage extends StatelessWidget {
         leading:
         IconButton( onPressed: (){
           Navigator.pop(context);
-        },icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
+        },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
       ),
       body: SafeArea(
         child: SingleChildScrollView(
-          child: Container(
+          child: SizedBox(
             height: MediaQuery.of(context).size.height,
             width: double.infinity,
             child: Column(
@@ -39,20 +41,20 @@ class RegisterPage extends StatelessWidget {
                     Column(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        Text ("サインアップ", style: TextStyle(
+                        const Text ("サインアップ", style: TextStyle(
                           fontSize: 30,
                           fontWeight: FontWeight.bold,
                         ),),
-                        SizedBox(height: 20,),
+                        const SizedBox(height: 20,),
                         Text("アカウントを作成し、無料です",style: TextStyle(
                           fontSize: 15,
                           color: Colors.grey[700],
                         ),),
-                        SizedBox(height: 30,)
+                        const SizedBox(height: 30,)
                       ],
                     ),
                     Padding(
-                      padding: EdgeInsets.symmetric(
+                      padding: const EdgeInsets.symmetric(
                           horizontal: 40
                       ),
                       child: Column(
@@ -64,12 +66,12 @@ class RegisterPage extends StatelessWidget {
                       ),
                     ),
                     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),
@@ -84,9 +86,9 @@ class RegisterPage extends StatelessWidget {
                               Get.snackbar(
                                 "No match",
                                  "Passwords does not match",
-                                icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
-                                duration: Duration(milliseconds: 800),
+                                duration: const Duration(milliseconds: 800),
                                 backgroundColor: Colors.yellow,
                                 //icon:Image(image:AssetImage("assets/images/dora.png"))
                               );
@@ -95,9 +97,9 @@ class RegisterPage extends StatelessWidget {
                               Get.snackbar(
                                 "no_values".tr,
                                  "email_and_password_required".tr,
-                                icon: Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
+                                icon: const Icon(Icons.assistant_photo_outlined, size: 40.0, color: Colors.blue),
                                 snackPosition: SnackPosition.TOP,
-                                duration: Duration(milliseconds: 800),
+                                duration: const Duration(milliseconds: 800),
                                 backgroundColor: Colors.yellow,
                                 //icon:Image(image:AssetImage("assets/images/dora.png"))
                               );
@@ -110,23 +112,23 @@ class RegisterPage extends StatelessWidget {
                           shape: RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(40)
                           ),
-                          child: Text("sign_up".tr,style: TextStyle(
+                          child: Text("sign_up".tr,style: const TextStyle(
                             fontWeight: FontWeight.w600,fontSize: 16,
 
                           ),),
                         ),
                       ),
                     ),
-                    SizedBox(height: 20,),
+                    const SizedBox(height: 20,),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        Flexible(child: Text("すでにアカウントをお持ちですか？")),
+                        const Flexible(child: Text("すでにアカウントをお持ちですか？")),
                         TextButton(
                           onPressed: (){
                             Get.toNamed(AppPages.LOGIN);
                           },
-                          child: Text("ログイン",style: TextStyle(
+                          child: const Text("ログイン",style: TextStyle(
                               fontWeight: FontWeight.w600,
                               fontSize: 18
                           ),),
@@ -149,17 +151,17 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
   return Column(
     crossAxisAlignment: CrossAxisAlignment.start,
     children: [
-      Text(label,style:TextStyle(
+      Text(label,style:const TextStyle(
           fontSize: 15,
           fontWeight: FontWeight.w400,
           color: Colors.black87
       ),),
-      SizedBox(height: 5,),
+      const SizedBox(height: 5,),
       TextField(
         controller: controller,
         obscureText: obsureText,
         decoration: InputDecoration(
-          contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10),
+          contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
           enabledBorder: OutlineInputBorder(
             borderSide: BorderSide(
               color: (Colors.grey[400])!,
@@ -171,7 +173,7 @@ Widget makeInput({label, required TextEditingController controller, obsureText =
         ),
       ),
       ),
-      SizedBox(height: 30,)
+      const SizedBox(height: 30,)
 
     ],
   );

lib/pages/search/search_controller.dart

@@ -1,8 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:geojson/geojson.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
-import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 
 class SearchBarController extends GetxController {

lib/pages/search/search_page.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:geojson/geojson.dart';
@@ -8,22 +7,24 @@ 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){
+  Image getImage(int index) {
-    if(searchController.searchResults[index].properties!["photos"] == null || searchController.searchResults[index].properties!["photos"] == ""){
+    if (searchController.searchResults[index].properties!["photos"] == null ||
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+        searchController.searchResults[index].properties!["photos"] == "") {
-    }
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
-    else{
+    } else {
       return Image(
-        image: NetworkImage(searchController.searchResults[index].properties!["photos"]),
+        image: NetworkImage(
-        errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
+            searchController.searchResults[index].properties!["photos"]),
+        errorBuilder:
+            (BuildContext context, Object exception, StackTrace? stackTrace) {
           return Image.asset("assets/images/empty_image.png");
         },
-        );
+      );
     }
   }
 
@@ -34,41 +35,66 @@ class SearchPage extends StatelessWidget {
         elevation: 0,
         backgroundColor: Colors.white,
         leading: IconButton(
-          onPressed:(){
+            onPressed: () {
-            Navigator.pop(context);
+              Get.back();
-        },
+            },
-        icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black,)),
+            icon: const Icon(
-        title: TypeAheadField(
+              Icons.arrow_back_ios_new,
+              color: Colors.black,
+            )),
+        centerTitle: true,
+        //title: const CupertinoSearchTextField(),
+      ),
+      body: SingleChildScrollView(
+        child: TypeAheadField(
           textFieldConfiguration: TextFieldConfiguration(
             autofocus: true,
+            style: DefaultTextStyle.of(context).style.copyWith(
+                  fontStyle: FontStyle.normal,
+                  fontSize: 15.0,
+                ),
+            decoration: InputDecoration(
+              border: const OutlineInputBorder(),
+              hintText: "検索",
+              prefixIcon: const Icon(Icons.search),
+              suffixIcon: IconButton(
+                icon: const Icon(Icons.clear),
+                onPressed: () {
+                  // clear the text field
+                },
+              ),
+            ),
           ),
-          suggestionsCallback: (pattern) async{
+          suggestionsCallback: (pattern) async {
-            return searchController.searchResults.where((GeoJsonFeature element) => element.properties!["location_name"].toString().contains(pattern));
+            return searchController.searchResults.where(
+                (GeoJsonFeature element) => element.properties!["location_name"]
+                    .toString()
+                    .contains(pattern));
             //return await
           },
-          itemBuilder: (context, GeoJsonFeature suggestion){
+          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){
+          onSuggestionSelected: (GeoJsonFeature suggestion) {
-              indexController.currentFeature.clear();
+            indexController.currentFeature.clear();
-              indexController.currentFeature.add(suggestion);
+            indexController.currentFeature.add(suggestion);
-              Get.back();
+            Get.back();
-              showModalBottomSheet(
+            showModalBottomSheet(
-                          isScrollControlled: true,
+                constraints:
-                          context: context,
+                    BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
-                          //builder: (context) => BottomSheetWidget(),
+                isScrollControlled: true,
-                          builder:((context) => BottomSheetNew())
+                context: context,
-                        );
+                //builder: (context) => BottomSheetWidget(),
+                builder: ((context) => BottomSheetNew()));
           },
         ),
-        //title: const CupertinoSearchTextField(),
-         
       ),
-      //body: 
       // Obx(() =>
       //   ListView.builder(
       //   itemCount: searchController.searchResults.length,

lib/pages/subperf/subperf_page.dart

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

lib/routes/app_pages.dart

@@ -6,6 +6,7 @@ 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/history/history_page.dart';
 import 'package:rogapp/pages/home/home_binding.dart';
 import 'package:rogapp/pages/home/home_page.dart';
 
@@ -48,6 +49,7 @@ 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 final routes = [
     // GetPage(
@@ -72,7 +74,7 @@ class AppPages {
     ),
     GetPage(
       name: Routes.LANDING,
-      page: () => LandingPage(),
+      page: () => const LandingPage(),
       //binding: SpaBinding(),
     ),
     GetPage(
@@ -92,7 +94,7 @@ class AppPages {
     ),
     GetPage(
       name: Routes.LOADING,
-      page: () => LoadingPage(),
+      page: () => const LoadingPage(),
       //binding: DestinationBinding(),
     ),
     GetPage(
@@ -102,12 +104,12 @@ class AppPages {
     ),
     GetPage(
       name: Routes.HOME,
-      page: () => HomePage(),
+      page: () => const HomePage(),
       binding: HomeBinding(),
     ),
     GetPage(
       name: Routes.PERMISSION,
-      page: () => PermissionHandlerScreen(),
+      page: () => const PermissionHandlerScreen(),
     ),
     GetPage(
       name: Routes.SEARCH,
@@ -124,11 +126,11 @@ class AppPages {
     ),
     GetPage(
       name: Routes.CITY,
-      page: () => CityPage(),
+      page: () => const CityPage(),
     ),
     GetPage(
       name: Routes.CATEOGORY,
-      page: () => CategoryPage(),
+      page: () => const CategoryPage(),
     ),
     GetPage(
       name: Routes.CHANGE_PASSWORD,
@@ -140,7 +142,11 @@ class AppPages {
     ),
     GetPage(
       name: Routes.PROGRESS,
-      page: () => ProgressPage(),
+      page: () => const ProgressPage(),
+    ),
+    GetPage(
+      name: Routes.HISTORY,
+      page: () => const HistoryPage(),
     )
   ];
 }

lib/routes/app_routes.dart

@@ -24,4 +24,5 @@ abstract class Routes {
   static const CHANGE_PASSWORD = '/change_password';
   static const CAMERA_PAGE = '/camera_page';
   static const PROGRESS = '/progress';
+  static const HISTORY = '/history';
 }

lib/services/action_service.dart

@@ -5,14 +5,14 @@ import 'package:rogapp/utils/const.dart';
 
 class ActionService{
 
-  static Future<Map<String, dynamic>>  makeAction(int user_id, int location_id, bool wanttogo, bool like, bool checkin) async {
+  static Future<Map<String, dynamic>>  makeAction(int userId, int locationId, bool wanttogo, bool like, bool checkin) async {
-    print("----- action is ---- ${like}-- ${wanttogo}-- ${checkin}");
+    print("----- action is ---- $like-- $wanttogo-- $checkin");
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
+    String url = "$serverUrl/api/makeaction/?user_id=$userId&location_id=$locationId&wanttogo=$wanttogo&like=$like&checkin=$checkin";
     //String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
-    print('++++++++${url}');
+    print('++++++++$url');
-     print("url is ------ ${url}");
+     print("url is ------ $url");
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{
@@ -27,11 +27,11 @@ class ActionService{
   }
 
 
-  static Future<List<dynamic>?>  userAction(int user_id, int location_id) async {
+  static Future<List<dynamic>?>  userAction(int userId, int locationId) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/useraction/?user_id=${user_id}&location_id=${location_id}';
+    String url = '$serverUrl/api/useraction/?user_id=$userId&location_id=$locationId';
-    print('++++++++${url}');
+    print('++++++++$url');
     //String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{

lib/services/auth_service.dart

@@ -8,14 +8,14 @@ class AuthService{
 
   static Future<Map<String, dynamic>> changePassword(String oldpassword, String newpassword, String token) async {
     Map<String, dynamic> changePassword = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/change-password/';
+    String url = '$serverUrl/api/change-password/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.put(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token ${token}'
+        'Authorization': 'Token $token'
       },
       body: jsonEncode(<String, String>{
         'old_password': oldpassword,
@@ -31,11 +31,11 @@ class AuthService{
 
 
   static Future<Map<String, dynamic>> login(String email, String password) async {
-    print("------- in logged email ${email} pwd ${password} ###### --------");
+    print("------- in logged email $email pwd $password ###### --------");
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/login/';
+    String url = '$serverUrl/api/login/';
-    print('++++++++${url}');
+    print('++++++++$url');
     //String url = 'http://localhost:8100/api/login/';
     final http.Response response = await http.post(
       Uri.parse(url),
@@ -57,9 +57,9 @@ class AuthService{
   
   static Future<Map<String, dynamic>>  register(String email, String password) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/register/';
+    String url = '$serverUrl/api/register/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.post(
       Uri.parse(url),
       headers: <String, String>{
@@ -70,7 +70,7 @@ class AuthService{
         'password': password
       }),
     );
-
+    print(response.body);
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
@@ -79,14 +79,14 @@ class AuthService{
 
   static Future<Map<String, dynamic>>  deleteUser(String token) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/delete-account/';
+    String url = '$serverUrl/api/delete-account/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token ${token}'
+        'Authorization': 'Token $token'
       }
     );
 
@@ -99,10 +99,10 @@ class AuthService{
   
   static Future<List<dynamic>?> UserDetails(int userid) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/userdetials?user_id=${userid}';
+    String url = '$serverUrl/api/userdetials?user_id=$userid';
-    print('++++++++${url}');
+    print('++++++++$url');
-    print("---- UserDetails url is ${url}");
+    print("---- UserDetails url is $url");
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -118,6 +118,26 @@ class AuthService{
 
 
 
+  static Future<List<dynamic>?> userForToken(String token) async {
+    Map<String, dynamic> cats = {};
+    String serverUrl = ConstValues.currentServer();
+    String url = '$serverUrl/api/user/';
+    print('++++++++$url');
+    print("---- UserDetails url is $url");
+    final response = await http.get(Uri.parse(url),
+      headers: <String, String>{
+        'Content-Type': 'application/json; charset=UTF-8',
+         'Authorization': 'Token $token'
+      },
+    );
+
+    if (response.statusCode == 200) {
+
+      cats = json.decode(utf8.decode(response.bodyBytes));
+      print("--- eeeeee $cats ----");
+    }
+    return [{"user":cats}];
+  }
 
 
 

lib/services/cat_service.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 
 import '../utils/const.dart';
@@ -9,9 +8,9 @@ class CatService{
 
   static Future<List<dynamic>?> loadCats(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/cats/?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
+    String url = '$serverUrl/api/cats/?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -28,9 +27,9 @@ class CatService{
   
   static Future<List<dynamic>?> loadCatByCity(String cityname)async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/catbycity/?${cityname}';
+    String url = '$serverUrl/api/catbycity/?$cityname';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',

lib/services/destination_service.dart

@@ -11,11 +11,11 @@ import '../utils/const.dart';
 
 class DestinationService{
 
-  static Future<List<dynamic>>  getDestinations(int user_id) async {
+  static Future<List<dynamic>>  getDestinations(int userId) async {
     List<dynamic> cats = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/destinations/?user_id=${user_id}";
+    String url = "$serverUrl/api/destinations/?user_id=$userId";
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{
@@ -29,11 +29,11 @@ class DestinationService{
     return cats;
   }
 
-  static Future<Map<String, dynamic>>  deleteDestination(int dest_id) async {
+  static Future<Map<String, dynamic>>  deleteDestination(int destId) async {
     Map<String, dynamic> cats = {};
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/delete_destination/?dest_id=${dest_id}";
+    String url = "$serverUrl/api/delete_destination/?dest_id=$destId";
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{
@@ -44,15 +44,15 @@ class DestinationService{
     if (response.statusCode == 200) {
       cats = json.decode(utf8.decode(response.bodyBytes));
     }
-    print("####### ---- ${cats}");
+    print("####### ---- $cats");
     return cats;
   }
 
-  static Future<int>  updateOrder(int action_id, int order, String dir) async {
+  static Future<int>  updateOrder(int actionId, int order, String dir) async {
     int cats = 0;
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = "${server_url}/api/updateorder/?user_action_id=${action_id}&order=${order}&dir=${dir}";
+    String url = "$serverUrl/api/updateorder/?user_action_id=$actionId&order=$order&dir=$dir";
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{
@@ -69,7 +69,7 @@ class DestinationService{
   static Future<List<PointLatLng>>? getDestinationLine(List<Destination> destinations, Map<String, dynamic> mtx) async{
     PolylinePoints polylinePoints = PolylinePoints();
 
-    if(destinations.length <= 0){
+    if(destinations.isEmpty){
       return [];
     }
     
@@ -90,7 +90,7 @@ class DestinationService{
 
       int j = 0;
 
-      PolylineWayPoint pwp = PolylineWayPoint(location: "${la},${ln}", stopOver: false);
+      PolylineWayPoint pwp = PolylineWayPoint(location: "$la,$ln", stopOver: false);
       
 
       //print("----- UUUUUU ${pwp}");
@@ -101,13 +101,13 @@ class DestinationService{
     }
 
     final DestinationController destinationController = Get.find<DestinationController>();
-    int trav_mode = destinationController.travelMode.value;
+    int travMode = destinationController.travelMode.value;
     String _mode = "WALKING";
-    if(trav_mode == 1){
+    if(travMode == 1){
       //_mode = TravelMode.driving;
       _mode = "DRIVING";
     }
-    else if(trav_mode == 2) {
+    else if(travMode == 2) {
       //_mode = TravelMode.transit;
       _mode = "TRANSIT";
     }

lib/services/external_service.dart

@@ -2,12 +2,10 @@ import 'dart:io';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
-import 'package:rogapp/model/destination.dart';
 import 'package:rogapp/model/rog.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/utils/database_helper.dart';
-import 'package:sqflite/sqlite_api.dart';
 import 'dart:convert';
 
 import '../utils/const.dart';
@@ -35,7 +33,7 @@ class ExternalService {
 
     Map<String, dynamic> _res = {};
 
-    int user_id = indexController.currentUser[0]["user"]["id"];
+    int userId = indexController.currentUser[0]["user"]["id"];
     //print("--- Pressed -----");
     String _team = indexController.currentUser[0]["user"]['team_name'];
     //print("--- _team : ${_team}-----");
@@ -47,7 +45,7 @@ class ExternalService {
         id:1,
         team_name: _team,
         event_code : _event_code,
-        user_id: user_id,
+        user_id: userId,
         cp_number: -1,
         checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
         image: null,
@@ -56,8 +54,8 @@ class ExternalService {
       db.insertRogaining(_rog);
     }
     else {
-      String url = 'https://natnats.mobilous.com/start_from_rogapp';
+      String url = 'https://rogaining.sumasen.net/gifuroge/start_from_rogapp';
-      print('++++++++${url}');
+      print('++++++++$url');
       final http.Response response = await http.post(
         Uri.parse(url),
         headers: <String, String>{
@@ -73,16 +71,17 @@ class ExternalService {
 
       if (response.statusCode == 200) {
           _res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : ${_res} ----');
+          print('----_res : $_res ----');
       }
     }
     return _res;
   }
 
-  Future<Map<String, dynamic>> makeCheckpoint(int user_id, String token, String checkin_time, String teamname, int cp, String eventcode, String imageurl) async {
+  Future<Map<String, dynamic>> makeCheckpoint(int userId, String token, String checkinTime, String teamname, int cp, String eventcode, String imageurl) async {
+    //print("--cpcp-- ${cp}");
     Map<String, dynamic> _res = {};
-    String url = 'https://natnats.mobilous.com/checkin_from_rogapp';
+    String url = 'https://rogaining.sumasen.net/gifuroge/checkin_from_rogapp';
-    print('++++++++${url}');
+    print('++++++++$url');
     final IndexController indexController = Get.find<IndexController>();
 
     if(imageurl != null){
@@ -93,7 +92,7 @@ class ExternalService {
           id:1,
           team_name: teamname,
           event_code : eventcode,
-          user_id: user_id,
+          user_id: userId,
           cp_number: cp,
           checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
           image: imageurl,
@@ -102,31 +101,31 @@ class ExternalService {
         db.insertRogaining(_rog);
       }
       else {
-        String server_url = ConstValues.currentServer();
+        String serverUrl = ConstValues.currentServer();
-        String url1 = "${server_url}/api/checkinimage/";
+        String url1 = "$serverUrl/api/checkinimage/";
-        final im1Bytes = File(imageurl!).readAsBytesSync();
+        final im1Bytes = File(imageurl).readAsBytesSync();
         String im1_64 = base64Encode(im1Bytes);
 
         final http.Response response = await http.post(
             Uri.parse(url1),
             headers: <String, String>{
               'Content-Type': 'application/json; charset=UTF-8',
-              'Authorization': 'Token ${token}'
+              'Authorization': 'Token $token'
             },
             // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' 
             body: jsonEncode(<String, String>{
-              'user' : user_id.toString(),
+              'user' : userId.toString(),
               'team_name': teamname,
               'event_code': eventcode,
               'checkinimage' : im1_64,
-              'checkintime' : checkin_time,
+              'checkintime' : checkinTime,
               'cp_number' : cp.toString()
             }),
           );
 
           _res = json.decode(utf8.decode(response.bodyBytes));
 
-          print("-----@@@@@ ${_res} -----");
+          print("-----@@@@@ $_res -----");
 
           if(response.statusCode == 201){
               //print('---- toekn is ${token} -----');
@@ -142,10 +141,17 @@ class ExternalService {
                   'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
                 }),
               );
+              var vv = jsonEncode(<String, String>{
+                  'team_name': teamname,
+                  'cp_number': cp.toString(),
+                  'event_code': eventcode,
+                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+                });
+              print("--json-- $vv");
               print("--- checnin response ${response2.statusCode}----");
               if (response2.statusCode == 200) {
                   _res = json.decode(utf8.decode(response2.bodyBytes));
-                  print('----checkin res _res : ${_res} ----');
+                  print('----checkin res _res : $_res ----');
               }
           }
       }
@@ -157,7 +163,7 @@ class ExternalService {
             id:1,
             team_name: teamname,
             event_code : eventcode,
-            user_id: user_id,
+            user_id: userId,
             cp_number: cp,
             checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
             image: null,
@@ -178,10 +184,17 @@ class ExternalService {
                 'image': ""
               }),
           );
+          var vvv = jsonEncode(<String, String>{
+                  'team_name': teamname,
+                  'cp_number': cp.toString(),
+                  'event_code': eventcode,
+                  'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+                });
+              print("--json-- $vvv");
           print("--- checnin response ${response3.statusCode}----");
           if (response3.statusCode == 200) {
                 _res = json.decode(utf8.decode(response3.bodyBytes));
-                print('----checkin res _res : ${_res} ----');
+                print('----checkin res _res : $_res ----');
           }
         }
     }
@@ -189,7 +202,7 @@ class ExternalService {
   }
   
 
-  Future<Map<String, dynamic>> makeGoal(int user_id, String token, String teamname, String image, String goal_time, String eventcode) async {
+  Future<Map<String, dynamic>> makeGoal(int userId, String token, String teamname, String image, String goalTime, String eventcode) async {
     Map<String, dynamic> _res2 = {};
 
     final IndexController indexController = Get.find<IndexController>();
@@ -201,7 +214,7 @@ class ExternalService {
             id:1,
             team_name: teamname,
             event_code : eventcode,
-            user_id: user_id,
+            user_id: userId,
             cp_number: -1,
             checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
             image: image,
@@ -210,33 +223,33 @@ class ExternalService {
           db.insertRogaining(_rog);
     // }
     // else{
-      String server_url = ConstValues.currentServer();
+      String serverUrl = ConstValues.currentServer();
-      String url1 = "${server_url}/api/goalimage/";
+      String url1 = "$serverUrl/api/goalimage/";
-      final im1Bytes = File(image!).readAsBytesSync();
+      final im1Bytes = File(image).readAsBytesSync();
       String im1_64 = base64Encode(im1Bytes);
 
       final http.Response response = await http.post(
         Uri.parse(url1),
         headers: <String, String>{
           'Content-Type': 'application/json; charset=UTF-8',
-          'Authorization': 'Token ${token}'
+          'Authorization': 'Token $token'
         },
         // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' 
         body: jsonEncode(<String, String>{
-          'user' : user_id.toString(),
+          'user' : userId.toString(),
           'team_name': teamname,
           'event_code': eventcode,
-          'goaltime' : goal_time,
+          'goaltime' : goalTime,
           'goalimage' : im1_64,
           'cp_number' : "-1"
         }),
       );
 
-      String url = 'https://natnats.mobilous.com/goal_from_rogapp';
+      String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
-      print('++++++++${url}');
+      print('++++++++$url');
       if (response.statusCode == 201) {
           Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes));
-          print('----_res : ${_res} ----');
+          print('----_res : $_res ----');
           print('---- image url ${_res["goalimage"]} ----');
           final http.Response response2 = await http.post(
             Uri.parse(url),
@@ -246,12 +259,20 @@ class ExternalService {
             body: jsonEncode(<String, String>{
                 'team_name': teamname,
                 'event_code': eventcode,
-                'goal_time' : goal_time,
+                'goal_time' : goalTime,
                 'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
               }
             ),
         );
-        print('----- response2 is ${response2} --------');
+        String rec = jsonEncode(<String, String>{
+                'team_name': teamname,
+                'event_code': eventcode,
+                'goal_time' : goalTime,
+                'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
+              }
+            );
+        print("-- json -- $rec");
+        print('----- response2 is $response2 --------');
         if (response2.statusCode == 200) {
           _res2 = json.decode(utf8.decode(response2.bodyBytes));
         }
@@ -264,8 +285,8 @@ class ExternalService {
 
   static Future<Map<String, dynamic>>  usersEventCode(String teamcode, String password) async {
     Map<String, dynamic> _res = {};
-    String url = "https://natnats.mobilous.com/check_event_code?zekken_number=${teamcode}&password=${password}";
+    String url = "https://rogaining.sumasen.net/gifuroge/check_event_code?zekken_number=$teamcode&password=$password";
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{

lib/services/location_line_service.dart

@@ -8,9 +8,9 @@ class LocationLineService{
    static Future<GeoJsonFeature?> loadLocationLines() async {
     final geo = GeoJson();
     GeoJsonFeature? fs;
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/location_line/';
+    String url = '$serverUrl/api/location_line/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',

lib/services/location_polygon_service.dart

@@ -9,9 +9,9 @@ class LocationPolygonervice{
     final geo = GeoJson();
     GeoJsonFeature? fs;
 
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/location_polygon/';
+    String url = '$serverUrl/api/location_polygon/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',

lib/services/location_service.dart

@@ -37,17 +37,17 @@ class LocationService{
   static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
   
     if(cat.isNotEmpty){
       if(indexController.currentUser.isNotEmpty){
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture + '&cat=' + cat;
+        url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture + '&cat=' + cat;
       }
       else {
-        url = '${server_url}/api/inperf/?perf=' + perfecture + '&cat=' + cat;
+        url = '$serverUrl/api/inperf/?perf=' + perfecture + '&cat=' + cat;
       }
     }
     else{
@@ -55,13 +55,13 @@ class LocationService{
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture;
+        url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture;
       }
       else {
-        url = '${server_url}/api/inperf/?perf=' + perfecture;
+        url = '$serverUrl/api/inperf/?perf=' + perfecture;
       }
     }
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -78,13 +78,13 @@ class LocationService{
 
   static Future<List<dynamic>?> getLocationsExt(String token) async {
     List<dynamic> ext = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/locsext/';
+    String url = '$serverUrl/api/locsext/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.post(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
-        'Authorization': 'Token ${token}'
+        'Authorization': 'Token $token'
       },
       body: jsonEncode(<String, String>{
         'token': token,
@@ -102,16 +102,16 @@ class LocationService{
   static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
     if(cat.isNotEmpty){
       if(indexController.currentUser.isNotEmpty){
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/insubperf?rog=${r}&subperf=' + subperfecture + '&cat=' + cat;
+        url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture + '&cat=' + cat;
       }
       else{
-        url = '${server_url}/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
+        url = '$serverUrl/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
       }
     }
     else{
@@ -119,13 +119,13 @@ class LocationService{
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/insubperf?rog=${r}&subperf=' + subperfecture;
+        url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture;
       }
       else{
-        url = '${server_url}/api/insubperf?subperf=' + subperfecture; 
+        url = '$serverUrl/api/insubperf?subperf=' + subperfecture; 
       }
     }
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -145,16 +145,16 @@ class LocationService{
     print("-------- in location for bound -------------");
     final IndexController indexController = Get.find<IndexController>();
     String url = "";
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
     if(cat.isNotEmpty){
       if(indexController.currentUser.isNotEmpty){
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/inbound?rog=${r}&grp=$grp&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
+        url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
       }
       else{
-        url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}' + '&cat=' + cat;
+        url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
       }
     }
     else{
@@ -162,14 +162,14 @@ class LocationService{
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        print("-------- requested user group ${grp} -------------");
+        print("-------- requested user group $grp -------------");
-        url = '${server_url}/api/inbound?rog=${r}&grp=$grp&ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
+        url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
       }
       else{
-        url = '${server_url}/api/inbound?ln1=${lon1}&la1=${lat1}&ln2=${lon2}&la2=${lat2}&ln3=${lon3}&la3=${lat3}&ln4=${lon4}&la4=${lat4}';
+        url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
       }
     }
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -200,17 +200,17 @@ class LocationService{
     if(cat == "-all-"){
       cat = "";
     }
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    print("loadCustomLocations url is ----- ${cat}");
+    print("loadCustomLocations url is ----- $cat");
     if(cat.isNotEmpty){
       if(indexController.currentUser.isNotEmpty){
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/custom_area/?rog=${r}&&cat=' + cat;
+        url = '$serverUrl/api/custom_area/?rog=$r&&cat=' + cat;
       }
       else{
-        url = '${server_url}/api/custom_area/?&cat=' + cat;
+        url = '$serverUrl/api/custom_area/?&cat=' + cat;
       }
     }
     else{
@@ -218,13 +218,13 @@ class LocationService{
         bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
         String r = _rog == true ? 'True': 'False';
         var grp = indexController.currentUser[0]['user']['event_code'];
-        url = '${server_url}/api/customarea?rog=${r}&name=${name}';
+        url = '$serverUrl/api/customarea?rog=$r&name=$name';
       }
       else{
-        url = '${server_url}/api/customarea?name=${name}';
+        url = '$serverUrl/api/customarea?name=$name';
       }
     }
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',

lib/services/maxtrix_service.dart

@@ -18,7 +18,7 @@ class MatrixService{
     int i = 0;
     for(Destination d in destinations){
 
-      print("---- getting matrix for ${d} ------------");
+      print("---- getting matrix for $d ------------");
 
       if(i==0){
         origin = "${d.lat}, ${d.lon}";
@@ -37,7 +37,7 @@ class MatrixService{
       i++;
     }
 
-    locs = "optimize:false|${locs}";
+    locs = "optimize:false|$locs";
 
     String _mode = "walking";
     switch (destinationController.travelMode.value) {
@@ -53,8 +53,8 @@ class MatrixService{
     }
 
     Map<String, dynamic> cats = {};
-    String url = "https://maps.googleapis.com/maps/api/directions/json?destination=${destination}&mode=${_mode}&waypoints=${locs}&origin=${origin}&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE";
+    String url = "https://maps.googleapis.com/maps/api/directions/json?destination=$destination&mode=$_mode&waypoints=$locs&origin=$origin&key=AIzaSyAUBI1ablMKuJwGj2-kSuEhvYxvB1A-mOE";
-    print('++++++++${url}');
+    print('++++++++$url');
     final http.Response response = await http.get(
       Uri.parse(url),
       headers: <String, String>{

lib/services/perfecture_service.dart

@@ -7,9 +7,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadPerfectures() async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/perf_main/';
+    String url = '$serverUrl/api/perf_main/';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -25,9 +25,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadSubPerfectures(String area) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/subperfinmain/?area=' + area;
+    String url = '$serverUrl/api/subperfinmain/?area=' + area;
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -44,9 +44,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> getMainPerfExt(String id) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/mainperfext/?perf=' + id;
+    String url = '$serverUrl/api/mainperfext/?perf=' + id;
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -62,9 +62,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadGifuAreas(String perf) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/allgifuareas/?perf=' + perf;
+    String url = '$serverUrl/api/allgifuareas/?perf=' + perf;
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -80,9 +80,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> loadCustomAreas() async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/customareanames';
+    String url = '$serverUrl/api/customareanames';
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',
@@ -99,9 +99,9 @@ class PerfectureService{
 
   static Future<List<dynamic>?> getSubExt(String id) async {
     List<dynamic> perfs = [];
-    String server_url = ConstValues.currentServer();
+    String serverUrl = ConstValues.currentServer();
-    String url = '${server_url}/api/perfext/?sub_perf=' + id;
+    String url = '$serverUrl/api/perfext/?sub_perf=' + id;
-    print('++++++++${url}');
+    print('++++++++$url');
     final response = await http.get(Uri.parse(url),
       headers: <String, String>{
         'Content-Type': 'application/json; charset=UTF-8',

lib/services/reacking_service.dart

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

lib/utils/database_helper.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 import 'package:path_provider/path_provider.dart';
-import 'package:rogapp/model/Rogaining.dart';
 import 'package:rogapp/model/destination.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
@@ -86,14 +85,14 @@ class DatabaseHelper{
     var rog = await db.query('rog');
     List<Rog> roglist = rog.isNotEmpty ?
       rog.map((e) => Rog.fromMap(e)).toList() : [];
-    print("--------- ${rog}");
+    print("--------- $rog");
     return roglist;
   }
 
 
   Future<List<Rog>> getRogainingByLatLon(double lat, double lon) async {
     Database db = await instance.database;
-    var rog = await db.query('rog', where: "lat = ${lat} and lon= ${lon}");
+    var rog = await db.query('rog', where: "lat = $lat and lon= $lon");
     List<Rog> roglist = rog.isNotEmpty
       ? rog.map((e) => Rog.fromMap(e)).toList() : [];
     return roglist;
@@ -101,12 +100,12 @@ class DatabaseHelper{
 
   Future clearSelection() async {
     Database db = await instance.database;
-    Map<String, dynamic> row_clear = {
+    Map<String, dynamic> rowClear = {
           "selected": false
     };
     return await db.update(
         "destination", 
-        row_clear
+        rowClear
       );
   }
 
@@ -114,7 +113,7 @@ class DatabaseHelper{
     Database db = await instance.database;
     
     bool val = !dest.selected!;
-    Map<String, dynamic> row_target = {
+    Map<String, dynamic> rowTarget = {
           "selected": val
       };
 
@@ -122,7 +121,7 @@ class DatabaseHelper{
 
     return await db.update(
         "destination", 
-        row_target,
+        rowTarget,
         where: 'location_id = ?',
         whereArgs: [dest.location_id!]
         );
@@ -130,7 +129,7 @@ class DatabaseHelper{
 
   Future<int> deleteRogaining(int id) async {
     Database db = await instance.database;
-    var rog = await db.delete('rog', where: "id = ${id}");
+    var rog = await db.delete('rog', where: "id = $id");
     int ret = rog > 0 ? rog : -1;
     
     return ret;
@@ -145,8 +144,8 @@ class DatabaseHelper{
   
   Future<bool>isRogAlreadyAvailable(int id) async{
     Database db = await instance.database;
-    var rog = await db.query('rog', where: "id = ${id}");
+    var rog = await db.query('rog', where: "id = $id");
-    return rog.length > 0 ? true : false;
+    return rog.isNotEmpty ? true : false;
   }
 
   Future<int?>latestGoal() async{
@@ -157,16 +156,16 @@ class DatabaseHelper{
 
   Future<int> insertRogaining(Rog rog) async {
     Database db = await instance.database;
-    int? next_order = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
+    int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
-    next_order = next_order==null ? 0 : next_order;
+    nextOrder = nextOrder ?? 0;
-    next_order = next_order + 1;
+    nextOrder = nextOrder + 1;
-    rog.id = next_order;
+    rog.id = nextOrder;
     int res = await db.insert(
       'rog',
       rog.toMap(),
       conflictAlgorithm: ConflictAlgorithm.replace,
     );
-    print("------ database helper insert ${res}-----------::::::::");
+    print("------ database helper insert $res-----------::::::::");
     return res;
   }
 
@@ -176,13 +175,13 @@ class DatabaseHelper{
     var dest = await db.query('destination', orderBy: 'list_order');
     List<Destination> destList = dest.isNotEmpty ?
       dest.map((e) => Destination.fromMap(e)).toList() : [];
-    print("--------- ${destList}");
+    print("--------- $destList");
     return destList;
   }
 
   Future<List<Destination>> getDestinationById(int id) async {
     Database db = await instance.database;
-    var rog = await db.query('destination', where: "location_id = ${id}");
+    var rog = await db.query('destination', where: "location_id = $id");
     List<Destination> deslist = rog.isNotEmpty
       ? rog.map((e) => Destination.fromMap(e)).toList() : [];
     return deslist;
@@ -191,15 +190,15 @@ class DatabaseHelper{
 
   Future<List<Destination>> getDestinationByLatLon(double lat, double lon) async {
     Database db = await instance.database;
-    var dest = await db.query('destination', where: "lat = ${lat} and lon= ${lon}", orderBy: 'list_order');
+    var dest = await db.query('destination', where: "lat = $lat and lon= $lon", orderBy: 'list_order');
     List<Destination> destList = dest.isNotEmpty
       ? dest.map((e) => Destination.fromMap(e)).toList() : [];
     return destList;
   }
 
-  Future<int> deleteDestination(int location_id) async {
+  Future<int> deleteDestination(int locationId) async {
     Database db = await instance.database;
-    var dest = await db.delete('destination', where: "location_id = ${location_id}");
+    var dest = await db.delete('destination', where: "location_id = $locationId");
     int ret = dest > 0 ? dest : -1;
 
     //after deleting set correct order
@@ -212,19 +211,19 @@ class DatabaseHelper{
     Database db = await instance.database;
     var byOrder = await db.query('destination', orderBy: 'list_order');
 
-    List<Destination> des_db = byOrder.isNotEmpty
+    List<Destination> desDb = byOrder.isNotEmpty
     ? byOrder.map((e) => Destination.fromMap(e)).toList() : [];
 
     int order = 1;
-    for( Destination d in des_db){
+    for( Destination d in desDb){
 
-      Map<String, dynamic> row_target = {
+      Map<String, dynamic> rowTarget = {
           "list_order": order
       };
 
       await db.update(
         "destination", 
-        row_target,
+        rowTarget,
         where: 'location_id = ?',
         whereArgs: [d.location_id]
       );
@@ -238,18 +237,18 @@ class DatabaseHelper{
     await db.delete('destination');
   }
 
-  Future<bool>isAlreadyAvailable(int location_id) async{
+  Future<bool>isAlreadyAvailable(int locationId) async{
     Database db = await instance.database;
-    var dest = await db.query('destination', where: "location_id = ${location_id}");
+    var dest = await db.query('destination', where: "location_id = $locationId");
-    return dest.length > 0 ? true : false;
+    return dest.isNotEmpty ? true : false;
   }
 
   Future<int> insertDestination(Destination dest) async {
     Database db = await instance.database;
-    int? next_order = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(list_order) FROM destination'));
+    int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(list_order) FROM destination'));
-    next_order = next_order==null ? 0 : next_order;
+    nextOrder = nextOrder ?? 0;
-    next_order = next_order + 1;
+    nextOrder = nextOrder + 1;
-    dest.list_order = next_order;
+    dest.list_order = nextOrder;
     int res = await db.insert(
       'destination',
       dest.toMap(),
@@ -278,23 +277,23 @@ class DatabaseHelper{
     var target = await db.query('destination', where: "list_order = ${d.list_order! + dir}");
     var dest = await db.query('destination', where: "location_id = ${d.location_id}");
 
-    print("--- target in db is ${target}");
+    print("--- target in db is $target");
-    print("--- destine in db is ${dest}");
+    print("--- destine in db is $dest");
 
     if(target.isNotEmpty){
 
-      List<Destination> target_indb = target.isNotEmpty
+      List<Destination> targetIndb = target.isNotEmpty
       ? target.map((e) => Destination.fromMap(e)).toList() : [];
 
-      List<Destination> dest_indb = dest.isNotEmpty
+      List<Destination> destIndb = dest.isNotEmpty
       ? dest.map((e) => Destination.fromMap(e)).toList() : [];
 
-      Map<String, dynamic> row_target = {
+      Map<String, dynamic> rowTarget = {
         "list_order": d.list_order
       };
 
-      Map<String, dynamic> row_des = {
+      Map<String, dynamic> rowDes = {
-        "list_order": dest_indb[0].list_order! + dir
+        "list_order": destIndb[0].list_order! + dir
       };
 
       // print("--- target destination is ${target_indb[0].location_id}");
@@ -302,16 +301,16 @@ class DatabaseHelper{
 
       await db.update(
         "destination", 
-        row_target,
+        rowTarget,
         where: 'location_id = ?',
-        whereArgs: [target_indb[0]!.location_id]
+        whereArgs: [targetIndb[0].location_id]
       );
 
       await db.update(
         "destination", 
-        row_des,
+        rowDes,
         where: 'location_id = ?',
-        whereArgs: [dest_indb[0]!.location_id]
+        whereArgs: [destIndb[0].location_id]
       );
     }
   }

lib/utils/text_util.dart

@@ -22,7 +22,7 @@ class TextUtils{
       RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
       String txt = "";
       if(dp.cp! > 0){
-        txt = "${dp.cp.toString().replaceAll(regex, '')}";
+        txt = dp.cp.toString().replaceAll(regex, '');
         if(dp.checkin_point != null && dp.checkin_point! > 0){
           txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}";
         }

lib/widgets/base_layer_widget.dart

@@ -13,7 +13,7 @@ class BaseLayer extends StatelessWidget {
                               FMTCTileProviderSettings(
                                 behavior: CacheBehavior.values
                                     .byName('cacheFirst'),
-                                cachedValidDuration: Duration(
+                                cachedValidDuration: const Duration(
                                         days: 14
                                       ),
                               ),

lib/widgets/bottom_sheet_widget.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:geojson/geojson.dart';
@@ -13,9 +12,11 @@ class BottomSheetWidget extends StatelessWidget {
 
   final IndexController indexController = Get.find<IndexController>();
 
+  BottomSheetWidget({Key? key}) : super(key: key);
+
   Image getImage(GeoJsonFeature? gf){
     if(gf!.properties!["photos"] == null || gf.properties!["photos"] == ""){
-      return Image(image: AssetImage('assets/images/empty_image.png'));
+      return const Image(image: AssetImage('assets/images/empty_image.png'));
     }
     else{
       return Image(image: NetworkImage(
@@ -37,7 +38,7 @@ class BottomSheetWidget extends StatelessWidget {
     return SingleChildScrollView(
       child: Column(
         children: [
-          SizedBox(height: 5.0,),
+          const SizedBox(height: 5.0,),
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
@@ -47,18 +48,18 @@ class BottomSheetWidget extends StatelessWidget {
                 },
                 color: Colors.blue,
                 textColor: Colors.white,
-                child: Icon(
+                child: const Icon(
                   Icons.arrow_back_ios,
                   size: 14,
                 ),
-                padding: EdgeInsets.all(14),
+                padding: const EdgeInsets.all(14),
-                shape: CircleBorder(),
+                shape: const CircleBorder(),
               ),
               Expanded(
                 child: Container(
                   alignment: Alignment.center,
                   child:  Obx(() => 
-                    Text(indexController.currentFeature[0].properties!["location_name"], style: TextStyle(
+                    Text(indexController.currentFeature[0].properties!["location_name"], style: const TextStyle(
                     fontSize: 15.0,
                     fontWeight: FontWeight.bold,
                   ),
@@ -72,12 +73,12 @@ class BottomSheetWidget extends StatelessWidget {
                 },
                 color: Colors.blue,
                 textColor: Colors.white,
-                child: Icon(
+                child: const Icon(
                   Icons.arrow_forward_ios,
                   size: 14,
                 ),
-                padding: EdgeInsets.all(14),
+                padding: const EdgeInsets.all(14),
-                shape: CircleBorder(),
+                shape: const CircleBorder(),
               ),
             ],
           ),
@@ -105,59 +106,59 @@ class BottomSheetWidget extends StatelessWidget {
                           Expanded(
                             child: Container(
                               alignment: Alignment.topRight,
-                              child: Text("address".tr, style: TextStyle(fontWeight: FontWeight.bold),)),
+                              child: Text("address".tr, style: const TextStyle(fontWeight: FontWeight.bold),)),
                           ),
-                          SizedBox(width: 12.0,),
+                          const SizedBox(width: 12.0,),
                           Expanded(
                             child: Container(
                               alignment: Alignment.topLeft,
                               child: Obx(() => Text(indexController.currentFeature[0].properties!["address"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
+                              style: const TextStyle(color: Colors.blue,),
                               softWrap: true,
                               overflow: TextOverflow.ellipsis,)
                               ),
                             ),
                           )
                         ],
-                      ): Container(width: 0.0, height: 0,),
+                      ): const SizedBox(width: 0.0, height: 0,),
                       indexController.currentFeature[0].properties!["phone"] != null ?
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Expanded(child: Container(
                             alignment: Alignment.topRight,
-                            child: Text("telephone".tr, style: TextStyle(fontWeight: FontWeight.bold),))),
+                            child: Text("telephone".tr, style: const TextStyle(fontWeight: FontWeight.bold),))),
-                          SizedBox(width: 12.0,),
+                          const SizedBox(width: 12.0,),
                           Expanded(
                             child: Container(
                               alignment: Alignment.topLeft,
                               child: Obx(() => Text(indexController.currentFeature[0].properties!["phone"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
+                              style: const TextStyle(color: Colors.blue,),
                               overflow: TextOverflow.ellipsis,)
                               ),
                             ),
                           )
                         ],
-                      ): Container(width: 0, height: 0,),
+                      ): const SizedBox(width: 0, height: 0,),
                       indexController.currentFeature[0].properties!["email"] != null ?
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Expanded(child: Container(
                             alignment: Alignment.topRight,
-                            child: Text("email".tr, style: TextStyle(fontWeight: FontWeight.bold),))),
+                            child: Text("email".tr, style: const TextStyle(fontWeight: FontWeight.bold),))),
-                          SizedBox(width: 12.0,),
+                          const SizedBox(width: 12.0,),
                           Expanded(
                             child: Container(
                               alignment: Alignment.topLeft,
                               child: Obx(() => Text(indexController.currentFeature[0].properties!["email"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
+                              style: const TextStyle(color: Colors.blue,),
                               overflow: TextOverflow.ellipsis,)
                               ),
                             ),
                           )
                         ],
-                      ): Container(width: 0, height: 0,),
+                      ): const SizedBox(width: 0, height: 0,),
                       indexController.currentFeature[0].properties!["webcontents"] != null ?
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
@@ -165,8 +166,8 @@ class BottomSheetWidget extends StatelessWidget {
                           Expanded(child: Container(
                             alignment: Alignment.topRight,
                             child: Text(
-                              "web".tr, style: TextStyle(fontWeight: FontWeight.bold)))),
+                              "web".tr, style: const TextStyle(fontWeight: FontWeight.bold)))),
-                          SizedBox(width: 12.0,),
+                          const SizedBox(width: 12.0,),
                           Expanded(
                             child: Container(
                               alignment: Alignment.topLeft,
@@ -175,40 +176,40 @@ class BottomSheetWidget extends StatelessWidget {
                                 _launchURL(indexController.currentFeature[0].properties!["webcontents"]);
                               },
                               child: Text(indexController.currentFeature[0].properties!["webcontents"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
+                              style: const TextStyle(color: Colors.blue,),
                               softWrap: false,
                               overflow: TextOverflow.fade,),
                                                     )),
                             ),
                           )
                         ],
-                      ): Container(width: 0.0, height: 0.0,),
+                      ): const SizedBox(width: 0.0, height: 0.0,),
                       indexController.currentFeature[0].properties!["videos"] != null ?
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Expanded(child: Container(
                             alignment: Alignment.topRight,
-                            child: Text("video".tr, style: TextStyle(fontWeight: FontWeight.bold)))),
+                            child: Text("video".tr, style: const TextStyle(fontWeight: FontWeight.bold)))),
-                          SizedBox(width: 12.0,),
+                          const SizedBox(width: 12.0,),
                           Expanded(
                             child: Container(
                               alignment: Alignment.topLeft,
                               child: Obx(() => Text(indexController.currentFeature[0].properties!["videos"] ?? '',
-                              style: TextStyle(color: Colors.blue,),
+                              style: const TextStyle(color: Colors.blue,),
                               overflow: TextOverflow.ellipsis,)
                               ),
                             ),
                           )
                         ],
-                      ): Container(width: 0.0, height: 0.0,),
+                      ): const SizedBox(width: 0.0, height: 0.0,),
                     ],
                   ),
                 ),
               ),
             ],
           ),
-          SizedBox(height: 20.0,),
+          const SizedBox(height: 20.0,),
           Obx(() => 
           indexController.currentAction.isNotEmpty  ?
           Row(
@@ -232,7 +233,7 @@ class BottomSheetWidget extends StatelessWidget {
                     indexController.currentAction[0][0]["wanttogo"] = true;
                     Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                     indexController.currentAction.clear();
-                    print("---temp---${temp}");  
+                    print("---temp---$temp");  
                     indexController.currentAction.add([temp]);
                   }
                   indexController.makeAction(context);
@@ -246,7 +247,7 @@ class BottomSheetWidget extends StatelessWidget {
                     indexController.currentAction[0][0]["wanttogo"] = false;
                     Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                     indexController.currentAction.clear();
-                    print("---temp---${temp}");  
+                    print("---temp---$temp");  
                     indexController.currentAction.add([temp]);
                   }
                   indexController.makeAction(context);
@@ -267,7 +268,7 @@ class BottomSheetWidget extends StatelessWidget {
                     indexController.currentAction[0][0]["like"] = true;
                     Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                     indexController.currentAction.clear();
-                    print("---temp---${temp}");  
+                    print("---temp---$temp");  
                     indexController.currentAction.add([temp]);
                   }
                   indexController.makeAction(context);
@@ -281,7 +282,7 @@ class BottomSheetWidget extends StatelessWidget {
                     indexController.currentAction[0][0]["like"] = false;
                     Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                     indexController.currentAction.clear();
-                    print("---temp---${temp}");  
+                    print("---temp---$temp");  
                     indexController.currentAction.add([temp]);
                   }
                   indexController.makeAction(context);
@@ -302,7 +303,7 @@ class BottomSheetWidget extends StatelessWidget {
 
 
               :
-              Container(width: 0, height: 0,),
+              const SizedBox(width: 0, height: 0,),
               indexController.rog_mode.value == 1 ?
               indexController.currentAction[0][0]["checkin"] == false ?
                 Column(
@@ -311,7 +312,7 @@ class BottomSheetWidget extends StatelessWidget {
                      mainAxisSize: MainAxisSize.max,
                      children: [
                        ElevatedButton(
-                        child: Text("Image"), onPressed: (){
+                        child: const Text("Image"), onPressed: (){
                         final ImagePicker _picker = ImagePicker();
                         _picker.pickImage(source: ImageSource.camera).then((value){
                           print("----- image---- ${value!.path}");
@@ -327,7 +328,7 @@ class BottomSheetWidget extends StatelessWidget {
                           indexController.currentAction[0][0]["checkin"] = true;
                           Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                           indexController.currentAction.clear();
-                          print("---temp---${temp}");  
+                          print("---temp---$temp");  
                           indexController.currentAction.add([temp]);
                         }
                         indexController.makeAction(context);
@@ -344,18 +345,18 @@ class BottomSheetWidget extends StatelessWidget {
                     indexController.currentAction[0][0]["checkin"] = false;
                     Map<String,dynamic> temp = Map<String,dynamic>.from(indexController.currentAction[0][0]);
                     indexController.currentAction.clear();
-                    print("---temp---${temp}");  
+                    print("---temp---$temp");  
                     indexController.currentAction.add([temp]);
                   }
                   indexController.makeAction(context);
                 },
                 
-                 child: Icon(
+                 child: const Icon(
                    Icons.favorite, color: Colors.red) 
 
                     ,
               ):
-              Container(width: 0, height: 0,),
+              const SizedBox(width: 0, height: 0,),
             ],
           ): Row(
             mainAxisAlignment: MainAxisAlignment.center,
@@ -364,11 +365,11 @@ class BottomSheetWidget extends StatelessWidget {
                 onPressed: (){
                   Get.toNamed(AppPages.LOGIN);
                   }, 
-                child: Flexible(child: Text("その他のオプションについてはログインしてください")))
+                child: const Flexible(child: Text("その他のオプションについてはログインしてください")))
                 ],
           ),
           ),
-          Row(
+          const Row(
             children: [
               SizedBox(height: 60.0,),
             ],

lib/widgets/bread_crum_widget.dart

@@ -15,7 +15,7 @@ class BreadCrumbWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    print("------ map controller is ${mapController}------------");
+    print("------ map controller is $mapController------------");
     return 
       Obx(()=> 
         indexController.perfectures.isNotEmpty && mapController != null  ?

lib/widgets/cat_widget.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/services/location_service.dart';
 
 class CatWidget extends StatefulWidget {
   CatWidget({ Key? key, required this.indexController, }) : super(key: key);

lib/widgets/destination_widget.dart

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

lib/widgets/list_widget.dart

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

lib/widgets/map_widget.dart

@@ -3,163 +3,205 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
 import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
 import 'package:flutter_map_marker_cluster/flutter_map_marker_cluster.dart';
+import 'package:flutter_polyline_points/flutter_polyline_points.dart';
 import 'package:geojson/geojson.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/get_state_manager.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:rogapp/pages/destination/destination_controller.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
 import 'package:rogapp/utils/text_util.dart';
 import 'package:rogapp/widgets/base_layer_widget.dart';
 import 'package:rogapp/widgets/bottom_sheet_new.dart';
-import 'package:rogapp/widgets/bottom_sheet_widget.dart';
 
 class MapWidget extends StatelessWidget {
-
   final IndexController indexController = Get.find<IndexController>();
-  final DestinationController destinationController = Get.find<DestinationController>();
+  final DestinationController destinationController =
+      Get.find<DestinationController>();
 
-  MapWidget({ Key? key}) : super(key: key);
+  MapWidget({Key? key}) : super(key: key);
 
   StreamSubscription? subscription;
 
-  Widget getMarkerShape(GeoJsonFeature i, BuildContext context){
+  Widget getMarkerShape(GeoJsonFeature i, BuildContext context) {
     GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
     //print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
     RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
     return Row(
-                                      mainAxisAlignment: MainAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.start,
-                                      children: [
+      children: [
-                                        InkWell(
+        InkWell(
-                                          onTap: () {                                            
+          onTap: () {
-                                                  GeoJsonFeature? fs = indexController.getFeatureForLatLong(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude);
+            GeoJsonFeature? fs = indexController.getFeatureForLatLong(
-                                                  print("------- fs ${fs}------");
+                p.geoSerie!.geoPoints[0].latitude,
-                                                  if(fs != null){
+                p.geoSerie!.geoPoints[0].longitude);
-                                                    indexController.currentFeature.clear();
+            print("------- fs $fs------");
-                                                    indexController.currentFeature.add(fs);
+            if (fs != null) {
-                                                    //print("----- fs is ${fs.properties!['photos']}");
+              indexController.currentFeature.clear();
-                                                    indexController.getAction();
+              indexController.currentFeature.add(fs);
+              //print("----- fs is ${fs.properties!['photos']}");
+              indexController.getAction();
 
-                                                    showModalBottomSheet(
+              showModalBottomSheet(
-                                                      context: context, 
+                  constraints:
-                                                      isScrollControlled: true, 
+                      BoxConstraints.loose(Size(Get.width, Get.height * 0.75)),
-                                                      isDismissible: true,
+                  context: context,
-                                                      builder:((context) => BottomSheetNew())
+                  isScrollControlled: true,
-                                                      //builder:((context) => BottomSheetWidget())
+                  isDismissible: true,
-                                                    ).whenComplete((){
+                  builder: ((context) => BottomSheetNew())
-                                                      destinationController.skip_gps = false;
+                  //builder:((context) => BottomSheetWidget())
-                                                    });
+                  ).whenComplete(() {
-                                                  }
+                destinationController.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: [
+                  const 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: const Icon(
+                            Icons.play_arrow_outlined,
+                            color: Colors.red,
+                            size: 70,
+                          ))
+                      : Container(
+                          color: Colors.transparent,
+                        ),
+                ],
+              )),
+        ),
+        Container(
+            color: Colors.white,
+            child: Text(TextUtils.getDisplayTextFeture(i),
+                style: const TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.red,
+                ))),
+      ],
+    );
+  }
 
-
+  List<LatLng>? getPoints() {
-
+    print("##### --- route point ${indexController.routePoints.length}");
-
+    List<LatLng> pts = [];
-                                          },
+    for (PointLatLng p in indexController.routePoints) {
-                                          child: Container(
+      LatLng l = LatLng(p.latitude, p.longitude);
-                                            height: 32,
+      pts.add(l);
-                                            width: 32,
+    }
-                                              decoration: BoxDecoration(
+    return pts;
-                                                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.getDisplayTextFeture(i), style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,))),
-                                      ],
-                                    );
   }
 
   @override
   Widget build(BuildContext context) {
-
+    print(
-    print("---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
+        "---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
 
     final PopupController _popupController = PopupController();
     return Stack(
-                  children: [
+      children: [
-                    Obx(() => 
+        Obx(() => indexController.is_loading == true
-                      indexController.is_loading == true ? Padding(
+            ? const Padding(
-                        padding: const EdgeInsets.only(top: 60.0),
+                padding: EdgeInsets.only(top: 60.0),
-                        child: CircularProgressIndicator(),
+                child: CircularProgressIndicator(),
-                      ):
+              )
-                      FlutterMap(
+            : FlutterMap(
-                      mapController: indexController.mapController,
+                mapController: indexController.mapController,
-                      options: MapOptions(
+                options: MapOptions(
-                          maxZoom:18.4,
+                  maxZoom: 18.4,
-                          onMapReady: (){
+                  onMapReady: () {
-                            indexController.is_mapController_loaded.value = true;
+                    indexController.is_mapController_loaded.value = true;
-                            subscription = indexController.mapController.mapEventStream.listen((MapEvent mapEvent) {
+                    subscription = indexController.mapController.mapEventStream
-                              if (mapEvent is MapEventMoveStart) {
+                        .listen((MapEvent mapEvent) {
-                                  //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
+                      if (mapEvent is MapEventMoveStart) {
-                                  // do something
+                        //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
-                                }
+                        // do something
-                                if (mapEvent is MapEventMoveEnd && indexController.currentUser. length <= 0) {
+                      }
-                                  //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
+                      if (mapEvent is MapEventMoveEnd &&
-                                  indexController.loadLocationsBound();
+                          indexController.currentUser.isEmpty) {
-                                  //indexController.rogMapController!.move(c.center, c.zoom);
+                        //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
-                                }
+                        indexController.loadLocationsBound();
-                              });
+                        //indexController.rogMapController!.move(c.center, c.zoom);
+                      }
+                    });
+                  },
+                  //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, isvalue) {},
-                          //center: LatLng(37.15319600454702, 139.58765950528198),
+                  onTap: (_, __) => _popupController
-                          bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
+                      .hideAllPopups(), // Hide popup when the map is tapped.
-                          zoom: 1,
+                ),
-                          interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
+                children: [
-                          
+                  const BaseLayer(),
-                          onPositionChanged: (MapPosition pos, isvalue){
+                  Obx(
-
+                    () => indexController.routePointLenght > 0
-                          },
+                        ? PolylineLayer(
-                          onTap: (_, __) =>
+                            polylines: [
-                              _popupController
+                              Polyline(
-                                  .hideAllPopups(), // Hide popup when the map is tapped.
+                                  points: getPoints()!,
-                        ),
+                                  strokeWidth: 6.0,
-                        children: [
+                                  color: Colors.indigo),
-                          BaseLayer(),
+                            ],
-                          CurrentLocationLayer(),
-                          indexController.locations.isNotEmpty && indexController.locations[0].collection.isNotEmpty ?
-                          MarkerLayer(
-                            markers:indexController.locations[0].collection.map((i) {
-                                      print("i si ${i.properties!['location_id']}");
-                                      
-                                      RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
-                                      GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
-                                      print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
-                                      return Marker(
-                                        anchorPos: AnchorPos.exactly(Anchor(108.0, 18.0)),
-                                        height: 32.0,
-                                        width: 120.0,
-                                        point: LatLng(p.geoSerie!.geoPoints[0].latitude, p.geoSerie!.geoPoints[0].longitude),
-                                        builder: (ctx){
-                                          return getMarkerShape(i, context);
-                                        },
-                                      );
-                                    }).toList(),
                           )
-                          :
+                        : Container(),
-                          Center(child: CircularProgressIndicator())
+                  ),
-                          ,
+                  CurrentLocationLayer(),
-                        ],
+                  indexController.locations.isNotEmpty &&
-                    )
+                          indexController.locations[0].collection.isNotEmpty
-                    )
+                      ? MarkerLayer(
-                  ],
+                          markers:
-                );
+                              indexController.locations[0].collection.map((i) {
+                            print("i si ${i.properties!['location_id']}");
+
+                            RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
+                            GeoJsonMultiPoint p =
+                                i.geometry as GeoJsonMultiPoint;
+                            print(
+                                "lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
+                            return Marker(
+                              anchorPos: AnchorPos.exactly(Anchor(108.0, 18.0)),
+                              height: 32.0,
+                              width: 120.0,
+                              point: LatLng(p.geoSerie!.geoPoints[0].latitude,
+                                  p.geoSerie!.geoPoints[0].longitude),
+                              builder: (ctx) {
+                                return getMarkerShape(i, context);
+                              },
+                            );
+                          }).toList(),
+                        )
+                      : const Center(child: CircularProgressIndicator()),
+                ],
+              ))
+      ],
+    );
   }
 }

lib/widgets/perfecture_widget.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:get/get.dart';
 import 'package:rogapp/pages/index/index_controller.dart';
-import 'package:rogapp/widgets/cat_widget.dart';
 
 
 class PerfectureWidget  extends StatefulWidget {
@@ -166,11 +165,9 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
         }
         setState(() {
             widget.indexController.locations.clear();
-            if(newValue != null){
+            widget.indexController.is_loading.value = true;
-              widget.indexController.is_loading.value = true;
+            widget.indexController.areaDropdownValue = newValue;
-              widget.indexController.areaDropdownValue = newValue;
+            widget.indexController.populateSubPerForArea(newValue, widget.mapController);
-              widget.indexController.populateSubPerForArea(newValue, widget.mapController);
-            }
           });
         },
         items: getCustomArea(),
@@ -203,7 +200,7 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
       ) :
       const Text(""),
        //CatWidget(indexController: widget.indexController,),
-      widget.indexController.cats.length > 0 ?
+      widget.indexController.cats.isNotEmpty ?
       DropdownButton<String>(
         value: widget.indexController.getCatText(),
         icon: const Icon(Icons.arrow_downward),

pubspec.yaml

@@ -15,10 +15,10 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.12+12
+version: 1.0.16+16
 
 environment:
-  sdk: ">=2.16.0 <3.0.0"
+  sdk: '>=3.1.0 <4.0.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -36,13 +36,13 @@ dependencies:
   cupertino_icons: ^1.0.2
   sqflite: ^2.0.1
   get: ^4.6.5
-  flutter_map: any
+  flutter_map: ^4.0.0
-  geolocator: ^9.0.1
+  geolocator: ^9.0.2
   permission_handler: ^10.0.0
-  google_api_availability: ^3.0.1
+  google_api_availability: ^5.0.0
   tuple: ^2.0.0
   latlong2: ^0.8.1
-  positioned_tap_detector: ^1.0.3
+  positioned_tap_detector_2: ^1.0.4
   transparent_image: ^2.0.0
   async: ^2.8.2
   vector_math: ^2.1.1
@@ -53,9 +53,9 @@ dependencies:
   path_provider: ^2.0.8
   flutter_map_location_marker: any
   flutter_map_marker_cluster: any
-  material_design_icons_flutter: ^5.0.6595
+  material_design_icons_flutter: ^7.0.7296
-  google_fonts: ^2.1.1
+  #google_fonts: ^2.1.1
-  image_picker: ^0.8.4+4
+  image_picker: ^1.0.4
   #geojson_vi: ^2.0.7
   geojson: ^1.0.0
   url_launcher: ^6.0.20
@@ -66,15 +66,17 @@ dependencies:
   flutter_polyline_points: ^1.0.0
   google_maps_webservice: ^0.0.19
   flutter_typeahead: ^4.0.0
-  flutter_launcher_icons: ^0.10.0
+  flutter_launcher_icons: ^0.13.1
   rename: ^2.0.1
   circular_menu: ^2.0.1
   camera_camera: ^3.0.0-dev
-  intl: ^0.17.0
+  intl: ^0.18.1
   modal_bottom_sheet: ^3.0.0-pre
-  connectivity_plus: ^3.0.2
+  connectivity_plus: ^4.0.2
-  flutter_map_tile_caching: ^6.2.0
+  flutter_map_tile_caching: ^8.0.1
   shared_preferences: ^2.0.15
+  gallery_saver: ^2.3.2
+  
 
 flutter_icons:
   android: true
@@ -91,7 +93,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^1.0.0
+  flutter_lints: ^2.0.3
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

test/widget_test.dart

@@ -13,7 +13,7 @@ import 'package:rogapp/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget( MyApp());
+    await tester.pumpWidget( const MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);

windows/flutter/generated_plugin_registrant.cc

@@ -7,20 +7,23 @@
 #include "generated_plugin_registrant.h"
 
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <file_selector_windows/file_selector_windows.h>
 #include <geolocator_windows/geolocator_windows.h>
+#include <isar_flutter_libs/isar_flutter_libs_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
-#include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   ConnectivityPlusWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
   GeolocatorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("GeolocatorWindows"));
+  IsarFlutterLibsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
-  SharePlusWindowsPluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,9 +4,10 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
+  file_selector_windows
   geolocator_windows
+  isar_flutter_libs
   permission_handler_windows
-  share_plus
   url_launcher_windows
 )