Skip to content

Remove platform-specific implementation of createApi in Factory #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 15, 2025
Merged

Remove platform-specific implementation of createApi in Factory #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5661fa5
Removed platform-specific implementation of createApi
Sushant-Hande Sep 9, 2025
b5aed0d
Refactor: remove platform-specific implementation of createApi and ce…
Sushant-Hande Sep 9, 2025
217c99a
Refactor: centralize JSON configuration and removed JsonConfig.kt
Sushant-Hande Sep 11, 2025
d06a5e6
Refactor: Addressed formatting issue by running spotless command
Sushant-Hande Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Fruitties/shared/src/androidMain/kotlin/com/example/fruitties/di/Factory.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
import com.example.fruitties.database.AppDatabase
import com.example.fruitties.database.CartDataStore
import com.example.fruitties.database.DB_FILE_NAME
import com.example.fruitties.network.FruittieApi
import kotlinx.coroutines.Dispatchers

actual class Factory(
Expand All @@ -45,6 +44,4 @@ actual class Factory(
"cart.json",
).absolutePath
}

actual fun createApi(): FruittieApi = commonCreateApi()
}
21 changes: 20 additions & 1 deletion Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/AppContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,29 @@ package com.example.fruitties.di
import androidx.lifecycle.viewmodel.initializer
import androidx.lifecycle.viewmodel.viewModelFactory
import com.example.fruitties.DataRepository
import com.example.fruitties.network.FruittieApi
import com.example.fruitties.network.FruittieNetworkApi
import com.example.fruitties.viewmodel.CartViewModel
import com.example.fruitties.viewmodel.FruittieViewModel
import com.example.fruitties.viewmodel.FruittieViewModel.Companion.FRUITTIE_ID_KEY
import com.example.fruitties.viewmodel.MainViewModel
import io.ktor.client.HttpClient
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.http.ContentType
import io.ktor.serialization.kotlinx.json.json
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.serialization.json.Json

val json = Json { ignoreUnknownKeys = true }

class AppContainer(
private val factory: Factory,
) {
val dataRepository: DataRepository by lazy {
DataRepository(
api = factory.createApi(),
api = commonCreateApi(),
database = factory.createRoomDatabase(),
cartDataStore = factory.createCartDataStore(),
scope = CoroutineScope(Dispatchers.Default + SupervisorJob()),
Expand Down Expand Up @@ -59,4 +68,14 @@ class AppContainer(
)
}
}

internal fun commonCreateApi(): FruittieApi =
FruittieNetworkApi(
client = HttpClient {
install(ContentNegotiation) {
json(json, contentType = ContentType.Any)
}
},
apiUrl = "https://android.github.io/kotlin-multiplatform-samples/fruitties-api",
)
}
21 changes: 0 additions & 21 deletions Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/Factory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,9 @@ package com.example.fruitties.di

import com.example.fruitties.database.AppDatabase
import com.example.fruitties.database.CartDataStore
import com.example.fruitties.network.FruittieApi
import com.example.fruitties.network.FruittieNetworkApi
import io.ktor.client.HttpClient
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.http.ContentType
import io.ktor.serialization.kotlinx.json.json
import kotlinx.serialization.json.Json

expect class Factory {
fun createRoomDatabase(): AppDatabase

fun createApi(): FruittieApi

fun createCartDataStore(): CartDataStore
}

internal fun commonCreateApi(): FruittieApi =
FruittieNetworkApi(
client = HttpClient {
install(ContentNegotiation) {
json(json, contentType = ContentType.Any)
}
},
apiUrl = "https://android.github.io/kotlin-multiplatform-samples/fruitties-api",
)

val json = Json { ignoreUnknownKeys = true }
3 changes: 0 additions & 3 deletions Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/Factory.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
import com.example.fruitties.database.AppDatabase
import com.example.fruitties.database.CartDataStore
import com.example.fruitties.database.DB_FILE_NAME
import com.example.fruitties.network.FruittieApi
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.IO
Expand Down Expand Up @@ -56,6 +55,4 @@ actual class Factory {
)
return requireNotNull(documentDirectory).path!!
}

actual fun createApi(): FruittieApi = commonCreateApi()
}