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

2/9/3

Browse Source
This commit is contained in:
Hamza-Ayed
2024-02-10 00:27:19 +03:00
parent 835be01923
commit 8c99fc94e2
15 changed files with 158 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/views/Rate/rate_captain.dart
View File

@@ -8,8 +8,8 @@ import '../../controller/rate/rate_conroller.dart';
import '../widgets/elevated_btn.dart';
import '../widgets/my_scafold.dart';
class RateCaptainFromPassenger extends StatelessWidget {
RateCaptainFromPassenger({super.key});
class RateDriverFromPassenger extends StatelessWidget {
RateDriverFromPassenger({super.key});
final RateController controller = Get.put(RateController());
@override
Widget build(BuildContext context) {

4
lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
View File

@@ -37,7 +37,9 @@ GetBuilder<MapDriverController> driverEndRideBar() {
children: [
const Icon(Icons.timelapse),
Text(
'${mapDriverController.duration} ${'Minute'.tr}',
mapDriverController.hours > 1
? '${'Your Ride Duration is '.tr}${mapDriverController.hours} H and ${mapDriverController.minutes} m'
: '${'Your Ride Duration is '.tr} ${mapDriverController.minutes} m',
style: AppStyle.title),
],
),

29
lib/views/home/map_widget.dart/points_page_for_rider.dart
View File

@@ -108,22 +108,19 @@ class PointsPageForRider extends StatelessWidget {
border: Border.all(),
color:
AppColor.accentColor.withOpacity(.5)),
child: GetBuilder<MapPassengerController>(
builder: (mapPassengerController) {
return Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(mapPassengerController
.currentLocationStringAll[index]
.toString()),
const Icon(
Icons.reorder,
size: 20,
),
],
);
}),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(mapPassengerController
.currentLocationStringAll[index]
.toString()),
const Icon(
Icons.reorder,
size: 20,
),
],
),
),
),
trailing: index > 0

5
lib/views/home/my_wallet/passenger_wallet_dialoge.dart
View File

@@ -143,8 +143,9 @@ class PassengerWalletDialoge extends StatelessWidget {
onPressed: () {
if (controller.selectedAmount != 0) {
controller.makePaymentStripe(
controller.selectedAmount as double, 'USD',
() {
controller.selectedAmount!
.toDouble(), // Convert int to double
'USD', () {
controller.addPassengerWallet();
controller.changePromoSheetDialogue();
controller.getPassengerWallet();

2
lib/views/home/my_wallet/walet_captain.dart
View File

@@ -63,7 +63,7 @@ class WaletCaptain extends StatelessWidget {
const SizedBox(
height: 10,
),
CardSeferWalletDriver(),
const CardSeferWalletDriver(),
Card(
elevation: 4,
child: Padding(

56
lib/views/home/profile/passenger_profile_page.dart
View File

@@ -203,44 +203,36 @@ class PassengerProfilePage extends StatelessWidget {
left: 70,
bottom: 10,
right: 70,
child: MyElevatedButton(
title: 'Delete My Account'.tr,
onPressed: () {
Get.defaultDialog(
title: 'Are you sure to delete your account?'.tr,
content: GetBuilder<LogOutController>(
builder: (logOutController) {
return Form(
child: GetBuilder<LogOutController>(builder: (logOutController) {
return MyElevatedButton(
title: 'Delete My Account'.tr,
onPressed: () {
Get.defaultDialog(
title: 'Are you sure to delete your account?'.tr,
content: Form(
key: logOutController.formKey1,
child: MyTextForm(
controller: logOutController.emailTextController,
label: 'Type your Email'.tr,
hint: 'Type your Email'.tr,
type: TextInputType.emailAddress,
),
);
}),
confirm: MyElevatedButton(
title: 'Delete My Account'.tr,
onPressed: () async {
if (logOutController.formKey.currentState!
.validate()) {
LogOutController().deleteMyAccount(
box.read(BoxName.passengerID).toString());
await CRUD().post(
link: AppLink.passengerRemovedAccountEmail,
payload: {
'email': box.read(BoxName.email).text,
});
}
}),
cancel: MyElevatedButton(
title: 'No I want'.tr,
onPressed: () {
logOutController.emailTextController.clear();
logOutController.update();
Get.back();
}));
}),
),
confirm: MyElevatedButton(
title: 'Delete My Account'.tr,
kolor: AppColor.redColor,
onPressed: () async {
await logOutController.deletePassengerAccount();
}),
cancel: MyElevatedButton(
title: 'No I want'.tr,
onPressed: () {
logOutController.emailTextController.clear();
logOutController.update();
Get.back();
}));
});
}),
)
],
);

11
lib/views/widgets/my_textField.dart
View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import '../../constant/colors.dart';
@@ -44,11 +45,17 @@ class MyTextForm extends StatelessWidget {
if (value!.isEmpty) {
return 'Please enter $label.'.tr;
}
if (type == TextInputType.emailAddress) {
return 'Please enter Valid email.'.tr;
if (!value.contains('@')) {
return 'Please enter a valid email.'.tr;
}
} else if (type == TextInputType.phone) {
return 'Please enter Valid Phone.'.tr;
if (value.length != 10) {
return 'Please enter a valid phone number.'.tr;
}
}
return null;
},
),