diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6db7e98..da426b3 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -81,6 +81,13 @@ + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 3722edb..e668788 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -59,5 +59,18 @@ UIViewControllerBasedStatusBarAppearance + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLName + com.cloud.solutions.mowater.ksa.provider + CFBundleURLSchemes + + mowaterprovider + + + diff --git a/lib/views/branch_management/branch/branch_detail_page.dart b/lib/views/branch_management/branch/branch_detail_page.dart index 6e472c0..73599f5 100644 --- a/lib/views/branch_management/branch/branch_detail_page.dart +++ b/lib/views/branch_management/branch/branch_detail_page.dart @@ -1,6 +1,4 @@ import 'dart:async'; -import 'dart:developer'; - import 'package:car_provider_app/view_models/schedule_view_model.dart'; import 'package:car_provider_app/views/branch_management/branch/dealer/widget/assign_dealer_user_sheet.dart'; import 'package:car_provider_app/views/branch_management/services/services_list_page.dart'; @@ -25,7 +23,6 @@ import 'package:mc_common_app/widgets/button/show_fill_button.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/custom_add_button_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; -import 'package:mc_common_app/widgets/row_with_arrow.dart'; import 'package:provider/provider.dart'; class BranchDetailPage extends StatefulWidget { @@ -215,7 +212,8 @@ class _BranchDetailPageState extends State { width: 13.0, color: Colors.black, ), - ) ], + ) + ], ) ], )), @@ -272,7 +270,8 @@ class _BranchDetailPageState extends State { ), Column( children: [ - showData("${LocaleKeys.location.tr()}:", "${isArabic ? widget.branchData.cityNameN.toString() : widget.branchData.cityName.toString()}, ${isArabic ? widget.branchData.countryNameN.toString() : widget.branchData.countryName.toString()}"), + showData("${LocaleKeys.location.tr()}:", + "${isArabic ? widget.branchData.cityNameN.toString() : widget.branchData.cityName.toString()}, ${isArabic ? widget.branchData.countryNameN.toString() : widget.branchData.countryName.toString()}"), showData("${LocaleKeys.provider.tr()}:", widget.branchData.serviceProviderName.toString()), showData("${LocaleKeys.time.tr()}:", "${widget.branchData.openTime.toString()} - ${widget.branchData.closeTime.toString()}"), showData("${LocaleKeys.address.tr()}:", widget.branchData.address.toString()), @@ -310,14 +309,7 @@ class _BranchDetailPageState extends State { ), ) ], - ) - // .withArrow( - // isArrowEnabled: true, - // color: Colors.white, - // arrowWidth: 16.16, - // arrowHeight: 11.75, - // ) - .margin(right: 5), + ).margin(right: 5), ).onPress(() { if (widget.branchData.branchStatus == BranchStatusEnum.pending || widget.branchData.branchStatus == BranchStatusEnum.rejected) { Utils.showToast(LocaleKeys.waitForBranchVerification.tr()); diff --git a/lib/views/dashboard/widget/general_appointment_widget.dart b/lib/views/dashboard/widget/general_appointment_widget.dart index bea03ce..425be6d 100644 --- a/lib/views/dashboard/widget/general_appointment_widget.dart +++ b/lib/views/dashboard/widget/general_appointment_widget.dart @@ -175,9 +175,7 @@ class GeneralAppointmentWidget extends StatelessWidget { 4.width, // Expanded(child: appointmentListModel.appointmentDate!.toFormattedDateWithoutTime().toText(fontSize: 8)) Expanded( - child: appointmentListModel.appointmentDate! - .toLocalizedFormattedDateWithoutTime(context) - .toText(fontSize: 8), + child: appointmentListModel.appointmentDate!.toLocalizedFormattedDateWithoutTime(context).toText(fontSize: 8), ) ], ), @@ -196,11 +194,9 @@ class GeneralAppointmentWidget extends StatelessWidget { children: [ "${LocaleKeys.createdOn.tr()}: ".toText(color: MyColors.lightTextColor), 2.width, - // Expanded(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8)) + // Expanded(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8)) Expanded( - child: appointmentListModel.appointmentCreatedOn! - .toLocalizedFormattedDateWithoutTime(context) - .toText(fontSize: 8), + child: appointmentListModel.appointmentCreatedOn!.toLocalizedFormattedDateWithoutTime(context).toText(fontSize: 8), ) ], ), diff --git a/lib/views/subscriptions/my_subscritions_page.dart b/lib/views/subscriptions/my_subscritions_page.dart index 4dfc3e3..b425b34 100644 --- a/lib/views/subscriptions/my_subscritions_page.dart +++ b/lib/views/subscriptions/my_subscritions_page.dart @@ -143,5 +143,3 @@ class _MySubscriptionsPageState extends State { ); } } - - diff --git a/lib/views/subscriptions/sheet/upgrade_package_sheet.dart b/lib/views/subscriptions/sheet/upgrade_package_sheet.dart index 5a1602f..673f137 100644 --- a/lib/views/subscriptions/sheet/upgrade_package_sheet.dart +++ b/lib/views/subscriptions/sheet/upgrade_package_sheet.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/config/routes.dart'; diff --git a/lib/views/subscriptions/widget/all_subscriptions_card.dart b/lib/views/subscriptions/widget/all_subscriptions_card.dart index d862fc6..e8a2377 100644 --- a/lib/views/subscriptions/widget/all_subscriptions_card.dart +++ b/lib/views/subscriptions/widget/all_subscriptions_card.dart @@ -93,7 +93,7 @@ class AllSubscriptionsCard extends StatelessWidget { ], ), ), - if (subscription.subscriptionTypeEnum == SubscriptionTypeEnum.current && subscription.isRenewable!) + if (subscription.subscriptionTypeEnum == SubscriptionTypeEnum.current && subscription.isRenewable! && DateHelper.isWithinDays(subscription.dateEnd, 7)) Row( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/views/subscriptions/widget/my_subscriptions_card.dart b/lib/views/subscriptions/widget/my_subscriptions_card.dart index fb2a74f..8cec621 100644 --- a/lib/views/subscriptions/widget/my_subscriptions_card.dart +++ b/lib/views/subscriptions/widget/my_subscriptions_card.dart @@ -105,7 +105,7 @@ class MySubscriptionsCard extends StatelessWidget { "${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateFormat('d MMMM yyyy', context.locale.toString()).format(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}" .toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium), // "${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}".toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium), - if (subscriptionVM.isRenewable!) + if (subscriptionVM.isRenewable! && DateHelper.isWithinDays(subscriptionVM.dateEnd, 7)) Row( children: [ 6.width,