From abdecb3cb427cdeeae45f6a4d4470fc825e956b4 Mon Sep 17 00:00:00 2001 From: Secozzi <49240133+Secozzi@users.noreply.github.com> Date: Sat, 15 Aug 2026 17:19:05 +0200 Subject: [PATCH] Show updates and upcoming filter icon as active for categories (#3772) --- CHANGELOG.md | 3 +++ .../tachiyomi/ui/updates/UpdatesViewModel.kt | 8 +++++++- .../mihon/feature/upcoming/UpcomingViewModel.kt | 14 +++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af595703a..d055a5b33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co - `Other` - for technical stuff. ## [Unreleased] +### Improved +- Show updates and upcoming filter icon as active for categories ([@Secozzi](https://github.com/Secozzi)) ([#3772](https://github.com/mihonapp/mihon/pull/3772)) + ### Fixed - Fixed app and extension update check running again on configuration change ([@AntsyLich](https://github.com/AntsyLich)) ([#3708](https://github.com/mihonapp/mihon/pull/3708)) - Fixed MangaBaka user start/finish dates drifting in negative offset timezones ([@MajorTanya](https://github.com/MajorTanya)) ([#3711](https://github.com/mihonapp/mihon/pull/3711)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesViewModel.kt index b0414ffbc..939b3f93e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesViewModel.kt @@ -115,7 +115,13 @@ class UpdatesViewModel( prefs.filterStarted, prefs.filterBookmarked, ) - .any { it != TriState.DISABLED } + .any { it != TriState.DISABLED } || + prefs.filterExcludedScanlators || + listOf( + prefs.filterIncludedCategories, + prefs.filterExcludedCategories, + ) + .any { it.isNotEmpty() } } .distinctUntilChanged() diff --git a/app/src/main/java/mihon/feature/upcoming/UpcomingViewModel.kt b/app/src/main/java/mihon/feature/upcoming/UpcomingViewModel.kt index 4e1ac7a5c..ca0d53f3a 100644 --- a/app/src/main/java/mihon/feature/upcoming/UpcomingViewModel.kt +++ b/app/src/main/java/mihon/feature/upcoming/UpcomingViewModel.kt @@ -53,6 +53,16 @@ class UpcomingViewModel( private val dialog = MutableStateFlow(null) + private val hasActiveFilters = getUpcomingItemPreferenceFlow() + .map { prefs -> + listOf( + prefs.filterIncludedCategories, + prefs.filterExcludedCategories, + ) + .any { it.isNotEmpty() } + } + .distinctUntilChanged() + private val upcoming = getUpcomingItemPreferenceFlow() .distinctUntilChanged() .flatMapLatest { @@ -70,12 +80,14 @@ class UpcomingViewModel( upcoming, selectedYearMonth, dialog, - ) { upcoming, selectedYearMonth, dialog -> + hasActiveFilters, + ) { upcoming, selectedYearMonth, dialog, hasActiveFilters -> State( selectedYearMonth = selectedYearMonth, items = upcoming, events = upcoming.toEvents(), headerIndexes = upcoming.getHeaderIndexes(), + hasActiveFilters = hasActiveFilters, dialog = dialog, ) }