Fix bookmarking scrolling to top of the page bug (#548)

Manuel Vivo · web-flow · commit 20c29a6c0912 · 2023-01-27T11:39:31.000+01:00
diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt
@@ -32,7 +32,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -68,7 +67,8 @@ class ForYouViewModel @Inject constructor(
                 } else {
                     getSaveableNewsResources(
                         filterTopicIds = userData.followedTopics,
-                    ).mapToFeedState()
+                    )
+                        .map<List<UserNewsResource>, NewsFeedUiState>(NewsFeedUiState::Success)
                 }
             }
             // Flatten the feed flows.
@@ -116,7 +116,3 @@ class ForYouViewModel @Inject constructor(
         }
     }
 }
-
-private fun Flow<List<UserNewsResource>>.mapToFeedState(): Flow<NewsFeedUiState> =
-    map<List<UserNewsResource>, NewsFeedUiState>(NewsFeedUiState::Success)
-        .onStart { emit(NewsFeedUiState.Loading) }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ import kotlinx.coroutines.flow.combine`
`32`	`32`	`import kotlinx.coroutines.flow.flatMapLatest`
`33`	`33`	`import kotlinx.coroutines.flow.flowOf`
`34`	`34`	`import kotlinx.coroutines.flow.map`
`35`		`-import kotlinx.coroutines.flow.onStart`
`36`	`35`	`import kotlinx.coroutines.flow.stateIn`
`37`	`36`	`import kotlinx.coroutines.launch`
`38`	`37`	`import javax.inject.Inject`
`@@ -68,7 +67,8 @@ class ForYouViewModel @Inject constructor(`
`68`	`67`	`} else {`
`69`	`68`	`getSaveableNewsResources(`
`70`	`69`	`filterTopicIds = userData.followedTopics,`
`71`		`- ).mapToFeedState()`
	`70`	`+ )`
	`71`	`+ .map<List<UserNewsResource>, NewsFeedUiState>(NewsFeedUiState::Success)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`// Flatten the feed flows.`
`@@ -116,7 +116,3 @@ class ForYouViewModel @Inject constructor(`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
`119`		`-`
`120`		`-private fun Flow<List<UserNewsResource>>.mapToFeedState(): Flow<NewsFeedUiState> =`
`121`		`- map<List<UserNewsResource>, NewsFeedUiState>(NewsFeedUiState::Success)`
`122`		`- .onStart { emit(NewsFeedUiState.Loading) }`