Adding missing dependency injection in implementation separated in modules

Author: RajashekarRaju

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/MainActivity.kt

@@ -5,7 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
-import com.developersbreach.kotlindictionarymultiplatform.di.appModule
+import com.developersbreach.kotlindictionarymultiplatform.di.appModules
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
@@ -17,7 +17,7 @@ class MainActivity : ComponentActivity() {
 
         startKoin {
             androidContext(this@MainActivity)
-            modules(appModule)
+            appModules()
         }
 
         setContent {

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/api/GeminiApiService.kt

@@ -1,26 +1,29 @@
 package com.developersbreach.kotlindictionarymultiplatform.core.network.api
 
 import com.developersbreach.kotlindictionarymultiplatform.Log
-import com.developersbreach.kotlindictionarymultiplatform.core.network.client.KtorClientProvider
 import com.developersbreach.kotlindictionarymultiplatform.core.network.parser.GeminiJsonParser
 import com.developersbreach.kotlindictionarymultiplatform.core.network.request.GeminiPromptBuilder
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.KotlinTopicDetails
+import io.ktor.client.HttpClient
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
+import kotlinx.serialization.json.Json
 
-object GeminiApiService {
-
+class GeminiApiService(
+    private val client: HttpClient,
+    private val json: Json,
+) {
     suspend fun generateTopicDetails(
         topicId: String,
         apiKey: String,
     ): KotlinTopicDetails {
         val prompt = GeminiPromptBuilder.buildRequest(topicId)
         val requestBody = GeminiPromptBuilder.buildRequestBody(prompt)
 
-        val response = KtorClientProvider.client.post(
+        val response = client.post(
             "https://generativelanguage.googleapis.com/v1/models/gemini-2.0-flash:generateContent?key=$apiKey",
         ) {
             contentType(ContentType.Application.Json)
@@ -30,9 +33,9 @@ object GeminiApiService {
         val responseBody = response.bodyAsText()
         Log.i("GeminiRawResponse", responseBody)
 
-        val cleanJson = GeminiJsonParser.extractCleanJson(responseBody, KtorClientProvider.json)
+        val cleanJson = GeminiJsonParser.extractCleanJson(responseBody, json)
         Log.i("CleanJson", cleanJson)
 
-        return KtorClientProvider.json.decodeFromString(KotlinTopicDetails.serializer(), cleanJson)
+        return json.decodeFromString(KotlinTopicDetails.serializer(), cleanJson)
     }
 }

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/network/client/KtorClientProvider.kt

@@ -5,13 +5,15 @@ import com.developersbreach.kotlindictionarymultiplatform.core.network.api.Gemin
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.KotlinTopicDetails
 import com.developersbreach.kotlindictionarymultiplatform.getOpenApiKey
 
-class DetailRepository {
+class DetailRepository(
+    private val service: GeminiApiService,
+) {
 
     suspend fun fetchTopic(
         topicId: String,
     ): Either<Throwable, KotlinTopicDetails> {
         return Either.catch {
-            GeminiApiService.generateTopicDetails(
+            service.generateTopicDetails(
                 topicId = topicId,
                 apiKey = getOpenApiKey(),
             )

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/detail/repository/DetailRepository.kt

@@ -0,0 +1,10 @@
+package com.developersbreach.kotlindictionarymultiplatform.di
+
+import com.developersbreach.kotlindictionarymultiplatform.core.network.api.GeminiApiService
+import org.koin.dsl.module
+
+internal val apiModule = module {
+    single {
+        GeminiApiService(client = get(), json = get())
+    }
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/ApiModule.kt

@@ -0,0 +1,12 @@
+package com.developersbreach.kotlindictionarymultiplatform.di
+
+import org.koin.core.KoinApplication
+
+internal fun KoinApplication.appModules() {
+    modules(
+        httpClientModule,
+        apiModule,
+        repositoryModule,
+        viewModelModule,
+    )
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/AppModules.kt

@@ -0,0 +1,24 @@
+package com.developersbreach.kotlindictionarymultiplatform.di
+
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import org.koin.dsl.module
+
+internal val httpClientModule = module {
+    single {
+        Json {
+            ignoreUnknownKeys = true
+            prettyPrint = true
+        }
+    }
+
+    single {
+        HttpClient {
+            install(ContentNegotiation) {
+                json(get())
+            }
+        }
+    }
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/HttpClientModule.kt

@@ -0,0 +1,14 @@
+package com.developersbreach.kotlindictionarymultiplatform.di
+
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.repository.DetailRepository
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
+import org.koin.dsl.module
+
+internal val repositoryModule = module {
+    single {
+        DetailRepository(get())
+    }
+    single {
+        TopicRepository
+    }
+}

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/RepositoryModule.kt

@@ -1,17 +1,12 @@
 package com.developersbreach.kotlindictionarymultiplatform.di
 
-import com.developersbreach.kotlindictionarymultiplatform.data.detail.repository.DetailRepository
-import org.koin.dsl.module
+import androidx.lifecycle.SavedStateHandle
 import com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail.DetailViewModel
 import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicViewModel
 import org.koin.core.module.dsl.viewModel
-import androidx.lifecycle.SavedStateHandle
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
-
-val appModule = module {
-    single { DetailRepository() }
-    single { TopicRepository }
+import org.koin.dsl.module
 
+internal val viewModelModule = module {
     viewModel { (handle: SavedStateHandle) ->
         DetailViewModel(
             savedStateHandle = handle,