Merge pull request #128 from nativesintech/update-android-34

Update to Android 34
nativesintech · Aug 17, 2024 · 73f5913 · 73f5913
2 parents e627e12 + 988d5c0
commit 73f5913
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.mehequanna.mmiw"
         minSdkVersion 24
-        targetSdkVersion 33
-        versionCode 4
+        targetSdkVersion 34
+        versionCode 7
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/Android/app/src/main/java/com/mehequanna/mmiw/MmiwActivity.kt b/Android/app/src/main/java/com/mehequanna/mmiw/MmiwActivity.kt
@@ -49,7 +49,7 @@ import java.io.IOException
 import java.util.*
 
 class MmiwActivity : AppCompatActivity() {
-    private val TAG: String = MmiwActivity.javaClass.name
+    private val TAG: String = MmiwActivity::class.java.name
     private lateinit var arFragment: FaceArFragment
     private var faceMeshTexture: Texture? = null
     private var faceNodeMap = HashMap<AugmentedFace, AugmentedFaceNode>()
@@ -341,13 +341,13 @@ class MmiwActivity : AppCompatActivity() {
             if (copyResult == PixelCopy.SUCCESS) {
                 val file: File?
                 val databaseFile: File?
-                val bitmap: Bitmap?
                 try {
                     val screenElementsBitmap: Bitmap = takeScreenshot()
-                    bitmap = combineBitmaps(arViewBitmap, screenElementsBitmap)
-                    databaseFile = saveBitmapToDisk(bitmap.compressBitmapForDatabase())
-                    file = saveBitmapToDisk(bitmap)
-                    saveImageFiles(bitmap, file, databaseFile)
+                    combineBitmaps(arViewBitmap, screenElementsBitmap).also { combinedBitmap ->
+                        databaseFile = saveBitmapToDisk(combinedBitmap.compressBitmapForDatabase())
+                        file = saveBitmapToDisk(combinedBitmap)
+                        saveImageFiles(combinedBitmap, file, databaseFile)
+                    }
                 } catch (e: Exception) {
                     val toast: Toast = Toast.makeText(
                         this, e.toString(),