From c2ca9009c09d6d7111f03e04fefbc65f87982786 Mon Sep 17 00:00:00 2001 From: Gergely Hegedus Date: Mon, 18 Dec 2023 20:17:38 +0100 Subject: [PATCH] Support api 24 --- app/build.gradle | 6 +++--- .../org/fnives/android/qrcodetransfer/read/CameraView.kt | 4 ++-- .../org/fnives/android/qrcodetransfer/read/ReadQRCode.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4773f46..8244a69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { applicationId applicationIdArgument ?: "org.fnives.android.qrcodetransfer" - minSdk 26 + minSdk 24 targetSdk 34 versionCode applicationVersionCodeArgument ?: 1 versionName "1.0" @@ -75,7 +75,7 @@ dependencies { def compose_ui_version = '1.5.4' implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' - implementation 'androidx.activity:activity-compose:1.8.1' + implementation 'androidx.activity:activity-compose:1.8.2' implementation "androidx.compose.ui:ui:$compose_ui_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" implementation 'androidx.compose.material:material:1.5.4' @@ -87,7 +87,7 @@ dependencies { implementation 'com.google.accompanist:accompanist-permissions:0.32.0' // camerax - def camerax_version = "1.3.0" + def camerax_version = "1.3.1" implementation "androidx.camera:camera-camera2:$camerax_version" implementation "androidx.camera:camera-lifecycle:$camerax_version" implementation "androidx.camera:camera-view:$camerax_version" diff --git a/app/src/main/java/org/fnives/android/qrcodetransfer/read/CameraView.kt b/app/src/main/java/org/fnives/android/qrcodetransfer/read/CameraView.kt index 1e424ed..b425860 100644 --- a/app/src/main/java/org/fnives/android/qrcodetransfer/read/CameraView.kt +++ b/app/src/main/java/org/fnives/android/qrcodetransfer/read/CameraView.kt @@ -42,7 +42,7 @@ fun interface PreviewProcessor { @Composable fun CameraView( - interval: Duration, + intervalInMillis: Long, processImage: PreviewProcessor, backgroundColor: Color = Color.Black, ) { @@ -74,7 +74,7 @@ fun CameraView( bitmapReaderScope.launch { while (isActive) { - delay(interval.toMillis()) + delay(intervalInMillis) bitmapStream.value = bitmap } } diff --git a/app/src/main/java/org/fnives/android/qrcodetransfer/read/ReadQRCode.kt b/app/src/main/java/org/fnives/android/qrcodetransfer/read/ReadQRCode.kt index 16ca401..71c525c 100644 --- a/app/src/main/java/org/fnives/android/qrcodetransfer/read/ReadQRCode.kt +++ b/app/src/main/java/org/fnives/android/qrcodetransfer/read/ReadQRCode.kt @@ -61,7 +61,7 @@ fun QRCodeReader() { .weight(1f) .fillMaxWidth(), ) { - CameraView(interval = Duration.ofSeconds(1), processImage = { + CameraView(intervalInMillis = 1000L, processImage = { readState = processImage(it, readState) }) }