From ab6fc3df5c328a5ccd9aa83b3c9f9a2b068435ca Mon Sep 17 00:00:00 2001 From: Mohamed Nouffer Date: Fri, 22 Jul 2022 19:36:04 +0530 Subject: [PATCH] update --- ios/Podfile.lock | 6 + lib/pages/index/index_page.dart | 208 +++++++++++++++--------------- lib/widgets/bottom_sheet_new.dart | 69 +++++----- 3 files changed, 146 insertions(+), 137 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 55d8e7f..8a992b1 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,6 +2,8 @@ PODS: - Flutter (1.0.0) - flutter_compass (0.0.1): - Flutter + - flutter_keyboard_visibility (0.0.1): + - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) @@ -30,6 +32,7 @@ PODS: DEPENDENCIES: - Flutter (from `Flutter`) - flutter_compass (from `.symlinks/plugins/flutter_compass/ios`) + - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) @@ -48,6 +51,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_compass: :path: ".symlinks/plugins/flutter_compass/ios" + flutter_keyboard_visibility: + :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" geolocator_apple: :path: ".symlinks/plugins/geolocator_apple/ios" google_maps_flutter: @@ -66,6 +71,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_compass: cbbd285cea1584c7ac9c4e0c3e1f17cbea55e855 + flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 google_maps_flutter: c59fc576c0d0c7f4dc4bd63832c862d22d5a7c6d diff --git a/lib/pages/index/index_page.dart b/lib/pages/index/index_page.dart index 7d8c83c..2adf1dd 100644 --- a/lib/pages/index/index_page.dart +++ b/lib/pages/index/index_page.dart @@ -22,119 +22,113 @@ class IndexPage extends GetView { @override Widget build(BuildContext context) { - return Scaffold( - drawer: const DrawerPage(), - appBar: AppBar( - leading: IconButton( - icon: Icon(Icons.arrow_back_ios), - onPressed: (){ - indexController.switchPage(AppPages.TRAVEL); - }, - ), - //automaticallyImplyLeading: false, - title: Text("Add locations"), - actions: [ - InkWell( - onTap: (){ - Get.toNamed(AppPages.SEARCH); - }, - child: Container( - height: 32, - width: 75, - decoration: BoxDecoration( - color: Colors.blue, - borderRadius: BorderRadius.circular(25), - + return WillPopScope( + onWillPop: () async { + indexController.switchPage(AppPages.INITIAL); + return false; + }, + child: Scaffold( + drawer: const DrawerPage(), + appBar: AppBar( + leading: IconButton( + icon: Icon(Icons.arrow_back_ios), + onPressed: (){ + indexController.switchPage(AppPages.TRAVEL); + }, + ), + //automaticallyImplyLeading: false, + title: Text("Add locations"), + actions: [ + InkWell( + onTap: (){ + Get.toNamed(AppPages.SEARCH); + }, + child: Container( + height: 32, + width: 75, + decoration: BoxDecoration( + color: Colors.blue, + borderRadius: BorderRadius.circular(25), + + ), + child: const Center(child: Icon(Icons.search),), + ), ), - child: const Center(child: Icon(Icons.search),), - ), - ), - // RaisedButton( - // child: Text("db"), - // onPressed: (){ - // DatabaseHelper db = DatabaseHelper.instance; - // db.getDestinations().then((value){ - // print("-------- lendth in db ${value.length} ---- :::::"); - // for(Destination d in value){ - // print("-------- values in db are ${d.checkedin} ---- :::::"); - // }; - // }); - // }, - // ), - CatWidget(indexController: indexController,), - ], - ), - bottomNavigationBar: BottomAppBar( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded(child: IconButton(icon: const Icon(Icons.camera_enhance), onPressed: (){},),), - const Expanded(child: Text('')), - Expanded(child: IconButton(icon: const Icon(Icons.travel_explore), onPressed: (){ - indexController.switchPage(AppPages.TRAVEL); - }),), + CatWidget(indexController: indexController,), ], ), - ), - floatingActionButton: FloatingActionButton( - onPressed: (){ - indexController.toggleMode(); - if(indexController.currentCat.isNotEmpty){ - print(indexController.currentCat[0].toString()); - } - - }, - tooltip: 'Increment', - child: const Icon(Icons.document_scanner), - elevation: 4.0, - ), - floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, - body: SafeArea( - child: Column( - children: [ - Container( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - alignment: Alignment.centerLeft, - height: 50.0, - 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,) - ], - ) - ], - ) + bottomNavigationBar: BottomAppBar( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded(child: IconButton(icon: const Icon(Icons.camera_enhance), onPressed: (){},),), + const Expanded(child: Text('')), + Expanded(child: IconButton(icon: const Icon(Icons.travel_explore), onPressed: (){ + indexController.switchPage(AppPages.TRAVEL); + }),), + ], + ), + ), + floatingActionButton: FloatingActionButton( + onPressed: (){ + indexController.toggleMode(); + if(indexController.currentCat.isNotEmpty){ + print(indexController.currentCat[0].toString()); + } + + }, + tooltip: 'Increment', + child: const Icon(Icons.document_scanner), + elevation: 4.0, + ), + floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, + body: SafeArea( + child: Column( + children: [ + Container( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + alignment: Alignment.centerLeft, + height: 50.0, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Obx(() => + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + indexController.is_mapController_loaded.value == false ? + Center(child: CircularProgressIndicator()) + : + BreadCrumbWidget(mapController: indexController.mapController), + Container(width: 24.0,), + Row( + children: [ + indexController.currentCat.isNotEmpty ? Text(indexController.currentCat[0].toString()): Text(""), + indexController.currentCat.isNotEmpty ? + IconButton( + onPressed: (){ + indexController.currentCat.clear(); + indexController.loadLocationsBound(); + }, + icon: Icon(Icons.cancel, color: Colors.red,) + ) : + Container(width: 0, height: 0,) + ], + ) + ], + ) + ), ), ), - ), - Expanded( - child: Obx(() => - indexController.mode == 0 ? - MapWidget() : - ListWidget(), + Expanded( + child: Obx(() => + indexController.mode == 0 ? + MapWidget() : + ListWidget(), + ) + ) - - ) - ], + ], + ), ), ), ); diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart index 9478d11..d315a75 100644 --- a/lib/widgets/bottom_sheet_new.dart +++ b/lib/widgets/bottom_sheet_new.dart @@ -58,6 +58,16 @@ class BottomSheetNew extends GetView { if (!await launch(url)) throw 'Could not launch $url'; } + bool isInDestination(String locationid){ + int lid = int.parse(locationid); + if(destinationController.destinations.where((element) => element.location_id == lid).length > 0){ + return true; + } + else{ + return false; + } + } + @override Widget build(BuildContext context) { @@ -349,37 +359,36 @@ class BottomSheetNew extends GetView { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - indexController.rog_mode == 0 ? - IconButton( - icon: Icon(Icons.pin_drop_sharp, size: 32,), - - onPressed: (){ - GeoJsonMultiPoint mp = indexController.currentFeature[0].geometry as GeoJsonMultiPoint; - LatLng pt = LatLng(mp.geoSerie!.geoPoints[0].latitude, mp.geoSerie!.geoPoints[0].longitude); + indexController.rog_mode == 0 ? + IconButton( + icon: Icon(Icons.pin_drop_sharp, size: 32,), + onPressed: (){ + GeoJsonMultiPoint mp = indexController.currentFeature[0].geometry as GeoJsonMultiPoint; + LatLng pt = LatLng(mp.geoSerie!.geoPoints[0].latitude, mp.geoSerie!.geoPoints[0].longitude); - Destination dest = Destination( - name: indexController.currentFeature[0].properties!["location_name"], - address: indexController.currentFeature[0].properties!["address"], - phone: indexController.currentFeature[0].properties!["phone"], - email: indexController.currentFeature[0].properties!["email"], - webcontents: indexController.currentFeature[0].properties!["webcontents"], - videos: indexController.currentFeature[0].properties!["videos"], - category: indexController.currentFeature[0].properties!["category"], - series: 1, - lat: pt.latitude, - lon: pt.longitude, - location_id: indexController.currentFeature[0].properties!["location_id"], - list_order: 1, - photos: indexController.currentFeature[0].properties!["photos"], - checkin_radious: indexController.currentFeature[0].properties!["checkin_radious"], - auto_checkin: indexController.currentFeature[0].properties!["auto_checkin"] == true ? 1 : 0, - selected: false, - checkedin: false - ); - destinationController.addDestinations(dest); - }, - ): - Container(), + Destination dest = Destination( + name: indexController.currentFeature[0].properties!["location_name"], + address: indexController.currentFeature[0].properties!["address"], + phone: indexController.currentFeature[0].properties!["phone"], + email: indexController.currentFeature[0].properties!["email"], + webcontents: indexController.currentFeature[0].properties!["webcontents"], + videos: indexController.currentFeature[0].properties!["videos"], + category: indexController.currentFeature[0].properties!["category"], + series: 1, + lat: pt.latitude, + lon: pt.longitude, + location_id: indexController.currentFeature[0].properties!["location_id"], + list_order: 1, + photos: indexController.currentFeature[0].properties!["photos"], + checkin_radious: indexController.currentFeature[0].properties!["checkin_radious"], + auto_checkin: indexController.currentFeature[0].properties!["auto_checkin"] == true ? 1 : 0, + selected: false, + checkedin: false + ); + destinationController.addDestinations(dest); + }, + ): + Container(), SizedBox(width: 8.0,) , Obx((() =>