Merge branch 'master' into flutter_upgrade_with_timesheet_changes

android/app/build.gradle

@@ -33,7 +33,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "hmg.cloudSolutions.mohem"
-        minSdkVersion 30
+        minSdkVersion 28
         targetSdk 35
         targetSdk = flutter.targetSdkVersion
         versionCode flutter.versionCode

android/gradle.properties

@@ -1,7 +1,12 @@
-org.gradle.jvmargs=-Xmx4096m
+#org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1024m
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m -Dfile.encoding=UTF-8
 kotlin.daemon.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
 apmsInstrumentationEnabled=false
 
-#org.gradle.java.home=/Users/amirs/Library/Java/JavaVirtualMachines/jbr-17.0.12/Contents/Home/
+#org.gradle.java.home=/Users/amirs/Library/Java/JavaVirtualMachines/jbr-17.0.12/Contents/Home/
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Jul 08 11:08:34 AST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle

@@ -30,8 +30,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.11.0' apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id "com.android.application" version '8.11.1' apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
     id("com.google.gms.google-services") version "4.4.3" apply false
     id("com.google.firebase.crashlytics") version "3.0.4" apply false
     id('org.gradle.toolchains.foojay-resolver-convention') version '0.9.0' apply false

lib/classes/consts.dart

@@ -9,12 +9,13 @@ class ApiConsts {
  //  static String baseUrl = "https://webservices.hmg.com"; // PreProd
  //  static String baseUrl = "https://hmgwebservices.com"; // Live server
 
-  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   static String ssoBaseUrl = "https://sso.hmg.com"; // New Live server
   //
   // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  // static String baseUrl = "http://10.201.214.101:2027/";
   // static String baseUrl = "http://10.20.200.111:1010/";
-  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   //static String eLearningBaseUrl = "https://elearning.hmg.com/moodle_dev/api/"; // Elearning server UAT
   static String eLearningBaseUrl = "https://elearning.hmg.com/moodle/api/"; // Elearning server live
   static String enSATLiveURL = "https://ensat.hmg.com/auth/autologin"; // ENSAT server live

lib/theme/app_theme.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';

pubspec.yaml

@@ -17,8 +17,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 3.7.2+300082
-#version: 3.9.3+1
+version: 3.7.7+300087
+#version: 3.9.8+1
 
 environment:
   sdk: ^3.7.0
@@ -65,8 +65,8 @@ dependencies:
   month_year_picker: ^0.5.0+1
   month_picker_dialog: ^6.0.3
 #  open_file: ^3.2.1
-  open_filex: ^4.6.0
-  wifi_iot: ^0.3.19+1
+  open_filex: ^4.7.0
+  wifi_iot: ^0.4.0
   flutter_html: ^3.0.0-alpha.6
   mobile_scanner: ^6.0.10
   #  flutter_barcode_scanner: ^2.0.0
@@ -94,7 +94,7 @@ dependencies:
   swipe_to: ^1.0.2
   flutter_webrtc: ^0.12.11
 #  camera: ^0.10.3
-  camera: ^0.11.2
+  camera: ^0.12.1
   flutter_local_notifications: ^18.0.1
   #firebase_analytics: any
 
@@ -137,7 +137,7 @@ dependencies:
   #  store_checker: ^1.1.0
   google_api_availability: ^5.0.1
   google_maps_flutter_web: ^0.5.4
-  in_app_update: 4.1.0
+  in_app_update: ^5.0.0
   flutter_inappwebview: ^6.1.5
   flutter_blurhash: ^0.8.0