From a3e91f527884e7e1be895c7c3782945a6e627fab Mon Sep 17 00:00:00 2001
From: Karan Sharma <55722391+ksharma-xyz@users.noreply.github.com>
Date: Thu, 26 Dec 2024 09:31:44 +1100
Subject: [PATCH] Scope Koin Modules to MainApplication

https://github.com/InsertKoinIO/koin/issues/2078#issuecomment-2561922247
---
 .idea/gradle.xml                                  |  1 +
 .../xyz/ksharma/koinsingleton/MainActivity.kt     | 15 ++-------------
 .../xyz/ksharma/koinsingleton/MainApplication.kt  | 14 +++++++++-----
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae733f1..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/app/src/main/java/xyz/ksharma/koinsingleton/MainActivity.kt b/app/src/main/java/xyz/ksharma/koinsingleton/MainActivity.kt
index a802c4b..64063fc 100644
--- a/app/src/main/java/xyz/ksharma/koinsingleton/MainActivity.kt
+++ b/app/src/main/java/xyz/ksharma/koinsingleton/MainActivity.kt
@@ -11,15 +11,12 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import org.koin.android.ext.koin.androidContext
+import org.koin.androidx.compose.KoinAndroidContext
 import org.koin.androidx.compose.koinViewModel
-import org.koin.compose.KoinApplication
 import org.koin.core.module.dsl.viewModelOf
-import org.koin.dsl.koinConfiguration
 import org.koin.dsl.module
 import xyz.ksharma.koinsingleton.ui.theme.KoinSingletonBugTheme
 
-
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,7 +24,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             val navController = rememberNavController()
 
-            KoinApplication(application = koinConfig) {
+            KoinAndroidContext {
                 KoinSingletonBugTheme {
                     Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                         NavHost(
@@ -53,14 +50,6 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-val koinConfig = koinConfiguration {
-    modules(
-        repoModule,
-        viewModelsModule,
-    )
-    androidContext(MainApplication.instance ?: error("No Android application context set"))
-}
-
 val viewModelsModule = module {
     viewModelOf(::HomeViewModel)
     viewModelOf(::DetailViewModel)
diff --git a/app/src/main/java/xyz/ksharma/koinsingleton/MainApplication.kt b/app/src/main/java/xyz/ksharma/koinsingleton/MainApplication.kt
index 6e8a23d..c616c4b 100644
--- a/app/src/main/java/xyz/ksharma/koinsingleton/MainApplication.kt
+++ b/app/src/main/java/xyz/ksharma/koinsingleton/MainApplication.kt
@@ -1,15 +1,19 @@
 package xyz.ksharma.koinsingleton
 
 import android.app.Application
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
 
 class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
-    }
-
-    companion object {
-        var instance: Application? = null
+        startKoin {
+            modules(
+                repoModule,
+                viewModelsModule,
+            )
+            androidContext(this@MainApplication)
+        }
     }
 }