FreshRSS/ReadYou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix/refresh view after sync (#531)

Browse Source
This commit is contained in:
kid1412621 2024-01-15 18:09:30 +08:00 committed by GitHub
parent 799a44cdd3
commit 0800e838a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt
View File

@ -113,7 +113,7 @@ fun FeedsPage(
feedsViewModel.fetchAccount() feedsViewModel.fetchAccount()
} }
LaunchedEffect(filterUiState) { LaunchedEffect(filterUiState, isSyncing) {
snapshotFlow { filterUiState }.collect { snapshotFlow { filterUiState }.collect {
feedsViewModel.pullFeeds(it) feedsViewModel.pullFeeds(it)
} }

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsViewModel.kt
View File

@ -43,8 +43,9 @@ class FeedsViewModel @Inject constructor(
val isStarred = filterState.filter.isStarred() val isStarred = filterState.filter.isStarred()
val isUnread = filterState.filter.isUnread() val isUnread = filterState.filter.isUnread()
_feedsUiState.update { _feedsUiState.update {
val important = rssService.get().pullImportant(isStarred, isUnread)
it.copy( it.copy(
importantSum = rssService.get().pullImportant(isStarred, isUnread) importantSum = important
.mapLatest { .mapLatest {
(it["sum"] ?: 0).run { (it["sum"] ?: 0).run {
androidStringsHelper.getQuantityString( androidStringsHelper.getQuantityString(
@ -59,7 +60,7 @@ class FeedsViewModel @Inject constructor(
} }
}.flowOn(defaultDispatcher), }.flowOn(defaultDispatcher),
groupWithFeedList = combine( groupWithFeedList = combine(
rssService.get().pullImportant(isStarred, isUnread), important,
rssService.get().pullFeeds() rssService.get().pullFeeds()
) { importantMap, groupWithFeedList -> ) { importantMap, groupWithFeedList ->
val groupIterator = groupWithFeedList.iterator() val groupIterator = groupWithFeedList.iterator()