From 3ff0eace3f7bf3817f7bb556d9a058efa8ae6514 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Thu, 23 May 2024 02:10:42 +0300 Subject: [PATCH] 5/23/1 --- lib/controller/auth/login_controller.dart | 18 +++-- lib/controller/auth/register_controller.dart | 1 + lib/controller/firebase/firbase_messge.dart | 2 + .../home/map_passenger_controller.dart | 20 ++++-- .../home/splash_screen_controlle.dart | 2 +- lib/views/auth/login_page.dart | 67 +++++++++++-------- lib/views/auth/sms_verfy_page.dart | 4 +- .../map_widget.dart/apply_order_widget.dart | 3 +- .../car_details_widget_to_go.dart | 61 +++++++++-------- .../map_widget.dart/main_bottom_Menu_map.dart | 51 ++++++-------- 10 files changed, 127 insertions(+), 102 deletions(-) diff --git a/lib/controller/auth/login_controller.dart b/lib/controller/auth/login_controller.dart index b2574b6..fa9a5c8 100644 --- a/lib/controller/auth/login_controller.dart +++ b/lib/controller/auth/login_controller.dart @@ -66,28 +66,32 @@ class LoginController extends GetxController { if (jsonDecoeded['status'] == 'success' && jsonDecoeded['data'][0]['verified'] == 1) { // + box.write(BoxName.isVerified, 'true'); + box.write(BoxName.email, jsonDecoeded['data'][0]['email']); - Get.offAll(() => const MapPagePassenger()); print(box.read(BoxName.tokenFCM)); var token = await CRUD().get(link: AppLink.getTokens, payload: { 'passengerID': box.read(BoxName.passengerID).toString() }); print(token); + print(box.read(BoxName.tokenFCM)); if (token != 'failure') { if (jsonDecode(token)['data'][0]['token'] != box.read(BoxName.tokenFCM)) { - Get.find() + Get.put(FirebaseMessagesController()) .sendNotificationToAnyWithoutData( 'token change', 'change device', jsonDecode(token)['data'][0]['token'].toString(), ); + await CRUD().post(link: AppLink.addTokens, payload: { + 'token': box.read(BoxName.tokenFCM), + 'passengerID': box.read(BoxName.passengerID).toString() + }).then((value) => print('cccc')); } } - await CRUD().post(link: AppLink.addTokens, payload: { - 'token': box.read(BoxName.tokenFCM), - 'passengerID': box.read(BoxName.passengerID).toString() - }).then((value) => print('cccc')); + + Get.offAll(() => const MapPagePassenger()); } else { Get.offAll(() => SmsSignupEgypt()); // Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'], @@ -238,7 +242,7 @@ class LoginController extends GetxController { } } print('permisson is ${permissionGranted.toString()}'); - if ('PermissionStatus.granted' == permissionGranted.toString()) { + if (permissionGranted.toString() == 'PermissionStatus.granted') { box.write(BoxName.locationPermission, 'true'); } update(); diff --git a/lib/controller/auth/register_controller.dart b/lib/controller/auth/register_controller.dart index c84e994..a57771a 100644 --- a/lib/controller/auth/register_controller.dart +++ b/lib/controller/auth/register_controller.dart @@ -117,6 +117,7 @@ class RegisterController extends GetxController { ); if (jsonDecode(res1)['status'] == 'success') { box.write(BoxName.isVerified, 'true'); + box.write(BoxName.phone, '+2${phoneController.text}'); Get.offAll(const MapPagePassenger()); } } else { diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index d872777..ca5ec03 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -143,6 +143,8 @@ class FirebaseMessagesController extends GetxController { .showNotification('Promo', 'Show latest promo'.tr, 'promo'); Get.to(const PromosPassengerPage()); } else if (message.notification!.title! == 'token change') { + NotificationController() + .showNotification('token change', 'token change', 'cancel'); GoogleSignInHelper.signOut(); } else if (message.notification!.title! == 'DriverIsGoingToPassenger') { Get.find().isDriverInPassengerWay = true; diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index b83a34e..2853a78 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -889,7 +889,7 @@ class MapPassengerController extends GetxController { driverPhone = dataCarsLocationByPassenger['message'][carsOrder]['phone'].toString(); firstName = dataCarsLocationByPassenger['message'][carsOrder] - ['first_name'] + ['driverName'] .toString(); carColor = dataCarsLocationByPassenger['message'][carsOrder]['color'].toString(); @@ -1002,8 +1002,14 @@ class MapPassengerController extends GetxController { titleStyle: AppStyle.title, middleText: 'Please Try anther time '.tr, middleTextStyle: AppStyle.title.copyWith(color: AppColor.yellowColor), - confirm: - MyElevatedButton(title: 'Ok'.tr, onPressed: () => Get.back())); + confirm: MyElevatedButton( + title: 'Ok'.tr, + onPressed: () { + Get.back(); + isSearchingWindow = false; + cancelRide(); + update(); + })); } } @@ -2449,6 +2455,7 @@ class MapPassengerController extends GetxController { totalCostPassenger = 20; totalPassengerSpeed = 20; totalPassengerComfort = 30; + totalPassengerLady = 30; totalPassengerMotoDelivery = 18; } else { totalPassenger = totalCostPassenger; @@ -2459,6 +2466,8 @@ class MapPassengerController extends GetxController { (-1) * (double.parse(box.read(BoxName.passengerWalletTotal))); totalPassengerComfort = totalPassengerComfort + (-1) * (double.parse(box.read(BoxName.passengerWalletTotal))); + totalPassengerLady = totalPassengerLady + + (-1) * (double.parse(box.read(BoxName.passengerWalletTotal))); totalPassengerMotoDelivery = totalPassengerMotoDelivery + (-1) * (double.parse(box.read(BoxName.passengerWalletTotal))); update(); @@ -2587,7 +2596,8 @@ class MapPassengerController extends GetxController { payload: {'passenger_id': box.read(BoxName.passengerID)}); if (res != 'failure') { print(jsonDecode(res)['message']['rating']); - passengerRate = jsonDecode(res)['message']['rating'] ?? 5; + passengerRate = + double.parse(jsonDecode(res)['message']['rating'].toString()); } } @@ -2602,7 +2612,7 @@ class MapPassengerController extends GetxController { addCustomStartIcon(); addCustomEndIcon(); await getLocation(); - await addToken(); + // await addToken(); await getKazanPercent(); await getPassengerRate(); await getRideStatusFromStartApp(); diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart index 2e5ad55..5475688 100644 --- a/lib/controller/home/splash_screen_controlle.dart +++ b/lib/controller/home/splash_screen_controlle.dart @@ -50,7 +50,7 @@ class SplashScreenController extends GetxController ? Get.off(() => OnBoardingPage()) : box.read(BoxName.email) != null && box.read(BoxName.phone) != null && - box.read(BoxName.isVerified) != 'true' + box.read(BoxName.isVerified) == 'true' // ? Get.off(() => const MapPagePassenger()) ? await Get.put(LoginController()).loginFromSignInGoogle( box.read(BoxName.passengerID).toString(), diff --git a/lib/views/auth/login_page.dart b/lib/views/auth/login_page.dart index 469fe24..0dee108 100644 --- a/lib/views/auth/login_page.dart +++ b/lib/views/auth/login_page.dart @@ -219,6 +219,15 @@ class LoginPage extends StatelessWidget { }, kolor: AppColor.blueColor, ), + // MyElevatedButton( + // title: 'Sign In by Google'.tr, + // onPressed: () async { + // print(box.read(BoxName.email)); + // print(box.read(BoxName.phone)); + // print(box.read(BoxName.isVerified)); + // }, + // kolor: AppColor.blueColor, + // ), ], ), )), @@ -350,36 +359,38 @@ class LoginPage extends StatelessWidget { } locationPermissionDialog() { - return Padding( - padding: const EdgeInsets.all(16), - child: Container( - height: Get.height * .4, - decoration: AppStyle.boxDecoration1, - child: Padding( - padding: const EdgeInsets.all(20.0), - child: Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Text( - 'We use location to get accurate and nearest driver for you' - .tr, - textAlign: TextAlign.center, - style: AppStyle.title, - ), - MyElevatedButton( - title: 'Grant Location'.tr, - onPressed: () async { - await controller.getLocationPermission(); - }, - kolor: AppColor.greenColor, - ) - ], + return GetBuilder(builder: (controller) { + return Padding( + padding: const EdgeInsets.all(16), + child: Container( + height: Get.height * .4, + decoration: AppStyle.boxDecoration1, + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Text( + 'We use location to get accurate and nearest driver for you' + .tr, + textAlign: TextAlign.center, + style: AppStyle.title, + ), + MyElevatedButton( + title: 'Grant Location'.tr, + onPressed: () async { + await controller.getLocationPermission(); + }, + kolor: AppColor.greenColor, + ) + ], + ), ), ), ), - ), - ); + ); + }); } } diff --git a/lib/views/auth/sms_verfy_page.dart b/lib/views/auth/sms_verfy_page.dart index 3678db2..9ab9661 100644 --- a/lib/views/auth/sms_verfy_page.dart +++ b/lib/views/auth/sms_verfy_page.dart @@ -16,8 +16,8 @@ class SmsSignupEgypt extends StatelessWidget { title: 'Phone Check'.tr, body: [ GetBuilder(builder: (registerController) { - return Column( - mainAxisAlignment: MainAxisAlignment.center, + return ListView( + // mainAxisAlignment: MainAxisAlignment.center, children: [ // Logo at the top Padding( diff --git a/lib/views/home/map_widget.dart/apply_order_widget.dart b/lib/views/home/map_widget.dart/apply_order_widget.dart index 78ea68e..0910c20 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -1,4 +1,5 @@ import 'package:SEFER/constant/colors.dart'; +import 'package:SEFER/constant/links.dart'; import 'package:SEFER/constant/style.dart'; import 'package:SEFER/controller/firebase/firbase_messge.dart'; import 'package:SEFER/controller/home/map_passenger_controller.dart'; @@ -143,7 +144,7 @@ class ApplyOrderWidget extends StatelessWidget { backgroundImage: NetworkImage( // '', // ), - 'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'), + '${AppLink.server}/portrate_captain_image/${controller.driverId}.jpg'), ), Column( children: [ diff --git a/lib/views/home/map_widget.dart/car_details_widget_to_go.dart b/lib/views/home/map_widget.dart/car_details_widget_to_go.dart index becd5e6..f8319bd 100644 --- a/lib/views/home/map_widget.dart/car_details_widget_to_go.dart +++ b/lib/views/home/map_widget.dart/car_details_widget_to_go.dart @@ -202,7 +202,7 @@ class CarDetailsTypeToChoose extends StatelessWidget { ) : carType.carType == 'Lady' && (mapPassengerController - .totalPassengerLady > + .totalPassengerSpeed > 20) ? Row( children: [ @@ -396,8 +396,7 @@ class CarDetailsTypeToChoose extends StatelessWidget { 2) { box.write(BoxName.carType, 'Lady'); mapPassengerController.totalPassenger = - mapPassengerController - .totalPassengerSpeed; + mapPassengerController.totalPassengerLady; Get.defaultDialog( title: 'Lady', titleStyle: AppStyle.title, @@ -521,7 +520,7 @@ class HeaderDestination extends StatelessWidget { right: 5, child: Container( decoration: AppStyle.boxDecoration1, - height: Get.height * .16, + height: Get.height * .2, width: Get.width * .8, child: InkWell( onTap: () { @@ -531,30 +530,38 @@ class HeaderDestination extends StatelessWidget { mapPassengerController.cancelRide(); }); }, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Text( - '🤢 ${mapPassengerController.startNameAddress}', - style: AppStyle.subtitle, + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: SizedBox( + height: Get.height * .12, + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + // + children: [ + Text( + '🟢 ${mapPassengerController.startNameAddress}', + style: AppStyle.subtitle, + ), + Text( + '🔴 ${mapPassengerController.endNameAddress}', + style: AppStyle.subtitle, + ), + ], + ), ), - Text( - '😡 ${mapPassengerController.endNameAddress}', - style: AppStyle.subtitle, - ), - Row( - children: [ - Text( - '📍 ${mapPassengerController.distance} ${'KM'.tr} ⌛ ${mapPassengerController.hours > 0 ? '${'Your Ride Duration is '.tr}${mapPassengerController.hours} ${'H and'.tr} ${mapPassengerController.minutes} ${'m'.tr}' : '${'Your Ride Duration is '.tr} ${mapPassengerController.minutes} m'}', - style: AppStyle.subtitle, - ), - ], - ), - ], - ), + ), + Row( + children: [ + Text( + '📍 ${mapPassengerController.distance} ${'KM'.tr} ⌛ ${mapPassengerController.hours > 0 ? '${'Your Ride Duration is '.tr}${mapPassengerController.hours} ${'H and'.tr} ${mapPassengerController.minutes} ${'m'.tr}' : '${'Your Ride Duration is '.tr} ${mapPassengerController.minutes} m'}', + style: AppStyle.subtitle, + ), + ], + ), + ], ), ), ), diff --git a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart index 455c0b3..f8aba19 100644 --- a/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart +++ b/lib/views/home/map_widget.dart/main_bottom_Menu_map.dart @@ -334,41 +334,30 @@ class MainBottomMenuMap extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox( - height: 30, + height: 25, child: Text('${'Where to'.tr} ${box.read(BoxName.name)}')), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - controller.noCarString == false - ? Text('Nearest Car for you about '.tr) - : Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: AppColor.redColor, - ), - child: null - // Padding( - // padding: const EdgeInsets.all(6), - // child: Text( - // 'No Car in your site. Sorry!'.tr, - // style: AppStyle.title - // .copyWith(color: AppColor.secondaryColor), - // ), - // ), - ), - controller.noCarString == false - ? Container( - decoration: BoxDecoration( - border: - Border.all(color: AppColor.redColor, width: 3)), - child: Padding( - padding: const EdgeInsets.all(4), - child: Text((controller.nearestCar != null - ? controller.nearestDistance.toStringAsFixed(0) - : 'N/A')), - ), - ) - : const SizedBox(), + if (controller.noCarString) + Text('Nearest Car for you about '.tr) + else + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: AppColor.redColor, + ), + child: null, + ), + if (!controller.noCarString) + Padding( + padding: const EdgeInsets.all(4), + child: Text( + (controller.nearestCar != null + ? controller.nearestDistance.toStringAsFixed(0) + : ''), + ), + ), ], ) ],