From 10f4803781a629527ddc09786afddde6ff8672dd Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Wed, 20 Nov 2024 10:44:02 +0300 Subject: [PATCH 1/4] Fixing JIRA Issues --- lib/main.dart | 117 ++++++++++-------- lib/views/branches/provider_profile_view.dart | 26 ++-- 2 files changed, 82 insertions(+), 61 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index c007f00..52cb3f2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:car_customer_app/config/customer_dependencies.dart'; import 'package:car_customer_app/config/customer_routes.dart'; +import 'package:flutter/services.dart'; 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'; @@ -62,67 +63,69 @@ Future main() async { injector.get().handleLocationPermission(); }); CustomerAppRoutes.routes.addAll(AppRoutes.routes); - initializeDateFormatting().then((_) => runApp( - MultiProvider( - providers: [ - ChangeNotifierProvider( - create: (_) => BaseVM(), - ), - ChangeNotifierProvider( - create: (_) => DashboardVmCustomer( - commonServices: injector.get(), - userRepo: injector.get(), - ), + initializeDateFormatting().then( + (_) => runApp( + MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (_) => BaseVM(), + ), + ChangeNotifierProvider( + create: (_) => DashboardVmCustomer( + commonServices: injector.get(), + userRepo: injector.get(), ), - ChangeNotifierProvider( - create: (_) => UserVM( - userRepo: injector.get(), - commanServices: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => UserVM( + userRepo: injector.get(), + commanServices: injector.get(), ), - ChangeNotifierProvider( - create: (_) => AdVM( - commonServices: injector.get(), - commonRepo: injector.get(), - adsRepo: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => AdVM( + commonServices: injector.get(), + commonRepo: injector.get(), + adsRepo: injector.get(), ), - ChangeNotifierProvider( - create: (_) => AppointmentsVM( - appointmentRepo: injector.get(), - commonServices: injector.get(), - commonRepo: injector.get(), - branchRepo: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => AppointmentsVM( + appointmentRepo: injector.get(), + commonServices: injector.get(), + commonRepo: injector.get(), + branchRepo: injector.get(), ), - ChangeNotifierProvider( - create: (_) => PaymentVM( - paymentService: injector.get(), - paymentRepo: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => PaymentVM( + paymentService: injector.get(), + paymentRepo: injector.get(), ), - ChangeNotifierProvider( - create: (_) => ChatVM( - chatRepo: injector.get(), - requestRepo: injector.get(), - commonServices: injector.get(), - )), - ChangeNotifierProvider( - create: (_) => RequestsVM( - requestRepo: injector.get(), - commonServices: injector.get(), - commonRepo: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => ChatVM( + chatRepo: injector.get(), + requestRepo: injector.get(), + commonServices: injector.get(), + )), + ChangeNotifierProvider( + create: (_) => RequestsVM( + requestRepo: injector.get(), + commonServices: injector.get(), + commonRepo: injector.get(), ), - ChangeNotifierProvider( - create: (_) => SettingOptionsVM( - settingOptionsRepo: injector.get(), - ), + ), + ChangeNotifierProvider( + create: (_) => SettingOptionsVM( + settingOptionsRepo: injector.get(), ), - ], - child: MyApp(), - ).setupLocale(), - )); + ), + ], + child: MyApp(), + ).setupLocale(), + ), + ); } // todo terminal command to generate translation files @@ -136,6 +139,10 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { + SystemChrome.setPreferredOrientations([ + DeviceOrientation.portraitUp, + DeviceOrientation.portraitDown, + ]); return Sizer( builder: (context, orientation, deviceType) { injector.get().setAppType(AppType.customer); @@ -160,3 +167,5 @@ class MyApp extends StatelessWidget { ); } } + +//273821 slotID diff --git a/lib/views/branches/provider_profile_view.dart b/lib/views/branches/provider_profile_view.dart index 282fd26..62b17c1 100644 --- a/lib/views/branches/provider_profile_view.dart +++ b/lib/views/branches/provider_profile_view.dart @@ -86,19 +86,31 @@ class _ProviderProfileViewState extends State { //TODO: company logo/banner not added form provider app yet Image.asset(MyAssets.bnCar), 12.height, - (appointmentsVM.providerProfileModel!.name ?? appointmentsVM.providerProfileModel!.companyName).toString().toText( - fontSize: 16, - isBold: true, - ), + if (appointmentsVM.providerProfileModel!.memberSince!.isNotEmpty) ...[ + Row( + children: [ + ("${LocaleKeys.companyName.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12), + 4.width, + (appointmentsVM.providerProfileModel!.companyName ?? appointmentsVM.providerProfileModel!.name).toString().toText( + fontSize: 16, + isBold: true, + ), + ], + ), + ], if (appointmentsVM.providerProfileModel!.memberSince!.isNotEmpty) ...[ Row( children: [ ("${LocaleKeys.memberSince.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12), 4.width, - "${DateHelper.formatAsMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT( - appointmentsVM.providerProfileModel!.memberSince ?? "", - )))}" + "${DateHelper.formatAsMonthYear( + DateHelper.parseStringToDate( + DateHelper.formatDateT( + appointmentsVM.providerProfileModel!.memberSince ?? "", + ), + ), + )}" .toText(fontSize: 12, isBold: true), ], ), From 062cd4db2f4cd72d36421f6e6c13bfd61658470a Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 21 Nov 2024 17:03:46 +0300 Subject: [PATCH 2/4] Fixing JIRA Issues --- lib/main.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 52cb3f2..6bf91e2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -167,5 +167,3 @@ class MyApp extends StatelessWidget { ); } } - -//273821 slotID From 015f1483a5843e7c34c0d6e7357c2ceade8c142d Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Mon, 25 Nov 2024 17:40:37 +0300 Subject: [PATCH 3/4] Fixing JIRA Issues --- lib/views/branches/provider_profile_view.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/views/branches/provider_profile_view.dart b/lib/views/branches/provider_profile_view.dart index 62b17c1..7ae88c5 100644 --- a/lib/views/branches/provider_profile_view.dart +++ b/lib/views/branches/provider_profile_view.dart @@ -59,6 +59,7 @@ class _ProviderProfileViewState extends State { bool status = await appointmentsVM.removeProviderFromFavorite(serviceProviderID: appointmentsVM.providerProfileModel!.id!, context: context); if (status) { appointmentsVM.providerProfileModel!.isFavorite = false; + appointmentsVM.getMyFavoriteProviders(); setState(() {}); } } else { From 79a3737c03c5bc9c2ce6dc452cb847d59fe74c36 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Wed, 27 Nov 2024 17:57:26 +0300 Subject: [PATCH 4/4] Dropped the JIRA Count to 23 --- lib/main.dart | 9 +++++++++ lib/views/branches/provider_profile_view.dart | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 6bf91e2..2afe86a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -167,3 +167,12 @@ class MyApp extends StatelessWidget { ); } } + +//Latitude: 24.708741, Longitude: 46.6657643, + + +//Longitude=24.708741&Latitude=46.6657643 + + +//update I/flutter ( 5035): │ "latitude": "37.421998", +// I/flutter ( 5035): │ "longitude": "-122.0839", diff --git a/lib/views/branches/provider_profile_view.dart b/lib/views/branches/provider_profile_view.dart index 7ae88c5..d559f8a 100644 --- a/lib/views/branches/provider_profile_view.dart +++ b/lib/views/branches/provider_profile_view.dart @@ -46,6 +46,15 @@ class _ProviderProfileViewState extends State { body: Center(child: CircularProgressIndicator()), ); } + + String providerBannerImageUrl = ""; + + if (appointmentsVM.providerProfileModel!.serviceProviderBranch!.isNotEmpty) { + if (appointmentsVM.providerProfileModel!.serviceProviderBranch!.first.branchImages!.isNotEmpty) { + providerBannerImageUrl = appointmentsVM.providerProfileModel!.serviceProviderBranch!.first.branchImages!.first.imageUrl ?? ""; + } + } + return Scaffold( appBar: CustomAppBar( title: LocaleKeys.providerDetails.tr(), @@ -77,15 +86,14 @@ class _ProviderProfileViewState extends State { body: Container( width: double.infinity, height: double.infinity, - padding: EdgeInsets.all(21), + padding: EdgeInsets.symmetric(horizontal: 21), child: SingleChildScrollView( child: Column( children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - //TODO: company logo/banner not added form provider app yet - Image.asset(MyAssets.bnCar), + Center(child: providerBannerImageUrl.buildNetworkImage(height: 250, width: double.infinity, fit: BoxFit.cover)), 12.height, if (appointmentsVM.providerProfileModel!.memberSince!.isNotEmpty) ...[ Row( @@ -99,7 +107,6 @@ class _ProviderProfileViewState extends State { ], ), ], - if (appointmentsVM.providerProfileModel!.memberSince!.isNotEmpty) ...[ Row( children: [ @@ -137,7 +144,7 @@ class _ProviderProfileViewState extends State { onCardTapped: () { navigateWithName(context, AppRoutes.branchDetailView, arguments: branchModel); }, - providerImageUrl: MyAssets.bnCar, + providerImageUrl: (branchModel.branchImages != null && branchModel.branchImages!.isNotEmpty) ? (branchModel.branchImages!.first.imageUrl ?? "") : "", title: branchModel.branchName ?? "", providerLocation: branchModel.distanceKm.toString() + " KM", providerName: branchModel.serviceProviderName ?? "",