From 65545b161d7f303594c22080d8b8b3d655d30595 Mon Sep 17 00:00:00 2001 From: FaizHashmi Date: Sun, 9 Aug 2026 11:00:10 +0300 Subject: [PATCH] Completed the Bugs --- android/app/build.gradle | 1 + android/build.gradle | 4 ++-- android/gradle.properties | 4 ++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 4 ++-- lib/views/dashboard/dashboard_view.dart | 5 ----- .../fragments/appointments_fragment.dart | 4 ++-- .../dashboard/fragments/home_fragment.dart | 19 +++++++++++-------- pubspec.yaml | 6 +++--- 9 files changed, 26 insertions(+), 23 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 420c8b7..42bc97e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,6 +31,7 @@ if (flutterVersionName == null) { android { namespace = "com.cloud.solutions.mowater.ksa.customer" compileSdkVersion 36 + ndkVersion = "28.2.13676358" compileOptions { coreLibraryDesugaringEnabled true diff --git a/android/build.gradle b/android/build.gradle index 6407e73..f3223d5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '2.0.21' + ext.kotlin_version = '2.3.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.9.1' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.4.2' } diff --git a/android/gradle.properties b/android/gradle.properties index ed50858..5b15144 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,7 @@ org.gradle.jvmargs=-Xmx4608m android.useAndroidX=true android.enableJetifier=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e2847c8..ca025c8 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/settings.gradle b/android/settings.gradle index fdab6c8..950469e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.9.1' apply false - id "org.jetbrains.kotlin.android" version "2.0.21" apply false + id "com.android.application" version '8.11.1' apply false + id "org.jetbrains.kotlin.android" version "2.3.10" apply false } diff --git a/lib/views/dashboard/dashboard_view.dart b/lib/views/dashboard/dashboard_view.dart index 14ef873..2beb9ca 100644 --- a/lib/views/dashboard/dashboard_view.dart +++ b/lib/views/dashboard/dashboard_view.dart @@ -4,15 +4,10 @@ import 'package:car_customer_app/views/dashboard/fragments/appointments_fragment import 'package:car_customer_app/views/dashboard/fragments/home_fragment.dart'; import 'package:car_customer_app/views/dashboard/widgets/bottom_nav_bar.dart'; import 'package:flutter/material.dart'; -import 'package:mc_common_app/classes/app_state.dart'; -import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/utils/enums.dart'; -import 'package:mc_common_app/utils/navigator.dart'; -import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart'; import 'package:mc_common_app/views/common_fragments/ads_fragment.dart'; import 'package:mc_common_app/views/common_fragments/requests_fragment.dart'; -import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; import 'fragments/branches_fragment.dart'; diff --git a/lib/views/dashboard/fragments/appointments_fragment.dart b/lib/views/dashboard/fragments/appointments_fragment.dart index 752bf11..5917e08 100644 --- a/lib/views/dashboard/fragments/appointments_fragment.dart +++ b/lib/views/dashboard/fragments/appointments_fragment.dart @@ -39,7 +39,7 @@ class AppointmentsFragment extends StatelessWidget { smallSize: 20, backgroundColor: MyColors.darkPrimaryColor, label: Text('${appointmentsVM.appointmentFiltersCounter}'), - child: MyAssets.searchIcon.buildSvg(), + child: MyAssets.searchIcon.buildSvg(height: 22, width: 22), ), ).onPress(() { navigateWithName(context, AppRoutes.appoinmentSearchFilterPage); @@ -74,7 +74,7 @@ class AppointmentsFragment extends StatelessWidget { ? const AppointmentsListShimmer(itemCount: 5) : appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty ? AppState().getIsViewOnly - ? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor) + ? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor) : Column( mainAxisAlignment: MainAxisAlignment.center, children: [ diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 878aa03..c099245 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -195,8 +195,8 @@ class _HomeFragmentState extends State { 14.height, Consumer( builder: (BuildContext context, AppointmentsVM appointmentVM, Widget? child) { - // Show shimmer when loading - if (appointmentVM.state == ViewState.busy) { + // Show shimmer only when services are not loaded yet + if (appointmentVM.branchesCategoriesFilterOptions.isEmpty) { return Column( children: [ _buildServicesHeader(), @@ -205,11 +205,11 @@ class _HomeFragmentState extends State { ], ); } - // Show actual data when idle + // Show actual data when services are available if (appointmentVM.branchesCategoriesFilterOptions.isNotEmpty) { // Filter services based on search query final filteredServices = _filterServices(appointmentVM.branchesCategoriesFilterOptions); - + return Column( children: [ _buildServicesHeader().toViewOnly(context, onTap: () { @@ -220,10 +220,10 @@ class _HomeFragmentState extends State { ? Padding( padding: const EdgeInsets.all(40), child: LocaleKeys.noServiceFound.tr().toText( - fontSize: 16, - color: Colors.grey, - textAlign: TextAlign.center, - ), + fontSize: 16, + color: Colors.grey, + textAlign: TextAlign.center, + ), ) : MyServicesCategoriesWidget(homeCategories: filteredServices).horPaddingMain(), ], @@ -360,3 +360,6 @@ class _HomeFragmentState extends State { ); } } + + + diff --git a/pubspec.yaml b/pubspec.yaml index 924cf08..131ec9b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,10 +36,10 @@ dependencies: cupertino_icons: ^1.0.2 mc_common_app: - path: /Volumes/Data/Projects/Flutter_Projects/mowater_apps/car_common_app + path: /Users/faiz-hashmi/StudioProjects/mowater_apps/car_common_app +# path: /Volumes/Data/Projects/Flutter_Projects/mowater_apps/car_common_app # path: /Users/faizhashmi/Development/Projects/MyProjects/CloudSolutions/car_common_app -# path: /Users/aamir/StudioProjects/car_common_app -# path: C:/dev/Mawater/car_common_app + dev_dependencies: