Abdusalom999/Fondex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BASE: Fix Buttons Radiuses.

Browse Source
This commit is contained in:
Abdusalom G'ayratov
2025-11-29 10:49:25 +05:00
parent b2cb9b5dc5
commit d703dadafd
21 changed files with 1219 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
lib/screen_ui/cab_service_screens/cab_booking_screen.dart
View File

@@ -430,6 +430,7 @@ class CabBookingScreen extends StatelessWidget {
),
SizedBox(height: 15),
RoundedButtonFill(
borderRadius: 10.r,
title: "Continue".tr,
onPress: () {
if (controller
@@ -501,7 +502,7 @@ class CabBookingScreen extends StatelessWidget {
),
],
),
SizedBox(height: 15.h),
SizedBox(height: 10.h),
Padding(
padding: EdgeInsetsGeometry.symmetric(horizontal: 16.r),
child: Text(
@@ -663,35 +664,39 @@ class CabBookingScreen extends StatelessWidget {
),
),
SizedBox(height: 15.h),
Obx(
() => RoundedButtonFill(
title: 'pay_amount'.trParams({
'amount':
controller.selectedVehicleType.value.id == null
? Constant.amountShow(amount: "0.0")
: Constant.amountShow(
amount:
controller
.getAmount(
controller
.selectedVehicleType
.value,
)
.toString(),
),
}),
onPress: () async {
if (controller.selectedVehicleType.value.id != null) {
controller.calculateTotalAmount();
controller.bottomSheetType.value = "payment";
} else {
ShowToastDialog.showToast(
"Please select a vehicle type first.".tr,
);
}
},
color: AppThemeData.mainColor,
textColor: AppThemeData.grey50,
Padding(
padding: EdgeInsetsGeometry.symmetric(horizontal: 16.r),
child: Obx(
() => RoundedButtonFill(
borderRadius: 10.r,
title: 'pay_amount'.trParams({
'amount':
controller.selectedVehicleType.value.id == null
? Constant.amountShow(amount: "0.0")
: Constant.amountShow(
amount:
controller
.getAmount(
controller
.selectedVehicleType
.value,
)
.toString(),
),
}),
onPress: () async {
if (controller.selectedVehicleType.value.id != null) {
controller.calculateTotalAmount();
controller.bottomSheetType.value = "payment";
} else {
ShowToastDialog.showToast(
"Please select a vehicle type first.".tr,
);
}
},
color: AppThemeData.mainColor,
textColor: AppThemeData.grey50,
),
),
),
],
@@ -993,6 +998,7 @@ class CabBookingScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Continue".tr,
color: AppThemeData.primary300,
textColor: AppThemeData.grey900,
@@ -1396,9 +1402,9 @@ class CabBookingScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Redeem now".tr,
width: 27,
borderRadius: 10,
width: 27.w,
fontSizes: 14,
onPress: () async {
if (controller
@@ -1879,6 +1885,7 @@ class CabBookingScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Confirm Booking".tr,
onPress: () async {
controller.placeOrder();
@@ -1943,6 +1950,7 @@ class CabBookingScreen extends StatelessWidget {
),
Image.asset('assets/loader.gif', width: 250),
RoundedButtonFill(
borderRadius: 10.r,
title: "Cancel Ride".tr,
color: AppThemeData.danger300,
textColor: AppThemeData.surface,
@@ -2787,8 +2795,9 @@ class CabBookingScreen extends StatelessWidget {
return Column(
children: [
RoundedButtonFill(
borderRadius: 10.r,
title: "SOS".tr,
color: Colors.red.withOpacity(0.50),
color: Colors.red.withValues(alpha: 0.50),
textColor: AppThemeData.grey50,
isCenter: true,
icon: const Icon(Icons.call, color: Colors.white),
@@ -2850,6 +2859,7 @@ class CabBookingScreen extends StatelessWidget {
Constant.orderInTransit &&
controller.currentOrder.value.paymentStatus == false) {
return RoundedButtonFill(
borderRadius: 10.r,
title: "Pay Now".tr,
onPress: () async {
if (controller.selectedPaymentMethod.value ==