From 39bb9251dc576bd25f4e9713335065822929c820 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Wed, 24 Jul 2024 20:12:27 +0200 Subject: [PATCH] #1095fixed removing deactivated hidden item --- CHANGELOG.md | 4 ++++ lib/model/settings/modules/privacy.dart | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e355108e8..7a1b2fd0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- Viewer: display more items in tag/copy/move quick action choosers + ## [v1.11.8] - 2024-07-19 ### Added diff --git a/lib/model/settings/modules/privacy.dart b/lib/model/settings/modules/privacy.dart index 90a4b6a97..c9c2ff926 100644 --- a/lib/model/settings/modules/privacy.dart +++ b/lib/model/settings/modules/privacy.dart @@ -9,17 +9,18 @@ mixin PrivacySettings on SettingsAccess, SearchSettings { set hiddenFilters(Set newValue) => set(SettingKeys.hiddenFiltersKey, newValue.map((filter) => filter.toJson()).toList()); void changeFilterVisibility(Set filters, bool visible) { + final _deactivatedHiddenFilters = deactivatedHiddenFilters; final _hiddenFilters = hiddenFilters; + + _deactivatedHiddenFilters.removeAll(filters); if (visible) { _hiddenFilters.removeAll(filters); } else { _hiddenFilters.addAll(filters); searchHistory = searchHistory..removeWhere(filters.contains); - - final _deactivatedHiddenFilters = deactivatedHiddenFilters; - _deactivatedHiddenFilters.removeAll(filters); - deactivatedHiddenFilters = _deactivatedHiddenFilters; } + + deactivatedHiddenFilters = _deactivatedHiddenFilters; hiddenFilters = _hiddenFilters; } @@ -29,14 +30,18 @@ mixin PrivacySettings on SettingsAccess, SearchSettings { void activateHiddenFilter(CollectionFilter filter, bool active) { final _deactivatedHiddenFilters = deactivatedHiddenFilters; + final _hiddenFilters = hiddenFilters; + if (active) { _deactivatedHiddenFilters.remove(filter); + _hiddenFilters.add(filter); + searchHistory = searchHistory..remove(filter); } else { _deactivatedHiddenFilters.add(filter); + _hiddenFilters.remove(filter); } - deactivatedHiddenFilters = _deactivatedHiddenFilters; - final visible = !active; - changeFilterVisibility({filter}, visible); + deactivatedHiddenFilters = _deactivatedHiddenFilters; + hiddenFilters = _hiddenFilters; } }