Adopt Koin for dependency injection

Author: simolus3

demos/supabase-todolist/gradle/libs.versions.toml

@@ -13,6 +13,7 @@ kotlinx-io = "0.5.4"
 ktor = "3.0.1"
 uuid = "0.8.2"
 buildKonfig = "0.15.1"
+koin-bom = "4.0.2"
 
 junit = "4.13.2"
 
@@ -59,6 +60,8 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co
 androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-preview" }
 compose-lifecycle = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin-bom" }
+koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin-bom" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "android-gradle-plugin" }

demos/supabase-todolist/iosApp/iosApp.xcodeproj/project.pbxproj

@@ -118,6 +118,7 @@
 				7555FF79242A565900829871 /* Resources */,
 				F85CB1118929364A9C6EFABC /* Frameworks */,
 				3C5ACF3A4AAFF294B2A5839B /* [CP] Embed Pods Frameworks */,
+				1015E800EC39A6B62654C306 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -191,6 +192,23 @@
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 		};
+		1015E800EC39A6B62654C306 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3C5ACF3A4AAFF294B2A5839B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

demos/supabase-todolist/shared/build.gradle.kts

@@ -51,6 +51,8 @@ kotlin {
             implementation(compose.components.resources)
             implementation(compose.materialIconsExtended)
             implementation(libs.compose.lifecycle)
+            api(libs.koin.core)
+            implementation(libs.koin.compose.viewmodel)
         }
         androidMain.dependencies {
             api(libs.androidx.activity.compose)

demos/supabase-todolist/shared/src/commonMain/kotlin/com/powersync/demos/App.kt

@@ -15,6 +15,7 @@ import com.powersync.DatabaseDriverFactory
 import com.powersync.PowerSyncDatabase
 import com.powersync.bucket.BucketPriority
 import com.powersync.connector.supabase.SupabaseConnector
+import com.powersync.connectors.PowerSyncBackendConnector
 import com.powersync.demos.components.EditDialog
 import com.powersync.demos.powersync.ListContent
 import com.powersync.demos.powersync.ListItem
@@ -26,21 +27,49 @@ import com.powersync.demos.screens.SignUpScreen
 import com.powersync.demos.screens.TodosScreen
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.runBlocking
+import org.koin.compose.KoinApplication
+import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
+import org.koin.core.KoinApplication
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.viewModel
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.core.module.dsl.withOptions
+import org.koin.dsl.module
+
+val sharedAppModule = module {
+    single { PowerSyncDatabase(get(), schema) }
+    single {
+        SupabaseConnector(
+            powerSyncEndpoint = Config.POWERSYNC_URL,
+            supabaseUrl = Config.SUPABASE_URL,
+            supabaseKey = Config.SUPABASE_ANON_KEY,
+        )
+    } withOptions { bind<PowerSyncBackendConnector>() }
+
+    viewModel { NavController(Screen.Home) }
+    viewModelOf(::AuthViewModel)
+}
 
 @Composable
 fun App(
     factory: DatabaseDriverFactory,
     modifier: Modifier = Modifier,
 ) {
-    val supabase =
-        remember {
-            SupabaseConnector(
-                powerSyncEndpoint = Config.POWERSYNC_URL,
-                supabaseUrl = Config.SUPABASE_URL,
-                supabaseKey = Config.SUPABASE_ANON_KEY,
-            )
-        }
-    val db = remember { PowerSyncDatabase(factory, schema) }
+    fun KoinApplication.withDatabase() {
+        modules(module { single { factory } }, sharedAppModule)
+    }
+
+    KoinApplication(application = KoinApplication::withDatabase) {
+        AppContent(modifier=modifier)
+    }
+}
+
+@Composable
+internal fun AppContent(
+    db: PowerSyncDatabase = koinInject(),
+    modifier: Modifier = Modifier,
+) {
     // Debouncing the status flow prevents flicker
     val status by db.currentStatus
         .asFlow()
@@ -55,12 +84,8 @@ fun App(
         derivedStateOf { status.statusForPriority(BucketPriority(1)).hasSynced }
     }
 
-    val navController = remember { NavController(Screen.Home) }
-    val authViewModel =
-        remember {
-            AuthViewModel(supabase, db, navController)
-        }
-
+    val authViewModel = koinViewModel<AuthViewModel>()
+    val navController = koinViewModel<NavController>()
     val authState by authViewModel.authState.collectAsState()
     val currentScreen by navController.currentScreen.collectAsState()
 

demos/supabase-todolist/shared/src/commonMain/kotlin/com/powersync/demos/NavController.kt

@@ -1,5 +1,6 @@
 package com.powersync.demos
 
+import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -11,7 +12,7 @@ sealed class Screen {
     data object Todos : Screen()
 }
 
-internal class NavController(initialScreen: Screen) {
+internal class NavController(initialScreen: Screen): ViewModel() {
     private val _currentScreen = MutableStateFlow<Screen>(initialScreen)
     val currentScreen: StateFlow<Screen> = _currentScreen.asStateFlow()