Merge branch 'refs/heads/faiz_dev' into fatima_dev

# Conflicts:
#	android/build.gradle
#	pubspec.yaml

android/app/build.gradle

@@ -31,6 +31,7 @@ if (flutterVersionName == null) {
 android {
     namespace = "com.cloud.solutions.mowater.ksa.provider"
     compileSdkVersion 36
+    ndkVersion = "28.2.13676358"
 
     compileOptions {
         coreLibraryDesugaringEnabled true

android/build.gradle

@@ -32,14 +32,14 @@
 
 
 buildscript {
-    ext.kotlin_version = '2.1.0'
+    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'
     }

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

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
 
 }
 

lib/main.dart

@@ -69,14 +69,9 @@ Future<void> main() async {
   ProviderAppRoutes.routes.addAll(AppRoutes.routes);
   runApp(MultiProvider(
     providers: [
-      ChangeNotifierProvider<BaseVM>(
-        create: (_) => BaseVM(),
-      ),
+      ChangeNotifierProvider<BaseVM>(create: (_) => BaseVM()),
       ChangeNotifierProvider<DashboardVMProvider>(
-        create: (_) => DashboardVMProvider(
-          userRepo: injector.get<UserRepo>(),
-          commonServices: injector.get<CommonAppServices>(),
-        ),
+        create: (_) => DashboardVMProvider(userRepo: injector.get<UserRepo>(), commonServices: injector.get<CommonAppServices>()),
       ),
       ChangeNotifierProvider<UserVM>(
         create: (_) => UserVM(

lib/views/subscriptions/all_subscriptions_page.dart

@@ -68,7 +68,7 @@ class _SubscriptionsPageState extends State<SubscriptionsPage> {
                         },
                       ),
                       21.height,
-                      ListView.separated( 
+                      ListView.separated(
                         itemBuilder: (BuildContext context, int index) {
                           return AllSubscriptionsCard(
                             subcriptionsVM.tempSubscriptions[index],