Merge pull request #321 from mbakgun/feature/koin-inject

mbakgun · web-flow · commit 48ff262922d1 · 2024-11-06T17:37:59.000+01:00
feature/koin-inject
diff --git a/androidApp/src/androidMain/kotlin/com/mbakgun/mj/App.kt b/androidApp/src/androidMain/kotlin/com/mbakgun/mj/App.kt
@@ -1,7 +1,6 @@
 package com.mbakgun.mj
 
 import android.app.Application
-import com.mbakgun.mj.di.viewModelModule
 import di.initKoin
 import org.koin.android.ext.koin.androidContext
 
@@ -11,7 +10,6 @@ class App : Application() {
         super.onCreate()
         initKoin {
             androidContext(this@App)
-            modules(viewModelModule)
         }
     }
 }
diff --git a/androidApp/src/androidMain/kotlin/com/mbakgun/mj/di/ViewModelModule.kt b/androidApp/src/androidMain/kotlin/com/mbakgun/mj/di/ViewModelModule.kt
diff --git a/androidApp/src/androidMain/kotlin/com/mbakgun/mj/ui/MainActivity.kt b/androidApp/src/androidMain/kotlin/com/mbakgun/mj/ui/MainActivity.kt
@@ -3,7 +3,6 @@ package com.mbakgun.mj.ui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import org.koin.android.ext.android.get
 import ui.MjImagesApp
 
 class MainActivity : AppCompatActivity() {
@@ -15,9 +14,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setComposable() {
         setContent {
-            MjImagesApp(
-                viewModel = get()
-            )
+            MjImagesApp()
         }
     }
 }
diff --git a/automotiveApp/src/main/java/com/mbakgun/mj/App.kt b/automotiveApp/src/main/java/com/mbakgun/mj/App.kt
@@ -1,7 +1,6 @@
 package com.mbakgun.mj
 
 import android.app.Application
-import com.mbakgun.mj.di.viewModelModule
 import di.initKoin
 import org.koin.android.ext.koin.androidContext
 
@@ -11,7 +10,6 @@ class App : Application() {
         super.onCreate()
         initKoin {
             androidContext(this@App)
-            modules(viewModelModule)
         }
     }
 }
diff --git a/automotiveApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt b/automotiveApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt
diff --git a/automotiveApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt b/automotiveApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt
@@ -3,7 +3,6 @@ package com.mbakgun.mj.ui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import org.koin.android.ext.android.get
 import ui.MjImagesApp
 
 class MainActivity : AppCompatActivity() {
@@ -15,9 +14,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setComposable() {
         setContent {
-            MjImagesApp(
-                viewModel = get()
-            )
+            MjImagesApp()
         }
     }
 }
diff --git a/desktopApp/src/jvmMain/kotlin/com/mbakgun/mj/Main.kt b/desktopApp/src/jvmMain/kotlin/com/mbakgun/mj/Main.kt
@@ -3,25 +3,18 @@ package com.mbakgun.mj
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import di.initKoin
-import domain.usecase.MjImagesFetchUseCase
-import domain.usecase.MjImagesUseCase
-import org.koin.java.KoinJavaComponent.inject
 import ui.MjImagesApp
-import ui.MjImagesViewModel
 
 fun main() {
     System.setProperty("apple.awt.application.appearance", "system")
-    initKoin { }
-    val fetchUseCase by inject<MjImagesFetchUseCase>(MjImagesFetchUseCase::class.java)
-    val useCase by inject<MjImagesUseCase>(MjImagesUseCase::class.java)
-    val viewModel = MjImagesViewModel(fetchUseCase, useCase)
+    initKoin()
 
     application {
         Window(
             onCloseRequest = ::exitApplication,
             title = "MjImages",
         ) {
-            MjImagesApp(viewModel)
+            MjImagesApp()
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,7 +18,8 @@ coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3"
 coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" }
 coil-network-ktor = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil3" }
 coil-mp = { module = "io.coil-kt.coil3:coil", version.ref = "coil3" }
-koin = { module = "io.insert-koin:koin-android", version.ref="koin" }
+koinAndroid = { module = "io.insert-koin:koin-android", version.ref="koin" }
+koinComposeViewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" }
 koinCore = { module = "io.insert-koin:koin-core", version.ref="koin" }
 koinTest = { module = "io.insert-koin:koin-test", version.ref="koin" }
 ktorClient = { module = "io.ktor:ktor-client-android", version.ref="ktorClient" }
diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift
@@ -5,18 +5,13 @@ import shared
 struct ComposeView: UIViewControllerRepresentable {
     
     func makeUIViewController(context: Context) -> UIViewController {
-        let viewModel = MjImagesViewModel.init(
-        fetchUseCase: MjImagesFetchUseCase.init(),
-        useCase: MjImagesUseCase.init()
-        )
-        return Main_iosKt.MainViewController(viewModel: viewModel)
+        return Main_iosKt.MainViewController()
     }
     
     func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}
 }
 
 struct ContentView: View {
-    
     init() {
        KoinModuleKt.doInitKoin()
     }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -54,6 +54,7 @@ kotlin {
 
             //di
             api(libs.koinCore)
+            api(libs.koinComposeViewmodel)
 
             //network
             implementation(libs.ktorClientCore)
@@ -77,7 +78,7 @@ kotlin {
         }
 
         androidMain.dependencies {
-            api(libs.koin)
+            api(libs.koinAndroid)
             implementation(libs.ktorClient)
             implementation(libs.lifecycle.runtime.android)
         }
diff --git a/shared/detekt-baseline.xml b/shared/detekt-baseline.xml
@@ -11,13 +11,13 @@
     <ID>FunctionNaming:MjImagesApp.kt$@Composable fun PreviewDialog( hqImageUrl: String, onDismissed: () -&gt; Unit, )</ID>
     <ID>FunctionNaming:MjImagesApp.kt$@Composable fun PreviewImage(hqImageUrl: String)</ID>
     <ID>FunctionNaming:MjImagesApp.kt$@Composable fun ScrollToTopButton( onClick: () -&gt; Unit, modifier: Modifier = Modifier )</ID>
-    <ID>FunctionNaming:MjImagesApp.kt$@OptIn(ExperimentalMaterialApi::class) @Composable fun MjImagesApp( viewModel: MjImagesViewModel )</ID>
+    <ID>FunctionNaming:MjImagesApp.kt$@OptIn(ExperimentalMaterialApi::class) @Composable fun MjImagesApp( viewModel: MjImagesViewModel = koinViewModel&lt;MjImagesViewModel&gt;() )</ID>
     <ID>FunctionNaming:String0.commonMain.kt$@InternalResourceApi internal fun _collectCommonMainString0Resources(map: MutableMap&lt;String, StringResource&gt;)</ID>
     <ID>FunctionNaming:String0.commonMain.kt$private fun init_failed_fetch_message(): StringResource</ID>
     <ID>FunctionNaming:String0.commonMain.kt$private fun init_snack_message(): StringResource</ID>
     <ID>FunctionNaming:Theme.kt$@Composable fun AppTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -&gt; Unit )</ID>
-    <ID>FunctionNaming:main.ios.kt$fun MainViewController(viewModel: MjImagesViewModel): UIViewController</ID>
-    <ID>LongMethod:MjImagesApp.kt$@OptIn(ExperimentalMaterialApi::class) @Composable fun MjImagesApp( viewModel: MjImagesViewModel )</ID>
+    <ID>FunctionNaming:main.ios.kt$fun MainViewController(): UIViewController</ID>
+    <ID>LongMethod:MjImagesApp.kt$@OptIn(ExperimentalMaterialApi::class) @Composable fun MjImagesApp( viewModel: MjImagesViewModel = koinViewModel&lt;MjImagesViewModel&gt;() )</ID>
     <ID>MagicNumber:Colors.kt$0xFF1F1B16</ID>
     <ID>MagicNumber:Colors.kt$0xFF3E2D16</ID>
     <ID>MagicNumber:Colors.kt$0xFF452B00</ID>
diff --git a/shared/src/commonMain/kotlin/di/KoinModule.kt b/shared/src/commonMain/kotlin/di/KoinModule.kt
@@ -10,8 +10,10 @@ import domain.mapper.MjImagesMapper
 import domain.usecase.MjImagesFetchUseCase
 import domain.usecase.MjImagesUseCase
 import org.koin.core.context.startKoin
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.module
+import ui.MjImagesViewModel
 import util.getDispatcherProvider
 
 private val utilityModule = module {
@@ -35,7 +37,12 @@ private val useCaseModule = module {
     factory { MjImagesUseCase() }
 }
 
-private val sharedModules = listOf(useCaseModule, repositoryModule, apiModule, utilityModule)
+private val uiModule = module {
+    viewModelOf(::MjImagesViewModel)
+}
+
+private val sharedModules =
+    listOf(uiModule, useCaseModule, repositoryModule, apiModule, utilityModule)
 
 fun initKoin(appDeclaration: KoinAppDeclaration) = startKoin {
     modules(sharedModules)
diff --git a/shared/src/commonMain/kotlin/ui/MjImagesApp.kt b/shared/src/commonMain/kotlin/ui/MjImagesApp.kt
@@ -88,6 +88,7 @@ import kotlinx.coroutines.launch
 import midjourneyimagescomposemultiplatform.shared.generated.resources.Res
 import midjourneyimagescomposemultiplatform.shared.generated.resources.snack_message
 import org.jetbrains.compose.resources.getString
+import org.koin.compose.viewmodel.koinViewModel
 import ui.theme.AppTheme
 import util.OnBottomReached
 import util.getAsyncImageLoader
@@ -96,7 +97,7 @@ import util.getImageProvider
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun MjImagesApp(
-    viewModel: MjImagesViewModel
+    viewModel: MjImagesViewModel = koinViewModel<MjImagesViewModel>()
 ) {
     setSingletonImageLoaderFactory { context ->
         getAsyncImageLoader(context)
diff --git a/shared/src/iosMain/kotlin/main.ios.kt b/shared/src/iosMain/kotlin/main.ios.kt
@@ -1,9 +1,8 @@
 import androidx.compose.ui.window.ComposeUIViewController
 import platform.UIKit.UIViewController
 import ui.MjImagesApp
-import ui.MjImagesViewModel
 
-fun MainViewController(viewModel: MjImagesViewModel): UIViewController =
+fun MainViewController(): UIViewController =
     ComposeUIViewController {
-        MjImagesApp(viewModel)
+        MjImagesApp()
     }
diff --git a/televisionApp/src/main/java/com/mbakgun/mj/App.kt b/televisionApp/src/main/java/com/mbakgun/mj/App.kt
@@ -1,7 +1,6 @@
 package com.mbakgun.mj
 
 import android.app.Application
-import com.mbakgun.mj.di.viewModelModule
 import di.initKoin
 import org.koin.android.ext.koin.androidContext
 
@@ -11,7 +10,6 @@ class App : Application() {
         super.onCreate()
         initKoin {
             androidContext(this@App)
-            modules(viewModelModule)
         }
     }
 }
diff --git a/televisionApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt b/televisionApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt
diff --git a/televisionApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt b/televisionApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt
@@ -3,7 +3,6 @@ package com.mbakgun.mj.ui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import org.koin.android.ext.android.get
 import ui.MjImagesApp
 
 class MainActivity : AppCompatActivity() {
@@ -15,9 +14,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setComposable() {
         setContent {
-            MjImagesApp(
-                viewModel = get()
-            )
+            MjImagesApp()
         }
     }
 }
diff --git a/wasmApp/src/wasmJsMain/kotlin/com/mbakgun/mj/Main.kt b/wasmApp/src/wasmJsMain/kotlin/com/mbakgun/mj/Main.kt
@@ -3,21 +3,15 @@ package com.mbakgun.mj
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
 import di.initKoin
-import domain.usecase.MjImagesFetchUseCase
-import domain.usecase.MjImagesUseCase
 import kotlinx.browser.document
 import ui.MjImagesApp
-import ui.MjImagesViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    val koin = initKoin { }.koin
-    val fetchUseCase = koin.get<MjImagesFetchUseCase>()
-    val useCase = koin.get<MjImagesUseCase>()
-    val viewModel = MjImagesViewModel(fetchUseCase, useCase)
+    initKoin()
 
     CanvasBasedWindow("MjImagesApp") {
-        MjImagesApp(viewModel)
+        MjImagesApp()
     }
     document.getElementById("loader-container")?.remove()
 }
diff --git a/wearApp/src/main/java/com/mbakgun/mj/App.kt b/wearApp/src/main/java/com/mbakgun/mj/App.kt
@@ -1,7 +1,6 @@
 package com.mbakgun.mj
 
 import android.app.Application
-import com.mbakgun.mj.di.viewModelModule
 import di.initKoin
 import org.koin.android.ext.koin.androidContext
 
@@ -11,7 +10,6 @@ class App : Application() {
         super.onCreate()
         initKoin {
             androidContext(this@App)
-            modules(viewModelModule)
         }
     }
 }
diff --git a/wearApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt b/wearApp/src/main/java/com/mbakgun/mj/di/ViewModelModule.kt
diff --git a/wearApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt b/wearApp/src/main/java/com/mbakgun/mj/ui/MainActivity.kt
@@ -3,7 +3,6 @@ package com.mbakgun.mj.ui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import org.koin.android.ext.android.get
 import ui.MjImagesApp
 
 class MainActivity : AppCompatActivity() {
@@ -15,9 +14,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setComposable() {
         setContent {
-            MjImagesApp(
-                viewModel = get()
-            )
+            MjImagesApp()
         }
     }
 }
diff --git a/webApp/src/jsMain/kotlin/com/mbakgun/mj/Main.kt b/webApp/src/jsMain/kotlin/com/mbakgun/mj/Main.kt
@@ -3,23 +3,16 @@ package com.mbakgun.mj
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
 import di.initKoin
-import domain.usecase.MjImagesFetchUseCase
-import domain.usecase.MjImagesUseCase
 import kotlinx.browser.document
 import org.jetbrains.skiko.wasm.onWasmReady
 import ui.MjImagesApp
-import ui.MjImagesViewModel
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    val koin = initKoin { }.koin
-    val fetchUseCase = koin.get<MjImagesFetchUseCase>()
-    val useCase = koin.get<MjImagesUseCase>()
-    val viewModel = MjImagesViewModel(fetchUseCase, useCase)
-
+    initKoin()
     onWasmReady {
         CanvasBasedWindow("MjImagesApp") {
-            MjImagesApp(viewModel)
+            MjImagesApp()
         }
         document.getElementById("loader-container")?.remove()
     }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.mbakgun.mj`
`2`	`2`
`3`	`3`	`import android.app.Application`
`4`		`-import com.mbakgun.mj.di.viewModelModule`
`5`	`4`	`import di.initKoin`
`6`	`5`	`import org.koin.android.ext.koin.androidContext`
`7`	`6`
`@@ -11,7 +10,6 @@ class App : Application() {`
`11`	`10`	`super.onCreate()`
`12`	`11`	`initKoin {`
`13`	`12`	`androidContext(this@App)`
`14`		`- modules(viewModelModule)`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package com.mbakgun.mj.ui`
`3`	`3`	`import android.os.Bundle`
`4`	`4`	`import androidx.activity.compose.setContent`
`5`	`5`	`import androidx.appcompat.app.AppCompatActivity`
`6`		`-import org.koin.android.ext.android.get`
`7`	`6`	`import ui.MjImagesApp`
`8`	`7`
`9`	`8`	`class MainActivity : AppCompatActivity() {`
`@@ -15,9 +14,7 @@ class MainActivity : AppCompatActivity() {`
`15`	`14`
`16`	`15`	`private fun setComposable() {`
`17`	`16`	`setContent {`
`18`		`- MjImagesApp(`
`19`		`- viewModel = get()`
`20`		`- )`
	`17`	`+ MjImagesApp()`
`21`	`18`	`}`
`22`	`19`	`}`
`23`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,13 @@ import shared`
`5`	`5`	`struct ComposeView: UIViewControllerRepresentable {`
`6`	`6`
`7`	`7`	`func makeUIViewController(context: Context) -> UIViewController {`
`8`		`- let viewModel = MjImagesViewModel.init(`
`9`		`- fetchUseCase: MjImagesFetchUseCase.init(),`
`10`		`- useCase: MjImagesUseCase.init()`
`11`		`- )`
`12`		`- return Main_iosKt.MainViewController(viewModel: viewModel)`
	`8`	`+ return Main_iosKt.MainViewController()`
`13`	`9`	`}`
`14`	`10`
`15`	`11`	`func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}`
`16`	`12`	`}`
`17`	`13`
`18`	`14`	`struct ContentView: View {`
`19`		`-`
`20`	`15`	`init() {`
`21`	`16`	`KoinModuleKt.doInitKoin()`
`22`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ kotlin {`
`54`	`54`
`55`	`55`	`//di`
`56`	`56`	`api(libs.koinCore)`
	`57`	`+ api(libs.koinComposeViewmodel)`
`57`	`58`
`58`	`59`	`//network`
`59`	`60`	`implementation(libs.ktorClientCore)`
`@@ -77,7 +78,7 @@ kotlin {`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`androidMain.dependencies {`
`80`		`- api(libs.koin)`
	`81`	`+ api(libs.koinAndroid)`
`81`	`82`	`implementation(libs.ktorClient)`
`82`	`83`	`implementation(libs.lifecycle.runtime.android)`
`83`	`84`	`}`