feat: pull kik code scanner impl into own vendor module

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

apps/codeApp/build.gradle.kts

@@ -111,8 +111,6 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     // libs (not included with services)
     implementation(project(":libs:locale"))
     implementation(project(":libs:vibrator"))
@@ -132,6 +130,8 @@ dependencies {
     implementation(project(":ui:resources"))
     implementation(project(":ui:theme"))
 
+    // kik code scanner
+    implementation(project(":vendor:kik:scanner"))
     // tipkit
     implementation(project(":vendor:tipkit:tipkit-m2"))
 

apps/codeApp/src/main/java/com/getcode/inject/AppModule.kt

@@ -10,6 +10,9 @@ import android.os.VibratorManager
 import android.telephony.TelephonyManager
 import androidx.biometric.BiometricManager
 import androidx.core.app.NotificationManagerCompat
+import com.getcode.analytics.CodeAnalyticsService
+import com.getcode.media.StaticImageAnalyzer
+import com.getcode.media.StaticImageHelper
 import com.getcode.util.AndroidLocale
 import com.getcode.util.AndroidPermissions
 import com.getcode.util.vibration.Api25Vibrator
@@ -125,4 +128,11 @@ object AppModule {
     @Provides
     @Singleton
     fun providesCodeScanner(): KikCodeScanner = KikCodeScannerImpl()
+
+    @Provides
+    fun providesStaticImageAnalysis(
+        @ApplicationContext context: Context,
+        scanner: KikCodeScanner,
+        analyticsService: CodeAnalyticsService
+    ): StaticImageAnalyzer = StaticImageHelper(context, scanner, analyticsService)
 }

…odes/implementation/StaticImageHelper.kt …a/com/getcode/media/StaticImageHelper.ktapps/codeApp/src/main/java/com/kik/kikx/kikcodes/implementation/StaticImageHelper.kt renamed to apps/codeApp/src/main/java/com/getcode/media/StaticImageHelper.kt apps/codeApp/src/main/java/com/kik/kikx/kikcodes/implementation/StaticImageHelper.kt renamed to apps/codeApp/src/main/java/com/getcode/media/StaticImageHelper.kt

@@ -1,4 +1,4 @@
-package com.kik.kikx.kikcodes.implementation
+package com.getcode.media
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -24,14 +24,15 @@ import java.io.File
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
+import androidx.core.graphics.scale
 
 class StaticImageHelper @Inject constructor(
     @ApplicationContext
     private val context: Context,
     private val scanner: KikCodeScanner,
     private val analytics: CodeAnalyticsService,
-) {
-    suspend fun analyze(uri: Uri): Result<ScannableKikCode> {
+): StaticImageAnalyzer {
+    override suspend fun analyze(uri: Uri): Result<ScannableKikCode> {
         val bitmap = context.uriToBitmap(uri)
         return if (bitmap != null) {
             detectCodeInImage(bitmap) { image, quality ->
@@ -221,8 +222,7 @@ class StaticImageHelper @Inject constructor(
         val yOffset = (bitmap.height - cropHeight) / 2
 
         val croppedBitmap = Bitmap.createBitmap(bitmap, xOffset, yOffset, cropWidth, cropHeight)
-        val scaledBitmap =
-            Bitmap.createScaledBitmap(croppedBitmap, bitmap.width, bitmap.height, true)
+        val scaledBitmap = croppedBitmap.scale(bitmap.width, bitmap.height)
 
         croppedBitmap.recycle()
         return scaledBitmap

apps/codeApp/src/main/java/com/getcode/view/main/scanner/camera/CodeScanner.kt

@@ -34,6 +34,7 @@ import com.getcode.libs.biometrics.Biometrics
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.utils.AnimationUtils
+import com.getcode.utils.ErrorUtils
 import com.getcode.utils.trace
 import com.kik.kikx.kikcodes.implementation.KikCodeScannerImpl
 import com.kik.kikx.kikcodes.implementation.rememberKikCodeAnalyzer
@@ -89,7 +90,11 @@ fun CodeScanner(
     var autoFocusPoint by remember { mutableStateOf(Offset.Unspecified) }
     var gestureController by remember { mutableStateOf<CameraGestureController?>(null) }
 
-    val kikCodeAnalyzer = rememberKikCodeAnalyzer(scanner, onCodeScanned)
+    val kikCodeAnalyzer = rememberKikCodeAnalyzer(
+        scanner = scanner,
+        onCodeScanned = onCodeScanned,
+        onError = { ErrorUtils.handleError(it) }
+    )
 
     val biometricsState = LocalBiometricsState.current
 

settings.gradle

@@ -61,6 +61,7 @@ include(
         ":ui:theme",
 
         // 3rd party imported dependencies
+        ":vendor:kik:scanner",
         ":vendor:tipkit:tipkit",
         ":vendor:tipkit:tipkit-m2",
 )

vendor/kik/scanner/.gitignore

@@ -0,0 +1,2 @@
+build/
+.gradle/

vendor/kik/scanner/build.gradle.kts

@@ -0,0 +1,55 @@
+plugins {
+    id(Plugins.android_library)
+    id(Plugins.kotlin_android)
+}
+
+android {
+    namespace = "com.kik.kikx"
+    compileSdk = Android.compileSdkVersion
+    defaultConfig {
+        minSdk = Android.minSdkVersion
+        targetSdk = Android.targetSdkVersion
+        buildToolsVersion = Android.buildToolsVersion
+        testInstrumentationRunner = Android.testInstrumentationRunner
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.java
+        freeCompilerArgs += listOf(
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.RequiresOptIn"
+        )
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Versions.java))
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlin {
+        jvmToolchain(17)
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose_compiler
+    }
+}
+
+dependencies {
+    api(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation(platform(Libs.compose_bom))
+    implementation(Libs.compose_ui)
+    implementation(Libs.androidx_camerax_core)
+    implementation(Libs.inject)
+    implementation(Libs.hilt)
+}