From 57951225103555d6313b86d8e9927fb4343368f5 Mon Sep 17 00:00:00 2001 From: dom Date: Thu, 21 May 2026 12:12:34 +0800 Subject: [PATCH] opt import Signed-off-by: dom --- lib/common/widgets/flutter/chat_list_view.dart | 2 +- .../flutter/draggable_scrollable_sheet.dart | 12 +++++++++--- lib/common/widgets/flutter/page/scrollable.dart | 2 +- .../widgets/flutter/text_field/editable_text.dart | 2 +- lib/common/widgets/flutter/vertical_slider.dart | 2 +- .../widgets/image/cached_network_svg_image.dart | 2 +- .../progress_bar/audio_video_progress_bar.dart | 4 ++-- lib/grpc/grpc_req.dart | 2 +- lib/http/dynamics.dart | 2 +- lib/http/init.dart | 5 ++--- lib/http/login.dart | 2 +- lib/http/member.dart | 2 +- lib/http/msg.dart | 2 +- lib/http/search.dart | 4 ++-- lib/http/sponsor_block.dart | 2 +- lib/http/video.dart | 2 +- lib/main.dart | 3 ++- lib/models/common/sponsor_block/segment_type.dart | 2 +- lib/models/dynamics/result.dart | 2 +- lib/models_new/msg/msg_sys/data.dart | 2 +- lib/pages/about/view.dart | 3 +-- lib/pages/audio/controller.dart | 2 +- lib/pages/common/common_controller.dart | 2 -- lib/pages/common/common_intro_controller.dart | 4 ++-- lib/pages/common/publish/common_publish_page.dart | 3 +-- .../common/publish/common_rich_text_pub_page.dart | 2 +- lib/pages/danmaku/controller.dart | 2 +- lib/pages/danmaku_block/controller.dart | 2 +- lib/pages/download/controller.dart | 2 -- lib/pages/download/detail/view.dart | 2 +- lib/pages/download/detail/widgets/item.dart | 2 +- lib/pages/download/view.dart | 2 -- lib/pages/dynamics/controller.dart | 2 -- lib/pages/dynamics/widgets/vote.dart | 2 +- lib/pages/dynamics_mention/view.dart | 5 ++--- lib/pages/dynamics_select_topic/view.dart | 5 ++--- lib/pages/home/controller.dart | 2 -- lib/pages/live_room/controller.dart | 4 ++-- lib/pages/live_room/send_danmaku/view.dart | 2 -- lib/pages/live_room/superchat/superchat_card.dart | 2 +- lib/pages/live_room/view.dart | 14 ++++++++------ lib/pages/live_room/widgets/header_control.dart | 2 +- lib/pages/login/controller.dart | 2 +- lib/pages/login/view.dart | 6 +----- lib/pages/main/controller.dart | 2 -- lib/pages/main/view.dart | 2 +- lib/pages/mine/view.dart | 2 -- lib/pages/music/view.dart | 6 +++--- lib/pages/rank/controller.dart | 2 -- lib/pages/search/controller.dart | 2 +- lib/pages/setting/models/extra_settings.dart | 2 +- lib/pages/setting/models/video_settings.dart | 2 +- lib/pages/setting/pages/logs.dart | 4 ++-- lib/pages/setting/widgets/select_dialog.dart | 2 +- lib/pages/video/controller.dart | 6 ++---- lib/pages/video/introduction/local/view.dart | 2 +- lib/pages/video/introduction/pgc/controller.dart | 7 +++---- .../video/introduction/pgc/widgets/pgc_panel.dart | 2 +- lib/pages/video/introduction/ugc/controller.dart | 7 +++---- lib/pages/video/introduction/ugc/widgets/page.dart | 8 ++++---- .../video/introduction/ugc/widgets/season.dart | 2 +- .../introduction/ugc/widgets/triple_mixin.dart | 2 +- lib/pages/video/pay_coins/view.dart | 5 ++--- lib/pages/video/post_panel/view.dart | 8 ++++---- lib/pages/video/reply_new/view.dart | 7 +++---- lib/pages/video/send_danmaku/view.dart | 2 -- lib/pages/video/view.dart | 12 +++++------- lib/pages/video/widgets/player_focus.dart | 2 +- lib/pages/webview/view.dart | 2 +- lib/pages/whisper/widgets/item.dart | 2 +- lib/pages/whisper_detail/controller.dart | 3 +-- lib/pages/whisper_detail/view.dart | 1 - lib/pages/whisper_detail/widget/chat_item.dart | 2 +- lib/pages/whisper_link_setting/controller.dart | 2 -- lib/plugin/pl_player/utils/fullscreen.dart | 1 - .../pl_player/view/simple_video_texture.dart | 2 +- lib/plugin/pl_player/view/view.dart | 4 ++-- lib/plugin/pl_player/widgets/backward_seek.dart | 2 +- lib/plugin/pl_player/widgets/forward_seek.dart | 2 +- lib/plugin/pl_player/widgets/play_pause_btn.dart | 2 +- lib/services/account_service.dart | 2 +- lib/services/download/download_manager.dart | 5 ++--- lib/services/download/download_service.dart | 1 - lib/services/logger.dart | 2 +- lib/services/shutdown_timer_service.dart | 5 +++-- lib/tcp/live.dart | 6 +++--- .../accounts/account_manager/account_mgr.dart | 4 ++-- lib/utils/accounts/grpc_headers.dart | 2 +- lib/utils/app_scheme.dart | 2 +- lib/utils/json_file_handler.dart | 6 +++--- lib/utils/permission_handler.dart | 4 ++-- lib/utils/request_utils.dart | 7 +++---- lib/utils/storage.dart | 2 +- lib/utils/storage_pref.dart | 8 ++++---- lib/utils/wbi_sign.dart | 5 +++-- 95 files changed, 142 insertions(+), 176 deletions(-) diff --git a/lib/common/widgets/flutter/chat_list_view.dart b/lib/common/widgets/flutter/chat_list_view.dart index 2d820f9d4..8d6a10c2c 100644 --- a/lib/common/widgets/flutter/chat_list_view.dart +++ b/lib/common/widgets/flutter/chat_list_view.dart @@ -6,7 +6,7 @@ import 'dart:math' as math; -import 'package:flutter/foundation.dart'; +import 'package:flutter/foundation.dart' show precisionErrorTolerance; import 'package:flutter/material.dart' hide ListView; import 'package:flutter/rendering.dart' hide RenderSliverList; diff --git a/lib/common/widgets/flutter/draggable_scrollable_sheet.dart b/lib/common/widgets/flutter/draggable_scrollable_sheet.dart index a020b227b..4ba7d13e9 100644 --- a/lib/common/widgets/flutter/draggable_scrollable_sheet.dart +++ b/lib/common/widgets/flutter/draggable_scrollable_sheet.dart @@ -6,9 +6,15 @@ import 'dart:math' as math; -import 'package:collection/collection.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; +import 'package:collection/collection.dart' show IterableExtension; +import 'package:flutter/foundation.dart' + show + kFlutterMemoryAllocationsEnabled, + debugMaybeDispatchCreated, + clampDouble, + debugMaybeDispatchDisposed, + objectRuntimeType; +import 'package:flutter/gestures.dart' show Drag; import 'package:flutter/material.dart' hide DraggableScrollableSheet; part 'package:PiliPlus/common/widgets/draggable_sheet/dyn.dart'; diff --git a/lib/common/widgets/flutter/page/scrollable.dart b/lib/common/widgets/flutter/page/scrollable.dart index 1abd487d0..b6c1aa736 100644 --- a/lib/common/widgets/flutter/page/scrollable.dart +++ b/lib/common/widgets/flutter/page/scrollable.dart @@ -4,7 +4,7 @@ // ignore_for_file: prefer_initializing_formals -import 'dart:async'; +import 'dart:async' show scheduleMicrotask; import 'dart:math' as math; import 'package:PiliPlus/common/widgets/flutter/page/scrollable_helpers.dart'; diff --git a/lib/common/widgets/flutter/text_field/editable_text.dart b/lib/common/widgets/flutter/text_field/editable_text.dart index ac66f86bf..c730b3744 100644 --- a/lib/common/widgets/flutter/text_field/editable_text.dart +++ b/lib/common/widgets/flutter/text_field/editable_text.dart @@ -16,7 +16,7 @@ /// @docImport 'text_selection_toolbar_layout_delegate.dart'; library; -import 'dart:async'; +import 'dart:async' show Timer, scheduleMicrotask; import 'dart:io' show Platform; import 'dart:math' as math; import 'dart:ui' as ui hide TextStyle; diff --git a/lib/common/widgets/flutter/vertical_slider.dart b/lib/common/widgets/flutter/vertical_slider.dart index f87971610..ed03ad236 100644 --- a/lib/common/widgets/flutter/vertical_slider.dart +++ b/lib/common/widgets/flutter/vertical_slider.dart @@ -4,7 +4,7 @@ // ignore_for_file: prefer_initializing_formals -import 'dart:async'; +import 'dart:async' show Timer; import 'dart:math' as math; import 'package:flutter/cupertino.dart'; diff --git a/lib/common/widgets/image/cached_network_svg_image.dart b/lib/common/widgets/image/cached_network_svg_image.dart index 0775612ef..750c98475 100644 --- a/lib/common/widgets/image/cached_network_svg_image.dart +++ b/lib/common/widgets/image/cached_network_svg_image.dart @@ -1,6 +1,6 @@ // code from cached_network_svg_image; -import 'dart:developer'; +import 'dart:developer' show log; import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/material.dart'; diff --git a/lib/common/widgets/progress_bar/audio_video_progress_bar.dart b/lib/common/widgets/progress_bar/audio_video_progress_bar.dart index 5a8ea1cc7..296fd8108 100644 --- a/lib/common/widgets/progress_bar/audio_video_progress_bar.dart +++ b/lib/common/widgets/progress_bar/audio_video_progress_bar.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; +import 'package:flutter/gestures.dart' show HorizontalDragGestureRecognizer; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart' @@ -311,7 +311,7 @@ class _EagerHorizontalDragGestureRecognizer @override void addAllowedPointer(PointerDownEvent event) { super.addAllowedPointer(event); - resolve(GestureDisposition.accepted); + resolve(.accepted); } @override diff --git a/lib/grpc/grpc_req.dart b/lib/grpc/grpc_req.dart index 539a563dd..090a9daae 100644 --- a/lib/grpc/grpc_req.dart +++ b/lib/grpc/grpc_req.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show base64Decode, utf8; import 'dart:typed_data'; import 'package:PiliPlus/grpc/bilibili/rpc.pb.dart'; diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart index a8cb6fd49..2157cdb69 100644 --- a/lib/http/dynamics.dart +++ b/lib/http/dynamics.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonEncode; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/pair.dart'; diff --git a/lib/http/init.dart b/lib/http/init.dart index 4dad4e978..13449ee19 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -1,6 +1,5 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; +import 'dart:convert' show utf8; +import 'dart:io' show HttpClient; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/http/login.dart b/lib/http/login.dart index 742358dea..5913e3096 100644 --- a/lib/http/login.dart +++ b/lib/http/login.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show ascii; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/api.dart'; diff --git a/lib/http/member.dart b/lib/http/member.dart index 1ef7b2abc..3f9545519 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show HttpHeaders; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/api.dart'; diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 64d3ec0c8..b8c01827a 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonEncode; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; diff --git a/lib/http/search.dart b/lib/http/search.dart index 175e1ccff..b7d0f7031 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; @@ -32,7 +32,7 @@ abstract final class SearchHttp { }, ); if (res.data is String) { - Map resultMap = json.decode(res.data); + Map resultMap = jsonDecode(res.data); if (resultMap['code'] == 0) { if (resultMap['result'] is Map) { return Success(SearchSuggestModel.fromJson(resultMap['result'])); diff --git a/lib/http/sponsor_block.dart b/lib/http/sponsor_block.dart index 9cfe4c27b..d94db337c 100644 --- a/lib/http/sponsor_block.dart +++ b/lib/http/sponsor_block.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonEncode; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/init.dart'; diff --git a/lib/http/video.dart b/lib/http/video.dart index 3c42e41a3..ec684ecb7 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonEncode; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart' diff --git a/lib/main.dart b/lib/main.dart index 83292f629..282fc2144 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,5 @@ -import 'dart:io'; +import 'dart:io' + show Directory, Platform, HttpOverrides, HttpClient, SecurityContext, exit; import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/common/constants.dart'; diff --git a/lib/models/common/sponsor_block/segment_type.dart b/lib/models/common/sponsor_block/segment_type.dart index 0f8c72f95..1ca84f600 100644 --- a/lib/models/common/sponsor_block/segment_type.dart +++ b/lib/models/common/sponsor_block/segment_type.dart @@ -1,6 +1,6 @@ // ignore_for_file: constant_identifier_names -import 'dart:ui'; +import 'dart:ui' show Color; import 'package:PiliPlus/models/common/sponsor_block/action_type.dart'; diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart index 41435c580..a144a5273 100644 --- a/lib/models/dynamics/result.dart +++ b/lib/models/dynamics/result.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart'; import 'package:PiliPlus/models/dynamics/article_content_model.dart'; diff --git a/lib/models_new/msg/msg_sys/data.dart b/lib/models_new/msg/msg_sys/data.dart index 74fce1777..218b78724 100644 --- a/lib/models_new/msg/msg_sys/data.dart +++ b/lib/models_new/msg/msg_sys/data.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; class MsgSysItem { int? id; diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 0c8a9b048..e04858265 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:io' show Platform; import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/common/assets.dart'; diff --git a/lib/pages/audio/controller.dart b/lib/pages/audio/controller.dart index 6f4f12972..1e965dc91 100644 --- a/lib/pages/audio/controller.dart +++ b/lib/pages/audio/controller.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/audio.dart'; diff --git a/lib/pages/common/common_controller.dart b/lib/pages/common/common_controller.dart index c4bef1813..eefc8912e 100644 --- a/lib/pages/common/common_controller.dart +++ b/lib/pages/common/common_controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart'; import 'package:flutter/widgets.dart' show ScrollController; diff --git a/lib/pages/common/common_intro_controller.dart b/lib/pages/common/common_intro_controller.dart index bd64dda11..5c0791a48 100644 --- a/lib/pages/common/common_intro_controller.dart +++ b/lib/pages/common/common_intro_controller.dart @@ -18,8 +18,8 @@ import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; -import 'package:collection/collection.dart'; -import 'package:flutter/foundation.dart'; +import 'package:collection/collection.dart' show IterableExtension; +import 'package:flutter/foundation.dart' show kDebugMode; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/common/publish/common_publish_page.dart b/lib/pages/common/publish/common_publish_page.dart index 6399af8f0..b7cebd949 100644 --- a/lib/pages/common/publish/common_publish_page.dart +++ b/lib/pages/common/publish/common_publish_page.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:io' show Platform; import 'dart:math' show max; import 'package:PiliPlus/models/common/publish_panel_type.dart'; diff --git a/lib/pages/common/publish/common_rich_text_pub_page.dart b/lib/pages/common/publish/common_rich_text_pub_page.dart index ce478a36c..7d1cffbfd 100644 --- a/lib/pages/common/publish/common_rich_text_pub_page.dart +++ b/lib/pages/common/publish/common_rich_text_pub_page.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show File, HttpException; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; diff --git a/lib/pages/danmaku/controller.dart b/lib/pages/danmaku/controller.dart index d1f2bb689..e094d4871 100644 --- a/lib/pages/danmaku/controller.dart +++ b/lib/pages/danmaku/controller.dart @@ -1,4 +1,4 @@ -import 'dart:collection'; +import 'dart:collection' show HashSet, HashMap; import 'dart:io' show File; import 'package:PiliPlus/grpc/bilibili/community/service/dm/v1.pb.dart'; diff --git a/lib/pages/danmaku_block/controller.dart b/lib/pages/danmaku_block/controller.dart index 9b535409c..7055f7dd7 100644 --- a/lib/pages/danmaku_block/controller.dart +++ b/lib/pages/danmaku_block/controller.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show ascii; import 'package:PiliPlus/http/danmaku_block.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/pages/download/controller.dart b/lib/pages/download/controller.dart index 1dee8af8c..9a03f9357 100644 --- a/lib/pages/download/controller.dart +++ b/lib/pages/download/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/models_new/download/download_info.dart'; import 'package:PiliPlus/pages/common/multi_select/base.dart' diff --git a/lib/pages/download/detail/view.dart b/lib/pages/download/detail/view.dart index 2f4419b91..536427c59 100644 --- a/lib/pages/download/detail/view.dart +++ b/lib/pages/download/detail/view.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/common/widgets/appbar/appbar.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; diff --git a/lib/pages/download/detail/widgets/item.dart b/lib/pages/download/detail/widgets/item.dart index 754b07dc9..46501d93d 100644 --- a/lib/pages/download/detail/widgets/item.dart +++ b/lib/pages/download/detail/widgets/item.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show File; import 'package:PiliPlus/common/style.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; diff --git a/lib/pages/download/view.dart b/lib/pages/download/view.dart index 53a1b7c69..b0c7a6c03 100644 --- a/lib/pages/download/view.dart +++ b/lib/pages/download/view.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/style.dart'; import 'package:PiliPlus/common/widgets/appbar/appbar.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 92d8d4457..f08b1809c 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart'; diff --git a/lib/pages/dynamics/widgets/vote.dart b/lib/pages/dynamics/widgets/vote.dart index 35075d4b9..2b267c425 100644 --- a/lib/pages/dynamics/widgets/vote.dart +++ b/lib/pages/dynamics/widgets/vote.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show FutureOr; import 'package:PiliPlus/common/widgets/avatars.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; diff --git a/lib/pages/dynamics_mention/view.dart b/lib/pages/dynamics_mention/view.dart index be7d52c36..d293b8e03 100644 --- a/lib/pages/dynamics_mention/view.dart +++ b/lib/pages/dynamics_mention/view.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:math'; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/flutter/draggable_scrollable_sheet.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; @@ -36,7 +35,7 @@ class DynMentionPanel extends StatefulWidget { useSafeArea: true, isScrollControlled: true, constraints: BoxConstraints( - maxWidth: min(600, context.mediaQueryShortestSide), + maxWidth: math.min(600, context.mediaQueryShortestSide), ), builder: (context) => TopicDraggableScrollableSheet( expand: false, diff --git a/lib/pages/dynamics_select_topic/view.dart b/lib/pages/dynamics_select_topic/view.dart index 68dc33b55..dcb222028 100644 --- a/lib/pages/dynamics_select_topic/view.dart +++ b/lib/pages/dynamics_select_topic/view.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:math'; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/flutter/draggable_scrollable_sheet.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; @@ -33,7 +32,7 @@ class SelectTopicPanel extends StatefulWidget { useSafeArea: true, isScrollControlled: true, constraints: BoxConstraints( - maxWidth: min(600, context.mediaQueryShortestSide), + maxWidth: math.min(600, context.mediaQueryShortestSide), ), builder: (context) => TopicDraggableScrollableSheet( expand: false, diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 8a6d7800b..a96fa744a 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/models/common/home_tab_type.dart'; import 'package:PiliPlus/pages/common/common_controller.dart'; import 'package:PiliPlus/services/account_service.dart'; diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index d55e27234..b4c2b39a4 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:convert'; +import 'dart:async' show Timer; +import 'dart:convert' show jsonDecode; import 'dart:math' as math; import 'package:PiliPlus/common/widgets/dialog/report.dart'; diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart index 958c48b99..887c222b0 100644 --- a/lib/pages/live_room/send_danmaku/view.dart +++ b/lib/pages/live_room/send_danmaku/view.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/widgets/flutter/text_field/text_field.dart'; import 'package:PiliPlus/common/widgets/view_safe_area.dart'; import 'package:PiliPlus/http/live.dart'; diff --git a/lib/pages/live_room/superchat/superchat_card.dart b/lib/pages/live_room/superchat/superchat_card.dart index 5195c21a7..86df93ada 100644 --- a/lib/pages/live_room/superchat/superchat_card.dart +++ b/lib/pages/live_room/superchat/superchat_card.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/common/image_type.dart'; diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 6b8d48f6e..3e13f971c 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -1,6 +1,5 @@ -import 'dart:io'; -import 'dart:math'; -import 'dart:ui'; +import 'dart:io' show Platform; +import 'dart:math' as math; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/style.dart'; @@ -47,7 +46,7 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:floating/floating.dart'; -import 'package:flutter/foundation.dart' show kDebugMode; +import 'package:flutter/foundation.dart' show kDebugMode, clampDouble; import 'package:flutter/material.dart' hide PageView; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -432,7 +431,7 @@ class _LiveRoomPageState extends State offstage: isFullScreen, child: SizedBox( width: maxWidth, - height: max(0, bottomHeight), + height: math.max(0, bottomHeight), child: _buildBottomWidget, ), ), @@ -655,7 +654,10 @@ class _LiveRoomPageState extends State Widget _buildBodyH(bool isFullScreen) { double videoWidth = clampDouble(maxHeight / maxWidth * 1.08, 0.56, 0.7) * maxWidth; - final rightWidth = min(400.0, maxWidth - videoWidth - padding.horizontal); + final rightWidth = math.min( + 400.0, + maxWidth - videoWidth - padding.horizontal, + ); videoWidth = maxWidth - rightWidth - padding.horizontal; final videoHeight = maxHeight - padding.top - kToolbarHeight; final width = isFullScreen ? maxWidth : videoWidth; diff --git a/lib/pages/live_room/widgets/header_control.dart b/lib/pages/live_room/widgets/header_control.dart index 16b8d27fc..8b98bf255 100644 --- a/lib/pages/live_room/widgets/header_control.dart +++ b/lib/pages/live_room/widgets/header_control.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show Platform; import 'package:PiliPlus/common/widgets/marquee.dart'; import 'package:PiliPlus/pages/live_room/controller.dart'; diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart index b935d7a92..60f863d82 100644 --- a/lib/pages/login/controller.dart +++ b/lib/pages/login/controller.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/radio_widget.dart'; diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart index b616646e8..b143d3169 100644 --- a/lib/pages/login/view.dart +++ b/lib/pages/login/view.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; @@ -76,9 +74,7 @@ class _LoginPageState extends State { globalKey.currentContext!.findRenderObject()! as RenderRepaintBoundary; final image = await boundary.toImage(pixelRatio: 3); - ByteData? byteData = await image.toByteData( - format: ImageByteFormat.png, - ); + ByteData? byteData = await image.toByteData(format: .png); Uint8List pngBytes = byteData!.buffer.asUint8List(); SmartDialog.dismiss(); String picName = diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index 0fc98efab..7490eadd1 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/grpc/dyn.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/msg.dart'; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index a6aad4fb3..a5c7323a0 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show Platform, exit; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/constants.dart'; diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index 8923beead..c0a680967 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/style.dart'; import 'package:PiliPlus/common/widgets/flutter/list_tile.dart'; diff --git a/lib/pages/music/view.dart b/lib/pages/music/view.dart index 4521edf2e..faecbef9c 100644 --- a/lib/pages/music/view.dart +++ b/lib/pages/music/view.dart @@ -1,5 +1,5 @@ -import 'dart:io'; -import 'dart:math'; +import 'dart:io' show Platform; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/custom_icon.dart'; @@ -105,7 +105,7 @@ class _MusicDetailPageState extends CommonDynPageState { Widget _buildBody(ThemeData theme) => Obx(() { switch (controller.infoState.value) { case Success(:final response): - double padding = max(maxWidth / 2 - Grid.smallCardWidth, 0); + double padding = math.max(maxWidth / 2 - Grid.smallCardWidth, 0); final Widget child; if (isPortrait) { child = Padding( diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index 4a1421d0b..358e65909 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/models/common/rank_type.dart'; import 'package:PiliPlus/pages/common/common_controller.dart'; import 'package:PiliPlus/pages/rank/zone/controller.dart'; diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 577456922..536c91e73 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamController, StreamSubscription; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/pages/setting/models/extra_settings.dart b/lib/pages/setting/models/extra_settings.dart index d55561424..a61d0c55f 100644 --- a/lib/pages/setting/models/extra_settings.dart +++ b/lib/pages/setting/models/extra_settings.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show Platform; import 'package:PiliPlus/common/widgets/custom_icon.dart'; import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart'; diff --git a/lib/pages/setting/models/video_settings.dart b/lib/pages/setting/models/video_settings.dart index 897c1db7a..f3498eeab 100644 --- a/lib/pages/setting/models/video_settings.dart +++ b/lib/pages/setting/models/video_settings.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show Platform; import 'package:PiliPlus/models/common/video/audio_quality.dart'; import 'package:PiliPlus/models/common/video/cdn_type.dart'; diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart index 79c03c26e..55aadcfb0 100644 --- a/lib/pages/setting/pages/logs.dart +++ b/lib/pages/setting/pages/logs.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:convert'; +import 'dart:async' show Timer; +import 'dart:convert' show jsonDecode; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; diff --git a/lib/pages/setting/widgets/select_dialog.dart b/lib/pages/setting/widgets/select_dialog.dart index 5097e3173..36c47e15b 100644 --- a/lib/pages/setting/widgets/select_dialog.dart +++ b/lib/pages/setting/widgets/select_dialog.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show TimeoutException; import 'package:PiliPlus/http/browser_ua.dart'; import 'package:PiliPlus/http/constants.dart'; diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart index 1254b2edc..943e3b046 100644 --- a/lib/pages/video/controller.dart +++ b/lib/pages/video/controller.dart @@ -1,7 +1,5 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:io' show File; import 'dart:math' show min; -import 'dart:ui'; import 'package:PiliPlus/common/style.dart'; import 'package:PiliPlus/common/widgets/pair.dart'; @@ -66,7 +64,7 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/utils/video_utils.dart'; import 'package:collection/collection.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; -import 'package:flutter/foundation.dart' show kDebugMode; +import 'package:flutter/foundation.dart' show kDebugMode, clampDouble; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/video/introduction/local/view.dart b/lib/pages/video/introduction/local/view.dart index 80e49d410..31d7e8976 100644 --- a/lib/pages/video/introduction/local/view.dart +++ b/lib/pages/video/introduction/local/view.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show File; import 'package:PiliPlus/common/style.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; diff --git a/lib/pages/video/introduction/pgc/controller.dart b/lib/pages/video/introduction/pgc/controller.dart index 0ed489f20..614d2bd40 100644 --- a/lib/pages/video/introduction/pgc/controller.dart +++ b/lib/pages/video/introduction/pgc/controller.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:math' show max; +import 'dart:math' as math; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/fav.dart'; @@ -82,10 +81,10 @@ class PgcIntroController extends CommonIntroController { final hasFav = response.favorite == 1; late final stat = pgcItem.stat; if (hasLike) { - stat?.like = max(1, stat.like); + stat?.like = math.max(1, stat.like); } if (hasFav) { - stat?.favorite = max(1, stat.favorite); + stat?.favorite = math.max(1, stat.favorite); } this.hasLike.value = hasLike; coinNum.value = response.coinNumber!; diff --git a/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart b/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart index d71a83149..b9445acad 100644 --- a/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart +++ b/lib/pages/video/introduction/pgc/widgets/pgc_panel.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart'; diff --git a/lib/pages/video/introduction/ugc/controller.dart b/lib/pages/video/introduction/ugc/controller.dart index 265a4ae8a..61a6fbbd5 100644 --- a/lib/pages/video/introduction/ugc/controller.dart +++ b/lib/pages/video/introduction/ugc/controller.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:math'; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; @@ -176,10 +175,10 @@ class UgcIntroController extends CommonIntroController with ReloadMixin { if (result case Success(:final response)) { late final stat = videoDetail.value.stat; if (response.like!) { - stat?.like = max(1, stat.like); + stat?.like = math.max(1, stat.like); } if (response.favorite!) { - stat?.favorite = max(1, stat.favorite); + stat?.favorite = math.max(1, stat.favorite); } hasLike.value = response.like!; hasDislike.value = response.dislike!; diff --git a/lib/pages/video/introduction/ugc/widgets/page.dart b/lib/pages/video/introduction/ugc/widgets/page.dart index 8fa3ab834..231b614cf 100644 --- a/lib/pages/video/introduction/ugc/widgets/page.dart +++ b/lib/pages/video/introduction/ugc/widgets/page.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:math'; +import 'dart:async' show StreamSubscription; +import 'dart:math' as math; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/models_new/video/video_detail/page.dart'; @@ -62,7 +62,7 @@ class _PagesPanelState extends State { offset = targetOffset; _listener = _videoDetailController.cid.listen((cid) { this.cid = cid; - pageIndex = max(0, pages.indexWhere((e) => e.cid == cid)); + pageIndex = math.max(0, pages.indexWhere((e) => e.cid == cid)); if (!mounted) return; setState(() {}); jumpToCurr(); @@ -73,7 +73,7 @@ class _PagesPanelState extends State { double get targetOffset { const double itemWidth = 150; - return max(0, pageIndex * itemWidth - itemWidth / 2); + return math.max(0, pageIndex * itemWidth - itemWidth / 2); } void jumpToCurr() { diff --git a/lib/pages/video/introduction/ugc/widgets/season.dart b/lib/pages/video/introduction/ugc/widgets/season.dart index 2cd43f50b..69c430f5e 100644 --- a/lib/pages/video/introduction/ugc/widgets/season.dart +++ b/lib/pages/video/introduction/ugc/widgets/season.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/models_new/video/video_detail/data.dart'; diff --git a/lib/pages/video/introduction/ugc/widgets/triple_mixin.dart b/lib/pages/video/introduction/ugc/widgets/triple_mixin.dart index 9f98e03a1..586ed03dd 100644 --- a/lib/pages/video/introduction/ugc/widgets/triple_mixin.dart +++ b/lib/pages/video/introduction/ugc/widgets/triple_mixin.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'package:PiliPlus/utils/platform_utils.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/video/pay_coins/view.dart b/lib/pages/video/pay_coins/view.dart index 524322618..2010722a6 100644 --- a/lib/pages/video/pay_coins/view.dart +++ b/lib/pages/video/pay_coins/view.dart @@ -1,6 +1,5 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'dart:math' as math; -import 'dart:math' show max; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; @@ -405,7 +404,7 @@ class _PayCoinsPageState extends State const SizedBox(height: 10), Center( child: Text( - '${_coins != null ? '硬币余额：${max(0.0, _coins.toDouble().toPrecision(1))}' : ''}${widget.hasCoin ? '${_coins != null ? '，' : ''}已投1枚硬币' : ''}', + '${_coins != null ? '硬币余额：${math.max(0.0, _coins.toDouble().toPrecision(1))}' : ''}${widget.hasCoin ? '${_coins != null ? '，' : ''}已投1枚硬币' : ''}', style: const TextStyle(color: Colors.white, fontSize: 13), ), ), diff --git a/lib/pages/video/post_panel/view.dart b/lib/pages/video/post_panel/view.dart index d63bbd35b..81dfb1010 100644 --- a/lib/pages/video/post_panel/view.dart +++ b/lib/pages/video/post_panel/view.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:math'; +import 'dart:async' show Timer; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; @@ -145,7 +145,7 @@ class PostPanel extends CommonSlidePage { .toList(); double duration = 0; for (int i = 0; i < split.length; i++) { - duration += split[i] * pow(60, i); + duration += split[i] * math.pow(60, i); } if (duration <= videoDuration) { updateSegment( @@ -477,7 +477,7 @@ class _PostPanelState extends State } return; } - final seek = max(0, start - 2000); + final seek = math.max(0, start - 2000); await player.seek(Duration(milliseconds: seek)); if (!player.state.playing) { await player.play(); diff --git a/lib/pages/video/reply_new/view.dart b/lib/pages/video/reply_new/view.dart index 3be3dd2ac..d85473481 100644 --- a/lib/pages/video/reply_new/view.dart +++ b/lib/pages/video/reply_new/view.dart @@ -1,6 +1,5 @@ -import 'dart:async'; -import 'dart:io'; -import 'dart:math' show max; +import 'dart:io' show File; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/common/widgets/custom_icon.dart'; @@ -228,7 +227,7 @@ class _ReplyPageState extends CommonRichTextPubPageState { double height = context.isTablet ? 300 : 170; final keyboardHeight = controller.keyboardHeight; if (keyboardHeight != 0) { - height = max(height, keyboardHeight); + height = math.max(height, keyboardHeight); } Widget item({ diff --git a/lib/pages/video/send_danmaku/view.dart b/lib/pages/video/send_danmaku/view.dart index afabf45e8..a42486d53 100644 --- a/lib/pages/video/send_danmaku/view.dart +++ b/lib/pages/video/send_danmaku/view.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/view_safe_area.dart'; import 'package:PiliPlus/http/danmaku.dart'; diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart index 9f85ee9c9..9c9efe516 100644 --- a/lib/pages/video/view.dart +++ b/lib/pages/video/view.dart @@ -1,7 +1,5 @@ -import 'dart:async'; -import 'dart:io'; -import 'dart:math'; -import 'dart:ui'; +import 'dart:io' show Platform; +import 'dart:math' as math; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/style.dart'; @@ -59,7 +57,7 @@ import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:floating/floating.dart'; -import 'package:flutter/foundation.dart' show kDebugMode; +import 'package:flutter/foundation.dart' show kDebugMode, clampDouble; import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show SystemUiOverlayStyle; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -390,7 +388,7 @@ class _VideoDetailPageVState extends State final shortestSide = size.shortestSide; final minVideoHeight = shortestSide / Style.aspectRatio16x9; - final maxVideoHeight = max(size.longestSide * 0.65, shortestSide); + final maxVideoHeight = math.max(size.longestSide * 0.65, shortestSide); videoDetailController ..isPortrait = isPortrait = maxHeight >= maxWidth ..minVideoHeight = minVideoHeight @@ -1344,7 +1342,7 @@ class _VideoDetailPageVState extends State if (videoDetailController.plPlayerController.enableBlock) Positioned( left: 16, - bottom: isFullScreen ? max(75, maxHeight * 0.25) : 75, + bottom: isFullScreen ? math.max(75, maxHeight * 0.25) : 75, width: 120, child: AnimatedList( padding: EdgeInsets.zero, diff --git a/lib/pages/video/widgets/player_focus.dart b/lib/pages/video/widgets/player_focus.dart index bc30c0f71..3127dbf53 100644 --- a/lib/pages/video/widgets/player_focus.dart +++ b/lib/pages/video/widgets/player_focus.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'dart:io' show exit, Platform; import 'dart:math' as math; diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart index 67698ae7c..75132dbdf 100644 --- a/lib/pages/webview/view.dart +++ b/lib/pages/webview/view.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show Platform; import 'package:PiliPlus/common/widgets/flutter/pop_scope.dart'; import 'package:PiliPlus/common/widgets/scaffold.dart'; diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart index 17f48b6c2..78fdec6fe 100644 --- a/lib/pages/whisper/widgets/item.dart +++ b/lib/pages/whisper/widgets/item.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; import 'package:PiliPlus/common/assets.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index ef12bfea8..bf1b7473e 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:convert'; +import 'dart:convert' show jsonEncode; import 'package:PiliPlus/grpc/bilibili/im/interfaces/v1.pb.dart' show EmotionInfo, RspSessionMsg; diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart index b8bbd5bbf..608cc0c4f 100644 --- a/lib/pages/whisper_detail/view.dart +++ b/lib/pages/whisper_detail/view.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'dart:io' show File; import 'package:PiliPlus/common/assets.dart'; diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 0c40071a8..292e01f50 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; import 'dart:math' as math; import 'package:PiliPlus/common/constants.dart'; diff --git a/lib/pages/whisper_link_setting/controller.dart b/lib/pages/whisper_link_setting/controller.dart index 5d745b9b6..54d8121ed 100644 --- a/lib/pages/whisper_link_setting/controller.dart +++ b/lib/pages/whisper_link_setting/controller.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/common/widgets/dialog/report_member.dart'; import 'package:PiliPlus/grpc/bilibili/app/im/v1.pb.dart'; diff --git a/lib/plugin/pl_player/utils/fullscreen.dart b/lib/plugin/pl_player/utils/fullscreen.dart index 7350b5ebf..4675c2f89 100644 --- a/lib/plugin/pl_player/utils/fullscreen.dart +++ b/lib/plugin/pl_player/utils/fullscreen.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'dart:io' show Platform; import 'package:PiliPlus/utils/device_utils.dart'; diff --git a/lib/plugin/pl_player/view/simple_video_texture.dart b/lib/plugin/pl_player/view/simple_video_texture.dart index 6fab44b8d..a332086a8 100644 --- a/lib/plugin/pl_player/view/simple_video_texture.dart +++ b/lib/plugin/pl_player/view/simple_video_texture.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:flutter/material.dart'; import 'package:media_kit_video/media_kit_video.dart'; diff --git a/lib/plugin/pl_player/view/view.dart b/lib/plugin/pl_player/view/view.dart index c5d1c173d..09d632ebc 100644 --- a/lib/plugin/pl_player/view/view.dart +++ b/lib/plugin/pl_player/view/view.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:async' show Timer, StreamSubscription; +import 'dart:io' show Platform; import 'dart:math' as math; import 'dart:ui' as ui; diff --git a/lib/plugin/pl_player/widgets/backward_seek.dart b/lib/plugin/pl_player/widgets/backward_seek.dart index fec9c19ba..7714d4b86 100644 --- a/lib/plugin/pl_player/widgets/backward_seek.dart +++ b/lib/plugin/pl_player/widgets/backward_seek.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'package:flutter/material.dart'; diff --git a/lib/plugin/pl_player/widgets/forward_seek.dart b/lib/plugin/pl_player/widgets/forward_seek.dart index 7d53e4bd3..d1b039136 100644 --- a/lib/plugin/pl_player/widgets/forward_seek.dart +++ b/lib/plugin/pl_player/widgets/forward_seek.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show Timer; import 'package:flutter/material.dart'; diff --git a/lib/plugin/pl_player/widgets/play_pause_btn.dart b/lib/plugin/pl_player/widgets/play_pause_btn.dart index 67a9ba32c..673605c24 100644 --- a/lib/plugin/pl_player/widgets/play_pause_btn.dart +++ b/lib/plugin/pl_player/widgets/play_pause_btn.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:flutter/material.dart'; diff --git a/lib/services/account_service.dart b/lib/services/account_service.dart index 59972132e..db47266cc 100644 --- a/lib/services/account_service.dart +++ b/lib/services/account_service.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; diff --git a/lib/services/download/download_manager.dart b/lib/services/download/download_manager.dart index a9aa7466e..14c395147 100644 --- a/lib/services/download/download_manager.dart +++ b/lib/services/download/download_manager.dart @@ -1,5 +1,4 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:io' show File; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/models_new/download/bili_download_entry_info.dart'; @@ -40,7 +39,7 @@ class DownloadManager { } final sink = file.openWrite( - mode: received == 0 ? FileMode.writeOnly : FileMode.writeOnlyAppend, + mode: received == 0 ? .writeOnly : .writeOnlyAppend, ); Future onError(Object e, {bool delete = false}) async { diff --git a/lib/services/download/download_service.dart b/lib/services/download/download_service.dart index 6e846b6b8..a70c4b6a8 100644 --- a/lib/services/download/download_service.dart +++ b/lib/services/download/download_service.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'dart:convert' show jsonDecode, jsonEncode; import 'dart:io' show Directory, File; diff --git a/lib/services/logger.dart b/lib/services/logger.dart index 039b1afca..8cd6e514a 100644 --- a/lib/services/logger.dart +++ b/lib/services/logger.dart @@ -1,4 +1,4 @@ -import 'dart:io'; +import 'dart:io' show File; import 'package:PiliPlus/utils/json_file_handler.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; diff --git a/lib/services/shutdown_timer_service.dart b/lib/services/shutdown_timer_service.dart index a169a37d7..da935cf50 100644 --- a/lib/services/shutdown_timer_service.dart +++ b/lib/services/shutdown_timer_service.dart @@ -1,6 +1,7 @@ // 定时关闭服务 -import 'dart:async'; -import 'dart:io'; + +import 'dart:async' show Timer; +import 'dart:io' show exit; import 'package:PiliPlus/models/common/enum_with_label.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; diff --git a/lib/tcp/live.dart b/lib/tcp/live.dart index 520d1847f..b1c3dd0b4 100644 --- a/lib/tcp/live.dart +++ b/lib/tcp/live.dart @@ -1,6 +1,6 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; +import 'dart:async' show StreamSubscription, Timer; +import 'dart:convert' show jsonEncode, utf8, jsonDecode; +import 'dart:io' show ZLibDecoder; import 'dart:typed_data'; import 'package:PiliPlus/services/logger.dart'; diff --git a/lib/utils/accounts/account_manager/account_mgr.dart b/lib/utils/accounts/account_manager/account_mgr.dart index 8e95c13f1..057f30bf9 100644 --- a/lib/utils/accounts/account_manager/account_mgr.dart +++ b/lib/utils/accounts/account_manager/account_mgr.dart @@ -1,6 +1,6 @@ // edit from package:dio_cookie_manager -import 'dart:async'; -import 'dart:io'; + +import 'dart:io' show Cookie, HttpHeaders; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; diff --git a/lib/utils/accounts/grpc_headers.dart b/lib/utils/accounts/grpc_headers.dart index ee83b3b9f..d1ae405e8 100644 --- a/lib/utils/accounts/grpc_headers.dart +++ b/lib/utils/accounts/grpc_headers.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show base64Encode; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/bilibili/metadata.pb.dart'; diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart index 0b52e977a..81da1f3c2 100644 --- a/lib/utils/app_scheme.dart +++ b/lib/utils/app_scheme.dart @@ -1,4 +1,4 @@ -import 'dart:async'; +import 'dart:async' show StreamSubscription; import 'package:PiliPlus/common/widgets/scaffold.dart'; import 'package:PiliPlus/common/widgets/view_safe_area.dart'; diff --git a/lib/utils/json_file_handler.dart b/lib/utils/json_file_handler.dart index d6853fa35..a66016aab 100644 --- a/lib/utils/json_file_handler.dart +++ b/lib/utils/json_file_handler.dart @@ -1,5 +1,5 @@ -import 'dart:convert'; -import 'dart:io'; +import 'dart:convert' show jsonEncode; +import 'dart:io' show RandomAccessFile; import 'package:PiliPlus/services/logger.dart' show LoggerUtils; import 'package:catcher_2/model/platform_type.dart'; @@ -16,7 +16,7 @@ class JsonFileHandler extends ReportHandler { final bool handleWhenRejected; static Future _future = LoggerUtils.getLogsPath() - .then((file) => file.open(mode: FileMode.writeOnlyAppend)) + .then((file) => file.open(mode: .writeOnlyAppend)) .then((raf) => raf.writeFrom(const [])) .then(_flush); diff --git a/lib/utils/permission_handler.dart b/lib/utils/permission_handler.dart index 49806164f..96f3bc733 100644 --- a/lib/utils/permission_handler.dart +++ b/lib/utils/permission_handler.dart @@ -1,5 +1,5 @@ -import 'dart:async'; -import 'dart:io'; +import 'dart:async' show FutureOr; +import 'dart:io' show Platform; import 'package:flutter/foundation.dart' show VoidCallback; import 'package:permission_handler_platform_interface/permission_handler_platform_interface.dart'; diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart index 149098c8b..696fddd0b 100644 --- a/lib/utils/request_utils.dart +++ b/lib/utils/request_utils.dart @@ -1,6 +1,5 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:math'; +import 'dart:convert' show jsonEncode; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/grpc/bilibili/im/type.pbenum.dart' show MsgType; @@ -202,7 +201,7 @@ abstract final class RequestUtils { useSafeArea: true, isScrollControlled: true, constraints: BoxConstraints( - maxWidth: min(640, context.mediaQueryShortestSide), + maxWidth: math.min(640, context.mediaQueryShortestSide), ), builder: (BuildContext context) { final maxChildSize = diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index bf77ce481..59b9d53fc 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -1,4 +1,4 @@ -import 'dart:convert'; +import 'dart:convert' show jsonDecode; import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/user/danmaku_rule_adapter.dart'; diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart index 8ca7e1f2d..8b4addae5 100644 --- a/lib/utils/storage_pref.dart +++ b/lib/utils/storage_pref.dart @@ -1,5 +1,5 @@ -import 'dart:io'; -import 'dart:math' show pow, sqrt; +import 'dart:io' show Platform; +import 'dart:math' as math; import 'package:PiliPlus/common/widgets/gesture/horizontal_drag_gesture_recognizer.dart' show deviceTouchSlop; @@ -87,7 +87,7 @@ abstract final class Pref { static List get springDescription => List.from( _setting.get(SettingBoxKey.springDescription) ?? - [0.5, 100.0, 2.2 * sqrt(50)], // [mass, stiffness, damping] + [0.5, 100.0, 2.2 * math.sqrt(50)], // [mass, stiffness, damping] ); static List get speedList => List.from( @@ -338,7 +338,7 @@ abstract final class Pref { _setting.get(SettingBoxKey.showPgcTimeline, defaultValue: true); static num get maxCacheSize => - _setting.get(SettingBoxKey.maxCacheSize) ?? pow(1024, 3); + _setting.get(SettingBoxKey.maxCacheSize) ?? math.pow(1024, 3); static bool get horizontalScreen { bool? horizontalScreen = _setting.get(SettingBoxKey.horizontalScreen); diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart index 435be50ac..4bb9e1634 100644 --- a/lib/utils/wbi_sign.dart +++ b/lib/utils/wbi_sign.dart @@ -2,8 +2,9 @@ // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/misc/sign/wbi.md // import md5 from 'md5' // import axios from 'axios' -import 'dart:async'; -import 'dart:convert'; + +import 'dart:async' show FutureOr; +import 'dart:convert' show utf8; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart';