A fully functional Android app built entirely with Kotlin and Jetpack Compose
Rename fake to demo.
Jaehwa Noh27ca860745f0
diff --git a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeNewsRepository.kt b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeNewsRepository.ktindex 5ceff4dd0..070c7ed38 100644--- a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeNewsRepository.kt+++ b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeNewsRepository.kt@@ -25,7 +25,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource+import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.flow.Flow@@ -41,7 +41,7 @@ import javax.inject.Inject*/internal class FakeNewsRepository @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,- private val datasource: FakeNiaNetworkDataSource,+ private val datasource: DemoNiaNetworkDataSource,) : NewsRepository {override fun getNewsResources(diff --git a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeTopicsRepository.kt b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeTopicsRepository.ktindex f8ebca29e..0b81dd309 100644--- a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeTopicsRepository.kt+++ b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeTopicsRepository.kt@@ -21,7 +21,7 @@ import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositorimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource+import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSourceimport kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.flow@@ -38,7 +38,7 @@ import javax.inject.Inject*/internal class FakeTopicsRepository @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,- private val datasource: FakeNiaNetworkDataSource,+ private val datasource: DemoNiaNetworkDataSource,) : TopicsRepository {override fun getTopics(): Flow<List<Topic>> = flow {emit(diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.ktindex 7f9a69959..7675af7e9 100644--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt@@ -17,7 +17,7 @@package com.google.samples.apps.nowinandroid.core.data.testdoublesimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource+import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeListimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic@@ -35,7 +35,7 @@ enum class CollectionType {*/class TestNiaNetworkDataSource : NiaNetworkDataSource {- private val source = FakeNiaNetworkDataSource(+ private val source = DemoNiaNetworkDataSource(UnconfinedTestDispatcher(),Json { ignoreUnknownKeys = true },)diff --git a/core/network/src/demo/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt b/core/network/src/demo/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.ktindex 850b00201..42c2ffe8f 100644--- a/core/network/src/demo/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt+++ b/core/network/src/demo/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt@@ -17,7 +17,7 @@package com.google.samples.apps.nowinandroid.core.network.diimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource+import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSourceimport dagger.Bindsimport dagger.Moduleimport dagger.hilt.InstallIn@@ -28,5 +28,5 @@ import dagger.hilt.components.SingletonComponentinternal interface FlavoredNetworkModule {@Binds- fun binds(impl: FakeNiaNetworkDataSource): NiaNetworkDataSource+ fun binds(impl: DemoNiaNetworkDataSource): NiaNetworkDataSource}diff --git a/core/network/src/main/kotlin/JvmUnitTestFakeAssetManager.kt b/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.ktsimilarity index 92%rename from core/network/src/main/kotlin/JvmUnitTestFakeAssetManager.ktrename to core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.ktindex 79370d5a8..9c86a5c2e 100644--- a/core/network/src/main/kotlin/JvmUnitTestFakeAssetManager.kt+++ b/core/network/src/main/kotlin/JvmUnitTestDemoAssetManager.kt@@ -15,7 +15,7 @@*/import androidx.annotation.VisibleForTesting-import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager+import com.google.samples.apps.nowinandroid.core.network.demo.DemoAssetManagerimport java.io.Fileimport java.io.InputStreamimport java.util.Properties@@ -26,7 +26,7 @@ import java.util.Properties* @see <a href="https://developer.android.com/reference/tools/gradle-api/7.3/com/android/build/api/dsl/UnitTestOptions">UnitTestOptions</a>*/@VisibleForTesting-internal object JvmUnitTestFakeAssetManager : FakeAssetManager {+internal object JvmUnitTestDemoAssetManager : DemoAssetManager {private val config =requireNotNull(javaClass.getResource("com/android/tools/test_config.properties")) {"""diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeAssetManager.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.ktsimilarity index 81%rename from core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeAssetManager.ktrename to core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.ktindex 53ad7d48d..e5fb07bb3 100644--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeAssetManager.kt+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoAssetManager.kt@@ -1,5 +1,5 @@/*- * Copyright 2022 The Android Open Source Project+ * 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.@@ -14,10 +14,10 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.core.network.fake+package com.google.samples.apps.nowinandroid.core.network.demoimport java.io.InputStream-fun interface FakeAssetManager {+fun interface DemoAssetManager {fun open(fileName: String): InputStream}diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.ktsimilarity index 91%rename from core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.ktrename to core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.ktindex 6ef90ecff..b7c912c00 100644--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt@@ -1,5 +1,5 @@/*- * Copyright 2022 The Android Open Source Project+ * 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.@@ -14,9 +14,9 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.core.network.fake+package com.google.samples.apps.nowinandroid.core.network.demo-import JvmUnitTestFakeAssetManager+import JvmUnitTestDemoAssetManagerimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IOimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource@@ -33,10 +33,10 @@ import javax.inject.Inject/*** [NiaNetworkDataSource] implementation that provides static news resources to aid development*/-class FakeNiaNetworkDataSource @Inject constructor(+class DemoNiaNetworkDataSource @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,private val networkJson: Json,- private val assets: FakeAssetManager = JvmUnitTestFakeAssetManager,+ private val assets: DemoAssetManager = JvmUnitTestDemoAssetManager,) : NiaNetworkDataSource {@OptIn(ExperimentalSerializationApi::class)diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktindex a68683c7c..a99464304 100644--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt@@ -22,7 +22,7 @@ import coil.ImageLoaderimport coil.decode.SvgDecoderimport coil.util.DebugLoggerimport com.google.samples.apps.nowinandroid.core.network.BuildConfig-import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager+import com.google.samples.apps.nowinandroid.core.network.demo.DemoAssetManagerimport dagger.Moduleimport dagger.Providesimport dagger.hilt.InstallIn@@ -48,7 +48,7 @@ internal object NetworkModule {@Singletonfun providesFakeAssetManager(@ApplicationContext context: Context,- ): FakeAssetManager = FakeAssetManager(context.assets::open)+ ): DemoAssetManager = DemoAssetManager(context.assets::open)@Provides@Singletondiff --git a/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt b/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.ktsimilarity index 90%rename from core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.ktrename to core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.ktindex a0c60fdcb..e60cfeb3e 100644--- a/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt+++ b/core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.kt@@ -1,5 +1,5 @@/*- * Copyright 2022 The Android Open Source Project+ * 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.@@ -14,9 +14,9 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.core.network.fake+package com.google.samples.apps.nowinandroid.core.network.demo-import JvmUnitTestFakeAssetManager+import JvmUnitTestDemoAssetManagerimport com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopicimport kotlinx.coroutines.test.StandardTestDispatcher@@ -29,18 +29,18 @@ import org.junit.Beforeimport org.junit.Testimport kotlin.test.assertEquals-class FakeNiaNetworkDataSourceTest {+class DemoNiaNetworkDataSourceTest {- private lateinit var subject: FakeNiaNetworkDataSource+ private lateinit var subject: DemoNiaNetworkDataSourceprivate val testDispatcher = StandardTestDispatcher()@Beforefun setUp() {- subject = FakeNiaNetworkDataSource(+ subject = DemoNiaNetworkDataSource(ioDispatcher = testDispatcher,networkJson = Json { ignoreUnknownKeys = true },- assets = JvmUnitTestFakeAssetManager,+ assets = JvmUnitTestDemoAssetManager,)}