From 0bbed0ebdac0ba58d198c659922bb13bb17a37cc Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sun, 4 Aug 2024 12:38:14 +0200 Subject: [PATCH] minor --- lib/main_play_test_editor.dart | 2 +- lib/{widgets => model/app}/intent.dart | 0 lib/model/{apps.dart => app_inventory.dart} | 0 lib/model/covers.dart | 2 +- lib/model/db/db_metadata.dart | 2 +- lib/model/db/db_metadata_sqflite.dart | 2 +- lib/model/entry/extensions/catalog.dart | 4 ++-- lib/model/entry/extensions/info.dart | 2 +- lib/model/{ => media}/geotiff.dart | 0 lib/model/{ => media}/panorama.dart | 0 lib/model/{ => media}/video/channel_layouts.dart | 0 lib/model/{ => media}/video/codecs.dart | 0 lib/model/{ => media}/video/metadata.dart | 10 +++++----- lib/model/{ => media}/video/profiles/aac.dart | 0 lib/model/{ => media}/video/profiles/h264.dart | 0 lib/model/{ => media}/video/profiles/hevc.dart | 0 lib/model/naming_pattern.dart | 2 +- lib/model/{ => viewer}/video_playback.dart | 0 lib/model/{ => viewer}/view_state.dart | 0 lib/services/app_service.dart | 2 +- lib/services/metadata/metadata_fetch_service.dart | 4 ++-- lib/utils/android_file_utils.dart | 2 +- lib/view/view.dart | 1 + lib/widgets/aves_app.dart | 3 ++- lib/widgets/debug/android_apps.dart | 2 +- lib/widgets/debug/database.dart | 2 +- lib/widgets/dialogs/pick_dialogs/app_pick_page.dart | 2 +- lib/widgets/editor/entry_editor_page.dart | 2 +- lib/widgets/editor/image.dart | 2 +- lib/widgets/editor/transform/cropper.dart | 2 +- lib/widgets/explorer/app_bar.dart | 1 - lib/widgets/filter_grids/albums_page.dart | 2 +- .../filter_grids/common/covered_filter_chip.dart | 2 +- lib/widgets/home_page.dart | 4 ++-- lib/widgets/map/map_page.dart | 2 +- .../viewer/action/entry_info_action_delegate.dart | 3 +-- lib/widgets/viewer/debug/db.dart | 2 +- lib/widgets/viewer/info/basic_section.dart | 2 +- lib/widgets/viewer/info/info_page.dart | 3 +-- lib/widgets/viewer/overlay/minimap.dart | 2 +- lib/widgets/viewer/panorama_page.dart | 2 +- .../viewer/video/db_playback_state_handler.dart | 2 +- lib/widgets/viewer/view/conductor.dart | 2 +- lib/widgets/viewer/view/controller.dart | 2 +- lib/widgets/viewer/visual/entry_page_view.dart | 2 +- lib/widgets/viewer/visual/raster.dart | 2 +- lib/widgets/viewer/visual/vector.dart | 2 +- lib/widgets/viewer/visual/video/subtitle/subtitle.dart | 2 +- plugins/aves_model/lib/aves_model.dart | 3 ++- .../aves_model/lib/src/events/actions.dart | 0 test/fake/android_app_service.dart | 2 +- test/model/video/metadata_test.dart | 2 +- test/model/view_state_test.dart | 2 +- 53 files changed, 49 insertions(+), 49 deletions(-) rename lib/{widgets => model/app}/intent.dart (100%) rename lib/model/{apps.dart => app_inventory.dart} (100%) rename lib/model/{ => media}/geotiff.dart (100%) rename lib/model/{ => media}/panorama.dart (100%) rename lib/model/{ => media}/video/channel_layouts.dart (100%) rename lib/model/{ => media}/video/codecs.dart (100%) rename lib/model/{ => media}/video/metadata.dart (98%) rename lib/model/{ => media}/video/profiles/aac.dart (100%) rename lib/model/{ => media}/video/profiles/h264.dart (100%) rename lib/model/{ => media}/video/profiles/hevc.dart (100%) rename lib/model/{ => viewer}/video_playback.dart (100%) rename lib/model/{ => viewer}/view_state.dart (100%) rename lib/model/events.dart => plugins/aves_model/lib/src/events/actions.dart (100%) diff --git a/lib/main_play_test_editor.dart b/lib/main_play_test_editor.dart index 95e5f4d6c..01ef9fbfa 100644 --- a/lib/main_play_test_editor.dart +++ b/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/* diff --git a/lib/widgets/intent.dart b/lib/model/app/intent.dart similarity index 100% rename from lib/widgets/intent.dart rename to lib/model/app/intent.dart diff --git a/lib/model/apps.dart b/lib/model/app_inventory.dart similarity index 100% rename from lib/model/apps.dart rename to lib/model/app_inventory.dart diff --git a/lib/model/covers.dart b/lib/model/covers.dart index 340b8f8cc..eadd26621 100644 --- a/lib/model/covers.dart +++ b/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'; diff --git a/lib/model/db/db_metadata.dart b/lib/model/db/db_metadata.dart index 524efd299..c9216c3f1 100644 --- a/lib/model/db/db_metadata.dart +++ b/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; diff --git a/lib/model/db/db_metadata_sqflite.dart b/lib/model/db/db_metadata_sqflite.dart index e8903a076..9c2191a11 100644 --- a/lib/model/db/db_metadata_sqflite.dart +++ b/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'; diff --git a/lib/model/entry/extensions/catalog.dart b/lib/model/entry/extensions/catalog.dart index 94dd3b148..fc158c122 100644 --- a/lib/model/entry/extensions/catalog.dart +++ b/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'; diff --git a/lib/model/entry/extensions/info.dart b/lib/model/entry/extensions/info.dart index 115a5bb9f..0b2f9deda 100644 --- a/lib/model/entry/extensions/info.dart +++ b/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'; diff --git a/lib/model/geotiff.dart b/lib/model/media/geotiff.dart similarity index 100% rename from lib/model/geotiff.dart rename to lib/model/media/geotiff.dart diff --git a/lib/model/panorama.dart b/lib/model/media/panorama.dart similarity index 100% rename from lib/model/panorama.dart rename to lib/model/media/panorama.dart diff --git a/lib/model/video/channel_layouts.dart b/lib/model/media/video/channel_layouts.dart similarity index 100% rename from lib/model/video/channel_layouts.dart rename to lib/model/media/video/channel_layouts.dart diff --git a/lib/model/video/codecs.dart b/lib/model/media/video/codecs.dart similarity index 100% rename from lib/model/video/codecs.dart rename to lib/model/media/video/codecs.dart diff --git a/lib/model/video/metadata.dart b/lib/model/media/video/metadata.dart similarity index 98% rename from lib/model/video/metadata.dart rename to lib/model/media/video/metadata.dart index 6ae8ba583..3349e202f 100644 --- a/lib/model/video/metadata.dart +++ b/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'; diff --git a/lib/model/video/profiles/aac.dart b/lib/model/media/video/profiles/aac.dart similarity index 100% rename from lib/model/video/profiles/aac.dart rename to lib/model/media/video/profiles/aac.dart diff --git a/lib/model/video/profiles/h264.dart b/lib/model/media/video/profiles/h264.dart similarity index 100% rename from lib/model/video/profiles/h264.dart rename to lib/model/media/video/profiles/h264.dart diff --git a/lib/model/video/profiles/hevc.dart b/lib/model/media/video/profiles/hevc.dart similarity index 100% rename from lib/model/video/profiles/hevc.dart rename to lib/model/media/video/profiles/hevc.dart diff --git a/lib/model/naming_pattern.dart b/lib/model/naming_pattern.dart index c31c16143..2305f94c2 100644 --- a/lib/model/naming_pattern.dart +++ b/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'; diff --git a/lib/model/video_playback.dart b/lib/model/viewer/video_playback.dart similarity index 100% rename from lib/model/video_playback.dart rename to lib/model/viewer/video_playback.dart diff --git a/lib/model/view_state.dart b/lib/model/viewer/view_state.dart similarity index 100% rename from lib/model/view_state.dart rename to lib/model/viewer/view_state.dart diff --git a/lib/services/app_service.dart b/lib/services/app_service.dart index 774dacedc..370275c60 100644 --- a/lib/services/app_service.dart +++ b/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'; diff --git a/lib/services/metadata/metadata_fetch_service.dart b/lib/services/metadata/metadata_fetch_service.dart index 61958dc5b..aa2283587 100644 --- a/lib/services/metadata/metadata_fetch_service.dart +++ b/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'; diff --git a/lib/utils/android_file_utils.dart b/lib/utils/android_file_utils.dart index 0152bd1aa..5c4cbe6db 100644 --- a/lib/utils/android_file_utils.dart +++ b/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'; diff --git a/lib/view/view.dart b/lib/view/view.dart index 097448a81..6096c0996 100644 --- a/lib/view/view.dart +++ b/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'; diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart index 93433a885..8668b3a4c 100644 --- a/lib/widgets/aves_app.dart +++ b/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 with WidgetsBindingObserver { void didHaveMemoryPressure() { super.didHaveMemoryPressure(); reportService.log('App memory pressure'); + imageCache.clear(); } @override diff --git a/lib/widgets/debug/android_apps.dart b/lib/widgets/debug/android_apps.dart index 708566eda..101b18c08 100644 --- a/lib/widgets/debug/android_apps.dart +++ b/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'; diff --git a/lib/widgets/debug/database.dart b/lib/widgets/debug/database.dart index b8f6f5836..541d66321 100644 --- a/lib/widgets/debug/database.dart +++ b/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'; diff --git a/lib/widgets/dialogs/pick_dialogs/app_pick_page.dart b/lib/widgets/dialogs/pick_dialogs/app_pick_page.dart index f38d386a9..51635f243 100644 --- a/lib/widgets/dialogs/pick_dialogs/app_pick_page.dart +++ b/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'; diff --git a/lib/widgets/editor/entry_editor_page.dart b/lib/widgets/editor/entry_editor_page.dart index f375aeb27..5acce2bca 100644 --- a/lib/widgets/editor/entry_editor_page.dart +++ b/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'; diff --git a/lib/widgets/editor/image.dart b/lib/widgets/editor/image.dart index 2b2f703ea..c8b01d45f 100644 --- a/lib/widgets/editor/image.dart +++ b/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'; diff --git a/lib/widgets/editor/transform/cropper.dart b/lib/widgets/editor/transform/cropper.dart index c3abc7338..310cb618e 100644 --- a/lib/widgets/editor/transform/cropper.dart +++ b/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'; diff --git a/lib/widgets/explorer/app_bar.dart b/lib/widgets/explorer/app_bar.dart index c5a996ee9..2f5b86236 100644 --- a/lib/widgets/explorer/app_bar.dart +++ b/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'; diff --git a/lib/widgets/filter_grids/albums_page.dart b/lib/widgets/filter_grids/albums_page.dart index fd346316d..f2b1641e6 100644 --- a/lib/widgets/filter_grids/albums_page.dart +++ b/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'; diff --git a/lib/widgets/filter_grids/common/covered_filter_chip.dart b/lib/widgets/filter_grids/common/covered_filter_chip.dart index 3581bed66..b62b77e76 100644 --- a/lib/widgets/filter_grids/common/covered_filter_chip.dart +++ b/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'; diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index f2d537a33..f5c176819 100644 --- a/lib/widgets/home_page.dart +++ b/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'; diff --git a/lib/widgets/map/map_page.dart b/lib/widgets/map/map_page.dart index 528db5eb7..4b45ff8cd 100644 --- a/lib/widgets/map/map_page.dart +++ b/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'; diff --git a/lib/widgets/viewer/action/entry_info_action_delegate.dart b/lib/widgets/viewer/action/entry_info_action_delegate.dart index b63fd1dd2..41795c046 100644 --- a/lib/widgets/viewer/action/entry_info_action_delegate.dart +++ b/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'; diff --git a/lib/widgets/viewer/debug/db.dart b/lib/widgets/viewer/debug/db.dart index 7d156a89e..ef99c82ca 100644 --- a/lib/widgets/viewer/debug/db.dart +++ b/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'; diff --git a/lib/widgets/viewer/info/basic_section.dart b/lib/widgets/viewer/info/basic_section.dart index 42080956b..9149d3ed6 100644 --- a/lib/widgets/viewer/info/basic_section.dart +++ b/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'; diff --git a/lib/widgets/viewer/info/info_page.dart b/lib/widgets/viewer/info/info_page.dart index ca342a284..4cd8781df 100644 --- a/lib/widgets/viewer/info/info_page.dart +++ b/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'; diff --git a/lib/widgets/viewer/overlay/minimap.dart b/lib/widgets/viewer/overlay/minimap.dart index 5c63c5b20..cba86e77d 100644 --- a/lib/widgets/viewer/overlay/minimap.dart +++ b/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'; diff --git a/lib/widgets/viewer/panorama_page.dart b/lib/widgets/viewer/panorama_page.dart index aa9c74691..18345edb7 100644 --- a/lib/widgets/viewer/panorama_page.dart +++ b/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'; diff --git a/lib/widgets/viewer/video/db_playback_state_handler.dart b/lib/widgets/viewer/video/db_playback_state_handler.dart index d27db3957..c862ccc0b 100644 --- a/lib/widgets/viewer/video/db_playback_state_handler.dart +++ b/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'; diff --git a/lib/widgets/viewer/view/conductor.dart b/lib/widgets/viewer/view/conductor.dart index cae0f16cd..78a7def8b 100644 --- a/lib/widgets/viewer/view/conductor.dart +++ b/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'; diff --git a/lib/widgets/viewer/view/controller.dart b/lib/widgets/viewer/view/controller.dart index 1a5ea02bd..725e99ec1 100644 --- a/lib/widgets/viewer/view/controller.dart +++ b/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'; diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart index dab017301..2421221f2 100644 --- a/lib/widgets/viewer/visual/entry_page_view.dart +++ b/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'; diff --git a/lib/widgets/viewer/visual/raster.dart b/lib/widgets/viewer/visual/raster.dart index b4c015b6c..3ca4148eb 100644 --- a/lib/widgets/viewer/visual/raster.dart +++ b/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'; diff --git a/lib/widgets/viewer/visual/vector.dart b/lib/widgets/viewer/visual/vector.dart index 95ced38ed..0a5479848 100644 --- a/lib/widgets/viewer/visual/vector.dart +++ b/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'; diff --git a/lib/widgets/viewer/visual/video/subtitle/subtitle.dart b/lib/widgets/viewer/visual/video/subtitle/subtitle.dart index 1855fe33c..06a81b904 100644 --- a/lib/widgets/viewer/visual/video/subtitle/subtitle.dart +++ b/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'; diff --git a/plugins/aves_model/lib/aves_model.dart b/plugins/aves_model/lib/aves_model.dart index e406bb5c4..94e32722e 100644 --- a/plugins/aves_model/lib/aves_model.dart +++ b/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'; diff --git a/lib/model/events.dart b/plugins/aves_model/lib/src/events/actions.dart similarity index 100% rename from lib/model/events.dart rename to plugins/aves_model/lib/src/events/actions.dart diff --git a/test/fake/android_app_service.dart b/test/fake/android_app_service.dart index 0cd007280..f9e5052d2 100644 --- a/test/fake/android_app_service.dart +++ b/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'; diff --git a/test/model/video/metadata_test.dart b/test/model/video/metadata_test.dart index 15a40f85c..68a429ee9 100644 --- a/test/model/video/metadata_test.dart +++ b/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() { diff --git a/test/model/view_state_test.dart b/test/model/view_state_test.dart index 7da0dcb84..f582bd182 100644 --- a/test/model/view_state_test.dart +++ b/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';