Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7/12/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-07-12 22:52:54 +03:00
parent 67b5a20058
commit 8661bd7f3f
4 changed files with 209 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/controller/home/map_passenger_controller.dart
View File

@@ -1367,7 +1367,7 @@ class MapPassengerController extends GetxController {
rotation: double.parse(json['heading']), rotation: double.parse(json['heading']),
icon: json['model'].toString().contains('دراجة') icon: json['model'].toString().contains('دراجة')
? motoIcon ? motoIcon
: json['gender'] == 'Male' : json['gender'] == 'Male'.tr
? carIcon ? carIcon
: ladyIcon, : ladyIcon,
), ),
@@ -1385,7 +1385,7 @@ class MapPassengerController extends GetxController {
rotation: double.parse(json['heading']), rotation: double.parse(json['heading']),
icon: json['model'].contains('دراجة') icon: json['model'].contains('دراجة')
? motoIcon ? motoIcon
: json['gender'] == 'Male' : json['gender'] == 'Male'.tr
? carIcon ? carIcon
: ladyIcon, : ladyIcon,
); );
@@ -1588,7 +1588,7 @@ class MapPassengerController extends GetxController {
? motoIcon ? motoIcon
: datadriverCarsLocationToPassengerAfterApplied['message'][0] : datadriverCarsLocationToPassengerAfterApplied['message'][0]
['gender'] == ['gender'] ==
'Male' 'Male'.tr
? carIcon ? carIcon
: ladyIcon, // Default to carIcon if gender is not Male or Female : ladyIcon, // Default to carIcon if gender is not Male or Female
); );

1
lib/controller/local/translations.dart
View File

@@ -267,6 +267,7 @@ iOS [https://getapp.cc/app/6458734951]
"By selecting 'I Agree' below, I have reviewed and agree to the Terms of Use and acknowledge the Privacy Notice. I am at least 18 years of age.": "By selecting 'I Agree' below, I have reviewed and agree to the Terms of Use and acknowledge the Privacy Notice. I am at least 18 years of age.":
"من خلال اختيار 'أوافق' أدناه، قمت بمراجعة وقبول شروط الاستخدام وأقر بإشعار الخصوصية. أنا على الأقل 18 عامًا.", "من خلال اختيار 'أوافق' أدناه، قمت بمراجعة وقبول شروط الاستخدام وأقر بإشعار الخصوصية. أنا على الأقل 18 عامًا.",
"I Agree": "أوافق", "I Agree": "أوافق",
"Finish Monitor": " إنهاء مراقبة الرحلة ",
"First name": "الاسم الأول", "First name": "الاسم الأول",
"Enter your first name": "أدخل اسمك الأول", "Enter your first name": "أدخل اسمك الأول",
"Please enter your first name.": "يرجى إدخال اسمك الأول.", "Please enter your first name.": "يرجى إدخال اسمك الأول.",

287
lib/views/home/map_widget.dart/google_map_passenger_widget.dart
View File

@@ -1,3 +1,4 @@
import 'package:SEFER/views/widgets/my_dialog.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
@@ -29,108 +30,194 @@ class GoogleMapPassengerWidget extends StatelessWidget {
cameraTargetBounds: CameraTargetBounds(controller.boundsdata), cameraTargetBounds: CameraTargetBounds(controller.boundsdata),
minMaxZoomPreference: const MinMaxZoomPreference(6, 18), minMaxZoomPreference: const MinMaxZoomPreference(6, 18),
onLongPress: (argument) { onLongPress: (argument) {
Get.defaultDialog( MyDialog().getDialog('Are you want to go to this site'.tr, '',
title: 'Are you want to go to this site'.tr, () async {
content: Column( controller.clearPolyline();
children: [ if (controller.dataCarsLocationByPassenger != null) {
Text('${argument.latitude},${argument.longitude}'), await controller.getMap(
], '${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
), '${argument.latitude.toString()},${argument.longitude.toString()}');
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: () async {
controller.clearPolyline();
if (controller.dataCarsLocationByPassenger != null) {
await controller.getMap(
'${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
'${argument.latitude.toString()},${argument.longitude.toString()}');
Get.back(); Get.back();
controller.bottomSheet(); controller.bottomSheet();
controller.showBottomSheet1(); controller.showBottomSheet1();
} else { } else {
Get.back(); Get.back();
Get.snackbar( Get.snackbar(
'We Are Sorry That we dont have cars in your Location!' 'We Are Sorry That we dont have cars in your Location!'
.tr, .tr,
'', '',
colorText: AppColor.redColor, colorText: AppColor.redColor,
duration: const Duration(seconds: 11), duration: const Duration(seconds: 11),
instantInit: true, instantInit: true,
snackPosition: SnackPosition.TOP, snackPosition: SnackPosition.TOP,
titleText: Text( titleText: Text(
'Error'.tr, 'Error'.tr,
style: style: const TextStyle(color: AppColor.redColor),
const TextStyle(color: AppColor.redColor), ),
), messageText: Text(
messageText: Text( 'We Are Sorry That we dont have cars in your Location!'
'We Are Sorry That we dont have cars in your Location!' .tr,
.tr, style: AppStyle.title,
style: AppStyle.title, ),
), icon: const Icon(Icons.error),
icon: const Icon(Icons.error), shouldIconPulse: true,
shouldIconPulse: true, maxWidth: double.infinity,
maxWidth: double.infinity, margin: const EdgeInsets.all(16),
margin: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
padding: const EdgeInsets.all(16), borderRadius: 8,
borderRadius: 8, borderColor: AppColor.redColor,
borderColor: AppColor.redColor, borderWidth: 2,
borderWidth: 2, backgroundColor: AppColor.secondaryColor,
backgroundColor: AppColor.secondaryColor, leftBarIndicatorColor: AppColor.redColor,
leftBarIndicatorColor: AppColor.redColor, boxShadows: [
boxShadows: [ BoxShadow(
BoxShadow( color: Colors.black.withOpacity(0.25),
color: Colors.black.withOpacity(0.25), blurRadius: 4,
blurRadius: 4, spreadRadius: 2,
spreadRadius: 2, offset: const Offset(0, 4),
offset: const Offset(0, 4), ),
), ],
], backgroundGradient: const LinearGradient(
backgroundGradient: const LinearGradient( colors: [AppColor.redColor, AppColor.accentColor],
colors: [ begin: Alignment.topLeft,
AppColor.redColor, end: Alignment.bottomRight,
AppColor.accentColor ),
], // mainButton: TextButton(
begin: Alignment.topLeft, // onPressed: () {
end: Alignment.bottomRight, // controller.getCarsLocationByPassenger();
), // },
// mainButton: TextButton( // child: Text(
// onPressed: () { // 'Try Again'.tr,
// controller.getCarsLocationByPassenger(); // style: const TextStyle(
// }, // color: AppColor.secondaryColor),
// child: Text( // ),
// 'Try Again'.tr, // ),
// style: const TextStyle( onTap: (GetSnackBar snackBar) {
// color: AppColor.secondaryColor), // Do something when the snackbar is tapped.
// ), },
// ), isDismissible: true,
onTap: (GetSnackBar snackBar) { showProgressIndicator: false,
// Do something when the snackbar is tapped. dismissDirection: DismissDirection.up,
}, progressIndicatorController: null,
isDismissible: true, progressIndicatorBackgroundColor: Colors.transparent,
showProgressIndicator: false, progressIndicatorValueColor: null,
dismissDirection: DismissDirection.up, snackStyle: SnackStyle.GROUNDED,
progressIndicatorController: null, forwardAnimationCurve: Curves.easeInToLinear,
progressIndicatorBackgroundColor: reverseAnimationCurve: Curves.easeInOut,
Colors.transparent, animationDuration: const Duration(milliseconds: 4000),
progressIndicatorValueColor: null, barBlur: 8,
snackStyle: SnackStyle.GROUNDED, overlayBlur: 0,
forwardAnimationCurve: Curves.easeInToLinear, snackbarStatus: null,
reverseAnimationCurve: Curves.easeInOut, overlayColor: AppColor.primaryColor.withOpacity(0.5),
animationDuration: userInputForm: null,
const Duration(milliseconds: 4000), );
barBlur: 8, }
overlayBlur: 0,
snackbarStatus: null,
overlayColor:
AppColor.primaryColor.withOpacity(0.5),
userInputForm: null,
);
}
// //
}), });
); // Get.defaultDialog(
// title: 'Are you want to go to this site'.tr,
// content: Column(
// children: [
// Text('${argument.latitude},${argument.longitude}'),
// ],
// ),
// confirm: MyElevatedButton(
// title: 'Ok'.tr,
// onPressed: () async {
// controller.clearPolyline();
// if (controller.dataCarsLocationByPassenger != null) {
// await controller.getMap(
// '${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
// '${argument.latitude.toString()},${argument.longitude.toString()}');
// Get.back();
// controller.bottomSheet();
// controller.showBottomSheet1();
// } else {
// Get.back();
// Get.snackbar(
// 'We Are Sorry That we dont have cars in your Location!'
// .tr,
// '',
// colorText: AppColor.redColor,
// duration: const Duration(seconds: 11),
// instantInit: true,
// snackPosition: SnackPosition.TOP,
// titleText: Text(
// 'Error'.tr,
// style:
// const TextStyle(color: AppColor.redColor),
// ),
// messageText: Text(
// 'We Are Sorry That we dont have cars in your Location!'
// .tr,
// style: AppStyle.title,
// ),
// icon: const Icon(Icons.error),
// shouldIconPulse: true,
// maxWidth: double.infinity,
// margin: const EdgeInsets.all(16),
// padding: const EdgeInsets.all(16),
// borderRadius: 8,
// borderColor: AppColor.redColor,
// borderWidth: 2,
// backgroundColor: AppColor.secondaryColor,
// leftBarIndicatorColor: AppColor.redColor,
// boxShadows: [
// BoxShadow(
// color: Colors.black.withOpacity(0.25),
// blurRadius: 4,
// spreadRadius: 2,
// offset: const Offset(0, 4),
// ),
// ],
// backgroundGradient: const LinearGradient(
// colors: [
// AppColor.redColor,
// AppColor.accentColor
// ],
// begin: Alignment.topLeft,
// end: Alignment.bottomRight,
// ),
// // mainButton: TextButton(
// // onPressed: () {
// // controller.getCarsLocationByPassenger();
// // },
// // child: Text(
// // 'Try Again'.tr,
// // style: const TextStyle(
// // color: AppColor.secondaryColor),
// // ),
// // ),
// onTap: (GetSnackBar snackBar) {
// // Do something when the snackbar is tapped.
// },
// isDismissible: true,
// showProgressIndicator: false,
// dismissDirection: DismissDirection.up,
// progressIndicatorController: null,
// progressIndicatorBackgroundColor:
// Colors.transparent,
// progressIndicatorValueColor: null,
// snackStyle: SnackStyle.GROUNDED,
// forwardAnimationCurve: Curves.easeInToLinear,
// reverseAnimationCurve: Curves.easeInOut,
// animationDuration:
// const Duration(milliseconds: 4000),
// barBlur: 8,
// overlayBlur: 0,
// snackbarStatus: null,
// overlayColor:
// AppColor.primaryColor.withOpacity(0.5),
// userInputForm: null,
// );
// }
// //
// }),
// );
}, },
onTap: (argument) { onTap: (argument) {

36
lib/views/home/map_widget.dart/left_main_menu_icons.dart
View File

@@ -85,24 +85,24 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
const SizedBox( const SizedBox(
width: 5, width: 5,
), ),
AnimatedContainer( // AnimatedContainer(
duration: const Duration(microseconds: 200), // duration: const Duration(microseconds: 200),
width: controller.widthMapTypeAndTraffic, // width: controller.widthMapTypeAndTraffic,
decoration: BoxDecoration( // decoration: BoxDecoration(
color: AppColor.secondaryColor, // color: AppColor.secondaryColor,
border: Border.all(), // border: Border.all(),
borderRadius: BorderRadius.circular(15)), // borderRadius: BorderRadius.circular(15)),
child: IconButton( // child: IconButton(
onPressed: () async { // onPressed: () async {
box.remove(BoxName.isVerified); // box.remove(BoxName.isVerified);
Get.to(() => SmsSignupEgypt()); // Get.to(() => SmsSignupEgypt());
}, // },
icon: const Icon( // icon: const Icon(
Icons.voice_chat, // Icons.voice_chat,
size: 29, // size: 29,
), // ),
), // ),
), // ),
// AnimatedContainer( // AnimatedContainer(
// duration: const Duration(microseconds: 200), // duration: const Duration(microseconds: 200),
// width: controller.widthMapTypeAndTraffic, // width: controller.widthMapTypeAndTraffic,