From 44ae05f9e70fb30ec7a361be47faff3ece3cd1e3 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Wed, 25 Dec 2024 11:21:04 +0300 Subject: [PATCH] Quick Fixes --- android/app/src/main/AndroidManifest.xml | 22 ++++++++++++++- .../schedule/schedules_list_page.dart | 2 +- .../services/services_list_page.dart | 28 ++++++++++--------- .../dashboard/widget/my_service_provider.dart | 2 +- pubspec.yaml | 4 +-- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 80cb209..a4e4a3f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -16,10 +16,29 @@ or higher if your app targets Android 14 (API level 34) or higher. --> + + + + + + + + + + + + + + + + + + + + diff --git a/lib/views/branch_management/schedule/schedules_list_page.dart b/lib/views/branch_management/schedule/schedules_list_page.dart index 53dd43e..fd306bb 100644 --- a/lib/views/branch_management/schedule/schedules_list_page.dart +++ b/lib/views/branch_management/schedule/schedules_list_page.dart @@ -23,7 +23,7 @@ import 'package:easy_localization/easy_localization.dart'; class SchedulesListPage extends StatefulWidget { final String? branchId; - const SchedulesListPage(this.branchId, {Key? key}) : super(key: key); + const SchedulesListPage(this.branchId, {super.key}); @override State createState() => _SchedulesListPageState(); diff --git a/lib/views/branch_management/services/services_list_page.dart b/lib/views/branch_management/services/services_list_page.dart index b8b4431..d4803f9 100644 --- a/lib/views/branch_management/services/services_list_page.dart +++ b/lib/views/branch_management/services/services_list_page.dart @@ -105,7 +105,7 @@ class _ServicesListPageState extends State { ), 8.width, Expanded( - flex: 10, + flex: 8, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, @@ -117,18 +117,20 @@ class _ServicesListPageState extends State { ], ), // 5.height, - Container( - child: ("${LocaleKeys.branchName.tr()}: ${categoryData.branchName}").toText( - fontSize: 12, - color: MyColors.lightTextColor, - ), + Row( + children: [ + Flexible( + child: ("${LocaleKeys.branchName.tr()}: ${categoryData.branchName}").toText( + fontSize: 12, + color: MyColors.lightTextColor, + ), + ), + ], ), if (categoryData.services != null) ...[ - Container( - child: ("${LocaleKeys.totalNumberOfServices.tr()} ${categoryData.services!.length}").toText( - fontSize: 12, - color: MyColors.lightTextColor, - ), + ("${LocaleKeys.totalNumberOfServices.tr()} ${categoryData.services!.length}").toText( + fontSize: 12, + color: MyColors.lightTextColor, ), ], ], @@ -137,9 +139,10 @@ class _ServicesListPageState extends State { Expanded( flex: 4, child: Column( + crossAxisAlignment: CrossAxisAlignment.end, children: [ LocaleKeys.active.tr().toText(fontSize: 16), - 8.width, + 5.height, Container( width: 50, height: 30, @@ -180,7 +183,6 @@ class _ServicesListPageState extends State { } Future updateCategoryStatus({required bool isCategoryActive, required int categoryId, required int branchId}) async { - log("isCategoryActive: $isCategoryActive"); final serviceVM = context.read(); bool status = await serviceVM.updateCategoryStatus( context: context, diff --git a/lib/views/dashboard/widget/my_service_provider.dart b/lib/views/dashboard/widget/my_service_provider.dart index 70dc4e4..e8f5666 100644 --- a/lib/views/dashboard/widget/my_service_provider.dart +++ b/lib/views/dashboard/widget/my_service_provider.dart @@ -15,7 +15,7 @@ import 'package:provider/provider.dart'; import 'package:easy_localization/easy_localization.dart'; class ServiceProviderWidget extends StatelessWidget { - const ServiceProviderWidget({Key? key}) : super(key: key); + const ServiceProviderWidget({super.key}); @override Widget build(BuildContext context) { diff --git a/pubspec.yaml b/pubspec.yaml index 6885ea9..e32c8aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -41,8 +41,8 @@ dependencies: mc_common_app: # path: D:\Development\car_common_app - path: /Users/aamir/StudioProjects/car_common_app -# path: /Users/faizhashmi/Development/Projects/MyProjects/CloudSolutions/car_common_app + path: /Volumes/Data/Projects/Flutter/car_common_app + # path: /Users/aamir/StudioProjects/car_common_app