Refactor: remove platform-specific implementation of createApi and centralize JSON configuration

Author: Sushant-Hande

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/database/CartDataStore.kt

@@ -18,8 +18,8 @@ package com.example.fruitties.database
 import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.okio.OkioSerializer
 import androidx.datastore.core.okio.OkioStorage
-import com.example.fruitties.di.json
 import com.example.fruitties.model.Fruittie
+import com.example.fruitties.utils.JsonConfig.json
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.Serializable
 import okio.BufferedSink

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/AppContainer.kt

@@ -18,13 +18,21 @@ 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.utils.JsonConfig.json
 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
 
 class AppContainer(
     private val factory: Factory,
@@ -59,4 +67,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",
+        )
 }

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/Factory.kt

@@ -17,28 +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 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 }

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/utils/JsonConfig.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.fruitties.utils
+
+import kotlinx.serialization.json.Json
+
+object JsonConfig {
+    val json = Json { ignoreUnknownKeys = true }
+}