A fully functional Android app built entirely with Kotlin and Jetpack Compose
Rename NiaPreferencesLocalDataSource to NiaPreferencesDataSource
madroid600d5e738c5b
diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.ktindex 6fd6b69bf..5344810f3 100644--- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt@@ -23,7 +23,7 @@ import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDaoimport com.google.samples.apps.nowinandroid.core.database.model.AuthorEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.mapclass OfflineFirstAuthorsRepository @Inject constructor(private val authorDao: AuthorDao,private val network: NiaNetworkDataSource,- private val niaPreferences: NiaPreferencesLocalDataSource,+ private val niaPreferences: NiaPreferencesDataSource,) : AuthorsRepository {override fun getAuthorStream(id: String): Flow<Author> =diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.ktindex 157632b31..4e2c64c9d 100644--- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt@@ -23,7 +23,7 @@ import com.google.samples.apps.nowinandroid.core.database.dao.TopicDaoimport com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.mapclass OfflineFirstTopicsRepository @Inject constructor(private val topicDao: TopicDao,private val network: NiaNetworkDataSource,- private val niaPreferences: NiaPreferencesLocalDataSource,+ private val niaPreferences: NiaPreferencesDataSource,) : TopicsRepository {override fun getTopicsStream(): Flow<List<Topic>> =diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.ktindex 6970a46d7..4a0ebf0ba 100644--- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt@@ -18,7 +18,7 @@ package com.google.samples.apps.nowinandroid.core.data.repository.fakeimport com.google.samples.apps.nowinandroid.core.data.Synchronizerimport com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO@@ -41,7 +41,7 @@ import kotlinx.serialization.json.Json*/class FakeAuthorsRepository @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,- private val niaPreferences: NiaPreferencesLocalDataSource,+ private val niaPreferences: NiaPreferencesDataSource,private val networkJson: Json,) : AuthorsRepository {diff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.ktindex d71dc022f..ec18600f0 100644--- a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt+++ b/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt@@ -18,7 +18,7 @@ package com.google.samples.apps.nowinandroid.core.data.repository.fakeimport com.google.samples.apps.nowinandroid.core.data.Synchronizerimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport 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@@ -43,7 +43,7 @@ import kotlinx.serialization.json.Jsonclass FakeTopicsRepository @Inject constructor(@Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,private val networkJson: Json,- private val niaPreferences: NiaPreferencesLocalDataSource+ private val niaPreferences: NiaPreferencesDataSource) : TopicsRepository {override fun getTopicsStream(): Flow<List<Topic>> = flow<List<Topic>> {emit(diff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.ktindex 2f5f7f348..1d7bc0407 100644--- a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt@@ -24,7 +24,7 @@ import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetworkimport com.google.samples.apps.nowinandroid.core.database.dao.AuthorDaoimport com.google.samples.apps.nowinandroid.core.database.model.AuthorEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModel-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor@@ -54,7 +54,7 @@ class OfflineFirstAuthorsRepositoryTest {fun setup() {authorDao = TestAuthorDao()network = TestNiaNetworkDataSource()- val niaPreferencesDataSource = NiaPreferencesLocalDataSource(+ val niaPreferencesDataSource = NiaPreferencesDataSource(tmpFolder.testUserPreferencesDataStore())synchronizer = TestSynchronizer(niaPreferencesDataSource)diff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.ktindex e26e57939..7f4db0d90 100644--- a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt@@ -38,7 +38,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.PopulatedEpisodeimport com.google.samples.apps.nowinandroid.core.database.model.PopulatedNewsResourceimport com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModel-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList@@ -78,7 +78,7 @@ class OfflineFirstNewsRepositoryTest {topicDao = TestTopicDao()network = TestNiaNetworkDataSource()synchronizer = TestSynchronizer(- NiaPreferencesLocalDataSource(+ NiaPreferencesDataSource(tmpFolder.testUserPreferencesDataStore()))diff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.ktindex f17769491..9481af62f 100644--- a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt@@ -24,7 +24,7 @@ import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestTopicDaoimport com.google.samples.apps.nowinandroid.core.database.dao.TopicDaoimport com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModel-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic@@ -44,7 +44,7 @@ class OfflineFirstTopicsRepositoryTest {private lateinit var network: TestNiaNetworkDataSource- private lateinit var niaPreferences: NiaPreferencesLocalDataSource+ private lateinit var niaPreferences: NiaPreferencesDataSourceprivate lateinit var synchronizer: Synchronizer@@ -55,7 +55,7 @@ class OfflineFirstTopicsRepositoryTest {fun setup() {topicDao = TestTopicDao()network = TestNiaNetworkDataSource()- niaPreferences = NiaPreferencesLocalDataSource(+ niaPreferences = NiaPreferencesDataSource(tmpFolder.testUserPreferencesDataStore())synchronizer = TestSynchronizer(niaPreferences)diff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.ktindex 6b210bb5b..e50a3776b 100644--- a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt+++ b/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt@@ -18,13 +18,13 @@ package com.google.samples.apps.nowinandroid.core.data.repositoryimport com.google.samples.apps.nowinandroid.core.data.Synchronizerimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSource/**- * Test synchronizer that delegates to [NiaPreferencesLocalDataSource]+ * Test synchronizer that delegates to [NiaPreferencesDataSource]*/class TestSynchronizer(- private val niaPreferences: NiaPreferencesLocalDataSource+ private val niaPreferences: NiaPreferencesDataSource) : Synchronizer {override suspend fun getChangeListVersions(): ChangeListVersions =niaPreferences.getChangeListVersions()diff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesLocalDataSource.kt b/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktsimilarity index 98%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesLocalDataSource.ktrename to core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktindex 23e107188..938e85af6 100644--- a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesLocalDataSource.kt+++ b/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.firstOrNullimport kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.retry-class NiaPreferencesLocalDataSource @Inject constructor(+class NiaPreferencesDataSource @Inject constructor(private val userPreferences: DataStore<UserPreferences>) {suspend fun setFollowedTopicIds(followedTopicIds: Set<String>) {diff --git a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.ktindex 43a48ab1a..5b99e603b 100644--- a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt+++ b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt@@ -28,7 +28,7 @@ import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepositoimport com.google.samples.apps.nowinandroid.core.data.repository.NewsRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions-import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesLocalDataSource+import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSourceimport com.google.samples.apps.nowinandroid.core.network.Dispatcherimport com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IOimport com.google.samples.apps.nowinandroid.sync.initializers.SyncConstraints@@ -48,7 +48,7 @@ import kotlinx.coroutines.withContextclass SyncWorker @AssistedInject constructor(@Assisted private val appContext: Context,@Assisted workerParams: WorkerParameters,- private val niaPreferences: NiaPreferencesLocalDataSource,+ private val niaPreferences: NiaPreferencesDataSource,private val topicRepository: TopicsRepository,private val newsRepository: NewsRepository,private val authorsRepository: AuthorsRepository,