folder renaming

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 }

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/collection/filter_bar.dart';
-import 'package:aves/widgets/album/search/search_delegate.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';

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';

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';
 

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';
 

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/collection/grid/header_album.dart';
-import 'package:aves/widgets/album/grid/header_date.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';

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';

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/collection/grid/header_generic.dart';
-import 'package:aves/widgets/album/grid/tile_extent_manager.dart';
+import 'package:aves/widgets/collection/grid/tile_extent_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

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/collection/grid/list_known_extent.dart';
-import 'package:aves/widgets/album/grid/list_section_layout.dart';
+import 'package:aves/widgets/collection/grid/list_section_layout.dart';
-import 'package:aves/widgets/album/thumbnail/decorated.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';

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/collection/grid/list_section_layout.dart';
-import 'package:aves/widgets/album/grid/list_sliver.dart';
+import 'package:aves/widgets/collection/grid/list_sliver.dart';
-import 'package:aves/widgets/album/grid/tile_extent_manager.dart';
+import 'package:aves/widgets/collection/grid/tile_extent_manager.dart';
-import 'package:aves/widgets/album/thumbnail/decorated.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';

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';

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/collection/thumbnail/overlay.dart';
-import 'package:aves/widgets/album/thumbnail/raster.dart';
+import 'package:aves/widgets/collection/thumbnail/raster.dart';
-import 'package:aves/widgets/album/thumbnail/vector.dart';
+import 'package:aves/widgets/collection/thumbnail/vector.dart';
 import 'package:flutter/material.dart';
 
 class DecoratedThumbnail extends StatelessWidget {

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/collection/app_bar.dart';
-import 'package:aves/widgets/album/empty.dart';
+import 'package:aves/widgets/collection/empty.dart';
-import 'package:aves/widgets/album/grid/list_section_layout.dart';
+import 'package:aves/widgets/collection/grid/list_section_layout.dart';
-import 'package:aves/widgets/album/grid/list_sliver.dart';
+import 'package:aves/widgets/collection/grid/list_sliver.dart';
-import 'package:aves/widgets/album/grid/scaling.dart';
+import 'package:aves/widgets/collection/grid/scaling.dart';
-import 'package:aves/widgets/album/grid/tile_extent_manager.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';

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/collection/app_bar.dart';
-import 'package:aves/widgets/album/empty.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';

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';
 

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';

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';

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/collection/thumbnail/raster.dart';
-import 'package:aves/widgets/album/thumbnail/vector.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';

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';

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';

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';

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';

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';

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';

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/collection/collection_page.dart';
-import 'package:aves/widgets/album/empty.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';