diff --git a/android/app/build.gradle b/android/app/build.gradle index 98c75fbe..4a9605d9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -99,6 +99,8 @@ android { debug { debuggable true signingConfig signingConfigs.debug + minifyEnabled false + shrinkResources false // ndk { // abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64' // } @@ -135,6 +137,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = '1.8' + } } flutter { @@ -184,6 +189,10 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'androidx.test.ext:junit:1.1.5' implementation 'com.android.volley:volley:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.8.5' + implementation 'androidx.activity:activity:1.9.3' def room_version = "2.4.0-alpha04" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" @@ -216,4 +225,6 @@ dependencies { implementation 'com.airbnb.android:lottie:5.2.0' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22' + implementation 'com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0' + } diff --git a/android/build.gradle b/android/build.gradle index 532ac03d..69a65d6a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -41,6 +41,7 @@ buildscript { classpath 'com.google.gms:google-services:4.3.8' // classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath 'com.huawei.agconnect:agcp:1.5.2.300' + classpath("com.android.tools:r8:8.2.42") classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12' classpath "com.mapbox.gradle.plugins:access-token:0.4.0" } diff --git a/android/gradle.properties b/android/gradle.properties index cb9913a1..9efff7ab 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -4,5 +4,5 @@ android.useAndroidX=true android.enableJetifier=true android.suppressUnsupportedCompileSdk=33 MAPBOX_USER_NAME = "mapbox" -#MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg" -MAPBOX_DOWNLOADS_TOKEN="pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ" \ No newline at end of file +MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg" +#MAPBOX_DOWNLOADS_TOKEN="pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ" \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index 202891d9..d7a696e3 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,6 +1,6 @@ include ':app' include ':vital-sign-engine' -project(':vital-sign-engine').projectDir = new File('C:\\Users\\taha.alam\\AndroidStudioProjects\\diplomatic-quarter\\packages\\vital_sign_camera') +project(':vital-sign-engine').projectDir = new File('C:\\Users\\taha.alam\\AndroidStudioProjects\\diplomatic-quarter\\packages\\vital_sign_camera\\android\\libs') def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() diff --git a/lib/vital_signs/vital_sign.dart b/lib/vital_signs/vital_sign.dart index 8a58aa73..a108889b 100644 --- a/lib/vital_signs/vital_sign.dart +++ b/lib/vital_signs/vital_sign.dart @@ -29,8 +29,7 @@ class _VitalSignState extends State { @override Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( + return Scaffold( body: Stack(children: [ VitalSignCamera( onCreated: _onVitalSignCameraCreated, @@ -56,14 +55,13 @@ class _VitalSignState extends State { ), ), ]), - ), ); } void _onVideoFrameProcessed(VideoFrameProcessedEvent event) { - setState(() { - _heartRate = event.healthResult?.health?.vitalSigns.heartRate; - }); + // setState(() { + // _heartRate = event.healthResult?.health?.vitalSigns.heartRate; + // }); } void _onVitalSignCameraCreated(VitalSignCameraController controller) {