project reorganization, filter scaling prep

lib/main.dart

@@ -2,10 +2,10 @@ import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/utils/route_tracker.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/data_providers/settings_provider.dart';
+import 'package:aves/widgets/common/behaviour/route_tracker.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/behaviour/routes.dart';
-import 'package:aves/widgets/common/routes.dart';
+import 'package:aves/widgets/common/providers/settings_provider.dart';
 import 'package:aves/widgets/home_page.dart';
 import 'package:aves/widgets/welcome_page.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';

lib/model/actions/chip_actions.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/widgets.dart';
 
 enum ChipSetAction {

lib/model/actions/collection_actions.dart

@@ -1,13 +1,14 @@
 enum CollectionAction {
   addShortcut,
-  copy,
+  sort,
   group,
-  move,
   refresh,
-  refreshMetadata,
   select,
   selectAll,
   selectNone,
-  sort,
   stats,
+  // apply to entry set
+  copy,
+  move,
+  refreshMetadata,
 }

lib/model/actions/entry_actions.dart

@@ -1,5 +1,5 @@
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 enum EntryAction {
   delete,

lib/model/entry_cache.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';
+import 'package:aves/image_providers/thumbnail_provider.dart';
-import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
+import 'package:aves/image_providers/uri_image_provider.dart';
 
 class EntryCache {
   static Future<void> evict(

lib/model/filters/album.dart

@@ -1,8 +1,9 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/utils/android_file_utils.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/identity/aves_icons.dart';
-import 'package:aves/widgets/common/image_providers/app_icon_image_provider.dart';
+import 'package:aves/theme/icons.dart';
+import 'package:aves/image_providers/app_icon_image_provider.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:palette_generator/palette_generator.dart';

lib/model/filters/favourite.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 

lib/model/filters/location.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 

lib/model/filters/mime.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/mime_types.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/utils/mime_utils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
@@ -35,7 +35,7 @@ class MimeFilter extends CollectionFilter {
       _label ??= lowMime.split('/')[0].toUpperCase();
     } else {
       _filter = (entry) => entry.mimeType == lowMime;
-      _label = MimeTypes.displayType(lowMime);
+      _label = MimeUtils.displayType(lowMime);
     }
     _icon ??= AIcons.vector;
   }

lib/model/filters/query.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

lib/model/filters/tag.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 

lib/model/image_entry.dart

@@ -17,7 +17,7 @@ import 'package:geocoder/geocoder.dart';
 import 'package:latlong/latlong.dart';
 import 'package:path/path.dart' as ppath;
 
-import 'mime_types.dart';
+import '../ref/mime_types.dart';
 
 class ImageEntry {
   String uri;
@@ -40,6 +40,9 @@ class ImageEntry {
 
   final AChangeNotifier imageChangeNotifier = AChangeNotifier(), metadataChangeNotifier = AChangeNotifier(), addressChangeNotifier = AChangeNotifier();
 
+  // TODO TLAD make it dynamic if it depends on OS/lib versions
+  static const List<String> undecodable = [MimeTypes.crw, MimeTypes.psd];
+
   ImageEntry({
     this.uri,
     String path,
@@ -59,7 +62,7 @@ class ImageEntry {
     this.dateModifiedSecs = dateModifiedSecs;
   }
 
-  bool get canDecode => !MimeTypes.undecodable.contains(mimeType);
+  bool get canDecode => !undecodable.contains(mimeType);
 
   ImageEntry copyWith({
     @required String uri,

lib/ref/mime_types.dart

@@ -41,24 +41,4 @@ class MimeTypes {
 
   // groups
   static const List<String> rawImages = [arw, cr2, crw, dcr, dng, erf, k25, kdc, mrw, nef, nrw, orf, pef, raf, raw, rw2, sr2, srf, srw, x3f];
-  static const List<String> undecodable = [crw, psd]; // TODO TLAD make it dynamic if it depends on OS/lib versions
-
-  static String displayType(String mime) {
-    switch (mime) {
-      case 'image/x-icon':
-        return 'ICO';
-      case 'image/vnd.adobe.photoshop':
-      case 'image/x-photoshop':
-        return 'PSD';
-      default:
-        final patterns = [
-          RegExp('.*/'), // remove type, keep subtype
-          RegExp('(X-|VND.(WAP.)?)'), // noisy prefixes
-          '+XML', // noisy suffix
-        ];
-        mime = mime.toUpperCase();
-        patterns.forEach((pattern) => mime = mime.replaceFirst(pattern, ''));
-        return mime;
-    }
-  }
 }

lib/services/image_file_service.dart

@@ -4,7 +4,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/mime_types.dart';
+import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/service_policy.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

lib/theme/icons.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+
+class AIcons {
+  static const IconData allCollection = Icons.collections_outlined;
+  static const IconData image = Icons.photo_outlined;
+  static const IconData video = Icons.movie_outlined;
+  static const IconData audio = Icons.audiotrack_outlined;
+  static const IconData vector = Icons.code_outlined;
+
+  static const IconData android = Icons.android;
+  static const IconData checked = Icons.done_outlined;
+  static const IconData date = Icons.calendar_today_outlined;
+  static const IconData disc = Icons.fiber_manual_record;
+  static const IconData error = Icons.error_outline;
+  static const IconData location = Icons.place_outlined;
+  static const IconData locationOff = Icons.location_off_outlined;
+  static const IconData raw = Icons.camera_outlined;
+  static const IconData shooting = Icons.camera_outlined;
+  static const IconData removableStorage = Icons.sd_storage_outlined;
+  static const IconData settings = Icons.settings_outlined;
+  static const IconData text = Icons.format_quote_outlined;
+  static const IconData tag = Icons.local_offer_outlined;
+  static const IconData tagOff = MdiIcons.tagOffOutline;
+
+  // actions
+  static const IconData addShortcut = Icons.add_to_home_screen_outlined;
+  static const IconData clear = Icons.clear_outlined;
+  static const IconData collapse = Icons.expand_less_outlined;
+  static const IconData createAlbum = Icons.add_circle_outline;
+  static const IconData debug = Icons.whatshot_outlined;
+  static const IconData delete = Icons.delete_outlined;
+  static const IconData expand = Icons.expand_more_outlined;
+  static const IconData flip = Icons.flip_outlined;
+  static const IconData favourite = Icons.favorite_border;
+  static const IconData favouriteActive = Icons.favorite;
+  static const IconData goUp = Icons.arrow_upward_outlined;
+  static const IconData group = Icons.group_work_outlined;
+  static const IconData info = Icons.info_outlined;
+  static const IconData layers = Icons.layers_outlined;
+  static const IconData openInNew = Icons.open_in_new_outlined;
+  static const IconData pin = Icons.push_pin_outlined;
+  static const IconData print = Icons.print_outlined;
+  static const IconData refresh = Icons.refresh_outlined;
+  static const IconData rename = Icons.title_outlined;
+  static const IconData rotateLeft = Icons.rotate_left_outlined;
+  static const IconData rotateRight = Icons.rotate_right_outlined;
+  static const IconData search = Icons.search_outlined;
+  static const IconData select = Icons.select_all_outlined;
+  static const IconData share = Icons.share_outlined;
+  static const IconData sort = Icons.sort_outlined;
+  static const IconData stats = Icons.pie_chart_outlined;
+  static const IconData zoomIn = Icons.add_outlined;
+  static const IconData zoomOut = Icons.remove_outlined;
+
+  // albums
+  static const IconData album = Icons.photo_album_outlined;
+  static const IconData cameraAlbum = Icons.photo_camera_outlined;
+  static const IconData downloadAlbum = Icons.file_download;
+  static const IconData screenshotAlbum = Icons.smartphone_outlined;
+
+  // thumbnail overlay
+  static const IconData animated = Icons.slideshow;
+  static const IconData play = Icons.play_circle_outline;
+  static const IconData selected = Icons.check_circle_outline;
+  static const IconData unselected = Icons.radio_button_unchecked;
+}

lib/utils/flutter_utils.dart

@@ -1,5 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-extension ExtraContext on BuildContext {
-  String get currentRouteName => ModalRoute.of(this)?.settings?.name;
-}

lib/utils/mime_utils.dart

@@ -0,0 +1,20 @@
+class MimeUtils {
+  static String displayType(String mime) {
+    switch (mime) {
+      case 'image/x-icon':
+        return 'ICO';
+      case 'image/vnd.adobe.photoshop':
+      case 'image/x-photoshop':
+        return 'PSD';
+      default:
+        final patterns = [
+          RegExp('.*/'), // remove type, keep subtype
+          RegExp('(X-|VND.(WAP.)?)'), // noisy prefixes
+          '+XML', // noisy suffix
+        ];
+        mime = mime.toUpperCase();
+        patterns.forEach((pattern) => mime = mime.replaceFirst(pattern, ''));
+        return mime;
+    }
+  }
+}

lib/widgets/about/about_page.dart

@@ -1,7 +1,7 @@
 import 'package:aves/flutter_version.dart';
 import 'package:aves/widgets/about/licenses.dart';
-import 'package:aves/widgets/common/aves_logo.dart';
+import 'package:aves/widgets/common/basic/link_chip.dart';
-import 'package:aves/widgets/common/link_chip.dart';
+import 'package:aves/widgets/common/identity/aves_logo.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info/package_info.dart';
 

lib/widgets/about/licenses.dart

@@ -1,9 +1,9 @@
-import 'package:aves/utils/brand_colors.dart';
+import 'package:aves/ref/brand_colors.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/basic/link_chip.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/basic/menu_row.dart';
-import 'package:aves/widgets/common/link_chip.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
-import 'package:aves/widgets/common/menu_row.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/collection/app_bar.dart

@@ -6,17 +6,17 @@ import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/services/app_shortcut_service.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/collection/collection_actions.dart';
+import 'package:aves/model/actions/collection_actions.dart';
 import 'package:aves/widgets/collection/filter_bar.dart';
-import 'package:aves/widgets/common/action_delegates/add_shortcut_dialog.dart';
+import 'package:aves/widgets/dialogs/add_shortcut_dialog.dart';
-import 'package:aves/widgets/common/action_delegates/selection_action_delegate.dart';
+import 'package:aves/widgets/collection/entry_set_action_delegate.dart';
 import 'package:aves/widgets/common/app_bar_subtitle.dart';
 import 'package:aves/widgets/common/app_bar_title.dart';
-import 'package:aves/widgets/common/aves_selection_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_selection_dialog.dart';
-import 'package:aves/widgets/common/entry_actions.dart';
+import 'package:aves/model/actions/entry_actions.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/menu_row.dart';
+import 'package:aves/widgets/common/basic/menu_row.dart';
 import 'package:aves/widgets/search/search_button.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
 import 'package:aves/widgets/stats/stats.dart';
@@ -42,7 +42,7 @@ class CollectionAppBar extends StatefulWidget {
 
 class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerProviderStateMixin {
   final TextEditingController _searchFieldController = TextEditingController();
-  SelectionActionDelegate _actionDelegate;
+  EntrySetActionDelegate _actionDelegate;
   AnimationController _browseToSelectAnimation;
   Future<bool> _canAddShortcutsLoader;
 
@@ -55,7 +55,7 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
   @override
   void initState() {
     super.initState();
-    _actionDelegate = SelectionActionDelegate(
+    _actionDelegate = EntrySetActionDelegate(
       collection: collection,
     );
     _browseToSelectAnimation = AnimationController(

lib/widgets/collection/collection_page.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/widgets/collection/thumbnail_collection.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/behaviour/double_back_pop.dart';
-import 'package:aves/widgets/common/double_back_pop.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/drawer/app_drawer.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

lib/widgets/collection/entry_set_action_delegate.dart

@@ -5,26 +5,26 @@ import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/android_app_service.dart';
 import 'package:aves/services/image_file_service.dart';
-import 'package:aves/widgets/collection/collection_actions.dart';
+import 'package:aves/model/actions/collection_actions.dart';
-import 'package:aves/widgets/common/action_delegates/feedback.dart';
+import 'package:aves/widgets/common/action_mixins/feedback.dart';
-import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
+import 'package:aves/widgets/common/action_mixins/permission_aware.dart';
-import 'package:aves/widgets/common/action_delegates/size_aware.dart';
+import 'package:aves/widgets/common/action_mixins/size_aware.dart';
-import 'package:aves/widgets/common/aves_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
-import 'package:aves/widgets/common/entry_actions.dart';
+import 'package:aves/model/actions/entry_actions.dart';
 import 'package:aves/widgets/filter_grids/album_pick.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 
-class SelectionActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
+class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
   final CollectionLens collection;
 
   CollectionSource get source => collection.source;
 
   Set<ImageEntry> get selection => collection.selection;
 
-  SelectionActionDelegate({
+  EntrySetActionDelegate({
     @required this.collection,
   });
 

lib/widgets/collection/filter_bar.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:flutter/material.dart';
 
 class FilterBar extends StatefulWidget implements PreferredSizeWidget {

lib/widgets/collection/grid/header_album.dart

@@ -1,6 +1,7 @@
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/grid/header_generic.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/identity/aves_icons.dart';
 import 'package:flutter/material.dart';
 
 class AlbumSectionHeader extends StatelessWidget {

lib/widgets/collection/grid/header_generic.dart

@@ -5,10 +5,10 @@ import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/grid/header_album.dart';
 import 'package:aves/widgets/collection/grid/header_date.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:provider/provider.dart';

lib/widgets/collection/grid/list_sliver.dart

@@ -4,8 +4,9 @@ import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/services/viewer_service.dart';
 import 'package:aves/widgets/collection/grid/list_known_extent.dart';
 import 'package:aves/widgets/collection/grid/list_section_layout.dart';
+import 'package:aves/widgets/collection/grid/scaling.dart';
 import 'package:aves/widgets/collection/thumbnail/decorated.dart';
-import 'package:aves/widgets/common/routes.dart';
+import 'package:aves/widgets/common/behaviour/routes.dart';
 import 'package:aves/widgets/fullscreen/fullscreen_page.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -70,7 +71,7 @@ class GridThumbnail extends StatelessWidget {
         }
       },
       child: MetaData(
-        metaData: ThumbnailMetadata(entry),
+        metaData: ScalerMetadata(entry),
         child: DecoratedThumbnail(
           entry: entry,
           extent: tileExtent,
@@ -94,10 +95,3 @@ class GridThumbnail extends StatelessWidget {
     );
   }
 }
-
-// metadata to identify entry from RenderObject hit test during collection scaling
-class ThumbnailMetadata {
-  final ImageEntry entry;
-
-  const ThumbnailMetadata(this.entry);
-}

lib/widgets/collection/grid/scaling.dart

@@ -1,23 +1,28 @@
 import 'dart:math';
 import 'dart:ui' as ui;
 
-import 'package:aves/model/image_entry.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/utils/durations.dart';
-import 'package:aves/widgets/collection/grid/list_section_layout.dart';
-import 'package:aves/widgets/collection/grid/list_sliver.dart';
 import 'package:aves/widgets/collection/grid/tile_extent_manager.dart';
 import 'package:aves/widgets/collection/thumbnail/decorated.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:provider/provider.dart';
 
-class GridScaleGestureDetector extends StatefulWidget {
+// metadata to identify entry from RenderObject hit test during collection scaling
+class ScalerMetadata<T> {
+  final T item;
+
+  const ScalerMetadata(this.item);
+}
+
+class GridScaleGestureDetector<T> extends StatefulWidget {
   final GlobalKey scrollableKey;
   final ValueNotifier<double> appBarHeightNotifier;
   final ValueNotifier<double> extentNotifier;
   final Size viewportSize;
-  final void Function(ImageEntry entry) onScaled;
+  final Widget Function(T item, double extent) scaledBuilder;
+  final Rect Function(T item) getScaledItemTileRect;
+  final void Function(T item) onScaled;
   final Widget child;
 
   const GridScaleGestureDetector({
@@ -25,20 +30,22 @@ class GridScaleGestureDetector extends StatefulWidget {
     @required this.appBarHeightNotifier,
     @required this.extentNotifier,
     @required this.viewportSize,
-    this.onScaled,
+    @required this.scaledBuilder,
+    @required this.getScaledItemTileRect,
+    @required this.onScaled,
     @required this.child,
   });
 
   @override
-  _GridScaleGestureDetectorState createState() => _GridScaleGestureDetectorState();
+  _GridScaleGestureDetectorState createState() => _GridScaleGestureDetectorState<T>();
 }
 
-class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
+class _GridScaleGestureDetectorState<T> extends State<GridScaleGestureDetector> {
   double _startExtent, _extentMin, _extentMax;
   bool _applyingScale = false;
   ValueNotifier<double> _scaledExtentNotifier;
   OverlayEntry _overlayEntry;
-  ThumbnailMetadata _metadata;
+  ScalerMetadata<T> _metadata;
 
   ValueNotifier<double> get tileExtentNotifier => widget.extentNotifier;
 
@@ -60,7 +67,7 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
         scrollableBox.hitTest(result, position: details.localFocalPoint);
 
         // find `RenderObject`s at the gesture focal point
-        T firstOf<T>(BoxHitTestResult result) => result.path.firstWhere((el) => el.target is T, orElse: () => null)?.target as T;
+        U firstOf<U>(BoxHitTestResult result) => result.path.firstWhere((el) => el.target is U, orElse: () => null)?.target as U;
         final renderMetaData = firstOf<RenderMetaData>(result);
         // abort if we cannot find an image to show on overlay
         if (renderMetaData == null) return;
@@ -75,14 +82,12 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
         final halfExtent = _startExtent / 2;
         final thumbnailCenter = renderMetaData.localToGlobal(Offset(halfExtent, halfExtent));
         _overlayEntry = OverlayEntry(
-          builder: (context) {
+          builder: (context) => ScaleOverlay(
-            return ScaleOverlay(
+            builder: (extent) => widget.scaledBuilder(_metadata.item, extent),
-              imageEntry: _metadata.entry,
+            center: thumbnailCenter,
-              center: thumbnailCenter,
+            gridWidth: gridWidth,
-              gridWidth: gridWidth,
+            scaledExtentNotifier: _scaledExtentNotifier,
-              scaledExtentNotifier: _scaledExtentNotifier,
+          ),
-            );
-          },
         );
         Overlay.of(scrollableContext).insert(_overlayEntry);
       },
@@ -112,8 +117,8 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
         } else {
           // scroll to show the focal point thumbnail at its new position
           WidgetsBinding.instance.addPostFrameCallback((_) {
-            final entry = _metadata.entry;
+            final entry = _metadata.item;
-            _scrollToEntry(entry);
+            _scrollToItem(entry);
             // warning: posting `onScaled` in the next frame with `addPostFrameCallback`
             // would trigger only when the scrollable offset actually changes
             Future.delayed(Durations.collectionScalingCompleteNotificationDelay).then((_) => widget.onScaled?.call(entry));
@@ -129,11 +134,10 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
   // `Scrollable.ensureVisible` only works on already rendered objects
   // `RenderViewport.showOnScreen` can find any `RenderSliver`, but not always a `RenderMetadata`
   // `RenderViewport.scrollOffsetOf` is a good alternative
-  void _scrollToEntry(ImageEntry entry) {
+  void _scrollToItem(T item) {
     final scrollableContext = widget.scrollableKey.currentContext;
     final scrollableHeight = (scrollableContext.findRenderObject() as RenderBox).size.height;
-    final sectionedListLayout = Provider.of<SectionedListLayout>(context, listen: false);
+    final tileRect = widget.getScaledItemTileRect(item);
-    final tileRect = sectionedListLayout.getTileRect(entry) ?? Rect.zero;
     // most of the time the app bar will be scrolled away after scaling,
     // so we compensate for it to center the focal point thumbnail
     final appBarHeight = widget.appBarHeightNotifier.value;
@@ -144,13 +148,13 @@ class _GridScaleGestureDetectorState extends State<GridScaleGestureDetector> {
 }
 
 class ScaleOverlay extends StatefulWidget {
-  final ImageEntry imageEntry;
+  final Widget Function(double extent) builder;
   final Offset center;
   final double gridWidth;
   final ValueNotifier<double> scaledExtentNotifier;
 
   const ScaleOverlay({
-    @required this.imageEntry,
+    @required this.builder,
     @required this.center,
     @required this.gridWidth,
     @required this.scaledExtentNotifier,
@@ -225,11 +229,7 @@ class _ScaleOverlayState extends State<ScaleOverlay> {
                       top: clampedCenter.dy - extent / 2,
                       child: DefaultTextStyle(
                         style: TextStyle(),
-                        child: DecoratedThumbnail(
+                        child: widget.builder(extent),
-                          entry: widget.imageEntry,
-                          extent: extent,
-                          showOverlay: false,
-                        ),
                       ),
                     ),
                   ],

lib/widgets/collection/thumbnail/error.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/mime_types.dart';
+import 'package:aves/utils/mime_utils.dart';
 import 'package:flutter/material.dart';
 
 class ErrorThumbnail extends StatelessWidget {
@@ -22,7 +22,7 @@ class ErrorThumbnail extends StatelessWidget {
         message: tooltip,
         preferBelow: false,
         child: Text(
-          MimeTypes.displayType(entry.mimeType),
+          MimeUtils.displayType(entry.mimeType),
           style: TextStyle(
             color: Colors.blueGrey,
             fontSize: extent / 5,

lib/widgets/collection/thumbnail/overlay.dart

@@ -4,9 +4,10 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/fx/sweeper.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/identity/aves_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tuple/tuple.dart';

lib/widgets/collection/thumbnail/raster.dart

@@ -1,11 +1,11 @@
 import 'dart:math';
 
+import 'package:aves/image_providers/thumbnail_provider.dart';
+import 'package:aves/image_providers/uri_image_provider.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/thumbnail/error.dart';
-import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';
+import 'package:aves/widgets/common/fx/transition_image.dart';
-import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
-import 'package:aves/widgets/common/transition_image.dart';
 import 'package:flutter/material.dart';
 
 class ThumbnailRasterImage extends StatefulWidget {

lib/widgets/collection/thumbnail/vector.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/widgets/common/image_providers/uri_picture_provider.dart';
+import 'package:aves/image_providers/uri_picture_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';

lib/widgets/collection/thumbnail_collection.dart

@@ -2,24 +2,25 @@ import 'dart:async';
 
 import 'package:aves/model/filters/favourite.dart';
 import 'package:aves/model/filters/mime.dart';
-import 'package:aves/model/mime_types.dart';
+import 'package:aves/model/image_entry.dart';
+import 'package:aves/ref/mime_types.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/app_bar.dart';
 import 'package:aves/widgets/collection/empty.dart';
 import 'package:aves/widgets/collection/grid/list_section_layout.dart';
 import 'package:aves/widgets/collection/grid/list_sliver.dart';
 import 'package:aves/widgets/collection/grid/scaling.dart';
 import 'package:aves/widgets/collection/grid/tile_extent_manager.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/collection/thumbnail/decorated.dart';
-import 'package:aves/widgets/common/scroll_thumb.dart';
+import 'package:aves/widgets/common/behaviour/sloppy_scroll_physics.dart';
-import 'package:aves/widgets/common/sloppy_scroll_physics.dart';
+import 'package:aves/theme/icons.dart';
+import 'package:aves/widgets/common/identity/scroll_thumb.dart';
 import 'package:draggable_scrollbar/draggable_scrollbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:provider/provider.dart';
-import 'package:tuple/tuple.dart';
 
 class ThumbnailCollection extends StatelessWidget {
   final ValueNotifier<double> _appBarHeightNotifier = ValueNotifier(0);
@@ -30,16 +31,14 @@ class ThumbnailCollection extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SafeArea(
-      child: Selector<MediaQueryData, Tuple2<Size, double>>(
+      child: LayoutBuilder(
-        selector: (context, mq) => Tuple2(mq.size, mq.padding.horizontal),
+        builder: (context, constraints) {
-        builder: (context, mq, child) {
+          final viewportSize = constraints.biggest;
-          final mqSize = mq.item1;
+          assert(viewportSize.isFinite, 'Cannot layout collection with unbounded constraints.');
-          final mqHorizontalPadding = mq.item2;
+          if (viewportSize.isEmpty) return SizedBox.shrink();
 
-          if (mqSize.isEmpty) return SizedBox.shrink();
+          TileExtentManager.applyTileExtent(viewportSize, _tileExtentNotifier);
-
+          final cacheExtent = TileExtentManager.extentMaxForSize(viewportSize) * 2;
-          TileExtentManager.applyTileExtent(Size(mqSize.width - mqHorizontalPadding, mqSize.height), _tileExtentNotifier);
-          final cacheExtent = TileExtentManager.extentMaxForSize(mqSize) * 2;
 
           // do not replace by Provider.of<CollectionLens>
           // so that view updates on collection filter changes
@@ -58,11 +57,20 @@ class ThumbnailCollection extends StatelessWidget {
                 cacheExtent: cacheExtent,
               );
 
-              final scaler = GridScaleGestureDetector(
+              final scaler = GridScaleGestureDetector<ImageEntry>(
                 scrollableKey: _scrollableKey,
                 appBarHeightNotifier: _appBarHeightNotifier,
                 extentNotifier: _tileExtentNotifier,
-                viewportSize: Size(mqSize.width - mqHorizontalPadding, mqSize.height),
+                viewportSize: viewportSize,
+                scaledBuilder: (entry, extent) => DecoratedThumbnail(
+                  entry: entry,
+                  extent: extent,
+                  showOverlay: false,
+                ),
+                getScaledItemTileRect: (entry) {
+                  final sectionedListLayout = Provider.of<SectionedListLayout>(context, listen: false);
+                  return sectionedListLayout.getTileRect(entry) ?? Rect.zero;
+                },
                 onScaled: collection.highlight,
                 child: scrollView,
               );
@@ -71,7 +79,7 @@ class ThumbnailCollection extends StatelessWidget {
                 valueListenable: _tileExtentNotifier,
                 builder: (context, tileExtent, child) => SectionedListLayoutProvider(
                   collection: collection,
-                  scrollableWidth: mqSize.width - mqHorizontalPadding,
+                  scrollableWidth: viewportSize.width,
                   tileExtent: tileExtent,
                   thumbnailBuilder: (entry) => GridThumbnail(
                     key: ValueKey(entry.contentId),

lib/widgets/common/action_mixins/feedback.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/services/image_file_service.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:flushbar/flushbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/common/action_mixins/permission_aware.dart

@@ -1,9 +1,8 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/services/android_file_service.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:flutter/material.dart';
 
-import '../aves_dialog.dart';
-
 mixin PermissionAwareMixin {
   Future<bool> checkStoragePermission(BuildContext context, Set<ImageEntry> entries) {
     return checkStoragePermissionForAlbums(context, entries.where((e) => e.path != null).map((e) => e.directory).toSet());

lib/widgets/common/action_mixins/size_aware.dart

@@ -5,7 +5,7 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/services/android_file_service.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/file_utils.dart';
-import 'package:aves/widgets/common/aves_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

lib/widgets/common/app_bar_subtitle.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:flutter/material.dart';
 
 class SourceStateAwareAppBarTitle extends StatelessWidget {

lib/widgets/common/basic/link_chip.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 

lib/widgets/common/basic/menu_row.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:flutter/material.dart';
 
 class MenuRow extends StatelessWidget {

lib/widgets/common/basic/reselectable_radio_list_tile.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 // `RadioListTile` that can trigger `onChanged` on tap when already selected, if `reselectable` is true
-class AvesRadioListTile<T> extends StatelessWidget {
+class ReselectableRadioListTile<T> extends StatelessWidget {
   final T value;
   final T groupValue;
   final ValueChanged<T> onChanged;
@@ -19,7 +19,7 @@ class AvesRadioListTile<T> extends StatelessWidget {
 
   bool get checked => value == groupValue;
 
-  const AvesRadioListTile({
+  const ReselectableRadioListTile({
     Key key,
     @required this.value,
     @required this.groupValue,

lib/widgets/common/behaviour/double_back_pop.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/common/action_delegates/feedback.dart';
+import 'package:aves/widgets/common/action_mixins/feedback.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:overlay_support/overlay_support.dart';

lib/widgets/common/behaviour/routes.dart

@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';
 
+extension ExtraContext on BuildContext {
+  String get currentRouteName => ModalRoute.of(this)?.settings?.name;
+}
+
 class DirectMaterialPageRoute<T> extends PageRouteBuilder<T> {
   DirectMaterialPageRoute({
     RouteSettings settings,

lib/widgets/common/fx/sweeper.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 

lib/widgets/common/identity/aves_expansion_tile.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/highlight_title.dart';
+import 'package:aves/widgets/common/identity/highlight_title.dart';
 import 'package:expansion_tile_card/expansion_tile_card.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/common/identity/aves_filter_chip.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/filters.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/widgets/common/icons.dart';
 import 'package:flutter/material.dart';
 
 typedef FilterCallback = void Function(CollectionFilter filter);
@@ -28,7 +28,7 @@ class AvesFilterChip extends StatefulWidget {
 
   const AvesFilterChip({
     Key key,
-    this.filter,
+    @required this.filter,
     this.removable = false,
     this.showGenericIcon = true,
     this.background,
@@ -36,7 +36,8 @@ class AvesFilterChip extends StatefulWidget {
     this.heroType = HeroType.onTap,
     @required this.onTap,
     this.onLongPress,
-  }) : super(key: key);
+  })  : assert(filter != null),
+        super(key: key);
 
   @override
   _AvesFilterChipState createState() => _AvesFilterChipState();

lib/widgets/common/identity/aves_icons.dart

@@ -1,77 +1,12 @@
 import 'dart:ui';
 
+import 'package:aves/image_providers/app_icon_image_provider.dart';
 import 'package:aves/model/image_entry.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/widgets/common/image_providers/app_icon_image_provider.dart';
 import 'package:decorated_icon/decorated_icon.dart';
 import 'package:flutter/material.dart';
-import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
-
-class AIcons {
-  static const IconData allCollection = Icons.collections_outlined;
-  static const IconData image = Icons.photo_outlined;
-  static const IconData video = Icons.movie_outlined;
-  static const IconData audio = Icons.audiotrack_outlined;
-  static const IconData vector = Icons.code_outlined;
-
-  static const IconData android = Icons.android;
-  static const IconData checked = Icons.done_outlined;
-  static const IconData date = Icons.calendar_today_outlined;
-  static const IconData disc = Icons.fiber_manual_record;
-  static const IconData error = Icons.error_outline;
-  static const IconData location = Icons.place_outlined;
-  static const IconData locationOff = Icons.location_off_outlined;
-  static const IconData raw = Icons.camera_outlined;
-  static const IconData shooting = Icons.camera_outlined;
-  static const IconData removableStorage = Icons.sd_storage_outlined;
-  static const IconData settings = Icons.settings_outlined;
-  static const IconData text = Icons.format_quote_outlined;
-  static const IconData tag = Icons.local_offer_outlined;
-  static const IconData tagOff = MdiIcons.tagOffOutline;
-
-  // actions
-  static const IconData addShortcut = Icons.add_to_home_screen_outlined;
-  static const IconData clear = Icons.clear_outlined;
-  static const IconData collapse = Icons.expand_less_outlined;
-  static const IconData createAlbum = Icons.add_circle_outline;
-  static const IconData debug = Icons.whatshot_outlined;
-  static const IconData delete = Icons.delete_outlined;
-  static const IconData expand = Icons.expand_more_outlined;
-  static const IconData flip = Icons.flip_outlined;
-  static const IconData favourite = Icons.favorite_border;
-  static const IconData favouriteActive = Icons.favorite;
-  static const IconData goUp = Icons.arrow_upward_outlined;
-  static const IconData group = Icons.group_work_outlined;
-  static const IconData info = Icons.info_outlined;
-  static const IconData layers = Icons.layers_outlined;
-  static const IconData openInNew = Icons.open_in_new_outlined;
-  static const IconData pin = Icons.push_pin_outlined;
-  static const IconData print = Icons.print_outlined;
-  static const IconData refresh = Icons.refresh_outlined;
-  static const IconData rename = Icons.title_outlined;
-  static const IconData rotateLeft = Icons.rotate_left_outlined;
-  static const IconData rotateRight = Icons.rotate_right_outlined;
-  static const IconData search = Icons.search_outlined;
-  static const IconData select = Icons.select_all_outlined;
-  static const IconData share = Icons.share_outlined;
-  static const IconData sort = Icons.sort_outlined;
-  static const IconData stats = Icons.pie_chart_outlined;
-  static const IconData zoomIn = Icons.add_outlined;
-  static const IconData zoomOut = Icons.remove_outlined;
-
-  // albums
-  static const IconData album = Icons.photo_album_outlined;
-  static const IconData cameraAlbum = Icons.photo_camera_outlined;
-  static const IconData downloadAlbum = Icons.file_download;
-  static const IconData screenshotAlbum = Icons.smartphone_outlined;
-
-  // thumbnail overlay
-  static const IconData animated = Icons.slideshow;
-  static const IconData play = Icons.play_circle_outline;
-  static const IconData selected = Icons.check_circle_outline;
-  static const IconData unselected = Icons.radio_button_unchecked;
-}
 
 class VideoIcon extends StatelessWidget {
   final ImageEntry entry;

lib/widgets/debug/android_env.dart

@@ -1,7 +1,7 @@
 import 'dart:collection';
 
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/debug/app_debug_page.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/debug/android_env.dart';
 import 'package:aves/widgets/debug/cache.dart';
 import 'package:aves/widgets/debug/database.dart';

lib/widgets/debug/cache.dart

@@ -1,6 +1,6 @@
 import 'package:aves/services/image_file_service.dart';
 import 'package:aves/utils/file_utils.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 

lib/widgets/debug/database.dart

@@ -3,7 +3,7 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/image_metadata.dart';
 import 'package:aves/model/metadata_db.dart';
 import 'package:aves/utils/file_utils.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:flutter/material.dart';
 
 class DebugAppDatabaseSection extends StatefulWidget {

lib/widgets/debug/firebase.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_core/firebase_core.dart';

lib/widgets/debug/settings.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/debug/storage.dart

@@ -1,7 +1,7 @@
 import 'package:aves/services/android_file_service.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/file_utils.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/dialogs/add_shortcut_dialog.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:flutter/material.dart';
 
-import '../aves_dialog.dart';
+import 'aves_dialog.dart';
 
 class AddShortcutDialog extends StatefulWidget {
   final Set<CollectionFilter> filters;

lib/widgets/dialogs/aves_dialog.dart

@@ -14,11 +14,13 @@ class AvesDialog extends AlertDialog {
     @required List<Widget> actions,
   })  : assert((scrollableContent != null) ^ (content != null)),
         super(
-          title: title != null ? Padding(
+          title: title != null
-            // padding to avoid transparent border overlapping
+              ? Padding(
-            padding: EdgeInsets.symmetric(horizontal: borderWidth),
+                  // padding to avoid transparent border overlapping
-            child: DialogTitle(title: title),
+                  padding: EdgeInsets.symmetric(horizontal: borderWidth),
-          ) : null,
+                  child: DialogTitle(title: title),
+                )
+              : null,
           titlePadding: EdgeInsets.zero,
           // the `scrollable` flag of `AlertDialog` makes it
           // scroll both the title and the content together,

lib/widgets/dialogs/aves_selection_dialog.dart

@@ -1,4 +1,4 @@
-import 'package:aves/widgets/common/aves_radio_list_tile.dart';
+import 'package:aves/widgets/common/basic/reselectable_radio_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
@@ -48,7 +48,7 @@ class _AvesSelectionDialogState<T> extends State<AvesSelectionDialog> {
   }
 
   Widget _buildRadioListTile(T value, String title) {
-    return AvesRadioListTile<T>(
+    return ReselectableRadioListTile<T>(
       key: Key(value.toString()),
       value: value,
       groupValue: _selectedValue,

lib/widgets/dialogs/create_album_dialog.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 
 import 'package:aves/utils/android_file_utils.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:path/path.dart';
 
-import '../aves_dialog.dart';
+import 'aves_dialog.dart';
 
 class CreateAlbumDialog extends StatefulWidget {
   @override

lib/widgets/dialogs/rename_album_dialog.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as path;
 
-import '../aves_dialog.dart';
+import '../dialogs/aves_dialog.dart';
 
 class RenameAlbumDialog extends StatefulWidget {
   final String album;

lib/widgets/dialogs/rename_entry_dialog.dart

@@ -4,7 +4,7 @@ import 'package:aves/model/image_entry.dart';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as path;
 
-import '../aves_dialog.dart';
+import 'aves_dialog.dart';
 
 class RenameEntryDialog extends StatefulWidget {
   final ImageEntry entry;

lib/widgets/drawer/app_drawer.dart

@@ -3,15 +3,16 @@ import 'dart:ui';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/favourite.dart';
 import 'package:aves/model/filters/mime.dart';
-import 'package:aves/model/mime_types.dart';
 import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/location.dart';
 import 'package:aves/model/source/tag.dart';
+import 'package:aves/ref/mime_types.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/about/about_page.dart';
-import 'package:aves/widgets/common/aves_logo.dart';
+import 'package:aves/widgets/common/identity/aves_icons.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/identity/aves_logo.dart';
 import 'package:aves/widgets/debug/app_debug_page.dart';
 import 'package:aves/widgets/drawer/collection_tile.dart';
 import 'package:aves/widgets/drawer/tile.dart';

lib/widgets/drawer/tile.dart

@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:aves/utils/flutter_utils.dart';
+import 'package:aves/widgets/common/behaviour/routes.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/filter_grids/album_pick.dart

@@ -1,14 +1,14 @@
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
+import 'package:aves/theme/durations.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/debouncer.dart';
-import 'package:aves/utils/durations.dart';
 import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/common/action_delegates/create_album_dialog.dart';
+import 'package:aves/widgets/dialogs/create_album_dialog.dart';
-import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
 import 'package:aves/widgets/filter_grids/common/chip_set_action_delegate.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
 import 'package:flutter/foundation.dart';

lib/widgets/filter_grids/albums_page.dart

@@ -7,9 +7,9 @@ import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/filter_grids/common/chip_action_delegate.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/widgets/filter_grids/common/chip_set_action_delegate.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
 import 'package:collection/collection.dart';

lib/widgets/filter_grids/common/chip_action_delegate.dart

@@ -1,14 +1,14 @@
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/image_file_service.dart';
-import 'package:aves/widgets/common/action_delegates/feedback.dart';
+import 'package:aves/widgets/common/action_mixins/feedback.dart';
-import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
+import 'package:aves/widgets/common/action_mixins/permission_aware.dart';
-import 'package:aves/widgets/common/action_delegates/rename_album_dialog.dart';
+import 'package:aves/widgets/common/action_mixins/size_aware.dart';
-import 'package:aves/widgets/common/action_delegates/size_aware.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
-import 'package:aves/widgets/common/aves_dialog.dart';
+import 'package:aves/widgets/dialogs/rename_album_dialog.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:path/path.dart' as path;

lib/widgets/filter_grids/common/chip_set_action_delegate.dart

@@ -1,8 +1,8 @@
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
-import 'package:aves/widgets/common/aves_selection_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_selection_dialog.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
 import 'package:aves/widgets/stats/stats.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/filter_grids/common/decorated_filter_chip.dart

@@ -6,11 +6,11 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/thumbnail/raster.dart';
 import 'package:aves/widgets/collection/thumbnail/vector.dart';
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
 import 'package:decorated_icon/decorated_icon.dart';
 import 'package:flutter/material.dart';

lib/widgets/filter_grids/common/filter_grid_page.dart

@@ -6,19 +6,19 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
 import 'package:aves/widgets/common/app_bar_subtitle.dart';
 import 'package:aves/widgets/common/app_bar_title.dart';
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/behaviour/double_back_pop.dart';
-import 'package:aves/widgets/common/double_back_pop.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/basic/menu_row.dart';
-import 'package:aves/widgets/common/menu_row.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
-import 'package:aves/widgets/common/scroll_thumb.dart';
+import 'package:aves/widgets/common/identity/scroll_thumb.dart';
 import 'package:aves/widgets/drawer/app_drawer.dart';
 import 'package:aves/widgets/filter_grids/common/chip_action_delegate.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/widgets/filter_grids/common/chip_set_action_delegate.dart';
 import 'package:aves/widgets/filter_grids/common/decorated_filter_chip.dart';
 import 'package:aves/widgets/search/search_button.dart';

lib/widgets/filter_grids/countries_page.dart

@@ -1,3 +1,4 @@
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/image_entry.dart';
@@ -5,10 +6,9 @@ import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/model/source/location.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/filter_grids/common/chip_action_delegate.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
 import 'package:aves/widgets/filter_grids/common/chip_set_action_delegate.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
 import 'package:collection/collection.dart';

lib/widgets/filter_grids/tags_page.dart

@@ -6,9 +6,9 @@ import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/model/source/tag.dart';
 import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/filter_grids/common/chip_action_delegate.dart';
-import 'package:aves/widgets/filter_grids/common/chip_actions.dart';
+import 'package:aves/model/actions/chip_actions.dart';
 import 'package:aves/widgets/filter_grids/common/chip_set_action_delegate.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
 import 'package:collection/collection.dart';

lib/widgets/fullscreen/debug/metadata.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/services/metadata_service.dart';
 import 'package:aves/utils/constants.dart';
-import 'package:aves/widgets/common/aves_expansion_tile.dart';
+import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/fullscreen/entry_action_delegate.dart

@@ -1,13 +1,13 @@
+import 'package:aves/image_providers/uri_image_provider.dart';
+import 'package:aves/model/actions/entry_actions.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/services/android_app_service.dart';
 import 'package:aves/services/image_file_service.dart';
-import 'package:aves/widgets/common/action_delegates/feedback.dart';
+import 'package:aves/widgets/common/action_mixins/feedback.dart';
-import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
+import 'package:aves/widgets/common/action_mixins/permission_aware.dart';
-import 'package:aves/widgets/common/action_delegates/rename_entry_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
-import 'package:aves/widgets/common/aves_dialog.dart';
+import 'package:aves/widgets/dialogs/rename_entry_dialog.dart';
-import 'package:aves/widgets/common/entry_actions.dart';
-import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
 import 'package:aves/widgets/fullscreen/fullscreen_debug_page.dart';
 import 'package:aves/widgets/fullscreen/source_viewer_page.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/fullscreen_body.dart

@@ -6,9 +6,9 @@ import 'package:aves/model/settings/screen_on.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/utils/change_notifier.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
-import 'package:aves/widgets/common/action_delegates/entry_action_delegate.dart';
+import 'package:aves/widgets/fullscreen/entry_action_delegate.dart';
 import 'package:aves/widgets/fullscreen/image_page.dart';
 import 'package:aves/widgets/fullscreen/image_view.dart';
 import 'package:aves/widgets/fullscreen/info/info_page.dart';

lib/widgets/fullscreen/fullscreen_debug_page.dart

@@ -1,8 +1,8 @@
 import 'package:aves/main.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';
+import 'package:aves/image_providers/thumbnail_provider.dart';
-import 'package:aves/widgets/common/image_providers/uri_picture_provider.dart';
+import 'package:aves/image_providers/uri_picture_provider.dart';
 import 'package:aves/widgets/fullscreen/debug/db.dart';
 import 'package:aves/widgets/fullscreen/debug/metadata.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';

lib/widgets/fullscreen/fullscreen_page.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/fullscreen/fullscreen_body.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/fullscreen/image_view.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
+import 'package:aves/image_providers/thumbnail_provider.dart';
+import 'package:aves/image_providers/uri_image_provider.dart';
+import 'package:aves/image_providers/uri_picture_provider.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/settings/settings.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/common/icons.dart';
-import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';
-import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
-import 'package:aves/widgets/common/image_providers/uri_picture_provider.dart';
 import 'package:aves/widgets/fullscreen/tiled_view.dart';
 import 'package:aves/widgets/fullscreen/video_view.dart';
 import 'package:flutter/foundation.dart';

lib/widgets/fullscreen/info/basic_section.dart

@@ -4,11 +4,11 @@ import 'package:aves/model/filters/favourite.dart';
 import 'package:aves/model/filters/mime.dart';
 import 'package:aves/model/filters/tag.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/mime_types.dart';
 import 'package:aves/model/source/collection_lens.dart';
+import 'package:aves/ref/mime_types.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/utils/file_utils.dart';
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/info/common.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';

lib/widgets/fullscreen/info/info_page.dart

@@ -1,9 +1,9 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/fullscreen/info/basic_section.dart';
 import 'package:aves/widgets/fullscreen/info/location_section.dart';
 import 'package:aves/widgets/fullscreen/info/metadata/metadata_section.dart';

lib/widgets/fullscreen/info/location_section.dart

@@ -3,9 +3,9 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/settings/coordinate_format.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/common/aves_filter_chip.dart';
+import 'package:aves/theme/icons.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/fullscreen/info/common.dart';
 import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:aves/widgets/fullscreen/info/maps/google_map.dart';

lib/widgets/fullscreen/info/maps/common.dart

@@ -1,11 +1,11 @@
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/android_app_service.dart';
-import 'package:aves/utils/durations.dart';
+import 'package:aves/theme/durations.dart';
-import 'package:aves/widgets/common/aves_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_dialog.dart';
-import 'package:aves/widgets/common/aves_selection_dialog.dart';
+import 'package:aves/widgets/dialogs/aves_selection_dialog.dart';
-import 'package:aves/widgets/common/borders.dart';
+import 'package:aves/widgets/common/fx/borders.dart';
 import 'package:aves/widgets/common/fx/blurred.dart';
-import 'package:aves/widgets/common/icons.dart';
+import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/fullscreen/info/location_section.dart';
 import 'package:aves/widgets/fullscreen/overlay/common.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/info/maps/scale_layer.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:aves/widgets/common/fx/outlined_text.dart';
+import 'package:aves/widgets/common/basic/outlined_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:flutter_map/plugin_api.dart';