A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix typo.
Jaehwa Nohee4320723fd4
diff --git a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.kt b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.ktindex d9323e312..4871baad9 100644--- a/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.kt+++ b/core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.kt@@ -43,7 +43,7 @@ internal class FakeUserDataRepository @Inject constructor(override suspend fun setTopicIdFollowed(followedTopicId: String, followed: Boolean) =niaPreferencesDataSource.setTopicIdFollowed(followedTopicId, followed)- override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {+ override suspend fun setNewsResourceBookmarked(newsResourceId: String, bookmarked: Boolean) {niaPreferencesDataSource.setNewsResourceBookmarked(newsResourceId, bookmarked)}diff --git a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.ktindex a781b7d14..089b7087d 100644--- a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt+++ b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt@@ -42,7 +42,7 @@ internal class OfflineFirstUserDataRepository @Inject constructor(analyticsHelper.logTopicFollowToggled(followedTopicId, followed)}- override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {+ override suspend fun setNewsResourceBookmarked(newsResourceId: String, bookmarked: Boolean) {niaPreferencesDataSource.setNewsResourceBookmarked(newsResourceId, bookmarked)analyticsHelper.logNewsResourceBookmarkToggled(newsResourceId = newsResourceId,diff --git a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.ktindex c0acd4862..c5202b02b 100644--- a/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt+++ b/core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt@@ -41,7 +41,7 @@ interface UserDataRepository {/*** Updates the bookmarked status for a news resource*/- suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean)+ suspend fun setNewsResourceBookmarked(newsResourceId: String, bookmarked: Boolean)/*** Updates the viewed status for a news resourcediff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.ktindex fca625d40..422e2cfb7 100644--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt@@ -133,7 +133,7 @@ class OfflineFirstUserDataRepositoryTest {@Testfun offlineFirstUserDataRepository_bookmark_news_resource_logic_delegates_to_nia_preferences() =testScope.runTest {- subject.setNewsResourceBookmark(newsResourceId = "0", bookmarked = true)+ subject.setNewsResourceBookmarked(newsResourceId = "0", bookmarked = true)assertEquals(setOf("0"),@@ -142,7 +142,7 @@ class OfflineFirstUserDataRepositoryTest {.first(),)- subject.setNewsResourceBookmark(newsResourceId = "1", bookmarked = true)+ subject.setNewsResourceBookmarked(newsResourceId = "1", bookmarked = true)assertEquals(setOf("0", "1"),diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.ktindex 8eb09b00b..be76112dc 100644--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt@@ -61,7 +61,7 @@ class TestUserDataRepository : UserDataRepository {}}- override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {+ override suspend fun setNewsResourceBookmarked(newsResourceId: String, bookmarked: Boolean) {currentUserData.let { current ->val bookmarkedNews = if (bookmarked) {current.bookmarkedNewsResources + newsResourceIddiff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.ktindex 5b1074fdb..f93602485 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt@@ -58,7 +58,7 @@ class BookmarksViewModel @Inject constructor(viewModelScope.launch {shouldDisplayUndoBookmark = truelastRemovedBookmarkId = newsResourceId- userDataRepository.setNewsResourceBookmark(newsResourceId, false)+ userDataRepository.setNewsResourceBookmarked(newsResourceId, false)}}@@ -71,7 +71,7 @@ class BookmarksViewModel @Inject constructor(fun undoBookmarkRemoval() {viewModelScope.launch {lastRemovedBookmarkId?.let {- userDataRepository.setNewsResourceBookmark(it, true)+ userDataRepository.setNewsResourceBookmarked(it, true)}}clearUndoState()diff --git a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.ktindex 1ebc1c037..037e9db64 100644--- a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt+++ b/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt@@ -67,7 +67,7 @@ class BookmarksViewModelTest {val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }newsRepository.sendNewsResources(newsResourcesTestData)- userDataRepository.setNewsResourceBookmark(newsResourcesTestData[0].id, true)+ userDataRepository.setNewsResourceBookmarked(newsResourcesTestData[0].id, true)val item = viewModel.feedUiState.valueassertIs<Success>(item)assertEquals(item.feed.size, 1)@@ -81,7 +81,7 @@ class BookmarksViewModelTest {// Set the news resources to be used by this testnewsRepository.sendNewsResources(newsResourcesTestData)// Start with the resource saved- userDataRepository.setNewsResourceBookmark(newsResourcesTestData[0].id, true)+ userDataRepository.setNewsResourceBookmarked(newsResourcesTestData[0].id, true)// Use viewModel to remove saved resourceviewModel.removeFromSavedResources(newsResourcesTestData[0].id)// Verify list of saved resources is now emptydiff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktindex c634f8895..85035a77a 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt@@ -117,7 +117,7 @@ class ForYouViewModel @Inject constructor(fun updateNewsResourceSaved(newsResourceId: String, isChecked: Boolean) {viewModelScope.launch {- userDataRepository.setNewsResourceBookmark(newsResourceId, isChecked)+ userDataRepository.setNewsResourceBookmarked(newsResourceId, isChecked)}}diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.ktindex 52aa46599..2dea8ba05 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt@@ -81,7 +81,7 @@ class TopicViewModel @Inject constructor(fun bookmarkNews(newsResourceId: String, bookmarked: Boolean) {viewModelScope.launch {- userDataRepository.setNewsResourceBookmark(newsResourceId, bookmarked)+ userDataRepository.setNewsResourceBookmarked(newsResourceId, bookmarked)}}