A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix unit and UI tests. Apply spotless.
Don Turner5638e253aea9
diff --git a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.ktindex c081abf1f..4071eb1aa 100644--- a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt+++ b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/FollowableTopic.kt@@ -22,7 +22,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.previewTopics/*** A [topic] with the additional information for whether or not it is followed.*/-data class FollowableTopic( //TODO consider changing to UserTopic and flattening+data class FollowableTopic( // TODO consider changing to UserTopic and flatteningval topic: Topic,val isFollowed: Boolean)diff --git a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.ktindex c70f549b2..b8cef84a7 100644--- a/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt+++ b/core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/model/UserNewsResource.kt@@ -21,12 +21,13 @@ import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceTypeimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Codelabimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Unknownimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video-import com.google.samples.apps.nowinandroid.core.model.data.previewTopicsimport kotlinx.datetime.Instantimport kotlinx.datetime.LocalDateTimeimport kotlinx.datetime.TimeZoneimport kotlinx.datetime.toInstant+/* ktlint-disable max-line-length */+/*** A [NewsResource] with the additional user information.*/diff --git a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetUserNewsResourcesUseCaseTest.kt b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetUserNewsResourcesUseCaseTest.ktindex ce730d6f2..d711d851e 100644--- a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetUserNewsResourcesUseCaseTest.kt+++ b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetUserNewsResourcesUseCaseTest.kt@@ -70,7 +70,8 @@ class GetUserNewsResourcesUseCaseTest {isFollowed = false)},- true),+ true+ ),UserNewsResource(sampleNewsResources[1].id,sampleNewsResources[1].title,@@ -85,7 +86,8 @@ class GetUserNewsResourcesUseCaseTest {isFollowed = false)},- false),+ false+ ),UserNewsResource(sampleNewsResources[2].id,sampleNewsResources[2].title,@@ -97,10 +99,11 @@ class GetUserNewsResourcesUseCaseTest {sampleNewsResources[2].topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = true+ isFollowed = false)},- true),+ true+ ),),saveableNewsResources.first())@@ -120,21 +123,24 @@ class GetUserNewsResourcesUseCaseTest {assertEquals(sampleNewsResources.filter { it.topics.contains(sampleTopic1) }- .map { UserNewsResource(- id = it.id,- title = it.title,- content = it.content,- url = it.url,- headerImageUrl = it.headerImageUrl,- publishDate = it.publishDate,- type = it.type,- topics = it.topics.map { topic ->- FollowableTopic(- topic = topic,- isFollowed = false- )- },- isSaved = false) },+ .map {+ UserNewsResource(+ id = it.id,+ title = it.title,+ content = it.content,+ url = it.url,+ headerImageUrl = it.headerImageUrl,+ publishDate = it.publishDate,+ type = it.type,+ topics = it.topics.map { topic ->+ FollowableTopic(+ topic = topic,+ isFollowed = false+ )+ },+ isSaved = false+ )+ },saveableNewsResources.first())}diff --git a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.ktindex c334f1bab..70ce0662f 100644--- a/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt+++ b/core/ui/src/androidTest/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt@@ -20,7 +20,7 @@ import androidx.activity.ComponentActivityimport androidx.compose.ui.test.assertIsDisplayedimport androidx.compose.ui.test.junit4.createAndroidComposeRuleimport androidx.compose.ui.test.onNodeWithText-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResources+import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResourcesimport org.junit.Ruleimport org.junit.Test@@ -30,7 +30,7 @@ class NewsResourceCardTest {@Testfun testMetaDataDisplay_withCodelabResource() {- val newsWithKnownResourceType = previewNewsResources[0]+ val newsWithKnownResourceType = previewUserNewsResources[0]var dateFormatted = ""composeTestRule.setContent {@@ -57,7 +57,7 @@ class NewsResourceCardTest {@Testfun testMetaDataDisplay_withUnknownResource() {- val newsWithUnknownResourceType = previewNewsResources[3]+ val newsWithUnknownResourceType = previewUserNewsResources[3]var dateFormatted = ""composeTestRule.setContent {diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex 6eb6e7859..d6d3ff55e 100644--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -61,7 +61,6 @@ import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResourceimport com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResourcesimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport java.time.ZoneIdimport java.time.format.DateTimeFormatterimport java.util.Localediff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.ktindex c2bdb6580..c7441c182 100644--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt@@ -38,7 +38,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.NewsResource*/fun <T> LazyListScope.newsResourceCardItems(items: List<T>,- newsResourceMapper: (item: T) -> UserNewsResource, //TODO remove this?+ newsResourceMapper: (item: T) -> UserNewsResource, // TODO remove this?isBookmarkedMapper: (item: T) -> Boolean,onToggleBookmark: (item: T) -> Unit,onItemClick: ((item: T) -> Unit)? = null,diff --git a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.ktindex 3421f885a..bd9ca2056 100644--- a/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt+++ b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt@@ -31,8 +31,7 @@ import androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performClickimport androidx.compose.ui.test.performScrollToNode-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResources+import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResourcesimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport kotlin.test.assertEqualsimport kotlin.test.assertTrue@@ -70,8 +69,7 @@ class BookmarksScreenTest {composeTestRule.setContent {BookmarksScreen(feedState = NewsFeedUiState.Success(- previewNewsResources.take(2)- .map { UserNewsResource(it, true) }+ previewUserNewsResources.take(2)),removeFromBookmarks = { })@@ -79,7 +77,7 @@ class BookmarksScreenTest {composeTestRule.onNodeWithText(- previewNewsResources[0].title,+ previewUserNewsResources[0].title,substring = true).assertExists()@@ -88,14 +86,14 @@ class BookmarksScreenTest {composeTestRule.onNode(hasScrollToNodeAction()).performScrollToNode(hasText(- previewNewsResources[1].title,+ previewUserNewsResources[1].title,substring = true))composeTestRule.onNodeWithText(- previewNewsResources[1].title,+ previewUserNewsResources[1].title,substring = true).assertExists()@@ -109,11 +107,10 @@ class BookmarksScreenTest {composeTestRule.setContent {BookmarksScreen(feedState = NewsFeedUiState.Success(- previewNewsResources.take(2)- .map { UserNewsResource(it, true) }+ previewUserNewsResources.take(2)),removeFromBookmarks = { newsResourceId ->- assertEquals(previewNewsResources[0].id, newsResourceId)+ assertEquals(previewUserNewsResources[0].id, newsResourceId)removeFromBookmarksCalled = true})@@ -127,7 +124,7 @@ class BookmarksScreenTest {).filter(hasAnyAncestor(hasText(- previewNewsResources[0].title,+ previewUserNewsResources[0].title,substring = true))diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktindex 9dbad373b..789fbec31 100644--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt@@ -52,9 +52,7 @@ import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheelimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResourceimport com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Loadingimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Successdiff --git a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktindex ee6e2795b..70f60811b 100644--- a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt+++ b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt@@ -29,9 +29,8 @@ import androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performScrollToNodeimport com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource+import com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResourcesimport com.google.samples.apps.nowinandroid.core.model.data.Topic-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport org.junit.Ruleimport org.junit.Test@@ -225,9 +224,7 @@ class ForYouScreenTest {isSyncing = false,onboardingUiState = OnboardingUiState.NotShown,feedState = NewsFeedUiState.Success(- feed = previewNewsResources.map {- UserNewsResource(it, false)- }+ feed = previewUserNewsResources),onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},@@ -237,7 +234,7 @@ class ForYouScreenTest {composeTestRule.onNodeWithText(- previewNewsResources[0].title,+ previewUserNewsResources[0].title,substring = true).assertExists()@@ -246,14 +243,14 @@ class ForYouScreenTest {composeTestRule.onNode(hasScrollToNodeAction()).performScrollToNode(hasText(- previewNewsResources[1].title,+ previewUserNewsResources[1].title,substring = true))composeTestRule.onNodeWithText(- previewNewsResources[1].title,+ previewUserNewsResources[1].title,substring = true).assertExists()diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex fb4d83c7e..0e62a9b0b 100644--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -83,9 +83,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaOverlimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResourceimport com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport com.google.samples.apps.nowinandroid.core.model.data.previewTopicsimport com.google.samples.apps.nowinandroid.core.ui.DevicePreviewsimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStatediff --git a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktindex 35b8a2f5a..5ab8d92db 100644--- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt+++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt@@ -263,7 +263,9 @@ class ForYouViewModelTest {val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }topicsRepository.sendTopics(sampleTopics)- userDataRepository.setFollowedTopicIds(setOf("0", "1"))++ val followedTopicIds = setOf("0", "1")+ userDataRepository.setFollowedTopicIds(followedTopicIds)viewModel.dismissOnboarding()assertEquals(@@ -290,10 +292,10 @@ class ForYouViewModelTest {headerImageUrl = it.headerImageUrl,publishDate = it.publishDate,type = it.type,- topics = it.topics.map{ topic ->+ topics = it.topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = false+ isFollowed = followedTopicIds.contains(topic.id))},isSaved = false@@ -319,41 +321,9 @@ class ForYouViewModelTest {assertEquals(OnboardingUiState.Shown(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = false- )- ),+ topics = sampleTopics.map {+ FollowableTopic(it, false)+ }),viewModel.onboardingUiState.value)@@ -364,45 +334,14 @@ class ForYouViewModelTest {viewModel.feedState.value)- viewModel.updateTopicSelection("1", isChecked = true)+ val followedTopicId = sampleTopics[1].id+ viewModel.updateTopicSelection(followedTopicId, isChecked = true)assertEquals(OnboardingUiState.Shown(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = true- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "long description",- url = "URL",- imageUrl = "image URL",- ),- isFollowed = false- )- ),+ topics = sampleTopics.map {+ FollowableTopic(it, it.id == followedTopicId)+ }),viewModel.onboardingUiState.value)@@ -417,10 +356,10 @@ class ForYouViewModelTest {headerImageUrl = sampleNewsResources[1].headerImageUrl,publishDate = sampleNewsResources[1].publishDate,type = sampleNewsResources[1].type,- topics = sampleNewsResources[1].topics.map{ topic ->+ topics = sampleNewsResources[1].topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = false+ isFollowed = topic.id == followedTopicId)},isSaved = false@@ -433,10 +372,10 @@ class ForYouViewModelTest {headerImageUrl = sampleNewsResources[2].headerImageUrl,publishDate = sampleNewsResources[2].publishDate,type = sampleNewsResources[2].type,- topics = sampleNewsResources[2].topics.map{ topic ->+ topics = sampleNewsResources[2].topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = false+ isFollowed = topic.id == followedTopicId)},isSaved = false@@ -520,8 +459,10 @@ class ForYouViewModelTest {launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }+ val followedTopicIds = setOf("1")+topicsRepository.sendTopics(sampleTopics)- userDataRepository.setFollowedTopicIds(setOf("1"))+ userDataRepository.setFollowedTopicIds(followedTopicIds)userDataRepository.setShouldHideOnboarding(true)newsRepository.sendNewsResources(sampleNewsResources)viewModel.updateNewsResourceSaved("2", true)@@ -541,10 +482,10 @@ class ForYouViewModelTest {headerImageUrl = sampleNewsResources[1].headerImageUrl,publishDate = sampleNewsResources[1].publishDate,type = sampleNewsResources[1].type,- topics = sampleNewsResources[1].topics.map{ topic ->+ topics = sampleNewsResources[1].topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = false+ isFollowed = followedTopicIds.contains(topic.id))},isSaved = true@@ -557,10 +498,10 @@ class ForYouViewModelTest {headerImageUrl = sampleNewsResources[2].headerImageUrl,publishDate = sampleNewsResources[2].publishDate,type = sampleNewsResources[2].type,- topics = sampleNewsResources[2].topics.map{ topic ->+ topics = sampleNewsResources[2].topics.map { topic ->FollowableTopic(topic = topic,- isFollowed = false+ isFollowed = followedTopicIds.contains(topic.id))},isSaved = falsediff --git a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.ktindex 0f6d2dcc0..c635b7a53 100644--- a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt+++ b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt@@ -26,7 +26,6 @@ import androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performScrollToNodeimport com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopicimport com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Videoimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport kotlinx.datetime.Instant@@ -99,14 +98,7 @@ class TopicScreenTest {composeTestRule.setContent {TopicScreen(topicUiState = TopicUiState.Loading,- newsUiState = NewsUiState.Success(- sampleNewsResources.mapIndexed { index, newsResource ->- UserNewsResource(- newsResource = newsResource,- isSaved = index % 2 == 0,- )- }- ),+ newsUiState = NewsUiState.Success(sampleUserNewsResources),onBackClick = { },onFollowClick = { },onBookmarkChanged = { _, _ -> },@@ -126,12 +118,7 @@ class TopicScreenTest {TopicScreen(topicUiState = TopicUiState.Success(testTopic),newsUiState = NewsUiState.Success(- sampleNewsResources.mapIndexed { index, newsResource ->- UserNewsResource(- newsResource = newsResource,- isSaved = index % 2 == 0,- )- }+ sampleUserNewsResources),onBackClick = { },onFollowClick = { },@@ -143,7 +130,7 @@ class TopicScreenTest {composeTestRule.onAllNodes(hasScrollToNodeAction()).onFirst()- .performScrollToNode(hasText(sampleNewsResources.first().title))+ .performScrollToNode(hasText(sampleUserNewsResources.first().title))}}@@ -188,8 +175,8 @@ private val testTopics = listOf())-private val sampleNewsResources = listOf(- NewsResource(+private val sampleUserNewsResources = listOf(+ UserNewsResource(id = "1",title = "Thanks for helping us reach 1M YouTube Subscribers",content = "Thank you everyone for following the Now in Android series and everything the " +@@ -201,14 +188,18 @@ private val sampleNewsResources = listOf(publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),type = Video,topics = listOf(- Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = TOPIC_DESC,- url = "",- imageUrl = ""+ FollowableTopic(+ topic = Topic(+ id = "0",+ name = "Headlines",+ shortDescription = "",+ longDescription = TOPIC_DESC,+ url = "",+ imageUrl = ""+ ),+ isFollowed = false)- )+ ),+ isSaved = true))diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktindex 3e79318eb..263c04d78 100644--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt@@ -53,9 +53,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadiimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic-import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResourceimport com.google.samples.apps.nowinandroid.core.domain.model.previewUserNewsResources-import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport com.google.samples.apps.nowinandroid.core.model.data.previewTopicsimport com.google.samples.apps.nowinandroid.core.ui.DevicePreviewsimport com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank