From 371a0d74395ef8248ebe05d288ba5d6c6918c3ad Mon Sep 17 00:00:00 2001 From: Sultan khan Date: Mon, 1 Sep 2025 19:28:28 +0300 Subject: [PATCH] initial --- android/app/build.gradle | 15 +++++++++++---- android/build.gradle | 3 ++- .../build/reports/problems/problems-report.html | 2 +- android/gradle.properties | 6 ++++-- android/gradle/wrapper/gradle-wrapper.properties | 1 - lib/config/config.dart | 4 ++-- lib/uitl/app-permissions.dart | 3 ++- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 10fbe461..5c131cb2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,9 +1,9 @@ plugins { id "com.android.application" - id "kotlin-android" + id "com.google.firebase.crashlytics" id "com.google.gms.google-services" + id "kotlin-android" id "dev.flutter.flutter-gradle-plugin" - id "com.google.firebase.crashlytics" id "com.huawei.agconnect" // id("com.mapbox.gradle.application") // id("com.mapbox.gradle.plugins.ndk") @@ -20,7 +20,7 @@ if (keystorePropertiesFile.exists()) { android { namespace 'com.ejada.hmg' compileSdk 36 - ndkVersion '28.2.13676358' + ndkVersion '27.0.12077973' defaultConfig { applicationId "com.ejada.hmg" @@ -69,10 +69,14 @@ android { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + firebaseCrashlytics { + mappingFileUploadEnabled false + } } staging { matchingFallbacks = ['debug', 'qa', 'release'] } + } packagingOptions { jniLibs { @@ -95,6 +99,7 @@ android { coreLibraryDesugaringEnabled true } + // kotlinOptions { // jvmTarget = '17' // } @@ -176,5 +181,7 @@ dependencies { androidTestImplementation "androidx.test:core:1.6.1" implementation 'com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5' + implementation 'com.google.firebase:firebase-crashlytics:18.4.1' + implementation 'com.google.firebase:firebase-analytics:21.5.0' // implementation project(':vitalSignEngine') -} +} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 74abf447..6f4b8a0f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -97,6 +97,7 @@ allprojects { } } } + } @@ -110,4 +111,4 @@ subprojects { tasks.register("clean", Delete) { delete rootProject.layout.buildDirectory -} +} \ No newline at end of file diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html index bb369a92..a33c3daa 100644 --- a/android/build/reports/problems/problems-report.html +++ b/android/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/android/gradle.properties b/android/gradle.properties index ff84a4dc..9ef7cd07 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,7 +1,9 @@ -org.gradle.jvmargs=-Xmx4096m -kotlin.daemon.jvmargs=-Xmx4096m +org.gradle.jvmargs=-Xmx8096m +kotlin.daemon.jvmargs=-Xmx8096m android.useAndroidX=true android.enableJetifier=true android.suppressUnsupportedCompileSdk=33 MAPBOX_USER_NAME = "mapbox" MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg" +org.gradle.java.home=/Users/mohamedmekawy/Library/Java/JavaVirtualMachines/corretto-23.0.2/Contents/Home +android.jdkTarget=21 \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 7f19c88a..2733ed5d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,3 @@ -#Wed Jul 02 15:26:33 AST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip diff --git a/lib/config/config.dart b/lib/config/config.dart index fb64f682..e425c27d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - // var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; + var BASE_URL = 'https://uat.hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; diff --git a/lib/uitl/app-permissions.dart b/lib/uitl/app-permissions.dart index f344ae67..0ee75d12 100644 --- a/lib/uitl/app-permissions.dart +++ b/lib/uitl/app-permissions.dart @@ -1,4 +1,5 @@ -import 'dart:io'; + + import 'dart:io'; import 'package:hmg_patient_app/uitl/translations_delegate_base.dart'; import 'package:hmg_patient_app/widgets/dialogs/confirm_dialog.dart';