minor

lib/main_play_test_editor.dart

@@ -1,6 +1,6 @@
 import 'package:aves/app_flavor.dart';
 import 'package:aves/main_common.dart';
-import 'package:aves/widgets/intent.dart';
+import 'package:aves/model/app/intent.dart';
 
 // https://developer.android.com/studio/command-line/adb.html#IntentSpec
 // adb shell am start -n deckers.thibault.aves.debug/deckers.thibault.aves.MainActivity -a android.intent.action.EDIT -d content://media/external/images/media/183128 -t image/*

lib/model/covers.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';

lib/model/db/db_metadata.dart

@@ -6,7 +6,7 @@ import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/trash.dart';
 import 'package:aves/model/vaults/details.dart';
-import 'package:aves/model/video_playback.dart';
+import 'package:aves/model/viewer/video_playback.dart';
 
 abstract class MetadataDb {
   int get nextId;

lib/model/db/db_metadata_sqflite.dart

@@ -10,7 +10,7 @@ import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/trash.dart';
 import 'package:aves/model/vaults/details.dart';
-import 'package:aves/model/video_playback.dart';
+import 'package:aves/model/viewer/video_playback.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';

lib/model/entry/extensions/catalog.dart

@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/props.dart';
-import 'package:aves/model/geotiff.dart';
+import 'package:aves/model/media/geotiff.dart';
 import 'package:aves/model/metadata/catalog.dart';
-import 'package:aves/model/video/metadata.dart';
+import 'package:aves/model/media/video/metadata.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/services/metadata/svg_metadata_service.dart';

lib/model/entry/extensions/info.dart

@@ -4,7 +4,7 @@ import 'dart:collection';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/extensions/props.dart';
-import 'package:aves/model/video/metadata.dart';
+import 'package:aves/model/media/video/metadata.dart';
 import 'package:aves/ref/mime_types.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/services/metadata/svg_metadata_service.dart';

lib/model/media/video/metadata.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/metadata/catalog.dart';
-import 'package:aves/model/video/channel_layouts.dart';
-import 'package:aves/model/video/codecs.dart';
-import 'package:aves/model/video/profiles/aac.dart';
-import 'package:aves/model/video/profiles/h264.dart';
-import 'package:aves/model/video/profiles/hevc.dart';
+import 'package:aves/model/media/video/channel_layouts.dart';
+import 'package:aves/model/media/video/codecs.dart';
+import 'package:aves/model/media/video/profiles/aac.dart';
+import 'package:aves/model/media/video/profiles/h264.dart';
+import 'package:aves/model/media/video/profiles/hevc.dart';
 import 'package:aves/ref/languages.dart';
 import 'package:aves/ref/locales.dart';
 import 'package:aves/ref/mime_types.dart';

lib/model/naming_pattern.dart

@@ -1,4 +1,4 @@
-import 'package:aves/convert/metadata/fields.dart';
+import 'package:aves/convert/convert.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves_model/aves_model.dart';

lib/services/app_service.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/filters/filters.dart';

lib/services/metadata/metadata_fetch_service.dart

@@ -2,11 +2,11 @@ import 'package:aves/convert/convert.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
 import 'package:aves/model/entry/extensions/props.dart';
-import 'package:aves/model/geotiff.dart';
+import 'package:aves/model/media/geotiff.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/overlay.dart';
 import 'package:aves/model/multipage.dart';
-import 'package:aves/model/panorama.dart';
+import 'package:aves/model/media/panorama.dart';
 import 'package:aves/services/common/service_policy.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/services/metadata/xmp.dart';

lib/utils/android_file_utils.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/vaults/vaults.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves_model/aves_model.dart';

lib/view/view.dart

@@ -2,6 +2,7 @@ export 'src/actions/chip.dart';
 export 'src/actions/chip_set.dart';
 export 'src/actions/entry.dart';
 export 'src/actions/entry_set.dart';
+export 'src/actions/explorer.dart';
 export 'src/actions/map.dart';
 export 'src/actions/map_cluster.dart';
 export 'src/actions/share.dart';

lib/widgets/aves_app.dart

@@ -4,7 +4,7 @@ import 'dart:math';
 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/app_inventory.dart';
 import 'package:aves/model/device.dart';
 import 'package:aves/model/filters/recent.dart';
 import 'package:aves/model/settings/defaults.dart';
@@ -413,6 +413,7 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
   void didHaveMemoryPressure() {
     super.didHaveMemoryPressure();
     reportService.log('App memory pressure');
+    imageCache.clear();
   }
 
   @override

lib/widgets/debug/android_apps.dart

@@ -1,5 +1,5 @@
 import 'package:aves/image_providers/app_icon_image_provider.dart';
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/basic/query_bar.dart';
 import 'package:aves/widgets/common/identity/aves_expansion_tile.dart';

lib/widgets/debug/database.dart

@@ -6,7 +6,7 @@ import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/trash.dart';
 import 'package:aves/model/vaults/details.dart';
 import 'package:aves/model/vaults/vaults.dart';
-import 'package:aves/model/video_playback.dart';
+import 'package:aves/model/viewer/video_playback.dart';
 import 'package:aves/ref/locales.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/file_utils.dart';

lib/widgets/dialogs/pick_dialogs/app_pick_page.dart

@@ -1,5 +1,5 @@
 import 'package:aves/image_providers/app_icon_image_provider.dart';
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/common/basic/list_tiles/reselectable_radio.dart';

lib/widgets/editor/entry_editor_page.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/editor/control_panel.dart';
 import 'package:aves/widgets/editor/image.dart';
 import 'package:aves/widgets/editor/transform/controller.dart';

lib/widgets/editor/image.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/editor/transform/controller.dart';
 import 'package:aves/widgets/editor/transform/painter.dart';

lib/widgets/editor/transform/cropper.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/widgets/common/extensions/geometry.dart';
 import 'package:aves/widgets/common/fx/dashed_path_painter.dart';

lib/widgets/explorer/app_bar.dart

@@ -7,7 +7,6 @@ import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/theme/themes.dart';
 import 'package:aves/utils/android_file_utils.dart';
-import 'package:aves/view/src/actions/explorer.dart';
 import 'package:aves/view/view.dart';
 import 'package:aves/widgets/common/app_bar/app_bar_subtitle.dart';
 import 'package:aves/widgets/common/app_bar/app_bar_title.dart';

lib/widgets/filter_grids/albums_page.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/filters/album.dart';

lib/widgets/filter_grids/common/covered_filter_chip.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/covers.dart';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';

lib/widgets/home_page.dart

@@ -2,11 +2,12 @@ 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/app_inventory.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/app/intent.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';
@@ -28,7 +29,6 @@ import 'package:aves/widgets/editor/entry_editor_page.dart';
 import 'package:aves/widgets/explorer/explorer_page.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
-import 'package:aves/widgets/intent.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
 import 'package:aves/widgets/settings/home_widget_settings_page.dart';
 import 'package:aves/widgets/settings/screen_saver_settings_page.dart';

lib/widgets/map/map_page.dart

@@ -5,7 +5,7 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/location.dart';
 import 'package:aves/model/filters/coordinate.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/geotiff.dart';
+import 'package:aves/model/media/geotiff.dart';
 import 'package:aves/model/highlight.dart';
 import 'package:aves/model/settings/enums/accessibility_animations.dart';
 import 'package:aves/model/settings/enums/map_style.dart';

lib/widgets/viewer/action/entry_info_action_delegate.dart

@@ -7,9 +7,8 @@ import 'package:aves/model/entry/extensions/info.dart';
 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/events.dart';
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/geotiff.dart';
+import 'package:aves/model/media/geotiff.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/ref/mime_types.dart';

lib/widgets/viewer/debug/db.dart

@@ -3,7 +3,7 @@ import 'package:aves/model/metadata/address.dart';
 import 'package:aves/model/metadata/catalog.dart';
 import 'package:aves/model/metadata/trash.dart';
 import 'package:aves/model/source/collection_source.dart';
-import 'package:aves/model/video_playback.dart';
+import 'package:aves/model/viewer/video_playback.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/widgets/viewer/info/common.dart';
 import 'package:collection/collection.dart';

lib/widgets/viewer/info/basic_section.dart

@@ -1,6 +1,6 @@
 import 'package:aves/app_mode.dart';
 import 'package:aves/image_providers/app_icon_image_provider.dart';
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/favourites.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';

lib/widgets/viewer/info/info_page.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/multipage.dart';
-import 'package:aves/model/events.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/selection.dart';
 import 'package:aves/model/settings/settings.dart';
@@ -15,10 +14,10 @@ import 'package:aves/widgets/filter_grids/common/action_delegates/chip.dart';
 import 'package:aves/widgets/viewer/action/entry_info_action_delegate.dart';
 import 'package:aves/widgets/viewer/controls/notifications.dart';
 import 'package:aves/widgets/viewer/info/basic_section.dart';
+import 'package:aves/widgets/viewer/info/color_section.dart';
 import 'package:aves/widgets/viewer/info/embedded/embedded_data_opener.dart';
 import 'package:aves/widgets/viewer/info/info_app_bar.dart';
 import 'package:aves/widgets/viewer/info/location_section.dart';
-import 'package:aves/widgets/viewer/info/color_section.dart';
 import 'package:aves/widgets/viewer/info/metadata/metadata_dir.dart';
 import 'package:aves/widgets/viewer/info/metadata/metadata_section.dart';
 import 'package:aves/widgets/viewer/multipage/conductor.dart';

lib/widgets/viewer/overlay/minimap.dart

@@ -1,7 +1,7 @@
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/editor/transform/controller.dart';
 import 'package:aves/widgets/editor/transform/transformation.dart';

lib/widgets/viewer/panorama_page.dart

@@ -2,7 +2,7 @@ import 'dart:math';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/images.dart';
-import 'package:aves/model/panorama.dart';
+import 'package:aves/model/media/panorama.dart';
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/aves_app.dart';

lib/widgets/viewer/video/db_playback_state_handler.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/video_playback.dart';
+import 'package:aves/model/viewer/video_playback.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/theme/format.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';

lib/widgets/viewer/view/conductor.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/viewer/view/controller.dart';
 import 'package:aves_magnifier/aves_magnifier.dart';
 import 'package:collection/collection.dart';

lib/widgets/viewer/view/controller.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/entry/entry.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/viewer/view/histogram.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

lib/widgets/viewer/visual/entry_page_view.dart

@@ -4,7 +4,7 @@ import 'package:aves/app_mode.dart';
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/services/media/media_session_service.dart';
 import 'package:aves/theme/icons.dart';

lib/widgets/viewer/visual/raster.dart

@@ -6,7 +6,7 @@ import 'package:aves/model/entry/extensions/images.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/settings/enums/entry_background.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/common/fx/checkered_decoration.dart';
 import 'package:aves/widgets/viewer/controls/notifications.dart';
 import 'package:aves/widgets/viewer/visual/entry_page_view.dart';

lib/widgets/viewer/visual/vector.dart

@@ -5,7 +5,7 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/images.dart';
 import 'package:aves/model/settings/enums/entry_background.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/utils/math_utils.dart';
 import 'package:aves/widgets/common/fx/checkered_decoration.dart';
 import 'package:aves/widgets/viewer/visual/entry_page_view.dart';

lib/widgets/viewer/visual/video/subtitle/subtitle.dart

@@ -2,7 +2,7 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/entry/extensions/props.dart';
 import 'package:aves/model/settings/enums/subtitle_position.dart';
 import 'package:aves/model/settings/settings.dart';
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves/widgets/common/basic/text/background_painter.dart';
 import 'package:aves/widgets/common/basic/text/outlined.dart';
 import 'package:aves/widgets/viewer/visual/video/subtitle/ass_parser.dart';

plugins/aves_model/lib/aves_model.dart

@@ -1,10 +1,10 @@
 library aves_model;
 
 export 'src/actions/chip.dart';
-export 'src/actions/explorer.dart';
 export 'src/actions/chip_set.dart';
 export 'src/actions/entry.dart';
 export 'src/actions/entry_set.dart';
+export 'src/actions/explorer.dart';
 export 'src/actions/map.dart';
 export 'src/actions/map_cluster.dart';
 export 'src/actions/move_type.dart';
@@ -13,6 +13,7 @@ export 'src/actions/share.dart';
 export 'src/actions/slideshow.dart';
 export 'src/editor/enums.dart';
 export 'src/entry/base.dart';
+export 'src/events/actions.dart';
 export 'src/metadata/enums.dart';
 export 'src/metadata/fields.dart';
 export 'src/settings/access.dart';

test/fake/android_app_service.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/apps.dart';
+import 'package:aves/model/app_inventory.dart';
 import 'package:aves/services/app_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:test/fake.dart';

test/model/video/metadata_test.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/video/metadata.dart';
+import 'package:aves/model/media/video/metadata.dart';
 import 'package:test/test.dart';
 
 void main() {

test/model/view_state_test.dart

@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:aves/model/view_state.dart';
+import 'package:aves/model/viewer/view_state.dart';
 import 'package:aves_utils/aves_utils.dart';
 import 'package:test/test.dart';
 import 'package:vector_math/vector_math_64.dart';