From 17da9f675727414691fe8e7f547665b49faea731 Mon Sep 17 00:00:00 2001
From: Antoine Jaury <antoine@jaury.eu>
Date: Tue, 9 Jun 2026 17:22:43 +0200
Subject: [PATCH] refactor: integrate Koin for dependency injection across
 platforms

---
 README.md                                     |  7 ++++++-
 androidApp/build.gradle.kts                   |  2 +-
 androidApp/src/main/AndroidManifest.xml       |  1 +
 .../kotlin/fr/ajaury/gwenedeg/GwenedegApp.kt  |  5 +++++
 desktopApp/build.gradle.kts                   |  2 +-
 .../main/kotlin/fr/ajaury/gwenedeg/main.kt    |  3 ++-
 gradle/libs.versions.toml                     |  7 +++++++
 shared/build.gradle.kts                       |  7 +++++++
 .../kotlin/fr/ajaury/gwenedeg/App.kt          | 20 ++++++++++---------
 .../kotlin/fr/ajaury/gwenedeg/di/Modules.kt   | 14 +++++++++++++
 .../gwenedeg/records/ui/RecordsScreen.kt      | 12 ++++++++++-
 .../fr/ajaury/gwenedeg/MainViewController.kt  |  1 +
 webApp/build.gradle.kts                       |  3 ++-
 .../webMain/kotlin/fr/ajaury/gwenedeg/main.kt |  2 ++
 14 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 androidApp/src/main/kotlin/fr/ajaury/gwenedeg/GwenedegApp.kt
 create mode 100644 shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt

diff --git a/README.md b/README.md
index dcbe6cd..7c966b7 100644
--- a/README.md
+++ b/README.md
@@ -43,4 +43,9 @@ Learn more about [Kotlin Multiplatform](https://www.jetbrains.com/help/kotlin-mu
 [Kotlin/Wasm](https://kotl.in/wasm/)…
 
 We would appreciate your feedback on Compose/Web and Kotlin/Wasm in the public Slack channel [#compose-web](https://slack-chats.kotlinlang.org/c/compose-web).
-If you face any issues, please report them on [YouTrack](https://youtrack.jetbrains.com/newIssue?project=CMP).
\ No newline at end of file
+If you face any issues, please report them on [YouTrack](https://youtrack.jetbrains.com/newIssue?project=CMP).
+
+## Dependency injection
+
+For dependency injection, we use [Koin](https://insert-koin.io/). To know more about the integration with Compose,
+please refer to the [Koin Compose documentation](https://insert-koin.io/docs/reference/koin-compose/compose).
\ No newline at end of file
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 2a70c44..bb56f11 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -14,8 +14,8 @@ kotlin {
 dependencies {
     implementation(projects.shared)
 
+    // Compose
     implementation(libs.androidx.activity.compose)
-
     implementation(libs.compose.uiToolingPreview)
     debugImplementation(libs.compose.uiTooling)
 }
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 26403a7..3499af4 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
+        android:name=".GwenedegApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/GwenedegApp.kt b/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/GwenedegApp.kt
new file mode 100644
index 0000000..698b3f3
--- /dev/null
+++ b/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/GwenedegApp.kt
@@ -0,0 +1,5 @@
+package fr.ajaury.gwenedeg
+
+import android.app.Application
+
+class GwenedegApp : Application()
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
index 887d8be..920b14c 100644
--- a/desktopApp/build.gradle.kts
+++ b/desktopApp/build.gradle.kts
@@ -25,4 +25,4 @@ compose.desktop {
             packageVersion = "1.0.0"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt b/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt
index cd758ff..d62c403 100644
--- a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt
+++ b/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt
@@ -3,7 +3,7 @@ package fr.ajaury.gwenedeg
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 
-fun main() =
+fun main() {
     application {
         Window(
             onCloseRequest = ::exitApplication,
@@ -12,3 +12,4 @@ fun main() =
             App()
         }
     }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7dd0540..c11fdee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ kotlin = "2.3.21"
 kotlin-wrappers = "2026.5.5"
 kotlinx-coroutines = "1.11.0"
 material3 = "1.11.0-alpha07"
+koin = "4.2.1"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -34,6 +35,12 @@ compose-material3 = { module = "org.jetbrains.compose.material3:material3", vers
 compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
 compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" }
 compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" }
+koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" }
+koin-core = { module = "io.insert-koin:koin-core" }
+koin-core-viewmodel = { module = "io.insert-koin:koin-core-viewmodel" }
+koin-compose = { module = "io.insert-koin:koin-compose" }
+koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" }
+koin-android = { module = "io.insert-koin:koin-android" }
 kotlinx-coroutinesSwing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 wrappers-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version.ref = "kotlin-wrappers" }
 
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 1979f6b..dad8825 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -65,6 +65,13 @@ kotlin {
             implementation(libs.compose.uiToolingPreview)
             implementation(libs.androidx.lifecycle.viewmodelCompose)
             implementation(libs.androidx.lifecycle.runtimeCompose)
+
+            // DI
+            implementation(project.dependencies.platform(libs.koin.bom))
+            implementation(libs.koin.core)
+            implementation(libs.koin.core.viewmodel)
+            implementation(libs.koin.compose)
+            implementation(libs.koin.compose.viewmodel)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt
index de4d45e..4f21146 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt
@@ -2,20 +2,22 @@ package fr.ajaury.gwenedeg
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.tooling.preview.Preview
-import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository
+import fr.ajaury.gwenedeg.di.appModule
 import fr.ajaury.gwenedeg.records.ui.RecordsScreen
-import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
+import org.koin.compose.KoinApplication
+import org.koin.dsl.koinConfiguration
 
 @Composable
 @Preview
 fun App() {
-    val viewModel = remember {
-        RecordsViewModel(InMemoryRecordRepository())
-    }
-
-    MaterialTheme {
-        RecordsScreen(viewModel)
+    KoinApplication(
+        configuration = koinConfiguration {
+            modules(appModule)
+        },
+    ) {
+        MaterialTheme {
+            RecordsScreen()
+        }
     }
 }
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt
new file mode 100644
index 0000000..fb8a11e
--- /dev/null
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt
@@ -0,0 +1,14 @@
+package fr.ajaury.gwenedeg.di
+
+import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository
+import fr.ajaury.gwenedeg.records.domain.RecordRepository
+import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.factoryOf
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.dsl.module
+
+val appModule = module {
+    factoryOf(::InMemoryRecordRepository) { bind<RecordRepository>() }
+    viewModelOf(::RecordsViewModel)
+}
diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
index 5627272..5ed0a8e 100644
--- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
+++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt
@@ -14,11 +14,21 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import fr.ajaury.gwenedeg.records.domain.Record
 import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
-fun RecordsScreen(viewModel: RecordsViewModel) {
+fun RecordsScreen(viewModel: RecordsViewModel = koinViewModel()) {
     val records by viewModel.uiState.collectAsStateWithLifecycle()
+
+    RecordsScreen(
+        records = records,
+    )
+}
+
+@Composable
+fun RecordsScreen(records: List<Record>) {
     Scaffold { innerPadding ->
         LazyColumn(
             modifier =
diff --git a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt b/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt
index 454b9b8..a4d92bf 100644
--- a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt
+++ b/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt
@@ -2,4 +2,5 @@ package fr.ajaury.gwenedeg
 
 import androidx.compose.ui.window.ComposeUIViewController
 
+@Suppress("ktlint:standard:function-naming")
 fun MainViewController() = ComposeUIViewController { App() }
diff --git a/webApp/build.gradle.kts b/webApp/build.gradle.kts
index 865afe9..cca7888 100644
--- a/webApp/build.gradle.kts
+++ b/webApp/build.gradle.kts
@@ -22,7 +22,8 @@ kotlin {
         commonMain.dependencies {
             implementation(projects.shared)
 
+            // Compose
             implementation(libs.compose.ui)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt b/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt
index 8f1ef28..c4d81e4 100644
--- a/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt
+++ b/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package fr.ajaury.gwenedeg
 
 import androidx.compose.ui.ExperimentalComposeUiApi