Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Fix merge conflicts

Don Turner32bc5c159019
diff --cc feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
index 1f08d233a,2c5f76f63..260cecbd1
--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt
@@@ -45,8 -45,7 +45,7 @@@ class TopicViewModel @Inject constructo
stringDecoder: StringDecoder,
private val userDataRepository: UserDataRepository,
topicsRepository: TopicsRepository,
- // newsRepository: NewsRepository,
- getSaveableNewsResources: GetSaveableNewsResourcesUseCase
+ getSaveableNewsResources: GetUserNewsResourcesUseCase
) : ViewModel() {
private val topicArgs: TopicArgs = TopicArgs(savedStateHandle, stringDecoder)
@@@ -135,7 -134,7 +134,7 @@@ private fun newsUiState
userDataRepository: UserDataRepository,
): Flow<NewsUiState> {
// Observe news
- val news: Flow<List<UserNewsResource>> = getSaveableNewsResources(
- val newsStream: Flow<List<SaveableNewsResource>> = getSaveableNewsResources(
++ val newsStream: Flow<List<UserNewsResource>> = getSaveableNewsResources(
filterTopicIds = setOf(element = topicId),
)