From ad45c7ef27c3bedd39ca2a09dab23952bda103d9 Mon Sep 17 00:00:00 2001
From: Hadrian Burkhardt <hadrian.burkhardt@gmx.de>
Date: Fri, 8 May 2026 18:30:42 +0200
Subject: [PATCH] updates to newer version

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../scanner/ui/components/CameraPreview.kt    | 23 ++++++++++++++-----
 .../clean/scanner/ui/screens/ScannerScreen.kt |  2 +-
 build.gradle.kts                              |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ecaba30..e862738 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.WRITE_CONTACTS" tools:node="remove" />
 
     <application
+        tools:targetApi="33"
         android:name=".CleanScannerApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/clean/scanner/ui/components/CameraPreview.kt b/app/src/main/java/com/clean/scanner/ui/components/CameraPreview.kt
index 3426bd0..e93376b 100644
--- a/app/src/main/java/com/clean/scanner/ui/components/CameraPreview.kt
+++ b/app/src/main/java/com/clean/scanner/ui/components/CameraPreview.kt
@@ -1,4 +1,4 @@
-package de.softwareapp_hb.privateqrscanner.ui.components
+package com.clean.scanner.ui.components
 
 import android.annotation.SuppressLint
 import android.util.Size
@@ -7,6 +7,8 @@ import android.view.ScaleGestureDetector
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.Preview
+import androidx.camera.core.resolutionselector.ResolutionSelector
+import androidx.camera.core.resolutionselector.ResolutionStrategy
 import androidx.camera.core.UseCaseGroup
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
@@ -81,9 +83,9 @@ fun CameraPreview(
             override fun onScale(detector: ScaleGestureDetector): Boolean {
                 val camera = cameraRef.value ?: return false
                 val zoomState = camera.cameraInfo.zoomState.value ?: return false
-                val nextZoom = zoomRatio.value * detector.scaleFactor
+                val nextZoom = zoomRatio.floatValue * detector.scaleFactor
                 val clampedZoom = max(zoomState.minZoomRatio, min(nextZoom, zoomState.maxZoomRatio))
-                zoomRatio.value = clampedZoom
+                zoomRatio.floatValue = clampedZoom
                 camera.cameraControl.setZoomRatio(clampedZoom)
                 return true
             }
@@ -104,12 +106,21 @@ fun CameraPreview(
         provider.unbindAll()
 
         val preview = Preview.Builder().build().apply {
-            setSurfaceProvider(previewView.surfaceProvider)
+            surfaceProvider = previewView.surfaceProvider
         }
 
         val imageAnalysis = ImageAnalysis.Builder()
             .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-            .setTargetResolution(Size(1280, 720))
+            .setResolutionSelector(
+                ResolutionSelector.Builder()
+                    .setResolutionStrategy(
+                        ResolutionStrategy(
+                            Size(1280, 720),
+                            ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER
+                        )
+                    )
+                    .build()
+            )
             .build().apply {
                 setAnalyzer(cameraExecutor, analyzer)
             }
@@ -134,7 +145,7 @@ fun CameraPreview(
 
         onTorchAvailabilityChanged(camera.cameraInfo.hasFlashUnit())
         cameraRef.value = camera
-        zoomRatio.value = camera.cameraInfo.zoomState.value?.zoomRatio ?: 1f
+        zoomRatio.floatValue = camera.cameraInfo.zoomState.value?.zoomRatio ?: 1f
     }
 
     LaunchedEffect(torchEnabled) {
diff --git a/app/src/main/java/com/clean/scanner/ui/screens/ScannerScreen.kt b/app/src/main/java/com/clean/scanner/ui/screens/ScannerScreen.kt
index 6094599..7eaf361 100644
--- a/app/src/main/java/com/clean/scanner/ui/screens/ScannerScreen.kt
+++ b/app/src/main/java/com/clean/scanner/ui/screens/ScannerScreen.kt
@@ -79,7 +79,7 @@ import de.softwareapp_hb.privateqrscanner.domain.ScanResult
 import de.softwareapp_hb.privateqrscanner.ui.BatchScanRecord
 import de.softwareapp_hb.privateqrscanner.ui.EventTicketScanDecision
 import de.softwareapp_hb.privateqrscanner.ui.UseCaseView
-import de.softwareapp_hb.privateqrscanner.ui.components.CameraPreview
+import com.clean.scanner.ui.components.CameraPreview
 import de.softwareapp_hb.privateqrscanner.ui.capabilities
 import de.softwareapp_hb.privateqrscanner.util.ClipboardUtil
 import de.softwareapp_hb.privateqrscanner.util.Intents
diff --git a/build.gradle.kts b/build.gradle.kts
index 7f20ed6..f61b33a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
     id("com.android.application") version "9.2.1" apply false
     id("com.google.devtools.ksp") version "2.3.5" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.3.10" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.21" apply false
 }