ScanSettings View model refactor

app/build.gradle.kts

@@ -15,6 +15,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.koin)
 }
 
 fun getGitCommitHash(): String {
@@ -118,6 +119,12 @@ kotlin {
 }
 
 dependencies {
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose)
+    implementation(libs.koin.annotations)
+    implementation(libs.koin.compose.viewmodel)
+    implementation(libs.koin.androix.navigation)
     implementation(libs.esclkt)
     implementation(libs.zoomable)
     implementation(libs.kotlin.reflect)

app/src/main/java/io/github/chrisimx/scanbridge/CropScreen.kt

@@ -100,7 +100,8 @@ fun CropScreen(sessionID: String, pageIdx: Int, returnRoute: BaseRoute, navContr
     var processing: Boolean by remember { mutableStateOf(false) }
 
     val originalSessionResult: Result<Session?> = remember {
-        SessionsStore.loadSession(context, sessionID)
+        // We don't need to load scan regions so we can set caps to null:
+        SessionsStore.loadSession(context, sessionID, null)
     }
 
     if (originalSessionResult.getOrNull() == null) {

app/src/main/java/io/github/chrisimx/scanbridge/MainActivity.kt

@@ -28,26 +28,29 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import io.github.chrisimx.scanbridge.logs.FileLogger
-import io.github.chrisimx.scanbridge.util.LocaleProvider
+import io.github.chrisimx.scanbridge.services.AndroidLocaleProvider
 import java.io.BufferedWriter
 import java.io.File
 import java.io.FileWriter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import timber.log.Timber
 
 class MainActivity : ComponentActivity() {
     var debugWriter: BufferedWriter? = null
     var tree: Timber.Tree? = null
     var saveDebugFileLauncher: ActivityResultLauncher<Intent>? = null
 
+    private val localeProvider: AndroidLocaleProvider by inject()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Thread.setDefaultUncaughtExceptionHandler(CrashHandler(this))
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        LocaleProvider.update()
+        localeProvider.update()
 
         val sharedPreferences = this.getSharedPreferences("scanbridge", MODE_PRIVATE)
 

app/src/main/java/io/github/chrisimx/scanbridge/ScanBridgeApplication.kt

@@ -1,11 +1,33 @@
 package io.github.chrisimx.scanbridge
 
 import android.app.Application
+import io.github.chrisimx.scanbridge.data.ui.ScanSettingsComposableStateHolder
+import io.github.chrisimx.scanbridge.data.ui.ScanningScreenViewModel
+import io.github.chrisimx.scanbridge.services.AndroidLocaleProvider
+import io.github.chrisimx.scanbridge.services.LocaleProvider
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import org.koin.dsl.bind
+import org.koin.dsl.module
+import org.koin.plugin.module.dsl.factory
+import org.koin.plugin.module.dsl.single
+import org.koin.plugin.module.dsl.viewModel
 import timber.log.Timber
 
+val appModule = module {
+    single<AndroidLocaleProvider>() bind LocaleProvider::class
+    factory<ScanSettingsComposableStateHolder>()
+    viewModel<ScanningScreenViewModel>()
+}
+
 class ScanBridgeApplication : Application() {
     override fun onCreate() {
         super.onCreate()
+        startKoin {
+            androidContext(this@ScanBridgeApplication)
+            modules(appModule)
+        }
+
         Timber.plant(Timber.DebugTree())
     }
 }

app/src/main/java/io/github/chrisimx/scanbridge/ScanningScreen.kt

@@ -611,7 +611,6 @@ fun ScanningScreen(
             ModalBottomSheet({ scanningViewModel.setScanSettingsMenuOpen(false) }) {
                 ScanSettingsUI(
                     Modifier.heightIn(max = screenHeight * 0.8f),
-                    context,
                     scanningViewModel.scanningScreenData.scanSettingsVM!!
                 )
             }