From 0a8b1c2281235aac654f6c228eb7058c77b867d7 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Wed, 16 Oct 2024 15:10:21 +0300 Subject: [PATCH 1/5] fixed Things before QA --- .../dashboard/fragments/home_fragment.dart | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 459d40f..4a0505c 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -31,24 +31,24 @@ class HomeFragment extends StatelessWidget { leadingWidth: 100, onTap: () => navigateWithName(context, AppRoutes.settingOptionsLanguages), actions: [ - IconButton( - onPressed: () => context.read().onRefresh(context), - icon: const b.Badge( - badgeContent: Text( - '3', - style: TextStyle( - fontSize: 10, - color: Colors.white, - ), - ), - badgeStyle: b.BadgeStyle( - badgeColor: MyColors.primaryColor, - padding: EdgeInsets.all(5), - ), - child: Icon(Icons.notifications_active), - ), - ), - 10.width, + // IconButton( + // onPressed: () {}, + // icon: const b.Badge( + // badgeContent: Text( + // '3', + // style: TextStyle( + // fontSize: 10, + // color: Colors.white, + // ), + // ), + // badgeStyle: b.BadgeStyle( + // badgeColor: MyColors.primaryColor, + // padding: EdgeInsets.all(5), + // ), + // child: Icon(Icons.notifications_active), + // ), + // ), + // 10.width, ], ), body: SizedBox( From 56673db6bc3dadca180143d785238e67c798abf8 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 17 Oct 2024 11:35:08 +0300 Subject: [PATCH 2/5] fixed Things before QA --- lib/views/branches/branch_detail_view.dart | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index fe91961..70181ed 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -191,17 +191,16 @@ class _BranchDetailViewState extends State { itemBuilder: (context, index) { return ExpansionTile( tilePadding: EdgeInsets.zero, - title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText( - fontSize: 16, - isBold: true, - ), + title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16), children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? "Yes" : "No", valueColor: Colors.green), - showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + "KM"), - showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), + showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? LocaleKeys.yes.tr() : LocaleKeys.no.tr(), valueColor: Colors.green), + if ((widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false)) ...[ + showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + "KM"), + showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), + ], 8.height, ((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0) ? widget.branchDetailModel.branchServices![index].itemsCount.toString() + " items" @@ -247,9 +246,9 @@ class _BranchDetailViewState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - item.toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true), + item.toText(fontSize: 12, color: MyColors.lightTextColor), 4.width, - value.toText(fontSize: 12, color: valueColor, isBold: true), + value.toText(fontSize: 12, color: valueColor), ], ); } From 5f8422d68ce1ff92193b2f4cd8f1b60b2784d192 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 17 Oct 2024 16:11:43 +0300 Subject: [PATCH 3/5] fixed Things before QA --- lib/views/branches/branch_detail_view.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index 70181ed..043a345 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -1,9 +1,6 @@ import 'dart:async'; -import 'dart:developer'; - import 'package:car_customer_app/views/branches/components/branch_reviews_widget.dart'; import 'package:car_customer_app/views/branches/components/items_list_sheet.dart'; -import 'package:mc_common_app/main.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; From e671565d0413ba65854c5183a0204f7b53eb3829 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Mon, 21 Oct 2024 16:21:03 +0300 Subject: [PATCH 4/5] Added Shipping Management --- lib/views/branches/provider_profile_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/views/branches/provider_profile_view.dart b/lib/views/branches/provider_profile_view.dart index 984bd07..282fd26 100644 --- a/lib/views/branches/provider_profile_view.dart +++ b/lib/views/branches/provider_profile_view.dart @@ -50,7 +50,7 @@ class _ProviderProfileViewState extends State { appBar: CustomAppBar( title: LocaleKeys.providerDetails.tr(), actions: [ - Icon( + Icon( appointmentsVM.providerProfileModel!.isFavorite! ? Icons.favorite : Icons.favorite_border, color: appointmentsVM.providerProfileModel!.isFavorite! ? MyColors.darkPrimaryColor : MyColors.black, ).horPaddingMain().onPress( From 1a7705bdac319880eabc88ccab04ba135cb6f924 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 24 Oct 2024 10:00:07 +0300 Subject: [PATCH 5/5] Added Settings Modules --- lib/main.dart | 11 ++++++++++- lib/views/dashboard/fragments/home_fragment.dart | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 88a7ad4..b3c53f4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,6 +6,7 @@ import 'package:mc_common_app/repositories/branch_repo.dart'; import 'package:mc_common_app/repositories/chat_repo.dart'; import 'package:mc_common_app/repositories/appointment_repo.dart'; import 'package:mc_common_app/repositories/request_repo.dart'; +import 'package:mc_common_app/repositories/setting_options_repo.dart'; import 'package:mc_common_app/services/firebase_service.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/view_models/chat_view_model.dart'; @@ -28,6 +29,7 @@ import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/view_models/ad_view_model.dart'; import 'package:mc_common_app/view_models/base_view_model.dart'; import 'package:mc_common_app/view_models/payment_view_model.dart'; +import 'package:mc_common_app/view_models/setting_options_view_model.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; @@ -60,7 +62,9 @@ Future main() async { initializeDateFormatting().then((_) => runApp( MultiProvider( providers: [ - ChangeNotifierProvider(create: (_) => BaseVM()), + ChangeNotifierProvider( + create: (_) => BaseVM(), + ), ChangeNotifierProvider( create: (_) => DashboardVmCustomer( commonServices: injector.get(), @@ -107,6 +111,11 @@ Future main() async { commonRepo: injector.get(), ), ), + ChangeNotifierProvider( + create: (_) => SettingOptionsVM( + settingOptionsRepo: injector.get(), + ), + ), ], child: MyApp(), ).setupLocale(), diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 4a0505c..83c8a90 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -16,7 +16,6 @@ import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/view_all_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; -import 'package:badges/badges.dart' as b; import 'package:easy_localization/easy_localization.dart'; class HomeFragment extends StatelessWidget { @@ -29,7 +28,7 @@ class HomeFragment extends StatelessWidget { appBar: CustomAppBar( isDrawerEnabled: true, leadingWidth: 100, - onTap: () => navigateWithName(context, AppRoutes.settingOptionsLanguages), + onTap: () => navigateWithName(context, AppRoutes.settingOptionsMore), actions: [ // IconButton( // onPressed: () {},