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

9/3/1

Browse Source
This commit is contained in:
Hamza-Ayed
2023-09-03 13:48:55 +03:00
parent 4628f91d3e
commit ef6d3604cd
12 changed files with 341 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/views/home/map_page.dart
View File

@@ -129,7 +129,8 @@ class MapPage extends StatelessWidget {
// Circle(
// circleId: const CircleId('kk'),
// center: controller.mylocation,
// radius: 2000)
// radius: 60,
// fillColor: AppColor.primaryColor,)
// },
mapType:
controller.mapType ? MapType.satellite : MapType.normal,

105
lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
View File

@@ -233,61 +233,62 @@ GetBuilder<MapController> buttomSheetMapPage() {
),
InkWell(
onTap: () {
Get.defaultDialog(
title: 'Add Promo'.tr,
content: Column(
children: [
SizedBox(
width:
Get.width * .7,
child:
TextFormField(
controller:
controller.promo,
decoration:
InputDecoration(
labelText: 'Promo Code'.tr,
hintText: 'Enter promo code'.tr,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10),
),
filled: true,
fillColor: Colors.grey[200],
focusedBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: AppColor.primaryColor,
width: 2.0,
Get
.defaultDialog(
title: 'Add Promo'
.tr,
content:
Column(
children: [
SizedBox(
width: Get.width * .7,
child: TextFormField(
controller: controller.promo,
decoration: InputDecoration(
labelText: 'Promo Code'.tr,
hintText: 'Enter promo code'.tr,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10),
),
filled: true,
fillColor: Colors.grey[200],
focusedBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: AppColor.primaryColor,
width: 2.0,
),
borderRadius: BorderRadius.circular(10),
),
errorBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: Colors.red,
width: 2.0,
),
borderRadius: BorderRadius.circular(10),
),
enabledBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: Colors.grey,
width: 1.0,
),
borderRadius: BorderRadius.circular(10),
),
),
borderRadius: BorderRadius.circular(10),
),
errorBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: Colors.red,
width: 2.0,
),
borderRadius: BorderRadius.circular(10),
),
enabledBorder: OutlineInputBorder(
borderSide: const BorderSide(
color: Colors.grey,
width: 1.0,
),
borderRadius: BorderRadius.circular(10),
),
),
),
),
MyElevatedButton(
title:
'Add Promo'.tr,
onPressed:
() async {
controller.applyPromoCodetoPassenger();
Get.back();
},
)
],
));
MyElevatedButton(
title: 'Add Promo'.tr,
onPressed: () async {
if (controller.promoTaken == false) {
controller.applyPromoCodetoPassenger();
Get.back();
} else {
Get.defaultDialog(title: 'You have Promo ?.'.tr);
}
},
)
],
));
},
child: Text(
'Add Promo'.tr,

5
lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
View File

@@ -2,11 +2,8 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart';
import 'package:ride/constant/style.dart';
import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/controller/home/payment/payment_controller.dart';
import 'package:ride/views/widgets/circle_container.dart';
import 'package:ride/views/widgets/elevated_btn.dart';
import 'package:ride/views/widgets/mycircular.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/map_page_controller.dart';
@@ -72,7 +69,7 @@ class CashConfirmPageShown extends StatelessWidget {
),
Text(
// '${'Your Wallet balance is '.tr}JD ',
'${'Your Wallet balance is '.tr}JD ${box.read(BoxName.passengerWalletDetails)[0]['total'].toString()}',
'${'Your Wallet balance is '.tr}JD ${controller.passengerTotalWalletAmount.toString()}',
style: AppStyle.subtitle,
),
],

5
lib/views/widgets/elevated_btn.dart
View File

@@ -6,18 +6,19 @@ import '../../constant/colors.dart';
class MyElevatedButton extends StatelessWidget {
final String title;
final VoidCallback onPressed;
final Color kolor;
const MyElevatedButton({
Key? key,
required this.title,
required this.onPressed,
this.kolor = AppColor.primaryColor,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return ElevatedButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(AppColor.primaryColor),
backgroundColor: MaterialStateProperty.all(kolor),
),
onPressed: onPressed,
child: Text(