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

optimized

Browse Source
This commit is contained in:
Mohamed Nouffer
2023-10-06 16:25:21 +05:30
parent 7fdb6c05ee
commit 0e2a8f89f3
101 changed files with 50948 additions and 4137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
lib/main.dart
View File

@ -3,26 +3,29 @@ import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
import 'package:get/get.dart';
import 'package:rogapp/pages/destination/destination_controller.dart';
import 'package:rogapp/pages/index/index_binding.dart';
import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/routes/app_pages.dart';
import 'package:rogapp/utils/string_values.dart';
import 'package:shared_preferences/shared_preferences.dart';
// import 'package:is_lock_screen/is_lock_screen.dart';
void saveGameState() async {
DestinationController destinationController = Get.find<DestinationController>();
SharedPreferences pref = await SharedPreferences.getInstance();
pref.setBool("is_in_rog", destinationController.is_in_rog.value);
pref.setBool("rogaining_counted", destinationController.rogaining_counted.value);
}
DestinationController destinationController =
Get.find<DestinationController>();
SharedPreferences pref = await SharedPreferences.getInstance();
pref.setBool("is_in_rog", destinationController.isInRog.value);
pref.setBool(
"rogaining_counted", destinationController.rogainingCounted.value);
}
void restoreGame() async{
SharedPreferences pref = await SharedPreferences.getInstance();
DestinationController destinationController = Get.find<DestinationController>();
destinationController.skip_gps = false;
destinationController.is_in_rog.value = pref.getBool("is_in_rog") ?? false;
destinationController.rogaining_counted.value = pref.getBool("rogaining_counted") ?? false;
}
void restoreGame() async {
SharedPreferences pref = await SharedPreferences.getInstance();
DestinationController destinationController =
Get.find<DestinationController>();
destinationController.skipGps = false;
destinationController.isInRog.value = pref.getBool("is_in_rog") ?? false;
destinationController.rogainingCounted.value =
pref.getBool("rogaining_counted") ?? false;
}
void main() async {
WidgetsFlutterBinding.ensureInitialized();
@ -61,8 +64,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
WidgetsBinding.instance.addObserver(this);
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
@ -76,35 +77,36 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
// pref.setBool("rogaining_counted", destinationController.rogaining_counted.value);
// }
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
DestinationController destinationController = Get.find<DestinationController>();
switch (state) {
case AppLifecycleState.resumed:
print("RESUMED");
restoreGame();
if(destinationController.positionStream == null){
destinationController.startGPSTimer();
//destinationController.startGame();
}
break;
case AppLifecycleState.inactive:
print("INACTIVE");
break;
case AppLifecycleState.paused:
print("PAUSED");
saveGameState();
break;
case AppLifecycleState.detached:
print("DETACHED");
saveGameState();
break;
case AppLifecycleState.hidden:
print("DETACHED");
saveGameState();
break;
}
DestinationController destinationController =
Get.find<DestinationController>();
switch (state) {
case AppLifecycleState.resumed:
//print("RESUMED");
restoreGame();
if (destinationController.positionStream == null) {
//destinationController.startGPSTimer();
//destinationController.startGame();
}
break;
case AppLifecycleState.inactive:
//print("INACTIVE");
break;
case AppLifecycleState.paused:
//print("PAUSED");
saveGameState();
break;
case AppLifecycleState.detached:
//print("DETACHED");
saveGameState();
break;
case AppLifecycleState.hidden:
//print("DETACHED");
saveGameState();
break;
}
}
@override
Widget build(BuildContext context) {
@ -115,8 +117,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
fallbackLocale: const Locale('en', 'US'),
title: 'ROGAINING',
theme: ThemeData(
colorScheme:
ColorScheme.fromSeed(seedColor: Color.fromARGB(255, 36, 135, 221)),
colorScheme: ColorScheme.fromSeed(
seedColor: const Color.fromARGB(255, 36, 135, 221)),
useMaterial3: true,
),
debugShowCheckedModeBanner: false,
@ -131,51 +133,3 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
);
}
}
// class MyApp extends StatelessWidget {
// MyApp({Key? key}) : super(key: key);
// // This widget is the root of your application.
// @override
// Widget build(BuildContext context) {
// return MaterialApp(
// title: 'Flutter Demo',
// theme: ThemeData(
// primaryColor: Color(0xfff00B074),
// textTheme: const TextTheme(
// bodyText1: TextStyle(
// fontSize: 18.0,
// fontFamily: 'Barlow-Medium',
// color: Color(0xff464255)),
// ),
// ),
// home: PermissionHandlerScreen(),
// );
// }
// }
// class SplashScreen extends StatelessWidget {
// const SplashScreen({Key? key}) : super(key: key);
// @override
// Widget build(BuildContext context) {
// return WillPopScope(
// onWillPop: () async {
// SystemNavigator.pop();
// return true;
// },
// child: Scaffold(
// body: Center(
// child: Text(
// "Splash Screen",
// ),
// ),
// ),
// );
// }
// }

61
lib/main_nrog.dart Normal file
View File

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

24
lib/model/auth_user.dart Normal file
View File

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

245
lib/model/destination.dart
View File

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

18
lib/model/game_instance_state.dart
View File

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

8
lib/model/game_state_instance.dart Normal file
View File

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

6
lib/model/map_state_instance.dart Normal file
View File

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

229
lib/nrog/pages/auth_page.dart Normal file
View File

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

119
lib/nrog/pages/home_page.dart Normal file
View File

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

126
lib/nrog/pages/permission_page.dart Normal file
View File

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

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

@ -57,9 +57,9 @@ class CameraPage extends StatelessWidget {
await destinationController.makeCheckin(destination, true,
destinationController.photos[0].path);
Get.back();
destinationController.rogaining_counted.value = true;
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value = false;
destinationController.rogainingCounted.value = true;
destinationController.skipGps = false;
destinationController.isPhotoShoot.value = false;
Get.snackbar("チェックインしました。",
"${destination.sub_loc_id} : ${destination.name}");
},
@ -69,8 +69,8 @@ class CameraPage extends StatelessWidget {
);
}
if (destinationController.is_at_goal.value &&
destinationController.is_in_rog.value) {
if (destinationController.isAtGoal.value &&
destinationController.isInRog.value) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
@ -87,21 +87,21 @@ class CameraPage extends StatelessWidget {
style:
ElevatedButton.styleFrom(backgroundColor: Colors.red),
onPressed: () async {
print(
"----- user isss ${indexController.currentUser[0]} -----");
// print(
// "----- user isss ${indexController.currentUser[0]} -----");
settingGoal.value = true;
try {
int userId =
indexController.currentUser[0]["user"]["id"];
//print("--- Pressed -----");
String _team = indexController.currentUser[0]["user"]
String team = indexController.currentUser[0]["user"]
['team_name'];
//print("--- _team : ${_team}-----");
String _event_code = indexController.currentUser[0]
String eventCode = indexController.currentUser[0]
["user"]["event_code"];
//print("--- _event_code : ${_event_code}-----");
String _token =
String token =
indexController.currentUser[0]["token"];
//print("--- _token : ${_token}-----");
DateTime now = DateTime.now();
@ -111,21 +111,21 @@ class CameraPage extends StatelessWidget {
await ExternalService()
.makeGoal(
userId,
_token,
_team,
token,
team,
destinationController.photos[0].path,
formattedDate,
_event_code)
eventCode)
.then((value) {
print(
"---called ext api ${value['status']} ------");
// print(
// "---called ext api ${value['status']} ------");
if (value['status'] == 'OK') {
Get.back();
destinationController.skip_gps = false;
destinationController.skipGps = false;
Get.snackbar("目標が保存されました", "目標が正常に追加されました");
destinationController.resetRogaining();
} else {
print("---- status ${value['status']} ---- ");
//print("---- status ${value['status']} ---- ");
Get.snackbar("目標が追加されていません", "please_try_again");
}
});
@ -136,15 +136,13 @@ class CameraPage extends StatelessWidget {
}
},
child: Text("finish_goal".tr))
: Container(
child: const Center(
child: CircularProgressIndicator(),
),
: const Center(
child: CircularProgressIndicator(),
)
: Container())
],
);
} else if (destinationController.is_in_rog.value &&
} else if (destinationController.isInRog.value &&
dbDest?.checkedin != null &&
dbDest?.checkedin == true) {
//make buypoint image
@ -162,16 +160,16 @@ class CameraPage extends StatelessWidget {
? ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
onPressed: () async {
print(
"##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
// print(
// "##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
await destinationController.makeBuyPoint(
destination!, destinationController.photos[0].path);
destination, destinationController.photos[0].path);
Get.back();
destinationController.rogaining_counted.value = true;
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value = false;
destinationController.rogainingCounted.value = true;
destinationController.skipGps = false;
destinationController.isPhotoShoot.value = false;
Get.snackbar("お買い物加点を行いました。",
"${destination!.sub_loc_id} : ${destination!.name}");
"${destination.sub_loc_id} : ${destination.name}");
},
child: const Text("レシートの写真を撮る"))
: Container())
@ -192,16 +190,16 @@ class CameraPage extends StatelessWidget {
? ElevatedButton(
style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
onPressed: () async {
print(
"##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
// print(
// "##### current destination ${indexController.currentDestinationFeature[0].sub_loc_id} #######");
await destinationController.makeCheckin(
indexController.currentDestinationFeature[0],
true,
destinationController.photos[0].path);
Get.back();
destinationController.rogaining_counted.value = true;
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value = false;
destinationController.rogainingCounted.value = true;
destinationController.skipGps = false;
destinationController.isPhotoShoot.value = false;
Get.snackbar("チェックインした", "正常にチェックインしました");
},
child: const Text("チェックイン"))
@ -218,13 +216,13 @@ class CameraPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (buyPointPhoto == true) {
print("--- buy point camera ${destination.toString()}");
//print("--- buy point camera ${destination.toString()}");
return BuyPointCamera(destination: destination);
} else if (destinationController.is_in_rog.value) {
print("--- in normal camera ${destination.toString()}");
} else if (destinationController.isInRog.value) {
//print("--- in normal camera ${destination.toString()}");
return Scaffold(
appBar: destinationController.is_in_rog.value &&
destinationController.rogaining_counted.value == true
appBar: destinationController.isInRog.value &&
destinationController.rogainingCounted.value == true
? AppBar(
automaticallyImplyLeading: false,
title: destination.cp == -1
@ -297,25 +295,23 @@ class StartRogaining extends StatelessWidget {
"Not started yet".tr,
),
),
body: Container(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text("You have not started rogaining yet.".tr,
style: const TextStyle(fontSize: 24)),
const SizedBox(
height: 40.0,
),
ElevatedButton(
onPressed: () {
Get.back();
destinationController.skip_gps = false;
},
child: const Text("Back"),
),
],
),
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text("You have not started rogaining yet.".tr,
style: const TextStyle(fontSize: 24)),
const SizedBox(
height: 40.0,
),
ElevatedButton(
onPressed: () {
Get.back();
destinationController.skipGps = false;
},
child: const Text("Back"),
),
],
),
),
);
@ -404,7 +400,7 @@ class BuyPointCamera extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
Obx(() => Row(
mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min,
children: [
ElevatedButton(
onPressed: () {
@ -414,17 +410,17 @@ class BuyPointCamera extends StatelessWidget {
child: destinationController.photos.isNotEmpty
? const Text("再撮影")
: const Text("撮影")),
const SizedBox(width: 10,),
const SizedBox(
width: 10,
),
ElevatedButton(
onPressed: () async {
await destinationController.cancelBuyPoint(
destination);
Get.back();
destinationController.rogaining_counted.value =
true;
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value =
false;
await destinationController
.cancelBuyPoint(destination);
Get.back();
destinationController.rogainingCounted.value = true;
destinationController.skipGps = false;
destinationController.isPhotoShoot.value = false;
},
child: const Text("買い物なし"))
],
@ -449,11 +445,10 @@ class BuyPointCamera extends StatelessWidget {
destination,
destinationController.photos[0].path);
Get.back();
destinationController.rogaining_counted.value =
destinationController.rogainingCounted.value =
true;
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value =
false;
destinationController.skipGps = false;
destinationController.isPhotoShoot.value = false;
Get.snackbar("お買い物加点を行いました",
"${destination.sub_loc_id} : ${destination.name}");
},

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

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

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

File diff suppressed because it is too large Load Diff

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

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

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

@ -25,7 +25,7 @@ class DestinationMapPage extends StatelessWidget {
final PopupController _popupLayerController = PopupController();
List<LatLng>? getPoints() {
print("##### --- route point ${indexController.routePoints.length}");
//print("##### --- route point ${indexController.routePoints.length}");
List<LatLng> pts = [];
for (PointLatLng p in indexController.routePoints) {
LatLng l = LatLng(p.latitude, p.longitude);
@ -39,14 +39,14 @@ class DestinationMapPage extends StatelessWidget {
int index = -1;
for (int i = 0; i < destinationController.destinations.length; i++) {
Destination d = destinationController.destinations[i];
print("^^^^ $d ^^^^");
//print("^^^^ $d ^^^^");
Marker m = Marker(
point: LatLng(d.lat!, d.lon!),
anchorPos: AnchorPos.align(AnchorAlign.center),
builder: (cts) {
return InkWell(
onTap: () {
print("-- Destination is --- ${d.name} ------");
//print("-- Destination is --- ${d.name} ------");
if (indexController.currentDestinationFeature.isNotEmpty) {
indexController.currentDestinationFeature.clear();
}
@ -58,9 +58,11 @@ class DestinationMapPage extends StatelessWidget {
isScrollControlled: true,
constraints: BoxConstraints.loose(
Size(Get.width, Get.height * 0.75)),
builder: ((context) => BottomSheetNew(destination: d,))).whenComplete(() {
print("---- set skip gps to false -----");
destinationController.skip_gps = false;
builder: ((context) => BottomSheetNew(
destination: d,
))).whenComplete(() {
//print("---- set skip gps to false -----");
destinationController.skipGps = false;
});
},
child: Row(
@ -118,18 +120,18 @@ class DestinationMapPage extends StatelessWidget {
Padding(
padding: const EdgeInsets.only(top: 0.0),
//child: TravelMap(),
child: TravelMap(),
child: travelMap(),
),
],
)));
}
FlutterMap TravelMap() {
FlutterMap travelMap() {
return FlutterMap(
mapController: indexController.rogMapController,
options: MapOptions(
onMapReady: () {
indexController.is_rog_mapcontroller_loaded.value = true;
indexController.isRogMapcontrollerLoaded.value = true;
subscription = indexController.rogMapController.mapEventStream
.listen((MapEvent mapEvent) {
if (mapEvent is MapEventMoveStart) {}

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

@ -12,7 +12,7 @@ class DrawerPage extends StatelessWidget {
final IndexController indexController = Get.find<IndexController>();
void _launchURL(url) async {
if (!await launch(url)) throw 'Could not launch $url';
if (!await launchUrl(url)) throw 'Could not launch $url';
}
@override
@ -115,8 +115,8 @@ class DrawerPage extends StatelessWidget {
leading: const Icon(Icons.delete_forever),
title: Text("delete_account".tr),
onTap: () {
String _token = indexController.currentUser[0]['token'];
AuthService.deleteUser(_token).then((value) {
String token = indexController.currentUser[0]['token'];
AuthService.deleteUser(token).then((value) {
if (value.isNotEmpty) {
indexController.logout();
Get.toNamed(AppPages.TRAVEL);

73
lib/pages/history/history_page.dart
View File

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

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

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

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

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

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

@ -21,14 +21,6 @@ class IndexPage extends GetView<IndexController> {
child: Scaffold(
drawer: DrawerPage(),
appBar: AppBar(
// automaticallyImplyLeading: false,
// leading: IconButton(
// icon: Icon(Icons.arrow_back_ios),
// onPressed: (){
// indexController.switchPage(AppPages.TRAVEL);
// },
// ),
//automaticallyImplyLeading: false,
title: Text("add_location".tr),
actions: [
IconButton(
@ -63,124 +55,86 @@ class IndexPage extends GetView<IndexController> {
//CatWidget(indexController: indexController,),
],
),
bottomNavigationBar: BottomAppBar(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Obx(() =>
destinationController.is_in_rog.value == true ?
IconButton(onPressed: (){}, icon: Icon(Icons.run_circle, size: 44, color: Colors.green,))
:
IconButton(onPressed: (){}, icon: Icon(Icons.run_circle, size: 44, color: Colors.black12,)),
),
Padding(
padding:
const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
child: InkWell(
child:
Obx(() => destinationController.is_gps_selected == true
? Padding(
padding: const EdgeInsets.only(
right: 10.0, top: 4.0, bottom: 4.0),
child: InkWell(
child: const Image(
image: AssetImage(
'assets/images/route3_off.png'),
width: 35,
height: 35,
),
onTap: () {
//indexController.switchPage(AppPages.TRAVEL);
},
),
)
: Padding(
padding: const EdgeInsets.only(
right: 10.0, top: 4.0, bottom: 4.0),
child: InkWell(
child: const Image(
image: AssetImage(
'assets/images/route2_on.png'),
width: 35,
height: 35,
),
onTap: () {
//indexController.switchPage(AppPages.TRAVEL);
},
),
))),
),
],
),
),
// bottomNavigationBar: BottomAppBar(
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: <Widget>[
// Obx(
// () => destinationController.isInRog.value == true
// ? IconButton(
// onPressed: () {},
// icon: const Icon(
// Icons.run_circle,
// size: 44,
// color: Colors.green,
// ))
// : IconButton(
// onPressed: () {},
// icon: const Icon(
// Icons.run_circle,
// size: 44,
// color: Colors.black12,
// )),
// ),
// Padding(
// padding:
// const EdgeInsets.only(right: 10.0, top: 4.0, bottom: 4.0),
// child: InkWell(
// child: Obx(() => destinationController
// .isGpsSelected.value ==
// true
// ? Padding(
// padding: const EdgeInsets.only(
// right: 10.0, top: 4.0, bottom: 4.0),
// child: InkWell(
// child: const Image(
// image:
// AssetImage('assets/images/route3_off.png'),
// width: 35,
// height: 35,
// ),
// onTap: () {
// //indexController.switchPage(AppPages.TRAVEL);
// },
// ),
// )
// : Padding(
// padding: const EdgeInsets.only(
// right: 10.0, top: 4.0, bottom: 4.0),
// child: InkWell(
// child: const Image(
// image:
// AssetImage('assets/images/route2_on.png'),
// width: 35,
// height: 35,
// ),
// onTap: () {
// //indexController.switchPage(AppPages.TRAVEL);
// },
// ),
// ))),
// ),
// ],
// ),
// ),
floatingActionButton: FloatingActionButton(
onPressed: () {
indexController.toggleMode();
if (indexController.currentCat.isNotEmpty) {
print(indexController.currentCat[0].toString());
}
},
tooltip: 'Increment',
elevation: 1.0,
child: Obx(
() => indexController.mode == 0
() => indexController.mode.value == 0
? const Image(image: AssetImage('assets/images/list2.png'))
: const Image(image: AssetImage('assets/images/map.png')),
),
elevation: 4.0,
),
floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
body: SafeArea(
child: Column(
children: [
// Container(
// padding: const EdgeInsets.symmetric(horizontal: 8.0),
// alignment: Alignment.centerLeft,
// height: 50.0,
// //child: SingleChildScrollView(
// // scrollDirection: Axis.horizontal,
// // child:Row(
// // mainAxisAlignment: MainAxisAlignment.start,
// // children: [
// // TextButton(child:Text("Main Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.MAINPERF);},),
// // TextButton(child:Text("Sub Pef >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.SUBPERF);},),
// // TextButton(child:Text("Cities >", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CITY);},),
// // TextButton(child:Text("Categories", style: TextStyle(fontSize:16.0, fontWeight: FontWeight.bold),), onPressed: (){Get.toNamed(AppPages.CATEGORY);},),
// // ],
// // )
// // ),
// child: SingleChildScrollView(
// scrollDirection: Axis.horizontal,
// child: Obx(() =>
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// indexController.is_mapController_loaded.value == false ?
// Center(child: CircularProgressIndicator())
// :
// BreadCrumbWidget(mapController: indexController.mapController),
// Container(width: 24.0,),
// // Row(
// // children: [
// // indexController.currentCat.isNotEmpty ? Text(indexController.currentCat[0].toString()): Text(""),
// // indexController.currentCat.isNotEmpty ?
// // IconButton(
// // onPressed: (){
// // indexController.currentCat.clear();
// // indexController.loadLocationsBound();
// // },
// // icon: Icon(Icons.cancel, color: Colors.red,)
// // ) :
// // Container(width: 0, height: 0,)
// // ],
// // )
// ],
// )
// ),
// ),
// ),
Expanded(
child: Obx(
() => indexController.mode == 0
() => indexController.mode.value == 0
? MapWidget()
: const ListWidget(),
))

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

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

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

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

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

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

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

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

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

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

31
lib/provider/auth_provider.dart Normal file
View File

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

27
lib/provider/game_state_provider.dart
View File

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

18
lib/provider/map_state_provider.dart Normal file
View File

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

43
lib/routes/app_pages.dart
View File

@ -1,11 +1,9 @@
import 'package:get/get.dart';
import 'package:get/get_navigation/src/routes/get_route.dart';
import 'package:rogapp/pages/camera/camera_page.dart';
import 'package:rogapp/pages/category/category_page.dart';
import 'package:rogapp/pages/changepassword/change_password_page.dart';
import 'package:rogapp/pages/city/city_page.dart';
import 'package:rogapp/pages/destination/destination_binding.dart';
import 'package:rogapp/pages/destination/destination_page.dart';
import 'package:rogapp/pages/history/history_page.dart';
import 'package:rogapp/pages/home/home_binding.dart';
import 'package:rogapp/pages/home/home_page.dart';
@ -24,11 +22,9 @@ import 'package:rogapp/pages/subperf/subperf_page.dart';
import 'package:rogapp/spa/spa_binding.dart';
import 'package:rogapp/spa/spa_page.dart';
part 'app_routes.dart';
class AppPages {
// ignore: constant_identifier_names
static const INITIAL = Routes.INDEX;
// ignore: constant_identifier_names
@ -52,26 +48,11 @@ class AppPages {
static const HISTORY = Routes.HISTORY;
static final routes = [
// GetPage(
// name: Routes.HOME,
// page: () => HomePage(),
// binding: HomeBinding(),
// ),
// GetPage(
// name: Routes.MAP,
// page: () => MapPage(),
// binding: MapBinding(),
// )
GetPage(
name: Routes.INDEX,
page: () => IndexPage(),
//binding: IndexBinding(),
),
GetPage(
name: Routes.SPA,
page: () => const SpaPage(),
binding: SpaBinding(),
),
GetPage(
name: Routes.LANDING,
page: () => const LandingPage(),
@ -87,21 +68,11 @@ class AppPages {
page: () => RegisterPage(),
//binding: SpaBinding(),
),
GetPage(
name: Routes.TRAVEL,
page: () => DestnationPage(),
binding: DestinationBinding(),
),
GetPage(
name: Routes.LOADING,
page: () => const LoadingPage(),
//binding: DestinationBinding(),
),
GetPage(
name: Routes.DESTINATION_MAP,
page: () => DestnationPage(),
//binding: DestinationBinding(),
),
GetPage(
name: Routes.HOME,
page: () => const HomePage(),
@ -116,22 +87,10 @@ class AppPages {
page: () => SearchPage(),
binding: SearchBinding(),
),
GetPage(
name: Routes.MAINPERF,
page: () => MainPerfPage(),
),
GetPage(
name: Routes.SUBPERF,
page: () => SubPerfPage(),
),
GetPage(
name: Routes.CITY,
page: () => const CityPage(),
),
GetPage(
name: Routes.CATEOGORY,
page: () => const CategoryPage(),
),
GetPage(
name: Routes.CHANGE_PASSWORD,
page: () => ChangePasswordPage(),
@ -145,4 +104,4 @@ class AppPages {
page: () => const HistoryPage(),
)
];
}
}

42
lib/services/action_service.dart
View File

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

136
lib/services/auth_service.dart
View File

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

32
lib/services/cat_service.dart
View File

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

110
lib/services/destination_service.dart
View File

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

472
lib/services/external_service.dart
View File

@ -10,308 +10,312 @@ import 'dart:convert';
import '../utils/const.dart';
//
//
// Rog type 0- start 1- checkin 2- goal
//
//
class ExternalService {
static final ExternalService _instance = ExternalService._internal();
factory ExternalService(){
factory ExternalService() {
return _instance;
}
ExternalService._internal();
String getFormatedTime(DateTime datetime){
return DateFormat('yyyy-MM-dd HH:mm:ss').format(datetime);
String getFormatedTime(DateTime datetime) {
return DateFormat('yyyy-MM-dd HH:mm:ss').format(datetime);
}
Future<Map<String, dynamic>> StartRogaining() async {
Future<Map<String, dynamic>> startRogaining() async {
final IndexController indexController = Get.find<IndexController>();
Map<String, dynamic> _res = {};
Map<String, dynamic> res = {};
int userId = indexController.currentUser[0]["user"]["id"];
//print("--- Pressed -----");
String _team = indexController.currentUser[0]["user"]['team_name'];
String team = indexController.currentUser[0]["user"]['team_name'];
//print("--- _team : ${_team}-----");
String _event_code = indexController.currentUser[0]["user"]["event_code"];
String eventCode = indexController.currentUser[0]["user"]["event_code"];
if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
if (indexController.connectionStatusName.value != "wifi" &&
indexController.connectionStatusName.value != "mobile") {
DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog(
id:1,
team_name: _team,
event_code : _event_code,
user_id: userId,
cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null,
rog_action_type: 0
);
db.insertRogaining(_rog);
}
else {
Rog rog = Rog(
id: 1,
team_name: team,
event_code: eventCode,
user_id: userId,
cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null,
rog_action_type: 0);
db.insertRogaining(rog);
} else {
String url = 'https://rogaining.sumasen.net/gifuroge/start_from_rogapp';
print('++++++++$url');
//print('++++++++$url');
final http.Response response = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': _team,
'event_code': _event_code
}),
body: jsonEncode(
<String, String>{'team_name': team, 'event_code': eventCode}),
);
print("---- start rogianing api status ---- ${response.statusCode}");
//print("---- start rogianing api status ---- ${response.statusCode}");
if (response.statusCode == 200) {
_res = json.decode(utf8.decode(response.bodyBytes));
print('----_res : $_res ----');
res = json.decode(utf8.decode(response.bodyBytes));
//print('----_res : $res ----');
}
}
return _res;
return res;
}
Future<Map<String, dynamic>> makeCheckpoint(int userId, String token, String checkinTime, String teamname, int cp, String eventcode, String imageurl) async {
print("~~~~ in API call function ~~~~");
print("~~~~ cp is ${cp} ~~~~");
Future<Map<String, dynamic>> makeCheckpoint(
int userId,
String token,
String checkinTime,
String teamname,
int cp,
String eventcode,
String imageurl) async {
// print("~~~~ in API call function ~~~~");
// print("~~~~ cp is $cp ~~~~");
//print("--cpcp-- ${cp}");
Map<String, dynamic> _res = {};
Map<String, dynamic> res = {};
String url = 'https://rogaining.sumasen.net/gifuroge/checkin_from_rogapp';
print('++++++++$url');
//print('++++++++$url');
final IndexController indexController = Get.find<IndexController>();
if(imageurl != null){
if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
if (imageurl != null) {
if (indexController.connectionStatusName.value != "wifi" &&
indexController.connectionStatusName.value != "mobile") {
DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog(
id:1,
Rog rog = Rog(
id: 1,
team_name: teamname,
event_code : eventcode,
event_code: eventcode,
user_id: userId,
cp_number: cp,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: imageurl,
rog_action_type: 1,
);
db.insertRogaining(_rog);
}
else {
db.insertRogaining(rog);
} else {
String serverUrl = ConstValues.currentServer();
String url1 = "$serverUrl/api/checkinimage/";
final im1Bytes = File(imageurl).readAsBytesSync();
String im1_64 = base64Encode(im1Bytes);
print("~~~~ before calling api 1 ~~~~");
//print("~~~~ before calling api 1 ~~~~");
final http.Response response = await http.post(
Uri.parse(url1),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token $token'
},
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{
'user' : userId.toString(),
'team_name': teamname,
'event_code': eventcode,
'checkinimage' : im1_64,
'checkintime' : checkinTime,
'cp_number' : cp.toString()
}),
);
Uri.parse(url1),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token $token'
},
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{
'user': userId.toString(),
'team_name': teamname,
'event_code': eventcode,
'checkinimage': im1_64,
'checkintime': checkinTime,
'cp_number': cp.toString()
}),
);
_res = json.decode(utf8.decode(response.bodyBytes));
print("~~~~ api1 result ${_res} ~~~~");
//print("-----@@@@@ checkin $_res -----");
res = json.decode(utf8.decode(response.bodyBytes));
//print("~~~~ api1 result $res ~~~~");
//print("-----@@@@@ checkin $_res -----");
if(response.statusCode == 201){
print("~~~~ image from api1 ${_res["checkinimage"].toString()} ~~~~");
//print('---- toekn is ${token} -----');
print("~~~~ token is ${token} ~~~~");
print("~~~~ before callling api2 ~~~~");
final http.Response response2 = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
}),
);
var vv = jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
});
print("~~~~ api 2 values ${vv} ~~~~");
//print("--json-- $vv");
//print("--- checnin response ${response2.statusCode}----");
if (response2.statusCode == 200) {
_res = json.decode(utf8.decode(response2.bodyBytes));
print('----checkin res _res : $_res ----');
if(_res["status"] == "ERROR"){
Get.snackbar("エラーがおきました", _res["detail"]);
}
}
}
else{
Get.snackbar("エラーがおきました", "サーバーに更新できませんでした");
}
}
}
else{
if(indexController.connectionStatusName != "wifi" || indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog(
id:1,
team_name: teamname,
event_code : eventcode,
user_id: userId,
cp_number: cp,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null,
rog_action_type: 1,
);
db.insertRogaining(_rog);
}
else {
final http.Response response3 = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': ""
}),
);
var vvv = jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': _res["checkinimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
});
print("--json-- $vvv");
print("--- checnin response ${response3.statusCode}----");
if (response3.statusCode == 200) {
_res = json.decode(utf8.decode(response3.bodyBytes));
print('----checkin res _res : $_res ----');
}
}
}
print("~~~~ done checkin ~~~~");
return _res;
}
Future<Map<String, dynamic>> makeGoal(int userId, String token, String teamname, String image, String goalTime, String eventcode) async {
Map<String, dynamic> _res2 = {};
final IndexController indexController = Get.find<IndexController>();
final DestinationController destinationController = Get.find<DestinationController>();
//if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance;
Rog _rog = Rog(
id:1,
team_name: teamname,
event_code : eventcode,
user_id: userId,
cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: image,
rog_action_type: 1,
);
db.insertRogaining(_rog);
// }
// else{
String serverUrl = ConstValues.currentServer();
String url1 = "$serverUrl/api/goalimage/";
final im1Bytes = File(image).readAsBytesSync();
String im1_64 = base64Encode(im1Bytes);
final http.Response response = await http.post(
Uri.parse(url1),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token $token'
},
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{
'user' : userId.toString(),
'team_name': teamname,
'event_code': eventcode,
'goaltime' : goalTime,
'goalimage' : im1_64,
'cp_number' : "-1"
}),
);
String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
print('++++++++$url');
if (response.statusCode == 201) {
Map<String, dynamic> _res = json.decode(utf8.decode(response.bodyBytes));
print('----_res : $_res ----');
print('---- image url ${_res["goalimage"]} ----');
if (response.statusCode == 201) {
//print("~~~~ image from api1 ${res["checkinimage"].toString()} ~~~~");
//print('---- toekn is ${token} -----');
//print("~~~~ token is $token ~~~~");
//print("~~~~ before callling api2 ~~~~");
final http.Response response2 = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': teamname,
'event_code': eventcode,
'goal_time' : goalTime,
'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
}
),
);
String rec = jsonEncode(<String, String>{
'team_name': teamname,
'event_code': eventcode,
'goal_time' : goalTime,
'image' : _res["goalimage"].toString().replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
}
);
print("-- json -- $rec");
print('----- response2 is $response2 --------');
if (response2.statusCode == 200) {
_res2 = json.decode(utf8.decode(response2.bodyBytes));
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': res["checkinimage"].toString().replaceAll(
'http://localhost:8100', 'http://rogaining.sumasen.net')
}),
);
var vv = jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': res["checkinimage"].toString().replaceAll(
'http://localhost:8100', 'http://rogaining.sumasen.net')
});
//print("~~~~ api 2 values $vv ~~~~");
//print("--json-- $vv");
//print("--- checnin response ${response2.statusCode}----");
if (response2.statusCode == 200) {
res = json.decode(utf8.decode(response2.bodyBytes));
//print('----checkin res _res : $res ----');
if (res["status"] == "ERROR") {
Get.snackbar("エラーがおきました", res["detail"]);
}
}
} else {
Get.snackbar("エラーがおきました", "サーバーに更新できませんでした");
}
}
//}
destinationController.resetRogaining();
return _res2;
}
} else {
if (indexController.connectionStatusName.value != "wifi" ||
indexController.connectionStatusName.value != "mobile") {
DatabaseHelper db = DatabaseHelper.instance;
Rog rog = Rog(
id: 1,
team_name: teamname,
event_code: eventcode,
user_id: userId,
cp_number: cp,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: null,
rog_action_type: 1,
);
db.insertRogaining(rog);
} else {
final http.Response response3 = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': ""
}),
);
var vvv = jsonEncode(<String, String>{
'team_name': teamname,
'cp_number': cp.toString(),
'event_code': eventcode,
'image': res["checkinimage"].toString().replaceAll(
'http://localhost:8100', 'http://rogaining.sumasen.net')
});
// print("--json-- $vvv");
// print("--- checnin response ${response3.statusCode}----");
if (response3.statusCode == 200) {
res = json.decode(utf8.decode(response3.bodyBytes));
//print('----checkin res _res : $res ----');
}
}
}
//print("~~~~ done checkin ~~~~");
return res;
}
Future<Map<String, dynamic>> makeGoal(int userId, String token,
String teamname, String image, String goalTime, String eventcode) async {
Map<String, dynamic> res2 = {};
static Future<Map<String, dynamic>> usersEventCode(String teamcode, String password) async {
Map<String, dynamic> _res = {};
String url = "https://rogaining.sumasen.net/gifuroge/check_event_code?zekken_number=$teamcode&password=$password";
print('++++++++$url');
final http.Response response = await http.get(
Uri.parse(url),
final IndexController indexController = Get.find<IndexController>();
final DestinationController destinationController =
Get.find<DestinationController>();
//if(indexController.connectionStatusName != "wifi" && indexController.connectionStatusName != "mobile"){
DatabaseHelper db = DatabaseHelper.instance;
Rog rog = Rog(
id: 1,
team_name: teamname,
event_code: eventcode,
user_id: userId,
cp_number: -1,
checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
image: image,
rog_action_type: 1,
);
db.insertRogaining(rog);
// }
// else{
String serverUrl = ConstValues.currentServer();
String url1 = "$serverUrl/api/goalimage/";
final im1Bytes = File(image).readAsBytesSync();
String im1_64 = base64Encode(im1Bytes);
final http.Response response = await http.post(
Uri.parse(url1),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
}
'Authorization': 'Token $token'
},
// 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
body: jsonEncode(<String, String>{
'user': userId.toString(),
'team_name': teamname,
'event_code': eventcode,
'goaltime': goalTime,
'goalimage': im1_64,
'cp_number': "-1"
}),
);
if (response.statusCode == 200) {
_res = json.decode(utf8.decode(response.bodyBytes));
String url = 'https://rogaining.sumasen.net/gifuroge/goal_from_rogapp';
//print('++++++++$url');
if (response.statusCode == 201) {
Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
// print('----_res : $res ----');
// print('---- image url ${res["goalimage"]} ----');
final http.Response response2 = await http.post(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'team_name': teamname,
'event_code': eventcode,
'goal_time': goalTime,
'image': res["goalimage"].toString().replaceAll(
'http://localhost:8100', 'http://rogaining.sumasen.net')
}),
);
String rec = jsonEncode(<String, String>{
'team_name': teamname,
'event_code': eventcode,
'goal_time': goalTime,
'image': res["goalimage"]
.toString()
.replaceAll('http://localhost:8100', 'http://rogaining.sumasen.net')
});
// print("-- json -- $rec");
// print('----- response2 is $response2 --------');
if (response2.statusCode == 200) {
res2 = json.decode(utf8.decode(response2.bodyBytes));
}
}
return _res;
}
//}
destinationController.resetRogaining();
return res2;
}
}
static Future<Map<String, dynamic>> usersEventCode(
String teamcode, String password) async {
Map<String, dynamic> res = {};
String url =
"https://rogaining.sumasen.net/gifuroge/check_event_code?zekken_number=$teamcode&password=$password";
//print('++++++++$url');
final http.Response response =
await http.get(Uri.parse(url), headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
});
if (response.statusCode == 200) {
res = json.decode(utf8.decode(response.bodyBytes));
}
return res;
}
}

17
lib/services/location_line_service.dart
View File

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

17
lib/services/location_polygon_service.dart
View File

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

236
lib/services/location_service.dart
View File

@ -6,8 +6,7 @@ import 'package:http/http.dart' as http;
import 'package:rogapp/pages/index/index_controller.dart';
import 'package:rogapp/utils/const.dart';
class LocationService{
class LocationService {
// static Future<GeoJsonFeatureCollection?> loadLocations() async {
// final IndexController indexController = Get.find<IndexController>();
@ -34,42 +33,42 @@ class LocationService{
// return null;
// }
static Future<GeoJsonFeatureCollection?> loadLocationsFor(String perfecture, String cat) async {
static Future<GeoJsonFeatureCollection?> loadLocationsFor(
String perfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>();
String url = "";
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
if (cat.isNotEmpty) {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture + '&cat=' + cat;
url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture&cat=$cat';
} else {
url = '$serverUrl/api/inperf/?perf=$perfecture&cat=$cat';
}
else {
url = '$serverUrl/api/inperf/?perf=' + perfecture + '&cat=' + cat;
} else {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/inperf/?rog=$r&perf=$perfecture';
} else {
url = '$serverUrl/api/inperf/?perf=$perfecture';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/inperf/?rog=$r&perf=' + perfecture;
}
else {
url = '$serverUrl/api/inperf/?perf=' + perfecture;
}
}
print('++++++++$url');
final response = await http.get(Uri.parse(url),
//print('++++++++$url');
final response = await http.get(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
);
if (response.statusCode == 200) {
GeoJsonFeatureCollection cc = await featuresFromGeoJson(utf8.decode(response.bodyBytes));
GeoJsonFeatureCollection cc =
await featuresFromGeoJson(utf8.decode(response.bodyBytes));
//print(cc);
return cc; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
}
@ -80,97 +79,104 @@ class LocationService{
List<dynamic> ext = [];
String serverUrl = ConstValues.currentServer();
String url = '$serverUrl/api/locsext/';
print('++++++++$url');
//print('++++++++$url');
final response = await http.post(Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token $token'
},
body: jsonEncode(<String, String>{
'token': token,
})
);
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
'Authorization': 'Token $token'
},
body: jsonEncode(<String, String>{
'token': token,
}));
if (response.statusCode == 200) {
ext = json.decode(utf8.decode(response.bodyBytes));
}
return ext;
}
static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(String subperfecture, String cat) async {
static Future<GeoJsonFeatureCollection?> loadLocationsSubFor(
String subperfecture, String cat) async {
final IndexController indexController = Get.find<IndexController>();
String url = "";
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
if (cat.isNotEmpty) {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture + '&cat=' + cat;
url = '$serverUrl/api/insubperf?rog=$r&subperf=$subperfecture&cat=$cat';
} else {
url = '$serverUrl/api/insubperf?subperf=$subperfecture&cat=$cat';
}
else{
url = '$serverUrl/api/insubperf?subperf=' + subperfecture + '&cat=' + cat;
} else {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/insubperf?rog=$r&subperf=$subperfecture';
} else {
url = '$serverUrl/api/insubperf?subperf=$subperfecture';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/insubperf?rog=$r&subperf=' + subperfecture;
}
else{
url = '$serverUrl/api/insubperf?subperf=' + subperfecture;
}
}
print('++++++++$url');
final response = await http.get(Uri.parse(url),
//print('++++++++$url');
final response = await http.get(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
);
if (response.statusCode == 200) {
GeoJsonFeatureCollection cc = await featuresFromGeoJson(utf8.decode(response.bodyBytes));
GeoJsonFeatureCollection cc =
await featuresFromGeoJson(utf8.decode(response.bodyBytes));
//print(cc);
return cc; //featuresFromGeoJson(utf8.decode(response.bodyBytes));
}
return null;
}
static Future<GeoJsonFeatureCollection?> loadLocationsBound(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3, double lat4, double lon4, String cat) async {
print("-------- in location for bound -------------");
static Future<GeoJsonFeatureCollection?> loadLocationsBound(
double lat1,
double lon1,
double lat2,
double lon2,
double lat3,
double lon3,
double lat4,
double lon4,
String cat) async {
//print("-------- in location for bound -------------");
final IndexController indexController = Get.find<IndexController>();
String url = "";
String serverUrl = ConstValues.currentServer();
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
if (cat.isNotEmpty) {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
url =
'$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
} else {
url =
'$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4&cat=$cat';
}
else{
url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4' '&cat=' + cat;
} else {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
//print("-------- requested user group $grp -------------");
url =
'$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
} else {
url =
'$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
print("-------- requested user group $grp -------------");
url = '$serverUrl/api/inbound?rog=$r&grp=$grp&ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
}
else{
url = '$serverUrl/api/inbound?ln1=$lon1&la1=$lat1&ln2=$lon2&la2=$lat2&ln3=$lon3&la3=$lat3&ln4=$lon4&la4=$lat4';
}
}
print('++++++++$url');
final response = await http.get(Uri.parse(url),
//print('++++++++$url');
final response = await http.get(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
@ -181,51 +187,49 @@ class LocationService{
}
if (response.statusCode == 200) {
GeoJsonFeatureCollection cc = await featuresFromGeoJson(utf8.decode(response.bodyBytes));
if(cc.collection.isEmpty){
GeoJsonFeatureCollection cc =
await featuresFromGeoJson(utf8.decode(response.bodyBytes));
if (cc.collection.isEmpty) {
return null;
}
else{
} else {
//print("---- feature got from server is ${cc.collection[0].properties} ------");
return cc;
return cc;
}
}
return null;
}
static Future<GeoJsonFeatureCollection?> loadCustomLocations(String name, String cat) async {
static Future<GeoJsonFeatureCollection?> loadCustomLocations(
String name, String cat) async {
final IndexController indexController = Get.find<IndexController>();
String url = "";
if(cat == "-all-"){
if (cat == "-all-") {
cat = "";
}
String serverUrl = ConstValues.currentServer();
print("loadCustomLocations url is ----- $cat");
if(cat.isNotEmpty){
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
//print("loadCustomLocations url is ----- $cat");
if (cat.isNotEmpty) {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/custom_area/?rog=$r&&cat=' + cat;
url = '$serverUrl/api/custom_area/?rog=$r&&cat=$cat';
} else {
url = '$serverUrl/api/custom_area/?&cat=$cat';
}
else{
url = '$serverUrl/api/custom_area/?&cat=' + cat;
}
}
else{
if(indexController.currentUser.isNotEmpty){
bool _rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = _rog == true ? 'True': 'False';
} else {
if (indexController.currentUser.isNotEmpty) {
bool rog = indexController.currentUser[0]['user']['is_rogaining'];
String r = rog == true ? 'True' : 'False';
var grp = indexController.currentUser[0]['user']['event_code'];
url = '$serverUrl/api/customarea?rog=$r&name=$name';
}
else{
} else {
url = '$serverUrl/api/customarea?name=$name';
}
}
print('++++++++$url');
final response = await http.get(Uri.parse(url),
//print('++++++++$url');
final response = await http.get(
Uri.parse(url),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
@ -236,18 +240,14 @@ class LocationService{
}
if (response.statusCode == 200) {
GeoJsonFeatureCollection cc = await featuresFromGeoJson(utf8.decode(response.bodyBytes));
if(cc.collection.isEmpty){
GeoJsonFeatureCollection cc =
await featuresFromGeoJson(utf8.decode(response.bodyBytes));
if (cc.collection.isEmpty) {
return null;
}
else{
return cc;
} else {
return cc;
}
}
return null;
}
}
}

51
lib/services/maxtrix_service.dart
View File

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

54
lib/services/perfecture_service.dart
View File

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

16
lib/services/reacking_service.dart
View File

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

210
lib/utils/database_helper.dart
View File

@ -6,7 +6,7 @@ import 'package:path/path.dart';
import '../model/rog.dart';
class DatabaseHelper{
class DatabaseHelper {
DatabaseHelper._privateConstructor();
static final DatabaseHelper instance = DatabaseHelper._privateConstructor();
@ -21,7 +21,13 @@ class DatabaseHelper{
// version: 1,
// onCreate: _onCreate,
// );
return openDatabase(join(await getDatabasesPath(), 'rog.db',), version: 1, onCreate: _onCreate);
return openDatabase(
join(
await getDatabasesPath(),
'rog.db',
),
version: 1,
onCreate: _onCreate);
}
Future _onCreate(Database db, int version) async {
@ -56,7 +62,7 @@ class DatabaseHelper{
)
''');
await db.execute('''
await db.execute('''
CREATE TABLE rogaining(
rog_id INTEGER PRIMARY KEY AUTOINCREMENT,
course_id INTEGER,
@ -69,7 +75,7 @@ class DatabaseHelper{
)
''');
await db.execute('''
await db.execute('''
CREATE TABLE rog(
id INTEGER PRIMARY KEY AUTOINCREMENT,
team_name TEXT,
@ -81,86 +87,72 @@ class DatabaseHelper{
rog_action_type INTEGER
)
''');
}
Future<List<Rog>> allRogianing() async {
Database db = await instance.database;
var rog = await db.query('rog');
List<Rog> roglist = rog.isNotEmpty ?
rog.map((e) => Rog.fromMap(e)).toList() : [];
print("--------- $rog");
List<Rog> roglist =
rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
//print("--------- $rog");
return roglist;
}
Future<List<Rog>> getRogainingByLatLon(double lat, double lon) async {
Database db = await instance.database;
var rog = await db.query('rog', where: "lat = $lat and lon= $lon");
List<Rog> roglist = rog.isNotEmpty
? rog.map((e) => Rog.fromMap(e)).toList() : [];
List<Rog> roglist =
rog.isNotEmpty ? rog.map((e) => Rog.fromMap(e)).toList() : [];
return roglist;
}
Future clearSelection() async {
Database db = await instance.database;
Map<String, dynamic> rowClear = {
"selected": false
};
return await db.update(
"destination",
rowClear
);
Map<String, dynamic> rowClear = {"selected": false};
return await db.update("destination", rowClear);
}
Future<int> toggleSelecttion(Destination dest) async {
Database db = await instance.database;
bool val = !dest.selected!;
Map<String, dynamic> rowTarget = {
"selected": val
};
Map<String, dynamic> rowTarget = {"selected": val};
await clearSelection();
return await db.update(
"destination",
rowTarget,
where: 'location_id = ?',
whereArgs: [dest.location_id!]
);
return await db.update("destination", rowTarget,
where: 'location_id = ?', whereArgs: [dest.location_id!]);
}
Future<int> deleteRogaining(int id) async {
Database db = await instance.database;
var rog = await db.delete('rog', where: "id = $id");
int ret = rog > 0 ? rog : -1;
return ret;
}
Future<void> deleteAllRogaining() async {
Database db = await instance.database;
await db.delete('rog');
}
Future<bool>isRogAlreadyAvailable(int id) async{
Future<bool> isRogAlreadyAvailable(int id) async {
Database db = await instance.database;
var rog = await db.query('rog', where: "id = $id");
return rog.isNotEmpty ? true : false;
}
Future<int?>latestGoal() async{
Future<int?> latestGoal() async {
Database db = await instance.database;
return Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(checkintime) FROM rog'));
return Sqflite.firstIntValue(
await db.rawQuery('SELECT MAX(checkintime) FROM rog'));
}
Future<int> insertRogaining(Rog rog) async {
Database db = await instance.database;
int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
int? nextOrder =
Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(id) FROM rog'));
nextOrder = nextOrder ?? 0;
nextOrder = nextOrder + 1;
rog.id = nextOrder;
@ -169,68 +161,63 @@ class DatabaseHelper{
rog.toMap(),
conflictAlgorithm: ConflictAlgorithm.replace,
);
print("------ database helper insert $res-----------::::::::");
//print("------ database helper insert $res-----------::::::::");
return res;
}
Future<List<Destination>> getDestinations() async {
Database db = await instance.database;
var dest = await db.query('destination', orderBy: 'list_order');
List<Destination> destList = dest.isNotEmpty ?
dest.map((e) => Destination.fromMap(e)).toList() : [];
print("--------- $destList");
List<Destination> destList =
dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
//print("--------- $destList");
return destList;
}
Future<List<Destination>> getDestinationById(int id) async {
Database db = await instance.database;
var rog = await db.query('destination', where: "location_id = $id");
List<Destination> deslist = rog.isNotEmpty
? rog.map((e) => Destination.fromMap(e)).toList() : [];
List<Destination> deslist =
rog.isNotEmpty ? rog.map((e) => Destination.fromMap(e)).toList() : [];
return deslist;
}
Future<List<Destination>> getDestinationByLatLon(double lat, double lon) async {
Future<List<Destination>> getDestinationByLatLon(
double lat, double lon) async {
Database db = await instance.database;
var dest = await db.query('destination', where: "lat = $lat and lon= $lon", orderBy: 'list_order');
List<Destination> destList = dest.isNotEmpty
? dest.map((e) => Destination.fromMap(e)).toList() : [];
var dest = await db.query('destination',
where: "lat = $lat and lon= $lon", orderBy: 'list_order');
List<Destination> destList =
dest.isNotEmpty ? dest.map((e) => Destination.fromMap(e)).toList() : [];
return destList;
}
Future<int> deleteDestination(int locationId) async {
Database db = await instance.database;
var dest = await db.delete('destination', where: "location_id = $locationId");
var dest =
await db.delete('destination', where: "location_id = $locationId");
int ret = dest > 0 ? dest : -1;
//after deleting set correct order
await setOrder();
return ret;
}
Future<void>setOrder() async {
Future<void> setOrder() async {
Database db = await instance.database;
var byOrder = await db.query('destination', orderBy: 'list_order');
List<Destination> desDb = byOrder.isNotEmpty
? byOrder.map((e) => Destination.fromMap(e)).toList() : [];
? byOrder.map((e) => Destination.fromMap(e)).toList()
: [];
int order = 1;
for( Destination d in desDb){
for (Destination d in desDb) {
Map<String, dynamic> rowTarget = {"list_order": order};
Map<String, dynamic> rowTarget = {
"list_order": order
};
await db.update(
"destination",
rowTarget,
where: 'location_id = ?',
whereArgs: [d.location_id]
);
await db.update("destination", rowTarget,
where: 'location_id = ?', whereArgs: [d.location_id]);
order += 1;
}
@ -241,15 +228,17 @@ class DatabaseHelper{
await db.delete('destination');
}
Future<bool>isAlreadyAvailable(int locationId) async{
Future<bool> isAlreadyAvailable(int locationId) async {
Database db = await instance.database;
var dest = await db.query('destination', where: "location_id = $locationId");
var dest =
await db.query('destination', where: "location_id = $locationId");
return dest.isNotEmpty ? true : false;
}
Future<int> insertDestination(Destination dest) async {
Database db = await instance.database;
int? nextOrder = Sqflite.firstIntValue(await db.rawQuery('SELECT MAX(list_order) FROM destination'));
int? nextOrder = Sqflite.firstIntValue(
await db.rawQuery('SELECT MAX(list_order) FROM destination'));
nextOrder = nextOrder ?? 0;
nextOrder = nextOrder + 1;
dest.list_order = nextOrder;
@ -262,67 +251,50 @@ class DatabaseHelper{
return res;
}
Future<int> updateCancelBuyPoint(Destination destination)async {
print("---- updating puypint image in db -----");
Future<int> updateCancelBuyPoint(Destination destination) async {
//print("---- updating puypint image in db -----");
Database db = await instance.database;
Map<String, dynamic> row = {
"buy_point": 0
};
return await db.update(
"destination",
row,
where: 'location_id = ?',
whereArgs: [destination.location_id!]
);
Map<String, dynamic> row = {"buy_point": 0};
return await db.update("destination", row,
where: 'location_id = ?', whereArgs: [destination.location_id!]);
}
Future<int> updateBuyPoint(Destination destination, String imageUrl)async {
print("---- updating puypint image in db -----");
Future<int> updateBuyPoint(Destination destination, String imageUrl) async {
//print("---- updating puypint image in db -----");
Database db = await instance.database;
Map<String, dynamic> row = {
"buypoint_image": imageUrl
};
return await db.update(
"destination",
row,
where: 'location_id = ?',
whereArgs: [destination.location_id!]
);
Map<String, dynamic> row = {"buypoint_image": imageUrl};
return await db.update("destination", row,
where: 'location_id = ?', whereArgs: [destination.location_id!]);
}
Future<int> updateAction(Destination destination, bool checkin)async {
Future<int> updateAction(Destination destination, bool checkin) async {
Database db = await instance.database;
int act = checkin == false ? 0 : 1;
Map<String, dynamic> row = {
"checkedin": act
};
return await db.update(
"destination",
row,
where: 'location_id = ?',
whereArgs: [destination.location_id!]
);
Map<String, dynamic> row = {"checkedin": act};
return await db.update("destination", row,
where: 'location_id = ?', whereArgs: [destination.location_id!]);
}
Future<void> updateOrder(Destination d, int dir)async {
Future<void> updateOrder(Destination d, int dir) async {
Database db = await instance.database;
var target = await db.query('destination', where: "list_order = ${d.list_order! + dir}");
var dest = await db.query('destination', where: "location_id = ${d.location_id}");
var target = await db.query('destination',
where: "list_order = ${d.list_order! + dir}");
var dest =
await db.query('destination', where: "location_id = ${d.location_id}");
print("--- target in db is $target");
print("--- destine in db is $dest");
if(target.isNotEmpty){
// print("--- target in db is $target");
// print("--- destine in db is $dest");
if (target.isNotEmpty) {
List<Destination> targetIndb = target.isNotEmpty
? target.map((e) => Destination.fromMap(e)).toList() : [];
? target.map((e) => Destination.fromMap(e)).toList()
: [];
List<Destination> destIndb = dest.isNotEmpty
? dest.map((e) => Destination.fromMap(e)).toList() : [];
? dest.map((e) => Destination.fromMap(e)).toList()
: [];
Map<String, dynamic> rowTarget = {
"list_order": d.list_order
};
Map<String, dynamic> rowTarget = {"list_order": d.list_order};
Map<String, dynamic> rowDes = {
"list_order": destIndb[0].list_order! + dir
@ -331,19 +303,11 @@ class DatabaseHelper{
// print("--- target destination is ${target_indb[0].location_id}");
// print("--- destine destination is is ${dest_indb[0].location_id}");
await db.update(
"destination",
rowTarget,
where: 'location_id = ?',
whereArgs: [targetIndb[0].location_id]
);
await db.update("destination", rowTarget,
where: 'location_id = ?', whereArgs: [targetIndb[0].location_id]);
await db.update(
"destination",
rowDes,
where: 'location_id = ?',
whereArgs: [destIndb[0].location_id]
);
await db.update("destination", rowDes,
where: 'location_id = ?', whereArgs: [destIndb[0].location_id]);
}
}
@ -351,6 +315,4 @@ class DatabaseHelper{
// Database db = await instance.database;
// return await Sqflite.firstIntValue(await db.rawQuery("SELECT COUNT(*) FROM incidents"));
// }
}

71
lib/utils/text_util.dart
View File

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

338
lib/widgets/bottom_sheet_new.dart
View File

@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:geojson/geojson.dart';
import 'package:geolocator/geolocator.dart';
@ -28,15 +26,15 @@ class BottomSheetNew extends GetView<BottomSheetController> {
Image getImage() {
String serverUrl = ConstValues.currentServer();
if (indexController.rog_mode == 1) {
if (indexController.rogMode == 1) {
//print("----- rogaining mode 1");
if (indexController.currentDestinationFeature.isEmpty ||
indexController.currentDestinationFeature[0].photos! == "") {
return const Image(image: AssetImage('assets/images/empty_image.png'));
} else {
//print("@@@@@@@@@@@@@ rog mode -------------------- ${indexController.currentDestinationFeature[0].photos} @@@@@@@@@@@");
String _photo = indexController.currentDestinationFeature[0].photos!;
if (_photo.contains('http')) {
String photo = indexController.currentDestinationFeature[0].photos!;
if (photo.contains('http')) {
return Image(
image: NetworkImage(
indexController.currentDestinationFeature[0].photos!,
@ -49,8 +47,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
} else {
return Image(
image: NetworkImage(
'$serverUrl/media/compressed/' +
indexController.currentDestinationFeature[0].photos!,
'$serverUrl/media/compressed/${indexController.currentDestinationFeature[0].photos!}',
),
errorBuilder: (BuildContext context, Object exception,
StackTrace? stackTrace) {
@ -64,8 +61,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
if (gf.properties!["photos"] == null || gf.properties!["photos"] == "") {
return const Image(image: AssetImage('assets/images/empty_image.png'));
} else {
String _photo = gf.properties!["photos"];
if (_photo.contains('http')) {
String photo = gf.properties!["photos"];
if (photo.contains('http')) {
return Image(
image: NetworkImage(
gf.properties!["photos"],
@ -78,7 +75,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
} else {
return Image(
image: NetworkImage(
'$serverUrl/media/compressed/' + gf.properties!["photos"],
'$serverUrl/media/compressed/${gf.properties!["photos"]}',
),
errorBuilder: (BuildContext context, Object exception,
StackTrace? stackTrace) {
@ -91,7 +88,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
}
void _launchURL(url) async {
if (!await launch(url)) throw 'Could not launch $url';
if (!await launchUrl(url)) throw 'Could not launch $url';
}
bool isInDestination(String locationid) {
@ -107,63 +104,60 @@ class BottomSheetNew extends GetView<BottomSheetController> {
@override
Widget build(BuildContext context) {
destinationController.skip_gps = true;
print('---- rog_mode ----- ${indexController.rog_mode} -----');
return indexController.rog_mode == 0
destinationController.skipGps = true;
//print('---- rog_mode ----- ${indexController.rog_mode} -----');
return indexController.rogMode.value == 0
? detailsSheet(context)
: destinationSheet(context);
}
// Show destination detais
SingleChildScrollView destinationSheet(BuildContext context) {
print(
'---- currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} -----');
// print(
// '---- currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} -----');
return SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
child: Row(
children: [
MaterialButton(
onPressed: () {
Get.back();
//destinationController.makePrevious(indexController.currentDestinationFeature[0]);
},
color: Colors.blue,
textColor: Colors.white,
child: const Icon(
Icons.arrow_back_ios,
size: 14,
),
padding: const EdgeInsets.all(16),
shape: const CircleBorder(),
child: Row(
children: [
MaterialButton(
onPressed: () {
Get.back();
//destinationController.makePrevious(indexController.currentDestinationFeature[0]);
},
color: Colors.blue,
textColor: Colors.white,
padding: const EdgeInsets.all(16),
shape: const CircleBorder(),
child: const Icon(
Icons.arrow_back_ios,
size: 14,
),
Expanded(
child: Container(
alignment: Alignment.center,
child: Obx(() => indexController.currentUser.isNotEmpty
? Text(
"${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} : ${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} : ${indexController.currentDestinationFeature[0].name!}",
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)
: Text(
indexController
.currentDestinationFeature[0].name!,
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)),
),
),
Expanded(
child: Container(
alignment: Alignment.center,
child: Obx(() => indexController.currentUser.isNotEmpty
? Text(
"${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} : ${TextUtils.getDisplayText(indexController.currentDestinationFeature[0])} : ${indexController.currentDestinationFeature[0].name!}",
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)
: Text(
indexController.currentDestinationFeature[0].name!,
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)),
),
],
),
),
],
),
),
Row(
@ -180,8 +174,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
children: [
Obx(
() => indexController.currentDestinationFeature.isNotEmpty &&
destinationController.is_in_checkin.value == true &&
destinationController.is_at_start.value == false
destinationController.isInCheckin.value == true &&
destinationController.isAtStart.value == false
? Row(
children: [
ElevatedButton(
@ -196,8 +190,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
.currentDestinationFeature[0]
.hidden_location ==
0) {
destinationController.skip_gps = false;
destinationController.is_photo_shoot.value =
destinationController.skipGps = false;
destinationController.isPhotoShoot.value =
true;
Get.back();
} else {
@ -210,7 +204,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
.currentDestinationFeature[0].cp !=
-1) {
destinationController
.rogaining_counted.value = true;
.rogainingCounted.value = true;
}
}
} else {
@ -238,18 +232,18 @@ class BottomSheetNew extends GetView<BottomSheetController> {
: Container(),
),
Obx(
() => destinationController.is_at_start.value == true
() => destinationController.isAtStart.value == true
? ElevatedButton(
onPressed: () {
destinationController.is_in_rog.value = true;
destinationController.isInRog.value = true;
destinationController.addToRogaining(
destinationController.current_lat,
destinationController.current_lon,
destinationController.currentLat,
destinationController.currentLon,
indexController
.currentDestinationFeature[0].location_id!);
saveGameState();
saveGameState();
ExternalService()
.StartRogaining()
.startRogaining()
.then((value) => Get.back());
},
child: Text(
@ -265,8 +259,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
: Container(),
),
Obx(
() => destinationController.is_at_goal.value == true &&
destinationController.rogaining_counted == true
() => destinationController.isAtGoal.value == true &&
destinationController.rogainingCounted.value == true
? ElevatedButton(
onPressed: () {
Get.toNamed(AppPages.CAMERA_PAGE);
@ -374,51 +368,51 @@ class BottomSheetNew extends GetView<BottomSheetController> {
// show add location details
SingleChildScrollView detailsSheet(BuildContext context) {
Destination _cdest = destinationController.festuretoDestination(
indexController.currentFeature[0]);
Destination cdest = destinationController
.festuretoDestination(indexController.currentFeature[0]);
var distance = const Distance();
double _distance_to_dest = distance.as(LengthUnit.Meter, LatLng(destinationController.current_lat, destinationController.current_lon), LatLng(_cdest.lat!, _cdest.lon!));
double distanceToDest = distance.as(
LengthUnit.Meter,
LatLng(
destinationController.currentLat, destinationController.currentLon),
LatLng(cdest.lat!, cdest.lon!));
return SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
child: Row(
children: [
MaterialButton(
onPressed: () {
Get.back();
//indexController.makePrevious(indexController.currentFeature[0]);
},
color: Colors.blue,
textColor: Colors.white,
child: const Icon(
Icons.arrow_back_ios,
//Icons.arrow_back_ios,
size: 14,
),
padding: const EdgeInsets.all(16),
shape: const CircleBorder(),
child: Row(
children: [
MaterialButton(
onPressed: () {
Get.back();
//indexController.makePrevious(indexController.currentFeature[0]);
},
color: Colors.blue,
textColor: Colors.white,
padding: const EdgeInsets.all(16),
shape: const CircleBorder(),
child: const Icon(
Icons.arrow_back_ios,
//Icons.arrow_back_ios,
size: 14,
),
Expanded(
child: Container(
alignment: Alignment.center,
child: Obx(() => Text(
indexController
.currentFeature[0].properties!["location_name"],
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)),
),
),
Expanded(
child: Container(
alignment: Alignment.center,
child: Obx(() => Text(
indexController
.currentFeature[0].properties!["location_name"],
style: const TextStyle(
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)),
),
],
),
),
],
),
),
Row(
@ -446,26 +440,25 @@ class BottomSheetNew extends GetView<BottomSheetController> {
indexController.currentDestinationFeature[0]
.checkedin ==
false &&
destinationController.is_at_start.value ==
true
destinationController.isAtStart.value == true
? ElevatedButton(
onPressed: () async {
await destinationController.resetRogaining();
print("~~~~ start button ~~~~");
destinationController.is_in_rog.value =
true;
await destinationController
.resetRogaining();
//print("~~~~ start button ~~~~");
destinationController.isInRog.value = true;
destinationController.addToRogaining(
destinationController.current_lat,
destinationController.current_lon,
destinationController.currentLat,
destinationController.currentLon,
indexController
.currentDestinationFeature[0]
.location_id!);
saveGameState();
saveGameState();
ExternalService()
.StartRogaining()
.then((value){
Get.back();
});
.startRogaining()
.then((value) {
Get.back();
});
},
child: Text(
// start
@ -484,9 +477,9 @@ class BottomSheetNew extends GetView<BottomSheetController> {
: Container(),
),
Obx(
() => destinationController.is_at_goal.value ==
true &&
destinationController.rogaining_counted ==
() => destinationController.isAtGoal.value == true &&
destinationController
.rogainingCounted.value ==
true
? ElevatedButton(
onPressed: () {
@ -521,7 +514,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
.onPrimaryContainer),
onPressed: () async {
Get.back();
print("---- go to ----");
//print("---- go to ----");
GeoJsonFeature<GeoJsonMultiPoint> mp =
indexController.currentFeature[0]
as GeoJsonFeature<GeoJsonMultiPoint>;
@ -530,7 +523,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
desiredAccuracy:
LocationAccuracy.bestForNavigation,
forceAndroidLocationManager: true);
print("------- position -------- $position");
//print("------- position -------- $position");
Destination ds = Destination(
lat: position.latitude,
lon: position.longitude);
@ -550,49 +543,48 @@ class BottomSheetNew extends GetView<BottomSheetController> {
color:
Theme.of(context).colorScheme.onPrimary),
)),
SizedBox(
const SizedBox(
width: 10,
),
// forced start / checkin
_distance_to_dest <= 100 ?
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
print("~~~~ manual checkin button ~~~~");
if (destination.cp == -1) {
destinationController.is_in_rog.value = true;
destinationController.addToRogaining(
destinationController.current_lat,
destinationController.current_lon,
destination.location_id!);
saveGameState();
ExternalService()
.StartRogaining()
.then((value) => Get.back());
} else {
await destinationController.CallforCheckin(destination);
}
},
child: Text(
destinationController
.festuretoDestination(
indexController
.currentFeature[0])
.cp ==
-1
? "ロゲ開始"
: "チェックイン",
style: TextStyle(
color: Theme.of(context)
distanceToDest <= 100
? ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context)
.colorScheme
.onSecondary))):
Container()
,
.secondary),
onPressed: () async {
//print("~~~~ manual checkin button ~~~~");
if (destination.cp == -1) {
destinationController.isInRog.value = true;
destinationController.addToRogaining(
destinationController.currentLat,
destinationController.currentLon,
destination.location_id!);
saveGameState();
ExternalService()
.startRogaining()
.then((value) => Get.back());
} else {
await destinationController
.callforCheckin(destination);
}
},
child: Text(
destinationController
.festuretoDestination(
indexController
.currentFeature[0])
.cp ==
-1
? "ロゲ開始"
: "チェックイン",
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onSecondary)))
: Container(),
],
),
Row(
@ -603,8 +595,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
children: [
indexController.currentDestinationFeature
.isNotEmpty &&
destinationController
.is_in_checkin.value ==
destinationController.isInCheckin.value ==
true
? Container()
: FutureBuilder<Widget>(
@ -787,14 +778,14 @@ class BottomSheetNew extends GetView<BottomSheetController> {
}
Future<Widget> wantToGo(BuildContext context) async {
bool _selected = false;
print(
'---target-- ${indexController.currentFeature[0].properties!["location_id"]}----');
bool selected = false;
// print(
// '---target-- ${indexController.currentFeature[0].properties!["location_id"]}----');
for (Destination d in destinationController.destinations) {
print('---- ${d.location_id.toString()} ----');
//print('---- ${d.location_id.toString()} ----');
if (d.location_id ==
indexController.currentFeature[0].properties!["location_id"]) {
_selected = true;
selected = true;
break;
}
}
@ -905,12 +896,12 @@ class BottomSheetNew extends GetView<BottomSheetController> {
const SizedBox(
width: 8.0,
),
Obx((() => indexController.rog_mode == 1
Obx((() => indexController.rogMode.value == 1
? ElevatedButton(
onPressed: () async {
Destination dest =
indexController.currentDestinationFeature[0];
print("~~~~ before checking button ~~~~");
//print("~~~~ before checking button ~~~~");
//print("------ curent destination is ${dest!.checkedIn}-------");
destinationController.makeCheckin(
dest, !dest.checkedin!, "");
@ -945,8 +936,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
ElevatedButton(
child: const Text("Image"),
onPressed: () {
final ImagePicker _picker = ImagePicker();
_picker
final ImagePicker picker = ImagePicker();
picker
.pickImage(source: ImageSource.camera)
.then((value) {
//print("----- image---- ${value!.path}");
@ -968,7 +959,6 @@ class BottomSheetNew extends GetView<BottomSheetController> {
//print("---temp---${temp}");
indexController.currentAction.add([temp]);
}
indexController.makeAction(context);
},
child: Text("checkin".tr))
],
@ -984,7 +974,6 @@ class BottomSheetNew extends GetView<BottomSheetController> {
//print("---temp---${temp}");
indexController.currentAction.add([temp]);
}
indexController.makeAction(context);
},
child: const Icon(Icons.favorite, color: Colors.red),
)
@ -1006,7 +995,7 @@ class BottomSheetNew extends GetView<BottomSheetController> {
InkWell(
onTap: () {
if (isurl) {
if (indexController.rog_mode == 0) {
if (indexController.rogMode.value == 0) {
_launchURL(indexController
.currentFeature[0].properties!["webcontents"]);
} else {
@ -1015,7 +1004,8 @@ class BottomSheetNew extends GetView<BottomSheetController> {
}
},
child: SizedBox(
width: MediaQuery.of(context).size.width - (MediaQuery.of(context).size.width * 0.28),
width: MediaQuery.of(context).size.width -
(MediaQuery.of(context).size.width * 0.28),
child: Text(
text,
textDirection: TextDirection.ltr,

381
lib/widgets/bottom_sheet_widget.dart
View File

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

34
lib/widgets/bread_crum_widget.dart
View File

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

56
lib/widgets/c_form_text_field.dart Normal file
View File

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

54
lib/widgets/c_password_text_filed.dart Normal file
View File

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

49
lib/widgets/cat_widget.dart
View File

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

32
lib/widgets/destination_widget.dart
View File

@ -23,10 +23,10 @@ class DestinationWidget extends StatelessWidget {
destinationController.destinations[index].photos == "") {
return const Image(image: AssetImage('assets/images/empty_image.png'));
} else {
print(
"------- image is ${destinationController.destinations[index].photos!}------");
String _photo = destinationController.destinations[index].photos!;
if (_photo.contains('http')) {
// print(
// "------- image is ${destinationController.destinations[index].photos!}------");
String photo = destinationController.destinations[index].photos!;
if (photo.contains('http')) {
return Image(
image:
NetworkImage(destinationController.destinations[index].photos!),
@ -39,8 +39,8 @@ class DestinationWidget extends StatelessWidget {
String serverUrl = ConstValues.currentServer();
//print("==== photo is ${server_url + '/media/compressed/' + destinationController.destinations[index].photos!} ===");
return Image(
image: NetworkImage('$serverUrl/media/compressed/' +
destinationController.destinations[index].photos!),
image: NetworkImage(
'$serverUrl/media/compressed/${destinationController.destinations[index].photos!}'),
errorBuilder:
(BuildContext context, Object exception, StackTrace? stackTrace) {
return Image.asset("assets/images/empty_image.png");
@ -84,7 +84,7 @@ class DestinationWidget extends StatelessWidget {
}
}
if (d != null) {
print("--- selected destination is ${d.list_order}");
//print("--- selected destination is ${d.list_order}");
destinationController.makeOrder(d, -1);
}
}
@ -98,7 +98,7 @@ class DestinationWidget extends StatelessWidget {
}
}
if (d != null) {
print("--- selected destination is ${d.list_order}");
//print("--- selected destination is ${d.list_order}");
destinationController.makeOrder(d, 1);
}
}
@ -145,8 +145,8 @@ class DestinationWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
print(
"------ destination widget------ ${destinationController.destinationCount.value} ----------");
//print(
// "------ destination widget------ ${destinationController.destinationCount.value} ----------");
return Obx(() => Stack(
children: [
@ -161,12 +161,12 @@ class DestinationWidget extends StatelessWidget {
isFirst: index == 0 ? true : false,
indicatorStyle: IndicatorStyle(
indicator: CircleAvatar(
backgroundColor: Colors.red,
child: Text(
destinationController.destinations[index].list_order
.toString(),
style: const TextStyle(color: Colors.white),
),
backgroundColor: Colors.red,
),
),
key: Key(index.toString()),
@ -180,7 +180,7 @@ class DestinationWidget extends StatelessWidget {
{
Destination? fs =
destinationController.destinations[index];
print("----fsf-----$index");
//print("----fsf-----$index");
if (indexController
.currentDestinationFeature.isNotEmpty) {
indexController.currentDestinationFeature
@ -188,8 +188,8 @@ class DestinationWidget extends StatelessWidget {
}
indexController.currentDestinationFeature
.add(fs);
print(
"--- ndexController.currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} ----");
// print(
// "--- ndexController.currentDestinationFeature ----- ${indexController.currentDestinationFeature[0].name} ----");
//indexController.getAction();
showModalBottomSheet(
@ -198,7 +198,9 @@ class DestinationWidget extends StatelessWidget {
context: context,
isScrollControlled: true,
//builder:((context) => BottomSheetWidget())
builder: ((context) => BottomSheetNew(destination: fs,)));
builder: ((context) => BottomSheetNew(
destination: fs,
)));
}
},
onLongPress: () {

29
lib/widgets/list_widget.dart
View File

@ -28,13 +28,13 @@ class _ListWidgetState extends State<ListWidget> {
"") {
return const Image(image: AssetImage('assets/images/empty_image.png'));
} else {
print("==== photo index is $index ===");
//print("==== photo index is $index ===");
String serverUrl = ConstValues.currentServer();
GeoJsonFeature<dynamic> gf =
indexController.locations[0].collection[index];
String _photo = gf.properties!["photos"];
String photo = gf.properties!["photos"];
return Image(
image: NetworkImage('$serverUrl/media/compressed/' + _photo),
image: NetworkImage('$serverUrl/media/compressed/$photo'),
errorBuilder:
(BuildContext context, Object exception, StackTrace? stackTrace) {
return Image.asset("assets/images/empty_image.png");
@ -57,19 +57,19 @@ class _ListWidgetState extends State<ListWidget> {
Destination createDestination(GeoJsonFeature feature) {
final props = feature.properties;
GeoJsonMultiPoint _pt = feature.geometry;
GeoJsonMultiPoint pt = feature.geometry;
return Destination(
cp: props!['cp'],
lat: _pt.geoSerie!.geoPoints.first.latitude,
lon: _pt.geoSerie!.geoPoints.first.longitude,
lat: pt.geoSerie!.geoPoints.first.latitude,
lon: pt.geoSerie!.geoPoints.first.longitude,
);
}
Future<String> matrixDistance(int i) async {
// Create two destinations directly from indexController.locations[0].collection
Destination desCurr = Destination(
lat: indexController.current_lat, lon: indexController.current_lon);
lat: indexController.currentLat, lon: indexController.currentLon);
//Destination dest1 = createDestination(indexController.locations[0].collection[0]);
Destination dest2 =
createDestination(indexController.locations[0].collection[i]);
@ -82,7 +82,7 @@ class _ListWidgetState extends State<ListWidget> {
}
Future<void> _pullRefresh() async {
print("pull to refesh");
//print("pull to refesh");
indexController.locations[0].collection.sort((a, b) =>
(a.properties!['cp'] as Comparable)
.compareTo(b.properties!['cp'] as Comparable));
@ -99,23 +99,24 @@ class _ListWidgetState extends State<ListWidget> {
itemCount: indexController.locations[0].collection.length,
shrinkWrap: true,
itemBuilder: (_, index) {
bool _is_found = false;
bool isFound = false;
for (Destination d in destinationController.destinations) {
if (indexController.locations[0].collection[index]
.properties!['location_id'] ==
d.location_id) {
_is_found = true;
isFound = true;
break;
}
}
return Card(
child: ListTile(
selected: _is_found,
selected: isFound,
selectedTileColor: Colors.yellow.shade200,
onTap: () {
GeoJsonFeature gf =
indexController.locations[0].collection[index];
Destination des = destinationController.festuretoDestination(gf);
Destination des =
destinationController.festuretoDestination(gf);
changeCurrentFeature(gf);
showModalBottomSheet(
constraints: BoxConstraints.loose(
@ -123,7 +124,9 @@ class _ListWidgetState extends State<ListWidget> {
isScrollControlled: true,
context: context,
//builder: (context) => BottomSheetWidget(),
builder: ((context) => BottomSheetNew(destination: des,)));
builder: ((context) => BottomSheetNew(
destination: des,
)));
},
leading: getImage(index),
title: indexController.locations[0].collection[index]

35
lib/widgets/map_widget.dart
View File

@ -26,7 +26,7 @@ class MapWidget extends StatelessWidget {
Widget getMarkerShape(GeoJsonFeature i, BuildContext context) {
GeoJsonMultiPoint p = i.geometry as GeoJsonMultiPoint;
//print("lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
//RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
return Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
@ -35,12 +35,11 @@ class MapWidget extends StatelessWidget {
GeoJsonFeature? fs = indexController.getFeatureForLatLong(
p.geoSerie!.geoPoints[0].latitude,
p.geoSerie!.geoPoints[0].longitude);
print("------- fs $fs------");
//print("------- fs $fs------");
if (fs != null) {
indexController.currentFeature.clear();
indexController.currentFeature.add(fs);
//print("----- fs is ${fs.properties!['photos']}");
indexController.getAction();
Destination des = destinationController.festuretoDestination(fs);
@ -55,7 +54,7 @@ class MapWidget extends StatelessWidget {
))
//builder:((context) => BottomSheetWidget())
).whenComplete(() {
destinationController.skip_gps = false;
destinationController.skipGps = false;
});
}
},
@ -107,7 +106,7 @@ class MapWidget extends StatelessWidget {
}
List<LatLng>? getPoints() {
print("##### --- route point ${indexController.routePoints.length}");
//print("##### --- route point ${indexController.routePoints.length}");
List<LatLng> pts = [];
for (PointLatLng p in indexController.routePoints) {
LatLng l = LatLng(p.latitude, p.longitude);
@ -118,13 +117,13 @@ class MapWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
print(
"---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
// print(
// "---------- rog mode is ${indexController.rog_mode.value.toString()}----------");
final PopupController _popupController = PopupController();
final PopupController popupController = PopupController();
return Stack(
children: [
Obx(() => indexController.is_loading == true
Obx(() => indexController.isLoading.value == true
? const Padding(
padding: EdgeInsets.only(top: 60.0),
child: CircularProgressIndicator(),
@ -134,19 +133,13 @@ class MapWidget extends StatelessWidget {
options: MapOptions(
maxZoom: 18.4,
onMapReady: () {
indexController.is_mapController_loaded.value = true;
subscription = indexController.mapController.mapEventStream
.listen((MapEvent mapEvent) {
if (mapEvent is MapEventMoveStart) {
//print(DateTime.now().toString() + ' [MapEventMoveStart] START');
// do something
}
if (mapEvent is MapEventMoveEnd &&
indexController.currentUser.isEmpty) {
//print(DateTime.now().toString() + ' [MapEventMoveStart] END');
indexController.loadLocationsBound();
//indexController.rogMapController!.move(c.center, c.zoom);
}
if (mapEvent is MapEventMoveEnd) {}
});
},
//center: LatLng(37.15319600454702, 139.58765950528198),
@ -163,7 +156,7 @@ class MapWidget extends StatelessWidget {
onPositionChanged: (MapPosition pos, isvalue) {
indexController.currentBound = [pos.bounds!];
},
onTap: (_, __) => _popupController
onTap: (_, __) => popupController
.hideAllPopups(), // Hide popup when the map is tapped.
),
children: [
@ -181,7 +174,7 @@ class MapWidget extends StatelessWidget {
: Container(),
),
CurrentLocationLayer(
followOnLocationUpdate: FollowOnLocationUpdate.once,
followOnLocationUpdate: FollowOnLocationUpdate.never,
turnOnHeadingUpdate: TurnOnHeadingUpdate.never,
style: const LocationMarkerStyle(
marker: DefaultLocationMarker(
@ -199,13 +192,13 @@ class MapWidget extends StatelessWidget {
? MarkerLayer(
markers:
indexController.locations[0].collection.map((i) {
print("i si ${i.properties!['location_id']}");
//print("i si ${i.properties!['location_id']}");
RegExp regex = RegExp(r'([.]*0)(?!.*\d)');
GeoJsonMultiPoint p =
i.geometry as GeoJsonMultiPoint;
print(
"lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
//print(
// "lat is ${p.geoSerie!.geoPoints[0].latitude} and lon is ${p.geoSerie!.geoPoints[0].longitude}");
return Marker(
anchorPos: AnchorPos.exactly(Anchor(108.0, 18.0)),
height: 32.0,

237
lib/widgets/perfecture_widget.dart
View File

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