diff --git a/lib/model/settings/home_page.dart b/lib/model/settings/home_page.dart index 9cb131bbf..bc5c29b75 100644 --- a/lib/model/settings/home_page.dart +++ b/lib/model/settings/home_page.dart @@ -1,4 +1,4 @@ -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/filter_grids/albums_page.dart'; enum HomePageSetting { collection, albums } diff --git a/lib/widgets/album/app_bar.dart b/lib/widgets/collection/app_bar.dart similarity index 98% rename from lib/widgets/album/app_bar.dart rename to lib/widgets/collection/app_bar.dart index 9c9aa5d88..314f29ce5 100644 --- a/lib/widgets/album/app_bar.dart +++ b/lib/widgets/collection/app_bar.dart @@ -5,8 +5,8 @@ import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/enums.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/filter_bar.dart'; -import 'package:aves/widgets/album/search/search_delegate.dart'; +import 'package:aves/widgets/collection/filter_bar.dart'; +import 'package:aves/widgets/collection/search/search_delegate.dart'; import 'package:aves/widgets/common/action_delegates/selection_action_delegate.dart'; import 'package:aves/widgets/common/app_bar_subtitle.dart'; import 'package:aves/widgets/common/aves_selection_dialog.dart'; diff --git a/lib/widgets/album/collection_page.dart b/lib/widgets/collection/collection_page.dart similarity index 95% rename from lib/widgets/album/collection_page.dart rename to lib/widgets/collection/collection_page.dart index 8be4a541e..35fdb5981 100644 --- a/lib/widgets/album/collection_page.dart +++ b/lib/widgets/collection/collection_page.dart @@ -1,5 +1,5 @@ import 'package:aves/model/source/collection_lens.dart'; -import 'package:aves/widgets/album/thumbnail_collection.dart'; +import 'package:aves/widgets/collection/thumbnail_collection.dart'; import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart'; import 'package:aves/widgets/common/double_back_pop.dart'; import 'package:aves/widgets/drawer/app_drawer.dart'; diff --git a/lib/widgets/album/empty.dart b/lib/widgets/collection/empty.dart similarity index 100% rename from lib/widgets/album/empty.dart rename to lib/widgets/collection/empty.dart diff --git a/lib/widgets/album/filter_bar.dart b/lib/widgets/collection/filter_bar.dart similarity index 100% rename from lib/widgets/album/filter_bar.dart rename to lib/widgets/collection/filter_bar.dart diff --git a/lib/widgets/album/grid/header_album.dart b/lib/widgets/collection/grid/header_album.dart similarity index 94% rename from lib/widgets/album/grid/header_album.dart rename to lib/widgets/collection/grid/header_album.dart index 249a016d4..5afd82fa3 100644 --- a/lib/widgets/album/grid/header_album.dart +++ b/lib/widgets/collection/grid/header_album.dart @@ -1,5 +1,5 @@ import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/widgets/album/grid/header_generic.dart'; +import 'package:aves/widgets/collection/grid/header_generic.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/album/grid/header_date.dart b/lib/widgets/collection/grid/header_date.dart similarity index 96% rename from lib/widgets/album/grid/header_date.dart rename to lib/widgets/collection/grid/header_date.dart index 278b077dc..9e136c796 100644 --- a/lib/widgets/album/grid/header_date.dart +++ b/lib/widgets/collection/grid/header_date.dart @@ -1,5 +1,5 @@ import 'package:aves/utils/time_utils.dart'; -import 'package:aves/widgets/album/grid/header_generic.dart'; +import 'package:aves/widgets/collection/grid/header_generic.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; diff --git a/lib/widgets/album/grid/header_generic.dart b/lib/widgets/collection/grid/header_generic.dart similarity index 98% rename from lib/widgets/album/grid/header_generic.dart rename to lib/widgets/collection/grid/header_generic.dart index 1cf74d188..e267e2be4 100644 --- a/lib/widgets/album/grid/header_generic.dart +++ b/lib/widgets/collection/grid/header_generic.dart @@ -6,8 +6,8 @@ import 'package:aves/model/source/enums.dart'; import 'package:aves/utils/android_file_utils.dart'; import 'package:aves/utils/constants.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/grid/header_album.dart'; -import 'package:aves/widgets/album/grid/header_date.dart'; +import 'package:aves/widgets/collection/grid/header_album.dart'; +import 'package:aves/widgets/collection/grid/header_date.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/widgets/album/grid/list_known_extent.dart b/lib/widgets/collection/grid/list_known_extent.dart similarity index 99% rename from lib/widgets/album/grid/list_known_extent.dart rename to lib/widgets/collection/grid/list_known_extent.dart index 020f4a61d..6ea65c1f8 100644 --- a/lib/widgets/album/grid/list_known_extent.dart +++ b/lib/widgets/collection/grid/list_known_extent.dart @@ -1,6 +1,6 @@ import 'dart:math' as math; -import 'package:aves/widgets/album/grid/list_section_layout.dart'; +import 'package:aves/widgets/collection/grid/list_section_layout.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; diff --git a/lib/widgets/album/grid/list_section_layout.dart b/lib/widgets/collection/grid/list_section_layout.dart similarity index 97% rename from lib/widgets/album/grid/list_section_layout.dart rename to lib/widgets/collection/grid/list_section_layout.dart index b2475c810..fe88bfd51 100644 --- a/lib/widgets/album/grid/list_section_layout.dart +++ b/lib/widgets/collection/grid/list_section_layout.dart @@ -2,8 +2,8 @@ import 'dart:math'; import 'package:aves/model/image_entry.dart'; import 'package:aves/model/source/collection_lens.dart'; -import 'package:aves/widgets/album/grid/header_generic.dart'; -import 'package:aves/widgets/album/grid/tile_extent_manager.dart'; +import 'package:aves/widgets/collection/grid/header_generic.dart'; +import 'package:aves/widgets/collection/grid/tile_extent_manager.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/widgets/album/grid/list_sliver.dart b/lib/widgets/collection/grid/list_sliver.dart similarity index 94% rename from lib/widgets/album/grid/list_sliver.dart rename to lib/widgets/collection/grid/list_sliver.dart index 9e4006779..186df604d 100644 --- a/lib/widgets/album/grid/list_sliver.dart +++ b/lib/widgets/collection/grid/list_sliver.dart @@ -2,9 +2,9 @@ import 'package:aves/main.dart'; import 'package:aves/model/image_entry.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/services/viewer_service.dart'; -import 'package:aves/widgets/album/grid/list_known_extent.dart'; -import 'package:aves/widgets/album/grid/list_section_layout.dart'; -import 'package:aves/widgets/album/thumbnail/decorated.dart'; +import 'package:aves/widgets/collection/grid/list_known_extent.dart'; +import 'package:aves/widgets/collection/grid/list_section_layout.dart'; +import 'package:aves/widgets/collection/thumbnail/decorated.dart'; import 'package:aves/widgets/common/routes.dart'; import 'package:aves/widgets/fullscreen/fullscreen_page.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/album/grid/scaling.dart b/lib/widgets/collection/grid/scaling.dart similarity index 97% rename from lib/widgets/album/grid/scaling.dart rename to lib/widgets/collection/grid/scaling.dart index 0a6397fd7..b3887ba50 100644 --- a/lib/widgets/album/grid/scaling.dart +++ b/lib/widgets/collection/grid/scaling.dart @@ -3,10 +3,10 @@ import 'dart:ui' as ui; import 'package:aves/model/image_entry.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/grid/list_section_layout.dart'; -import 'package:aves/widgets/album/grid/list_sliver.dart'; -import 'package:aves/widgets/album/grid/tile_extent_manager.dart'; -import 'package:aves/widgets/album/thumbnail/decorated.dart'; +import 'package:aves/widgets/collection/grid/list_section_layout.dart'; +import 'package:aves/widgets/collection/grid/list_sliver.dart'; +import 'package:aves/widgets/collection/grid/tile_extent_manager.dart'; +import 'package:aves/widgets/collection/thumbnail/decorated.dart'; import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/widgets/album/grid/tile_extent_manager.dart b/lib/widgets/collection/grid/tile_extent_manager.dart similarity index 100% rename from lib/widgets/album/grid/tile_extent_manager.dart rename to lib/widgets/collection/grid/tile_extent_manager.dart diff --git a/lib/widgets/album/search/expandable_filter_row.dart b/lib/widgets/collection/search/expandable_filter_row.dart similarity index 100% rename from lib/widgets/album/search/expandable_filter_row.dart rename to lib/widgets/collection/search/expandable_filter_row.dart diff --git a/lib/widgets/album/search/search_delegate.dart b/lib/widgets/collection/search/search_delegate.dart similarity index 98% rename from lib/widgets/album/search/search_delegate.dart rename to lib/widgets/collection/search/search_delegate.dart index 28cc29f7a..ed570fc65 100644 --- a/lib/widgets/album/search/search_delegate.dart +++ b/lib/widgets/collection/search/search_delegate.dart @@ -10,7 +10,7 @@ import 'package:aves/model/source/album.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/location.dart'; import 'package:aves/model/source/tag.dart'; -import 'package:aves/widgets/album/search/expandable_filter_row.dart'; +import 'package:aves/widgets/collection/search/expandable_filter_row.dart'; import 'package:aves/widgets/common/aves_filter_chip.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/album/thumbnail/decorated.dart b/lib/widgets/collection/thumbnail/decorated.dart similarity index 90% rename from lib/widgets/album/thumbnail/decorated.dart rename to lib/widgets/collection/thumbnail/decorated.dart index c283be3fe..738ba77ab 100644 --- a/lib/widgets/album/thumbnail/decorated.dart +++ b/lib/widgets/collection/thumbnail/decorated.dart @@ -1,8 +1,8 @@ import 'package:aves/model/image_entry.dart'; import 'package:aves/model/source/collection_lens.dart'; -import 'package:aves/widgets/album/thumbnail/overlay.dart'; -import 'package:aves/widgets/album/thumbnail/raster.dart'; -import 'package:aves/widgets/album/thumbnail/vector.dart'; +import 'package:aves/widgets/collection/thumbnail/overlay.dart'; +import 'package:aves/widgets/collection/thumbnail/raster.dart'; +import 'package:aves/widgets/collection/thumbnail/vector.dart'; import 'package:flutter/material.dart'; class DecoratedThumbnail extends StatelessWidget { diff --git a/lib/widgets/album/thumbnail/overlay.dart b/lib/widgets/collection/thumbnail/overlay.dart similarity index 100% rename from lib/widgets/album/thumbnail/overlay.dart rename to lib/widgets/collection/thumbnail/overlay.dart diff --git a/lib/widgets/album/thumbnail/raster.dart b/lib/widgets/collection/thumbnail/raster.dart similarity index 100% rename from lib/widgets/album/thumbnail/raster.dart rename to lib/widgets/collection/thumbnail/raster.dart diff --git a/lib/widgets/album/thumbnail/vector.dart b/lib/widgets/collection/thumbnail/vector.dart similarity index 100% rename from lib/widgets/album/thumbnail/vector.dart rename to lib/widgets/collection/thumbnail/vector.dart diff --git a/lib/widgets/album/thumbnail_collection.dart b/lib/widgets/collection/thumbnail_collection.dart similarity index 95% rename from lib/widgets/album/thumbnail_collection.dart rename to lib/widgets/collection/thumbnail_collection.dart index 5b79f008b..8d5328121 100644 --- a/lib/widgets/album/thumbnail_collection.dart +++ b/lib/widgets/collection/thumbnail_collection.dart @@ -6,12 +6,12 @@ import 'package:aves/model/mime_types.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/app_bar.dart'; -import 'package:aves/widgets/album/empty.dart'; -import 'package:aves/widgets/album/grid/list_section_layout.dart'; -import 'package:aves/widgets/album/grid/list_sliver.dart'; -import 'package:aves/widgets/album/grid/scaling.dart'; -import 'package:aves/widgets/album/grid/tile_extent_manager.dart'; +import 'package:aves/widgets/collection/app_bar.dart'; +import 'package:aves/widgets/collection/empty.dart'; +import 'package:aves/widgets/collection/grid/list_section_layout.dart'; +import 'package:aves/widgets/collection/grid/list_sliver.dart'; +import 'package:aves/widgets/collection/grid/scaling.dart'; +import 'package:aves/widgets/collection/grid/tile_extent_manager.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/common/scroll_thumb.dart'; import 'package:aves/widgets/common/sloppy_scroll_physics.dart'; diff --git a/lib/widgets/common/action_delegates/selection_action_delegate.dart b/lib/widgets/common/action_delegates/selection_action_delegate.dart index b58772ebe..d7a4b286e 100644 --- a/lib/widgets/common/action_delegates/selection_action_delegate.dart +++ b/lib/widgets/common/action_delegates/selection_action_delegate.dart @@ -9,8 +9,8 @@ import 'package:aves/model/source/collection_source.dart'; import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/image_file_service.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/app_bar.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/app_bar.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/action_delegates/create_album_dialog.dart'; import 'package:aves/widgets/common/action_delegates/feedback.dart'; import 'package:aves/widgets/common/action_delegates/permission_aware.dart'; diff --git a/lib/widgets/drawer/collection_tile.dart b/lib/widgets/drawer/collection_tile.dart index 2acada773..9cff6347f 100644 --- a/lib/widgets/drawer/collection_tile.dart +++ b/lib/widgets/drawer/collection_tile.dart @@ -2,7 +2,7 @@ import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/filter_grids/albums_page.dart b/lib/widgets/filter_grids/albums_page.dart index c2b3d34b8..a95766ed1 100644 --- a/lib/widgets/filter_grids/albums_page.dart +++ b/lib/widgets/filter_grids/albums_page.dart @@ -6,7 +6,7 @@ import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/enums.dart'; import 'package:aves/utils/android_file_utils.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/aves_selection_dialog.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/common/menu_row.dart'; diff --git a/lib/widgets/filter_grids/countries_page.dart b/lib/widgets/filter_grids/countries_page.dart index c9098f568..d580f51d4 100644 --- a/lib/widgets/filter_grids/countries_page.dart +++ b/lib/widgets/filter_grids/countries_page.dart @@ -1,7 +1,7 @@ import 'package:aves/model/filters/location.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/location.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/filter_grids/filter_grid_page.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/filter_grids/decorated_filter_chip.dart b/lib/widgets/filter_grids/decorated_filter_chip.dart index 560889721..53f9d4e16 100644 --- a/lib/widgets/filter_grids/decorated_filter_chip.dart +++ b/lib/widgets/filter_grids/decorated_filter_chip.dart @@ -5,8 +5,8 @@ import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/image_entry.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/widgets/album/thumbnail/raster.dart'; -import 'package:aves/widgets/album/thumbnail/vector.dart'; +import 'package:aves/widgets/collection/thumbnail/raster.dart'; +import 'package:aves/widgets/collection/thumbnail/vector.dart'; import 'package:aves/widgets/common/aves_filter_chip.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/filter_grids/filter_grid_page.dart'; diff --git a/lib/widgets/filter_grids/filter_grid_page.dart b/lib/widgets/filter_grids/filter_grid_page.dart index 4c198d059..7f184b55a 100644 --- a/lib/widgets/filter_grids/filter_grid_page.dart +++ b/lib/widgets/filter_grids/filter_grid_page.dart @@ -6,7 +6,7 @@ import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/app_bar_subtitle.dart'; import 'package:aves/widgets/common/aves_filter_chip.dart'; import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart'; diff --git a/lib/widgets/filter_grids/tags_page.dart b/lib/widgets/filter_grids/tags_page.dart index 4b4693f89..be5bfd8f8 100644 --- a/lib/widgets/filter_grids/tags_page.dart +++ b/lib/widgets/filter_grids/tags_page.dart @@ -1,7 +1,7 @@ import 'package:aves/model/filters/tag.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/tag.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/filter_grids/filter_grid_page.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/fullscreen/fullscreen_body.dart b/lib/widgets/fullscreen/fullscreen_body.dart index 81e29e9d0..352902072 100644 --- a/lib/widgets/fullscreen/fullscreen_body.dart +++ b/lib/widgets/fullscreen/fullscreen_body.dart @@ -7,7 +7,7 @@ import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/utils/change_notifier.dart'; import 'package:aves/utils/durations.dart'; -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/action_delegates/entry_action_delegate.dart'; import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart'; import 'package:aves/widgets/common/image_providers/uri_image_provider.dart'; diff --git a/lib/widgets/fullscreen/image_view.dart b/lib/widgets/fullscreen/image_view.dart index 15b94d533..55e377e02 100644 --- a/lib/widgets/fullscreen/image_view.dart +++ b/lib/widgets/fullscreen/image_view.dart @@ -1,6 +1,6 @@ import 'package:aves/model/image_entry.dart'; import 'package:aves/model/settings/settings.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart'; import 'package:aves/widgets/common/image_providers/uri_image_provider.dart'; diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index a2181ee51..920c0b38d 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -6,7 +6,7 @@ import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/services/image_file_service.dart'; import 'package:aves/services/viewer_service.dart'; import 'package:aves/utils/android_file_utils.dart'; -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/data_providers/media_store_collection_provider.dart'; import 'package:aves/widgets/common/routes.dart'; import 'package:aves/widgets/filter_grids/albums_page.dart'; diff --git a/lib/widgets/stats/filter_table.dart b/lib/widgets/stats/filter_table.dart index ec3fb536c..ed946bae8 100644 --- a/lib/widgets/stats/filter_table.dart +++ b/lib/widgets/stats/filter_table.dart @@ -2,7 +2,7 @@ import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/utils/color_utils.dart'; -import 'package:aves/widgets/album/collection_page.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; import 'package:aves/widgets/common/aves_filter_chip.dart'; import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/stats/stats.dart b/lib/widgets/stats/stats.dart index 2370e7261..ecaa1415b 100644 --- a/lib/widgets/stats/stats.dart +++ b/lib/widgets/stats/stats.dart @@ -9,8 +9,8 @@ import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/utils/color_utils.dart'; import 'package:aves/utils/constants.dart'; -import 'package:aves/widgets/album/collection_page.dart'; -import 'package:aves/widgets/album/empty.dart'; +import 'package:aves/widgets/collection/collection_page.dart'; +import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart'; import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/stats/filter_table.dart';