From dba24780f8208155e472531c2ae5e8fb00670cd3 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Sun, 14 May 2023 17:36:46 +0600
Subject: [PATCH] actualize with new microutils

---
 gradle/libs.versions.toml                |  5 +++--
 mvvm/build.gradle                        |  1 +
 mvvm/src/main/kotlin/ViewFragment.kt     |  4 ++--
 mvvm/src/main/kotlin/utils/LazyInject.kt | 16 ----------------
 4 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 mvvm/src/main/kotlin/utils/LazyInject.kt

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9959a945..ac6911f6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ kotlin-coroutines = "1.6.4"
 kotlin-serialization = "1.5.0"
 dokka = "1.8.10"
 
-microutils = "0.18.3"
+microutils = "0.18.4"
 kslog = "1.1.1"
 uuid = "0.7.0"
 
@@ -22,7 +22,7 @@ android-minSdk = "21"
 android-compileSdk = "33"
 android-buildTools = "33.0.1"
 
-android-core-ktx = "1.9.0"
+android-core-ktx = "1.10.1"
 android-appcompat = "1.6.1"
 android-material = "1.6.1"
 android-compose-material3 = "1.0.1"
@@ -47,6 +47,7 @@ microutils-coroutines = { module = "dev.inmo:micro_utils.coroutines", version.re
 microutils-coroutines-compose = { module = "dev.inmo:micro_utils.coroutines.compose", version.ref = "microutils" }
 microutils-startup-plugin = { module = "dev.inmo:micro_utils.startup.plugin", version.ref = "microutils" }
 microutils-startup-launcher = { module = "dev.inmo:micro_utils.startup.launcher", version.ref = "microutils" }
+microutils-koin = { module = "dev.inmo:micro_utils.koin", version.ref = "microutils" }
 kslog = { module = "dev.inmo:kslog", version.ref = "kslog" }
 uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
 
diff --git a/mvvm/build.gradle b/mvvm/build.gradle
index bafccd14..96bb8252 100644
--- a/mvvm/build.gradle
+++ b/mvvm/build.gradle
@@ -14,6 +14,7 @@ kotlin {
             dependencies {
                 api project(":navigation.core")
                 api libs.microutils.coroutines.compose
+                api libs.microutils.koin
                 api libs.koin.core
                 api compose.runtime
             }
diff --git a/mvvm/src/main/kotlin/ViewFragment.kt b/mvvm/src/main/kotlin/ViewFragment.kt
index 04dc78d1..f240bf65 100644
--- a/mvvm/src/main/kotlin/ViewFragment.kt
+++ b/mvvm/src/main/kotlin/ViewFragment.kt
@@ -13,10 +13,10 @@ import androidx.compose.ui.platform.ComposeView
 import dev.inmo.kslog.common.d
 import dev.inmo.kslog.common.logger
 import dev.inmo.micro_utils.coroutines.compose.asComposeState
+import dev.inmo.micro_utils.koin.lazyInject
 import dev.inmo.navigation.core.NavigationNodeState
 import dev.inmo.navigation.core.configs.NavigationNodeDefaultConfig
 import dev.inmo.navigation.core.fragments.NodeFragment
-import dev.inmo.navigation.mvvm.utils.inject
 import kotlinx.coroutines.CoroutineScope
 import org.koin.core.parameter.parametersOf
 import kotlin.reflect.KClass
@@ -43,7 +43,7 @@ abstract class ViewFragment<ViewModel: dev.inmo.navigation.mvvm.ViewModel, Confi
         }
     }
 
-    val viewModel: ViewModel by inject(kClassFactory = ::viewModelClass) {
+    val viewModel: ViewModel by lazyInject(kClassFactory = ::viewModelClass) {
         Log.d { "Retrieving view model" }
         parametersOf(node)
     }
diff --git a/mvvm/src/main/kotlin/utils/LazyInject.kt b/mvvm/src/main/kotlin/utils/LazyInject.kt
deleted file mode 100644
index 310710a7..00000000
--- a/mvvm/src/main/kotlin/utils/LazyInject.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package dev.inmo.navigation.mvvm.utils
-
-import org.koin.core.parameter.ParametersDefinition
-import org.koin.core.qualifier.Qualifier
-import org.koin.java.KoinJavaComponent
-import kotlin.reflect.KClass
-
-fun <T> inject(
-    qualifier: Qualifier? = null,
-    kClassFactory: () -> KClass<*>,
-    parameters: ParametersDefinition? = null
-): Lazy<T> {
-    return lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
-        KoinJavaComponent.get(kClassFactory().java, qualifier, parameters)
-    }
-}