minor

Author: deckerst

lib/model/filters/covered/album_base.dart

@@ -0,0 +1,14 @@
+import 'package:aves/model/filters/filters.dart';
+import 'package:aves_model/aves_model.dart';
+
+abstract class AlbumBaseFilter extends CollectionFilter {
+  const AlbumBaseFilter({required super.reversed});
+
+  bool match(String query);
+
+  StorageVolume? get storageVolume;
+
+  bool get canRename;
+
+  bool get isVault;
+}

lib/model/filters/covered/dynamic_album.dart

@@ -1,5 +1,5 @@
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/covered.dart';
-import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves_model/aves_model.dart';

lib/model/filters/covered/stored_album.dart

@@ -1,4 +1,5 @@
 import 'package:aves/model/covers.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/covered.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/vaults/vaults.dart';
@@ -12,18 +13,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
-abstract class AlbumBaseFilter extends CollectionFilter {
-  const AlbumBaseFilter({required super.reversed});
-
-  bool match(String query);
-
-  StorageVolume? get storageVolume;
-
-  bool get canRename;
-
-  bool get isVault;
-}
-
 class StoredAlbumFilter extends AlbumBaseFilter with CoveredFilter {
   static const type = 'album';
 

lib/model/settings/modules/navigation.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/filters/covered/stored_album.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/settings/defaults.dart';
 import 'package:aves_model/aves_model.dart';

lib/model/source/album.dart

@@ -1,4 +1,5 @@
 import 'package:aves/model/entry/entry.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/dynamic_album.dart';
 import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/settings/settings.dart';

lib/model/source/collection_source.dart

@@ -8,6 +8,7 @@ import 'package:aves/model/entry/extensions/keys.dart';
 import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/entry/sort.dart';
 import 'package:aves/model/favourites.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/location.dart';
 import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/filters/covered/tag.dart';

lib/widgets/dialogs/pick_dialogs/album_pick_page.dart

@@ -1,4 +1,5 @@
 import 'package:aves/app_mode.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/selection.dart';

lib/widgets/filter_grids/albums_page.dart

@@ -2,8 +2,9 @@ import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/dynamic_albums.dart';
 import 'package:aves/model/entry/extensions/props.dart';
-import 'package:aves/model/filters/covered/stored_album.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/dynamic_album.dart';
+import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/album.dart';

lib/widgets/filter_grids/common/action_delegates/album_set.dart

@@ -4,6 +4,7 @@ import 'package:aves/app_mode.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/dynamic_albums.dart';
 import 'package:aves/model/entry/entry.dart';
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/dynamic_album.dart';
 import 'package:aves/model/filters/covered/stored_album.dart';
 import 'package:aves/model/filters/filters.dart';

lib/widgets/filter_grids/common/action_delegates/chip.dart

@@ -1,3 +1,4 @@
+import 'package:aves/model/filters/covered/album_base.dart';
 import 'package:aves/model/filters/covered/dynamic_album.dart';
 import 'package:aves/model/filters/covered/location.dart';
 import 'package:aves/model/filters/covered/stored_album.dart';