Merge pull request #26 from Ashinch/fix/opposite-starred-and-unread-desc

Fix opposite starred and unread descriptions
This commit is contained in:
Ashinch 2022-04-30 17:52:27 +08:00 committed by GitHub
commit eb679db4ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions

View File

@ -0,0 +1,20 @@
name: "Build Pull Request"
on: pull_request
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
- uses: gradle/gradle-build-action@v2
- run: gradle assembleRelease
- uses: actions/upload-artifact@v3
with:
name: ${{ github.sha }}
path: app/build/outputs/apk/release/*.apk

View File

@ -102,15 +102,13 @@ class FeedsViewModel @Inject constructor(
}
}
groupWithFeedList
}.onStart {
}.onEach { groupWithFeedList ->
_viewState.update {
it.copy(
importantCount = groupWithFeedList.sumOf { it.group.important ?: 0 }.run {
when {
isStarred -> stringsRepository.getString(R.string.unread_desc, this)
isUnread -> stringsRepository.getString(R.string.starred_desc, this)
isStarred -> stringsRepository.getString(R.string.starred_desc, this)
isUnread -> stringsRepository.getString(R.string.unread_desc, this)
else -> stringsRepository.getString(R.string.all_desc, this)
}
},
@ -118,7 +116,7 @@ class FeedsViewModel @Inject constructor(
feedsVisible = List(groupWithFeedList.size, init = { true })
)
}
}.catch() {
}.catch {
Log.e("RLog", "catch in articleRepository.pullFeeds(): ${it.message}")
}.flowOn(Dispatchers.Default).collect()
}