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

13
lib/screen_ui/cab_service_screens/Intercity_home_screen.dart
View File

@@ -15,6 +15,7 @@ import 'package:customer/utils/network_image_widget.dart';
import 'package:customer/utils/utils.dart';
import 'package:dotted_border/dotted_border.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:geocoding/geocoding.dart' as get_cord_address;
import 'package:get/get.dart';
@@ -320,6 +321,7 @@ class IntercityHomeScreen extends StatelessWidget {
),
SizedBox(height: 10),
RoundedButtonFill(
borderRadius: 10.r,
title: "Continue".tr,
onPress: () {
if (controller.sourceTextEditController.value.text.isEmpty) {
@@ -457,6 +459,7 @@ class IntercityHomeScreen extends StatelessWidget {
),
Obx(
() => RoundedButtonFill(
borderRadius: 10.r,
title: 'pay_amount'.trParams({
'amount':
controller.selectedVehicleType.value.id == null
@@ -594,6 +597,7 @@ class IntercityHomeScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Continue".tr,
color: AppThemeData.primary300,
textColor: AppThemeData.grey900,
@@ -819,9 +823,10 @@ class IntercityHomeScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Redeem now".tr,
width: 27,
borderRadius: 10,
width: 27.w,
fontSizes: 14,
onPress: () async {
if (controller.cabCouponList
@@ -1001,6 +1006,7 @@ class IntercityHomeScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Confirm Booking".tr,
onPress: () async {
controller.placeOrder();
@@ -1039,6 +1045,7 @@ class IntercityHomeScreen extends StatelessWidget {
Text("Waiting for driver....".tr, style: AppThemeData.mediumTextStyle(fontSize: 18, color: AppThemeData.grey900)),
Image.asset('assets/loader.gif', width: 250),
RoundedButtonFill(
borderRadius: 10.r,
title: "Cancel Ride".tr,
onPress: () async {
try {
@@ -1400,6 +1407,7 @@ class IntercityHomeScreen extends StatelessWidget {
return Column(
children: [
RoundedButtonFill(
borderRadius: 10.r,
title: "SOS".tr,
color: Colors.red.withOpacity(0.50),
textColor: AppThemeData.grey50,
@@ -1456,6 +1464,7 @@ class IntercityHomeScreen extends StatelessWidget {
Obx(() {
if (controller.currentOrder.value.status == Constant.orderInTransit && controller.currentOrder.value.paymentStatus == false) {
return RoundedButtonFill(
borderRadius: 10.r,
title: "Pay Now".tr,
onPress: () async {
if (controller.selectedPaymentMethod.value == PaymentGateway.stripe.name) {

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 ==

757
lib/screen_ui/cab_service_screens/cab_order_details.dart
View File

File diff suppressed because it is too large Load Diff

2
lib/screen_ui/cab_service_screens/cab_review_screen.dart
View File

@@ -1,6 +1,7 @@
import 'package:customer/controllers/cab_review_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../constant/constant.dart';
import '../../controllers/theme_controller.dart';
@@ -120,6 +121,7 @@ class CabReviewScreen extends StatelessWidget {
Padding(
padding: const EdgeInsets.all(20.0),
child: RoundedButtonFill(
borderRadius: 10.r,
title: controller.ratingModel.value != null ? "Update Review".tr : "Add Review".tr,
color: AppThemeData.primary300,
textColor: isDark ? Colors.white : Colors.black,

3
lib/screen_ui/cab_service_screens/complain_screen.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../controllers/complain_controller.dart';
import '../../controllers/theme_controller.dart';
@@ -53,7 +54,7 @@ class ComplainScreen extends StatelessWidget {
const SizedBox(height: 10),
Obx(() => TextFieldWidget(title: "Complain".tr, hintText: 'Type Description....'.tr, controller: controller.comment.value, maxLine: 8)),
const SizedBox(height: 20),
RoundedButtonFill(title: "Save".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () => controller.submitComplain()),
RoundedButtonFill( borderRadius: 10.r,title: "Save".tr, color: AppThemeData.primary300, textColor: AppThemeData.grey50, onPress: () => controller.submitComplain()),
],
),
),

4
lib/screen_ui/cab_service_screens/my_cab_booking_screen.dart
View File

@@ -6,6 +6,7 @@ import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_scr
import 'package:customer/themes/round_button_fill.dart';
import 'package:customer/themes/show_toast_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import '../../constant/constant.dart';
import '../../controllers/my_cab_booking_controller.dart';
@@ -89,6 +90,7 @@ class MyCabBookingScreen extends StatelessWidget {
),
const SizedBox(height: 20),
RoundedButtonFill(
borderRadius: 10.r,
title: "Log in".tr,
width: 55,
height: 5.5,
@@ -226,6 +228,7 @@ class MyCabBookingScreen extends StatelessWidget {
if (order.status == Constant.orderInTransit && order.paymentStatus == false) SizedBox(height: 14),
order.status == Constant.orderInTransit && order.paymentStatus == false
? RoundedButtonFill(
borderRadius: 10.r,
title: "Pay Now".tr,
onPress: () async {
controller.selectedPaymentMethod.value = order.paymentMethod.toString();
@@ -361,6 +364,7 @@ class MyCabBookingScreen extends StatelessWidget {
),
),
RoundedButtonFill(
borderRadius: 10.r,
title: "Continue".tr,
color: AppThemeData.primary300,
textColor: AppThemeData.grey900,