remember whether to show the title filter when picking albums

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file.
 
 - option to set the Tags page as home
 
+### Changed
+
+- remember whether to show the title filter when picking albums
+
 ## <a id="v1.8.6"></a>[v1.8.6] - 2023-04-30
 
 ### Added

lib/model/query.dart

@@ -8,7 +8,8 @@ class Query extends ChangeNotifier {
   final ValueNotifier<String> _queryNotifier = ValueNotifier('');
   final StreamController<bool> _enabledStreamController = StreamController.broadcast();
 
-  Query({required String? initialValue}) {
+  Query({required bool enabled, required String? initialValue}) {
+    _enabled = enabled;
     if (initialValue != null && initialValue.isNotEmpty) {
       _enabled = true;
       queryNotifier.value = initialValue;

lib/model/settings/settings.dart

@@ -118,6 +118,7 @@ class Settings extends ChangeNotifier {
   static const tagSortReverseKey = 'tag_sort_reverse';
   static const pinnedFiltersKey = 'pinned_filters';
   static const hiddenFiltersKey = 'hidden_filters';
+  static const showAlbumPickQueryKey = 'show_album_pick_query';
 
   // viewer
   static const viewerQuickActionsKey = 'viewer_quick_actions';
@@ -625,6 +626,10 @@ class Settings extends ChangeNotifier {
     hiddenFilters = _hiddenFilters;
   }
 
+  bool get showAlbumPickQuery => getBool(showAlbumPickQueryKey) ?? false;
+
+  set showAlbumPickQuery(bool newValue) => _set(showAlbumPickQueryKey, newValue);
+
   // viewer
 
   List<EntryAction> get viewerQuickActions => getEnumListOrDefault(viewerQuickActionsKey, SettingsDefaults.viewerQuickActions, EntryAction.values);
@@ -1107,6 +1112,7 @@ class Settings extends ChangeNotifier {
             case stateSortReverseKey:
             case placeSortReverseKey:
             case tagSortReverseKey:
+            case showAlbumPickQueryKey:
             case showOverlayOnOpeningKey:
             case showOverlayMinimapKey:
             case showOverlayInfoKey:

lib/widgets/common/providers/query_provider.dart

@@ -3,19 +3,24 @@ import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 class QueryProvider extends StatelessWidget {
+  final bool enabled;
   final String? initialQuery;
   final Widget child;
 
   const QueryProvider({
     super.key,
-    required this.initialQuery,
+    this.enabled = false,
+    this.initialQuery,
     required this.child,
   });
 
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider<Query>(
-      create: (context) => Query(initialValue: initialQuery),
+      create: (context) => Query(
+        enabled: enabled,
+        initialValue: initialQuery,
+      ),
       child: child,
     );
   }

lib/widgets/dialogs/pick_dialogs/album_pick_page.dart

@@ -14,6 +14,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/common/identity/buttons/captioned_button.dart';
 import 'package:aves/widgets/common/identity/empty.dart';
+import 'package:aves/widgets/common/providers/query_provider.dart';
 import 'package:aves/widgets/common/providers/selection_provider.dart';
 import 'package:aves/widgets/dialogs/aves_confirmation_dialog.dart';
 import 'package:aves/widgets/dialogs/filter_editors/create_album_dialog.dart';
@@ -106,12 +107,14 @@ class _AlbumPickPageState extends State<_AlbumPickPage> {
             builder: (context, snapshot) {
               final gridItems = AlbumListPage.getAlbumGridItems(context, source);
               return SelectionProvider<FilterGridItem<AlbumFilter>>(
+                child: QueryProvider(
+                  enabled: settings.showAlbumPickQuery,
                   child: FilterGridPage<AlbumFilter>(
                     settingsRouteKey: AlbumListPage.routeName,
                     appBar: FilterGridAppBar(
                       source: source,
                       title: title,
-                    actionDelegate: AlbumChipSetActionDelegate(gridItems),
+                      actionDelegate: _AlbumChipSetPickActionDelegate(gridItems),
                       actionsBuilder: _buildActions,
                       isEmpty: false,
                       appBarHeightNotifier: _appBarHeightNotifier,
@@ -129,6 +132,7 @@ class _AlbumPickPageState extends State<_AlbumPickPage> {
                     ),
                     heroType: HeroType.never,
                   ),
+                ),
               );
             },
           );
@@ -276,3 +280,15 @@ class _AlbumPickPageState extends State<_AlbumPickPage> {
     Navigator.maybeOf(context)?.pop<AlbumFilter>(filter);
   }
 }
+
+class _AlbumChipSetPickActionDelegate extends AlbumChipSetActionDelegate {
+  _AlbumChipSetPickActionDelegate(super.items);
+
+  @override
+  void onActionSelected(BuildContext context, Set<AlbumFilter> filters, ChipSetAction action) {
+    if (action == ChipSetAction.toggleTitleSearch) {
+      settings.showAlbumPickQuery = !settings.showAlbumPickQuery;
+    }
+    super.onActionSelected(context, filters, action);
+  }
+}

lib/widgets/filter_grids/common/filter_grid_page.dart

@@ -29,7 +29,6 @@ import 'package:aves/widgets/common/grid/sliver.dart';
 import 'package:aves/widgets/common/grid/theme.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/common/identity/scroll_thumb.dart';
-import 'package:aves/widgets/common/providers/query_provider.dart';
 import 'package:aves/widgets/common/providers/tile_extent_controller_provider.dart';
 import 'package:aves/widgets/common/thumbnail/image.dart';
 import 'package:aves/widgets/common/tile_extent_controller.dart';
@@ -82,9 +81,7 @@ class FilterGridPage<T extends CollectionFilter> extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final useTvLayout = settings.useTvLayout;
-    final body = QueryProvider(
-      initialQuery: null,
-      child: GestureAreaProtectorStack(
+    final body = GestureAreaProtectorStack(
       child: DirectionalSafeArea(
         start: !useTvLayout,
         top: false,
@@ -115,7 +112,6 @@ class FilterGridPage<T extends CollectionFilter> extends StatelessWidget {
           },
         ),
       ),
-      ),
     );
 
     if (useTvLayout) {

lib/widgets/filter_grids/common/filter_nav_page.dart

@@ -2,6 +2,7 @@ import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/utils/time_utils.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
+import 'package:aves/widgets/common/providers/query_provider.dart';
 import 'package:aves/widgets/common/providers/selection_provider.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
 import 'package:aves/widgets/filter_grids/common/app_bar.dart';
@@ -106,7 +107,8 @@ class _FilterNavigationPageState<T extends CollectionFilter, CSAD extends ChipSe
   Widget build(BuildContext context) {
     return SelectionProvider<FilterGridItem<T>>(
       child: Builder(
-        builder: (context) => FilterGridPage<T>(
+        builder: (context) => QueryProvider(
+          child: FilterGridPage<T>(
             appBar: FilterGridAppBar<T, CSAD>(
               source: widget.source,
               title: widget.title,
@@ -132,6 +134,7 @@ class _FilterNavigationPageState<T extends CollectionFilter, CSAD extends ChipSe
             heroType: HeroType.onTap,
           ),
         ),
+      ),
     );
   }
 }