BASE: Update Icons & Name Of The App.
This commit is contained in:
@@ -18,7 +18,7 @@ import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:google_maps_flutter/google_maps_flutter.dart';
|
||||
import 'package:flutter_map/flutter_map.dart' as flutterMap;
|
||||
import 'package:latlong2/latlong.dart' as latlong;
|
||||
@@ -668,21 +668,16 @@ class CabBookingScreen extends StatelessWidget {
|
||||
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(),
|
||||
),
|
||||
}),
|
||||
title: 'pay_amount'.tr(namedArgs: {
|
||||
'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();
|
||||
@@ -1927,7 +1922,9 @@ class CabBookingScreen extends StatelessWidget {
|
||||
);
|
||||
cabDashboardController.selectedIndex.value = 0;
|
||||
} catch (e) {
|
||||
ShowToastDialog.showToast(ConstTexts.failedToCancel.tr());
|
||||
ShowToastDialog.showToast(
|
||||
ConstTexts.failedToCancel.tr(),
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
@@ -2069,7 +2066,8 @@ class CabBookingScreen extends StatelessWidget {
|
||||
.value,
|
||||
// backgroundColor: AppThemeData.grey50,
|
||||
// borderColor: AppThemeData.grey50,
|
||||
hintText: ConstTexts.destinationLocation.tr(),
|
||||
hintText:
|
||||
ConstTexts.destinationLocation.tr(),
|
||||
enable: false,
|
||||
readOnly: true,
|
||||
prefix: const Padding(
|
||||
@@ -2282,7 +2280,7 @@ class CabBookingScreen extends StatelessWidget {
|
||||
InkWell(
|
||||
onTap: () async {
|
||||
ShowToastDialog.showLoader(
|
||||
ConstTexts.pleaseWait.tr(),
|
||||
ConstTexts.pleaseWait.tr(),
|
||||
);
|
||||
|
||||
UserModel? customer =
|
||||
@@ -2621,8 +2619,7 @@ class CabBookingScreen extends StatelessWidget {
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
'${taxModel.title} (${taxModel.tax} ${taxModel.type == "Fixed" ? Constant.currencyData!.code : "%"})'
|
||||
,
|
||||
'${taxModel.title} (${taxModel.tax} ${taxModel.type == "Fixed" ? Constant.currencyData!.code : "%"})',
|
||||
textAlign: TextAlign.start,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
fontSize: 14,
|
||||
@@ -2720,7 +2717,9 @@ class CabBookingScreen extends StatelessWidget {
|
||||
isCenter: true,
|
||||
icon: const Icon(Icons.call, color: Colors.white),
|
||||
onPress: () async {
|
||||
ShowToastDialog.showLoader(ConstTexts.pleaseWait.tr());
|
||||
ShowToastDialog.showLoader(
|
||||
ConstTexts.pleaseWait.tr(),
|
||||
);
|
||||
|
||||
LocationData location =
|
||||
await controller.currentLocation.value
|
||||
@@ -2741,8 +2740,7 @@ class CabBookingScreen extends StatelessWidget {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
ConstTexts.yourSosRequest.tr()
|
||||
|
||||
ConstTexts.yourSosRequest.tr(),
|
||||
),
|
||||
backgroundColor: Colors.green,
|
||||
duration: Duration(seconds: 3),
|
||||
@@ -2754,7 +2752,9 @@ class CabBookingScreen extends StatelessWidget {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
ConstTexts.yourSosrequestAlreadySubmitted.tr()
|
||||
ConstTexts
|
||||
.yourSosrequestAlreadySubmitted
|
||||
.tr(),
|
||||
),
|
||||
backgroundColor: Colors.red,
|
||||
duration: Duration(seconds: 3),
|
||||
@@ -2822,7 +2822,8 @@ class CabBookingScreen extends StatelessWidget {
|
||||
Constant.userModel!.walletAmount! <
|
||||
controller.totalAmount.value) {
|
||||
ShowToastDialog.showToast(
|
||||
ConstTexts.youDoNothaveSufficientwalletBalance.tr()
|
||||
ConstTexts.youDoNothaveSufficientwalletBalance
|
||||
.tr(),
|
||||
);
|
||||
} else {
|
||||
controller.completeOrder();
|
||||
@@ -2858,8 +2859,7 @@ class CabBookingScreen extends StatelessWidget {
|
||||
if (value == null) {
|
||||
Get.back();
|
||||
ShowToastDialog.showToast(
|
||||
|
||||
ConstTexts.somethingWentWrong.tr()
|
||||
ConstTexts.somethingWentWrong.tr(),
|
||||
);
|
||||
} else {
|
||||
CreateRazorPayOrderModel result = value;
|
||||
@@ -2873,7 +2873,7 @@ class CabBookingScreen extends StatelessWidget {
|
||||
});
|
||||
} else {
|
||||
ShowToastDialog.showToast(
|
||||
ConstTexts.plsSelectPaymentMethod.tr(),
|
||||
ConstTexts.plsSelectPaymentMethod.tr(),
|
||||
);
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user