From 90bef2a5edce723d25acafad52e3aad2e379b147 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Thu, 12 May 2022 21:48:46 +0900 Subject: [PATCH] packages upgrade, super param --- lib/theme/colors.dart | 4 +- lib/theme/durations.dart | 4 +- lib/widgets/about/about_page.dart | 2 +- lib/widgets/about/app_ref.dart | 2 +- lib/widgets/about/bug_report.dart | 2 +- lib/widgets/about/credits.dart | 2 +- lib/widgets/about/licenses.dart | 6 +-- lib/widgets/about/policy_page.dart | 4 +- lib/widgets/aves_app.dart | 4 +- lib/widgets/collection/app_bar.dart | 4 +- lib/widgets/collection/collection_grid.dart | 4 +- lib/widgets/collection/collection_page.dart | 4 +- .../collection/draggable_thumb_label.dart | 4 +- lib/widgets/collection/filter_bar.dart | 5 +- .../collection/grid/headers/album.dart | 4 +- lib/widgets/collection/grid/headers/any.dart | 4 +- lib/widgets/collection/grid/headers/date.dart | 8 +-- .../collection/grid/headers/rating.dart | 4 +- lib/widgets/collection/grid/list_details.dart | 4 +- .../collection/grid/list_details_theme.dart | 4 +- .../collection/grid/section_layout.dart | 28 ++++------ lib/widgets/collection/grid/tile.dart | 8 +-- lib/widgets/collection/query_bar.dart | 4 +- .../common/action_mixins/feedback.dart | 12 ++--- lib/widgets/common/app_bar_subtitle.dart | 8 +-- lib/widgets/common/app_bar_title.dart | 4 +- lib/widgets/common/aves_highlight.dart | 5 +- lib/widgets/common/basic/circle.dart | 8 +-- lib/widgets/common/basic/color_list_tile.dart | 8 +-- .../common/basic/draggable_scrollbar.dart | 13 +++-- lib/widgets/common/basic/insets.dart | 10 ++-- lib/widgets/common/basic/link_chip.dart | 4 +- .../common/basic/markdown_container.dart | 4 +- lib/widgets/common/basic/menu.dart | 12 ++--- .../common/basic/multi_cross_fader.dart | 4 +- lib/widgets/common/basic/outlined_text.dart | 5 +- .../common/basic/popup_menu_button.dart | 51 +++++++------------ lib/widgets/common/basic/query_bar.dart | 4 +- .../basic/reselectable_radio_list_tile.dart | 5 +- .../common/basic/slider_list_tile.dart | 4 +- lib/widgets/common/basic/wheel.dart | 4 +- .../common/behaviour/double_back_pop.dart | 4 +- lib/widgets/common/expandable_filter_row.dart | 4 +- lib/widgets/common/favourite_toggler.dart | 4 +- lib/widgets/common/fx/blurred.dart | 12 ++--- lib/widgets/common/fx/sweeper.dart | 4 +- lib/widgets/common/fx/transition_image.dart | 4 +- .../common/grid/draggable_thumb_label.dart | 8 +-- lib/widgets/common/grid/header.dart | 13 ++--- lib/widgets/common/grid/item_tracker.dart | 4 +- lib/widgets/common/grid/overlay.dart | 4 +- lib/widgets/common/grid/scaling.dart | 8 +-- lib/widgets/common/grid/section_layout.dart | 8 ++- lib/widgets/common/grid/selector.dart | 4 +- lib/widgets/common/grid/sliver.dart | 5 +- lib/widgets/common/grid/theme.dart | 4 +- .../common/identity/aves_expansion_tile.dart | 5 +- .../common/identity/aves_filter_chip.dart | 4 +- lib/widgets/common/identity/aves_icons.dart | 36 ++++++------- lib/widgets/common/identity/aves_logo.dart | 4 +- lib/widgets/common/identity/buttons.dart | 4 +- lib/widgets/common/identity/empty.dart | 4 +- .../common/identity/highlight_title.dart | 4 +- lib/widgets/common/magnifier/core/core.dart | 4 +- .../magnifier/core/gesture_detector.dart | 4 +- lib/widgets/common/magnifier/magnifier.dart | 4 +- .../magnifier/pan/gesture_detector_scope.dart | 4 +- lib/widgets/common/map/attribution.dart | 4 +- lib/widgets/common/map/buttons/button.dart | 4 +- .../common/map/buttons/coordinate_filter.dart | 4 +- lib/widgets/common/map/buttons/panel.dart | 4 +- lib/widgets/common/map/decorator.dart | 4 +- lib/widgets/common/map/geo_map.dart | 4 +- lib/widgets/common/map/leaflet/map.dart | 4 +- .../common/map/leaflet/scale_layer.dart | 8 +-- .../common/map/leaflet/tile_layers.dart | 6 +-- .../providers/highlight_info_provider.dart | 4 +- .../common/providers/map_theme_provider.dart | 4 +- .../providers/media_query_data_provider.dart | 4 +- .../common/providers/query_provider.dart | 4 +- .../common/providers/selection_provider.dart | 4 +- .../tile_extent_controller_provider.dart | 4 +- lib/widgets/common/sliver_app_bar_title.dart | 4 +- lib/widgets/common/thumbnail/decorated.dart | 4 +- lib/widgets/common/thumbnail/error.dart | 4 +- lib/widgets/common/thumbnail/image.dart | 4 +- lib/widgets/common/thumbnail/overlay.dart | 8 +-- lib/widgets/common/thumbnail/scroller.dart | 4 +- lib/widgets/debug/android_apps.dart | 2 +- lib/widgets/debug/android_codecs.dart | 2 +- lib/widgets/debug/android_dirs.dart | 2 +- lib/widgets/debug/app_debug_page.dart | 2 +- lib/widgets/debug/cache.dart | 2 +- lib/widgets/debug/database.dart | 2 +- .../debug/media_store_scan_dialog.dart | 2 +- lib/widgets/debug/overlay.dart | 2 +- lib/widgets/debug/report.dart | 2 +- lib/widgets/debug/settings.dart | 2 +- lib/widgets/debug/storage.dart | 2 +- lib/widgets/dialogs/add_shortcut_dialog.dart | 4 +- lib/widgets/dialogs/app_pick_dialog.dart | 4 +- .../dialogs/aves_confirmation_dialog.dart | 4 +- lib/widgets/dialogs/aves_dialog.dart | 9 ++-- .../dialogs/aves_selection_dialog.dart | 4 +- .../entry_editors/edit_date_dialog.dart | 4 +- .../entry_editors/edit_location_dialog.dart | 4 +- .../entry_editors/edit_rating_dialog.dart | 4 +- .../entry_editors/edit_tags_dialog.dart | 12 ++--- .../entry_editors/remove_metadata_dialog.dart | 4 +- .../entry_editors/rename_entry_dialog.dart | 4 +- .../rename_entry_set_dialog.dart | 4 +- lib/widgets/dialogs/export_entry_dialog.dart | 4 +- .../cover_selection_dialog.dart | 4 +- .../filter_editors/create_album_dialog.dart | 2 +- .../filter_editors/rename_album_dialog.dart | 4 +- lib/widgets/dialogs/item_pick_dialog.dart | 4 +- lib/widgets/dialogs/item_picker.dart | 4 +- lib/widgets/dialogs/location_pick_dialog.dart | 20 ++++---- lib/widgets/dialogs/tile_view_dialog.dart | 4 +- lib/widgets/dialogs/video_speed_dialog.dart | 4 +- .../video_stream_selection_dialog.dart | 4 +- lib/widgets/filter_grids/album_pick.dart | 12 ++--- lib/widgets/filter_grids/albums_page.dart | 2 +- lib/widgets/filter_grids/common/app_bar.dart | 4 +- .../common/covered_filter_chip.dart | 5 +- .../common/draggable_thumb_label.dart | 4 +- .../common/filter_chip_grid_decorator.dart | 4 +- .../filter_grids/common/filter_grid_page.dart | 12 ++--- .../filter_grids/common/filter_nav_page.dart | 4 +- .../filter_grids/common/filter_tile.dart | 8 +-- .../filter_grids/common/list_details.dart | 4 +- .../common/list_details_theme.dart | 4 +- lib/widgets/filter_grids/common/overlay.dart | 4 +- .../filter_grids/common/section_header.dart | 4 +- .../filter_grids/common/section_layout.dart | 37 +++++--------- lib/widgets/filter_grids/countries_page.dart | 2 +- lib/widgets/filter_grids/tags_page.dart | 2 +- lib/widgets/home_page.dart | 4 +- lib/widgets/map/map_info_row.dart | 12 ++--- lib/widgets/map/map_page.dart | 8 +-- lib/widgets/navigation/drawer/app_drawer.dart | 4 +- .../drawer/collection_nav_tile.dart | 9 ++-- .../navigation/drawer/page_nav_tile.dart | 4 +- lib/widgets/navigation/drawer/tile.dart | 16 +++--- lib/widgets/navigation/nav_bar/floating.dart | 4 +- lib/widgets/navigation/nav_bar/nav_bar.dart | 6 +-- lib/widgets/search/search_page.dart | 4 +- .../accessibility/time_to_take_action.dart | 2 +- .../settings/app_export/selection_dialog.dart | 4 +- .../common/quick_actions/action_button.dart | 4 +- .../common/quick_actions/action_panel.dart | 4 +- .../quick_actions/available_actions.dart | 4 +- .../common/quick_actions/editor_page.dart | 8 +-- .../common/quick_actions/placeholder.dart | 4 +- .../common/quick_actions/quick_actions.dart | 4 +- lib/widgets/settings/common/tile_leading.dart | 4 +- lib/widgets/settings/common/tiles.dart | 12 ++--- lib/widgets/settings/language/locale.dart | 4 +- .../navigation/confirmation_dialogs.dart | 2 +- lib/widgets/settings/navigation/drawer.dart | 2 +- .../navigation/drawer_editor_banner.dart | 2 +- .../navigation/drawer_tab_albums.dart | 4 +- .../settings/navigation/drawer_tab_fixed.dart | 4 +- .../settings/privacy/access_grants.dart | 4 +- .../privacy/file_picker/crumb_line.dart | 4 +- .../privacy/file_picker/file_picker.dart | 2 +- .../settings/privacy/hidden_items.dart | 8 +-- lib/widgets/settings/settings_page.dart | 2 +- .../thumbnails/collection_actions_editor.dart | 2 +- lib/widgets/settings/thumbnails/overlay.dart | 2 +- lib/widgets/settings/video/controls.dart | 2 +- .../settings/video/subtitle_sample.dart | 2 +- .../settings/video/subtitle_theme.dart | 2 +- .../settings/video/video_settings_page.dart | 2 +- .../settings/viewer/entry_background.dart | 4 +- lib/widgets/settings/viewer/overlay.dart | 2 +- .../viewer/viewer_actions_editor.dart | 2 +- lib/widgets/stats/filter_table.dart | 4 +- lib/widgets/stats/stats_page.dart | 4 +- lib/widgets/viewer/debug/db.dart | 4 +- lib/widgets/viewer/debug/debug_page.dart | 4 +- lib/widgets/viewer/debug/metadata.dart | 4 +- .../viewer/embedded/embedded_data_opener.dart | 4 +- .../viewer/entry_horizontal_pager.dart | 8 +-- lib/widgets/viewer/entry_vertical_pager.dart | 4 +- lib/widgets/viewer/entry_viewer_page.dart | 16 +++--- lib/widgets/viewer/entry_viewer_stack.dart | 4 +- lib/widgets/viewer/info/basic_section.dart | 4 +- lib/widgets/viewer/info/common.dart | 8 +-- lib/widgets/viewer/info/info_app_bar.dart | 4 +- lib/widgets/viewer/info/info_page.dart | 8 +-- lib/widgets/viewer/info/location_section.dart | 4 +- .../info/metadata/metadata_dir_tile.dart | 4 +- .../info/metadata/metadata_section.dart | 4 +- .../info/metadata/metadata_thumbnail.dart | 4 +- .../viewer/info/metadata/xmp_structs.dart | 8 +-- .../viewer/info/metadata/xmp_tile.dart | 4 +- lib/widgets/viewer/info/owner.dart | 4 +- lib/widgets/viewer/overlay/bottom.dart | 12 ++--- lib/widgets/viewer/overlay/common.dart | 8 +-- lib/widgets/viewer/overlay/details.dart | 12 ++--- lib/widgets/viewer/overlay/minimap.dart | 4 +- lib/widgets/viewer/overlay/multipage.dart | 4 +- lib/widgets/viewer/overlay/panorama.dart | 4 +- .../viewer/overlay/thumbnail_preview.dart | 4 +- lib/widgets/viewer/overlay/top.dart | 4 +- .../viewer/overlay/video/controls.dart | 4 +- .../viewer/overlay/video/mute_toggler.dart | 4 +- .../viewer/overlay/video/play_toggler.dart | 4 +- .../viewer/overlay/video/progress_bar.dart | 4 +- lib/widgets/viewer/overlay/video/video.dart | 4 +- .../viewer/overlay/viewer_button_row.dart | 8 +-- lib/widgets/viewer/page_entry_builder.dart | 4 +- lib/widgets/viewer/panorama_page.dart | 4 +- lib/widgets/viewer/source_viewer_page.dart | 4 +- .../viewer/visual/entry_page_view.dart | 4 +- lib/widgets/viewer/visual/error.dart | 4 +- lib/widgets/viewer/visual/raster.dart | 8 +-- .../viewer/visual/subtitle/subtitle.dart | 4 +- lib/widgets/viewer/visual/vector.dart | 8 +-- lib/widgets/viewer/visual/video.dart | 4 +- lib/widgets/welcome_page.dart | 2 +- plugins/aves_map/lib/src/marker/dot.dart | 2 +- .../aves_map/lib/src/marker/generator.dart | 4 +- plugins/aves_map/lib/src/marker/image.dart | 4 +- plugins/aves_services_google/lib/src/map.dart | 4 +- plugins/aves_services_huawei/lib/src/map.dart | 4 +- pubspec.lock | 11 +++- 228 files changed, 597 insertions(+), 643 deletions(-) diff --git a/lib/theme/colors.dart b/lib/theme/colors.dart index af6d581ec..9782413e0 100644 --- a/lib/theme/colors.dart +++ b/lib/theme/colors.dart @@ -11,9 +11,9 @@ class AvesColorsProvider extends StatelessWidget { final Widget child; const AvesColorsProvider({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/theme/durations.dart b/lib/theme/durations.dart index c13392c3c..cf0562ea5 100644 --- a/lib/theme/durations.dart +++ b/lib/theme/durations.dart @@ -74,9 +74,9 @@ class DurationsProvider extends StatelessWidget { final Widget child; const DurationsProvider({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/about/about_page.dart b/lib/widgets/about/about_page.dart index 3e69444b5..3766f7f82 100644 --- a/lib/widgets/about/about_page.dart +++ b/lib/widgets/about/about_page.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; class AboutPage extends StatelessWidget { static const routeName = '/about'; - const AboutPage({Key? key}) : super(key: key); + const AboutPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/about/app_ref.dart b/lib/widgets/about/app_ref.dart index 7ff052f37..e8ac7ef89 100644 --- a/lib/widgets/about/app_ref.dart +++ b/lib/widgets/about/app_ref.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; import 'package:package_info_plus/package_info_plus.dart'; class AppReference extends StatefulWidget { - const AppReference({Key? key}) : super(key: key); + const AppReference({super.key}); @override State createState() => _AppReferenceState(); diff --git a/lib/widgets/about/bug_report.dart b/lib/widgets/about/bug_report.dart index fb5eaac26..ff0bdd285 100644 --- a/lib/widgets/about/bug_report.dart +++ b/lib/widgets/about/bug_report.dart @@ -25,7 +25,7 @@ import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; class BugReport extends StatefulWidget { - const BugReport({Key? key}) : super(key: key); + const BugReport({super.key}); @override State createState() => _BugReportState(); diff --git a/lib/widgets/about/credits.dart b/lib/widgets/about/credits.dart index e0cf73381..2e5595ea2 100644 --- a/lib/widgets/about/credits.dart +++ b/lib/widgets/about/credits.dart @@ -5,7 +5,7 @@ import 'package:aves/widgets/viewer/info/common.dart'; import 'package:flutter/material.dart'; class AboutCredits extends StatelessWidget { - const AboutCredits({Key? key}) : super(key: key); + const AboutCredits({super.key}); static const translators = { 'Bahasa Indonesia': 'MeFinity', diff --git a/lib/widgets/about/licenses.dart b/lib/widgets/about/licenses.dart index 8a88ec490..e6193e7c1 100644 --- a/lib/widgets/about/licenses.dart +++ b/lib/widgets/about/licenses.dart @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class Licenses extends StatefulWidget { - const Licenses({Key? key}) : super(key: key); + const Licenses({super.key}); @override State createState() => _LicensesState(); @@ -121,9 +121,9 @@ class LicenseRow extends StatelessWidget { final Dependency package; const LicenseRow({ - Key? key, + super.key, required this.package, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/about/policy_page.dart b/lib/widgets/about/policy_page.dart index 534f3f7dc..ea4a1d113 100644 --- a/lib/widgets/about/policy_page.dart +++ b/lib/widgets/about/policy_page.dart @@ -6,9 +6,7 @@ import 'package:flutter/services.dart'; class PolicyPage extends StatefulWidget { static const routeName = '/about/policy'; - const PolicyPage({ - Key? key, - }) : super(key: key); + const PolicyPage({super.key}); @override State createState() => _PolicyPageState(); diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart index 8e9660e37..4d9dbd05e 100644 --- a/lib/widgets/aves_app.dart +++ b/lib/widgets/aves_app.dart @@ -46,9 +46,9 @@ class AvesApp extends StatefulWidget { static final GlobalKey navigatorKey = GlobalKey(debugLabel: 'app-navigator'); const AvesApp({ - Key? key, + super.key, required this.flavor, - }) : super(key: key); + }); @override State createState() => _AvesAppState(); diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart index 5c92264cb..f1a0087dd 100644 --- a/lib/widgets/collection/app_bar.dart +++ b/lib/widgets/collection/app_bar.dart @@ -36,10 +36,10 @@ class CollectionAppBar extends StatefulWidget { final CollectionLens collection; const CollectionAppBar({ - Key? key, + super.key, required this.appBarHeightNotifier, required this.collection, - }) : super(key: key); + }); @override State createState() => _CollectionAppBarState(); diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart index 319b7ff9f..c4b43408d 100644 --- a/lib/widgets/collection/collection_grid.dart +++ b/lib/widgets/collection/collection_grid.dart @@ -51,9 +51,9 @@ class CollectionGrid extends StatefulWidget { static const double spacing = 2; const CollectionGrid({ - Key? key, + super.key, required this.settingsRouteKey, - }) : super(key: key); + }); @override State createState() => _CollectionGridState(); diff --git a/lib/widgets/collection/collection_page.dart b/lib/widgets/collection/collection_page.dart index 42f6b029a..b057d89c6 100644 --- a/lib/widgets/collection/collection_page.dart +++ b/lib/widgets/collection/collection_page.dart @@ -32,11 +32,11 @@ class CollectionPage extends StatefulWidget { final bool Function(AvesEntry element)? highlightTest; const CollectionPage({ - Key? key, + super.key, required this.source, required this.filters, this.highlightTest, - }) : super(key: key); + }); @override State createState() => _CollectionPageState(); diff --git a/lib/widgets/collection/draggable_thumb_label.dart b/lib/widgets/collection/draggable_thumb_label.dart index 90017bdc0..f759854b9 100644 --- a/lib/widgets/collection/draggable_thumb_label.dart +++ b/lib/widgets/collection/draggable_thumb_label.dart @@ -15,10 +15,10 @@ class CollectionDraggableThumbLabel extends StatelessWidget { final double offsetY; const CollectionDraggableThumbLabel({ - Key? key, + super.key, required this.collection, required this.offsetY, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/filter_bar.dart b/lib/widgets/collection/filter_bar.dart index 7d67a60ec..f6b779cbd 100644 --- a/lib/widgets/collection/filter_bar.dart +++ b/lib/widgets/collection/filter_bar.dart @@ -12,12 +12,11 @@ class FilterBar extends StatefulWidget { final FilterCallback? onTap; FilterBar({ - Key? key, + super.key, required Set filters, required this.removable, this.onTap, - }) : filters = List.from(filters)..sort(), - super(key: key); + }) : filters = List.from(filters)..sort(); @override State createState() => _FilterBarState(); diff --git a/lib/widgets/collection/grid/headers/album.dart b/lib/widgets/collection/grid/headers/album.dart index 5cf468649..77bd42aef 100644 --- a/lib/widgets/collection/grid/headers/album.dart +++ b/lib/widgets/collection/grid/headers/album.dart @@ -13,10 +13,10 @@ class AlbumSectionHeader extends StatelessWidget { final String? directory, albumName; const AlbumSectionHeader({ - Key? key, + super.key, required this.directory, required this.albumName, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/grid/headers/any.dart b/lib/widgets/collection/grid/headers/any.dart index 7e1340005..b390dcf00 100644 --- a/lib/widgets/collection/grid/headers/any.dart +++ b/lib/widgets/collection/grid/headers/any.dart @@ -17,11 +17,11 @@ class CollectionSectionHeader extends StatelessWidget { final double height; const CollectionSectionHeader({ - Key? key, + super.key, required this.collection, required this.sectionKey, required this.height, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/grid/headers/date.dart b/lib/widgets/collection/grid/headers/date.dart index abce6c9dd..033492287 100644 --- a/lib/widgets/collection/grid/headers/date.dart +++ b/lib/widgets/collection/grid/headers/date.dart @@ -9,9 +9,9 @@ class DaySectionHeader extends StatelessWidget { final DateTime? date; const DaySectionHeader({ - Key? key, + super.key, required this.date, - }) : super(key: key); + }); // Examples (en_US): // `MMMMd`: `April 15` @@ -56,9 +56,9 @@ class MonthSectionHeader extends StatelessWidget { final DateTime? date; const MonthSectionHeader({ - Key? key, + super.key, required this.date, - }) : super(key: key); + }); static String _formatDate(BuildContext context, DateTime? date) { final l10n = context.l10n; diff --git a/lib/widgets/collection/grid/headers/rating.dart b/lib/widgets/collection/grid/headers/rating.dart index 225e6923e..c6e0198f0 100644 --- a/lib/widgets/collection/grid/headers/rating.dart +++ b/lib/widgets/collection/grid/headers/rating.dart @@ -7,9 +7,9 @@ class RatingSectionHeader extends StatelessWidget { final int rating; const RatingSectionHeader({ - Key? key, + super.key, required this.rating, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/grid/list_details.dart b/lib/widgets/collection/grid/list_details.dart index 608c9ea11..91c81c01f 100644 --- a/lib/widgets/collection/grid/list_details.dart +++ b/lib/widgets/collection/grid/list_details.dart @@ -14,9 +14,9 @@ class EntryListDetails extends StatelessWidget { final AvesEntry entry; const EntryListDetails({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/grid/list_details_theme.dart b/lib/widgets/collection/grid/list_details_theme.dart index 0c3f16b43..e6bd16e8c 100644 --- a/lib/widgets/collection/grid/list_details_theme.dart +++ b/lib/widgets/collection/grid/list_details_theme.dart @@ -14,10 +14,10 @@ class EntryListDetailsTheme extends StatelessWidget { static const double titleDetailPadding = 6; const EntryListDetailsTheme({ - Key? key, + super.key, required this.extent, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/grid/section_layout.dart b/lib/widgets/collection/grid/section_layout.dart index 56f055c43..bfced886b 100644 --- a/lib/widgets/collection/grid/section_layout.dart +++ b/lib/widgets/collection/grid/section_layout.dart @@ -1,6 +1,5 @@ import 'package:aves/model/entry.dart'; import 'package:aves/model/source/collection_lens.dart'; -import 'package:aves/model/source/enums.dart'; import 'package:aves/model/source/section_keys.dart'; import 'package:aves/widgets/collection/grid/headers/any.dart'; import 'package:aves/widgets/common/grid/section_layout.dart'; @@ -10,29 +9,20 @@ class SectionedEntryListLayoutProvider extends SectionedListLayoutProvider? isScrollingNotifier; const InteractiveTile({ - Key? key, + super.key, required this.collection, required this.entry, required this.thumbnailExtent, required this.tileLayout, this.isScrollingNotifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -101,7 +101,7 @@ class Tile extends StatelessWidget { final Object? Function()? heroTagger; const Tile({ - Key? key, + super.key, required this.entry, required this.thumbnailExtent, required this.tileLayout, @@ -109,7 +109,7 @@ class Tile extends StatelessWidget { this.highlightable = false, this.isScrollingNotifier, this.heroTagger, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/collection/query_bar.dart b/lib/widgets/collection/query_bar.dart index 2cc898ade..d1442b4c3 100644 --- a/lib/widgets/collection/query_bar.dart +++ b/lib/widgets/collection/query_bar.dart @@ -13,10 +13,10 @@ class EntryQueryBar extends StatefulWidget { static const preferredHeight = kToolbarHeight; const EntryQueryBar({ - Key? key, + super.key, required this.queryNotifier, required this.focusNode, - }) : super(key: key); + }); @override State createState() => _EntryQueryBarState(); diff --git a/lib/widgets/common/action_mixins/feedback.dart b/lib/widgets/common/action_mixins/feedback.dart index a209cc74d..837489f08 100644 --- a/lib/widgets/common/action_mixins/feedback.dart +++ b/lib/widgets/common/action_mixins/feedback.dart @@ -148,12 +148,12 @@ class ReportOverlay extends StatefulWidget { final void Function(Set processed) onDone; const ReportOverlay({ - Key? key, + super.key, required this.opStream, required this.itemCount, required this.onCancel, required this.onDone, - }) : super(key: key); + }); @override State> createState() => _ReportOverlayState(); @@ -281,12 +281,12 @@ class _FeedbackMessage extends StatefulWidget { final Color progressColor; const _FeedbackMessage({ - Key? key, + super.key, required this.message, required this.progressColor, this.start, this.stop, - }) : super(key: key); + }); @override State<_FeedbackMessage> createState() => _FeedbackMessageState(); @@ -365,9 +365,9 @@ class ActionFeedback extends StatefulWidget { final Widget? child; const ActionFeedback({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override State createState() => _ActionFeedbackState(); diff --git a/lib/widgets/common/app_bar_subtitle.dart b/lib/widgets/common/app_bar_subtitle.dart index 9871ca7e8..2a1df005d 100644 --- a/lib/widgets/common/app_bar_subtitle.dart +++ b/lib/widgets/common/app_bar_subtitle.dart @@ -13,10 +13,10 @@ class SourceStateAwareAppBarTitle extends StatelessWidget { final CollectionSource source; const SourceStateAwareAppBarTitle({ - Key? key, + super.key, required this.title, required this.source, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -54,9 +54,9 @@ class SourceStateSubtitle extends StatelessWidget { final CollectionSource source; const SourceStateSubtitle({ - Key? key, + super.key, required this.source, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/app_bar_title.dart b/lib/widgets/common/app_bar_title.dart index 57101d04b..6bed17d24 100644 --- a/lib/widgets/common/app_bar_title.dart +++ b/lib/widgets/common/app_bar_title.dart @@ -5,10 +5,10 @@ class InteractiveAppBarTitle extends StatelessWidget { final Widget child; const InteractiveAppBarTitle({ - Key? key, + super.key, this.onTap, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/aves_highlight.dart b/lib/widgets/common/aves_highlight.dart index 66bfc3258..2f1894ce4 100644 --- a/lib/widgets/common/aves_highlight.dart +++ b/lib/widgets/common/aves_highlight.dart @@ -31,15 +31,14 @@ class AvesHighlightView extends StatelessWidget { final TextStyle? textStyle; AvesHighlightView({ - Key? key, + super.key, required String input, this.language, this.theme = const {}, this.padding, this.textStyle, int tabSize = 8, // TODO: https://github.com/flutter/flutter/issues/50087 - }) : source = input.replaceAll('\t', ' ' * tabSize), - super(key: key); + }) : source = input.replaceAll('\t', ' ' * tabSize); List _convert(List nodes) { final spans = []; diff --git a/lib/widgets/common/basic/circle.dart b/lib/widgets/common/basic/circle.dart index b429b70ac..d829c6993 100644 --- a/lib/widgets/common/basic/circle.dart +++ b/lib/widgets/common/basic/circle.dart @@ -8,14 +8,14 @@ class CircularIndicator extends StatefulWidget { final Widget center; const CircularIndicator({ - Key? key, + super.key, required this.radius, required this.lineWidth, required this.percent, required this.background, required this.foreground, required this.center, - }) : super(key: key); + }); @override State createState() => _CircularIndicatorState(); @@ -53,12 +53,12 @@ class Circle extends StatelessWidget { final Color color; const Circle({ - Key? key, + super.key, required this.radius, required this.lineWidth, required this.percent, required this.color, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/color_list_tile.dart b/lib/widgets/common/basic/color_list_tile.dart index 91860f690..588f06b42 100644 --- a/lib/widgets/common/basic/color_list_tile.dart +++ b/lib/widgets/common/basic/color_list_tile.dart @@ -12,11 +12,11 @@ class ColorListTile extends StatelessWidget { static const double radius = 16.0; const ColorListTile({ - Key? key, + super.key, required this.title, required this.value, required this.onChanged, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -51,9 +51,9 @@ class ColorPickerDialog extends StatefulWidget { final Color initialValue; const ColorPickerDialog({ - Key? key, + super.key, required this.initialValue, - }) : super(key: key); + }); @override State createState() => _ColorPickerDialogState(); diff --git a/lib/widgets/common/basic/draggable_scrollbar.dart b/lib/widgets/common/basic/draggable_scrollbar.dart index 2230cd0a8..4e31017b7 100644 --- a/lib/widgets/common/basic/draggable_scrollbar.dart +++ b/lib/widgets/common/basic/draggable_scrollbar.dart @@ -61,7 +61,7 @@ class DraggableScrollbar extends StatefulWidget { final ScrollView child; DraggableScrollbar({ - Key? key, + super.key, required this.backgroundColor, required this.scrollThumbSize, required this.scrollThumbBuilder, @@ -73,8 +73,7 @@ class DraggableScrollbar extends StatefulWidget { required this.labelTextBuilder, required this.crumbTextBuilder, required this.child, - }) : assert(child.scrollDirection == Axis.vertical), - super(key: key); + }) : assert(child.scrollDirection == Axis.vertical); @override State createState() => _DraggableScrollbarState(); @@ -116,11 +115,11 @@ class ScrollLabel extends StatelessWidget { final Widget child; const ScrollLabel({ - Key? key, + super.key, required this.child, required this.animation, required this.backgroundColor, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -418,10 +417,10 @@ class SlideFadeTransition extends StatelessWidget { final Widget child; const SlideFadeTransition({ - Key? key, + super.key, required this.animation, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/insets.dart b/lib/widgets/common/basic/insets.dart index 4915aea22..ce6b182d8 100644 --- a/lib/widgets/common/basic/insets.dart +++ b/lib/widgets/common/basic/insets.dart @@ -7,7 +7,7 @@ import 'package:provider/provider.dart'; // - a vertically scrollable body. // It will prevent the body from scrolling when a user swipe from bottom to use Android Q style navigation gestures. class BottomGestureAreaProtector extends StatelessWidget { - const BottomGestureAreaProtector({Key? key}) : super(key: key); + const BottomGestureAreaProtector({super.key}); @override Widget build(BuildContext context) { @@ -27,7 +27,7 @@ class BottomGestureAreaProtector extends StatelessWidget { // It will prevent the body from scrolling when a user swipe from edges to use Android Q style navigation gestures. class SideGestureAreaProtector extends StatelessWidget { - const SideGestureAreaProtector({Key? key}) : super(key: key); + const SideGestureAreaProtector({super.key}); @override Widget build(BuildContext context) { @@ -63,9 +63,9 @@ class GestureAreaProtectorStack extends StatelessWidget { final Widget child; const GestureAreaProtectorStack({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -79,7 +79,7 @@ class GestureAreaProtectorStack extends StatelessWidget { } class BottomPaddingSliver extends StatelessWidget { - const BottomPaddingSliver({Key? key}) : super(key: key); + const BottomPaddingSliver({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/link_chip.dart b/lib/widgets/common/basic/link_chip.dart index 19869aa4d..6e4ed0766 100644 --- a/lib/widgets/common/basic/link_chip.dart +++ b/lib/widgets/common/basic/link_chip.dart @@ -13,14 +13,14 @@ class LinkChip extends StatelessWidget { static const borderRadius = BorderRadius.all(Radius.circular(8)); const LinkChip({ - Key? key, + super.key, this.leading, required this.text, this.urlString, this.color, this.textStyle, this.onTap, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/markdown_container.dart b/lib/widgets/common/basic/markdown_container.dart index 0db99e2ba..03feb2280 100644 --- a/lib/widgets/common/basic/markdown_container.dart +++ b/lib/widgets/common/basic/markdown_container.dart @@ -8,10 +8,10 @@ class MarkdownContainer extends StatelessWidget { final TextDirection? textDirection; const MarkdownContainer({ - Key? key, + super.key, required this.data, this.textDirection, - }) : super(key: key); + }); static const double maxWidth = 460; diff --git a/lib/widgets/common/basic/menu.dart b/lib/widgets/common/basic/menu.dart index 8c568a77a..695e2c73e 100644 --- a/lib/widgets/common/basic/menu.dart +++ b/lib/widgets/common/basic/menu.dart @@ -7,10 +7,10 @@ class MenuRow extends StatelessWidget { final Widget? icon; const MenuRow({ - Key? key, + super.key, required this.text, this.icon, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -37,9 +37,9 @@ class MenuIconTheme extends StatelessWidget { final Widget child; const MenuIconTheme({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -60,12 +60,12 @@ class PopupMenuItemExpansionPanel extends StatefulWidget { final List> items; const PopupMenuItemExpansionPanel({ - Key? key, + super.key, this.enabled = true, required this.icon, required this.title, required this.items, - }) : super(key: key); + }); @override State> createState() => _PopupMenuItemExpansionPanelState(); diff --git a/lib/widgets/common/basic/multi_cross_fader.dart b/lib/widgets/common/basic/multi_cross_fader.dart index 95be7ff94..ba3d01c01 100644 --- a/lib/widgets/common/basic/multi_cross_fader.dart +++ b/lib/widgets/common/basic/multi_cross_fader.dart @@ -7,13 +7,13 @@ class MultiCrossFader extends StatefulWidget { final Widget child; const MultiCrossFader({ - Key? key, + super.key, required this.duration, this.fadeCurve = Curves.linear, this.sizeCurve = Curves.linear, this.alignment = Alignment.topCenter, required this.child, - }) : super(key: key); + }); @override State createState() => _MultiCrossFaderState(); diff --git a/lib/widgets/common/basic/outlined_text.dart b/lib/widgets/common/basic/outlined_text.dart index 12a4812c2..4b1e787d9 100644 --- a/lib/widgets/common/basic/outlined_text.dart +++ b/lib/widgets/common/basic/outlined_text.dart @@ -12,7 +12,7 @@ class OutlinedText extends StatelessWidget { static const widgetSpanAlignment = PlaceholderAlignment.middle; const OutlinedText({ - Key? key, + super.key, required this.textSpans, double? outlineWidth, Color? outlineColor, @@ -20,8 +20,7 @@ class OutlinedText extends StatelessWidget { this.textAlign, }) : outlineWidth = outlineWidth ?? 1, outlineColor = outlineColor ?? Colors.black, - outlineBlurSigma = outlineBlurSigma ?? 0, - super(key: key); + outlineBlurSigma = outlineBlurSigma ?? 0; @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/popup_menu_button.dart b/lib/widgets/common/basic/popup_menu_button.dart index a6b224f78..36d18607f 100644 --- a/lib/widgets/common/basic/popup_menu_button.dart +++ b/lib/widgets/common/basic/popup_menu_button.dart @@ -4,41 +4,24 @@ class AvesPopupMenuButton extends PopupMenuButton { final VoidCallback? onMenuOpened; const AvesPopupMenuButton({ - Key? key, - required PopupMenuItemBuilder itemBuilder, - T? initialValue, - PopupMenuItemSelected? onSelected, - PopupMenuCanceled? onCanceled, - String? tooltip, - double? elevation, - EdgeInsetsGeometry padding = const EdgeInsets.all(8.0), - Widget? child, - Widget? icon, - Offset offset = Offset.zero, - bool enabled = true, - ShapeBorder? shape, - Color? color, - bool? enableFeedback, - double? iconSize, + super.key, + required super.itemBuilder, + super.initialValue, + super.onSelected, + super.onCanceled, + super.tooltip, + super.elevation, + super.padding = const EdgeInsets.all(8.0), + super.child, + super.icon, + super.offset = Offset.zero, + super.enabled = true, + super.shape, + super.color, + super.enableFeedback, + super.iconSize, this.onMenuOpened, - }) : super( - key: key, - itemBuilder: itemBuilder, - initialValue: initialValue, - onSelected: onSelected, - onCanceled: onCanceled, - tooltip: tooltip, - elevation: elevation, - padding: padding, - child: child, - icon: icon, - iconSize: iconSize, - offset: offset, - enabled: enabled, - shape: shape, - color: color, - enableFeedback: enableFeedback, - ); + }); @override PopupMenuButtonState createState() => _AvesPopupMenuButtonState(); diff --git a/lib/widgets/common/basic/query_bar.dart b/lib/widgets/common/basic/query_bar.dart index 909b5fe05..e4365f297 100644 --- a/lib/widgets/common/basic/query_bar.dart +++ b/lib/widgets/common/basic/query_bar.dart @@ -12,13 +12,13 @@ class QueryBar extends StatefulWidget { final bool editable; const QueryBar({ - Key? key, + super.key, required this.queryNotifier, this.focusNode, this.icon, this.hintText, this.editable = true, - }) : super(key: key); + }); @override State createState() => _QueryBarState(); diff --git a/lib/widgets/common/basic/reselectable_radio_list_tile.dart b/lib/widgets/common/basic/reselectable_radio_list_tile.dart index 501c52118..5d88833c3 100644 --- a/lib/widgets/common/basic/reselectable_radio_list_tile.dart +++ b/lib/widgets/common/basic/reselectable_radio_list_tile.dart @@ -20,7 +20,7 @@ class ReselectableRadioListTile extends StatelessWidget { bool get checked => value == groupValue; const ReselectableRadioListTile({ - Key? key, + super.key, required this.value, required this.groupValue, required this.onChanged, @@ -35,8 +35,7 @@ class ReselectableRadioListTile extends StatelessWidget { this.selected = false, this.controlAffinity = ListTileControlAffinity.platform, this.autofocus = false, - }) : assert(!isThreeLine || subtitle != null), - super(key: key); + }) : assert(!isThreeLine || subtitle != null); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/slider_list_tile.dart b/lib/widgets/common/basic/slider_list_tile.dart index 8dc65db1c..8997b687a 100644 --- a/lib/widgets/common/basic/slider_list_tile.dart +++ b/lib/widgets/common/basic/slider_list_tile.dart @@ -9,14 +9,14 @@ class SliderListTile extends StatelessWidget { final int? divisions; const SliderListTile({ - Key? key, + super.key, required this.title, required this.value, required this.onChanged, this.min = 0.0, this.max = 1.0, this.divisions, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/basic/wheel.dart b/lib/widgets/common/basic/wheel.dart index f1e9cbf34..c6b552b6c 100644 --- a/lib/widgets/common/basic/wheel.dart +++ b/lib/widgets/common/basic/wheel.dart @@ -7,12 +7,12 @@ class WheelSelector extends StatefulWidget { final TextAlign textAlign; const WheelSelector({ - Key? key, + super.key, required this.valueNotifier, required this.values, required this.textStyle, required this.textAlign, - }) : super(key: key); + }); @override State> createState() => _WheelSelectorState(); diff --git a/lib/widgets/common/behaviour/double_back_pop.dart b/lib/widgets/common/behaviour/double_back_pop.dart index d1bbfc8c3..258e43c04 100644 --- a/lib/widgets/common/behaviour/double_back_pop.dart +++ b/lib/widgets/common/behaviour/double_back_pop.dart @@ -12,9 +12,9 @@ class DoubleBackPopScope extends StatefulWidget { final Widget child; const DoubleBackPopScope({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override State createState() => _DoubleBackPopScopeState(); diff --git a/lib/widgets/common/expandable_filter_row.dart b/lib/widgets/common/expandable_filter_row.dart index 0356a6461..903412dc8 100644 --- a/lib/widgets/common/expandable_filter_row.dart +++ b/lib/widgets/common/expandable_filter_row.dart @@ -15,7 +15,7 @@ class ExpandableFilterRow extends StatelessWidget { final OffsetFilterCallback? onLongPress; const ExpandableFilterRow({ - Key? key, + super.key, this.title, required this.filters, required this.expandedNotifier, @@ -23,7 +23,7 @@ class ExpandableFilterRow extends StatelessWidget { this.heroTypeBuilder, required this.onTap, required this.onLongPress, - }) : super(key: key); + }); static const double horizontalPadding = 8; static const double verticalPadding = 8; diff --git a/lib/widgets/common/favourite_toggler.dart b/lib/widgets/common/favourite_toggler.dart index 340e9d0ee..0b3e858af 100644 --- a/lib/widgets/common/favourite_toggler.dart +++ b/lib/widgets/common/favourite_toggler.dart @@ -14,11 +14,11 @@ class FavouriteToggler extends StatefulWidget { final VoidCallback? onPressed; const FavouriteToggler({ - Key? key, + super.key, required this.entries, this.isMenuItem = false, this.onPressed, - }) : super(key: key); + }); @override State createState() => _FavouriteTogglerState(); diff --git a/lib/widgets/common/fx/blurred.dart b/lib/widgets/common/fx/blurred.dart index 91131ac39..c3374401a 100644 --- a/lib/widgets/common/fx/blurred.dart +++ b/lib/widgets/common/fx/blurred.dart @@ -9,10 +9,10 @@ class BlurredRect extends StatelessWidget { final Widget child; const BlurredRect({ - Key? key, + super.key, this.enabled = true, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -33,11 +33,11 @@ class BlurredRRect extends StatelessWidget { final Widget child; const BlurredRRect({ - Key? key, + super.key, this.enabled = true, required this.borderRadius, required this.child, - }) : super(key: key); + }); factory BlurredRRect.all({ Key? key, @@ -72,10 +72,10 @@ class BlurredOval extends StatelessWidget { final Widget child; const BlurredOval({ - Key? key, + super.key, this.enabled = true, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/fx/sweeper.dart b/lib/widgets/common/fx/sweeper.dart index 6062016cb..a02add989 100644 --- a/lib/widgets/common/fx/sweeper.dart +++ b/lib/widgets/common/fx/sweeper.dart @@ -15,7 +15,7 @@ class Sweeper extends StatefulWidget { final VoidCallback? onSweepEnd; const Sweeper({ - Key? key, + super.key, required this.builder, this.startAngle = -pi / 2, this.sweepAngle = pi / 4, @@ -23,7 +23,7 @@ class Sweeper extends StatefulWidget { required this.toggledNotifier, this.centerSweep = true, this.onSweepEnd, - }) : super(key: key); + }); @override State createState() => _SweeperState(); diff --git a/lib/widgets/common/fx/transition_image.dart b/lib/widgets/common/fx/transition_image.dart index 33d5b2472..cad92fddb 100644 --- a/lib/widgets/common/fx/transition_image.dart +++ b/lib/widgets/common/fx/transition_image.dart @@ -16,13 +16,13 @@ class TransitionImage extends StatefulWidget { final Color? background; const TransitionImage({ - Key? key, + super.key, required this.image, required this.animation, this.width, this.height, this.background, - }) : super(key: key); + }); @override State createState() => _TransitionImageState(); diff --git a/lib/widgets/common/grid/draggable_thumb_label.dart b/lib/widgets/common/grid/draggable_thumb_label.dart index 375b1c71f..af6888457 100644 --- a/lib/widgets/common/grid/draggable_thumb_label.dart +++ b/lib/widgets/common/grid/draggable_thumb_label.dart @@ -9,9 +9,9 @@ class DraggableCrumbLabel extends StatelessWidget { final String label; const DraggableCrumbLabel({ - Key? key, + super.key, required this.label, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -30,10 +30,10 @@ class DraggableThumbLabel extends StatelessWidget { final List Function(BuildContext context, T item) lineBuilder; const DraggableThumbLabel({ - Key? key, + super.key, required this.offsetY, required this.lineBuilder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/grid/header.dart b/lib/widgets/common/grid/header.dart index bcb0e40e0..6863fe454 100644 --- a/lib/widgets/common/grid/header.dart +++ b/lib/widgets/common/grid/header.dart @@ -16,13 +16,13 @@ class SectionHeader extends StatelessWidget { final bool selectable; const SectionHeader({ - Key? key, + super.key, required this.sectionKey, this.leading, required this.title, this.trailing, this.selectable = true, - }) : super(key: key); + }); static const leadingDimension = 32.0; static const padding = EdgeInsets.all(16); @@ -39,6 +39,7 @@ class SectionHeader extends StatelessWidget { child: Text.rich( TextSpan( children: [ + // TODO TLAD [flutter 3] https://github.com/flutter/flutter/issues/103615 WidgetSpan( alignment: widgetSpanAlignment, child: _SectionSelectableLeading( @@ -127,12 +128,12 @@ class _SectionSelectableLeading extends StatelessWidget { final VoidCallback? onPressed; const _SectionSelectableLeading({ - Key? key, + super.key, this.selectable = true, required this.sectionKey, required this.browsingBuilder, required this.onPressed, - }) : super(key: key); + }); static const leadingDimension = SectionHeader.leadingDimension; @@ -180,10 +181,10 @@ class _SectionSelectingLeading extends StatelessWidget { final VoidCallback? onPressed; const _SectionSelectingLeading({ - Key? key, + super.key, required this.sectionKey, required this.onPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/grid/item_tracker.dart b/lib/widgets/common/grid/item_tracker.dart index d1a6d70b9..8f5755999 100644 --- a/lib/widgets/common/grid/item_tracker.dart +++ b/lib/widgets/common/grid/item_tracker.dart @@ -17,13 +17,13 @@ class GridItemTracker extends StatefulWidget { final Widget child; const GridItemTracker({ - Key? key, + super.key, required this.scrollableKey, required this.appBarHeightNotifier, required this.tileLayout, required this.scrollController, required this.child, - }) : super(key: key); + }); @override State> createState() => _GridItemTrackerState(); diff --git a/lib/widgets/common/grid/overlay.dart b/lib/widgets/common/grid/overlay.dart index 4af0f83d2..a7fc392de 100644 --- a/lib/widgets/common/grid/overlay.dart +++ b/lib/widgets/common/grid/overlay.dart @@ -13,11 +13,11 @@ class GridItemSelectionOverlay extends StatelessWidget { static const duration = Durations.thumbnailOverlayAnimation; const GridItemSelectionOverlay({ - Key? key, + super.key, required this.item, this.borderRadius, this.padding, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/grid/scaling.dart b/lib/widgets/common/grid/scaling.dart index 045a056bc..61f2431cd 100644 --- a/lib/widgets/common/grid/scaling.dart +++ b/lib/widgets/common/grid/scaling.dart @@ -31,7 +31,7 @@ class GridScaleGestureDetector extends StatefulWidget { final Widget child; const GridScaleGestureDetector({ - Key? key, + super.key, required this.scrollableKey, required this.tileLayout, required this.heightForWidth, @@ -39,7 +39,7 @@ class GridScaleGestureDetector extends StatefulWidget { required this.scaledBuilder, this.highlightItem, required this.child, - }) : super(key: key); + }); @override State> createState() => _GridScaleGestureDetectorState(); @@ -236,7 +236,7 @@ class _ScaleOverlay extends StatefulWidget { final Widget Function(Offset center, Size tileSize, Widget child) gridBuilder; const _ScaleOverlay({ - Key? key, + super.key, required this.builder, required this.tileLayout, required this.center, @@ -244,7 +244,7 @@ class _ScaleOverlay extends StatefulWidget { required this.xMax, required this.scaledSizeNotifier, required this.gridBuilder, - }) : super(key: key); + }); @override State<_ScaleOverlay> createState() => _ScaleOverlayState(); diff --git a/lib/widgets/common/grid/section_layout.dart b/lib/widgets/common/grid/section_layout.dart index 42f2dd021..cb6ef28b5 100644 --- a/lib/widgets/common/grid/section_layout.dart +++ b/lib/widgets/common/grid/section_layout.dart @@ -21,7 +21,7 @@ abstract class SectionedListLayoutProvider extends StatelessWidget { final Widget child; const SectionedListLayoutProvider({ - Key? key, + super.key, required this.scrollableWidth, required this.tileLayout, required int columnCount, @@ -34,8 +34,7 @@ abstract class SectionedListLayoutProvider extends StatelessWidget { required this.child, }) : assert(scrollableWidth != 0), columnCount = tileLayout == TileLayout.list ? 1 : columnCount, - tileWidth = tileLayout == TileLayout.list ? scrollableWidth - (horizontalPadding * 2) : tileWidth, - super(key: key); + tileWidth = tileLayout == TileLayout.list ? scrollableWidth - (horizontalPadding * 2) : tileWidth; @override Widget build(BuildContext context) { @@ -296,13 +295,12 @@ class _GridRow extends MultiChildRenderObjectWidget { final TextDirection textDirection; _GridRow({ - Key? key, required this.width, required this.height, required this.spacing, required this.textDirection, required List children, - }) : super(key: key, children: children); + }) : super(children: children); @override RenderObject createRenderObject(BuildContext context) { diff --git a/lib/widgets/common/grid/selector.dart b/lib/widgets/common/grid/selector.dart index 907166958..4a53f5607 100644 --- a/lib/widgets/common/grid/selector.dart +++ b/lib/widgets/common/grid/selector.dart @@ -18,14 +18,14 @@ class GridSelectionGestureDetector extends StatefulWidget { final Widget child; const GridSelectionGestureDetector({ - Key? key, + super.key, required this.scrollableKey, this.selectable = true, required this.items, required this.scrollController, required this.appBarHeightNotifier, required this.child, - }) : super(key: key); + }); @override State> createState() => _GridSelectionGestureDetectorState(); diff --git a/lib/widgets/common/grid/sliver.dart b/lib/widgets/common/grid/sliver.dart index d322a5a4f..d7acd1734 100644 --- a/lib/widgets/common/grid/sliver.dart +++ b/lib/widgets/common/grid/sliver.dart @@ -14,7 +14,7 @@ import 'package:provider/provider.dart'; // cf https://github.com/flutter/flutter/issues/49027 // adapted from Flutter `RenderSliverFixedExtentBoxAdaptor` in `/rendering/sliver_fixed_extent_list.dart` class SectionedListSliver extends StatelessWidget { - const SectionedListSliver({Key? key}) : super(key: key); + const SectionedListSliver({super.key}); @override Widget build(BuildContext context) { @@ -40,10 +40,9 @@ class _SliverKnownExtentList extends SliverMultiBoxAdaptorWidget { final List sectionLayouts; const _SliverKnownExtentList({ - Key? key, required SliverChildDelegate delegate, required this.sectionLayouts, - }) : super(key: key, delegate: delegate); + }) : super(delegate: delegate); @override _RenderSliverKnownExtentBoxAdaptor createRenderObject(BuildContext context) { diff --git a/lib/widgets/common/grid/theme.dart b/lib/widgets/common/grid/theme.dart index 6708de32b..e096011b2 100644 --- a/lib/widgets/common/grid/theme.dart +++ b/lib/widgets/common/grid/theme.dart @@ -10,12 +10,12 @@ class GridTheme extends StatelessWidget { final Widget child; const GridTheme({ - Key? key, + super.key, required this.extent, this.showLocation, this.showTrash, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/aves_expansion_tile.dart b/lib/widgets/common/identity/aves_expansion_tile.dart index 34c4e019d..c929a1b73 100644 --- a/lib/widgets/common/identity/aves_expansion_tile.dart +++ b/lib/widgets/common/identity/aves_expansion_tile.dart @@ -14,7 +14,7 @@ class AvesExpansionTile extends StatelessWidget { final List children; const AvesExpansionTile({ - Key? key, + super.key, String? value, this.leading, required this.title, @@ -23,8 +23,7 @@ class AvesExpansionTile extends StatelessWidget { this.initiallyExpanded = false, this.showHighlight = true, required this.children, - }) : value = value ?? title, - super(key: key); + }) : value = value ?? title; @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/aves_filter_chip.dart b/lib/widgets/common/identity/aves_filter_chip.dart index f5c40b614..21dfe3297 100644 --- a/lib/widgets/common/identity/aves_filter_chip.dart +++ b/lib/widgets/common/identity/aves_filter_chip.dart @@ -60,7 +60,7 @@ class AvesFilterChip extends StatefulWidget { static const double decoratedContentVerticalPadding = 5; const AvesFilterChip({ - Key? key, + super.key, required this.filter, this.removable = false, this.showText = true, @@ -75,7 +75,7 @@ class AvesFilterChip extends StatefulWidget { this.heroType = HeroType.onTap, this.onTap, this.onLongPress = showDefaultLongPressMenu, - }) : super(key: key); + }); static Future showDefaultLongPressMenu(BuildContext context, CollectionFilter filter, Offset tapPosition) async { if (context.read>().value == AppMode.main) { diff --git a/lib/widgets/common/identity/aves_icons.dart b/lib/widgets/common/identity/aves_icons.dart index 93d4e8a4a..e5742d597 100644 --- a/lib/widgets/common/identity/aves_icons.dart +++ b/lib/widgets/common/identity/aves_icons.dart @@ -12,9 +12,9 @@ class VideoIcon extends StatelessWidget { final AvesEntry entry; const VideoIcon({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -38,7 +38,7 @@ class VideoIcon extends StatelessWidget { } class AnimatedImageIcon extends StatelessWidget { - const AnimatedImageIcon({Key? key}) : super(key: key); + const AnimatedImageIcon({super.key}); static const scale = .8; @@ -52,7 +52,7 @@ class AnimatedImageIcon extends StatelessWidget { } class GeoTiffIcon extends StatelessWidget { - const GeoTiffIcon({Key? key}) : super(key: key); + const GeoTiffIcon({super.key}); @override Widget build(BuildContext context) { @@ -63,7 +63,7 @@ class GeoTiffIcon extends StatelessWidget { } class SphericalImageIcon extends StatelessWidget { - const SphericalImageIcon({Key? key}) : super(key: key); + const SphericalImageIcon({super.key}); @override Widget build(BuildContext context) { @@ -74,7 +74,7 @@ class SphericalImageIcon extends StatelessWidget { } class FavouriteIcon extends StatelessWidget { - const FavouriteIcon({Key? key}) : super(key: key); + const FavouriteIcon({super.key}); static const scale = .9; @@ -88,7 +88,7 @@ class FavouriteIcon extends StatelessWidget { } class TagIcon extends StatelessWidget { - const TagIcon({Key? key}) : super(key: key); + const TagIcon({super.key}); static const scale = .9; @@ -103,7 +103,7 @@ class TagIcon extends StatelessWidget { } class GpsIcon extends StatelessWidget { - const GpsIcon({Key? key}) : super(key: key); + const GpsIcon({super.key}); @override Widget build(BuildContext context) { @@ -114,7 +114,7 @@ class GpsIcon extends StatelessWidget { } class RawIcon extends StatelessWidget { - const RawIcon({Key? key}) : super(key: key); + const RawIcon({super.key}); @override Widget build(BuildContext context) { @@ -125,7 +125,7 @@ class RawIcon extends StatelessWidget { } class MotionPhotoIcon extends StatelessWidget { - const MotionPhotoIcon({Key? key}) : super(key: key); + const MotionPhotoIcon({super.key}); static const scale = .8; @@ -144,9 +144,9 @@ class MultiPageIcon extends StatelessWidget { static const scale = .8; const MultiPageIcon({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -172,9 +172,9 @@ class RatingIcon extends StatelessWidget { final AvesEntry entry; const RatingIcon({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -195,9 +195,9 @@ class TrashIcon extends StatelessWidget { final int? trashDaysLeft; const TrashIcon({ - Key? key, + super.key, required this.trashDaysLeft, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -223,14 +223,14 @@ class OverlayIcon extends StatelessWidget { final Offset? relativeOffset; const OverlayIcon({ - Key? key, + super.key, required this.icon, this.iconScale = 1, this.text, // default margin for multiple icons in a `Column` this.margin = const EdgeInsets.only(left: 1, right: 1, bottom: 1), this.relativeOffset, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/aves_logo.dart b/lib/widgets/common/identity/aves_logo.dart index 23fb7a04e..19a4b161c 100644 --- a/lib/widgets/common/identity/aves_logo.dart +++ b/lib/widgets/common/identity/aves_logo.dart @@ -9,9 +9,9 @@ class AvesLogo extends StatelessWidget { final double size; const AvesLogo({ - Key? key, + super.key, required this.size, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/buttons.dart b/lib/widgets/common/identity/buttons.dart index 3897ee2d6..9b3ecc2f8 100644 --- a/lib/widgets/common/identity/buttons.dart +++ b/lib/widgets/common/identity/buttons.dart @@ -6,11 +6,11 @@ class AvesOutlinedButton extends StatelessWidget { final VoidCallback? onPressed; const AvesOutlinedButton({ - Key? key, + super.key, this.icon, required this.label, required this.onPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/empty.dart b/lib/widgets/common/identity/empty.dart index af4ff6096..9c40675df 100644 --- a/lib/widgets/common/identity/empty.dart +++ b/lib/widgets/common/identity/empty.dart @@ -10,13 +10,13 @@ class EmptyContent extends StatelessWidget { final bool safeBottom; const EmptyContent({ - Key? key, + super.key, this.icon, required this.text, this.alignment = const FractionalOffset(.5, .35), this.fontSize = 22, this.safeBottom = true, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/identity/highlight_title.dart b/lib/widgets/common/identity/highlight_title.dart index a8976cb8d..64e263e96 100644 --- a/lib/widgets/common/identity/highlight_title.dart +++ b/lib/widgets/common/identity/highlight_title.dart @@ -15,14 +15,14 @@ class HighlightTitle extends StatelessWidget { final bool showHighlight; const HighlightTitle({ - Key? key, + super.key, required this.title, this.color, this.fontSize = 18, this.enabled = true, this.selectable = false, this.showHighlight = true, - }) : super(key: key); + }); static const disabledColor = Colors.grey; diff --git a/lib/widgets/common/magnifier/core/core.dart b/lib/widgets/common/magnifier/core/core.dart index bbaf1e69a..9364dcbc2 100644 --- a/lib/widgets/common/magnifier/core/core.dart +++ b/lib/widgets/common/magnifier/core/core.dart @@ -23,7 +23,7 @@ class MagnifierCore extends StatefulWidget { final Widget child; const MagnifierCore({ - Key? key, + super.key, required this.controller, required this.scaleStateCycle, required this.applyScale, @@ -31,7 +31,7 @@ class MagnifierCore extends StatefulWidget { this.onTap, this.onDoubleTap, required this.child, - }) : super(key: key); + }); @override State createState() => _MagnifierCoreState(); diff --git a/lib/widgets/common/magnifier/core/gesture_detector.dart b/lib/widgets/common/magnifier/core/gesture_detector.dart index e39d67040..58117dd1e 100644 --- a/lib/widgets/common/magnifier/core/gesture_detector.dart +++ b/lib/widgets/common/magnifier/core/gesture_detector.dart @@ -7,7 +7,7 @@ import 'package:provider/provider.dart'; class MagnifierGestureDetector extends StatefulWidget { const MagnifierGestureDetector({ - Key? key, + super.key, required this.hitDetector, this.onScaleStart, this.onScaleUpdate, @@ -17,7 +17,7 @@ class MagnifierGestureDetector extends StatefulWidget { this.onDoubleTap, this.behavior, this.child, - }) : super(key: key); + }); final CornerHitDetector hitDetector; final void Function(ScaleStartDetails details, bool doubleTap)? onScaleStart; diff --git a/lib/widgets/common/magnifier/magnifier.dart b/lib/widgets/common/magnifier/magnifier.dart index 0661d557b..98d5b6d35 100644 --- a/lib/widgets/common/magnifier/magnifier.dart +++ b/lib/widgets/common/magnifier/magnifier.dart @@ -20,7 +20,7 @@ import 'package:flutter/material.dart'; */ class Magnifier extends StatelessWidget { const Magnifier({ - Key? key, + super.key, required this.controller, required this.childSize, this.minScale = const ScaleLevel(factor: .0), @@ -31,7 +31,7 @@ class Magnifier extends StatelessWidget { this.onTap, this.onDoubleTap, required this.child, - }) : super(key: key); + }); final MagnifierController controller; diff --git a/lib/widgets/common/magnifier/pan/gesture_detector_scope.dart b/lib/widgets/common/magnifier/pan/gesture_detector_scope.dart index 9763bc1f6..e7a597baf 100644 --- a/lib/widgets/common/magnifier/pan/gesture_detector_scope.dart +++ b/lib/widgets/common/magnifier/pan/gesture_detector_scope.dart @@ -8,11 +8,11 @@ import 'package:flutter/widgets.dart'; /// such as [PageView], [Dismissible], [BottomSheet]. class MagnifierGestureDetectorScope extends InheritedWidget { const MagnifierGestureDetectorScope({ - Key? key, + super.key, required this.axis, this.touchSlopFactor = .8, required Widget child, - }) : super(key: key, child: child); + }) : super(child: child); static MagnifierGestureDetectorScope? of(BuildContext context) { final scope = context.dependOnInheritedWidgetOfExactType(); diff --git a/lib/widgets/common/map/attribution.dart b/lib/widgets/common/map/attribution.dart index 6ea130395..57aaab097 100644 --- a/lib/widgets/common/map/attribution.dart +++ b/lib/widgets/common/map/attribution.dart @@ -9,9 +9,9 @@ class Attribution extends StatelessWidget { final EntryMapStyle style; const Attribution({ - Key? key, + super.key, required this.style, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/map/buttons/button.dart b/lib/widgets/common/map/buttons/button.dart index 77fdf23d0..7bd435ce8 100644 --- a/lib/widgets/common/map/buttons/button.dart +++ b/lib/widgets/common/map/buttons/button.dart @@ -12,11 +12,11 @@ class MapOverlayButton extends StatelessWidget { final VoidCallback? onPressed; const MapOverlayButton({ - Key? key, + super.key, required this.icon, required this.tooltip, required this.onPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/map/buttons/coordinate_filter.dart b/lib/widgets/common/map/buttons/coordinate_filter.dart index c9639d069..3056ace31 100644 --- a/lib/widgets/common/map/buttons/coordinate_filter.dart +++ b/lib/widgets/common/map/buttons/coordinate_filter.dart @@ -15,10 +15,10 @@ class OverlayCoordinateFilterChip extends StatefulWidget { final double padding; const OverlayCoordinateFilterChip({ - Key? key, + super.key, required this.boundsNotifier, required this.padding, - }) : super(key: key); + }); @override State createState() => _OverlayCoordinateFilterChipState(); diff --git a/lib/widgets/common/map/buttons/panel.dart b/lib/widgets/common/map/buttons/panel.dart index 6608cf1bc..31d0505b9 100644 --- a/lib/widgets/common/map/buttons/panel.dart +++ b/lib/widgets/common/map/buttons/panel.dart @@ -21,12 +21,12 @@ class MapButtonPanel extends StatelessWidget { final VoidCallback? resetRotation; const MapButtonPanel({ - Key? key, + super.key, required this.boundsNotifier, this.zoomBy, this.openMapPage, this.resetRotation, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/map/decorator.dart b/lib/widgets/common/map/decorator.dart index d3ddd0ce3..7969420ae 100644 --- a/lib/widgets/common/map/decorator.dart +++ b/lib/widgets/common/map/decorator.dart @@ -11,9 +11,9 @@ class MapDecorator extends StatelessWidget { static const mapLoadingGrid = Color(0xFFC4BEBB); const MapDecorator({ - Key? key, + super.key, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/map/geo_map.dart b/lib/widgets/common/map/geo_map.dart index d881c8579..a6c598cb3 100644 --- a/lib/widgets/common/map/geo_map.dart +++ b/lib/widgets/common/map/geo_map.dart @@ -37,7 +37,7 @@ class GeoMap extends StatefulWidget { final void Function(BuildContext context)? openMapPage; const GeoMap({ - Key? key, + super.key, this.controller, this.collectionListenable, required this.entries, @@ -50,7 +50,7 @@ class GeoMap extends StatefulWidget { this.onMapTap, this.onMarkerTap, this.openMapPage, - }) : super(key: key); + }); @override State createState() => _GeoMapState(); diff --git a/lib/widgets/common/map/leaflet/map.dart b/lib/widgets/common/map/leaflet/map.dart index 7869ac958..43931d71b 100644 --- a/lib/widgets/common/map/leaflet/map.dart +++ b/lib/widgets/common/map/leaflet/map.dart @@ -31,7 +31,7 @@ class EntryLeafletMap extends StatefulWidget { final MarkerTapCallback? onMarkerTap; const EntryLeafletMap({ - Key? key, + super.key, this.controller, required this.clusterListenable, required this.boundsNotifier, @@ -50,7 +50,7 @@ class EntryLeafletMap extends StatefulWidget { this.onUserZoomChange, this.onMapTap, this.onMarkerTap, - }) : super(key: key); + }); @override State createState() => _EntryLeafletMapState(); diff --git a/lib/widgets/common/map/leaflet/scale_layer.dart b/lib/widgets/common/map/leaflet/scale_layer.dart index 37e76093c..547a1937d 100644 --- a/lib/widgets/common/map/leaflet/scale_layer.dart +++ b/lib/widgets/common/map/leaflet/scale_layer.dart @@ -9,11 +9,11 @@ class ScaleLayerOptions extends LayerOptions { final Widget Function(double width, String distance) builder; ScaleLayerOptions({ - Key? key, + super.key, this.unitSystem = UnitSystem.metric, this.builder = defaultBuilder, rebuild, - }) : super(key: key, rebuild: rebuild); + }) : super(rebuild: rebuild); static Widget defaultBuilder(double width, String distance) { return ScaleBar( @@ -132,10 +132,10 @@ class ScaleBar extends StatelessWidget { static const double barThickness = 1; const ScaleBar({ - Key? key, + super.key, required this.distance, required this.width, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/map/leaflet/tile_layers.dart b/lib/widgets/common/map/leaflet/tile_layers.dart index 069a0967c..5602a58c3 100644 --- a/lib/widgets/common/map/leaflet/tile_layers.dart +++ b/lib/widgets/common/map/leaflet/tile_layers.dart @@ -6,7 +6,7 @@ import 'package:provider/provider.dart'; const _tileLayerBackgroundColor = Colors.transparent; class OSMHotLayer extends StatelessWidget { - const OSMHotLayer({Key? key}) : super(key: key); + const OSMHotLayer({super.key}); @override Widget build(BuildContext context) { @@ -23,7 +23,7 @@ class OSMHotLayer extends StatelessWidget { } class StamenTonerLayer extends StatelessWidget { - const StamenTonerLayer({Key? key}) : super(key: key); + const StamenTonerLayer({super.key}); @override Widget build(BuildContext context) { @@ -40,7 +40,7 @@ class StamenTonerLayer extends StatelessWidget { } class StamenWatercolorLayer extends StatelessWidget { - const StamenWatercolorLayer({Key? key}) : super(key: key); + const StamenWatercolorLayer({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/highlight_info_provider.dart b/lib/widgets/common/providers/highlight_info_provider.dart index 22889f0cc..cdcb7a980 100644 --- a/lib/widgets/common/providers/highlight_info_provider.dart +++ b/lib/widgets/common/providers/highlight_info_provider.dart @@ -6,9 +6,9 @@ class HighlightInfoProvider extends StatelessWidget { final Widget child; const HighlightInfoProvider({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/map_theme_provider.dart b/lib/widgets/common/providers/map_theme_provider.dart index c4856fb51..96a5d785a 100644 --- a/lib/widgets/common/providers/map_theme_provider.dart +++ b/lib/widgets/common/providers/map_theme_provider.dart @@ -12,7 +12,7 @@ class MapTheme extends StatelessWidget { final Widget child; const MapTheme({ - Key? key, + super.key, required this.interactive, required this.showCoordinateFilter, required this.navigationButton, @@ -20,7 +20,7 @@ class MapTheme extends StatelessWidget { this.visualDensity, this.mapHeight, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/media_query_data_provider.dart b/lib/widgets/common/providers/media_query_data_provider.dart index 302b6f8f4..71c45c4a4 100644 --- a/lib/widgets/common/providers/media_query_data_provider.dart +++ b/lib/widgets/common/providers/media_query_data_provider.dart @@ -5,9 +5,9 @@ class MediaQueryDataProvider extends StatelessWidget { final Widget child; const MediaQueryDataProvider({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/query_provider.dart b/lib/widgets/common/providers/query_provider.dart index 472d444e8..426cb7c56 100644 --- a/lib/widgets/common/providers/query_provider.dart +++ b/lib/widgets/common/providers/query_provider.dart @@ -7,10 +7,10 @@ class QueryProvider extends StatelessWidget { final Widget child; const QueryProvider({ - Key? key, + super.key, required this.initialQuery, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/selection_provider.dart b/lib/widgets/common/providers/selection_provider.dart index 5d44029cf..b1bd9b61a 100644 --- a/lib/widgets/common/providers/selection_provider.dart +++ b/lib/widgets/common/providers/selection_provider.dart @@ -6,9 +6,9 @@ class SelectionProvider extends StatelessWidget { final Widget child; const SelectionProvider({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/providers/tile_extent_controller_provider.dart b/lib/widgets/common/providers/tile_extent_controller_provider.dart index 995279d68..c2e53f309 100644 --- a/lib/widgets/common/providers/tile_extent_controller_provider.dart +++ b/lib/widgets/common/providers/tile_extent_controller_provider.dart @@ -7,10 +7,10 @@ class TileExtentControllerProvider extends StatelessWidget { final Widget child; const TileExtentControllerProvider({ - Key? key, + super.key, required this.controller, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/sliver_app_bar_title.dart b/lib/widgets/common/sliver_app_bar_title.dart index 5d4f786eb..3c04c231f 100644 --- a/lib/widgets/common/sliver_app_bar_title.dart +++ b/lib/widgets/common/sliver_app_bar_title.dart @@ -7,9 +7,9 @@ class SliverAppBarTitleWrapper extends StatelessWidget { final Widget child; const SliverAppBarTitleWrapper({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/thumbnail/decorated.dart b/lib/widgets/common/thumbnail/decorated.dart index 5c0b65f39..336a3f8c9 100644 --- a/lib/widgets/common/thumbnail/decorated.dart +++ b/lib/widgets/common/thumbnail/decorated.dart @@ -16,14 +16,14 @@ class DecoratedThumbnail extends StatelessWidget { static final double borderWidth = AvesBorder.straightBorderWidth; const DecoratedThumbnail({ - Key? key, + super.key, required this.entry, required this.tileExtent, this.cancellableNotifier, this.selectable = true, this.highlightable = true, this.heroTagger, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common/thumbnail/error.dart b/lib/widgets/common/thumbnail/error.dart index b00266454..bb6fa6000 100644 --- a/lib/widgets/common/thumbnail/error.dart +++ b/lib/widgets/common/thumbnail/error.dart @@ -12,10 +12,10 @@ class ErrorThumbnail extends StatefulWidget { final double extent; const ErrorThumbnail({ - Key? key, + super.key, required this.entry, required this.extent, - }) : super(key: key); + }); @override State createState() => _ErrorThumbnailState(); diff --git a/lib/widgets/common/thumbnail/image.dart b/lib/widgets/common/thumbnail/image.dart index 558ae4153..ae4542f72 100644 --- a/lib/widgets/common/thumbnail/image.dart +++ b/lib/widgets/common/thumbnail/image.dart @@ -26,7 +26,7 @@ class ThumbnailImage extends StatefulWidget { final Object? heroTag; const ThumbnailImage({ - Key? key, + super.key, required this.entry, required this.extent, this.progressive = true, @@ -34,7 +34,7 @@ class ThumbnailImage extends StatefulWidget { this.showLoadingBackground = true, this.cancellableNotifier, this.heroTag, - }) : super(key: key); + }); @override State createState() => _ThumbnailImageState(); diff --git a/lib/widgets/common/thumbnail/overlay.dart b/lib/widgets/common/thumbnail/overlay.dart index e6f61bf8e..393af4178 100644 --- a/lib/widgets/common/thumbnail/overlay.dart +++ b/lib/widgets/common/thumbnail/overlay.dart @@ -12,9 +12,9 @@ class ThumbnailEntryOverlay extends StatelessWidget { final AvesEntry entry; const ThumbnailEntryOverlay({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -54,9 +54,9 @@ class ThumbnailHighlightOverlay extends StatefulWidget { final AvesEntry entry; const ThumbnailHighlightOverlay({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _ThumbnailHighlightOverlayState(); diff --git a/lib/widgets/common/thumbnail/scroller.dart b/lib/widgets/common/thumbnail/scroller.dart index a74e32bf5..4c8162149 100644 --- a/lib/widgets/common/thumbnail/scroller.dart +++ b/lib/widgets/common/thumbnail/scroller.dart @@ -18,7 +18,7 @@ class ThumbnailScroller extends StatefulWidget { final bool scrollable, highlightable, showLocation; const ThumbnailScroller({ - Key? key, + super.key, required this.availableWidth, required this.entryCount, required this.entryBuilder, @@ -28,7 +28,7 @@ class ThumbnailScroller extends StatefulWidget { this.highlightable = false, this.showLocation = true, this.scrollable = true, - }) : super(key: key); + }); @override State createState() => _ThumbnailScrollerState(); diff --git a/lib/widgets/debug/android_apps.dart b/lib/widgets/debug/android_apps.dart index b82710219..af96119e2 100644 --- a/lib/widgets/debug/android_apps.dart +++ b/lib/widgets/debug/android_apps.dart @@ -8,7 +8,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; class DebugAndroidAppSection extends StatefulWidget { - const DebugAndroidAppSection({Key? key}) : super(key: key); + const DebugAndroidAppSection({super.key}); @override State createState() => _DebugAndroidAppSectionState(); diff --git a/lib/widgets/debug/android_codecs.dart b/lib/widgets/debug/android_codecs.dart index dc2c47c12..bba35f549 100644 --- a/lib/widgets/debug/android_codecs.dart +++ b/lib/widgets/debug/android_codecs.dart @@ -7,7 +7,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/material.dart'; class DebugAndroidCodecSection extends StatefulWidget { - const DebugAndroidCodecSection({Key? key}) : super(key: key); + const DebugAndroidCodecSection({super.key}); @override State createState() => _DebugAndroidCodecSectionState(); diff --git a/lib/widgets/debug/android_dirs.dart b/lib/widgets/debug/android_dirs.dart index 5b5bd1a36..fd92c851e 100644 --- a/lib/widgets/debug/android_dirs.dart +++ b/lib/widgets/debug/android_dirs.dart @@ -6,7 +6,7 @@ import 'package:aves/widgets/viewer/info/common.dart'; import 'package:flutter/material.dart'; class DebugAndroidDirSection extends StatefulWidget { - const DebugAndroidDirSection({Key? key}) : super(key: key); + const DebugAndroidDirSection({super.key}); @override State createState() => _DebugAndroidDirSectionState(); diff --git a/lib/widgets/debug/app_debug_page.dart b/lib/widgets/debug/app_debug_page.dart index 7223094ec..73cd76b09 100644 --- a/lib/widgets/debug/app_debug_page.dart +++ b/lib/widgets/debug/app_debug_page.dart @@ -31,7 +31,7 @@ import 'package:provider/provider.dart'; class AppDebugPage extends StatefulWidget { static const routeName = '/debug'; - const AppDebugPage({Key? key}) : super(key: key); + const AppDebugPage({super.key}); @override State createState() => _AppDebugPageState(); diff --git a/lib/widgets/debug/cache.dart b/lib/widgets/debug/cache.dart index 34c8c649c..1ba8e936c 100644 --- a/lib/widgets/debug/cache.dart +++ b/lib/widgets/debug/cache.dart @@ -4,7 +4,7 @@ import 'package:aves/widgets/common/identity/aves_expansion_tile.dart'; import 'package:flutter/material.dart'; class DebugCacheSection extends StatefulWidget { - const DebugCacheSection({Key? key}) : super(key: key); + const DebugCacheSection({super.key}); @override State createState() => _DebugCacheSectionState(); diff --git a/lib/widgets/debug/database.dart b/lib/widgets/debug/database.dart index 60eaad3b6..596eacdcd 100644 --- a/lib/widgets/debug/database.dart +++ b/lib/widgets/debug/database.dart @@ -11,7 +11,7 @@ import 'package:aves/widgets/common/identity/aves_expansion_tile.dart'; import 'package:flutter/material.dart'; class DebugAppDatabaseSection extends StatefulWidget { - const DebugAppDatabaseSection({Key? key}) : super(key: key); + const DebugAppDatabaseSection({super.key}); @override State createState() => _DebugAppDatabaseSectionState(); diff --git a/lib/widgets/debug/media_store_scan_dialog.dart b/lib/widgets/debug/media_store_scan_dialog.dart index a63d07202..f3c150bdc 100644 --- a/lib/widgets/debug/media_store_scan_dialog.dart +++ b/lib/widgets/debug/media_store_scan_dialog.dart @@ -6,7 +6,7 @@ import 'package:aves/widgets/dialogs/aves_dialog.dart'; import 'package:flutter/material.dart'; class MediaStoreScanDirDialog extends StatefulWidget { - const MediaStoreScanDirDialog({Key? key}) : super(key: key); + const MediaStoreScanDirDialog({super.key}); @override State createState() => _MediaStoreScanDirDialogState(); diff --git a/lib/widgets/debug/overlay.dart b/lib/widgets/debug/overlay.dart index 143a798bd..b2984037b 100644 --- a/lib/widgets/debug/overlay.dart +++ b/lib/widgets/debug/overlay.dart @@ -2,7 +2,7 @@ import 'package:aves/services/common/service_policy.dart'; import 'package:flutter/material.dart'; class DebugTaskQueueOverlay extends StatelessWidget { - const DebugTaskQueueOverlay({Key? key}) : super(key: key); + const DebugTaskQueueOverlay({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/debug/report.dart b/lib/widgets/debug/report.dart index b97df4b14..c59676c94 100644 --- a/lib/widgets/debug/report.dart +++ b/lib/widgets/debug/report.dart @@ -5,7 +5,7 @@ import 'package:aves/widgets/viewer/info/common.dart'; import 'package:flutter/material.dart'; class DebugErrorReportingSection extends StatelessWidget { - const DebugErrorReportingSection({Key? key}) : super(key: key); + const DebugErrorReportingSection({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/debug/settings.dart b/lib/widgets/debug/settings.dart index 017ad8f31..f84b1c897 100644 --- a/lib/widgets/debug/settings.dart +++ b/lib/widgets/debug/settings.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class DebugSettingsSection extends StatelessWidget { - const DebugSettingsSection({Key? key}) : super(key: key); + const DebugSettingsSection({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/debug/storage.dart b/lib/widgets/debug/storage.dart index e7c697590..8ea4ba4dc 100644 --- a/lib/widgets/debug/storage.dart +++ b/lib/widgets/debug/storage.dart @@ -6,7 +6,7 @@ import 'package:aves/widgets/viewer/info/common.dart'; import 'package:flutter/material.dart'; class DebugStorageSection extends StatefulWidget { - const DebugStorageSection({Key? key}) : super(key: key); + const DebugStorageSection({super.key}); @override State createState() => _DebugStorageSectionState(); diff --git a/lib/widgets/dialogs/add_shortcut_dialog.dart b/lib/widgets/dialogs/add_shortcut_dialog.dart index b7e8c9cff..f78cda820 100644 --- a/lib/widgets/dialogs/add_shortcut_dialog.dart +++ b/lib/widgets/dialogs/add_shortcut_dialog.dart @@ -17,10 +17,10 @@ class AddShortcutDialog extends StatefulWidget { final String defaultName; const AddShortcutDialog({ - Key? key, + super.key, required this.defaultName, this.collection, - }) : super(key: key); + }); @override State createState() => _AddShortcutDialogState(); diff --git a/lib/widgets/dialogs/app_pick_dialog.dart b/lib/widgets/dialogs/app_pick_dialog.dart index 8819fedd9..13a0e22cc 100644 --- a/lib/widgets/dialogs/app_pick_dialog.dart +++ b/lib/widgets/dialogs/app_pick_dialog.dart @@ -14,9 +14,9 @@ class AppPickDialog extends StatefulWidget { final String? initialValue; const AppPickDialog({ - Key? key, + super.key, required this.initialValue, - }) : super(key: key); + }); @override State createState() => _AppPickDialogState(); diff --git a/lib/widgets/dialogs/aves_confirmation_dialog.dart b/lib/widgets/dialogs/aves_confirmation_dialog.dart index 36f77c408..caa0ec039 100644 --- a/lib/widgets/dialogs/aves_confirmation_dialog.dart +++ b/lib/widgets/dialogs/aves_confirmation_dialog.dart @@ -83,11 +83,11 @@ class _AvesConfirmationDialog extends StatefulWidget { final String confirmationButtonLabel; const _AvesConfirmationDialog({ - Key? key, + super.key, required this.type, required this.delegate, required this.confirmationButtonLabel, - }) : super(key: key); + }); @override State<_AvesConfirmationDialog> createState() => _AvesConfirmationDialogState(); diff --git a/lib/widgets/dialogs/aves_dialog.dart b/lib/widgets/dialogs/aves_dialog.dart index 27e49752e..42a27caa8 100644 --- a/lib/widgets/dialogs/aves_dialog.dart +++ b/lib/widgets/dialogs/aves_dialog.dart @@ -17,7 +17,7 @@ class AvesDialog extends StatelessWidget { static const double borderWidth = 1.0; const AvesDialog({ - Key? key, + super.key, this.title, this.scrollController, this.scrollableContent, @@ -25,8 +25,7 @@ class AvesDialog extends StatelessWidget { this.horizontalContentPadding = defaultHorizontalContentPadding, this.content, required this.actions, - }) : assert((scrollableContent != null) ^ (content != null)), - super(key: key); + }) : assert((scrollableContent != null) ^ (content != null)); @override Widget build(BuildContext context) { @@ -120,9 +119,9 @@ class DialogTitle extends StatelessWidget { final String title; const DialogTitle({ - Key? key, + super.key, required this.title, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/dialogs/aves_selection_dialog.dart b/lib/widgets/dialogs/aves_selection_dialog.dart index 8ad80c1f2..a06c385f6 100644 --- a/lib/widgets/dialogs/aves_selection_dialog.dart +++ b/lib/widgets/dialogs/aves_selection_dialog.dart @@ -31,7 +31,7 @@ class AvesSelectionDialog extends StatefulWidget { final bool? dense; const AvesSelectionDialog({ - Key? key, + super.key, required this.initialValue, required this.options, this.optionSubtitleBuilder, @@ -39,7 +39,7 @@ class AvesSelectionDialog extends StatefulWidget { this.message, this.confirmationButtonLabel, this.dense, - }) : super(key: key); + }); @override State> createState() => _AvesSelectionDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart index 25b00d606..749d0054c 100644 --- a/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart @@ -21,10 +21,10 @@ class EditEntryDateDialog extends StatefulWidget { final CollectionLens? collection; const EditEntryDateDialog({ - Key? key, + super.key, required this.entry, this.collection, - }) : super(key: key); + }); @override State createState() => _EditEntryDateDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart index 79e9fd0e0..649052d67 100644 --- a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart @@ -15,10 +15,10 @@ class EditEntryLocationDialog extends StatefulWidget { final CollectionLens? collection; const EditEntryLocationDialog({ - Key? key, + super.key, required this.entry, this.collection, - }) : super(key: key); + }); @override State createState() => _EditEntryLocationDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart index 275aab264..49c848423 100644 --- a/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart @@ -9,9 +9,9 @@ class EditEntryRatingDialog extends StatefulWidget { final AvesEntry entry; const EditEntryRatingDialog({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _EditEntryRatingDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart index 09ee22b97..0e9be4233 100644 --- a/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart @@ -19,9 +19,9 @@ class TagEditorPage extends StatefulWidget { final Map> tagsByEntry; const TagEditorPage({ - Key? key, + super.key, required this.tagsByEntry, - }) : super(key: key); + }); @override State createState() => _TagEditorPageState(); @@ -229,12 +229,12 @@ class _FilterRow extends StatelessWidget { final void Function(String tag) onTap; const _FilterRow({ - Key? key, + super.key, required this.title, required this.filters, required this.expandedNotifier, required this.onTap, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -255,9 +255,9 @@ class _TagCount extends StatelessWidget { final int count; const _TagCount({ - Key? key, + super.key, required this.count, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart b/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart index ec9c74360..1cb08eec6 100644 --- a/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart @@ -17,9 +17,9 @@ class RemoveEntryMetadataDialog extends StatefulWidget { final bool showJpegTypes; const RemoveEntryMetadataDialog({ - Key? key, + super.key, required this.showJpegTypes, - }) : super(key: key); + }); @override State createState() => _RemoveEntryMetadataDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/rename_entry_dialog.dart b/lib/widgets/dialogs/entry_editors/rename_entry_dialog.dart index b3c5875a2..b68aa54d2 100644 --- a/lib/widgets/dialogs/entry_editors/rename_entry_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/rename_entry_dialog.dart @@ -12,9 +12,9 @@ class RenameEntryDialog extends StatefulWidget { final AvesEntry entry; const RenameEntryDialog({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _RenameEntryDialogState(); diff --git a/lib/widgets/dialogs/entry_editors/rename_entry_set_dialog.dart b/lib/widgets/dialogs/entry_editors/rename_entry_set_dialog.dart index fd749797b..df9beaa39 100644 --- a/lib/widgets/dialogs/entry_editors/rename_entry_set_dialog.dart +++ b/lib/widgets/dialogs/entry_editors/rename_entry_set_dialog.dart @@ -23,9 +23,9 @@ class RenameEntrySetPage extends StatefulWidget { final List entries; const RenameEntrySetPage({ - Key? key, + super.key, required this.entries, - }) : super(key: key); + }); @override State createState() => _RenameEntrySetPageState(); diff --git a/lib/widgets/dialogs/export_entry_dialog.dart b/lib/widgets/dialogs/export_entry_dialog.dart index 8f5ded8e9..6ef6d5787 100644 --- a/lib/widgets/dialogs/export_entry_dialog.dart +++ b/lib/widgets/dialogs/export_entry_dialog.dart @@ -11,9 +11,9 @@ class ExportEntryDialog extends StatefulWidget { final AvesEntry entry; const ExportEntryDialog({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _ExportEntryDialogState(); diff --git a/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart b/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart index 057eb3346..c46f34f3d 100644 --- a/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart +++ b/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart @@ -28,12 +28,12 @@ class CoverSelectionDialog extends StatefulWidget { final Color? customColor; const CoverSelectionDialog({ - Key? key, + super.key, required this.filter, required this.customEntry, required this.customPackage, required this.customColor, - }) : super(key: key); + }); @override State createState() => _CoverSelectionDialogState(); diff --git a/lib/widgets/dialogs/filter_editors/create_album_dialog.dart b/lib/widgets/dialogs/filter_editors/create_album_dialog.dart index ba5ffc5f1..89312f415 100644 --- a/lib/widgets/dialogs/filter_editors/create_album_dialog.dart +++ b/lib/widgets/dialogs/filter_editors/create_album_dialog.dart @@ -10,7 +10,7 @@ import 'package:flutter/material.dart'; import '../aves_dialog.dart'; class CreateAlbumDialog extends StatefulWidget { - const CreateAlbumDialog({Key? key}) : super(key: key); + const CreateAlbumDialog({super.key}); @override State createState() => _CreateAlbumDialogState(); diff --git a/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart b/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart index 525fb8ff4..f270af325 100644 --- a/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart +++ b/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart @@ -9,9 +9,9 @@ class RenameAlbumDialog extends StatefulWidget { final String album; const RenameAlbumDialog({ - Key? key, + super.key, required this.album, - }) : super(key: key); + }); @override State createState() => _RenameAlbumDialogState(); diff --git a/lib/widgets/dialogs/item_pick_dialog.dart b/lib/widgets/dialogs/item_pick_dialog.dart index 184187a04..dfb5ab706 100644 --- a/lib/widgets/dialogs/item_pick_dialog.dart +++ b/lib/widgets/dialogs/item_pick_dialog.dart @@ -18,9 +18,9 @@ class ItemPickDialog extends StatefulWidget { final CollectionLens collection; const ItemPickDialog({ - Key? key, + super.key, required this.collection, - }) : super(key: key); + }); @override State createState() => _ItemPickDialogState(); diff --git a/lib/widgets/dialogs/item_picker.dart b/lib/widgets/dialogs/item_picker.dart index b70d7ecc9..2c5c2631d 100644 --- a/lib/widgets/dialogs/item_picker.dart +++ b/lib/widgets/dialogs/item_picker.dart @@ -13,11 +13,11 @@ class ItemPicker extends StatelessWidget { final GestureTapCallback? onTap; const ItemPicker({ - Key? key, + super.key, required this.extent, required this.entry, this.onTap, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/dialogs/location_pick_dialog.dart b/lib/widgets/dialogs/location_pick_dialog.dart index a0d446753..fccc58738 100644 --- a/lib/widgets/dialogs/location_pick_dialog.dart +++ b/lib/widgets/dialogs/location_pick_dialog.dart @@ -29,10 +29,10 @@ class LocationPickDialog extends StatelessWidget { final LatLng? initialLocation; const LocationPickDialog({ - Key? key, + super.key, required this.collection, required this.initialLocation, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -58,10 +58,10 @@ class _Content extends StatefulWidget { final LatLng? initialLocation; const _Content({ - Key? key, + super.key, required this.collection, required this.initialLocation, - }) : super(key: key); + }); @override State<_Content> createState() => _ContentState(); @@ -178,9 +178,9 @@ class _LocationInfo extends StatelessWidget { static const double _interRowPadding = 2.0; const _LocationInfo({ - Key? key, + super.key, required this.locationNotifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -230,9 +230,9 @@ class _AddressRow extends StatefulWidget { final LatLng? location; const _AddressRow({ - Key? key, + super.key, required this.location, - }) : super(key: key); + }); @override State<_AddressRow> createState() => _AddressRowState(); @@ -312,9 +312,9 @@ class _CoordinateRow extends StatelessWidget { final LatLng? location; const _CoordinateRow({ - Key? key, + super.key, required this.location, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/dialogs/tile_view_dialog.dart b/lib/widgets/dialogs/tile_view_dialog.dart index 3bb272948..b43715f13 100644 --- a/lib/widgets/dialogs/tile_view_dialog.dart +++ b/lib/widgets/dialogs/tile_view_dialog.dart @@ -16,12 +16,12 @@ class TileViewDialog extends StatefulWidget { final Map layoutOptions; const TileViewDialog({ - Key? key, + super.key, required this.initialValue, this.sortOptions = const {}, this.groupOptions = const {}, this.layoutOptions = const {}, - }) : super(key: key); + }); @override State createState() => _TileViewDialogState(); diff --git a/lib/widgets/dialogs/video_speed_dialog.dart b/lib/widgets/dialogs/video_speed_dialog.dart index a61a53d86..4b44b8cb9 100644 --- a/lib/widgets/dialogs/video_speed_dialog.dart +++ b/lib/widgets/dialogs/video_speed_dialog.dart @@ -7,11 +7,11 @@ class VideoSpeedDialog extends StatefulWidget { final double current, min, max; const VideoSpeedDialog({ - Key? key, + super.key, required this.current, required this.min, required this.max, - }) : super(key: key); + }); @override State createState() => _VideoSpeedDialogState(); diff --git a/lib/widgets/dialogs/video_stream_selection_dialog.dart b/lib/widgets/dialogs/video_stream_selection_dialog.dart index 106f00ae5..87f5e8435 100644 --- a/lib/widgets/dialogs/video_stream_selection_dialog.dart +++ b/lib/widgets/dialogs/video_stream_selection_dialog.dart @@ -13,9 +13,9 @@ class VideoStreamSelectionDialog extends StatefulWidget { final Map streams; const VideoStreamSelectionDialog({ - Key? key, + super.key, required this.streams, - }) : super(key: key); + }); @override State createState() => _VideoStreamSelectionDialogState(); diff --git a/lib/widgets/filter_grids/album_pick.dart b/lib/widgets/filter_grids/album_pick.dart index ccdcee07c..702f5f93f 100644 --- a/lib/widgets/filter_grids/album_pick.dart +++ b/lib/widgets/filter_grids/album_pick.dart @@ -52,10 +52,10 @@ class _AlbumPickPage extends StatefulWidget { final MoveType? moveType; const _AlbumPickPage({ - Key? key, + super.key, required this.source, required this.moveType, - }) : super(key: key); + }); @override State<_AlbumPickPage> createState() => _AlbumPickPageState(); @@ -122,12 +122,12 @@ class _AlbumPickAppBar extends StatelessWidget { static const preferredHeight = kToolbarHeight + _AlbumQueryBar.preferredHeight; const _AlbumPickAppBar({ - Key? key, + super.key, required this.source, required this.moveType, required this.actionDelegate, required this.queryNotifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -207,9 +207,9 @@ class _AlbumQueryBar extends StatelessWidget implements PreferredSizeWidget { static const preferredHeight = kToolbarHeight; const _AlbumQueryBar({ - Key? key, + super.key, required this.queryNotifier, - }) : super(key: key); + }); @override Size get preferredSize => const Size.fromHeight(preferredHeight); diff --git a/lib/widgets/filter_grids/albums_page.dart b/lib/widgets/filter_grids/albums_page.dart index f44836da6..9ebb50c89 100644 --- a/lib/widgets/filter_grids/albums_page.dart +++ b/lib/widgets/filter_grids/albums_page.dart @@ -20,7 +20,7 @@ import 'package:tuple/tuple.dart'; class AlbumListPage extends StatelessWidget { static const routeName = '/albums'; - const AlbumListPage({Key? key}) : super(key: key); + const AlbumListPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/app_bar.dart b/lib/widgets/filter_grids/common/app_bar.dart index 2ef0990ef..104f54d1f 100644 --- a/lib/widgets/filter_grids/common/app_bar.dart +++ b/lib/widgets/filter_grids/common/app_bar.dart @@ -22,12 +22,12 @@ class FilterGridAppBar extends StatefulWidget { final bool isEmpty; const FilterGridAppBar({ - Key? key, + super.key, required this.source, required this.title, required this.actionDelegate, required this.isEmpty, - }) : super(key: key); + }); @override State> createState() => _FilterGridAppBarState(); diff --git a/lib/widgets/filter_grids/common/covered_filter_chip.dart b/lib/widgets/filter_grids/common/covered_filter_chip.dart index c1b161dd0..75139d5dd 100644 --- a/lib/widgets/filter_grids/common/covered_filter_chip.dart +++ b/lib/widgets/filter_grids/common/covered_filter_chip.dart @@ -28,7 +28,7 @@ class CoveredFilterChip extends StatelessWidget { final HeroType heroType; const CoveredFilterChip({ - Key? key, + super.key, required this.filter, required this.extent, double? thumbnailExtent, @@ -38,8 +38,7 @@ class CoveredFilterChip extends StatelessWidget { this.banner, this.onTap, this.heroType = HeroType.onTap, - }) : thumbnailExtent = thumbnailExtent ?? extent, - super(key: key); + }) : thumbnailExtent = thumbnailExtent ?? extent; static double tileHeight({required double extent, required double textScaleFactor, required bool showText}) { return extent + infoHeight(extent: extent, textScaleFactor: textScaleFactor, showText: showText); diff --git a/lib/widgets/filter_grids/common/draggable_thumb_label.dart b/lib/widgets/filter_grids/common/draggable_thumb_label.dart index 433c54867..5276ac819 100644 --- a/lib/widgets/filter_grids/common/draggable_thumb_label.dart +++ b/lib/widgets/filter_grids/common/draggable_thumb_label.dart @@ -11,10 +11,10 @@ class FilterDraggableThumbLabel extends StatelessWid final double offsetY; const FilterDraggableThumbLabel({ - Key? key, + super.key, required this.sortFactor, required this.offsetY, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/filter_chip_grid_decorator.dart b/lib/widgets/filter_grids/common/filter_chip_grid_decorator.dart index 1f6d68cea..1ed8368c2 100644 --- a/lib/widgets/filter_grids/common/filter_chip_grid_decorator.dart +++ b/lib/widgets/filter_grids/common/filter_chip_grid_decorator.dart @@ -11,13 +11,13 @@ class FilterChipGridDecorator extends StatelessWidget { final StreamController _draggableScrollBarEventStreamController = StreamController.broadcast(); FilterGridPage({ - Key? key, + super.key, this.settingsRouteKey, required this.appBar, this.appBarHeight = kToolbarHeight, @@ -68,7 +68,7 @@ class FilterGridPage extends StatelessWidget { this.applyQuery, required this.emptyBuilder, required this.heroType, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -145,7 +145,7 @@ class FilterGrid extends StatefulWidget { final HeroType heroType; const FilterGrid({ - Key? key, + super.key, required this.settingsRouteKey, required this.appBar, required this.appBarHeight, @@ -158,7 +158,7 @@ class FilterGrid extends StatefulWidget { required this.applyQuery, required this.emptyBuilder, required this.heroType, - }) : super(key: key); + }); @override State> createState() => _FilterGridState(); @@ -216,7 +216,7 @@ class _FilterGridContent extends StatelessWidget { final ValueNotifier _appBarHeightNotifier = ValueNotifier(0); _FilterGridContent({ - Key? key, + super.key, required this.appBar, required double appBarHeight, required this.sections, @@ -228,7 +228,7 @@ class _FilterGridContent extends StatelessWidget { required this.applyQuery, required this.emptyBuilder, required this.heroType, - }) : super(key: key) { + }) { _appBarHeightNotifier.value = appBarHeight; } diff --git a/lib/widgets/filter_grids/common/filter_nav_page.dart b/lib/widgets/filter_grids/common/filter_nav_page.dart index 9746f1c1a..4110b19b1 100644 --- a/lib/widgets/filter_grids/common/filter_nav_page.dart +++ b/lib/widgets/filter_grids/common/filter_nav_page.dart @@ -21,7 +21,7 @@ class FilterNavigationPage extends StatelessWidget { final Widget Function() emptyBuilder; const FilterNavigationPage({ - Key? key, + super.key, required this.source, required this.title, required this.sortFactor, @@ -30,7 +30,7 @@ class FilterNavigationPage extends StatelessWidget { required this.filterSections, this.newFilters, required this.emptyBuilder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/filter_tile.dart b/lib/widgets/filter_grids/common/filter_tile.dart index 47b732f9b..71b668f17 100644 --- a/lib/widgets/filter_grids/common/filter_tile.dart +++ b/lib/widgets/filter_grids/common/filter_tile.dart @@ -22,14 +22,14 @@ class InteractiveFilterTile extends StatefulWidget { final HeroType heroType; const InteractiveFilterTile({ - Key? key, + super.key, required this.gridItem, required this.chipExtent, required this.thumbnailExtent, required this.tileLayout, this.banner, required this.heroType, - }) : super(key: key); + }); @override State> createState() => _InteractiveFilterTileState(); @@ -113,7 +113,7 @@ class FilterTile extends StatelessWidget { final HeroType heroType; const FilterTile({ - Key? key, + super.key, required this.gridItem, required this.chipExtent, required this.thumbnailExtent, @@ -123,7 +123,7 @@ class FilterTile extends StatelessWidget { this.highlightable = false, this.onTap, this.heroType = HeroType.never, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/list_details.dart b/lib/widgets/filter_grids/common/list_details.dart index f7605a8ec..3a7678d38 100644 --- a/lib/widgets/filter_grids/common/list_details.dart +++ b/lib/widgets/filter_grids/common/list_details.dart @@ -22,10 +22,10 @@ class FilterListDetails extends StatelessWidget { AvesEntry? get entry => gridItem.entry; const FilterListDetails({ - Key? key, + super.key, required this.gridItem, required this.pinned, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/list_details_theme.dart b/lib/widgets/filter_grids/common/list_details_theme.dart index 894d160b5..1c0218661 100644 --- a/lib/widgets/filter_grids/common/list_details_theme.dart +++ b/lib/widgets/filter_grids/common/list_details_theme.dart @@ -18,10 +18,10 @@ class FilterListDetailsTheme extends StatelessWidget { static const double titleDetailPadding = 6; const FilterListDetailsTheme({ - Key? key, + super.key, required this.extent, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/overlay.dart b/lib/widgets/filter_grids/common/overlay.dart index 48651e9a7..1e479a9d8 100644 --- a/lib/widgets/filter_grids/common/overlay.dart +++ b/lib/widgets/filter_grids/common/overlay.dart @@ -12,11 +12,11 @@ class ChipHighlightOverlay extends StatefulWidget { final BorderRadius borderRadius; const ChipHighlightOverlay({ - Key? key, + super.key, required this.filter, required this.extent, required this.borderRadius, - }) : super(key: key); + }); @override State createState() => _ChipHighlightOverlayState(); diff --git a/lib/widgets/filter_grids/common/section_header.dart b/lib/widgets/filter_grids/common/section_header.dart index 4f83005ea..2ec5d7107 100644 --- a/lib/widgets/filter_grids/common/section_header.dart +++ b/lib/widgets/filter_grids/common/section_header.dart @@ -6,9 +6,9 @@ class FilterChipSectionHeader extends StatelessWidget { final ChipSectionKey sectionKey; const FilterChipSectionHeader({ - Key? key, + super.key, required this.sectionKey, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/common/section_layout.dart b/lib/widgets/filter_grids/common/section_layout.dart index 3e12913b5..832078152 100644 --- a/lib/widgets/filter_grids/common/section_layout.dart +++ b/lib/widgets/filter_grids/common/section_layout.dart @@ -1,5 +1,4 @@ import 'package:aves/model/filters/filters.dart'; -import 'package:aves/model/source/enums.dart'; import 'package:aves/model/source/section_keys.dart'; import 'package:aves/widgets/common/grid/section_layout.dart'; import 'package:aves/widgets/filter_grids/common/section_header.dart'; @@ -8,32 +7,20 @@ import 'package:flutter/material.dart'; class SectionedFilterListLayoutProvider extends SectionedListLayoutProvider> { const SectionedFilterListLayoutProvider({ - Key? key, + super.key, required this.sections, required this.showHeaders, - required double scrollableWidth, - required TileLayout tileLayout, - required int columnCount, - required double spacing, - required double horizontalPadding, - required double tileWidth, - required double tileHeight, - required Widget Function(FilterGridItem gridItem) tileBuilder, - required Duration tileAnimationDelay, - required Widget child, - }) : super( - key: key, - scrollableWidth: scrollableWidth, - tileLayout: tileLayout, - columnCount: columnCount, - spacing: spacing, - horizontalPadding: horizontalPadding, - tileWidth: tileWidth, - tileHeight: tileHeight, - tileBuilder: tileBuilder, - tileAnimationDelay: tileAnimationDelay, - child: child, - ); + required super.scrollableWidth, + required super.tileLayout, + required super.columnCount, + required super.spacing, + required super.horizontalPadding, + required super.tileWidth, + required super.tileHeight, + required super.tileBuilder, + required super.tileAnimationDelay, + required super.child, + }); @override final Map>> sections; diff --git a/lib/widgets/filter_grids/countries_page.dart b/lib/widgets/filter_grids/countries_page.dart index e99a2f05a..a3da3c50b 100644 --- a/lib/widgets/filter_grids/countries_page.dart +++ b/lib/widgets/filter_grids/countries_page.dart @@ -18,7 +18,7 @@ import 'package:tuple/tuple.dart'; class CountryListPage extends StatelessWidget { static const routeName = '/countries'; - const CountryListPage({Key? key}) : super(key: key); + const CountryListPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/filter_grids/tags_page.dart b/lib/widgets/filter_grids/tags_page.dart index 92220bbc8..89091a2ff 100644 --- a/lib/widgets/filter_grids/tags_page.dart +++ b/lib/widgets/filter_grids/tags_page.dart @@ -18,7 +18,7 @@ import 'package:tuple/tuple.dart'; class TagListPage extends StatelessWidget { static const routeName = '/tags'; - const TagListPage({Key? key}) : super(key: key); + const TagListPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index 69d603cb9..f605a1bc4 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -34,9 +34,9 @@ class HomePage extends StatefulWidget { final Map? intentData; const HomePage({ - Key? key, + super.key, this.intentData, - }) : super(key: key); + }); @override State createState() => _HomePageState(); diff --git a/lib/widgets/map/map_info_row.dart b/lib/widgets/map/map_info_row.dart index 1dd83b1d9..327440fce 100644 --- a/lib/widgets/map/map_info_row.dart +++ b/lib/widgets/map/map_info_row.dart @@ -20,9 +20,9 @@ class MapInfoRow extends StatelessWidget { static const double _interRowPadding = 2.0; const MapInfoRow({ - Key? key, + super.key, required this.entryNotifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -72,9 +72,9 @@ class _AddressRow extends StatefulWidget { final AvesEntry? entry; const _AddressRow({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State<_AddressRow> createState() => _AddressRowState(); @@ -161,9 +161,9 @@ class _DateRow extends StatelessWidget { final AvesEntry? entry; const _DateRow({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/map/map_page.dart b/lib/widgets/map/map_page.dart index 51eee4b7b..f242a546b 100644 --- a/lib/widgets/map/map_page.dart +++ b/lib/widgets/map/map_page.dart @@ -39,11 +39,11 @@ class MapPage extends StatelessWidget { final MappedGeoTiff? overlayEntry; const MapPage({ - Key? key, + super.key, required this.collection, this.initialEntry, this.overlayEntry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -76,11 +76,11 @@ class _Content extends StatefulWidget { final MappedGeoTiff? overlayEntry; const _Content({ - Key? key, + super.key, required this.collection, this.initialEntry, this.overlayEntry, - }) : super(key: key); + }); @override State<_Content> createState() => _ContentState(); diff --git a/lib/widgets/navigation/drawer/app_drawer.dart b/lib/widgets/navigation/drawer/app_drawer.dart index ba64657a7..559593d15 100644 --- a/lib/widgets/navigation/drawer/app_drawer.dart +++ b/lib/widgets/navigation/drawer/app_drawer.dart @@ -34,9 +34,9 @@ class AppDrawer extends StatefulWidget { final CollectionLens? currentCollection; const AppDrawer({ - Key? key, + super.key, this.currentCollection, - }) : super(key: key); + }); @override State createState() => _AppDrawerState(); diff --git a/lib/widgets/navigation/drawer/collection_nav_tile.dart b/lib/widgets/navigation/drawer/collection_nav_tile.dart index 42642d9ef..968b7df6f 100644 --- a/lib/widgets/navigation/drawer/collection_nav_tile.dart +++ b/lib/widgets/navigation/drawer/collection_nav_tile.dart @@ -18,15 +18,14 @@ class CollectionNavTile extends StatelessWidget { final bool Function() isSelected; const CollectionNavTile({ - Key? key, + super.key, required this.leading, required this.title, this.trailing, bool? dense, required this.filter, required this.isSelected, - }) : dense = dense ?? false, - super(key: key); + }) : dense = dense ?? false; @override Widget build(BuildContext context) { @@ -78,10 +77,10 @@ class AlbumNavTile extends StatelessWidget { final bool Function() isSelected; const AlbumNavTile({ - Key? key, + super.key, required this.album, required this.isSelected, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/navigation/drawer/page_nav_tile.dart b/lib/widgets/navigation/drawer/page_nav_tile.dart index 319462f63..e72b6d780 100644 --- a/lib/widgets/navigation/drawer/page_nav_tile.dart +++ b/lib/widgets/navigation/drawer/page_nav_tile.dart @@ -9,12 +9,12 @@ class PageNavTile extends StatelessWidget { final WidgetBuilder? pageBuilder; const PageNavTile({ - Key? key, + super.key, this.trailing, this.topLevel = true, required this.routeName, required this.pageBuilder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/navigation/drawer/tile.dart b/lib/widgets/navigation/drawer/tile.dart index 7294a4034..89eb9caaf 100644 --- a/lib/widgets/navigation/drawer/tile.dart +++ b/lib/widgets/navigation/drawer/tile.dart @@ -12,9 +12,9 @@ class DrawerFilterIcon extends StatelessWidget { final CollectionFilter? filter; const DrawerFilterIcon({ - Key? key, + super.key, required this.filter, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -31,9 +31,9 @@ class DrawerFilterTitle extends StatelessWidget { final CollectionFilter? filter; const DrawerFilterTitle({ - Key? key, + super.key, required this.filter, - }) : super(key: key); + }); @override Widget build(BuildContext context) => Text(NavigationDisplay.getFilterTitle(context, filter)); @@ -43,9 +43,9 @@ class DrawerPageIcon extends StatelessWidget { final String route; const DrawerPageIcon({ - Key? key, + super.key, required this.route, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -72,9 +72,9 @@ class DrawerPageTitle extends StatelessWidget { final String route; const DrawerPageTitle({ - Key? key, + super.key, required this.route, - }) : super(key: key); + }); @override Widget build(BuildContext context) => Text(NavigationDisplay.getPageTitle(context, route)); diff --git a/lib/widgets/navigation/nav_bar/floating.dart b/lib/widgets/navigation/nav_bar/floating.dart index bde4d318f..f4df637e2 100644 --- a/lib/widgets/navigation/nav_bar/floating.dart +++ b/lib/widgets/navigation/nav_bar/floating.dart @@ -9,11 +9,11 @@ class FloatingNavBar extends StatefulWidget { final Widget child; const FloatingNavBar({ - Key? key, + super.key, required this.scrollController, required this.events, required this.child, - }) : super(key: key); + }); @override State createState() => _FloatingNavBarState(); diff --git a/lib/widgets/navigation/nav_bar/nav_bar.dart b/lib/widgets/navigation/nav_bar/nav_bar.dart index 0c98b61a0..e3275a9d0 100644 --- a/lib/widgets/navigation/nav_bar/nav_bar.dart +++ b/lib/widgets/navigation/nav_bar/nav_bar.dart @@ -21,10 +21,10 @@ class AppBottomNavBar extends StatelessWidget { final CollectionLens? currentCollection; const AppBottomNavBar({ - Key? key, + super.key, required this.events, this.currentCollection, - }) : super(key: key); + }); static const padding = EdgeInsets.all(8); @@ -127,7 +127,7 @@ class AppBottomNavBar extends StatelessWidget { } class NavBarPaddingSliver extends StatelessWidget { - const NavBarPaddingSliver({Key? key}) : super(key: key); + const NavBarPaddingSliver({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/search/search_page.dart b/lib/widgets/search/search_page.dart index 801e132a4..937eba50c 100644 --- a/lib/widgets/search/search_page.dart +++ b/lib/widgets/search/search_page.dart @@ -13,10 +13,10 @@ class SearchPage extends StatefulWidget { final Animation animation; const SearchPage({ - Key? key, + super.key, required this.delegate, required this.animation, - }) : super(key: key); + }); @override State createState() => _SearchPageState(); diff --git a/lib/widgets/settings/accessibility/time_to_take_action.dart b/lib/widgets/settings/accessibility/time_to_take_action.dart index 79db20731..49ffe3a90 100644 --- a/lib/widgets/settings/accessibility/time_to_take_action.dart +++ b/lib/widgets/settings/accessibility/time_to_take_action.dart @@ -7,7 +7,7 @@ import 'package:aves/widgets/settings/common/tiles.dart'; import 'package:flutter/material.dart'; class TimeToTakeActionTile extends StatefulWidget { - const TimeToTakeActionTile({Key? key}) : super(key: key); + const TimeToTakeActionTile({super.key}); @override State createState() => _TimeToTakeActionTileState(); diff --git a/lib/widgets/settings/app_export/selection_dialog.dart b/lib/widgets/settings/app_export/selection_dialog.dart index 34cea2020..986b83603 100644 --- a/lib/widgets/settings/app_export/selection_dialog.dart +++ b/lib/widgets/settings/app_export/selection_dialog.dart @@ -8,11 +8,11 @@ class AppExportItemSelectionDialog extends StatefulWidget { final Set? selectableItems, initialSelection; const AppExportItemSelectionDialog({ - Key? key, + super.key, required this.title, this.selectableItems, this.initialSelection, - }) : super(key: key); + }); @override State createState() => _AppExportItemSelectionDialogState(); diff --git a/lib/widgets/settings/common/quick_actions/action_button.dart b/lib/widgets/settings/common/quick_actions/action_button.dart index a941a1951..9e43a23d6 100644 --- a/lib/widgets/settings/common/quick_actions/action_button.dart +++ b/lib/widgets/settings/common/quick_actions/action_button.dart @@ -7,12 +7,12 @@ class ActionButton extends StatelessWidget { final bool enabled, showCaption; const ActionButton({ - Key? key, + super.key, required this.text, required this.icon, this.enabled = true, this.showCaption = true, - }) : super(key: key); + }); static const padding = 8.0; diff --git a/lib/widgets/settings/common/quick_actions/action_panel.dart b/lib/widgets/settings/common/quick_actions/action_panel.dart index a107fe87d..d2b9cd621 100644 --- a/lib/widgets/settings/common/quick_actions/action_panel.dart +++ b/lib/widgets/settings/common/quick_actions/action_panel.dart @@ -6,10 +6,10 @@ class ActionPanel extends StatelessWidget { final Widget child; const ActionPanel({ - Key? key, + super.key, this.highlight = false, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/common/quick_actions/available_actions.dart b/lib/widgets/settings/common/quick_actions/available_actions.dart index bfa5bc6a1..307ba6fb3 100644 --- a/lib/widgets/settings/common/quick_actions/available_actions.dart +++ b/lib/widgets/settings/common/quick_actions/available_actions.dart @@ -16,7 +16,7 @@ class AvailableActionPanel extends StatelessWidget { final String Function(BuildContext context, T action) actionText; const AvailableActionPanel({ - Key? key, + super.key, required this.allActions, required this.quickActions, required this.quickActionsChangeNotifier, @@ -26,7 +26,7 @@ class AvailableActionPanel extends StatelessWidget { required this.removeQuickAction, required this.actionIcon, required this.actionText, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/common/quick_actions/editor_page.dart b/lib/widgets/settings/common/quick_actions/editor_page.dart index a5cf517ac..5195e25fb 100644 --- a/lib/widgets/settings/common/quick_actions/editor_page.dart +++ b/lib/widgets/settings/common/quick_actions/editor_page.dart @@ -24,7 +24,7 @@ class QuickActionEditorPage extends StatelessWidget { final void Function(List actions) save; const QuickActionEditorPage({ - Key? key, + super.key, required this.title, required this.bannerText, required this.allAvailableActions, @@ -32,7 +32,7 @@ class QuickActionEditorPage extends StatelessWidget { required this.actionText, required this.load, required this.save, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -65,14 +65,14 @@ class QuickActionEditorBody extends StatefulWidget { final void Function(List actions) save; const QuickActionEditorBody({ - Key? key, + super.key, required this.bannerText, required this.allAvailableActions, required this.actionIcon, required this.actionText, required this.load, required this.save, - }) : super(key: key); + }); @override State> createState() => _QuickActionEditorBodyState(); diff --git a/lib/widgets/settings/common/quick_actions/placeholder.dart b/lib/widgets/settings/common/quick_actions/placeholder.dart index 063751754..8024dccd3 100644 --- a/lib/widgets/settings/common/quick_actions/placeholder.dart +++ b/lib/widgets/settings/common/quick_actions/placeholder.dart @@ -4,9 +4,9 @@ class DraggedPlaceholder extends StatelessWidget { final Widget child; const DraggedPlaceholder({ - Key? key, + super.key, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/common/quick_actions/quick_actions.dart b/lib/widgets/settings/common/quick_actions/quick_actions.dart index 5e351048b..5cee3a46b 100644 --- a/lib/widgets/settings/common/quick_actions/quick_actions.dart +++ b/lib/widgets/settings/common/quick_actions/quick_actions.dart @@ -17,7 +17,7 @@ class QuickActionButton extends StatelessWidget { final Widget? child; const QuickActionButton({ - Key? key, + super.key, required this.placement, this.action, required this.panelHighlight, @@ -28,7 +28,7 @@ class QuickActionButton extends StatelessWidget { required this.onTargetLeave, this.draggableFeedbackBuilder, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/common/tile_leading.dart b/lib/widgets/settings/common/tile_leading.dart index 45f1140cd..1cb7f3a06 100644 --- a/lib/widgets/settings/common/tile_leading.dart +++ b/lib/widgets/settings/common/tile_leading.dart @@ -9,10 +9,10 @@ class SettingsTileLeading extends StatelessWidget { final Color color; const SettingsTileLeading({ - Key? key, + super.key, required this.icon, required this.color, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/common/tiles.dart b/lib/widgets/settings/common/tiles.dart index 14c4a3798..d12564118 100644 --- a/lib/widgets/settings/common/tiles.dart +++ b/lib/widgets/settings/common/tiles.dart @@ -9,11 +9,11 @@ class SettingsSubPageTile extends StatelessWidget { final WidgetBuilder builder; const SettingsSubPageTile({ - Key? key, + super.key, required this.title, required this.routeName, required this.builder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -40,13 +40,13 @@ class SettingsSwitchListTile extends StatelessWidget { final Widget? trailing; const SettingsSwitchListTile({ - Key? key, + super.key, required this.selector, required this.onChanged, required this.title, this.subtitle, this.trailing, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -86,7 +86,7 @@ class SettingsSelectionListTile extends StatelessWidget { final TextBuilder? optionSubtitleBuilder; const SettingsSelectionListTile({ - Key? key, + super.key, required this.values, required this.getName, required this.selector, @@ -94,7 +94,7 @@ class SettingsSelectionListTile extends StatelessWidget { required this.tileTitle, required this.dialogTitle, this.optionSubtitleBuilder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/language/locale.dart b/lib/widgets/settings/language/locale.dart index ca5340d19..882c54f9c 100644 --- a/lib/widgets/settings/language/locale.dart +++ b/lib/widgets/settings/language/locale.dart @@ -15,7 +15,7 @@ import 'package:provider/provider.dart'; class LocaleTile extends StatelessWidget { static const systemLocaleOption = Locale('system'); - const LocaleTile({Key? key}) : super(key: key); + const LocaleTile({super.key}); @override Widget build(BuildContext context) { @@ -56,7 +56,7 @@ class LocaleTile extends StatelessWidget { class LocaleSelectionPage extends StatefulWidget { static const routeName = '/settings/locale'; - const LocaleSelectionPage({Key? key}) : super(key: key); + const LocaleSelectionPage({super.key}); @override State createState() => _LocaleSelectionPageState(); diff --git a/lib/widgets/settings/navigation/confirmation_dialogs.dart b/lib/widgets/settings/navigation/confirmation_dialogs.dart index 4a09173f0..970d9cfe3 100644 --- a/lib/widgets/settings/navigation/confirmation_dialogs.dart +++ b/lib/widgets/settings/navigation/confirmation_dialogs.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; class ConfirmationDialogPage extends StatelessWidget { static const routeName = '/settings/navigation_confirmation'; - const ConfirmationDialogPage({Key? key}) : super(key: key); + const ConfirmationDialogPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/navigation/drawer.dart b/lib/widgets/settings/navigation/drawer.dart index 658b4357d..e3dfe27d8 100644 --- a/lib/widgets/settings/navigation/drawer.dart +++ b/lib/widgets/settings/navigation/drawer.dart @@ -16,7 +16,7 @@ import 'package:tuple/tuple.dart'; class NavigationDrawerEditorPage extends StatefulWidget { static const routeName = '/settings/navigation_drawer'; - const NavigationDrawerEditorPage({Key? key}) : super(key: key); + const NavigationDrawerEditorPage({super.key}); @override State createState() => _NavigationDrawerEditorPageState(); diff --git a/lib/widgets/settings/navigation/drawer_editor_banner.dart b/lib/widgets/settings/navigation/drawer_editor_banner.dart index 3ae27aee6..bd74132bf 100644 --- a/lib/widgets/settings/navigation/drawer_editor_banner.dart +++ b/lib/widgets/settings/navigation/drawer_editor_banner.dart @@ -3,7 +3,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:flutter/material.dart'; class DrawerEditorBanner extends StatelessWidget { - const DrawerEditorBanner({Key? key}) : super(key: key); + const DrawerEditorBanner({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/navigation/drawer_tab_albums.dart b/lib/widgets/settings/navigation/drawer_tab_albums.dart index 89a8780fe..2708ef157 100644 --- a/lib/widgets/settings/navigation/drawer_tab_albums.dart +++ b/lib/widgets/settings/navigation/drawer_tab_albums.dart @@ -13,9 +13,9 @@ class DrawerAlbumTab extends StatefulWidget { final List items; const DrawerAlbumTab({ - Key? key, + super.key, required this.items, - }) : super(key: key); + }); @override State createState() => _DrawerAlbumTabState(); diff --git a/lib/widgets/settings/navigation/drawer_tab_fixed.dart b/lib/widgets/settings/navigation/drawer_tab_fixed.dart index abc9f5110..0ee54de7b 100644 --- a/lib/widgets/settings/navigation/drawer_tab_fixed.dart +++ b/lib/widgets/settings/navigation/drawer_tab_fixed.dart @@ -12,12 +12,12 @@ class DrawerFixedListTab extends StatefulWidget { final ItemWidgetBuilder title; const DrawerFixedListTab({ - Key? key, + super.key, required this.items, required this.visibleItems, required this.leading, required this.title, - }) : super(key: key); + }); @override State> createState() => _DrawerFixedListTabState(); diff --git a/lib/widgets/settings/privacy/access_grants.dart b/lib/widgets/settings/privacy/access_grants.dart index 7376c631f..80e6f1018 100644 --- a/lib/widgets/settings/privacy/access_grants.dart +++ b/lib/widgets/settings/privacy/access_grants.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; class StorageAccessPage extends StatefulWidget { static const routeName = '/settings/storage_access'; - const StorageAccessPage({Key? key}) : super(key: key); + const StorageAccessPage({super.key}); @override State createState() => _StorageAccessPageState(); @@ -90,7 +90,7 @@ class _StorageAccessPageState extends State { } class _Header extends StatelessWidget { - const _Header({Key? key}) : super(key: key); + const _Header({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/privacy/file_picker/crumb_line.dart b/lib/widgets/settings/privacy/file_picker/crumb_line.dart index d5ab45a22..d25c29e54 100644 --- a/lib/widgets/settings/privacy/file_picker/crumb_line.dart +++ b/lib/widgets/settings/privacy/file_picker/crumb_line.dart @@ -8,10 +8,10 @@ class CrumbLine extends StatefulWidget { final void Function(String path) onTap; const CrumbLine({ - Key? key, + super.key, required this.directory, required this.onTap, - }) : super(key: key); + }); @override State createState() => _CrumbLineState(); diff --git a/lib/widgets/settings/privacy/file_picker/file_picker.dart b/lib/widgets/settings/privacy/file_picker/file_picker.dart index dd2ef7347..349ca7ab5 100644 --- a/lib/widgets/settings/privacy/file_picker/file_picker.dart +++ b/lib/widgets/settings/privacy/file_picker/file_picker.dart @@ -20,7 +20,7 @@ import 'package:flutter/scheduler.dart'; class FilePicker extends StatefulWidget { static const routeName = '/file_picker'; - const FilePicker({Key? key}) : super(key: key); + const FilePicker({super.key}); @override State createState() => _FilePickerState(); diff --git a/lib/widgets/settings/privacy/hidden_items.dart b/lib/widgets/settings/privacy/hidden_items.dart index 67b7c5996..770c5c9b5 100644 --- a/lib/widgets/settings/privacy/hidden_items.dart +++ b/lib/widgets/settings/privacy/hidden_items.dart @@ -17,7 +17,7 @@ import 'package:tuple/tuple.dart'; class HiddenItemsPage extends StatelessWidget { static const routeName = '/settings/hidden_items'; - const HiddenItemsPage({Key? key}) : super(key: key); + const HiddenItemsPage({super.key}); @override Widget build(BuildContext context) { @@ -55,7 +55,7 @@ class HiddenItemsPage extends StatelessWidget { } class _HiddenFilters extends StatelessWidget { - const _HiddenFilters({Key? key}) : super(key: key); + const _HiddenFilters({super.key}); @override Widget build(BuildContext context) { @@ -109,7 +109,7 @@ class _HiddenFilters extends StatelessWidget { } class _HiddenPaths extends StatelessWidget { - const _HiddenPaths({Key? key}) : super(key: key); + const _HiddenPaths({super.key}); @override Widget build(BuildContext context) { @@ -169,7 +169,7 @@ class _HiddenPaths extends StatelessWidget { class _Banner extends StatelessWidget { final String bannerText; - const _Banner({Key? key, required this.bannerText}) : super(key: key); + const _Banner({super.key, required this.bannerText}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/settings_page.dart b/lib/widgets/settings/settings_page.dart index 5442cd307..bad9172a3 100644 --- a/lib/widgets/settings/settings_page.dart +++ b/lib/widgets/settings/settings_page.dart @@ -37,7 +37,7 @@ import 'package:provider/provider.dart'; class SettingsPage extends StatefulWidget { static const routeName = '/settings'; - const SettingsPage({Key? key}) : super(key: key); + const SettingsPage({super.key}); @override State createState() => _SettingsPageState(); diff --git a/lib/widgets/settings/thumbnails/collection_actions_editor.dart b/lib/widgets/settings/thumbnails/collection_actions_editor.dart index 101bc13c1..7b6474159 100644 --- a/lib/widgets/settings/thumbnails/collection_actions_editor.dart +++ b/lib/widgets/settings/thumbnails/collection_actions_editor.dart @@ -9,7 +9,7 @@ import 'package:tuple/tuple.dart'; class CollectionActionEditorPage extends StatelessWidget { static const routeName = '/settings/collection_actions'; - const CollectionActionEditorPage({Key? key}) : super(key: key); + const CollectionActionEditorPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/thumbnails/overlay.dart b/lib/widgets/settings/thumbnails/overlay.dart index 1ba9221a5..72ea7e997 100644 --- a/lib/widgets/settings/thumbnails/overlay.dart +++ b/lib/widgets/settings/thumbnails/overlay.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; class ThumbnailOverlayPage extends StatelessWidget { static const routeName = '/settings/thumbnail_overlay'; - const ThumbnailOverlayPage({Key? key}) : super(key: key); + const ThumbnailOverlayPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/video/controls.dart b/lib/widgets/settings/video/controls.dart index 2f341c86e..17711bff5 100644 --- a/lib/widgets/settings/video/controls.dart +++ b/lib/widgets/settings/video/controls.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; class VideoControlsPage extends StatelessWidget { static const routeName = '/settings/video/controls'; - const VideoControlsPage({Key? key}) : super(key: key); + const VideoControlsPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/video/subtitle_sample.dart b/lib/widgets/settings/video/subtitle_sample.dart index 208f9eea6..3ac584b26 100644 --- a/lib/widgets/settings/video/subtitle_sample.dart +++ b/lib/widgets/settings/video/subtitle_sample.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; class SubtitleSample extends StatelessWidget { - const SubtitleSample({Key? key}) : super(key: key); + const SubtitleSample({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/video/subtitle_theme.dart b/lib/widgets/settings/video/subtitle_theme.dart index fc5117870..436962e1d 100644 --- a/lib/widgets/settings/video/subtitle_theme.dart +++ b/lib/widgets/settings/video/subtitle_theme.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; class SubtitleThemePage extends StatelessWidget { static const routeName = '/settings/video/subtitle_theme'; - const SubtitleThemePage({Key? key}) : super(key: key); + const SubtitleThemePage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/video/video_settings_page.dart b/lib/widgets/settings/video/video_settings_page.dart index ed63554e4..4567144ec 100644 --- a/lib/widgets/settings/video/video_settings_page.dart +++ b/lib/widgets/settings/video/video_settings_page.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; class VideoSettingsPage extends StatefulWidget { static const routeName = '/settings/video'; - const VideoSettingsPage({Key? key}) : super(key: key); + const VideoSettingsPage({super.key}); @override State createState() => _VideoSettingsPageState(); diff --git a/lib/widgets/settings/viewer/entry_background.dart b/lib/widgets/settings/viewer/entry_background.dart index 4d808a33d..ab5efdf60 100644 --- a/lib/widgets/settings/viewer/entry_background.dart +++ b/lib/widgets/settings/viewer/entry_background.dart @@ -9,10 +9,10 @@ class EntryBackgroundSelector extends StatefulWidget { final ValueSetter setter; const EntryBackgroundSelector({ - Key? key, + super.key, required this.getter, required this.setter, - }) : super(key: key); + }); @override State createState() => _EntryBackgroundSelectorState(); diff --git a/lib/widgets/settings/viewer/overlay.dart b/lib/widgets/settings/viewer/overlay.dart index 95342d7d5..431050a89 100644 --- a/lib/widgets/settings/viewer/overlay.dart +++ b/lib/widgets/settings/viewer/overlay.dart @@ -8,7 +8,7 @@ import 'package:tuple/tuple.dart'; class ViewerOverlayPage extends StatelessWidget { static const routeName = '/settings/viewer_overlay'; - const ViewerOverlayPage({Key? key}) : super(key: key); + const ViewerOverlayPage({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/settings/viewer/viewer_actions_editor.dart b/lib/widgets/settings/viewer/viewer_actions_editor.dart index 6ae06565d..795a2eddd 100644 --- a/lib/widgets/settings/viewer/viewer_actions_editor.dart +++ b/lib/widgets/settings/viewer/viewer_actions_editor.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; class ViewerActionEditorPage extends StatelessWidget { static const routeName = '/settings/viewer_actions'; - const ViewerActionEditorPage({Key? key}) : super(key: key); + const ViewerActionEditorPage({super.key}); static const allAvailableActions = [ EntryAction.share, diff --git a/lib/widgets/stats/filter_table.dart b/lib/widgets/stats/filter_table.dart index 5c2609eeb..7a572a4eb 100644 --- a/lib/widgets/stats/filter_table.dart +++ b/lib/widgets/stats/filter_table.dart @@ -17,14 +17,14 @@ class FilterTable extends StatelessWidget { final FilterCallback onFilterSelection; const FilterTable({ - Key? key, + super.key, required this.totalEntryCount, required this.entryCountMap, required this.filterBuilder, required this.sortByCount, required this.maxRowCount, required this.onFilterSelection, - }) : super(key: key); + }); static const chipWidth = AvesFilterChip.defaultMaxChipWidth; static const countWidth = 32.0; diff --git a/lib/widgets/stats/stats_page.dart b/lib/widgets/stats/stats_page.dart index 2e10505e9..b6955616c 100644 --- a/lib/widgets/stats/stats_page.dart +++ b/lib/widgets/stats/stats_page.dart @@ -40,11 +40,11 @@ class StatsPage extends StatelessWidget { static const mimeDonutMinWidth = 124.0; StatsPage({ - Key? key, + super.key, required this.entries, required this.source, this.parentCollection, - }) : super(key: key) { + }) { entries.forEach((entry) { if (entry.hasAddress) { final address = entry.addressDetails!; diff --git a/lib/widgets/viewer/debug/db.dart b/lib/widgets/viewer/debug/db.dart index 6575c1389..95b5d2fc7 100644 --- a/lib/widgets/viewer/debug/db.dart +++ b/lib/widgets/viewer/debug/db.dart @@ -12,9 +12,9 @@ class DbTab extends StatefulWidget { final AvesEntry entry; const DbTab({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _DbTabState(); diff --git a/lib/widgets/viewer/debug/debug_page.dart b/lib/widgets/viewer/debug/debug_page.dart index 2fdd44e23..a6468fd81 100644 --- a/lib/widgets/viewer/debug/debug_page.dart +++ b/lib/widgets/viewer/debug/debug_page.dart @@ -16,9 +16,9 @@ class ViewerDebugPage extends StatelessWidget { final AvesEntry entry; const ViewerDebugPage({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/debug/metadata.dart b/lib/widgets/viewer/debug/metadata.dart index 45c525d02..e75435a61 100644 --- a/lib/widgets/viewer/debug/metadata.dart +++ b/lib/widgets/viewer/debug/metadata.dart @@ -13,9 +13,9 @@ class MetadataTab extends StatefulWidget { final AvesEntry entry; const MetadataTab({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _MetadataTabState(); diff --git a/lib/widgets/viewer/embedded/embedded_data_opener.dart b/lib/widgets/viewer/embedded/embedded_data_opener.dart index 76e93359c..3152d7461 100644 --- a/lib/widgets/viewer/embedded/embedded_data_opener.dart +++ b/lib/widgets/viewer/embedded/embedded_data_opener.dart @@ -16,10 +16,10 @@ class EmbeddedDataOpener extends StatelessWidget with FeedbackMixin { final Widget child; const EmbeddedDataOpener({ - Key? key, + super.key, required this.entry, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/entry_horizontal_pager.dart b/lib/widgets/viewer/entry_horizontal_pager.dart index 2ff0965d5..1c27b0c03 100644 --- a/lib/widgets/viewer/entry_horizontal_pager.dart +++ b/lib/widgets/viewer/entry_horizontal_pager.dart @@ -18,12 +18,12 @@ class MultiEntryScroller extends StatefulWidget { final void Function(AvesEntry mainEntry, AvesEntry? pageEntry) onViewDisposed; const MultiEntryScroller({ - Key? key, + super.key, required this.collection, required this.pageController, required this.onPageChanged, required this.onViewDisposed, - }) : super(key: key); + }); @override State createState() => _MultiEntryScrollerState(); @@ -112,9 +112,9 @@ class SingleEntryScroller extends StatefulWidget { final AvesEntry entry; const SingleEntryScroller({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _SingleEntryScrollerState(); diff --git a/lib/widgets/viewer/entry_vertical_pager.dart b/lib/widgets/viewer/entry_vertical_pager.dart index 677453387..ed08f48ae 100644 --- a/lib/widgets/viewer/entry_vertical_pager.dart +++ b/lib/widgets/viewer/entry_vertical_pager.dart @@ -25,7 +25,7 @@ class ViewerVerticalPageView extends StatefulWidget { final void Function(AvesEntry mainEntry, AvesEntry? pageEntry) onViewDisposed; const ViewerVerticalPageView({ - Key? key, + super.key, required this.collection, required this.entryNotifier, required this.verticalPager, @@ -34,7 +34,7 @@ class ViewerVerticalPageView extends StatefulWidget { required this.onHorizontalPageChanged, required this.onImagePageRequested, required this.onViewDisposed, - }) : super(key: key); + }); @override State createState() => _ViewerVerticalPageViewState(); diff --git a/lib/widgets/viewer/entry_viewer_page.dart b/lib/widgets/viewer/entry_viewer_page.dart index 8caf6e5cd..814e1b703 100644 --- a/lib/widgets/viewer/entry_viewer_page.dart +++ b/lib/widgets/viewer/entry_viewer_page.dart @@ -17,10 +17,10 @@ class EntryViewerPage extends StatelessWidget { final AvesEntry initialEntry; const EntryViewerPage({ - Key? key, + super.key, this.collection, required this.initialEntry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -55,9 +55,9 @@ class ViewStateConductorProvider extends StatelessWidget { final Widget? child; const ViewStateConductorProvider({ - Key? key, + super.key, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -77,9 +77,9 @@ class VideoConductorProvider extends StatelessWidget { final Widget? child; const VideoConductorProvider({ - Key? key, + super.key, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -97,9 +97,9 @@ class MultiPageConductorProvider extends StatelessWidget { final Widget? child; const MultiPageConductorProvider({ - Key? key, + super.key, this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/entry_viewer_stack.dart b/lib/widgets/viewer/entry_viewer_stack.dart index ee9ea0b28..19ca01bce 100644 --- a/lib/widgets/viewer/entry_viewer_stack.dart +++ b/lib/widgets/viewer/entry_viewer_stack.dart @@ -44,10 +44,10 @@ class EntryViewerStack extends StatefulWidget { final AvesEntry initialEntry; const EntryViewerStack({ - Key? key, + super.key, this.collection, required this.initialEntry, - }) : super(key: key); + }); @override State createState() => _EntryViewerStackState(); diff --git a/lib/widgets/viewer/info/basic_section.dart b/lib/widgets/viewer/info/basic_section.dart index 6027073fb..cb0701554 100644 --- a/lib/widgets/viewer/info/basic_section.dart +++ b/lib/widgets/viewer/info/basic_section.dart @@ -28,13 +28,13 @@ class BasicSection extends StatelessWidget { final FilterCallback onFilter; const BasicSection({ - Key? key, + super.key, required this.entry, this.collection, required this.actionDelegate, required this.isEditingMetadataNotifier, required this.onFilter, - }) : super(key: key); + }); int get megaPixels => entry.megaPixels; diff --git a/lib/widgets/viewer/info/common.dart b/lib/widgets/viewer/info/common.dart index f6e72a77d..c5c2667ed 100644 --- a/lib/widgets/viewer/info/common.dart +++ b/lib/widgets/viewer/info/common.dart @@ -10,9 +10,9 @@ class SectionRow extends StatelessWidget { final IconData icon; const SectionRow({ - Key? key, + super.key, required this.icon, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -53,11 +53,11 @@ class InfoRowGroup extends StatefulWidget { static TextStyle keyStyle(BuildContext context) => Theme.of(context).textTheme.caption!.merge(_keyStyle); const InfoRowGroup({ - Key? key, + super.key, required this.info, this.maxValueLength = 0, this.linkHandlers, - }) : super(key: key); + }); @override State createState() => _InfoRowGroupState(); diff --git a/lib/widgets/viewer/info/info_app_bar.dart b/lib/widgets/viewer/info/info_app_bar.dart index 761d99ae9..603c93975 100644 --- a/lib/widgets/viewer/info/info_app_bar.dart +++ b/lib/widgets/viewer/info/info_app_bar.dart @@ -20,12 +20,12 @@ class InfoAppBar extends StatelessWidget { final VoidCallback onBackPressed; const InfoAppBar({ - Key? key, + super.key, required this.entry, required this.actionDelegate, required this.metadataNotifier, required this.onBackPressed, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/info/info_page.dart b/lib/widgets/viewer/info/info_page.dart index 67e0b0b6c..44441d95a 100644 --- a/lib/widgets/viewer/info/info_page.dart +++ b/lib/widgets/viewer/info/info_page.dart @@ -26,11 +26,11 @@ class InfoPage extends StatefulWidget { final ValueNotifier isScrollingNotifier; const InfoPage({ - Key? key, + super.key, required this.collection, required this.entryNotifier, required this.isScrollingNotifier, - }) : super(key: key); + }); @override State createState() => _InfoPageState(); @@ -132,14 +132,14 @@ class _InfoPageContent extends StatefulWidget { final VoidCallback goToViewer; const _InfoPageContent({ - Key? key, + super.key, required this.collection, required this.entry, required this.isScrollingNotifier, required this.scrollController, required this.split, required this.goToViewer, - }) : super(key: key); + }); @override State<_InfoPageContent> createState() => _InfoPageContentState(); diff --git a/lib/widgets/viewer/info/location_section.dart b/lib/widgets/viewer/info/location_section.dart index 9cc06ccdc..ed18d17ba 100644 --- a/lib/widgets/viewer/info/location_section.dart +++ b/lib/widgets/viewer/info/location_section.dart @@ -22,13 +22,13 @@ class LocationSection extends StatefulWidget { final FilterCallback onFilter; const LocationSection({ - Key? key, + super.key, required this.collection, required this.entry, required this.showTitle, required this.isScrollingNotifier, required this.onFilter, - }) : super(key: key); + }); @override State createState() => _LocationSectionState(); diff --git a/lib/widgets/viewer/info/metadata/metadata_dir_tile.dart b/lib/widgets/viewer/info/metadata/metadata_dir_tile.dart index 308c581a5..06314655b 100644 --- a/lib/widgets/viewer/info/metadata/metadata_dir_tile.dart +++ b/lib/widgets/viewer/info/metadata/metadata_dir_tile.dart @@ -26,14 +26,14 @@ class MetadataDirTile extends StatelessWidget { final bool initiallyExpanded, showThumbnails; const MetadataDirTile({ - Key? key, + super.key, required this.entry, required this.title, required this.dir, this.expandedDirectoryNotifier, this.initiallyExpanded = false, this.showThumbnails = true, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/info/metadata/metadata_section.dart b/lib/widgets/viewer/info/metadata/metadata_section.dart index fe003688e..ecd0efa25 100644 --- a/lib/widgets/viewer/info/metadata/metadata_section.dart +++ b/lib/widgets/viewer/info/metadata/metadata_section.dart @@ -23,10 +23,10 @@ class MetadataSectionSliver extends StatefulWidget { final ValueNotifier> metadataNotifier; const MetadataSectionSliver({ - Key? key, + super.key, required this.entry, required this.metadataNotifier, - }) : super(key: key); + }); @override State createState() => _MetadataSectionSliverState(); diff --git a/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart b/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart index 477f7ec34..0bb79ee82 100644 --- a/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart +++ b/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart @@ -10,9 +10,9 @@ class MetadataThumbnails extends StatefulWidget { final AvesEntry entry; const MetadataThumbnails({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _MetadataThumbnailsState(); diff --git a/lib/widgets/viewer/info/metadata/xmp_structs.dart b/lib/widgets/viewer/info/metadata/xmp_structs.dart index 372d9d2a7..315cd538b 100644 --- a/lib/widgets/viewer/info/metadata/xmp_structs.dart +++ b/lib/widgets/viewer/info/metadata/xmp_structs.dart @@ -16,11 +16,11 @@ class XmpStructArrayCard extends StatefulWidget { final Map Function(int index)? linkifier; XmpStructArrayCard({ - Key? key, + super.key, required this.title, required Map> structByIndex, this.linkifier, - }) : super(key: key) { + }) { final length = structByIndex.keys.fold(0, max); structs = [for (var i = 0; i < length; i++) structByIndex[i + 1] ?? {}]; } @@ -113,11 +113,11 @@ class XmpStructCard extends StatelessWidget { static const cardMargin = EdgeInsets.symmetric(vertical: 8, horizontal: 0); const XmpStructCard({ - Key? key, + super.key, required this.title, required this.struct, this.linkifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/info/metadata/xmp_tile.dart b/lib/widgets/viewer/info/metadata/xmp_tile.dart index aa7d2c79d..dcacff9a7 100644 --- a/lib/widgets/viewer/info/metadata/xmp_tile.dart +++ b/lib/widgets/viewer/info/metadata/xmp_tile.dart @@ -17,13 +17,13 @@ class XmpDirTile extends StatefulWidget { final bool initiallyExpanded; const XmpDirTile({ - Key? key, + super.key, required this.entry, required this.title, required this.tags, required this.expandedNotifier, required this.initiallyExpanded, - }) : super(key: key); + }); @override State createState() => _XmpDirTileState(); diff --git a/lib/widgets/viewer/info/owner.dart b/lib/widgets/viewer/info/owner.dart index 302516c51..1d8015752 100644 --- a/lib/widgets/viewer/info/owner.dart +++ b/lib/widgets/viewer/info/owner.dart @@ -14,9 +14,9 @@ class OwnerProp extends StatefulWidget { final AvesEntry entry; const OwnerProp({ - Key? key, + super.key, required this.entry, - }) : super(key: key); + }); @override State createState() => _OwnerPropState(); diff --git a/lib/widgets/viewer/overlay/bottom.dart b/lib/widgets/viewer/overlay/bottom.dart index 39d016c8e..bf32f119f 100644 --- a/lib/widgets/viewer/overlay/bottom.dart +++ b/lib/widgets/viewer/overlay/bottom.dart @@ -21,7 +21,7 @@ class ViewerBottomOverlay extends StatefulWidget { final MultiPageController? multiPageController; const ViewerBottomOverlay({ - Key? key, + super.key, required this.entries, required this.index, required this.hasCollection, @@ -29,7 +29,7 @@ class ViewerBottomOverlay extends StatefulWidget { this.viewInsets, this.viewPadding, required this.multiPageController, - }) : super(key: key); + }); @override State createState() => _ViewerBottomOverlayState(); @@ -93,7 +93,7 @@ class _BottomOverlayContent extends StatefulWidget { final AnimationController animationController; const _BottomOverlayContent({ - Key? key, + super.key, required this.entries, required this.index, required this.mainEntry, @@ -101,7 +101,7 @@ class _BottomOverlayContent extends StatefulWidget { required this.hasCollection, required this.multiPageController, required this.animationController, - }) : super(key: key); + }); @override State<_BottomOverlayContent> createState() => _BottomOverlayContentState(); @@ -211,11 +211,11 @@ class ExtraBottomOverlay extends StatelessWidget { final Widget child; const ExtraBottomOverlay({ - Key? key, + super.key, this.viewInsets, this.viewPadding, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/common.dart b/lib/widgets/viewer/overlay/common.dart index 0c94ca5a5..980ef34ca 100644 --- a/lib/widgets/viewer/overlay/common.dart +++ b/lib/widgets/viewer/overlay/common.dart @@ -10,11 +10,11 @@ class OverlayButton extends StatelessWidget { final Widget child; const OverlayButton({ - Key? key, + super.key, this.scale = kAlwaysCompleteAnimation, this.borderRadius, required this.child, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -66,11 +66,11 @@ class OverlayTextButton extends StatelessWidget { final VoidCallback? onPressed; const OverlayTextButton({ - Key? key, + super.key, required this.scale, required this.buttonLabel, this.onPressed, - }) : super(key: key); + }); static const _borderRadius = 123.0; static final _minSize = MaterialStateProperty.all(const Size(kMinInteractiveDimension, kMinInteractiveDimension)); diff --git a/lib/widgets/viewer/overlay/details.dart b/lib/widgets/viewer/overlay/details.dart index 9ebff5b71..c3bc95159 100644 --- a/lib/widgets/viewer/overlay/details.dart +++ b/lib/widgets/viewer/overlay/details.dart @@ -33,12 +33,12 @@ class ViewerDetailOverlay extends StatefulWidget { final MultiPageController? multiPageController; const ViewerDetailOverlay({ - Key? key, + super.key, required this.entries, required this.index, required this.hasCollection, required this.multiPageController, - }) : super(key: key); + }); @override State createState() => _ViewerDetailOverlayState(); @@ -127,13 +127,13 @@ class ViewerDetailOverlayContent extends StatelessWidget { static const padding = EdgeInsets.symmetric(vertical: 4, horizontal: 8); const ViewerDetailOverlayContent({ - Key? key, + super.key, required this.pageEntry, required this.details, required this.position, required this.availableWidth, required this.multiPageController, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -288,9 +288,9 @@ class _LocationRow extends AnimatedWidget { final AvesEntry entry; _LocationRow({ - Key? key, + super.key, required this.entry, - }) : super(key: key, listenable: entry.addressChangeNotifier); + }) : super(listenable: entry.addressChangeNotifier); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/minimap.dart b/lib/widgets/viewer/overlay/minimap.dart index dad6232ae..b3f5de899 100644 --- a/lib/widgets/viewer/overlay/minimap.dart +++ b/lib/widgets/viewer/overlay/minimap.dart @@ -10,9 +10,9 @@ class Minimap extends StatelessWidget { static const Size minimapSize = Size(96, 96); const Minimap({ - Key? key, + super.key, required this.viewStateNotifier, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/multipage.dart b/lib/widgets/viewer/overlay/multipage.dart index 44507cd47..708d542b0 100644 --- a/lib/widgets/viewer/overlay/multipage.dart +++ b/lib/widgets/viewer/overlay/multipage.dart @@ -11,11 +11,11 @@ class MultiPageOverlay extends StatefulWidget { final bool scrollable; const MultiPageOverlay({ - Key? key, + super.key, required this.controller, required this.availableWidth, required this.scrollable, - }) : super(key: key); + }); @override State createState() => _MultiPageOverlayState(); diff --git a/lib/widgets/viewer/overlay/panorama.dart b/lib/widgets/viewer/overlay/panorama.dart index a76b2e9d6..4facceecc 100644 --- a/lib/widgets/viewer/overlay/panorama.dart +++ b/lib/widgets/viewer/overlay/panorama.dart @@ -12,10 +12,10 @@ class PanoramaOverlay extends StatelessWidget { final Animation scale; const PanoramaOverlay({ - Key? key, + super.key, required this.entry, required this.scale, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/thumbnail_preview.dart b/lib/widgets/viewer/overlay/thumbnail_preview.dart index 796a1b99b..8ac74c54d 100644 --- a/lib/widgets/viewer/overlay/thumbnail_preview.dart +++ b/lib/widgets/viewer/overlay/thumbnail_preview.dart @@ -11,11 +11,11 @@ class ViewerThumbnailPreview extends StatefulWidget { final double availableWidth; const ViewerThumbnailPreview({ - Key? key, + super.key, required this.entries, required this.displayedIndex, required this.availableWidth, - }) : super(key: key); + }); @override State createState() => _ViewerThumbnailPreviewState(); diff --git a/lib/widgets/viewer/overlay/top.dart b/lib/widgets/viewer/overlay/top.dart index b7075e7bd..ce6c8b23e 100644 --- a/lib/widgets/viewer/overlay/top.dart +++ b/lib/widgets/viewer/overlay/top.dart @@ -20,7 +20,7 @@ class ViewerTopOverlay extends StatelessWidget { final bool hasCollection; const ViewerTopOverlay({ - Key? key, + super.key, required this.entries, required this.index, required this.mainEntry, @@ -28,7 +28,7 @@ class ViewerTopOverlay extends StatelessWidget { required this.hasCollection, required this.viewInsets, required this.viewPadding, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/video/controls.dart b/lib/widgets/viewer/overlay/video/controls.dart index eab6a7be9..90f096566 100644 --- a/lib/widgets/viewer/overlay/video/controls.dart +++ b/lib/widgets/viewer/overlay/video/controls.dart @@ -16,11 +16,11 @@ class VideoControlRow extends StatelessWidget { static const Radius radius = Radius.circular(123); const VideoControlRow({ - Key? key, + super.key, required this.controller, required this.scale, required this.onActionSelected, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/overlay/video/mute_toggler.dart b/lib/widgets/viewer/overlay/video/mute_toggler.dart index 8ab3089c7..5b7a09350 100644 --- a/lib/widgets/viewer/overlay/video/mute_toggler.dart +++ b/lib/widgets/viewer/overlay/video/mute_toggler.dart @@ -12,11 +12,11 @@ class MuteToggler extends StatelessWidget { final VoidCallback? onPressed; const MuteToggler({ - Key? key, + super.key, required this.controller, this.isMenuItem = false, this.onPressed, - }) : super(key: key); + }); bool get isMuted => controller?.isMuted ?? false; diff --git a/lib/widgets/viewer/overlay/video/play_toggler.dart b/lib/widgets/viewer/overlay/video/play_toggler.dart index b7e781b29..3bce59e4c 100644 --- a/lib/widgets/viewer/overlay/video/play_toggler.dart +++ b/lib/widgets/viewer/overlay/video/play_toggler.dart @@ -14,11 +14,11 @@ class PlayToggler extends StatefulWidget { final VoidCallback? onPressed; const PlayToggler({ - Key? key, + super.key, required this.controller, this.isMenuItem = false, this.onPressed, - }) : super(key: key); + }); @override State createState() => _PlayTogglerState(); diff --git a/lib/widgets/viewer/overlay/video/progress_bar.dart b/lib/widgets/viewer/overlay/video/progress_bar.dart index 185b7e691..ef244e45d 100644 --- a/lib/widgets/viewer/overlay/video/progress_bar.dart +++ b/lib/widgets/viewer/overlay/video/progress_bar.dart @@ -16,10 +16,10 @@ class VideoProgressBar extends StatefulWidget { final Animation scale; const VideoProgressBar({ - Key? key, + super.key, required this.controller, required this.scale, - }) : super(key: key); + }); @override State createState() => _VideoProgressBarState(); diff --git a/lib/widgets/viewer/overlay/video/video.dart b/lib/widgets/viewer/overlay/video/video.dart index 4243cb05c..e0a2d9e4b 100644 --- a/lib/widgets/viewer/overlay/video/video.dart +++ b/lib/widgets/viewer/overlay/video/video.dart @@ -16,13 +16,13 @@ class VideoControlOverlay extends StatefulWidget { final VoidCallback onActionMenuOpened; const VideoControlOverlay({ - Key? key, + super.key, required this.entry, required this.controller, required this.scale, required this.onActionSelected, required this.onActionMenuOpened, - }) : super(key: key); + }); @override State createState() => _VideoControlOverlayState(); diff --git a/lib/widgets/viewer/overlay/viewer_button_row.dart b/lib/widgets/viewer/overlay/viewer_button_row.dart index db1f6a81c..5091cb0e1 100644 --- a/lib/widgets/viewer/overlay/viewer_button_row.dart +++ b/lib/widgets/viewer/overlay/viewer_button_row.dart @@ -36,12 +36,12 @@ class ViewerButtonRow extends StatelessWidget { static double _buttonSize(BuildContext context) => OverlayButton.getSize(context); const ViewerButtonRow({ - Key? key, + super.key, required this.mainEntry, required this.pageEntry, required this.scale, required this.canToggleFavourite, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -147,7 +147,7 @@ class ViewerButtonRowContent extends StatelessWidget { static const double padding = 8; const ViewerButtonRowContent({ - Key? key, + super.key, required this.quickActions, required this.topLevelActions, required this.exportActions, @@ -155,7 +155,7 @@ class ViewerButtonRowContent extends StatelessWidget { required this.scale, required this.mainEntry, required this.pageEntry, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/page_entry_builder.dart b/lib/widgets/viewer/page_entry_builder.dart index 23050602f..6c234a365 100644 --- a/lib/widgets/viewer/page_entry_builder.dart +++ b/lib/widgets/viewer/page_entry_builder.dart @@ -8,10 +8,10 @@ class PageEntryBuilder extends StatelessWidget { final Widget Function(AvesEntry? pageEntry) builder; const PageEntryBuilder({ - Key? key, + super.key, required this.multiPageController, required this.builder, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/panorama_page.dart b/lib/widgets/viewer/panorama_page.dart index fe54f97cc..dabe95efb 100644 --- a/lib/widgets/viewer/panorama_page.dart +++ b/lib/widgets/viewer/panorama_page.dart @@ -25,10 +25,10 @@ class PanoramaPage extends StatefulWidget { final PanoramaInfo info; const PanoramaPage({ - Key? key, + super.key, required this.entry, required this.info, - }) : super(key: key); + }); @override State createState() => _PanoramaPageState(); diff --git a/lib/widgets/viewer/source_viewer_page.dart b/lib/widgets/viewer/source_viewer_page.dart index f486011ea..18e54ef94 100644 --- a/lib/widgets/viewer/source_viewer_page.dart +++ b/lib/widgets/viewer/source_viewer_page.dart @@ -9,9 +9,9 @@ class SourceViewerPage extends StatefulWidget { final Future Function() loader; const SourceViewerPage({ - Key? key, + super.key, required this.loader, - }) : super(key: key); + }); @override State createState() => _SourceViewerPageState(); diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart index 5d74b5c9a..f642dd8d2 100644 --- a/lib/widgets/viewer/visual/entry_page_view.dart +++ b/lib/widgets/viewer/visual/entry_page_view.dart @@ -39,11 +39,11 @@ class EntryPageView extends StatefulWidget { static const decorationCheckSize = 20.0; const EntryPageView({ - Key? key, + super.key, required this.mainEntry, required this.pageEntry, this.onDisposed, - }) : super(key: key); + }); @override State createState() => _EntryPageViewState(); diff --git a/lib/widgets/viewer/visual/error.dart b/lib/widgets/viewer/visual/error.dart index 0c7a3bd5a..85ce3d3d9 100644 --- a/lib/widgets/viewer/visual/error.dart +++ b/lib/widgets/viewer/visual/error.dart @@ -12,10 +12,10 @@ class ErrorView extends StatefulWidget { final VoidCallback onTap; const ErrorView({ - Key? key, + super.key, required this.entry, required this.onTap, - }) : super(key: key); + }); @override State createState() => _ErrorViewState(); diff --git a/lib/widgets/viewer/visual/raster.dart b/lib/widgets/viewer/visual/raster.dart index 077df7188..0f5dd148e 100644 --- a/lib/widgets/viewer/visual/raster.dart +++ b/lib/widgets/viewer/visual/raster.dart @@ -21,11 +21,11 @@ class RasterImageView extends StatefulWidget { final ImageErrorWidgetBuilder errorBuilder; const RasterImageView({ - Key? key, + super.key, required this.entry, required this.viewStateNotifier, required this.errorBuilder, - }) : super(key: key); + }); @override State createState() => _RasterImageViewState(); @@ -337,12 +337,12 @@ class _RegionTile extends StatefulWidget { final int sampleSize; const _RegionTile({ - Key? key, + super.key, required this.entry, required this.tileRect, required this.regionRect, required this.sampleSize, - }) : super(key: key); + }); @override State<_RegionTile> createState() => _RegionTileState(); diff --git a/lib/widgets/viewer/visual/subtitle/subtitle.dart b/lib/widgets/viewer/visual/subtitle/subtitle.dart index 6695fc51e..e9a5cac3e 100644 --- a/lib/widgets/viewer/visual/subtitle/subtitle.dart +++ b/lib/widgets/viewer/visual/subtitle/subtitle.dart @@ -19,11 +19,11 @@ class VideoSubtitles extends StatelessWidget { static const baseShadowOffset = Offset(1, 1); const VideoSubtitles({ - Key? key, + super.key, required this.controller, required this.viewStateNotifier, this.debugMode = false, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/lib/widgets/viewer/visual/vector.dart b/lib/widgets/viewer/visual/vector.dart index cc0e1277e..e6b7cdf9b 100644 --- a/lib/widgets/viewer/visual/vector.dart +++ b/lib/widgets/viewer/visual/vector.dart @@ -21,11 +21,11 @@ class VectorImageView extends StatefulWidget { final ImageErrorWidgetBuilder errorBuilder; const VectorImageView({ - Key? key, + super.key, required this.entry, required this.viewStateNotifier, required this.errorBuilder, - }) : super(key: key); + }); @override State createState() => _VectorImageViewState(); @@ -290,14 +290,14 @@ class _RegionTile extends StatefulWidget { final _BackgroundFrameBuilder? backgroundFrameBuilder; const _RegionTile({ - Key? key, + super.key, required this.entry, required this.tileRect, required this.regionRect, required this.scale, required this.backgroundColor, required this.backgroundFrameBuilder, - }) : super(key: key); + }); @override State<_RegionTile> createState() => _RegionTileState(); diff --git a/lib/widgets/viewer/visual/video.dart b/lib/widgets/viewer/visual/video.dart index ec17a12e4..6fadf9908 100644 --- a/lib/widgets/viewer/visual/video.dart +++ b/lib/widgets/viewer/visual/video.dart @@ -7,10 +7,10 @@ class VideoView extends StatefulWidget { final AvesVideoController controller; const VideoView({ - Key? key, + super.key, required this.entry, required this.controller, - }) : super(key: key); + }); @override State createState() => _VideoViewState(); diff --git a/lib/widgets/welcome_page.dart b/lib/widgets/welcome_page.dart index c459baf59..e08c40497 100644 --- a/lib/widgets/welcome_page.dart +++ b/lib/widgets/welcome_page.dart @@ -15,7 +15,7 @@ import 'package:flutter_staggered_animations/flutter_staggered_animations.dart'; import 'package:provider/provider.dart'; class WelcomePage extends StatefulWidget { - const WelcomePage({Key? key}) : super(key: key); + const WelcomePage({super.key}); @override State createState() => _WelcomePageState(); diff --git a/plugins/aves_map/lib/src/marker/dot.dart b/plugins/aves_map/lib/src/marker/dot.dart index ba3cc65b8..7a3477e22 100644 --- a/plugins/aves_map/lib/src/marker/dot.dart +++ b/plugins/aves_map/lib/src/marker/dot.dart @@ -2,7 +2,7 @@ import 'package:aves_map/src/theme.dart'; import 'package:flutter/material.dart'; class DotMarker extends StatelessWidget { - const DotMarker({Key? key}) : super(key: key); + const DotMarker({super.key}); static const double diameter = 16; static const double outerBorderRadiusDim = diameter; diff --git a/plugins/aves_map/lib/src/marker/generator.dart b/plugins/aves_map/lib/src/marker/generator.dart index d87a71679..e8a8f77c0 100644 --- a/plugins/aves_map/lib/src/marker/generator.dart +++ b/plugins/aves_map/lib/src/marker/generator.dart @@ -14,11 +14,11 @@ class MarkerGeneratorWidget extends StatefulWidget { final void Function(T markerKey, Uint8List bitmap) onRendered; const MarkerGeneratorWidget({ - Key? key, + super.key, required this.markers, required this.isReadyToRender, required this.onRendered, - }) : super(key: key); + }); @override State> createState() => _MarkerGeneratorWidgetState(); diff --git a/plugins/aves_map/lib/src/marker/image.dart b/plugins/aves_map/lib/src/marker/image.dart index a45d22591..08ccc4b5a 100644 --- a/plugins/aves_map/lib/src/marker/image.dart +++ b/plugins/aves_map/lib/src/marker/image.dart @@ -16,10 +16,10 @@ class ImageMarker extends StatelessWidget { static const innerBorderRadius = BorderRadius.all(innerRadius); const ImageMarker({ - Key? key, + super.key, required this.count, required this.buildThumbnailImage, - }) : super(key: key); + }); @override Widget build(BuildContext context) { diff --git a/plugins/aves_services_google/lib/src/map.dart b/plugins/aves_services_google/lib/src/map.dart index c5582c0e4..ebbef0a9b 100644 --- a/plugins/aves_services_google/lib/src/map.dart +++ b/plugins/aves_services_google/lib/src/map.dart @@ -26,7 +26,7 @@ class EntryGoogleMap extends StatefulWidget { final MarkerTapCallback? onMarkerTap; const EntryGoogleMap({ - Key? key, + super.key, this.controller, required this.clusterListenable, required this.boundsNotifier, @@ -44,7 +44,7 @@ class EntryGoogleMap extends StatefulWidget { this.onUserZoomChange, this.onMapTap, this.onMarkerTap, - }) : super(key: key); + }); @override State createState() => _EntryGoogleMapState(); diff --git a/plugins/aves_services_huawei/lib/src/map.dart b/plugins/aves_services_huawei/lib/src/map.dart index f0fb93ade..b7226c42f 100644 --- a/plugins/aves_services_huawei/lib/src/map.dart +++ b/plugins/aves_services_huawei/lib/src/map.dart @@ -26,7 +26,7 @@ class EntryHmsMap extends StatefulWidget { final MarkerTapCallback? onMarkerTap; const EntryHmsMap({ - Key? key, + super.key, this.controller, required this.clusterListenable, required this.boundsNotifier, @@ -44,7 +44,7 @@ class EntryHmsMap extends StatefulWidget { this.onUserZoomChange, this.onMapTap, this.onMarkerTap, - }) : super(key: key); + }); @override State createState() => _EntryHmsMapState(); diff --git a/pubspec.lock b/pubspec.lock index 23d763e2a..d66d21fa0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -895,7 +895,7 @@ packages: name: screen_brightness url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.1" screen_brightness_android: dependency: transitive description: @@ -910,6 +910,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.0" + screen_brightness_macos: + dependency: transitive + description: + name: screen_brightness_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0+1" screen_brightness_platform_interface: dependency: transitive description: @@ -1067,7 +1074,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: cd5ccd925d0348218aaf156f0b9dc4f8caaec7cc + resolved-ref: b8ad46de0322b3b107cb411dfbf373878692e657 url: "https://github.com/deckerst/aves_streams_channel.git" source: git version: "0.3.0"