diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png index fd9bd39..116410e 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png index 5e604ac..130b014 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png index e129f04..356c275 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png index 339756c..a7b25db 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png index fec760e..7f3f61a 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/assets/images/logo.png b/assets/images/logo.png index 3e0026b..59e4915 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 7c46123..17fe3d2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 8a158b1..e7c001f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index a3c6d38..730a8a9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6c411d5..11c44b9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index a7cbbbc..f33138b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 895df18..5656ec1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 9c32eff..ae7b9f0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index a3c6d38..730a8a9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 4a9dc83..8c657b4 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index dc0244c..80cfebf 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index 9e8ee71..0b6fec4 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index 323679f..81685ed 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index c7f0be7..3ca3112 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index cbf74c6..3ff1d23 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index dc0244c..80cfebf 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index f2ba0db..2662616 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index fd9bd39..116410e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 339756c..a7b25db 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 4fbdd93..0df2668 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index e778f7c..c7eaad0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 43fd07c..eb4b053 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/controller/functions/audio_recorder_controller.dart b/lib/controller/functions/audio_recorder_controller.dart index b0dd2c8..ed0362d 100644 --- a/lib/controller/functions/audio_recorder_controller.dart +++ b/lib/controller/functions/audio_recorder_controller.dart @@ -1,13 +1,16 @@ import 'dart:io'; -import 'package:SEFER/controller/home/map_passenger_controller.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_sound/flutter_sound.dart'; import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; +import '../home/map_passenger_controller.dart'; + class AudioController extends GetxController { final recorder = FlutterSoundRecorder(); - bool isRecoding = false; + bool isRecording = false; + @override void onInit() { super.onInit(); @@ -17,7 +20,13 @@ class AudioController extends GetxController { Future initRecorder() async { final status = await Permission.microphone.request(); if (status != PermissionStatus.granted) { - // Handle permission denied + if (status.isPermanentlyDenied) { + // Handle permission permanently denied + showPermissionDeniedDialog(); + } else { + // Handle permission denied + showPermissionDeniedSnackbar(); + } return; } await recorder.openRecorder(); @@ -25,10 +34,10 @@ class AudioController extends GetxController { } Future startRecording() async { - await recorder.startRecorder( - toFile: - 'audio_${Get.find().rideId}.wav'); // Specify the file name - isRecoding = true; + final controller = Get.find(); + final filePath = 'audio_${controller.rideId}.wav'; // Specify the file name + await recorder.startRecorder(toFile: filePath); + isRecording = true; update(); } @@ -37,13 +46,56 @@ class AudioController extends GetxController { final audioFile = File(filePath!); print('Recorded file path: $audioFile'); // Now you can send this file to the server - isRecoding = false; + isRecording = false; update(); } @override void onClose() { - recorder.closeRecorder(); + recorder.stopRecorder(); super.onClose(); } + + void showPermissionDeniedDialog() { + showDialog( + context: Get.context!, + builder: (context) => AlertDialog( + title: Text('Microphone Permission'), + content: Text('Microphone permission is required to record audio.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(context).pop(); + openAppSettings(); + }, + child: Text('Open Settings'), + ), + TextButton( + onPressed: () { + Navigator.of(context).pop(); + }, + child: Text('Cancel'), + ), + ], + ), + ); + } + + void showPermissionDeniedSnackbar() { + Get.snackbar( + 'Microphone Permission', + 'Microphone permission is required to record audio.', + snackPosition: SnackPosition.BOTTOM, + duration: Duration(seconds: 5), + mainButton: TextButton( + onPressed: () { + openAppSettings(); + }, + child: Text( + 'Open Settings', + style: TextStyle(color: Colors.white), + ), + ), + ); + } } diff --git a/lib/controller/home/captin/home_captain_controller.dart b/lib/controller/home/captin/home_captain_controller.dart index f7548a9..68b1daa 100644 --- a/lib/controller/home/captin/home_captain_controller.dart +++ b/lib/controller/home/captin/home_captain_controller.dart @@ -28,7 +28,7 @@ class HomeCaptainController extends GetxController { late double kazan; double latePrice = 0; double heavyPrice = 0; - double comfortPrice = 0, speedPrice = 0, deliveryPrice = 0, freePrice = 0; + double comfortPrice = 0, speedPrice = 0, deliveryPrice = 0, mashwariPrice = 0; double naturePrice = 0; bool isCallOn = false; String totalMoneyToday = '0'; @@ -255,7 +255,7 @@ class HomeCaptainController extends GetxController { speedPrice = double.parse(jsonDecode(res)['message'][0]['speedPrice']); deliveryPrice = double.parse(jsonDecode(res)['message'][0]['deliveryPrice']); - freePrice = double.parse(jsonDecode(res)['message'][0]['freePrice']); + mashwariPrice = double.parse(jsonDecode(res)['message'][0]['freePrice']); } } diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart index be81714..380eb6c 100644 --- a/lib/controller/home/captin/map_driver_controller.dart +++ b/lib/controller/home/captin/map_driver_controller.dart @@ -298,30 +298,12 @@ class MapDriverController extends GetxController { 'rideTimeStart': DateTime.now().toString(), 'status': 'Begin', }); - await CRUD().post(link: AppLink.addDriverpayment, payload: { - 'rideId': rideId, - 'amount': paymentAmount, - 'payment_method': paymentMethod, - 'passengerID': passengerId, - 'driverID': box.read(BoxName.driverID).toString(), - }); FirebaseMessagesController().sendNotificationToAnyWithoutData( 'RideIsBegin', box.read(BoxName.name).toString(), tokenPassenger); rideIsBeginPassengerTimer(); - double pointsSubstraction = 0; - pointsSubstraction = double.parse(paymentAmount) * - (-1) * - double.parse(kazan) / - 100; // for eygpt /100 - var res = - await CRUD().post(link: AppLink.addDriversWalletPoints, payload: { - 'paymentID': 'rideId$rideId', - 'amount': (pointsSubstraction).toString(), - 'paymentMethod': paymentMethod, - 'driverID': box.read(BoxName.driverID).toString(), - }); - var d = jsonDecode(res); + + // var d = jsonDecode(res); update(); // Start updating location and moving camera @@ -443,7 +425,7 @@ class MapDriverController extends GetxController { isRideFinished = true; isRideStarted = false; isPriceWindow = false; - totalCost = carType == 'Comfort' || carType == 'Free Ride' + totalCost = carType == 'Comfort' || carType == 'Mashwari' ? price.toStringAsFixed(1) : totalPassenger; paymentAmount = totalCost; @@ -461,6 +443,13 @@ class MapDriverController extends GetxController { 'balance': ((-1) * double.parse(paymentAmount)).toString() }); } + await CRUD().post(link: AppLink.addDriverpayment, payload: { + 'rideId': rideId, + 'amount': paymentAmount, + 'payment_method': paymentMethod, + 'passengerID': passengerId, + 'driverID': box.read(BoxName.driverID).toString(), + }); print('passengerWalletBurc bef ${double.parse(passengerWalletBurc)}'); if (double.parse(passengerWalletBurc) < 0) { await CRUD().post(link: AppLink.addPassengersWallet, payload: { @@ -469,11 +458,22 @@ class MapDriverController extends GetxController { }); print('passengerWalletBurc aft ${double.parse(passengerWalletBurc)}'); } + double pointsSubstraction = 0; + pointsSubstraction = double.parse(paymentAmount) * + (-1) * + double.parse(kazan) / + 100; // for eygpt /100 + var res = await CRUD().post(link: AppLink.addDriversWalletPoints, payload: { + 'paymentID': 'rideId$rideId', + 'amount': (pointsSubstraction).toString(), + 'paymentMethod': paymentMethod, + 'driverID': box.read(BoxName.driverID).toString(), + }); Future.delayed(const Duration(milliseconds: 300)); FirebaseMessagesController().sendNotificationToPassengerToken( 'Driver Finish Trip', 'you will pay to Driver'.tr + - ' ${carType == 'Comfort' || carType == 'Free Ride' ? price.toStringAsFixed(1) : totalPassenger} \$' + ' ${carType == 'Comfort' || carType == 'Mashwari' ? price.toStringAsFixed(2) : totalPassenger} \$' .tr, tokenPassenger, [ @@ -597,7 +597,7 @@ class MapDriverController extends GetxController { : (i ~/ 60) + (recentDistanceToDash * Get.find() - .freePrice); // $1 for each minute + $4 for each km + .mashwariPrice); // $1 for each minute + $4 for each km price = (price * .10) + price; // Add 10% tax speed = Get.find().speed * 3.6; progressTimerRideBegin = i / durationOfRide; diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart index 9b5f4d4..8c3e78f 100644 --- a/lib/controller/home/map_passenger_controller.dart +++ b/lib/controller/home/map_passenger_controller.dart @@ -700,12 +700,16 @@ class MapPassengerController extends GetxController { //print(res); } var decode = jsonDecode(res); - - if (decode['data']['status'] == 'Begin') { - //todo from sql or get storage - List pol = box.read(BoxName.tripData); + print(decode['data']); + if (decode['data'] == 'Begin') { + statusRide = 'Begin'; + update(); + // todo from sql or get storage + // List pol = box.read(BoxName.tripData); + // print(pol); Map tripData = box.read(BoxName.tripData) as Map; + print(tripData); final points = decodePolyline( tripData["routes"][0]["overview_polyline"]["points"]); @@ -729,8 +733,9 @@ class MapPassengerController extends GetxController { rideTimerBegin = true; isDriverInPassengerWay = false; isDriverArrivePassenger = false; - update(); + // update(); // isCancelRidePageShown = true; + durationToAdd = tripData['routes'][0]['legs'][0]['duration']['value']; rideIsBeginPassengerTimer(); runWhenRideIsBegin(); update(); @@ -1144,32 +1149,33 @@ class MapPassengerController extends GetxController { late double headingList; Future getCarsLocationByPassengerAndReloadMarker() async { - // if (rideConfirm == false) { - carsLocationByPassenger = []; - LatLngBounds bounds = calculateBounds( - passengerLocation.latitude, passengerLocation.longitude, 7000); + if (statusRide == 'wait') { + carsLocationByPassenger = []; + LatLngBounds bounds = calculateBounds( + passengerLocation.latitude, passengerLocation.longitude, 7000); - var res = - await CRUD().get(link: AppLink.getCarsLocationByPassenger, payload: { - 'southwestLat': bounds.southwest.latitude.toString(), - 'southwestLon': bounds.southwest.longitude.toString(), - 'northeastLat': bounds.northeast.latitude.toString(), - 'northeastLon': bounds.northeast.longitude.toString(), - }); - if (res == 'failure') { - noCarString = true; - dataCarsLocationByPassenger = res; - update(); - } else { - noCarString = false; - dataCarsLocationByPassenger = jsonDecode(res); - //print(dataCarsLocationByPassenger); - // if (dataCarsLocationByPassenger.length > carsOrder) { - driverId = dataCarsLocationByPassenger['message'][carsOrder]['driver_id'] - .toString(); - gender = dataCarsLocationByPassenger['message'][carsOrder]['gender'] - .toString(); - // } + var res = + await CRUD().get(link: AppLink.getCarsLocationByPassenger, payload: { + 'southwestLat': bounds.southwest.latitude.toString(), + 'southwestLon': bounds.southwest.longitude.toString(), + 'northeastLat': bounds.northeast.latitude.toString(), + 'northeastLon': bounds.northeast.longitude.toString(), + }); + if (res == 'failure') { + noCarString = true; + dataCarsLocationByPassenger = res; + update(); + } else { + noCarString = false; + dataCarsLocationByPassenger = jsonDecode(res); + //print(dataCarsLocationByPassenger); + // if (dataCarsLocationByPassenger.length > carsOrder) { + driverId = dataCarsLocationByPassenger['message'][carsOrder] + ['driver_id'] + .toString(); + gender = dataCarsLocationByPassenger['message'][carsOrder]['gender'] + .toString(); + } // //print('driverId==============$driverId'); @@ -1964,6 +1970,7 @@ class MapPassengerController extends GetxController { var response = await CRUD().getGoogleApi(link: url, payload: {}); data = response['routes'][0]['legs']; // //print(data); + box.remove(BoxName.tripData); box.write(BoxName.tripData, response); startNameAddress = data[0]['start_address']; endNameAddress = data[0]['end_address']; diff --git a/lib/views/home/Captin/home_captain/drawer_captain.dart b/lib/views/home/Captin/home_captain/drawer_captain.dart index fc15432..9c903e4 100644 --- a/lib/views/home/Captin/home_captain/drawer_captain.dart +++ b/lib/views/home/Captin/home_captain/drawer_captain.dart @@ -31,7 +31,7 @@ class DrawerCaptain extends StatelessWidget { } return Drawer( - child: Column( + child: ListView( children: [ // Other drawer items UserAccountsDrawerHeader( 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 7bd4f4a..0f7ce8f 100644 --- a/lib/views/home/map_widget.dart/apply_order_widget.dart +++ b/lib/views/home/map_widget.dart/apply_order_widget.dart @@ -154,7 +154,7 @@ class ApplyOrderWidget extends StatelessWidget { ), ), controller.isDriverArrivePassenger - ? DriverArrivePassengerAndWaitMinute() + ? const DriverArrivePassengerAndWaitMinute() : const TimeDriverToPassenger() ], ), 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 8cb6e71..78abe22 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 @@ -290,10 +290,10 @@ class CarDetailsTypeToChoose extends StatelessWidget { } else if (mapPassengerController .selectedIndex == 3) { - box.write(BoxName.carType, 'FreeRide'); + box.write(BoxName.carType, 'Mashwari'); mapPassengerController.totalPassenger = 50; Get.defaultDialog( - title: 'FreeRide', + title: 'Mashwari', titleStyle: AppStyle.title, content: CarDialogue( textToSpeechController: diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index 930dee2..946962e 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -21,7 +21,7 @@ class RideBeginPassenger extends StatelessWidget { ProfileController profileController = Get.put(ProfileController()); AudioController audioController = Get.put(AudioController()); return GetBuilder(builder: (controller) { - if (controller.rideTimerBegin) { + if (controller.rideTimerBegin || controller.statusRide == 'Begin') { return Positioned( left: 10, right: 10, @@ -73,7 +73,7 @@ class RideBeginPassenger extends StatelessWidget { ), tooltip: ' Add Note', // Optional tooltip for clarity ), - audioController.isRecoding + audioController.isRecoding == false ? IconButton( onPressed: () { audioController.startRecording(); diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 7c46123..17fe3d2 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index f3071c6..4f5a411 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index e2add38..5e69572 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index 38858e5..70f5b43 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 16e881b..1627ad4 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 2743bb8..1b827c4 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 913776c..8efecee 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/web/favicon.png b/web/favicon.png index e2add38..5e69572 100644 Binary files a/web/favicon.png and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index fec760e..7f3f61a 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 2743bb8..1b827c4 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png index fec760e..7f3f61a 100644 Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png index 2743bb8..1b827c4 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index 4cca494..274a259 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ