refactor

lib/model/actions/chip.dart

@@ -1,17 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum ChipAction {
-  goToAlbumPage,
-  goToCountryPage,
-  goToPlacePage,
-  goToTagPage,
-  reverse,
-  hide,
-  lockVault,
-}
-
 extension ExtraChipAction on ChipAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/chip_set.dart

@@ -1,75 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
-enum ChipSetAction {
-  // general
-  configureView,
-  select,
-  selectAll,
-  selectNone,
-  // browsing
-  search,
-  toggleTitleSearch,
-  createAlbum,
-  createVault,
-  // browsing or selecting
-  map,
-  slideshow,
-  stats,
-  // selecting (single/multiple filters)
-  delete,
-  hide,
-  pin,
-  unpin,
-  lockVault,
-  showCountryStates,
-  // selecting (single filter)
-  rename,
-  setCover,
-  configureVault,
-}
-
-class ChipSetActions {
-  static const general = [
-    ChipSetAction.configureView,
-    ChipSetAction.select,
-    ChipSetAction.selectAll,
-    ChipSetAction.selectNone,
-  ];
-
-  // `null` items are converted to dividers
-  static const browsing = [
-    ChipSetAction.search,
-    ChipSetAction.toggleTitleSearch,
-    null,
-    ChipSetAction.map,
-    ChipSetAction.slideshow,
-    ChipSetAction.stats,
-    null,
-    ChipSetAction.createAlbum,
-    ChipSetAction.createVault,
-  ];
-
-  // `null` items are converted to dividers
-  static const selection = [
-    ChipSetAction.setCover,
-    ChipSetAction.pin,
-    ChipSetAction.unpin,
-    ChipSetAction.delete,
-    ChipSetAction.rename,
-    ChipSetAction.showCountryStates,
-    ChipSetAction.hide,
-    null,
-    ChipSetAction.map,
-    ChipSetAction.slideshow,
-    ChipSetAction.stats,
-    null,
-    ChipSetAction.configureVault,
-    ChipSetAction.lockVault,
-  ];
-}
-
 extension ExtraChipSetAction on ChipSetAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/entry.dart

@@ -1,146 +1,9 @@
 import 'package:aves/theme/colors.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum EntryAction {
-  info,
-  addShortcut,
-  copyToClipboard,
-  delete,
-  restore,
-  convert,
-  print,
-  rename,
-  copy,
-  move,
-  share,
-  toggleFavourite,
-  // raster
-  rotateCCW,
-  rotateCW,
-  flip,
-  // vector
-  viewSource,
-  // video
-  lockViewer,
-  videoCaptureFrame,
-  videoSelectStreams,
-  videoSetSpeed,
-  videoToggleMute,
-  videoSettings,
-  videoTogglePlay,
-  videoReplay10,
-  videoSkip10,
-  // external
-  edit,
-  open,
-  openVideo,
-  openMap,
-  setAs,
-  // platform
-  rotateScreen,
-  // metadata
-  editDate,
-  editLocation,
-  editTitleDescription,
-  editRating,
-  editTags,
-  removeMetadata,
-  exportMetadata,
-  // metadata / GeoTIFF
-  showGeoTiffOnMap,
-  // metadata / motion photo
-  convertMotionPhotoToStillImage,
-  viewMotionPhotoVideo,
-  // debug
-  debug,
-}
-
-class EntryActions {
-  static const topLevel = [
-    EntryAction.info,
-    EntryAction.share,
-    EntryAction.edit,
-    EntryAction.rename,
-    EntryAction.delete,
-    EntryAction.copy,
-    EntryAction.move,
-    EntryAction.toggleFavourite,
-    EntryAction.rotateScreen,
-    EntryAction.viewSource,
-  ];
-
-  static const export = [
-    ...exportInternal,
-    ...exportExternal,
-  ];
-
-  static const exportInternal = [
-    EntryAction.convert,
-    EntryAction.addShortcut,
-    EntryAction.copyToClipboard,
-    EntryAction.print,
-  ];
-
-  static const exportExternal = [
-    EntryAction.open,
-    EntryAction.openMap,
-    EntryAction.setAs,
-  ];
-
-  static const pageActions = {
-    EntryAction.videoCaptureFrame,
-    EntryAction.videoSelectStreams,
-    EntryAction.videoSetSpeed,
-    EntryAction.videoToggleMute,
-    EntryAction.videoSettings,
-    EntryAction.videoTogglePlay,
-    EntryAction.videoReplay10,
-    EntryAction.videoSkip10,
-    EntryAction.rotateCCW,
-    EntryAction.rotateCW,
-    EntryAction.flip,
-  };
-
-  static const trashed = [
-    EntryAction.delete,
-    EntryAction.restore,
-    EntryAction.debug,
-  ];
-
-  static const video = [
-    EntryAction.videoCaptureFrame,
-    EntryAction.videoToggleMute,
-    EntryAction.videoSetSpeed,
-    EntryAction.videoSelectStreams,
-    EntryAction.videoSettings,
-    EntryAction.lockViewer,
-  ];
-
-  static const videoPlayback = [
-    EntryAction.videoReplay10,
-    EntryAction.videoTogglePlay,
-    EntryAction.videoSkip10,
-  ];
-
-  static const commonMetadataActions = [
-    EntryAction.editDate,
-    EntryAction.editLocation,
-    EntryAction.editTitleDescription,
-    EntryAction.editRating,
-    EntryAction.editTags,
-    EntryAction.removeMetadata,
-    EntryAction.exportMetadata,
-  ];
-
-  static const formatSpecificMetadataActions = [
-    EntryAction.showGeoTiffOnMap,
-    EntryAction.convertMotionPhotoToStillImage,
-    EntryAction.viewMotionPhotoVideo,
-  ];
-}
-
 extension ExtraEntryAction on EntryAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/entry_set.dart

@@ -1,133 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
-enum EntrySetAction {
-  // general
-  configureView,
-  select,
-  selectAll,
-  selectNone,
-  // browsing
-  searchCollection,
-  toggleTitleSearch,
-  addShortcut,
-  emptyBin,
-  // browsing or selecting
-  map,
-  slideshow,
-  stats,
-  rescan,
-  // selecting
-  share,
-  delete,
-  restore,
-  copy,
-  move,
-  rename,
-  convert,
-  toggleFavourite,
-  rotateCCW,
-  rotateCW,
-  flip,
-  editDate,
-  editLocation,
-  editTitleDescription,
-  editRating,
-  editTags,
-  removeMetadata,
-}
-
-class EntrySetActions {
-  static const general = [
-    EntrySetAction.configureView,
-    EntrySetAction.select,
-    EntrySetAction.selectAll,
-    EntrySetAction.selectNone,
-  ];
-
-  // `null` items are converted to dividers
-  static const pageBrowsing = [
-    EntrySetAction.searchCollection,
-    EntrySetAction.toggleTitleSearch,
-    EntrySetAction.addShortcut,
-    null,
-    EntrySetAction.map,
-    EntrySetAction.slideshow,
-    EntrySetAction.stats,
-    null,
-    EntrySetAction.rescan,
-    EntrySetAction.emptyBin,
-  ];
-
-  // exclude bin related actions
-  static const collectionEditorBrowsing = [
-    EntrySetAction.searchCollection,
-    EntrySetAction.toggleTitleSearch,
-    EntrySetAction.addShortcut,
-    EntrySetAction.map,
-    EntrySetAction.slideshow,
-    EntrySetAction.stats,
-    EntrySetAction.rescan,
-  ];
-
-  // `null` items are converted to dividers
-  static const pageSelection = [
-    EntrySetAction.share,
-    EntrySetAction.delete,
-    EntrySetAction.restore,
-    EntrySetAction.copy,
-    EntrySetAction.move,
-    EntrySetAction.rename,
-    EntrySetAction.convert,
-    EntrySetAction.toggleFavourite,
-    null,
-    EntrySetAction.map,
-    EntrySetAction.slideshow,
-    EntrySetAction.stats,
-    null,
-    EntrySetAction.rescan,
-    // editing actions are in their subsection
-  ];
-
-  // exclude bin related actions
-  static const collectionEditorSelectionRegular = [
-    EntrySetAction.share,
-    EntrySetAction.delete,
-    EntrySetAction.copy,
-    EntrySetAction.move,
-    EntrySetAction.rename,
-    EntrySetAction.convert,
-    EntrySetAction.toggleFavourite,
-    EntrySetAction.map,
-    EntrySetAction.slideshow,
-    EntrySetAction.stats,
-    EntrySetAction.rescan,
-    // editing actions are in their subsection
-  ];
-
-  static const collectionEditorSelectionEdit = [
-    EntrySetAction.rotateCCW,
-    EntrySetAction.rotateCW,
-    EntrySetAction.flip,
-    EntrySetAction.editDate,
-    EntrySetAction.editLocation,
-    EntrySetAction.editTitleDescription,
-    EntrySetAction.editRating,
-    EntrySetAction.editTags,
-    EntrySetAction.removeMetadata,
-  ];
-
-  static const edit = [
-    EntrySetAction.editDate,
-    EntrySetAction.editLocation,
-    EntrySetAction.editTitleDescription,
-    EntrySetAction.editRating,
-    EntrySetAction.editTags,
-    EntrySetAction.removeMetadata,
-  ];
-}
-
 extension ExtraEntrySetAction on EntrySetAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/map.dart

@@ -1,13 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum MapAction {
-  selectStyle,
-  zoomIn,
-  zoomOut,
-}
-
 extension ExtraMapAction on MapAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/map_cluster.dart

@@ -1,12 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum MapClusterAction {
-  editLocation,
-  removeLocation,
-}
-
 extension ExtraMapClusterAction on MapClusterAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/share.dart

@@ -1,12 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum ShareAction {
-  imageOnly,
-  videoOnly,
-}
-
 extension ExtraShareAction on ShareAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/actions/slideshow.dart

@@ -1,13 +1,8 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
-enum SlideshowAction {
-  resume,
-  showInCollection,
-  settings,
-}
-
 extension ExtraSlideshowAction on SlideshowAction {
   String getText(BuildContext context) {
     switch (this) {

lib/model/entry/extensions/metadata_edition.dart

@@ -6,7 +6,6 @@ import 'package:aves/model/entry/extensions/catalog.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/metadata/date_modifier.dart';
 import 'package:aves/model/metadata/enums/date_field_source.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/fields.dart';
 import 'package:aves/ref/exif.dart';
 import 'package:aves/ref/iptc.dart';
@@ -15,6 +14,7 @@ import 'package:aves/services/common/services.dart';
 import 'package:aves/services/metadata/xmp.dart';
 import 'package:aves/utils/time_utils.dart';
 import 'package:aves/utils/xmp_utils.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart';

lib/model/filters/coordinate.dart

@@ -2,11 +2,11 @@ import 'package:aves/l10n/l10n.dart';
 import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/settings/enums/coordinate_format.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';

lib/model/metadata/date_modifier.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/fields.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';

lib/model/metadata/enums/date_edit_action.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraDateEditAction on DateEditAction {

lib/model/metadata/enums/date_field_source.dart

@@ -1,6 +1,6 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/fields.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraDateFieldSource on DateFieldSource {

lib/model/metadata/enums/length_unit.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraLengthUnit on LengthUnit {

lib/model/metadata/enums/location_edit_action.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraLocationEditAction on LocationEditAction {

lib/model/metadata/enums/metadata_type.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/metadata/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 
 class MetadataTypes {
   static const main = {

lib/model/metadata/fields.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/metadata/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 
 enum MetadataField {
   exifDate,

lib/model/settings/defaults.dart

@@ -1,16 +1,14 @@
 import 'dart:ui';
 
-import 'package:aves/model/actions/entry.dart';
-import 'package:aves/model/actions/entry_set.dart';
 import 'package:aves/model/filters/recent.dart';
 import 'package:aves/model/naming_pattern.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/source/enums/enums.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/utils/colors.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/countries_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
+import 'package:aves_model/aves_model.dart';
 
 class SettingsDefaults {
   // app

lib/model/settings/enums/accessibility_animations.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraAccessibilityAnimations on AccessibilityAnimations {
   bool get animate {

lib/model/settings/enums/accessibility_timeout.dart

@@ -1,6 +1,6 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/services/accessibility_service.dart';
 import 'package:aves/theme/durations.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraAccessibilityTimeout on AccessibilityTimeout {
   Future<Duration> getSnackBarDuration(bool hasAction) async {

lib/model/settings/enums/coordinate_format.dart

@@ -1,5 +1,5 @@
 import 'package:aves/l10n/l10n.dart';
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart';
 

lib/model/settings/enums/display_refresh_rate_mode.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/services/common/services.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';

lib/model/settings/enums/entry_background.dart

@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraEntryBackground on EntryBackground {
   bool get isColor {

lib/model/settings/enums/home_page.dart

@@ -1,6 +1,6 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraHomePageSetting on HomePageSetting {
   String get routeName {

lib/model/settings/enums/l10n.dart

@@ -1,6 +1,6 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraAccessibilityAnimationsName on AccessibilityAnimations {

lib/model/settings/enums/screen_on.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/services/common/services.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraKeepScreenOn on KeepScreenOn {
   void apply() {

lib/model/settings/enums/subtitle_position.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraSubtitlePosition on SubtitlePosition {

lib/model/settings/enums/theme_brightness.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 extension ExtraAvesThemeBrightness on AvesThemeBrightness {

lib/model/settings/enums/thumbnail_overlay_location_icon.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/theme/icons.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraThumbnailOverlayLocationIcon on ThumbnailOverlayLocationIcon {

lib/model/settings/enums/thumbnail_overlay_tag_icon.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/theme/icons.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraThumbnailOverlayTagIcon on ThumbnailOverlayTagIcon {

lib/model/settings/enums/video_loop_mode.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 
 extension ExtraVideoLoopMode on VideoLoopMode {
   static const shortVideoThreshold = Duration(seconds: 30);

lib/model/settings/enums/viewer_transition.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/widgets/viewer/controls/controller.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraViewerTransition on ViewerTransition {

lib/model/settings/enums/widget_shape.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/settings/enums/enums.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/widgets.dart';
 
 extension ExtraWidgetShape on WidgetShape {

lib/model/settings/settings.dart

@@ -3,14 +3,11 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:aves/app_flavor.dart';
-import 'package:aves/model/actions/entry.dart';
-import 'package:aves/model/actions/entry_set.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/filters/favourite.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/filters/mime.dart';
 import 'package:aves/model/settings/defaults.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/map_style.dart';
 import 'package:aves/model/source/enums/enums.dart';
 import 'package:aves/ref/bursts.dart';
@@ -23,6 +20,7 @@ import 'package:aves/widgets/filter_grids/countries_page.dart';
 import 'package:aves/widgets/filter_grids/places_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:device_info_plus/device_info_plus.dart';

lib/model/source/collection_lens.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/sort.dart';
@@ -21,6 +20,7 @@ import 'package:aves/model/source/location/location.dart';
 import 'package:aves/model/source/section_keys.dart';
 import 'package:aves/model/source/tag.dart';
 import 'package:aves/utils/collection_utils.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';

lib/model/source/collection_source.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/catalog.dart';
@@ -28,6 +27,7 @@ import 'package:aves/model/vaults/vaults.dart';
 import 'package:aves/services/analysis_service.dart';
 import 'package:aves/services/common/image_op_events.dart';
 import 'package:aves/services/common/services.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/foundation.dart';

lib/model/source/events.dart

@@ -1,5 +1,5 @@
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/entry/entry.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/foundation.dart';
 
 @immutable

lib/services/media/media_edit_service.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/services/common/image_op_events.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/services/media/enums.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';

lib/services/metadata/metadata_edit_service.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/metadata/date_modifier.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/enums/metadata_type.dart';
 import 'package:aves/model/metadata/fields.dart';
 import 'package:aves/services/common/services.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';
 

lib/theme/colors.dart

@@ -1,7 +1,7 @@
 import 'package:aves/image_providers/app_icon_image_provider.dart';
 import 'package:aves/model/covers.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:palette_generator/palette_generator.dart';

lib/theme/themes.dart

@@ -1,8 +1,8 @@
 import 'dart:ui';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/aves_app.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widget_common.dart

@@ -3,13 +3,13 @@ import 'dart:async';
 import 'package:aves/app_flavor.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/sort.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/media_store_source.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/home_widget.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

lib/widgets/about/bug_report.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'package:aves/app_flavor.dart';
 import 'package:aves/flutter_version.dart';
 import 'package:aves/model/device.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/common/services.dart';
@@ -17,6 +16,7 @@ import 'package:aves/widgets/common/action_mixins/feedback.dart';
 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/outlined_button.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';

lib/widgets/aves_app.dart

@@ -5,12 +5,12 @@ import 'dart:ui';
 import 'package:aves/app_flavor.dart';
 import 'package:aves/app_mode.dart';
 import 'package:aves/l10n/l10n.dart';
+import 'package:aves/model/apps.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/filters/recent.dart';
 import 'package:aves/model/settings/defaults.dart';
 import 'package:aves/model/settings/enums/accessibility_animations.dart';
 import 'package:aves/model/settings/enums/display_refresh_rate_mode.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/screen_on.dart';
 import 'package:aves/model/settings/enums/theme_brightness.dart';
 import 'package:aves/model/settings/settings.dart';
@@ -24,7 +24,6 @@ import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/theme/styles.dart';
 import 'package:aves/theme/themes.dart';
-import 'package:aves/model/apps.dart';
 import 'package:aves/utils/debouncer.dart';
 import 'package:aves/widgets/collection/collection_grid.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
@@ -39,6 +38,7 @@ import 'package:aves/widgets/home_page.dart';
 import 'package:aves/widgets/navigation/tv_page_transitions.dart';
 import 'package:aves/widgets/navigation/tv_rail.dart';
 import 'package:aves/widgets/welcome_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:aves_utils/aves_utils.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:equatable/equatable.dart';

lib/widgets/collection/app_bar.dart

@@ -34,6 +34,7 @@ import 'package:aves/widgets/common/tile_extent_controller.dart';
 import 'package:aves/widgets/dialogs/tile_view_dialog.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/collection/entry_set_action_delegate.dart

@@ -1,8 +1,6 @@
 import 'dart:async';
 
 import 'package:aves/app_mode.dart';
-import 'package:aves/model/actions/entry_set.dart';
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/favourites.dart';
@@ -14,7 +12,6 @@ import 'package:aves/model/metadata/date_modifier.dart';
 import 'package:aves/model/naming_pattern.dart';
 import 'package:aves/model/query.dart';
 import 'package:aves/model/selection.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/analysis_controller.dart';
 import 'package:aves/model/source/collection_lens.dart';
@@ -42,6 +39,7 @@ import 'package:aves/widgets/map/map_page.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
 import 'package:aves/widgets/stats/stats_page.dart';
 import 'package:aves/widgets/viewer/slideshow_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/common/action_controls/quick_choosers/move_button.dart

@@ -8,6 +8,7 @@ import 'package:aves/widgets/common/action_controls/quick_choosers/common/button
 import 'package:aves/widgets/common/action_controls/quick_choosers/common/menu.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/filter_grids/common/filter_nav_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/common/action_controls/quick_choosers/rate_button.dart

@@ -1,6 +1,7 @@
 import 'package:aves/model/actions/entry.dart';
 import 'package:aves/widgets/common/action_controls/quick_choosers/common/button.dart';
 import 'package:aves/widgets/common/action_controls/quick_choosers/rate_chooser.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class RateButton extends ChooserQuickButton<int> {

lib/widgets/common/action_controls/quick_choosers/share_button.dart

@@ -1,9 +1,9 @@
 import 'package:aves/model/actions/entry.dart';
-import 'package:aves/model/actions/share.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/widgets/common/action_controls/quick_choosers/common/button.dart';
 import 'package:aves/widgets/common/action_controls/quick_choosers/share_chooser.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class ShareButton extends ChooserQuickButton<ShareAction> {

lib/widgets/common/action_controls/quick_choosers/share_chooser.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:aves/model/actions/share.dart';
 import 'package:aves/widgets/common/action_controls/quick_choosers/common/menu.dart';
 import 'package:aves/widgets/common/basic/popup/menu_row.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class ShareQuickChooser extends StatelessWidget {

lib/widgets/common/action_controls/quick_choosers/tag_button.dart

@@ -8,6 +8,7 @@ import 'package:aves/widgets/common/action_controls/quick_choosers/common/menu.d
 import 'package:aves/widgets/common/action_controls/quick_choosers/tag_chooser.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/filter_grids/common/filter_nav_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/common/action_mixins/entry_editor.dart

@@ -5,7 +5,6 @@ import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/filters/placeholder.dart';
 import 'package:aves/model/filters/tag.dart';
 import 'package:aves/model/metadata/date_modifier.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/common/services.dart';
@@ -17,6 +16,7 @@ import 'package:aves/widgets/dialogs/entry_editors/edit_location_dialog.dart';
 import 'package:aves/widgets/dialogs/entry_editors/edit_rating_dialog.dart';
 import 'package:aves/widgets/dialogs/entry_editors/remove_metadata_dialog.dart';
 import 'package:aves/widgets/dialogs/entry_editors/tag_editor_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';

lib/widgets/common/action_mixins/entry_storage.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:aves/app_mode.dart';
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/extensions/props.dart';
@@ -10,8 +9,6 @@ import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/trash.dart';
 import 'package:aves/model/highlight.dart';
 import 'package:aves/model/metadata/date_modifier.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
@@ -32,6 +29,7 @@ import 'package:aves/widgets/dialogs/convert_entry_dialog.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/album_pick_page.dart';
 import 'package:aves/widgets/dialogs/selection_dialogs/single_selection.dart';
 import 'package:aves/widgets/viewer/controls/notifications.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/common/action_mixins/size_aware.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/storage/volume.dart';
 import 'package:aves/services/common/services.dart';
@@ -10,6 +9,7 @@ import 'package:aves/utils/collection_utils.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/dialogs/aves_dialog.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/common/behaviour/pop/tv_navigation.dart

@@ -1,4 +1,3 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/home_page.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
@@ -6,6 +5,7 @@ import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/common/grid/theme.dart

@@ -4,9 +4,9 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/favourites.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/extensions/props.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/identity/aves_icons.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/common/identity/aves_filter_chip.dart

@@ -19,6 +19,7 @@ import 'package:aves/widgets/common/basic/popup/menu_row.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';

lib/widgets/common/identity/aves_logo.dart

@@ -1,7 +1,7 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/fx/borders.dart';
 import 'package:aves/widgets/common/fx/colors.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/common/identity/highlight_title.dart

@@ -1,10 +1,10 @@
 import 'dart:ui';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
 import 'package:aves/widgets/common/basic/text/outlined.dart';
 import 'package:aves/widgets/common/fx/highlight_decoration.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/common/map/buttons/panel.dart

@@ -8,6 +8,7 @@ import 'package:aves/widgets/common/map/buttons/coordinate_filter.dart';
 import 'package:aves/widgets/common/map/compass.dart';
 import 'package:aves/widgets/common/map/map_action_delegate.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';

lib/widgets/common/map/leaflet/scale_layer.dart

@@ -1,7 +1,7 @@
 import 'dart:math';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/widgets/common/basic/text/outlined.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/plugin_api.dart';
 import 'package:latlong2/latlong.dart';

lib/widgets/common/map/map_action_delegate.dart

@@ -1,4 +1,3 @@
-import 'package:aves/model/actions/map.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/common/services.dart';
@@ -6,6 +5,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/dialogs/selection_dialogs/common.dart';
 import 'package:aves/widgets/dialogs/selection_dialogs/single_selection.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 

lib/widgets/common/thumbnail/image.dart

@@ -7,7 +7,6 @@ import 'package:aves/model/entry/extensions/images.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/settings/enums/accessibility_animations.dart';
 import 'package:aves/model/settings/enums/entry_background.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/basic/insets.dart';
@@ -15,6 +14,7 @@ import 'package:aves/widgets/common/fx/checkered_decoration.dart';
 import 'package:aves/widgets/common/fx/transition_image.dart';
 import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/common/thumbnail/error.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/dialogs/aves_confirmation_dialog.dart

@@ -1,6 +1,6 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 import 'aves_dialog.dart';

lib/widgets/dialogs/convert_entry_dialog.dart

@@ -1,6 +1,5 @@
 import 'package:aves/model/app/support.dart';
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/enums/length_unit.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/ref/mime_types.dart';
@@ -12,6 +11,7 @@ import 'package:aves/utils/mime_utils.dart';
 import 'package:aves/widgets/common/basic/text_dropdown_button.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/fx/transitions.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/dialogs/entry_editors/edit_date_dialog.dart

@@ -2,7 +2,6 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/metadata/date_modifier.dart';
 import 'package:aves/model/metadata/enums/date_edit_action.dart';
 import 'package:aves/model/metadata/enums/date_field_source.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/fields.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/theme/durations.dart';
@@ -18,6 +17,7 @@ import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
 import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:aves/widgets/dialogs/item_picker.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/item_pick_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/dialogs/entry_editors/edit_location_dialog.dart

@@ -1,7 +1,6 @@
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/entry/extensions/metadata_edition.dart';
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/enums/location_edit_action.dart';
 import 'package:aves/model/settings/enums/coordinate_format.dart';
 import 'package:aves/model/settings/settings.dart';
@@ -18,6 +17,7 @@ import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:aves/widgets/dialogs/item_picker.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/item_pick_page.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/location_pick_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart';

lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart

@@ -1,6 +1,4 @@
-import 'package:aves/model/metadata/enums/enums.dart';
 import 'package:aves/model/metadata/enums/metadata_type.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/ref/brand_colors.dart';
 import 'package:aves/theme/colors.dart';
@@ -10,6 +8,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/fx/highlight_decoration.dart';
 import 'package:aves/widgets/common/identity/highlight_title.dart';
 import 'package:aves/widgets/dialogs/aves_dialog.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart

@@ -4,7 +4,6 @@ import 'package:aves/image_providers/app_icon_image_provider.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
@@ -17,6 +16,7 @@ import 'package:aves/widgets/dialogs/aves_dialog.dart';
 import 'package:aves/widgets/dialogs/item_picker.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/app_pick_page.dart';
 import 'package:aves/widgets/dialogs/pick_dialogs/item_pick_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:provider/provider.dart';

lib/widgets/dialogs/pick_dialogs/album_pick_page.dart

@@ -1,10 +1,8 @@
 import 'package:aves/app_mode.dart';
 import 'package:aves/model/actions/chip_set.dart';
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/selection.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/collection_source.dart';
@@ -25,6 +23,7 @@ import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/album_set.dart';
 import 'package:aves/widgets/filter_grids/common/app_bar.dart';
 import 'package:aves/widgets/filter_grids/common/filter_grid_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';

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

@@ -1,14 +1,11 @@
 import 'dart:io';
 
 import 'package:aves/app_mode.dart';
-import 'package:aves/model/actions/chip_set.dart';
-import 'package:aves/model/actions/move_type.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/highlight.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums/enums.dart';
@@ -32,6 +29,7 @@ import 'package:aves/widgets/dialogs/filter_editors/rename_album_dialog.dart';
 import 'package:aves/widgets/dialogs/tile_view_dialog.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

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

@@ -1,4 +1,3 @@
-import 'package:aves/model/actions/chip.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/highlight.dart';
@@ -13,6 +12,7 @@ import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/countries_page.dart';
 import 'package:aves/widgets/filter_grids/places_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

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

@@ -1,5 +1,4 @@
 import 'package:aves/app_mode.dart';
-import 'package:aves/model/actions/chip_set.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/filters/album.dart';
@@ -28,6 +27,7 @@ import 'package:aves/widgets/map/map_page.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
 import 'package:aves/widgets/stats/stats_page.dart';
 import 'package:aves/widgets/viewer/slideshow_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

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

@@ -1,6 +1,5 @@
 import 'package:aves/app_mode.dart';
 import 'package:aves/geo/states.dart';
-import 'package:aves/model/actions/chip_set.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/settings/settings.dart';
@@ -9,6 +8,7 @@ import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
 import 'package:aves/widgets/filter_grids/countries_page.dart';
 import 'package:aves/widgets/filter_grids/states_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/filter_grids/common/app_bar.dart

@@ -19,6 +19,7 @@ import 'package:aves/widgets/common/search/route.dart';
 import 'package:aves/widgets/filter_grids/common/action_delegates/chip_set.dart';
 import 'package:aves/widgets/filter_grids/common/query_bar.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/home_page.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:aves/app_mode.dart';
 import 'package:aves/model/app/permissions.dart';
+import 'package:aves/model/apps.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/catalog.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/home_page.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
@@ -17,7 +17,6 @@ import 'package:aves/services/common/services.dart';
 import 'package:aves/services/global_search.dart';
 import 'package:aves/services/intent_service.dart';
 import 'package:aves/services/widget_service.dart';
-import 'package:aves/model/apps.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/collection/collection_page.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
@@ -32,6 +31,7 @@ import 'package:aves/widgets/settings/screen_saver_settings_page.dart';
 import 'package:aves/widgets/viewer/entry_viewer_page.dart';
 import 'package:aves/widgets/viewer/screen_saver_page.dart';
 import 'package:aves/widgets/wallpaper_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';

lib/widgets/home_widget.dart

@@ -4,10 +4,10 @@ import 'dart:ui' as ui;
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/images.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/widget_shape.dart';
 import 'package:aves/theme/colors.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class HomeWidgetPainter {

lib/widgets/map/map_page.dart

@@ -33,6 +33,7 @@ import 'package:aves/widgets/map/scroller.dart';
 import 'package:aves/widgets/viewer/controls/notifications.dart';
 import 'package:aves/widgets/viewer/entry_viewer_page.dart';
 import 'package:aves_map/aves_map.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/navigation/tv_rail.dart

@@ -3,7 +3,6 @@ import 'dart:ui';
 
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
@@ -18,6 +17,7 @@ import 'package:aves/widgets/navigation/drawer/app_drawer.dart';
 import 'package:aves/widgets/navigation/drawer/page_nav_tile.dart';
 import 'package:aves/widgets/navigation/drawer/tile.dart';
 import 'package:aves/widgets/settings/settings_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

lib/widgets/settings/accessibility/accessibility.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
@@ -10,6 +9,7 @@ import 'package:aves/widgets/settings/accessibility/time_to_take_action.dart';
 import 'package:aves/widgets/settings/common/tile_leading.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/accessibility/time_to_take_action.dart

@@ -1,9 +1,9 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/accessibility_service.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class TimeToTakeActionTile extends StatefulWidget {

lib/widgets/settings/display/display.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:aves/model/device.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
@@ -12,6 +11,7 @@ import 'package:aves/widgets/settings/common/tile_leading.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/privacy/privacy.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/home_widget_settings_page.dart

@@ -1,5 +1,4 @@
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/enums/widget_shape.dart';
 import 'package:aves/model/settings/settings.dart';
@@ -13,6 +12,7 @@ import 'package:aves/widgets/common/identity/buttons/outlined_button.dart';
 import 'package:aves/widgets/home_widget.dart';
 import 'package:aves/widgets/settings/common/collection_tile.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/widgets/settings/language/language.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:aves/model/settings/enums/coordinate_format.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/ref/poi.dart';
@@ -12,6 +11,7 @@ import 'package:aves/widgets/settings/common/tile_leading.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/language/locale_tile.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/navigation/navigation.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
@@ -11,6 +10,7 @@ import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/navigation/confirmation_dialogs.dart';
 import 'package:aves/widgets/settings/navigation/drawer.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/screen_saver_settings_page.dart

@@ -1,11 +1,11 @@
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/collection_tile.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/settings_mobile_page.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:aves/model/actions/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/common/services.dart';
@@ -19,6 +18,7 @@ import 'package:aves/widgets/settings/app_export/items.dart';
 import 'package:aves/widgets/settings/app_export/selection_dialog.dart';
 import 'package:aves/widgets/settings/settings_page.dart';
 import 'package:aves/widgets/settings/settings_search.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';

lib/widgets/settings/thumbnails/collection_actions_editor_page.dart

@@ -3,6 +3,7 @@ import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/quick_actions/editor_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:tuple/tuple.dart';
 

lib/widgets/settings/thumbnails/overlay.dart

@@ -1,4 +1,3 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/enums/thumbnail_overlay_location_icon.dart';
 import 'package:aves/model/settings/enums/thumbnail_overlay_tag_icon.dart';
@@ -11,6 +10,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_icons.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/video/controls.dart

@@ -1,9 +1,9 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class VideoControlsPage extends StatelessWidget {

lib/widgets/settings/video/subtitle_sample.dart

@@ -1,4 +1,3 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
 import 'package:aves/widgets/common/basic/text/background_painter.dart';
@@ -6,6 +5,7 @@ import 'package:aves/widgets/common/basic/text/outlined.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/fx/borders.dart';
 import 'package:aves/widgets/viewer/visual/video/subtitle/subtitle.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/video/subtitle_theme.dart

@@ -1,4 +1,3 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/basic/list_tiles/color.dart';
@@ -7,6 +6,7 @@ import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/video/subtitle_sample.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/video/video.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:aves/model/device.dart';
 import 'package:aves/model/filters/mime.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/colors.dart';
@@ -13,6 +12,7 @@ import 'package:aves/widgets/settings/common/tiles.dart';
 import 'package:aves/widgets/settings/settings_definition.dart';
 import 'package:aves/widgets/settings/video/controls.dart';
 import 'package:aves/widgets/settings/video/subtitle_theme.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/viewer/entry_background.dart

@@ -1,7 +1,7 @@
 import 'package:aves/model/settings/enums/entry_background.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/widgets/common/basic/color_indicator.dart';
 import 'package:aves/widgets/common/fx/checkered_decoration.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class EntryBackgroundSelector extends StatefulWidget {

lib/widgets/settings/viewer/slideshow.dart

@@ -1,9 +1,9 @@
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/enums/l10n.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/basic/scaffold.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/tiles.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 
 class ViewerSlideshowPage extends StatelessWidget {

lib/widgets/settings/viewer/viewer.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/colors.dart';
@@ -13,6 +12,7 @@ import 'package:aves/widgets/settings/viewer/entry_background.dart';
 import 'package:aves/widgets/settings/viewer/overlay.dart';
 import 'package:aves/widgets/settings/viewer/slideshow.dart';
 import 'package:aves/widgets/settings/viewer/viewer_actions_editor.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/settings/viewer/viewer_actions_editor.dart

@@ -2,6 +2,7 @@ import 'package:aves/model/actions/entry.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/settings/common/quick_actions/editor_page.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/stats/filter_table.dart

@@ -1,10 +1,10 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/settings/enums/accessibility_animations.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/stats/percent_text.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';

lib/widgets/viewer/action/entry_action_delegate.dart

@@ -2,9 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:aves/app_mode.dart';
-import 'package:aves/model/actions/entry.dart';
-import 'package:aves/model/actions/move_type.dart';
-import 'package:aves/model/actions/share.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/favourites.dart';
@@ -13,7 +10,6 @@ import 'package:aves/model/entry/extensions/metadata_edition.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
@@ -38,6 +34,7 @@ import 'package:aves/widgets/viewer/debug/debug_page.dart';
 import 'package:aves/widgets/viewer/multipage/conductor.dart';
 import 'package:aves/widgets/viewer/source_viewer_page.dart';
 import 'package:aves/widgets/viewer/video/conductor.dart';
+import 'package:aves_model/aves_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';