initialise Koin in shared code

Kotlin · Nov 2, 2024 · 179fb96 · 179fb96
1 parent 370f64d
commit 179fb96
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git a/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/MuseumApp.kt b/composeApp/src/androidMain/kotlin/com/jetbrains/kmpapp/MuseumApp.kt
@@ -1,11 +1,9 @@
 package com.jetbrains.kmpapp
 
 import android.app.Application
-import com.jetbrains.kmpapp.di.initKoin
 
 class MuseumApp : Application() {
     override fun onCreate() {
         super.onCreate()
-        initKoin()
     }
 }
diff --git a/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/App.kt b/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/App.kt
@@ -11,9 +11,12 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import com.jetbrains.kmpapp.di.dataModule
+import com.jetbrains.kmpapp.di.viewModelModule
 import com.jetbrains.kmpapp.screens.detail.DetailScreen
 import com.jetbrains.kmpapp.screens.list.ListScreen
 import kotlinx.serialization.Serializable
+import org.koin.compose.KoinApplication
 
 @Serializable
 object ListDestination
@@ -23,24 +26,28 @@ data class DetailDestination(val objectId: Int)
 
 @Composable
 fun App() {
-    MaterialTheme(
-        colors = if (isSystemInDarkTheme()) darkColors() else lightColors()
-    ) {
-        Surface {
-            val navController: NavHostController = rememberNavController()
-            NavHost(navController = navController, startDestination = ListDestination) {
-                composable<ListDestination> {
-                    ListScreen(navigateToDetails = { objectId ->
-                        navController.navigate(DetailDestination(objectId))
-                    })
-                }
-                composable<DetailDestination> { backStackEntry ->
-                    DetailScreen(
-                        objectId = backStackEntry.toRoute<DetailDestination>().objectId,
-                        navigateBack = {
-                            navController.popBackStack()
-                        }
-                    )
+    KoinApplication(application = {
+        modules(dataModule, viewModelModule)
+    }) {
+        MaterialTheme(
+            colors = if (isSystemInDarkTheme()) darkColors() else lightColors()
+        ) {
+            Surface {
+                val navController: NavHostController = rememberNavController()
+                NavHost(navController = navController, startDestination = ListDestination) {
+                    composable<ListDestination> {
+                        ListScreen(navigateToDetails = { objectId ->
+                            navController.navigate(DetailDestination(objectId))
+                        })
+                    }
+                    composable<DetailDestination> { backStackEntry ->
+                        DetailScreen(
+                            objectId = backStackEntry.toRoute<DetailDestination>().objectId,
+                            navigateBack = {
+                                navController.popBackStack()
+                            }
+                        )
+                    }
                 }
             }
         }

diff --git a/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/di/Koin.kt b/composeApp/src/commonMain/kotlin/com/jetbrains/kmpapp/di/Koin.kt
@@ -40,12 +40,3 @@ val viewModelModule = module {
     factoryOf(::ListViewModel)
     factoryOf(::DetailViewModel)
 }
-
-fun initKoin() {
-    startKoin {
-        modules(
-            dataModule,
-            viewModelModule,
-        )
-    }
-}
diff --git a/iosApp/iosApp/iOSApp.swift b/iosApp/iosApp/iOSApp.swift
@@ -3,10 +3,6 @@ import ComposeApp
 
 @main
 struct iOSApp: App {
-    init() {
-        KoinKt.doInitKoin()
-    }
-
     var body: some Scene {
         WindowGroup {
             ContentView()