From 5c4b8feb04f1a8ebf4086cbce1450c80e76e2019 Mon Sep 17 00:00:00 2001 From: MiaoMint <1981324730@qq.com> Date: Mon, 11 Dec 2023 22:15:42 +0800 Subject: [PATCH] dart fix --- lib/utils/application.dart | 2 +- lib/views/dialogs/bt_dialog.dart | 2 +- lib/views/dialogs/tmdb_binding.dart | 4 ++-- lib/views/pages/code_edit_page.dart | 4 ++-- lib/views/pages/detail_page.dart | 6 +++--- lib/views/pages/extension/extension_page.dart | 2 +- .../pages/extension/extension_repo_page.dart | 2 +- .../extension/extension_settings_page.dart | 4 ++-- lib/views/pages/favorites_page.dart | 2 +- lib/views/pages/home_page.dart | 2 +- lib/views/pages/log_page.dart | 4 ++-- lib/views/pages/main_page.dart | 6 +++--- .../pages/search/extension_searcher_page.dart | 7 +++---- lib/views/pages/search/search_page.dart | 2 +- lib/views/pages/settings_page.dart | 2 +- .../watch/reader/comic/comic_reader.dart | 4 ++-- .../reader/comic/comic_reader_content.dart | 4 ++-- .../reader/comic/comic_reader_settings.dart | 2 +- .../watch/reader/novel/novel_reader.dart | 4 ++-- .../reader/novel/novel_reader_content.dart | 2 +- .../reader/novel/novel_reader_settings.dart | 2 +- lib/views/pages/watch/video/video_player.dart | 9 ++++----- .../watch/video/video_player_content.dart | 4 ++-- lib/views/pages/watch/watch_page.dart | 4 ++-- lib/views/pages/webview_page.dart | 4 ++-- lib/views/widgets/button.dart | 20 +++++++++---------- lib/views/widgets/cache_network_image.dart | 8 ++++---- lib/views/widgets/card_tile.dart | 4 ++-- lib/views/widgets/cover.dart | 4 ++-- .../detail/detail_appbar_flexible_space.dart | 4 ++-- .../widgets/detail/detail_appbar_title.dart | 4 ++-- .../detail/detail_background_color.dart | 4 ++-- .../widgets/detail/detail_continue_play.dart | 4 ++-- lib/views/widgets/detail/detail_episodes.dart | 4 ++-- .../widgets/detail/detail_extension_tile.dart | 4 ++-- .../detail/detail_favorite_button.dart | 4 ++-- lib/views/widgets/detail/detail_overview.dart | 4 ++-- .../widgets/extension/extension_card.dart | 4 ++-- .../widgets/extension/extension_tile.dart | 2 +- lib/views/widgets/extension/info_card.dart | 4 ++-- lib/views/widgets/extension_item_card.dart | 4 ++-- lib/views/widgets/grid_item_tile.dart | 4 ++-- lib/views/widgets/home/home_favorites.dart | 4 ++-- lib/views/widgets/home/home_recent.dart | 4 ++-- lib/views/widgets/home/home_resent_card.dart | 4 ++-- lib/views/widgets/horizontal_list.dart | 8 +++----- lib/views/widgets/infinite_scroller.dart | 4 ++-- lib/views/widgets/list_title.dart | 2 +- lib/views/widgets/log/extension_log_tile.dart | 2 +- lib/views/widgets/progress.dart | 4 ++-- .../widgets/search/search_all_extension.dart | 4 ++-- lib/views/widgets/search/search_all_tile.dart | 4 ++-- lib/views/widgets/settings_input_tile.dart | 4 ++-- .../widgets/settings_numberbox_button.dart | 6 ++---- lib/views/widgets/settings_radios_tile.dart | 4 ++-- lib/views/widgets/settings_switch_tile.dart | 4 ++-- lib/views/widgets/settings_tile.dart | 4 ++-- lib/views/widgets/watch/comic_view.dart | 4 ++-- .../widgets/watch/control_panel_footer.dart | 2 +- .../widgets/watch/control_panel_header.dart | 4 ++-- lib/views/widgets/watch/playlist.dart | 8 ++++---- lib/views/widgets/watch/reader_view.dart | 4 ++-- 62 files changed, 127 insertions(+), 133 deletions(-) diff --git a/lib/utils/application.dart b/lib/utils/application.dart index 17b7866f..d2788a2e 100644 --- a/lib/utils/application.dart +++ b/lib/utils/application.dart @@ -292,7 +292,7 @@ class ApplicationUtils { return true; } File(targetPath).writeAsBytesSync(output); - debugPrint("$targetPath"); + debugPrint(targetPath); // return true; } diff --git a/lib/views/dialogs/bt_dialog.dart b/lib/views/dialogs/bt_dialog.dart index b1e382a8..12505061 100644 --- a/lib/views/dialogs/bt_dialog.dart +++ b/lib/views/dialogs/bt_dialog.dart @@ -10,7 +10,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; import 'package:miru_app/views/widgets/progress.dart'; class BTDialog extends StatefulWidget { - const BTDialog({Key? key}) : super(key: key); + const BTDialog({super.key}); @override State createState() => _BTDialogState(); diff --git a/lib/views/dialogs/tmdb_binding.dart b/lib/views/dialogs/tmdb_binding.dart index 072c85c1..29863449 100644 --- a/lib/views/dialogs/tmdb_binding.dart +++ b/lib/views/dialogs/tmdb_binding.dart @@ -16,9 +16,9 @@ import 'package:tmdb_api/tmdb_api.dart'; class TMDBBinding extends StatefulWidget { const TMDBBinding({ - Key? key, + super.key, required this.title, - }) : super(key: key); + }); final String title; @override diff --git a/lib/views/pages/code_edit_page.dart b/lib/views/pages/code_edit_page.dart index e0848233..4e2b4f9b 100644 --- a/lib/views/pages/code_edit_page.dart +++ b/lib/views/pages/code_edit_page.dart @@ -11,8 +11,8 @@ import 'package:flutter_highlight/themes/monokai-sublime.dart'; class CodeEditPage extends StatefulWidget { const CodeEditPage({ required this.extension, - Key? key, - }) : super(key: key); + super.key, + }); final Extension extension; @override State createState() => _CodeEditPageState(); diff --git a/lib/views/pages/detail_page.dart b/lib/views/pages/detail_page.dart index 4db4bd99..38853ebc 100644 --- a/lib/views/pages/detail_page.dart +++ b/lib/views/pages/detail_page.dart @@ -24,11 +24,11 @@ import 'package:url_launcher/url_launcher.dart'; class DetailPage extends StatefulWidget { const DetailPage({ - Key? key, + super.key, required this.url, required this.package, this.tag, - }) : super(key: key); + }); final String url; final String package; final String? tag; @@ -528,7 +528,7 @@ class _DetailPageState extends State { width: 200, child: e, )) - .toList(), + , ]), ); }, diff --git a/lib/views/pages/extension/extension_page.dart b/lib/views/pages/extension/extension_page.dart index 2e9e5461..5fe6577c 100644 --- a/lib/views/pages/extension/extension_page.dart +++ b/lib/views/pages/extension/extension_page.dart @@ -17,7 +17,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; import 'package:url_launcher/url_launcher.dart'; class ExtensionPage extends StatefulWidget { - const ExtensionPage({Key? key}) : super(key: key); + const ExtensionPage({super.key}); @override State createState() => _ExtensionPageState(); diff --git a/lib/views/pages/extension/extension_repo_page.dart b/lib/views/pages/extension/extension_repo_page.dart index 4db6f141..f5f15531 100644 --- a/lib/views/pages/extension/extension_repo_page.dart +++ b/lib/views/pages/extension/extension_repo_page.dart @@ -11,7 +11,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; import 'package:miru_app/views/widgets/progress.dart'; class ExtensionRepoPage extends StatefulWidget { - const ExtensionRepoPage({Key? key}) : super(key: key); + const ExtensionRepoPage({super.key}); @override State createState() => _ExtensionRepoPageState(); diff --git a/lib/views/pages/extension/extension_settings_page.dart b/lib/views/pages/extension/extension_settings_page.dart index b7ba990a..155c27c6 100644 --- a/lib/views/pages/extension/extension_settings_page.dart +++ b/lib/views/pages/extension/extension_settings_page.dart @@ -25,9 +25,9 @@ import 'package:miru_app/views/widgets/settings_tile.dart'; class ExtensionSettingsPage extends StatefulWidget { const ExtensionSettingsPage({ - Key? key, + super.key, required this.package, - }) : super(key: key); + }); final String package; @override diff --git a/lib/views/pages/favorites_page.dart b/lib/views/pages/favorites_page.dart index c225b690..fc5cc363 100644 --- a/lib/views/pages/favorites_page.dart +++ b/lib/views/pages/favorites_page.dart @@ -9,7 +9,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; import 'package:miru_app/views/widgets/progress.dart'; class FavoritesPage extends fluent.StatefulWidget { - const FavoritesPage({Key? key, required this.type}) : super(key: key); + const FavoritesPage({super.key, required this.type}); final ExtensionType type; @override diff --git a/lib/views/pages/home_page.dart b/lib/views/pages/home_page.dart index 7d14b535..3b8318b7 100644 --- a/lib/views/pages/home_page.dart +++ b/lib/views/pages/home_page.dart @@ -8,7 +8,7 @@ import 'package:miru_app/utils/i18n.dart'; import 'package:miru_app/views/widgets/platform_widget.dart'; class HomePage extends StatefulWidget { - const HomePage({Key? key}) : super(key: key); + const HomePage({super.key}); @override State createState() => _HomePageState(); diff --git a/lib/views/pages/log_page.dart b/lib/views/pages/log_page.dart index 349bc34c..9604c087 100644 --- a/lib/views/pages/log_page.dart +++ b/lib/views/pages/log_page.dart @@ -7,9 +7,9 @@ import 'package:miru_app/views/widgets/log/extension_log_tile.dart'; class ExtensionLogWindow extends StatefulWidget { const ExtensionLogWindow({ - Key? key, + super.key, required this.windowController, - }) : super(key: key); + }); final WindowController windowController; @override diff --git a/lib/views/pages/main_page.dart b/lib/views/pages/main_page.dart index 263110fb..c377ba55 100644 --- a/lib/views/pages/main_page.dart +++ b/lib/views/pages/main_page.dart @@ -16,11 +16,11 @@ import 'package:window_manager/window_manager.dart'; class DesktopMainPage extends StatefulWidget { const DesktopMainPage({ - Key? key, + super.key, required this.child, required this.shellContext, required this.state, - }) : super(key: key); + }); final Widget child; final BuildContext? shellContext; @@ -150,7 +150,7 @@ class _DesktopMainPageState extends State { } class AndroidMainPage extends fluent.StatefulWidget { - const AndroidMainPage({Key? key}) : super(key: key); + const AndroidMainPage({super.key}); @override fluent.State createState() => _AndroidMainPageState(); diff --git a/lib/views/pages/search/extension_searcher_page.dart b/lib/views/pages/search/extension_searcher_page.dart index c07f87db..f1020e88 100644 --- a/lib/views/pages/search/extension_searcher_page.dart +++ b/lib/views/pages/search/extension_searcher_page.dart @@ -20,10 +20,10 @@ import 'package:miru_app/views/widgets/search_appbar.dart'; class ExtensionSearcherPage extends fluent.StatefulWidget { const ExtensionSearcherPage({ - Key? key, + super.key, required this.package, this.keyWord, - }) : super(key: key); + }); final String package; final String? keyWord; @@ -356,12 +356,11 @@ class _ExtensionSearcherPageState extends fluent.State { class _ExtensionFilterWidget extends StatefulWidget { const _ExtensionFilterWidget({ - Key? key, required this.runtime, required this.selectedFilters, required this.onSelectFilter, required this.filters, - }) : super(key: key); + }); final ExtensionService runtime; final Map filters; final Map> selectedFilters; diff --git a/lib/views/pages/search/search_page.dart b/lib/views/pages/search/search_page.dart index 611203b4..3c8c316c 100644 --- a/lib/views/pages/search/search_page.dart +++ b/lib/views/pages/search/search_page.dart @@ -11,7 +11,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; import 'package:miru_app/views/widgets/search_appbar.dart'; class SearchPage extends StatefulWidget { - const SearchPage({Key? key}) : super(key: key); + const SearchPage({super.key}); @override State createState() => _SearchPageState(); diff --git a/lib/views/pages/settings_page.dart b/lib/views/pages/settings_page.dart index 8d8a7fc3..4582238e 100644 --- a/lib/views/pages/settings_page.dart +++ b/lib/views/pages/settings_page.dart @@ -24,7 +24,7 @@ import 'package:tmdb_api/tmdb_api.dart'; import 'package:url_launcher/url_launcher.dart'; class SettingsPage extends StatefulWidget { - const SettingsPage({Key? key}) : super(key: key); + const SettingsPage({super.key}); @override State createState() => _SettingsPageState(); diff --git a/lib/views/pages/watch/reader/comic/comic_reader.dart b/lib/views/pages/watch/reader/comic/comic_reader.dart index ee5ee035..063768f2 100644 --- a/lib/views/pages/watch/reader/comic/comic_reader.dart +++ b/lib/views/pages/watch/reader/comic/comic_reader.dart @@ -12,7 +12,7 @@ import 'package:window_manager/window_manager.dart'; class ComicReader extends StatefulWidget { const ComicReader({ - Key? key, + super.key, required this.title, required this.playList, required this.detailUrl, @@ -20,7 +20,7 @@ class ComicReader extends StatefulWidget { required this.episodeGroupId, required this.runtime, this.cover, - }) : super(key: key); + }); final String title; final List playList; diff --git a/lib/views/pages/watch/reader/comic/comic_reader_content.dart b/lib/views/pages/watch/reader/comic/comic_reader_content.dart index bf2589ab..f91a02e8 100644 --- a/lib/views/pages/watch/reader/comic/comic_reader_content.dart +++ b/lib/views/pages/watch/reader/comic/comic_reader_content.dart @@ -15,7 +15,7 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:extended_image/extended_image.dart'; class ComicReaderContent extends StatefulWidget { - const ComicReaderContent(this.tag, {Key? key}) : super(key: key); + const ComicReaderContent(this.tag, {super.key}); final String tag; @override @@ -112,7 +112,7 @@ class _ComicReaderContentState extends State { onInteractionUpdate: (x) { double correctScaleValue = transformationController.value.getMaxScaleOnAxis(); - if (correctScaleValue > minScaleValue) ; + if (correctScaleValue > minScaleValue) {} if (x.scale == correctScaleValue) { setState(() { isZoomed = false; diff --git a/lib/views/pages/watch/reader/comic/comic_reader_settings.dart b/lib/views/pages/watch/reader/comic/comic_reader_settings.dart index a0eb18fb..7e494f49 100644 --- a/lib/views/pages/watch/reader/comic/comic_reader_settings.dart +++ b/lib/views/pages/watch/reader/comic/comic_reader_settings.dart @@ -7,7 +7,7 @@ import 'package:miru_app/utils/i18n.dart'; import 'package:miru_app/views/widgets/platform_widget.dart'; class ComicReaderSettings extends StatefulWidget { - const ComicReaderSettings(this.tag, {Key? key}) : super(key: key); + const ComicReaderSettings(this.tag, {super.key}); final String tag; @override diff --git a/lib/views/pages/watch/reader/novel/novel_reader.dart b/lib/views/pages/watch/reader/novel/novel_reader.dart index de3c9725..29e903b7 100644 --- a/lib/views/pages/watch/reader/novel/novel_reader.dart +++ b/lib/views/pages/watch/reader/novel/novel_reader.dart @@ -9,7 +9,7 @@ import 'package:miru_app/data/services/extension_service.dart'; class NovelReader extends StatefulWidget { const NovelReader({ - Key? key, + super.key, required this.playList, required this.runtime, required this.episodeGroupId, @@ -17,7 +17,7 @@ class NovelReader extends StatefulWidget { required this.title, required this.detailUrl, this.cover, - }) : super(key: key); + }); final String title; final List playList; diff --git a/lib/views/pages/watch/reader/novel/novel_reader_content.dart b/lib/views/pages/watch/reader/novel/novel_reader_content.dart index e137d9e8..e8460c99 100644 --- a/lib/views/pages/watch/reader/novel/novel_reader_content.dart +++ b/lib/views/pages/watch/reader/novel/novel_reader_content.dart @@ -9,7 +9,7 @@ import 'package:fluent_ui/fluent_ui.dart' as fluent; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class NovelReaderContent extends StatefulWidget { - const NovelReaderContent(this.tag, {Key? key}) : super(key: key); + const NovelReaderContent(this.tag, {super.key}); final String tag; @override diff --git a/lib/views/pages/watch/reader/novel/novel_reader_settings.dart b/lib/views/pages/watch/reader/novel/novel_reader_settings.dart index aa7bc42d..7dd0c4c9 100644 --- a/lib/views/pages/watch/reader/novel/novel_reader_settings.dart +++ b/lib/views/pages/watch/reader/novel/novel_reader_settings.dart @@ -6,7 +6,7 @@ import 'package:miru_app/utils/i18n.dart'; import 'package:miru_app/views/widgets/platform_widget.dart'; class NovelReaderSettings extends StatefulWidget { - const NovelReaderSettings(this.tag, {Key? key}) : super(key: key); + const NovelReaderSettings(this.tag, {super.key}); final String tag; @override diff --git a/lib/views/pages/watch/video/video_player.dart b/lib/views/pages/watch/video/video_player.dart index 9503af1b..726ced22 100644 --- a/lib/views/pages/watch/video/video_player.dart +++ b/lib/views/pages/watch/video/video_player.dart @@ -10,14 +10,14 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class VideoPlayer extends StatefulWidget { const VideoPlayer({ - Key? key, + super.key, required this.playList, required this.runtime, required this.episodeGroupId, required this.playerIndex, required this.title, required this.detailUrl, - }) : super(key: key); + }); final String title; final List playList; @@ -58,10 +58,9 @@ class _VideoPlayerState extends State { _buildContent() { return Obx(() { final maxWidth = MediaQuery.of(context).size.width; - return WillPopScope( - onWillPop: () async { + return PopScope( + onPopInvoked: (_) async { await _c.onExit(); - return true; }, child: Row( children: [ diff --git a/lib/views/pages/watch/video/video_player_content.dart b/lib/views/pages/watch/video/video_player_content.dart index bb848484..3bf13267 100644 --- a/lib/views/pages/watch/video/video_player_content.dart +++ b/lib/views/pages/watch/video/video_player_content.dart @@ -10,9 +10,9 @@ import 'package:window_manager/window_manager.dart'; class VideoPlayerConten extends StatefulWidget { const VideoPlayerConten({ - Key? key, + super.key, required this.tag, - }) : super(key: key); + }); final String tag; @override diff --git a/lib/views/pages/watch/watch_page.dart b/lib/views/pages/watch/watch_page.dart index 5911f53d..a239bab5 100644 --- a/lib/views/pages/watch/watch_page.dart +++ b/lib/views/pages/watch/watch_page.dart @@ -7,7 +7,7 @@ import 'package:miru_app/utils/extension.dart'; class WatchPage extends StatelessWidget { const WatchPage({ - Key? key, + super.key, required this.playList, required this.package, required this.title, @@ -15,7 +15,7 @@ class WatchPage extends StatelessWidget { required this.episodeGroupId, required this.detailUrl, this.cover, - }) : super(key: key); + }); final List playList; final int playerIndex; final String title; diff --git a/lib/views/pages/webview_page.dart b/lib/views/pages/webview_page.dart index 65dfedfd..da385831 100644 --- a/lib/views/pages/webview_page.dart +++ b/lib/views/pages/webview_page.dart @@ -4,10 +4,10 @@ import 'package:miru_app/data/services/extension_service.dart'; class WebViewPage extends StatefulWidget { const WebViewPage({ - Key? key, + super.key, required this.extensionRuntime, required this.url, - }) : super(key: key); + }); final ExtensionService extensionRuntime; final String url; diff --git a/lib/views/widgets/button.dart b/lib/views/widgets/button.dart index 06d496c7..57e688f6 100644 --- a/lib/views/widgets/button.dart +++ b/lib/views/widgets/button.dart @@ -4,10 +4,10 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class PlatformButton extends StatelessWidget { const PlatformButton({ - Key? key, + super.key, required this.child, this.onPressed, - }) : super(key: key); + }); final Widget child; final VoidCallback? onPressed; @@ -30,10 +30,10 @@ class PlatformButton extends StatelessWidget { class PlatformFilledButton extends StatelessWidget { const PlatformFilledButton({ - Key? key, + super.key, required this.child, this.onPressed, - }) : super(key: key); + }); final Widget child; final VoidCallback? onPressed; @@ -56,10 +56,10 @@ class PlatformFilledButton extends StatelessWidget { class PlatformTextButton extends StatelessWidget { const PlatformTextButton({ - Key? key, + super.key, required this.child, this.onPressed, - }) : super(key: key); + }); final Widget child; final VoidCallback? onPressed; @@ -82,10 +82,10 @@ class PlatformTextButton extends StatelessWidget { class PlatformIconButton extends StatelessWidget { const PlatformIconButton({ - Key? key, + super.key, required this.icon, this.onPressed, - }) : super(key: key); + }); final Widget icon; final VoidCallback? onPressed; @@ -108,11 +108,11 @@ class PlatformIconButton extends StatelessWidget { class PlatformToggleButton extends fluent.StatelessWidget { const PlatformToggleButton({ - Key? key, + super.key, required this.checked, required this.onChanged, required this.text, - }) : super(key: key); + }); final bool checked; final void Function(bool)? onChanged; diff --git a/lib/views/widgets/cache_network_image.dart b/lib/views/widgets/cache_network_image.dart index b87bf662..21525cac 100644 --- a/lib/views/widgets/cache_network_image.dart +++ b/lib/views/widgets/cache_network_image.dart @@ -5,13 +5,13 @@ import 'package:flutter/material.dart'; class CacheNetWorkImagePic extends StatelessWidget { const CacheNetWorkImagePic( this.url, { - Key? key, + super.key, this.fit = BoxFit.cover, this.width, this.height, this.fallback, this.headers, - }) : super(key: key); + }); final String url; final BoxFit fit; final double? width; @@ -42,13 +42,13 @@ class CacheNetWorkImagePic extends StatelessWidget { class CacheNetWorkImageComic extends StatelessWidget { const CacheNetWorkImageComic( this.url, { - Key? key, + super.key, this.fit = BoxFit.cover, this.width, this.height, this.fallback, this.headers, - }) : super(key: key); + }); final String url; final BoxFit fit; final double? width; diff --git a/lib/views/widgets/card_tile.dart b/lib/views/widgets/card_tile.dart index 366166e0..d569e1ab 100644 --- a/lib/views/widgets/card_tile.dart +++ b/lib/views/widgets/card_tile.dart @@ -2,12 +2,12 @@ import 'package:fluent_ui/fluent_ui.dart'; class CardTile extends StatelessWidget { const CardTile({ - Key? key, + super.key, required this.title, required this.child, this.trailing, this.leading, - }) : super(key: key); + }); final String title; final Widget? leading; final Widget? trailing; diff --git a/lib/views/widgets/cover.dart b/lib/views/widgets/cover.dart index a563c10a..3c405abb 100644 --- a/lib/views/widgets/cover.dart +++ b/lib/views/widgets/cover.dart @@ -4,11 +4,11 @@ import 'package:miru_app/views/widgets/cache_network_image.dart'; class Cover extends StatelessWidget { const Cover({ - Key? key, + super.key, required this.alt, this.url, this.noText = false, - }) : super(key: key); + }); final String? url; final String alt; final bool noText; diff --git a/lib/views/widgets/detail/detail_appbar_flexible_space.dart b/lib/views/widgets/detail/detail_appbar_flexible_space.dart index 6042d6e1..84ba6daa 100644 --- a/lib/views/widgets/detail/detail_appbar_flexible_space.dart +++ b/lib/views/widgets/detail/detail_appbar_flexible_space.dart @@ -9,9 +9,9 @@ import 'package:miru_app/views/widgets/cover.dart'; class DetailAppbarflexibleSpace extends StatefulWidget { const DetailAppbarflexibleSpace({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; diff --git a/lib/views/widgets/detail/detail_appbar_title.dart b/lib/views/widgets/detail/detail_appbar_title.dart index b2597413..a5374da7 100644 --- a/lib/views/widgets/detail/detail_appbar_title.dart +++ b/lib/views/widgets/detail/detail_appbar_title.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; class DetailAppbarTitle extends StatefulWidget { const DetailAppbarTitle( this.text, { - Key? key, + super.key, required this.controller, - }) : super(key: key); + }); final String text; final ScrollController controller; diff --git a/lib/views/widgets/detail/detail_background_color.dart b/lib/views/widgets/detail/detail_background_color.dart index aee05f4c..fc0e32e2 100644 --- a/lib/views/widgets/detail/detail_background_color.dart +++ b/lib/views/widgets/detail/detail_background_color.dart @@ -2,9 +2,9 @@ import 'package:fluent_ui/fluent_ui.dart'; class DetailBackgroundColor extends StatefulWidget { const DetailBackgroundColor({ - Key? key, + super.key, required this.controller, - }) : super(key: key); + }); final ScrollController controller; @override diff --git a/lib/views/widgets/detail/detail_continue_play.dart b/lib/views/widgets/detail/detail_continue_play.dart index 59fbf976..3ad66f19 100644 --- a/lib/views/widgets/detail/detail_continue_play.dart +++ b/lib/views/widgets/detail/detail_continue_play.dart @@ -9,9 +9,9 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class DetailContinuePlay extends StatefulWidget { const DetailContinuePlay({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; @override diff --git a/lib/views/widgets/detail/detail_episodes.dart b/lib/views/widgets/detail/detail_episodes.dart index eb9246d6..586ee69e 100644 --- a/lib/views/widgets/detail/detail_episodes.dart +++ b/lib/views/widgets/detail/detail_episodes.dart @@ -12,9 +12,9 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class DetailEpisodes extends StatefulWidget { const DetailEpisodes({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; @override diff --git a/lib/views/widgets/detail/detail_extension_tile.dart b/lib/views/widgets/detail/detail_extension_tile.dart index 6e56b62f..40c9e4a1 100644 --- a/lib/views/widgets/detail/detail_extension_tile.dart +++ b/lib/views/widgets/detail/detail_extension_tile.dart @@ -7,9 +7,9 @@ import 'package:miru_app/views/widgets/cache_network_image.dart'; class DetailExtensionTile extends StatelessWidget { const DetailExtensionTile({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; diff --git a/lib/views/widgets/detail/detail_favorite_button.dart b/lib/views/widgets/detail/detail_favorite_button.dart index d4df2f86..37596b20 100644 --- a/lib/views/widgets/detail/detail_favorite_button.dart +++ b/lib/views/widgets/detail/detail_favorite_button.dart @@ -7,9 +7,9 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class DetailFavoriteButton extends StatefulWidget { const DetailFavoriteButton({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; @override diff --git a/lib/views/widgets/detail/detail_overview.dart b/lib/views/widgets/detail/detail_overview.dart index e4e9537e..ceed041b 100644 --- a/lib/views/widgets/detail/detail_overview.dart +++ b/lib/views/widgets/detail/detail_overview.dart @@ -7,9 +7,9 @@ import 'package:miru_app/views/widgets/cache_network_image.dart'; class DetailOverView extends StatelessWidget { const DetailOverView({ - Key? key, + super.key, this.tag, - }) : super(key: key); + }); final String? tag; diff --git a/lib/views/widgets/extension/extension_card.dart b/lib/views/widgets/extension/extension_card.dart index 549064f0..f11a5b92 100644 --- a/lib/views/widgets/extension/extension_card.dart +++ b/lib/views/widgets/extension/extension_card.dart @@ -10,14 +10,14 @@ import 'package:miru_app/views/widgets/progress.dart'; class ExtensionCard extends StatefulWidget { const ExtensionCard({ - Key? key, + super.key, required this.name, required this.version, required this.icon, required this.package, required this.nsfw, required this.type, - }) : super(key: key); + }); final String? icon; final String name; final String version; diff --git a/lib/views/widgets/extension/extension_tile.dart b/lib/views/widgets/extension/extension_tile.dart index 2e502612..ec2e06f3 100644 --- a/lib/views/widgets/extension/extension_tile.dart +++ b/lib/views/widgets/extension/extension_tile.dart @@ -13,7 +13,7 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:path/path.dart' as path; class ExtensionTile extends StatefulWidget { - const ExtensionTile(this.extension, {Key? key}) : super(key: key); + const ExtensionTile(this.extension, {super.key}); final Extension extension; @override diff --git a/lib/views/widgets/extension/info_card.dart b/lib/views/widgets/extension/info_card.dart index f6e65672..33a0246a 100644 --- a/lib/views/widgets/extension/info_card.dart +++ b/lib/views/widgets/extension/info_card.dart @@ -3,11 +3,11 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class InfoCard extends StatelessWidget { const InfoCard({ - Key? key, + super.key, required this.icon, required this.title, required this.content, - }) : super(key: key); + }); final IconData icon; final String title; final String content; diff --git a/lib/views/widgets/extension_item_card.dart b/lib/views/widgets/extension_item_card.dart index 36d25cd0..919bf6ee 100644 --- a/lib/views/widgets/extension_item_card.dart +++ b/lib/views/widgets/extension_item_card.dart @@ -7,13 +7,13 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class ExtensionItemCard extends StatefulWidget { const ExtensionItemCard({ - Key? key, + super.key, required this.title, required this.url, required this.package, this.cover, this.update, - }) : super(key: key); + }); final String title; final String? cover; final String? update; diff --git a/lib/views/widgets/grid_item_tile.dart b/lib/views/widgets/grid_item_tile.dart index c5e55e21..13202d5b 100644 --- a/lib/views/widgets/grid_item_tile.dart +++ b/lib/views/widgets/grid_item_tile.dart @@ -4,12 +4,12 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class GridItemTile extends StatefulWidget { const GridItemTile({ - Key? key, + super.key, required this.title, this.cover, this.subtitle, this.onTap, - }) : super(key: key); + }); final String title; final String? cover; final String? subtitle; diff --git a/lib/views/widgets/home/home_favorites.dart b/lib/views/widgets/home/home_favorites.dart index 101723ea..615b27e7 100644 --- a/lib/views/widgets/home/home_favorites.dart +++ b/lib/views/widgets/home/home_favorites.dart @@ -11,10 +11,10 @@ import 'package:miru_app/views/widgets/horizontal_list.dart'; class HomeFavorites extends StatefulWidget { const HomeFavorites({ - Key? key, + super.key, required this.type, required this.data, - }) : super(key: key); + }); final ExtensionType type; final List data; diff --git a/lib/views/widgets/home/home_recent.dart b/lib/views/widgets/home/home_recent.dart index 94426b10..06c65b2f 100644 --- a/lib/views/widgets/home/home_recent.dart +++ b/lib/views/widgets/home/home_recent.dart @@ -7,9 +7,9 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class HomeRecent extends StatefulWidget { const HomeRecent({ - Key? key, + super.key, required this.data, - }) : super(key: key); + }); final List data; @override diff --git a/lib/views/widgets/home/home_resent_card.dart b/lib/views/widgets/home/home_resent_card.dart index 47715e33..aec13622 100644 --- a/lib/views/widgets/home/home_resent_card.dart +++ b/lib/views/widgets/home/home_resent_card.dart @@ -20,9 +20,9 @@ import 'package:palette_generator/palette_generator.dart'; class HomeRecentCard extends StatefulWidget { const HomeRecentCard({ - Key? key, + super.key, required this.history, - }) : super(key: key); + }); final History history; @override diff --git a/lib/views/widgets/horizontal_list.dart b/lib/views/widgets/horizontal_list.dart index d8d2f339..13e1e96f 100644 --- a/lib/views/widgets/horizontal_list.dart +++ b/lib/views/widgets/horizontal_list.dart @@ -5,7 +5,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class HorizontalList extends StatefulWidget { const HorizontalList({ - Key? key, + super.key, required this.title, required this.onClickMore, this.itemCount, @@ -14,8 +14,7 @@ class HorizontalList extends StatefulWidget { }) : assert( (itemCount != null && itemBuilder != null) || contentBuilder != null, "itemCount and itemBuilder or contentBuilder must not be null", - ), - super(key: key); + ); final String title; final void Function() onClickMore; final int? itemCount; @@ -136,8 +135,7 @@ class _HorizontalListState extends State { } class HorizontalTitle extends StatefulWidget { - const HorizontalTitle(this.text, {Key? key, required this.onClick}) - : super(key: key); + const HorizontalTitle(this.text, {super.key, required this.onClick}); final String text; final Function() onClick; diff --git a/lib/views/widgets/infinite_scroller.dart b/lib/views/widgets/infinite_scroller.dart index a3ee81ca..13fc0991 100644 --- a/lib/views/widgets/infinite_scroller.dart +++ b/lib/views/widgets/infinite_scroller.dart @@ -7,14 +7,14 @@ import 'package:easy_refresh/easy_refresh.dart'; class InfiniteScroller extends StatefulWidget { const InfiniteScroller({ - Key? key, + super.key, required this.child, required this.onRefresh, required this.onLoad, this.refreshOnStart = true, this.enableInfiniteScroll = true, this.easyRefreshController, - }) : super(key: key); + }); final Widget child; final Future Function() onRefresh; diff --git a/lib/views/widgets/list_title.dart b/lib/views/widgets/list_title.dart index dc282845..ad09e29b 100644 --- a/lib/views/widgets/list_title.dart +++ b/lib/views/widgets/list_title.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:miru_app/views/widgets/platform_widget.dart'; class ListTitle extends StatelessWidget { - const ListTitle({Key? key, required this.title}) : super(key: key); + const ListTitle({super.key, required this.title}); final String title; diff --git a/lib/views/widgets/log/extension_log_tile.dart b/lib/views/widgets/log/extension_log_tile.dart index 8ef563e6..8a473e24 100644 --- a/lib/views/widgets/log/extension_log_tile.dart +++ b/lib/views/widgets/log/extension_log_tile.dart @@ -3,7 +3,7 @@ import 'package:miru_app/models/extension.dart'; import 'package:miru_app/views/widgets/cache_network_image.dart'; class ExtensionLogTile extends StatelessWidget { - const ExtensionLogTile({Key? key, required this.log}) : super(key: key); + const ExtensionLogTile({super.key, required this.log}); final ExtensionLog log; @override diff --git a/lib/views/widgets/progress.dart b/lib/views/widgets/progress.dart index dc418ae5..821e9041 100644 --- a/lib/views/widgets/progress.dart +++ b/lib/views/widgets/progress.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:miru_app/views/widgets/platform_widget.dart'; class ProgressRing extends StatelessWidget { - const ProgressRing({Key? key, this.value}) : super(key: key); + const ProgressRing({super.key, this.value}); final double? value; @override @@ -20,7 +20,7 @@ class ProgressRing extends StatelessWidget { } class ProgressBar extends StatelessWidget { - const ProgressBar({Key? key, this.value}) : super(key: key); + const ProgressBar({super.key, this.value}); final double? value; @override diff --git a/lib/views/widgets/search/search_all_extension.dart b/lib/views/widgets/search/search_all_extension.dart index da7cde4b..f0b4e281 100644 --- a/lib/views/widgets/search/search_all_extension.dart +++ b/lib/views/widgets/search/search_all_extension.dart @@ -11,11 +11,11 @@ import 'package:miru_app/views/widgets/button.dart'; class SearchAllExtSearch extends StatefulWidget { const SearchAllExtSearch({ - Key? key, + super.key, required this.kw, required this.runtimeList, required this.onClickMore, - }) : super(key: key); + }); final String kw; final List runtimeList; final Function(int) onClickMore; diff --git a/lib/views/widgets/search/search_all_tile.dart b/lib/views/widgets/search/search_all_tile.dart index a81796dc..89daaf67 100644 --- a/lib/views/widgets/search/search_all_tile.dart +++ b/lib/views/widgets/search/search_all_tile.dart @@ -9,11 +9,11 @@ import 'package:miru_app/views/widgets/progress.dart'; class SearchAllTile extends StatefulWidget { const SearchAllTile({ - Key? key, + super.key, required this.searchResult, required this.onClickMore, required this.kw, - }) : super(key: key); + }); final String kw; final SearchResult searchResult; diff --git a/lib/views/widgets/settings_input_tile.dart b/lib/views/widgets/settings_input_tile.dart index c08da165..4afe511e 100644 --- a/lib/views/widgets/settings_input_tile.dart +++ b/lib/views/widgets/settings_input_tile.dart @@ -6,14 +6,14 @@ import 'package:miru_app/views/widgets/settings_tile.dart'; class SettingsIntpuTile extends fluent.StatefulWidget { const SettingsIntpuTile({ - Key? key, + super.key, this.icon, required this.title, required this.onChanged, required this.text, required this.buildSubtitle, this.trailing = const Icon(Icons.chevron_right), - }) : super(key: key); + }); final Widget? icon; final String title; final String Function() buildSubtitle; diff --git a/lib/views/widgets/settings_numberbox_button.dart b/lib/views/widgets/settings_numberbox_button.dart index 1dadd812..57792f1d 100644 --- a/lib/views/widgets/settings_numberbox_button.dart +++ b/lib/views/widgets/settings_numberbox_button.dart @@ -1,19 +1,17 @@ import 'package:fluent_ui/fluent_ui.dart' as fluent; import 'package:flutter/material.dart'; -import 'package:miru_app/utils/i18n.dart'; // import 'package:miru_app/views/widgets/platform_widget.dart'; -import 'package:miru_app/views/widgets/settings_tile.dart'; class SettingNumboxButton extends fluent.StatefulWidget { const SettingNumboxButton({ - Key? key, + super.key, this.icon, required this.title, required this.onChanged, required this.button1text, required this.button2text, required this.numberBoxvalue, - }) : super(key: key); + }); final Widget? icon; final String title; final String button1text; diff --git a/lib/views/widgets/settings_radios_tile.dart b/lib/views/widgets/settings_radios_tile.dart index 6cc127c4..dbe27d5c 100644 --- a/lib/views/widgets/settings_radios_tile.dart +++ b/lib/views/widgets/settings_radios_tile.dart @@ -5,7 +5,7 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class SettingsRadiosTile extends StatefulWidget { const SettingsRadiosTile({ - Key? key, + super.key, this.icon, required this.title, this.buildSubtitle, @@ -13,7 +13,7 @@ class SettingsRadiosTile extends StatefulWidget { required this.applyValue, required this.buildGroupValue, this.trailing = const Icon(Icons.chevron_right), - }) : super(key: key); + }); final Widget? icon; final String title; final String Function()? buildSubtitle; diff --git a/lib/views/widgets/settings_switch_tile.dart b/lib/views/widgets/settings_switch_tile.dart index 6fd84d2f..8301c19e 100644 --- a/lib/views/widgets/settings_switch_tile.dart +++ b/lib/views/widgets/settings_switch_tile.dart @@ -5,13 +5,13 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class SettingsSwitchTile extends StatefulWidget { const SettingsSwitchTile({ - Key? key, + super.key, this.icon, required this.title, required this.buildValue, required this.onChanged, this.buildSubtitle, - }) : super(key: key); + }); final Widget? icon; final String title; final String Function()? buildSubtitle; diff --git a/lib/views/widgets/settings_tile.dart b/lib/views/widgets/settings_tile.dart index 3f20f1f9..178df90c 100644 --- a/lib/views/widgets/settings_tile.dart +++ b/lib/views/widgets/settings_tile.dart @@ -4,13 +4,13 @@ import 'package:miru_app/views/widgets/platform_widget.dart'; class SettingsTile extends StatefulWidget { const SettingsTile({ - Key? key, + super.key, this.icon, required this.title, this.trailing, this.buildSubtitle, this.onTap, - }) : super(key: key); + }); final Widget? icon; final String title; final String Function()? buildSubtitle; diff --git a/lib/views/widgets/watch/comic_view.dart b/lib/views/widgets/watch/comic_view.dart index 3bc9efe3..5afce70b 100644 --- a/lib/views/widgets/watch/comic_view.dart +++ b/lib/views/widgets/watch/comic_view.dart @@ -7,10 +7,10 @@ import 'package:miru_app/controllers/watch/reader_controller.dart'; class ReaderView extends StatelessWidget { const ReaderView( this.tag, { - Key? key, + super.key, required this.content, required this.buildSettings, - }) : super(key: key); + }); final String tag; final Widget content; final Widget Function(BuildContext context) buildSettings; diff --git a/lib/views/widgets/watch/control_panel_footer.dart b/lib/views/widgets/watch/control_panel_footer.dart index 2ae0bb27..c80a83a4 100644 --- a/lib/views/widgets/watch/control_panel_footer.dart +++ b/lib/views/widgets/watch/control_panel_footer.dart @@ -8,7 +8,7 @@ import 'package:miru_app/utils/i18n.dart'; import 'package:miru_app/views/widgets/button.dart'; class ControlPanelFooter extends StatelessWidget { - const ControlPanelFooter(this.tag, {Key? key}) : super(key: key); + const ControlPanelFooter(this.tag, {super.key}); final String tag; @override diff --git a/lib/views/widgets/watch/control_panel_header.dart b/lib/views/widgets/watch/control_panel_header.dart index 3c9c5823..9c3a54fd 100644 --- a/lib/views/widgets/watch/control_panel_header.dart +++ b/lib/views/widgets/watch/control_panel_header.dart @@ -12,9 +12,9 @@ import 'package:window_manager/window_manager.dart'; class ControlPanelHeader extends StatefulWidget { const ControlPanelHeader( this.tag, { - Key? key, + super.key, required this.buildSettings, - }) : super(key: key); + }); final String tag; final Widget Function(BuildContext context) buildSettings; diff --git a/lib/views/widgets/watch/playlist.dart b/lib/views/widgets/watch/playlist.dart index a79316d2..7900921d 100644 --- a/lib/views/widgets/watch/playlist.dart +++ b/lib/views/widgets/watch/playlist.dart @@ -5,12 +5,12 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class PlayList extends fluent.StatelessWidget { const PlayList({ - Key? key, + super.key, required this.title, required this.list, required this.selectIndex, required this.onChange, - }) : super(key: key); + }); final String title; final List list; final int selectIndex; @@ -69,11 +69,11 @@ class PlayList extends fluent.StatelessWidget { class PlaylistAndroidTile extends StatelessWidget { const PlaylistAndroidTile({ - Key? key, + super.key, required this.title, required this.onTap, required this.selected, - }) : super(key: key); + }); final String title; final Function() onTap; final bool selected; diff --git a/lib/views/widgets/watch/reader_view.dart b/lib/views/widgets/watch/reader_view.dart index 9e8a6182..b75b36b0 100644 --- a/lib/views/widgets/watch/reader_view.dart +++ b/lib/views/widgets/watch/reader_view.dart @@ -7,10 +7,10 @@ import 'package:miru_app/controllers/watch/reader_controller.dart'; class ReaderView extends StatelessWidget { const ReaderView( this.tag, { - Key? key, + super.key, required this.content, required this.buildSettings, - }) : super(key: key); + }); final String tag; final Widget content; final Widget Function(BuildContext context) buildSettings;