nouffer/rog_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to 3.13

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-09-03 23:37:41 +05:30
parent c41dde4c33
commit 56e9861c7a
60 changed files with 3111 additions and 2705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
.metadata
View File

@ -1,10 +1,30 @@
# This file tracks properties of this Flutter project. # This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc. # Used by Flutter tool to assess capabilities and perform upgrades etc.
# #
# This file should be version controlled and should not be manually edited. # This file should be version controlled.
version: version:
revision: 5f105a6ca7a5ac7b8bc9b241f4c2d86f4188cf5c revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
channel: stable channel: stable
project_type: app project_type: app
# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
- platform: ios
create_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
base_revision: 2ad6cd72c040113b47ee9055e722606a490ef0da
# User provided section
# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'

62
android/build.gradle
View File

@ -1,31 +1,31 @@
buildscript { buildscript {
ext.kotlin_version = '1.6.10' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
allprojects { allprojects {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
} }
rootProject.buildDir = '../build' rootProject.buildDir = '../build'
subprojects { subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}" project.buildDir = "${rootProject.buildDir}/${project.name}"
} }
subprojects { subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
ios/Podfile
View File

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

121
ios/Podfile.lock
View File

@ -4,47 +4,11 @@ PODS:
- connectivity_plus (0.0.1): - connectivity_plus (0.0.1):
- Flutter - Flutter
- ReachabilitySwift - 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 (1.0.0)
- flutter_compass (0.0.1): - flutter_compass (0.0.1):
- Flutter - Flutter
- flutter_keyboard_visibility (0.0.1): - flutter_keyboard_visibility (0.0.1):
- Flutter - Flutter
- flutter_local_notifications (0.0.1):
- Flutter
- FMDB (2.7.5): - FMDB (2.7.5):
- FMDB/standard (= 2.7.5) - FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5) - FMDB/standard (2.7.5)
@ -52,127 +16,102 @@ PODS:
- Flutter - Flutter
- google_maps_flutter_ios (0.0.1): - google_maps_flutter_ios (0.0.1):
- Flutter - Flutter
- GoogleMaps - GoogleMaps (< 8.0)
- GoogleMaps (4.1.0): - GoogleMaps (6.2.1):
- GoogleMaps/Maps (= 4.1.0) - GoogleMaps/Maps (= 6.2.1)
- GoogleMaps/Base (4.1.0) - GoogleMaps/Base (6.2.1)
- GoogleMaps/Maps (4.1.0): - GoogleMaps/Maps (6.2.1):
- GoogleMaps/Base - GoogleMaps/Base
- image_picker_ios (0.0.1): - image_picker_ios (0.0.1):
- Flutter - Flutter
- move_to_background (0.0.1): - isar_flutter_libs (1.0.0):
- Flutter - Flutter
- path_provider_ios (0.0.1): - path_provider_foundation (0.0.1):
- Flutter - Flutter
- permission_handler_apple (9.0.4): - FlutterMacOS
- permission_handler_apple (9.1.1):
- Flutter - Flutter
- ReachabilitySwift (5.0.0) - 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): - shared_preferences_foundation (0.0.1):
- Flutter - Flutter
- FlutterMacOS - FlutterMacOS
- sqflite (0.0.2): - sqflite (0.0.3):
- Flutter - Flutter
- FMDB (>= 2.7.5) - FMDB (>= 2.7.5)
- SwiftyGif (5.4.4)
- url_launcher_ios (0.0.1): - url_launcher_ios (0.0.1):
- Flutter - Flutter
DEPENDENCIES: DEPENDENCIES:
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`) - Flutter (from `Flutter`)
- flutter_compass (from `.symlinks/plugins/flutter_compass/ios`) - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/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`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
- google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`) - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_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`) - 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`) - sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
SPEC REPOS: SPEC REPOS:
trunk: trunk:
- DKImagePickerController
- DKPhotoGallery
- FMDB - FMDB
- GoogleMaps - GoogleMaps
- ReachabilitySwift - ReachabilitySwift
- SDWebImage
- SwiftyGif
EXTERNAL SOURCES: EXTERNAL SOURCES:
camera_avfoundation: camera_avfoundation:
:path: ".symlinks/plugins/camera_avfoundation/ios" :path: ".symlinks/plugins/camera_avfoundation/ios"
connectivity_plus: connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios" :path: ".symlinks/plugins/connectivity_plus/ios"
file_picker:
:path: ".symlinks/plugins/file_picker/ios"
Flutter: Flutter:
:path: Flutter :path: Flutter
flutter_compass: flutter_compass:
:path: ".symlinks/plugins/flutter_compass/ios" :path: ".symlinks/plugins/flutter_compass/ios"
flutter_keyboard_visibility: flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios" :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
flutter_local_notifications:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
geolocator_apple: geolocator_apple:
:path: ".symlinks/plugins/geolocator_apple/ios" :path: ".symlinks/plugins/geolocator_apple/ios"
google_maps_flutter_ios: google_maps_flutter_ios:
:path: ".symlinks/plugins/google_maps_flutter_ios/ios" :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
image_picker_ios: image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/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: permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios" :path: ".symlinks/plugins/permission_handler_apple/ios"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_foundation: shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios" :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
sqflite: sqflite:
:path: ".symlinks/plugins/sqflite/ios" :path: ".symlinks/plugins/sqflite/ios"
url_launcher_ios: url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios" :path: ".symlinks/plugins/url_launcher_ios/ios"
SPEC CHECKSUMS: SPEC CHECKSUMS:
camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9 camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855 flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9 google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
GoogleMaps: 008e2c80e38605b56b560e8deb73d4194ff30bef GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
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 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 PODFILE CHECKSUM: 7a34d5e980f9e05ecf4e24c79da64ca020615638
COCOAPODS: 1.12.1 COCOAPODS: 1.12.1

38
ios/Runner.xcodeproj/project.pbxproj
View File

@ -139,7 +139,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */, 9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */, ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */,
FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */, BC610379D726847A0183FBD1 /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = { 97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1300; LastUpgradeCheck = 1430;
ORGANIZATIONNAME = ""; ORGANIZATIONNAME = "";
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
@ -251,6 +251,23 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
}; };
BC610379D726847A0183FBD1 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */ = { ED4E40E6FE1C0A73CAC736F8 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -268,23 +285,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
FE7C2E909403F98AB3140FE6 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */

2
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View File

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

21
lib/main.dart
View File

@ -1,22 +1,20 @@
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart'; import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:rogapp/pages/index/index_binding.dart'; import 'package:rogapp/pages/index/index_binding.dart';
import 'package:rogapp/routes/app_pages.dart'; import 'package:rogapp/routes/app_pages.dart';
import 'package:rogapp/utils/string_values.dart'; import 'package:rogapp/utils/string_values.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:path/path.dart' as p;
String? userToken;
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
FlutterMapTileCaching.initialise(await RootDirectory.normalCache); await FlutterMapTileCaching.initialise();
final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)'); final StoreDirectory instanceA = FMTC.instance('OpenStreetMap (A)');
await instanceA.manage.createAsync(); await instanceA.manage.createAsync();
await instanceA.metadata.addAsync( await instanceA.metadata.addAsync(
@ -32,9 +30,10 @@ void main() async {
value: 'cacheFirst', value: 'cacheFirst',
); );
runApp(MyApp()); runApp(const MyApp());
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key); const MyApp({Key? key}) : super(key: key);
// This widget is the root of your application. // This widget is the root of your application.
@ -47,16 +46,16 @@ class MyApp extends StatelessWidget {
fallbackLocale: const Locale('en', 'US'), fallbackLocale: const Locale('en', 'US'),
title: 'ROGAINING', title: 'ROGAINING',
theme: ThemeData( theme: ThemeData(
primarySwatch: Colors.blue, colorScheme: ColorScheme.fromSeed(
visualDensity: VisualDensity.adaptivePlatformDensity, seedColor: const Color.fromARGB(255, 4, 88, 161)),
textTheme: GoogleFonts.muliTextTheme(), useMaterial3: true,
), ),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
defaultTransition: Transition.cupertino, defaultTransition: Transition.cupertino,
opaqueRoute: Get.isOpaqueRouteDefault, opaqueRoute: Get.isOpaqueRouteDefault,
popGesture: Get.isPopGestureEnable, popGesture: Get.isPopGestureEnable,
transitionDuration: const Duration(milliseconds: 230), transitionDuration: const Duration(milliseconds: 230),
initialBinding: IndexBinding(), //HomeBinding(), initialBinding: IndexBinding(userToken), //HomeBinding(),
initialRoute: AppPages.PERMISSION, initialRoute: AppPages.PERMISSION,
getPages: AppPages.routes, getPages: AppPages.routes,
enableLog: true, enableLog: true,

38
lib/pages/camera/camera_page.dart
View File

@ -21,7 +21,7 @@ class CameraPage extends StatelessWidget {
return FileImage(destinationController.photos[0]); return FileImage(destinationController.photos[0]);
} }
else{ else{
return AssetImage('assets/images/empty_image.png'); return const AssetImage('assets/images/empty_image.png');
} }
} }
@ -40,21 +40,21 @@ class CameraPage extends StatelessWidget {
destinationController.photos.isNotEmpty ? destinationController.photos.isNotEmpty ?
ElevatedButton( ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: Colors.red backgroundColor: Colors.red
), ),
onPressed: (){ onPressed: (){
int user_id = indexController.currentUser[0]["user"]["id"]; int userId = indexController.currentUser[0]["user"]["id"];
//print("--- Pressed -----"); //print("--- Pressed -----");
String _team = indexController.currentUser[0]["user"]['team_name']; String team = indexController.currentUser[0]["user"]['team_name'];
//print("--- _team : ${_team}-----"); //print("--- _team : ${_team}-----");
String _event_code = indexController.currentUser[0]["user"]["event_code"]; String eventCode = indexController.currentUser[0]["user"]["event_code"];
//print("--- _event_code : ${_event_code}-----"); //print("--- _event_code : ${_event_code}-----");
String _token = indexController.currentUser[0]["token"]; String token = indexController.currentUser[0]["token"];
//print("--- _token : ${_token}-----"); //print("--- _token : ${_token}-----");
DateTime now = DateTime.now(); DateTime now = DateTime.now();
String formattedDate = DateFormat('yyyy-MM-dd HH:mm:ss').format(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){ ExternalService().makeGoal(userId, token, team, destinationController.photos[0].path, formattedDate, eventCode).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();
@ -84,14 +84,14 @@ class CameraPage extends StatelessWidget {
onPressed: (){ onPressed: (){
destinationController.openCamera(context); destinationController.openCamera(context);
}, },
child: destinationController.photos.length > 0 ? Text("再撮影") : Text("撮影") child: destinationController.photos.isNotEmpty ? const Text("再撮影") : const Text("撮影")
) )
), ),
Obx(() => Obx(() =>
destinationController.photos.isNotEmpty ? destinationController.photos.isNotEmpty ?
ElevatedButton( ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: Colors.red backgroundColor: Colors.red
), ),
onPressed: (){ onPressed: (){
print("##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######"); print("##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
@ -115,7 +115,7 @@ class CameraPage extends StatelessWidget {
// } // }
// }); // });
}, },
child: Text("チェックイン") child: const Text("チェックイン")
): ):
Container() Container()
) )
@ -145,7 +145,7 @@ class CameraPage extends StatelessWidget {
onPressed: (){ onPressed: (){
Navigator.of(context).pop(); Navigator.of(context).pop();
destinationController.skip_10s = true; 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; destinationController.skip_10s = false;
}); });
}, },
@ -154,13 +154,13 @@ class CameraPage extends StatelessWidget {
) )
: :
AppBar( AppBar(
title: Text("チェックポイント"), title: const Text("チェックポイント"),
), ),
body: Column( body: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Center( child: Center(
child: Obx(() => child: Obx(() =>
Container( Container(
@ -205,14 +205,14 @@ class StartRogaining extends StatelessWidget {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ 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( ElevatedButton(
onPressed: (){ onPressed: (){
Get.back(); Get.back();
destinationController.skip_gps = false; destinationController.skip_gps = false;
}, },
child: Text("Back"), child: const Text("Back"),
), ),
], ],
), ),
@ -238,14 +238,14 @@ class NotAtGoal extends StatelessWidget {
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ 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( ElevatedButton(
onPressed: (){ onPressed: (){
Get.back(); Get.back();
destinationController.skip_gps = false; destinationController.skip_gps = false;
}, },
child: Text("Back"), child: const Text("Back"),
), ),
], ],
), ),

37
lib/pages/changepassword/change_password_page.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/routes/app_pages.dart';
class ChangePasswordPage extends StatelessWidget { class ChangePasswordPage extends StatelessWidget {
ChangePasswordPage({Key? key}) : super(key: key); ChangePasswordPage({Key? key}) : super(key: key);
@ -23,10 +22,10 @@ class ChangePasswordPage extends StatelessWidget {
leading: leading:
IconButton( onPressed: (){ IconButton( onPressed: (){
Navigator.pop(context); Navigator.pop(context);
},icon:Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)), },icon:const Icon(Icons.arrow_back_ios,size: 20,color: Colors.black,)),
), ),
body: body:
Container( SizedBox(
width: double.infinity, width: double.infinity,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -37,13 +36,13 @@ class ChangePasswordPage extends StatelessWidget {
Column( Column(
children: [ children: [
Container( 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(
padding: EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 40 horizontal: 40
), ),
child: Column( child: Column(
@ -54,9 +53,9 @@ class ChangePasswordPage extends StatelessWidget {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 40), padding: const EdgeInsets.symmetric(horizontal: 40),
child: Container( child: Container(
padding: EdgeInsets.only(top: 3,left: 3), padding: const EdgeInsets.only(top: 3,left: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(40), borderRadius: BorderRadius.circular(40),
), ),
@ -71,7 +70,7 @@ class ChangePasswordPage extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40) borderRadius: BorderRadius.circular(40)
), ),
child: CircularProgressIndicator(), child: const CircularProgressIndicator(),
) : ) :
Column( Column(
children: [ children: [
@ -83,9 +82,9 @@ class ChangePasswordPage extends StatelessWidget {
Get.snackbar( Get.snackbar(
"no_values".tr, "no_values".tr,
"values_required".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, 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"))
); );
@ -99,12 +98,12 @@ class ChangePasswordPage extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(40) borderRadius: BorderRadius.circular(40)
), ),
child: Text("ログイン",style: TextStyle( child: const Text("ログイン",style: TextStyle(
fontWeight: FontWeight.w600,fontSize: 16,color: Colors.white70 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, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@ -132,17 +131,17 @@ class ChangePasswordPage extends StatelessWidget {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(label,style:TextStyle( Text(label,style:const TextStyle(
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Colors.black87 color: Colors.black87
),), ),),
SizedBox(height: 5,), const SizedBox(height: 5,),
TextField( TextField(
controller: controller, controller: controller,
obscureText: obsureText, obscureText: obsureText,
decoration: InputDecoration( decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(vertical: 0,horizontal: 10), contentPadding: const EdgeInsets.symmetric(vertical: 0,horizontal: 10),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: (Colors.grey[400])!, color: (Colors.grey[400])!,
@ -154,7 +153,7 @@ class ChangePasswordPage extends StatelessWidget {
), ),
), ),
), ),
SizedBox(height: 30.0,) const SizedBox(height: 30.0,)
], ],
); );
} }

1
lib/pages/destination/destination_binding.dart
View File

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

949
lib/pages/destination/destination_controller.dart
View File

File diff suppressed because it is too large Load Diff

41
lib/pages/destination/destination_page.dart
View File

@ -1,20 +1,14 @@
import 'dart:developer';
import 'dart:io';
import 'package:camera_camera/camera_camera.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:latlong2/latlong.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/destination_controller.dart';
import 'package:rogapp/pages/destination_map/destination_map_page.dart'; import 'package:rogapp/pages/destination_map/destination_map_page.dart';
import 'package:rogapp/pages/drawer/drawer_page.dart'; import 'package:rogapp/pages/drawer/drawer_page.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/routes/app_pages.dart'; import 'package:rogapp/routes/app_pages.dart';
import 'package:rogapp/services/external_service.dart';
import 'package:rogapp/widgets/destination_widget.dart'; import 'package:rogapp/widgets/destination_widget.dart';
import 'package:timeline_tile/timeline_tile.dart';
class DestnationPage extends StatelessWidget { class DestnationPage extends StatelessWidget {
DestnationPage({Key? key}) : super(key: key); DestnationPage({Key? key}) : super(key: key);
@ -33,12 +27,12 @@ class DestnationPage extends StatelessWidget {
} }
Position position = await Geolocator.getCurrentPosition( Position position = await Geolocator.getCurrentPosition(
desiredAccuracy: LocationAccuracy.high); desiredAccuracy: LocationAccuracy.high);
indexController.rogMapController?.move(LatLng(position.latitude, position.longitude), 14); indexController.rogMapController.move(LatLng(position.latitude, position.longitude), 14);
} }
Image getImage(int index){ Image getImage(int index){
if(destinationController.destinations[index].photos == null || destinationController.destinations[index].photos == ""){ 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{ else{
return Image(image: NetworkImage(destinationController.destinations[index].photos!)); return Image(image: NetworkImage(destinationController.destinations[index].photos!));
@ -48,13 +42,13 @@ class DestnationPage extends StatelessWidget {
Widget getRoutingImage(int route){ Widget getRoutingImage(int route){
switch (route) { switch (route) {
case 0: 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: 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: 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: 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,);
} }
} }
@ -69,6 +63,7 @@ class DestnationPage extends StatelessWidget {
return false; return false;
}, },
child: Scaffold( child: Scaffold(
drawer: DrawerPage(), drawer: DrawerPage(),
bottomNavigationBar: BottomAppBar( bottomNavigationBar: BottomAppBar(
child: Row( child: Row(
@ -85,12 +80,12 @@ class DestnationPage extends StatelessWidget {
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(top:30.0, bottom: 30), 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( ListTile(
selected: destinationController.travelMode == 0 ? true : false, selected: destinationController.travelMode == 0 ? true : false,
selectedTileColor: Colors.amber.shade200, 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), title: Text("walking".tr),
onTap:(){ onTap:(){
destinationController.travelMode.value = 0; destinationController.travelMode.value = 0;
@ -101,7 +96,7 @@ class DestnationPage extends StatelessWidget {
ListTile( ListTile(
selected: destinationController.travelMode == 1 ? true : false, selected: destinationController.travelMode == 1 ? true : false,
selectedTileColor: Colors.amber.shade200, 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), title: Text("driving".tr),
onTap:(){ onTap:(){
destinationController.travelMode.value = 1; destinationController.travelMode.value = 1;
@ -147,13 +142,13 @@ class DestnationPage extends StatelessWidget {
indexController.toggleDestinationMode(); indexController.toggleDestinationMode();
}, },
tooltip: 'Increment', tooltip: 'Increment',
elevation: 4.0,
child: Obx(() => child: Obx(() =>
indexController.desination_mode == 1 ? 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,
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
appBar:AppBar( appBar:AppBar(
@ -170,12 +165,12 @@ class DestnationPage extends StatelessWidget {
destinationController.is_at_goal == true ? destinationController.is_at_goal == true ?
IconButton( IconButton(
onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);},
icon: Icon(Icons.assistant_photo), icon: const Icon(Icons.assistant_photo),
) )
: :
IconButton( IconButton(
onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);}, onPressed:(){Get.toNamed(AppPages.CAMERA_PAGE);},
icon: Icon(Icons.accessibility), icon: const Icon(Icons.accessibility),
), ),
), ),
// Obx(() => // Obx(() =>
@ -185,9 +180,6 @@ class DestnationPage extends StatelessWidget {
ToggleButtons( ToggleButtons(
disabledColor: Colors.grey.shade200, disabledColor: Colors.grey.shade200,
selectedColor: Colors.red, selectedColor: Colors.red,
children: <Widget>[
Icon(Icons.explore, size: 35.0,
)],
onPressed: (int index) { onPressed: (int index) {
destinationController.is_gps_selected.value = !destinationController.is_gps_selected.value; destinationController.is_gps_selected.value = !destinationController.is_gps_selected.value;
if(destinationController.is_gps_selected.value){ if(destinationController.is_gps_selected.value){
@ -197,6 +189,9 @@ class DestnationPage extends StatelessWidget {
} }
}, },
isSelected: [destinationController.is_gps_selected.value], isSelected: [destinationController.is_gps_selected.value],
children: const <Widget>[
Icon(Icons.explore, size: 35.0,
)],
), ),
), ),
// IconButton(onPressed: (){ // IconButton(onPressed: (){

54
lib/pages/destination_map/destination_map_page.dart
View File

@ -5,21 +5,15 @@ import 'package:flutter/material.dart';
import 'package:flutter_map/plugin_api.dart'; import 'package:flutter_map/plugin_api.dart';
import 'package:flutter_map_location_marker/flutter_map_location_marker.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_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:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:geojson/geojson.dart';
import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import 'package:rogapp/model/destination.dart'; import 'package:rogapp/model/destination.dart';
import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_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/utils/text_util.dart';
import 'package:rogapp/widgets/base_layer_widget.dart'; import 'package:rogapp/widgets/base_layer_widget.dart';
import 'package:rogapp/widgets/bottom_sheet_new.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 { class DestinationMapPage extends StatelessWidget {
@ -46,7 +40,7 @@ class DestinationMapPage extends StatelessWidget {
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!), point: LatLng(d.lat!, d.lon!),
anchorPos: AnchorPos.align(AnchorAlign.center), anchorPos: AnchorPos.align(AnchorAlign.center),
@ -55,21 +49,19 @@ class DestinationMapPage extends StatelessWidget {
return InkWell( 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.getAction();
showModalBottomSheet(context: Get.context!, isScrollControlled: true,
builder:((context) => BottomSheetNew())
).whenComplete((){
print("---- set skip gps to false -----");
destinationController.skip_gps = false;
});
} }
}, indexController.currentDestinationFeature.add(d);
//indexController.getAction();
showModalBottomSheet(context: Get.context!, isScrollControlled: true,
builder:((context) => BottomSheetNew())
).whenComplete((){
print("---- set skip gps to false -----");
destinationController.skip_gps = false;
});
},
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -79,19 +71,19 @@ class DestinationMapPage extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.red, color: Colors.red,
shape: BoxShape.circle, shape: BoxShape.circle,
border: new Border.all( border: Border.all(
color: Colors.white, 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(), (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),)),
], ],
), ),
); );
@ -132,28 +124,28 @@ class DestinationMapPage extends StatelessWidget {
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.listen((MapEvent mapEvent) {
if (mapEvent is MapEventMoveStart) { if (mapEvent is MapEventMoveStart) {
} }
if (mapEvent is MapEventMoveEnd) { if (mapEvent is MapEventMoveEnd) {
//destinationController.is_gps_selected.value = true; //destinationController.is_gps_selected.value = true;
//indexController.mapController!.move(c.center, c.zoom); //indexController.mapController!.move(c.center, c.zoom);
LatLngBounds bounds = indexController.rogMapController!.bounds!; LatLngBounds bounds = indexController.rogMapController.bounds!;
indexController.currentBound.clear(); indexController.currentBound.clear();
indexController.currentBound.add(bounds); indexController.currentBound.add(bounds);
if(indexController.currentUser.length <= 0){ if(indexController.currentUser.isEmpty){
indexController.loadLocationsBound(); indexController.loadLocationsBound();
} }
} }
}); });
} , } ,
bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]), bounds: indexController.currentBound.isNotEmpty ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
zoom: 1, zoom: 1,
maxZoom: 42, maxZoom: 42,
interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag, interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
), ),
children: [ children: [
BaseLayer(), const BaseLayer(),
Obx(() => Obx(() =>
indexController.routePointLenght > 0 ? indexController.routePointLenght > 0 ?
PolylineLayer( PolylineLayer(

29
lib/pages/drawer/drawer_page.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.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/pages/index/index_controller.dart';
import 'package:rogapp/routes/app_pages.dart'; import 'package:rogapp/routes/app_pages.dart';
import 'package:rogapp/services/auth_service.dart'; import 'package:rogapp/services/auth_service.dart';
@ -33,16 +32,16 @@ class DrawerPage extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: 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(() => Obx(() =>
indexController.currentUser.length == 0 ? indexController.currentUser.isEmpty ?
ListTile( ListTile(
leading: const Icon(Icons.login), leading: const Icon(Icons.login),
title: Text("login".tr), title: Text("login".tr),
@ -59,7 +58,7 @@ class DrawerPage extends StatelessWidget {
}, },
) )
), ),
indexController.currentUser.length > 0 ? indexController.currentUser.isNotEmpty ?
ListTile( ListTile(
leading: const Icon(Icons.password), leading: const Icon(Icons.password),
title: Text("change_password".tr), title: Text("change_password".tr),
@ -67,8 +66,8 @@ class DrawerPage extends StatelessWidget {
Get.toNamed(AppPages.CHANGE_PASSWORD); Get.toNamed(AppPages.CHANGE_PASSWORD);
}, },
) : ) :
Container(width: 0, height: 0,), const SizedBox(width: 0, height: 0,),
indexController.currentUser.length == 0 ? indexController.currentUser.isEmpty ?
ListTile( ListTile(
leading: const Icon(Icons.person), leading: const Icon(Icons.person),
title: Text("sign_up".tr), title: Text("sign_up".tr),
@ -76,14 +75,14 @@ class DrawerPage extends StatelessWidget {
Get.toNamed(AppPages.REGISTER); Get.toNamed(AppPages.REGISTER);
}, },
) : ) :
Container(width: 0, height: 0,), const SizedBox(width: 0, height: 0,),
indexController.currentUser.length > 0 ? indexController.currentUser.isNotEmpty ?
ListTile( ListTile(
leading: const Icon(Icons.delete_forever), leading: const Icon(Icons.delete_forever),
title: Text("delete_account".tr), title: Text("delete_account".tr),
onTap: (){ onTap: (){
String _token = indexController.currentUser[0]['token']; String token = indexController.currentUser[0]['token'];
AuthService.deleteUser(_token).then((value){ AuthService.deleteUser(token).then((value){
if(value.isNotEmpty){ if(value.isNotEmpty){
indexController.logout(); indexController.logout();
Get.toNamed(AppPages.TRAVEL); Get.toNamed(AppPages.TRAVEL);
@ -92,7 +91,7 @@ class DrawerPage extends StatelessWidget {
}); });
}, },
) : ) :
Container(width: 0, height: 0,), const SizedBox(width: 0, height: 0,),
// ListTile( // ListTile(
// leading: const Icon(Icons.person), // leading: const Icon(Icons.person),
// title: Text("profile".tr), // title: Text("profile".tr),
@ -108,7 +107,7 @@ class DrawerPage extends StatelessWidget {
// title: Text("point_rank".tr), // title: Text("point_rank".tr),
// onTap: (){}, // onTap: (){},
// ), // ),
indexController.currentUser.length > 0 ? indexController.currentUser.isNotEmpty ?
ListTile( ListTile(
leading: const Icon(Icons.featured_video), leading: const Icon(Icons.featured_video),
title: Text("rog_web".tr), title: Text("rog_web".tr),
@ -116,7 +115,7 @@ class DrawerPage extends StatelessWidget {
_launchURL("https://www.gifuai.net/?page_id=17397"); _launchURL("https://www.gifuai.net/?page_id=17397");
}, },
) : ) :
Container(width: 0, height: 0,), const SizedBox(width: 0, height: 0,),
ListTile( ListTile(
leading: const Icon(Icons.privacy_tip), leading: const Icon(Icons.privacy_tip),
title: Text("privacy".tr), title: Text("privacy".tr),

65
lib/pages/history/history_page.dart Normal file
View File

@ -0,0 +1,65 @@
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) {
return Center(
child: ListView.builder(itemBuilder:(ctx, index){
return ListTile(
title: Text(dests[index].name?? ""),
subtitle: Text(dests[index].address ?? ""),
leading: dests[0].photos != null ? 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();
}),
],
),
),
);
}
}

2
lib/pages/home/home_page.dart
View File

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

11
lib/pages/index/index_binding.dart
View File

@ -1,12 +1,17 @@
import 'package:flutter_map/plugin_api.dart';
import 'package:get/get.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/pages/index/index_controller.dart';
class IndexBinding extends Bindings { class IndexBinding extends Bindings {
IndexBinding(this.token);
String? token;
@override @override
void dependencies() { void dependencies() {
Get.put<IndexController>(IndexController()); final IndexController indexController = IndexController();
indexController.userToken = token;
Get.put<IndexController>(indexController);
} }
} }

760
lib/pages/index/index_controller.dart
View File

File diff suppressed because it is too large Load Diff

163
lib/pages/index/index_page.dart
View File

@ -1,26 +1,18 @@
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:rogapp/model/destination.dart';
import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/drawer/drawer_page.dart'; import 'package:rogapp/pages/drawer/drawer_page.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/routes/app_pages.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/list_widget.dart';
import 'package:rogapp/widgets/map_widget.dart'; import 'package:rogapp/widgets/map_widget.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart';
class IndexPage extends GetView<IndexController> { class IndexPage extends GetView<IndexController> {
IndexPage({Key? key}) : super(key: key); IndexPage({Key? key}) : super(key: key);
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
final DestinationController destinationController = Get.find<DestinationController>(); final DestinationController destinationController =
Get.find<DestinationController>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -30,33 +22,37 @@ class IndexPage extends GetView<IndexController> {
return false; return false;
}, },
child: Scaffold( child: Scaffold(
//drawer: const DrawerPage(), drawer: DrawerPage(),
appBar: AppBar( appBar: AppBar(
leading: IconButton( // leading: IconButton(
icon: Icon(Icons.arrow_back_ios), // icon: const Icon(Icons.arrow_back_ios),
onPressed: (){ // onPressed: (){
indexController.switchPage(AppPages.TRAVEL); // indexController.switchPage(AppPages.TRAVEL);
// },
// ),
//automaticallyImplyLeading: false,
title: Text("add_location".tr),
actions: [
InkWell(
onTap: () {
Get.toNamed(AppPages.SEARCH);
}, },
), child: Container(
//automaticallyImplyLeading: false, height: 32,
title: Text("add_location".tr), width: 75,
actions: [ decoration: BoxDecoration(
InkWell( borderRadius: BorderRadius.circular(25),
onTap: (){
Get.toNamed(AppPages.SEARCH);
},
child: Container(
height: 32,
width: 75,
decoration: BoxDecoration(
color: Colors.blue,
borderRadius: BorderRadius.circular(25),
),
child: const Center(child: Icon(Icons.search),),
),
), ),
//CatWidget(indexController: indexController,), child: const Center(
child: Icon(Icons.search),
),
),
),
IconButton(onPressed: () {
Get.toNamed(AppPages.HISTORY);
}, icon: const Icon(Icons.history))
//CatWidget(indexController: indexController,),
], ],
), ),
bottomNavigationBar: BottomAppBar( bottomNavigationBar: BottomAppBar(
@ -64,51 +60,59 @@ class IndexPage extends GetView<IndexController> {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Padding( 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: 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( floatingActionButton: FloatingActionButton(
onPressed: (){ onPressed: () {
indexController.toggleMode(); indexController.toggleMode();
if(indexController.currentCat.isNotEmpty){ if (indexController.currentCat.isNotEmpty) {
print(indexController.currentCat[0].toString()); print(indexController.currentCat[0].toString());
} }
}, },
tooltip: 'Increment', tooltip: 'Increment',
child: Obx(() =>
indexController.mode == 0 ?
Image(image: AssetImage('assets/images/list2.png'))
:
Image(image: AssetImage('assets/images/map.png')),
),
elevation: 4.0, elevation: 4.0,
child: Obx(
() => indexController.mode == 0
? const Image(image: AssetImage('assets/images/list2.png'))
: const Image(image: AssetImage('assets/images/map.png')),
),
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
body: SafeArea( body: SafeArea(
@ -132,11 +136,11 @@ class IndexPage extends GetView<IndexController> {
// // ), // // ),
// child: SingleChildScrollView( // child: SingleChildScrollView(
// scrollDirection: Axis.horizontal, // scrollDirection: Axis.horizontal,
// child: Obx(() => // child: Obx(() =>
// Row( // Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [ // children: [
// indexController.is_mapController_loaded.value == false ? // indexController.is_mapController_loaded.value == false ?
// Center(child: CircularProgressIndicator()) // Center(child: CircularProgressIndicator())
// : // :
// BreadCrumbWidget(mapController: indexController.mapController), // BreadCrumbWidget(mapController: indexController.mapController),
@ -149,7 +153,7 @@ class IndexPage extends GetView<IndexController> {
// // onPressed: (){ // // onPressed: (){
// // indexController.currentCat.clear(); // // indexController.currentCat.clear();
// // indexController.loadLocationsBound(); // // indexController.loadLocationsBound();
// // }, // // },
// // icon: Icon(Icons.cancel, color: Colors.red,) // // icon: Icon(Icons.cancel, color: Colors.red,)
// // ) : // // ) :
// // Container(width: 0, height: 0,) // // Container(width: 0, height: 0,)
@ -161,18 +165,13 @@ class IndexPage extends GetView<IndexController> {
// ), // ),
// ), // ),
Expanded( Expanded(
child: Obx(() => child: Obx(
indexController.mode == 0 ? () => indexController.mode == 0 ? MapWidget() : ListWidget(),
MapWidget() : ))
ListWidget(),
)
)
], ],
), ),
), ),
), ),
); );
} }
}
}

18
lib/pages/landing/landing_page.dart
View File

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

4
lib/pages/loading/loading_page.dart
View File

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

50
lib/pages/login/login_page.dart
View File

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

46
lib/pages/login_popup/login_popup_page.dart
View File

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

4
lib/pages/mainperf/mainperf_page.dart
View File

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

36
lib/pages/permission/permission.dart
View File

@ -4,7 +4,7 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:rogapp/routes/app_pages.dart'; import 'package:rogapp/routes/app_pages.dart';
class PermissionHandlerScreen extends StatefulWidget { class PermissionHandlerScreen extends StatefulWidget {
PermissionHandlerScreen({Key? key}) : super(key: key); const PermissionHandlerScreen({Key? key}) : super(key: key);
@override @override
State<PermissionHandlerScreen> createState() => _PermissionHandlerScreenState(); State<PermissionHandlerScreen> createState() => _PermissionHandlerScreenState();
@ -20,9 +20,9 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: const Text('ロケーション許可'), title: const Text('ロケーション許可'),
content: SingleChildScrollView( content: const SingleChildScrollView(
child: ListBody( child: ListBody(
children: const <Widget>[ children: <Widget>[
Text( 'このアプリでは、位置情報の収集を行います。'), Text( 'このアプリでは、位置情報の収集を行います。'),
Text( 'このアプリでは、開始時点で位置情報を収集します。'), Text( 'このアプリでは、開始時点で位置情報を収集します。'),
], ],
@ -57,22 +57,20 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
permissionServiceCall() async { permissionServiceCall() async {
await permissionServices().then( await permissionServices().then(
(value) { (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{
_showMyDialog();
}
} }
}, else{
_showMyDialog();
}
},
); );
} }
@ -122,7 +120,7 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
}); });
return Scaffold( return Scaffold(
body: Container( body: Container(
child: Text(""), child: const Text(""),
), ),
); );
} }
@ -132,9 +130,9 @@ class _PermissionHandlerScreenState extends State<PermissionHandlerScreen> {
context: context, context: context,
builder: (_) => AlertDialog( builder: (_) => AlertDialog(
title: const Text('ロケーション許可'), title: const Text('ロケーション許可'),
content: SingleChildScrollView( content: const SingleChildScrollView(
child: ListBody( child: ListBody(
children: const <Widget>[ children: <Widget>[
Text( 'このアプリでは、位置情報の収集を行います。'), Text( 'このアプリでは、位置情報の収集を行います。'),
Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'), Text('岐阜ナビアプリではチェックポイントの自動チェックインの機能を可能にするために、現在地のデータが収集されます。アプリを閉じている時や、使用していないときにも収集されます。位置情報は、個人を特定できない統計的な情報として、ユーザーの個人情報とは一切結びつかない形で送信されます。お知らせの配信、位置情報の利用を許可しない場合は、この後表示されるダイアログで「許可しない」を選択してください。'),
], ],

5
lib/pages/progress/progress.dart
View File

@ -1,7 +1,4 @@
import 'package:flutter/material.dart'; 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 { class ProgressPage extends StatelessWidget {
const ProgressPage({Key? key}) : super(key: key); const ProgressPage({Key? key}) : super(key: key);
@ -10,7 +7,7 @@ class ProgressPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
color: Colors.transparent, color: Colors.transparent,
child: Center( child: const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
), ),
); );

44
lib/pages/register/register_page.dart
View File

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

3
lib/pages/search/search_controller.dart
View File

@ -1,8 +1,5 @@
import 'package:flutter/material.dart';
import 'package:geojson/geojson.dart'; import 'package:geojson/geojson.dart';
import 'package:get/get.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'; import 'package:rogapp/pages/index/index_controller.dart';
class SearchBarController extends GetxController { class SearchBarController extends GetxController {

7
lib/pages/search/search_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart';
import 'package:geojson/geojson.dart'; import 'package:geojson/geojson.dart';
@ -15,7 +14,7 @@ class SearchPage extends StatelessWidget {
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 || searchController.searchResults[index].properties!["photos"] == ""){
return Image(image: AssetImage('assets/images/empty_image.png')); return const Image(image: AssetImage('assets/images/empty_image.png'));
} }
else{ else{
return Image( return Image(
@ -39,7 +38,7 @@ class SearchPage extends StatelessWidget {
}, },
icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black,)), icon: const Icon(Icons.arrow_back_ios_new, color: Colors.black,)),
title: TypeAheadField( title: TypeAheadField(
textFieldConfiguration: TextFieldConfiguration( textFieldConfiguration: const TextFieldConfiguration(
autofocus: true, autofocus: true,
), ),
suggestionsCallback: (pattern) async{ suggestionsCallback: (pattern) async{
@ -49,7 +48,7 @@ class SearchPage extends StatelessWidget {
itemBuilder: (context, GeoJsonFeature suggestion){ itemBuilder: (context, GeoJsonFeature suggestion){
return ListTile( return ListTile(
title: Text(suggestion.properties!["location_name"]), 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), //leading: getImage(index),
); );
}, },

2
lib/pages/subperf/subperf_page.dart
View File

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

20
lib/routes/app_pages.dart
View File

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

1
lib/routes/app_routes.dart
View File

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

20
lib/services/action_service.dart
View File

@ -5,14 +5,14 @@ import 'package:rogapp/utils/const.dart';
class ActionService{ 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 = {}; 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}"; //String url = "http://localhost:8100/api/makeaction/?user_id=${user_id}&location_id=${location_id}&wanttogo=${wanttogo}&like=${like}&checkin=${checkin}";
print('++++++++${url}'); print('++++++++$url');
print("url is ------ ${url}"); print("url is ------ $url");
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ 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 = []; 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}'; //String url = 'http://localhost:8100/api/useraction/?user_id=${user_id}&location_id=${location_id}';
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{

60
lib/services/auth_service.dart
View File

@ -8,14 +8,14 @@ class AuthService{
static Future<Map<String, dynamic>> changePassword(String oldpassword, String newpassword, String token) async { static Future<Map<String, dynamic>> changePassword(String oldpassword, String newpassword, String token) async {
Map<String, dynamic> changePassword = {}; 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( final http.Response response = await http.put(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token ${token}' 'Authorization': 'Token $token'
}, },
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'old_password': oldpassword, 'old_password': oldpassword,
@ -31,11 +31,11 @@ class AuthService{
static Future<Map<String, dynamic>> login(String email, String password) async { 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 = {}; 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/'; //String url = 'http://localhost:8100/api/login/';
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
@ -57,9 +57,9 @@ class AuthService{
static Future<Map<String, dynamic>> register(String email, String password) async { static Future<Map<String, dynamic>> register(String email, String password) async {
Map<String, dynamic> cats = {}; 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( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -79,14 +79,14 @@ class AuthService{
static Future<Map<String, dynamic>> deleteUser(String token) async { static Future<Map<String, dynamic>> deleteUser(String token) async {
Map<String, dynamic> cats = {}; Map<String, dynamic> cats = {};
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
String url = '${server_url}/api/delete-account/'; String url = '$serverUrl/api/delete-account/';
print('++++++++${url}'); print('++++++++$url');
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', '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 { static Future<List<dynamic>?> UserDetails(int userid) async {
List<dynamic> cats = []; List<dynamic> cats = [];
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
String url = '${server_url}/api/userdetials?user_id=${userid}'; String url = '$serverUrl/api/userdetials?user_id=$userid';
print('++++++++${url}'); print('++++++++$url');
print("---- UserDetails url is ${url}"); print("---- UserDetails url is $url");
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -117,6 +117,28 @@ 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}];
}

13
lib/services/cat_service.dart
View File

@ -1,5 +1,4 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import '../utils/const.dart'; 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 { 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 = []; 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), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -28,9 +27,9 @@ class CatService{
static Future<List<dynamic>?> loadCatByCity(String cityname)async { static Future<List<dynamic>?> loadCatByCity(String cityname)async {
List<dynamic> cats = []; List<dynamic> cats = [];
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
String url = '${server_url}/api/catbycity/?${cityname}'; String url = '$serverUrl/api/catbycity/?$cityname';
print('++++++++${url}'); print('++++++++$url');
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

42
lib/services/destination_service.dart
View File

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

128
lib/services/external_service.dart
View File

@ -2,12 +2,10 @@ import 'dart:io';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:rogapp/model/destination.dart';
import 'package:rogapp/model/rog.dart'; import 'package:rogapp/model/rog.dart';
import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/utils/database_helper.dart'; import 'package:rogapp/utils/database_helper.dart';
import 'package:sqflite/sqlite_api.dart';
import 'dart:convert'; import 'dart:convert';
import '../utils/const.dart'; import '../utils/const.dart';
@ -33,100 +31,100 @@ class ExternalService {
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
Map<String, dynamic> _res = {}; Map<String, dynamic> res = {};
int user_id = indexController.currentUser[0]["user"]["id"]; int userId = indexController.currentUser[0]["user"]["id"];
//print("--- Pressed -----"); //print("--- Pressed -----");
String _team = indexController.currentUser[0]["user"]['team_name']; String team = indexController.currentUser[0]["user"]['team_name'];
//print("--- _team : ${_team}-----"); //print("--- _team : ${_team}-----");
String _event_code = indexController.currentUser[0]["user"]["event_code"]; String eventCode = indexController.currentUser[0]["user"]["event_code"];
if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){ if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance; DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog( Rog rog = Rog(
id:1, id:1,
team_name: _team, team_name: team,
event_code : _event_code, event_code : eventCode,
user_id: user_id, user_id: userId,
cp_number: -1, cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch, checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null, image: null,
rog_action_type: 0 rog_action_type: 0
); );
db.insertRogaining(_rog); db.insertRogaining(rog);
} }
else { else {
String url = 'https://natnats.mobilous.com/start_from_rogapp'; String url = 'https://natnats.mobilous.com/start_from_rogapp';
print('++++++++${url}'); print('++++++++$url');
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
}, },
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'team_name': _team, 'team_name': team,
'event_code': _event_code 'event_code': eventCode
}), }),
); );
print("---- start rogianing api status ---- ${response.statusCode}"); print("---- start rogianing api status ---- ${response.statusCode}");
if (response.statusCode == 200) { if (response.statusCode == 200) {
_res = json.decode(utf8.decode(response.bodyBytes)); res = json.decode(utf8.decode(response.bodyBytes));
print('----_res : ${_res} ----'); print('----_res : $res ----');
} }
} }
return _res; return res;
} }
Future<Map<String, dynamic>> makeCheckpoint(int user_id, String token, String checkin_time, String teamname, int cp, String eventcode, String imageurl) async { Future<Map<String, dynamic>> makeCheckpoint(int userId, String token, String checkinTime, String teamname, int cp, String eventcode, String imageurl) async {
Map<String, dynamic> _res = {}; Map<String, dynamic> res = {};
String url = 'https://natnats.mobilous.com/checkin_from_rogapp'; String url = 'https://natnats.mobilous.com/checkin_from_rogapp';
print('++++++++${url}'); print('++++++++$url');
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
if(imageurl != null){ if(imageurl != null){
if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){ if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance; DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog( Rog rog = Rog(
id:1, id:1,
team_name: teamname, team_name: teamname,
event_code : eventcode, event_code : eventcode,
user_id: user_id, user_id: userId,
cp_number: cp, cp_number: cp,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch, checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: imageurl, image: imageurl,
rog_action_type: 1, rog_action_type: 1,
); );
db.insertRogaining(_rog); db.insertRogaining(rog);
} }
else { 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); String im1_64 = base64Encode(im1Bytes);
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url1), Uri.parse(url1),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token ${token}' 'Authorization': 'Token $token'
}, },
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'user' : user_id.toString(), 'user' : userId.toString(),
'team_name': teamname, 'team_name': teamname,
'event_code': eventcode, 'event_code': eventcode,
'checkinimage' : im1_64, 'checkinimage' : im1_64,
'checkintime' : checkin_time, 'checkintime' : checkinTime,
'cp_number' : cp.toString() 'cp_number' : cp.toString()
}), }),
); );
_res = json.decode(utf8.decode(response.bodyBytes)); res = json.decode(utf8.decode(response.bodyBytes));
print("-----@@@@@ ${_res} -----"); print("-----@@@@@ $res -----");
if(response.statusCode == 201){ if(response.statusCode == 201){
//print('---- toekn is ${token} -----'); //print('---- toekn is ${token} -----');
@ -139,13 +137,13 @@ class ExternalService {
'team_name': teamname, 'team_name': teamname,
'cp_number': cp.toString(), 'cp_number': cp.toString(),
'event_code': eventcode, 'event_code': eventcode,
'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net') 'image': res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
}), }),
); );
print("--- checnin response ${response2.statusCode}----"); print("--- checnin response ${response2.statusCode}----");
if (response2.statusCode == 200) { if (response2.statusCode == 200) {
_res = json.decode(utf8.decode(response2.bodyBytes)); res = json.decode(utf8.decode(response2.bodyBytes));
print('----checkin res _res : ${_res} ----'); print('----checkin res _res : $res ----');
} }
} }
} }
@ -153,17 +151,17 @@ class ExternalService {
else{ else{
if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){ if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance; DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog( Rog rog = Rog(
id:1, id:1,
team_name: teamname, team_name: teamname,
event_code : eventcode, event_code : eventcode,
user_id: user_id, user_id: userId,
cp_number: cp, cp_number: cp,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch, checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null, image: null,
rog_action_type: 1, rog_action_type: 1,
); );
db.insertRogaining(_rog); db.insertRogaining(rog);
} }
else { else {
final http.Response response3 = await http.post( final http.Response response3 = await http.post(
@ -180,64 +178,64 @@ class ExternalService {
); );
print("--- checnin response ${response3.statusCode}----"); print("--- checnin response ${response3.statusCode}----");
if (response3.statusCode == 200) { if (response3.statusCode == 200) {
_res = json.decode(utf8.decode(response3.bodyBytes)); res = json.decode(utf8.decode(response3.bodyBytes));
print('----checkin res _res : ${_res} ----'); print('----checkin res _res : $res ----');
} }
} }
} }
return _res; return res;
} }
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 = {}; Map<String, dynamic> res2 = {};
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
final DestinationController destinationController = Get.find<DestinationController>(); final DestinationController destinationController = Get.find<DestinationController>();
//if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){ //if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance; DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog( Rog rog = Rog(
id:1, id:1,
team_name: teamname, team_name: teamname,
event_code : eventcode, event_code : eventcode,
user_id: user_id, user_id: userId,
cp_number: -1, cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch, checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: image, image: image,
rog_action_type: 1, rog_action_type: 1,
); );
db.insertRogaining(_rog); db.insertRogaining(rog);
// } // }
// else{ // 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); String im1_64 = base64Encode(im1Bytes);
final http.Response response = await http.post( final http.Response response = await http.post(
Uri.parse(url1), Uri.parse(url1),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token ${token}' 'Authorization': 'Token $token'
}, },
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number' // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'user' : user_id.toString(), 'user' : userId.toString(),
'team_name': teamname, 'team_name': teamname,
'event_code': eventcode, 'event_code': eventcode,
'goaltime' : goal_time, 'goaltime' : goalTime,
'goalimage' : im1_64, 'goalimage' : im1_64,
'cp_number' : "-1" 'cp_number' : "-1"
}), }),
); );
String url = 'https://natnats.mobilous.com/goal_from_rogapp'; String url = 'https://natnats.mobilous.com/goal_from_rogapp';
print('++++++++${url}'); print('++++++++$url');
if (response.statusCode == 201) { if (response.statusCode == 201) {
Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes)); Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
print('----_res : ${_res} ----'); print('----_res : $res ----');
print('---- image url ${_res["goalimage"]} ----'); print('---- image url ${res["goalimage"]} ----');
final http.Response response2 = await http.post( final http.Response response2 = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -246,26 +244,26 @@ class ExternalService {
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'team_name': teamname, 'team_name': teamname,
'event_code': eventcode, 'event_code': eventcode,
'goal_time' : goal_time, 'goal_time' : goalTime,
'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net') 'image' : res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
} }
), ),
); );
print('----- response2 is ${response2} --------'); print('----- response2 is $response2 --------');
if (response2.statusCode == 200) { if (response2.statusCode == 200) {
_res2 = json.decode(utf8.decode(response2.bodyBytes)); res2 = json.decode(utf8.decode(response2.bodyBytes));
} }
} }
//} //}
destinationController.resetRogaining(); destinationController.resetRogaining();
return _res2; return res2;
} }
static Future<Map<String, dynamic>> usersEventCode(String teamcode, String password) async { static Future<Map<String, dynamic>> usersEventCode(String teamcode, String password) async {
Map<String, dynamic> _res = {}; Map<String, dynamic> res = {};
String url = "https://natnats.mobilous.com/check_event_code?zekken_number=${teamcode}&password=${password}"; String url = "https://natnats.mobilous.com/check_event_code?zekken_number=$teamcode&password=$password";
print('++++++++${url}'); print('++++++++$url');
final http.Response response = await http.get( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
@ -274,9 +272,9 @@ class ExternalService {
); );
if (response.statusCode == 200) { if (response.statusCode == 200) {
_res = json.decode(utf8.decode(response.bodyBytes)); res = json.decode(utf8.decode(response.bodyBytes));
} }
return _res; return res;
} }
} }

6
lib/services/location_line_service.dart
View File

@ -8,9 +8,9 @@ class LocationLineService{
static Future<GeoJsonFeature?> loadLocationLines() async { static Future<GeoJsonFeature?> loadLocationLines() async {
final geo = GeoJson(); final geo = GeoJson();
GeoJsonFeature? fs; 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), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

6
lib/services/location_polygon_service.dart
View File

@ -9,9 +9,9 @@ class LocationPolygonervice{
final geo = GeoJson(); final geo = GeoJson();
GeoJsonFeature? fs; 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), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

95
lib/services/location_service.dart
View File

@ -37,31 +37,31 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async { static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
String url = ""; String url = "";
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){ if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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 { else {
url = '${server_url}/api/inperf/?perf=' + perfecture + '&cat=' + cat; url = '$serverUrl/api/inperf/?perf=$perfecture&cat=$cat';
} }
} }
else{ else{
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/inperf/?rog=${r}&perf=' + perfecture; url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture';
} }
else { else {
url = '${server_url}/api/inperf/?perf=' + perfecture; url = '$serverUrl/api/inperf/?perf=$perfecture';
} }
} }
print('++++++++${url}'); print('++++++++$url');
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -78,13 +78,13 @@ class LocationService{
static Future<List<dynamic>?> getLocationsExt(String token) async { static Future<List<dynamic>?> getLocationsExt(String token) async {
List<dynamic> ext = []; 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), final response = await http.post(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token ${token}' 'Authorization': 'Token $token'
}, },
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'token': token, 'token': token,
@ -102,30 +102,30 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async { static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
String url = ""; String url = "";
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){ if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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{ else{
url = '${server_url}/api/insubperf?subperf=' + subperfecture + '&cat=' + cat; url = '$serverUrl/api/insubperf?subperf=$subperfecture&cat=$cat';
} }
} }
else{ else{
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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{ 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), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -142,34 +142,35 @@ class LocationService{
static Future<GeoJsonFeatureCollection?> loadLocationsBound(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4, String cat) async { static Future<GeoJsonFeatureCollection?> loadLocationsBound(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4, String cat) async {
print("-------- in location for bound -------------");
final IndexController indexController = Get.find<IndexController>(); final IndexController indexController = Get.find<IndexController>();
print("-------- in location for bound -------------");
print("-------- in location for bound current user ${indexController.currentUser} -------------");
String url = ""; String url = "";
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){ if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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{ 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{ else{
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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{ 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), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
@ -200,31 +201,31 @@ class LocationService{
if(cat == "-all-"){ if(cat == "-all-"){
cat = ""; cat = "";
} }
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
print("loadCustomLocations url is ----- ${cat}"); print("loadCustomLocations url is ----- $cat");
if(cat.isNotEmpty){ if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; 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{ else{
url = '${server_url}/api/custom_area/?&cat=' + cat; url = '$serverUrl/api/custom_area/?&cat=$cat';
} }
} }
else{ else{
if(indexController.currentUser.isNotEmpty){ if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining']; bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False'; String r = rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code']; var grp = indexController.currentUser[0]['user']['event_code'];
url = '${server_url}/api/customarea?rog=${r}&name=${name}'; url = '$serverUrl/api/customarea?rog=$r&name=$name';
} }
else{ else{
url = '${server_url}/api/customarea?name=${name}'; url = '$serverUrl/api/customarea?name=$name';
} }
} }
print('++++++++${url}'); print('++++++++$url');
final response = await http.get(Uri.parse(url), final response = await http.get(Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',

16
lib/services/maxtrix_service.dart
View File

@ -18,7 +18,7 @@ class MatrixService{
int i = 0; int i = 0;
for(Destination d in destinations){ for(Destination d in destinations){
print("---- getting matrix for ${d} ------------"); print("---- getting matrix for $d ------------");
if(i==0){ if(i==0){
origin = "${d.lat}, ${d.lon}"; origin = "${d.lat}, ${d.lon}";
@ -37,24 +37,24 @@ class MatrixService{
i++; i++;
} }
locs = "optimize:false|${locs}"; locs = "optimize:false|$locs";
String _mode = "walking"; String mode = "walking";
switch (destinationController.travelMode.value) { switch (destinationController.travelMode.value) {
case 1: case 1:
_mode = "driving"; mode = "driving";
break; break;
case 2: case 2:
_mode = "transit"; mode = "transit";
break; break;
default: default:
_mode = "walking"; mode = "walking";
break; break;
} }
Map<String, dynamic> cats = {}; 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( final http.Response response = await http.get(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{

36
lib/services/perfecture_service.dart
View File

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

13
lib/services/reacking_service.dart
View File

@ -1,26 +1,25 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:rogapp/utils/const.dart'; import 'package:rogapp/utils/const.dart';
class TrackingService { 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 = {}; 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( final http.Response response = await http.post(
Uri.parse(url), Uri.parse(url),
headers: <String, String>{ headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8', 'Content-Type': 'application/json; charset=UTF-8',
}, },
body: jsonEncode(<String, String>{ body: jsonEncode(<String, String>{
'user_id': user_id, 'user_id': userId,
'geom': geom 'geom': geom
}), }),
); );

83
lib/utils/database_helper.dart
View File

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

6
lib/utils/text_util.dart
View File

@ -12,7 +12,7 @@ class TextUtils{
// txt = "${f.properties!["cp"].toString().replaceAll(regex, '')}"; // txt = "${f.properties!["cp"].toString().replaceAll(regex, '')}";
// } // }
//if(f.properties!["buy_point"] != null && f.properties!["buy_point"] > 0){ //if(f.properties!["buy_point"] != null && f.properties!["buy_point"] > 0){
txt = txt + "${f.properties!["sub_loc_id"]}"; txt = "$txt${f.properties!["sub_loc_id"]}";
//} //}
return txt; return txt;
} }
@ -22,9 +22,9 @@ class TextUtils{
RegExp regex = RegExp(r'([.]*0)(?!.*\d)'); RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
String txt = ""; String txt = "";
if(dp.cp! > 0){ 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){ if(dp.checkin_point != null && dp.checkin_point! > 0){
txt = txt + "{${dp.checkin_point.toString().replaceAll(regex, '')}}"; txt = "$txt{${dp.checkin_point.toString().replaceAll(regex, '')}}";
} }
if(dp.buy_point != null && dp.buy_point! > 0){ if(dp.buy_point != null && dp.buy_point! > 0){
print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^"); print("^^^^^^^^^ ${dp.sub_loc_id}^^^^^^^^^^");

2
lib/widgets/base_layer_widget.dart
View File

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

1605
lib/widgets/bottom_sheet_new.dart
View File

File diff suppressed because it is too large Load Diff

91
lib/widgets/bottom_sheet_widget.dart
View File

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

2
lib/widgets/bread_crum_widget.dart
View File

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

3
lib/widgets/cat_widget.dart
View File

@ -1,6 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/services/location_service.dart';
class CatWidget extends StatefulWidget { class CatWidget extends StatefulWidget {
CatWidget({ Key? key, required this.indexController, }) : super(key: key); CatWidget({ Key? key, required this.indexController, }) : super(key: key);
@ -31,7 +30,7 @@ class _CatWidgetState extends State<CatWidget> {
itemBuilder: (BuildContext context){ itemBuilder: (BuildContext context){
List<PopupMenuItem> itms = <PopupMenuItem>[]; List<PopupMenuItem> itms = <PopupMenuItem>[];
for(dynamic d in widget.indexController.cats[0]){ for(dynamic d in widget.indexController.cats[0]){
PopupMenuItem itm = PopupMenuItem(child: Text(d['category'].toString()), value: d['category'].toString()); PopupMenuItem itm = PopupMenuItem(value: d['category'].toString(), child: Text(d['category'].toString()));
itms.add(itm); itms.add(itm);
} }
return itms; return itms;

77
lib/widgets/destination_widget.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geojson/geojson.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:rogapp/model/destination.dart'; import 'package:rogapp/model/destination.dart';
import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/destination/destination_controller.dart';
@ -7,8 +6,6 @@ import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/utils/const.dart'; import 'package:rogapp/utils/const.dart';
import 'package:rogapp/utils/database_helper.dart'; import 'package:rogapp/utils/database_helper.dart';
import 'package:rogapp/widgets/bottom_sheet_new.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'; import 'package:timeline_tile/timeline_tile.dart';
class DestinationWidget extends StatelessWidget { class DestinationWidget extends StatelessWidget {
@ -22,12 +19,12 @@ class DestinationWidget extends StatelessWidget {
Image getImage(int index){ Image getImage(int index){
if(destinationController.destinations[index].photos== null || destinationController.destinations[index].photos == ""){ 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{ else{
print("------- image is ${destinationController.destinations[index].photos!}------"); print("------- image is ${destinationController.destinations[index].photos!}------");
String _photo = destinationController.destinations[index].photos!; String photo = destinationController.destinations[index].photos!;
if(_photo.contains('http')){ if(photo.contains('http')){
return Image(image: NetworkImage( return Image(image: NetworkImage(
destinationController.destinations[index].photos!), destinationController.destinations[index].photos!),
errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) { errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
@ -36,10 +33,10 @@ class DestinationWidget extends StatelessWidget {
); );
} }
else { else {
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
//print("==== photo is ${server_url + '/media/compressed/' + destinationController.destinations[index].photos!} ==="); //print("==== photo is ${server_url + '/media/compressed/' + destinationController.destinations[index].photos!} ===");
return Image(image: NetworkImage( return Image(image: NetworkImage(
'${server_url}/media/compressed/' + destinationController.destinations[index].photos!), '$serverUrl/media/compressed/${destinationController.destinations[index].photos!}'),
errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) { errorBuilder: (BuildContext context, Object exception, StackTrace? stackTrace) {
return Image.asset("assets/images/empty_image.png"); return Image.asset("assets/images/empty_image.png");
}, },
@ -63,10 +60,10 @@ class DestinationWidget extends StatelessWidget {
// } // }
void doDelete() { void doDelete() {
destinationController.currentSelectedDestinations.forEach((element) { for (var element in destinationController.currentSelectedDestinations) {
destinationController.deleteDestination(element); destinationController.deleteDestination(element);
destinationController.resetRogaining(); destinationController.resetRogaining();
}); }
// destinationController.destination_index_data.forEach((element) { // destinationController.destination_index_data.forEach((element) {
// //print(element["index"]); // //print(element["index"]);
// destinationController.deleteDestination(element["index"]); // destinationController.deleteDestination(element["index"]);
@ -75,7 +72,7 @@ class DestinationWidget extends StatelessWidget {
} }
void moveUp() { 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; d = ad;
@ -89,7 +86,7 @@ class DestinationWidget extends StatelessWidget {
} }
void moveDown() { 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; d = ad;
@ -107,8 +104,8 @@ class DestinationWidget extends StatelessWidget {
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,
@ -116,7 +113,7 @@ class DestinationWidget extends StatelessWidget {
buttonColor: Colors.white, buttonColor: Colors.white,
barrierDismissible: false, barrierDismissible: false,
radius: 10, radius: 10,
content: Column( content: const Column(
children: [ children: [
], ],
), ),
@ -138,9 +135,9 @@ class DestinationWidget extends StatelessWidget {
// }); // });
} }
Future getIsLocationAvilable(int location_id) async { Future getIsLocationAvilable(int locationId) async {
DatabaseHelper db = DatabaseHelper.instance; DatabaseHelper db = DatabaseHelper.instance;
return await db.isAlreadyAvailable(location_id); return await db.isAlreadyAvailable(locationId);
} }
@override @override
@ -164,8 +161,8 @@ class DestinationWidget extends StatelessWidget {
isFirst: index == 0 ? true : false, isFirst: index == 0 ? true : false,
indicatorStyle: IndicatorStyle( indicatorStyle: IndicatorStyle(
indicator: CircleAvatar( indicator: CircleAvatar(
child: Text(destinationController.destinations[index].list_order.toString(), style: TextStyle(color: Colors.white),),
backgroundColor: Colors.red, backgroundColor: Colors.red,
child: Text(destinationController.destinations[index].list_order.toString(), style: const TextStyle(color: Colors.white),),
), ),
), ),
key: Key(index.toString()), key: Key(index.toString()),
@ -178,22 +175,20 @@ class DestinationWidget extends StatelessWidget {
onTap: () async { onTap: () async {
{ {
Destination? fs = destinationController.destinations[index]; Destination? fs = destinationController.destinations[index];
print("----fsf-----${index}"); print("----fsf-----$index");
if(fs != null){
if(indexController.currentDestinationFeature.isNotEmpty) {
if(indexController.currentDestinationFeature.isNotEmpty) { indexController.currentDestinationFeature.clear();
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())
);
} }
}; 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: (){ onLongPress: (){
destinationController.toggleSelection(destinationController.destinations[index]); destinationController.toggleSelection(destinationController.destinations[index]);
@ -229,7 +224,7 @@ class DestinationWidget extends StatelessWidget {
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
), ),
], ],
), ),
@ -239,22 +234,22 @@ class DestinationWidget extends StatelessWidget {
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 ? doDelete : null,
), ),
IconButton( IconButton(
icon:Icon(Icons.move_up), icon:const Icon(Icons.move_up),
onPressed: destinationController.currentSelectedDestinations.length > 0 ? moveUp : null, onPressed: destinationController.currentSelectedDestinations.isNotEmpty ? moveUp : null,
), ),
IconButton( IconButton(
icon:Icon(Icons.move_down), icon:const Icon(Icons.move_down),
onPressed: destinationController.currentSelectedDestinations.length > 0 ? moveDown : null, onPressed: destinationController.currentSelectedDestinations.isNotEmpty ? moveDown : null,
), ),
// IconButton( // IconButton(
// icon:Icon(Icons.sync), // icon:Icon(Icons.sync),

29
lib/widgets/list_widget.dart
View File

@ -6,7 +6,6 @@ import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/utils/const.dart'; import 'package:rogapp/utils/const.dart';
import 'package:rogapp/widgets/bottom_sheet_new.dart'; import 'package:rogapp/widgets/bottom_sheet_new.dart';
import 'package:rogapp/widgets/bottom_sheet_widget.dart';
class ListWidget extends StatelessWidget { class ListWidget extends StatelessWidget {
ListWidget({ Key? key }) : super(key: key); ListWidget({ Key? key }) : super(key: key);
@ -16,16 +15,16 @@ class ListWidget extends StatelessWidget {
Image getImage(int index){ Image getImage(int index){
if(indexController.locations[0].collection[index].properties!["photos"] == null || indexController.locations[0].collection[index].properties!["photos"] == ""){ if(indexController.locations[0].collection[index].properties!["photos"] == null || indexController.locations[0].collection[index].properties!["photos"] == ""){
return Image(image: AssetImage('assets/images/empty_image.png')); return const Image(image: AssetImage('assets/images/empty_image.png'));
} }
else{ else{
print("==== photo index is ${index} ==="); print("==== photo index is $index ===");
String server_url = ConstValues.currentServer(); String serverUrl = ConstValues.currentServer();
GeoJsonFeature<dynamic> gf = indexController.locations[0].collection[index]; GeoJsonFeature<dynamic> gf = indexController.locations[0].collection[index];
String _photo = gf!.properties!["photos"]; String photo = gf.properties!["photos"];
return Image( return Image(
image: NetworkImage( image: NetworkImage(
'${server_url}/media/compressed/' + _photo '$serverUrl/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"); return Image.asset("assets/images/empty_image.png");
@ -35,7 +34,7 @@ class ListWidget extends StatelessWidget {
} }
void changeCurrentFeature(GeoJsonFeature fs){ void changeCurrentFeature(GeoJsonFeature fs){
if(indexController.currentFeature.length > 0){ if(indexController.currentFeature.isNotEmpty){
indexController.currentFeature.clear(); indexController.currentFeature.clear();
} }
indexController.currentFeature.add(fs); indexController.currentFeature.add(fs);
@ -44,21 +43,21 @@ class ListWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Obx(() => return Obx(() =>
indexController.locations.length > 0 ? indexController.locations.isNotEmpty ?
ListView.builder( ListView.builder(
itemCount: indexController.locations[0].collection.length, itemCount: indexController.locations[0].collection.length,
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (_, index){ itemBuilder: (_, index){
bool _is_found = false; bool isFound = false;
for(Destination d in destinationController.destinations){ for(Destination d in destinationController.destinations){
if(indexController.locations[0].collection[index].properties!['location_id'] == d.location_id){ if(indexController.locations[0].collection[index].properties!['location_id'] == d.location_id){
_is_found = true; isFound = true;
break; break;
} }
} }
return Card( return Card(
child: ListTile( child: ListTile(
selected: _is_found, selected: isFound,
selectedTileColor: Colors.yellow.shade200, selectedTileColor: Colors.yellow.shade200,
onTap: (){ onTap: (){
@ -72,13 +71,13 @@ class ListWidget extends StatelessWidget {
); );
}, },
leading: getImage(index), leading: getImage(index),
title: indexController.locations[0].collection[index].properties!['location_name'] != null ? Text(indexController.locations[0].collection[index].properties!['location_name'].toString()) : Text(""), title: indexController.locations[0].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']) : Text(""), subtitle: indexController.locations[0].collection[index].properties!['category'] != null ? Text(indexController.locations[0].collection[index].properties!['category']) : const Text(""),
trailing: indexController.locations[0].collection[index].properties!['sub_loc_id'] != null ? Text(indexController.locations[0].collection[index].properties!['sub_loc_id']) : Text(""), trailing: indexController.locations[0].collection[index].properties!['sub_loc_id'] != null ? Text(indexController.locations[0].collection[index].properties!['sub_loc_id']) : const Text(""),
), ),
); );
}, },
) : Container(width: 0, height: 0,), ) : const SizedBox(width: 0, height: 0,),
); );
} }
} }

22
lib/widgets/map_widget.dart
View File

@ -5,14 +5,12 @@ 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_map_marker_cluster/flutter_map_marker_cluster.dart';
import 'package:geojson/geojson.dart'; import 'package:geojson/geojson.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get/get_state_manager/get_state_manager.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import 'package:rogapp/pages/destination/destination_controller.dart'; import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/utils/text_util.dart'; import 'package:rogapp/utils/text_util.dart';
import 'package:rogapp/widgets/base_layer_widget.dart'; import 'package:rogapp/widgets/base_layer_widget.dart';
import 'package:rogapp/widgets/bottom_sheet_new.dart'; import 'package:rogapp/widgets/bottom_sheet_new.dart';
import 'package:rogapp/widgets/bottom_sheet_widget.dart';
class MapWidget extends StatelessWidget { class MapWidget extends StatelessWidget {
@ -69,19 +67,19 @@ class MapWidget extends StatelessWidget {
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Icon(Icons.circle,size: 6.0,), const Icon(Icons.circle,size: 6.0,),
i.properties!['cp'] == -1 ? i.properties!['cp'] == -1 ?
Transform.rotate( Transform.rotate(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
origin: Offset.fromDirection(1, 26), origin: Offset.fromDirection(1, 26),
angle: 270 * pi / 180, angle: 270 * pi / 180,
child: Icon(Icons.play_arrow_outlined, color: Colors.red, size: 70,)): child: const Icon(Icons.play_arrow_outlined, color: Colors.red, size: 70,)):
Container(color: Colors.transparent,), Container(color: Colors.transparent,),
], ],
) )
), ),
), ),
Container(color: Colors.white, child: Text(TextUtils.getDisplayTextFeture(i), style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,))), Container(color: Colors.white, child: Text(TextUtils.getDisplayTextFeture(i), style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color:Colors.red,))),
], ],
); );
} }
@ -91,12 +89,12 @@ class MapWidget extends StatelessWidget {
print("---------- rog mode is ${indexController.rog_mode.value.toString()}----------"); print("---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
final PopupController _popupController = PopupController(); final PopupController popupController = PopupController();
return Stack( return Stack(
children: [ children: [
Obx(() => Obx(() =>
indexController.is_loading == true ? Padding( indexController.is_loading == true ? const Padding(
padding: const EdgeInsets.only(top: 60.0), padding: EdgeInsets.only(top: 60.0),
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
): ):
FlutterMap( FlutterMap(
@ -110,7 +108,7 @@ class MapWidget extends StatelessWidget {
//print(DateTime.now().toString() + ' [MapEventMoveStart] START'); //print(DateTime.now().toString() + ' [MapEventMoveStart] START');
// do something // do something
} }
if (mapEvent is MapEventMoveEnd && indexController.currentUser. length <= 0) { if (mapEvent is MapEventMoveEnd && indexController.currentUser.isEmpty) {
//print(DateTime.now().toString() + ' [MapEventMoveStart] END'); //print(DateTime.now().toString() + ' [MapEventMoveStart] END');
indexController.loadLocationsBound(); indexController.loadLocationsBound();
//indexController.rogMapController!.move(c.center, c.zoom); //indexController.rogMapController!.move(c.center, c.zoom);
@ -119,7 +117,7 @@ class MapWidget extends StatelessWidget {
}, },
//center: LatLng(37.15319600454702, 139.58765950528198), //center: LatLng(37.15319600454702, 139.58765950528198),
bounds: indexController.currentBound.length > 0 ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]), bounds: indexController.currentBound.isNotEmpty ? indexController.currentBound[0]: LatLngBounds.fromPoints([LatLng(35.03999881162295, 136.40587119778962), LatLng(36.642756778706904, 137.95226720406063)]),
zoom: 1, zoom: 1,
interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag, interactiveFlags: InteractiveFlag.pinchZoom | InteractiveFlag.drag,
@ -127,11 +125,11 @@ class MapWidget extends StatelessWidget {
}, },
onTap: (_, __) => onTap: (_, __) =>
_popupController popupController
.hideAllPopups(), // Hide popup when the map is tapped. .hideAllPopups(), // Hide popup when the map is tapped.
), ),
children: [ children: [
BaseLayer(), const BaseLayer(),
CurrentLocationLayer(), CurrentLocationLayer(),
indexController.locations.isNotEmpty && indexController.locations[0].collection.isNotEmpty ? indexController.locations.isNotEmpty && indexController.locations[0].collection.isNotEmpty ?
MarkerLayer( MarkerLayer(

23
lib/widgets/perfecture_widget.dart
View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/flutter_map.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:rogapp/pages/index/index_controller.dart'; import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/widgets/cat_widget.dart';
class PerfectureWidget extends StatefulWidget { class PerfectureWidget extends StatefulWidget {
@ -41,8 +40,8 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
for (Map<String, dynamic> currency in widget.indexController.perfectures[0]) { for (Map<String, dynamic> currency in widget.indexController.perfectures[0]) {
//print(currency["id"].toString()); //print(currency["id"].toString());
var newDropdown = DropdownMenuItem( var newDropdown = DropdownMenuItem(
child: Text(currency["adm1_ja"].toString()),
value: currency["id"].toString(), value: currency["id"].toString(),
child: Text(currency["adm1_ja"].toString()),
); );
dropDownItems.add(newDropdown); dropDownItems.add(newDropdown);
@ -57,8 +56,8 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
for (Map<String, dynamic> currency in widget.indexController.subPerfs[0]) { for (Map<String, dynamic> currency in widget.indexController.subPerfs[0]) {
var newDropdown = DropdownMenuItem( var newDropdown = DropdownMenuItem(
child: Text(currency["adm2_ja"].toString()),
value: currency["id"].toString(), value: currency["id"].toString(),
child: Text(currency["adm2_ja"].toString()),
); );
dropDownItems.add(newDropdown); dropDownItems.add(newDropdown);
} }
@ -72,8 +71,8 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
for (Map<String, dynamic> currency in widget.indexController.areas[0]) { for (Map<String, dynamic> currency in widget.indexController.areas[0]) {
var newDropdown = DropdownMenuItem( var newDropdown = DropdownMenuItem(
child: Text(currency["area_nm"].toString()),
value: currency["id"].toString(), value: currency["id"].toString(),
child: Text(currency["area_nm"].toString()),
); );
dropDownItems.add(newDropdown); dropDownItems.add(newDropdown);
@ -85,8 +84,8 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
for (Map<String, dynamic> currency in widget.indexController.customAreas[0]) { for (Map<String, dynamic> currency in widget.indexController.customAreas[0]) {
var newDropdown = DropdownMenuItem( var newDropdown = DropdownMenuItem(
child: Text(currency["event_name"].toString()),
value: currency["event_name"].toString(), value: currency["event_name"].toString(),
child: Text(currency["event_name"].toString()),
); );
dropDownItems.add(newDropdown); dropDownItems.add(newDropdown);
@ -105,7 +104,7 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
//print("--------cats ------############### ${widget.indexController.cats.toString()} -------------"); //print("--------cats ------############### ${widget.indexController.cats.toString()} -------------");
for(dynamic d in widget.indexController.cats){ for(dynamic d in widget.indexController.cats){
//print("-------- ddd ------############### ${d} --------dddd-----"); //print("-------- ddd ------############### ${d} --------dddd-----");
var newDropdown = DropdownMenuItem(child: Text(d['category'].toString()), value: d['category'].toString()); var newDropdown = DropdownMenuItem(value: d['category'].toString(), child: Text(d['category'].toString()));
//print("--------cats ------############### ${d['category'].toString()} -------------"); //print("--------cats ------############### ${d['category'].toString()} -------------");
dropDownItems.add(newDropdown); dropDownItems.add(newDropdown);
} }
@ -166,12 +165,10 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
} }
setState(() { setState(() {
widget.indexController.locations.clear(); 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(), items: getCustomArea(),
): const Text(""), ): const Text(""),
@ -203,7 +200,7 @@ class _PerfectureWidgetState extends State<PerfectureWidget> {
) : ) :
const Text(""), const Text(""),
//CatWidget(indexController: widget.indexController,), //CatWidget(indexController: widget.indexController,),
widget.indexController.cats.length > 0 ? widget.indexController.cats.isNotEmpty ?
DropdownButton<String>( DropdownButton<String>(
value: widget.indexController.getCatText(), value: widget.indexController.getCatText(),
icon: const Icon(Icons.arrow_downward), icon: const Icon(Icons.arrow_downward),

722
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

24
pubspec.yaml
View File

@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.12+12 version: 1.0.12+12
environment: 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. # Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions # To automatically upgrade your package dependencies to the latest versions
@ -39,10 +39,10 @@ dependencies:
flutter_map: any flutter_map: any
geolocator: ^9.0.1 geolocator: ^9.0.1
permission_handler: ^10.0.0 permission_handler: ^10.0.0
google_api_availability: ^3.0.1 google_api_availability: ^5.0.0
tuple: ^2.0.0 tuple: ^2.0.0
latlong2: ^0.8.1 latlong2: ^0.8.1
positioned_tap_detector: ^1.0.3 positioned_tap_detector_2: ^1.0.4
transparent_image: ^2.0.0 transparent_image: ^2.0.0
async: ^2.8.2 async: ^2.8.2
vector_math: ^2.1.1 vector_math: ^2.1.1
@ -53,27 +53,27 @@ dependencies:
path_provider: ^2.0.8 path_provider: ^2.0.8
flutter_map_location_marker: any flutter_map_location_marker: any
flutter_map_marker_cluster: 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: ^4.0.4
image_picker: ^0.8.4+4 image_picker: ^1.0.4
#geojson_vi: ^2.0.7 #geojson_vi: ^2.0.7
geojson: ^1.0.0 geojson: ^1.0.0
url_launcher: ^6.0.20 url_launcher: ^6.0.20
flutter_breadcrumb: ^1.0.1 flutter_breadcrumb: ^1.0.1
timeline_tile: ^2.0.0 timeline_tile: ^2.0.0
google_maps_flutter: ^2.1.5 google_maps_flutter: ^2.5.0
#flutter_map_marker_popup: any #flutter_map_marker_popup: any
flutter_polyline_points: ^1.0.0 flutter_polyline_points: ^1.0.0
google_maps_webservice: ^0.0.19 google_maps_webservice: ^0.0.19
flutter_typeahead: ^4.0.0 flutter_typeahead: ^4.0.0
flutter_launcher_icons: ^0.10.0 flutter_launcher_icons: ^0.13.1
rename: ^2.0.1 rename: ^2.0.1
circular_menu: ^2.0.1 circular_menu: ^2.0.1
camera_camera: ^3.0.0-dev camera_camera: ^3.0.0-dev
intl: ^0.17.0 intl: ^0.18.1
modal_bottom_sheet: ^3.0.0-pre 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 shared_preferences: ^2.0.15
flutter_icons: flutter_icons:
@ -91,7 +91,7 @@ dev_dependencies:
# activated in the `analysis_options.yaml` file located at the root of your # activated in the `analysis_options.yaml` file located at the root of your
# package. See that file for information about deactivating specific lint # package. See that file for information about deactivating specific lint
# rules and activating additional ones. # 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 # For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec # following page: https://dart.dev/tools/pub/pubspec

2
test/widget_test.dart
View File

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

9
windows/flutter/generated_plugin_registrant.cc
View File

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

3
windows/flutter/generated_plugins.cmake
View File

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