From 877732e1e7092d121f9609258a067493480a999e Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Sun, 4 May 2025 16:27:52 +0800 Subject: [PATCH] chore: organize imports Signed-off-by: bggRGjQaUbCoE --- .vscode/settings.json | 7 +++-- lib/common/skeleton/dynamic_card.dart | 2 +- lib/common/skeleton/fav_pgc_item.dart | 2 +- lib/common/skeleton/media_bangumi.dart | 3 +- lib/common/skeleton/msg_feed_sys_msg_.dart | 2 +- lib/common/skeleton/msg_feed_top.dart | 2 +- lib/common/skeleton/video_card_h.dart | 2 +- lib/common/skeleton/video_card_v.dart | 2 +- lib/common/skeleton/video_reply.dart | 2 +- lib/common/skeleton/whisper_item.dart | 2 +- lib/common/widgets/avatar.dart | 3 +- lib/common/widgets/custom_toast.dart | 2 +- lib/common/widgets/image/image_view.dart | 4 +-- .../widgets/image/network_img_layer.dart | 2 +- lib/common/widgets/image/nine_grid_view.dart | 4 +-- .../interactiveviewer_gallery.dart | 6 ++-- .../widgets/video_card/video_card_h.dart | 2 +- .../video_card/video_card_h_member_video.dart | 2 +- lib/grpc/grpc_repo.dart | 2 +- lib/http/init.dart | 1 + lib/http/login.dart | 1 + lib/http/msg.dart | 1 + lib/http/search.dart | 3 +- lib/http/video.dart | 1 + lib/main.dart | 28 +++++++++--------- .../common/sponsor_block/segment_type.dart | 3 ++ lib/models/dynamics/result.dart | 3 +- lib/models/member/archive.dart | 3 +- lib/models/model_hot_video_item.dart | 4 +-- lib/models/model_owner.dart | 3 +- lib/models/search/result.dart | 5 ++-- lib/models/space_fav/datum.dart | 3 +- lib/models/space_fav/list.dart | 3 +- lib/models/space_fav/media_list_response.dart | 3 +- lib/models/space_fav/space_fav.dart | 3 +- lib/models/space_fav/upper.dart | 12 ++++---- lib/models/user/fav_detail.dart | 5 ++-- lib/models/video/reply/data.dart | 3 +- lib/pages/about/view.dart | 4 +-- lib/pages/bangumi/controller.dart | 4 +-- lib/pages/bangumi/view.dart | 6 ++-- lib/pages/bangumi/widgets/bangumi_card_v.dart | 8 ++--- .../widgets/bangumi_card_v_member_home.dart | 4 +-- .../widgets/bangumi_card_v_pgc_index.dart | 4 +-- .../widgets/bangumi_card_v_search.dart | 4 +-- .../widgets/bangumi_card_v_timeline.dart | 4 +-- lib/pages/blacklist/view.dart | 6 ++-- lib/pages/common/common_publish_page.dart | 4 +-- lib/pages/common/reply_controller.dart | 6 ++-- lib/pages/danmaku/view.dart | 4 +-- lib/pages/danmaku_block/view.dart | 4 +-- lib/pages/dynamics/controller.dart | 8 ++--- lib/pages/dynamics/view.dart | 9 +++--- lib/pages/dynamics/widgets/action_panel.dart | 6 ++-- .../dynamics/widgets/additional_panel.dart | 4 +-- lib/pages/dynamics/widgets/article_panel.dart | 2 +- lib/pages/dynamics/widgets/author_panel.dart | 8 ++--- lib/pages/dynamics/widgets/content_panel.dart | 3 +- lib/pages/dynamics/widgets/dynamic_panel.dart | 8 ++--- lib/pages/dynamics/widgets/forward_panel.dart | 2 +- lib/pages/dynamics/widgets/live_panel.dart | 7 ++--- .../dynamics/widgets/live_rcmd_panel.dart | 9 +++--- lib/pages/dynamics/widgets/up_panel.dart | 8 ++--- lib/pages/dynamics/widgets/video_panel.dart | 9 +++--- lib/pages/dynamics_create/view.dart | 2 +- lib/pages/dynamics_detail/controller.dart | 4 +-- lib/pages/dynamics_detail/view.dart | 12 ++++---- lib/pages/dynamics_repost/view.dart | 2 +- lib/pages/dynamics_tab/view.dart | 4 +-- lib/pages/emote/view.dart | 4 +-- lib/pages/episode_panel/view.dart | 2 +- lib/pages/fan/view.dart | 2 +- lib/pages/fav/note/child_view.dart | 2 +- lib/pages/fav/pgc/child_view.dart | 2 +- lib/pages/fav/video/controller.dart | 2 +- lib/pages/fav/video/view.dart | 4 +-- lib/pages/fav/video/widgets/item.dart | 4 +-- lib/pages/fav/view.dart | 2 +- lib/pages/fav_detail/controller.dart | 2 +- lib/pages/fav_detail/view.dart | 8 ++--- .../fav_detail/widget/fav_video_card.dart | 16 +++++----- lib/pages/fav_panel/view.dart | 4 +-- lib/pages/fav_search/controller.dart | 2 +- lib/pages/fav_search/view.dart | 5 ++-- lib/pages/follow/controller.dart | 2 +- lib/pages/follow/widgets/follow_item.dart | 8 ++--- lib/pages/follow_search/view.dart | 3 +- lib/pages/group_panel/view.dart | 6 ++-- lib/pages/history/controller.dart | 6 ++-- lib/pages/history/view.dart | 2 +- lib/pages/history/widgets/item.dart | 20 ++++++------- lib/pages/history_search/controller.dart | 2 +- lib/pages/history_search/view.dart | 3 +- lib/pages/home/controller.dart | 4 +-- lib/pages/home/view.dart | 8 ++--- lib/pages/hot/view.dart | 8 ++--- lib/pages/later/child_view.dart | 2 +- lib/pages/later/controller.dart | 2 +- lib/pages/later_search/view.dart | 3 +- lib/pages/live/controller.dart | 2 +- lib/pages/live/view.dart | 8 ++--- lib/pages/live/widgets/live_item.dart | 8 ++--- lib/pages/live/widgets/live_item_follow.dart | 6 ++-- lib/pages/live_emote/view.dart | 4 +-- lib/pages/live_room/controller.dart | 6 ++-- lib/pages/live_room/send_danmaku/view.dart | 2 +- lib/pages/live_room/view.dart | 2 +- lib/pages/login/controller.dart | 4 +-- lib/pages/login/view.dart | 3 +- lib/pages/main/controller.dart | 6 ++-- lib/pages/main/view.dart | 8 ++--- lib/pages/media/controller.dart | 4 +-- lib/pages/media/view.dart | 6 ++-- lib/pages/member/view.dart | 10 +++---- lib/pages/member_article/controller.dart | 2 +- lib/pages/member_coin/widgets/item.dart | 10 +++---- lib/pages/member_contribute/view.dart | 2 +- lib/pages/member_dynamics/controller.dart | 4 +-- lib/pages/member_dynamics/view.dart | 2 +- lib/pages/member_home/view.dart | 2 +- lib/pages/member_pgc/controller.dart | 2 +- lib/pages/member_search/controller.dart | 2 +- lib/pages/member_search/view.dart | 4 +-- lib/pages/member_season_series/view.dart | 2 +- lib/pages/member_video/view.dart | 4 +-- lib/pages/mine/controller.dart | 10 +++---- lib/pages/mine/view.dart | 6 ++-- lib/pages/msg_feed_top/at_me/view.dart | 5 ++-- .../msg_feed_top/like_me/controller.dart | 2 +- lib/pages/msg_feed_top/like_me/view.dart | 2 +- lib/pages/msg_feed_top/reply_me/view.dart | 2 +- .../msg_feed_top/sys_msg/controller.dart | 2 +- lib/pages/msg_feed_top/sys_msg/view.dart | 3 +- lib/pages/pgc_index/view.dart | 2 +- lib/pages/rank/controller.dart | 2 +- lib/pages/rank/view.dart | 2 +- lib/pages/rank/zone/view.dart | 8 ++--- lib/pages/rcmd/view.dart | 8 ++--- lib/pages/save_panel/view.dart | 3 +- lib/pages/search/controller.dart | 6 ++-- lib/pages/search/view.dart | 6 ++-- lib/pages/search_panel/controller.dart | 4 +-- lib/pages/search_panel/view.dart | 5 ++-- lib/pages/search_result/view.dart | 6 ++-- lib/pages/setting/pages/color_select.dart | 4 +-- lib/pages/setting/pages/display_mode.dart | 2 +- lib/pages/setting/pages/font_size_select.dart | 2 +- lib/pages/setting/pages/home_tabbar_set.dart | 4 +-- lib/pages/setting/pages/logs.dart | 1 + lib/pages/setting/pages/play_speed_set.dart | 4 +-- lib/pages/setting/play_setting.dart | 2 +- lib/pages/setting/view.dart | 3 +- lib/pages/setting/widgets/select_item.dart | 2 +- lib/pages/setting/widgets/switch_item.dart | 2 +- lib/pages/subscription/controller.dart | 4 +-- lib/pages/subscription/view.dart | 4 +-- lib/pages/subscription/widgets/item.dart | 6 ++-- lib/pages/subscription_detail/controller.dart | 2 +- lib/pages/subscription_detail/view.dart | 6 ++-- .../widget/sub_video_card.dart | 10 +++---- lib/pages/video/ai/view.dart | 4 +-- lib/pages/video/controller.dart | 19 ++++++------ .../video/introduction/pgc/controller.dart | 18 ++++++------ lib/pages/video/introduction/pgc/view.dart | 20 ++++++------- .../pgc/widgets/bangumi_panel.dart | 4 +-- .../video/introduction/ugc/controller.dart | 22 +++++++------- lib/pages/video/introduction/ugc/view.dart | 29 +++++++++---------- .../introduction/ugc/widgets/action_item.dart | 2 +- .../ugc/widgets/action_row_item.dart | 2 +- .../introduction/ugc/widgets/menu_row.dart | 2 +- .../video/introduction/ugc/widgets/page.dart | 2 +- .../introduction/ugc/widgets/season.dart | 2 +- lib/pages/video/medialist/view.dart | 14 ++++----- lib/pages/video/member/view.dart | 4 +-- lib/pages/video/note/view.dart | 2 +- lib/pages/video/related/controller.dart | 2 +- lib/pages/video/related/view.dart | 6 ++-- lib/pages/video/reply/controller.dart | 2 +- lib/pages/video/reply/view.dart | 10 +++---- .../video/reply/widgets/reply_item_grpc.dart | 12 ++++---- lib/pages/video/reply/widgets/zan_grpc.dart | 6 ++-- lib/pages/video/reply_new/view.dart | 4 +-- lib/pages/video/reply_reply/controller.dart | 4 +-- lib/pages/video/reply_reply/view.dart | 7 ++--- lib/pages/video/view.dart | 22 +++++++------- lib/pages/video/widgets/header_control.dart | 14 ++++----- lib/pages/webdav/webdav.dart | 1 + lib/pages/whisper/controller.dart | 2 +- lib/pages/whisper/view.dart | 3 +- lib/pages/whisper_detail/controller.dart | 4 +-- .../whisper_detail/widget/chat_item.dart | 4 +-- lib/plugin/pl_player/controller.dart | 14 ++++----- lib/plugin/pl_player/utils/fullscreen.dart | 2 +- lib/plugin/pl_player/view.dart | 10 +++---- lib/router/app_pages.dart | 12 ++++---- lib/services/audio_handler.dart | 6 ++-- lib/services/loggeer.dart | 2 +- lib/services/shutdown_timer_service.dart | 1 + lib/utils/accounts/cookie_jar_adapter.dart | 3 +- lib/utils/cache_manage.dart | 1 + lib/utils/data.dart | 1 - lib/utils/download.dart | 4 +-- lib/utils/feed_back.dart | 2 +- lib/utils/grid.dart | 2 +- lib/utils/login_utils.dart | 12 ++++---- lib/utils/page_utils.dart | 2 +- lib/utils/proxy.dart | 1 + lib/utils/recommend_filter.dart | 3 +- lib/utils/request_utils.dart | 2 +- lib/utils/storage.dart | 9 +++--- lib/utils/utils.dart | 3 +- lib/utils/wbi_sign.dart | 1 + 212 files changed, 518 insertions(+), 531 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1a5e4d29..d9c71677 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,7 +3,8 @@ "[dart]": { "editor.formatOnType": true }, - // "editor.codeActionsOnSave": { - // "source.fixAll": true, - // } + "editor.codeActionsOnSave": { + "source.organizeImports": true, + // "source.fixAll": true, + } } \ No newline at end of file diff --git a/lib/common/skeleton/dynamic_card.dart b/lib/common/skeleton/dynamic_card.dart index 1124c4d8..6893853c 100644 --- a/lib/common/skeleton/dynamic_card.dart +++ b/lib/common/skeleton/dynamic_card.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class DynamicCardSkeleton extends StatelessWidget { const DynamicCardSkeleton({super.key}); diff --git a/lib/common/skeleton/fav_pgc_item.dart b/lib/common/skeleton/fav_pgc_item.dart index 0b01a8bb..74ac7901 100644 --- a/lib/common/skeleton/fav_pgc_item.dart +++ b/lib/common/skeleton/fav_pgc_item.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/common/constants.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class FavPgcItemSkeleton extends StatelessWidget { const FavPgcItemSkeleton({super.key}); diff --git a/lib/common/skeleton/media_bangumi.dart b/lib/common/skeleton/media_bangumi.dart index 5fba101d..340f8a4a 100644 --- a/lib/common/skeleton/media_bangumi.dart +++ b/lib/common/skeleton/media_bangumi.dart @@ -1,7 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/constants.dart'; - import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class MediaBangumiSkeleton extends StatefulWidget { const MediaBangumiSkeleton({super.key}); diff --git a/lib/common/skeleton/msg_feed_sys_msg_.dart b/lib/common/skeleton/msg_feed_sys_msg_.dart index cc414385..61354745 100644 --- a/lib/common/skeleton/msg_feed_sys_msg_.dart +++ b/lib/common/skeleton/msg_feed_sys_msg_.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class MsgFeedSysMsgSkeleton extends StatelessWidget { const MsgFeedSysMsgSkeleton({super.key}); diff --git a/lib/common/skeleton/msg_feed_top.dart b/lib/common/skeleton/msg_feed_top.dart index 2e48b0ee..012b7f19 100644 --- a/lib/common/skeleton/msg_feed_top.dart +++ b/lib/common/skeleton/msg_feed_top.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class MsgFeedTopSkeleton extends StatelessWidget { const MsgFeedTopSkeleton({super.key}); diff --git a/lib/common/skeleton/video_card_h.dart b/lib/common/skeleton/video_card_h.dart index a03f43f7..9030b8af 100644 --- a/lib/common/skeleton/video_card_h.dart +++ b/lib/common/skeleton/video_card_h.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/common/constants.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class VideoCardHSkeleton extends StatelessWidget { const VideoCardHSkeleton({super.key}); diff --git a/lib/common/skeleton/video_card_v.dart b/lib/common/skeleton/video_card_v.dart index 490c3ded..398fabee 100644 --- a/lib/common/skeleton/video_card_v.dart +++ b/lib/common/skeleton/video_card_v.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/common/constants.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class VideoCardVSkeleton extends StatelessWidget { const VideoCardVSkeleton({super.key}); diff --git a/lib/common/skeleton/video_reply.dart b/lib/common/skeleton/video_reply.dart index 4d02cfbf..8b657c05 100644 --- a/lib/common/skeleton/video_reply.dart +++ b/lib/common/skeleton/video_reply.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class VideoReplySkeleton extends StatelessWidget { const VideoReplySkeleton({super.key}); diff --git a/lib/common/skeleton/whisper_item.dart b/lib/common/skeleton/whisper_item.dart index 7893a01b..dfb9275c 100644 --- a/lib/common/skeleton/whisper_item.dart +++ b/lib/common/skeleton/whisper_item.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/skeleton/skeleton.dart'; +import 'package:flutter/material.dart'; class WhisperItemSkeleton extends StatelessWidget { const WhisperItemSkeleton({super.key}); diff --git a/lib/common/widgets/avatar.dart b/lib/common/widgets/avatar.dart index 0b0a117d..d6165617 100644 --- a/lib/common/widgets/avatar.dart +++ b/lib/common/widgets/avatar.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -5,8 +6,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; - class Avatar extends StatelessWidget { final _BadgeType _badgeType; final String avatar; diff --git a/lib/common/widgets/custom_toast.dart b/lib/common/widgets/custom_toast.dart index 8b0f856a..dd88e641 100644 --- a/lib/common/widgets/custom_toast.dart +++ b/lib/common/widgets/custom_toast.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/material.dart'; class CustomToast extends StatelessWidget { const CustomToast({super.key, required this.msg}); diff --git a/lib/common/widgets/image/image_view.dart b/lib/common/widgets/image/image_view.dart index def5a61f..85dcaeb3 100644 --- a/lib/common/widgets/image/image_view.dart +++ b/lib/common/widgets/image/image_view.dart @@ -2,10 +2,10 @@ import 'dart:math'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' - show SourceModel, SourceType; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/image/nine_grid_view.dart'; +import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' + show SourceModel, SourceType; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; diff --git a/lib/common/widgets/image/network_img_layer.dart b/lib/common/widgets/image/network_img_layer.dart index cd9abfac..f1623ba7 100644 --- a/lib/common/widgets/image/network_img_layer.dart +++ b/lib/common/widgets/image/network_img_layer.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/utils/extension.dart'; class NetworkImgLayer extends StatelessWidget { const NetworkImgLayer({ diff --git a/lib/common/widgets/image/nine_grid_view.dart b/lib/common/widgets/image/nine_grid_view.dart index 14fb3f3a..73c70276 100644 --- a/lib/common/widgets/image/nine_grid_view.dart +++ b/lib/common/widgets/image/nine_grid_view.dart @@ -1,9 +1,9 @@ -import 'package:flutter/material.dart'; - import 'dart:async'; import 'dart:collection'; import 'dart:math' as math; +import 'package:flutter/material.dart'; + /** * @Author: Sky24n * @GitHub: https://github.com/Sky24n diff --git a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart index 432e840d..577ce629 100644 --- a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart +++ b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart @@ -1,5 +1,8 @@ import 'dart:io'; +import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactive_viewer.dart' + as custom; +import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -11,9 +14,6 @@ import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; -import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactive_viewer_boundary.dart'; -import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactive_viewer.dart' - as custom; /// https://github.com/qq326646683/interactiveviewer_gallery diff --git a/lib/common/widgets/video_card/video_card_h.dart b/lib/common/widgets/video_card/video_card_h.dart index 105f0fae..448a4b31 100644 --- a/lib/common/widgets/video_card/video_card_h.dart +++ b/lib/common/widgets/video_card/video_card_h.dart @@ -2,9 +2,9 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/common/widgets/video_popup_menu.dart'; -import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/models/model_video.dart'; diff --git a/lib/common/widgets/video_card/video_card_h_member_video.dart b/lib/common/widgets/video_card/video_card_h_member_video.dart index 94b93435..8141d884 100644 --- a/lib/common/widgets/video_card/video_card_h_member_video.dart +++ b/lib/common/widgets/video_card/video_card_h_member_video.dart @@ -2,9 +2,9 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/common/widgets/video_popup_menu.dart'; -import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/grpc/grpc_repo.dart b/lib/grpc/grpc_repo.dart index 24241143..d9c02232 100644 --- a/lib/grpc/grpc_repo.dart +++ b/lib/grpc/grpc_repo.dart @@ -16,8 +16,8 @@ import 'package:PiliPlus/grpc/locale/locale.pb.dart'; import 'package:PiliPlus/grpc/metadata/metadata.pb.dart'; import 'package:PiliPlus/grpc/network/network.pb.dart' as network; import 'package:PiliPlus/grpc/restriction/restriction.pb.dart'; -import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/http/init.dart b/lib/http/init.dart index 51c93fb7..d476856a 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; + import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/retry_interceptor.dart'; diff --git a/lib/http/login.dart b/lib/http/login.dart index 2e1a1c38..e07bd27b 100644 --- a/lib/http/login.dart +++ b/lib/http/login.dart @@ -1,4 +1,5 @@ import 'dart:convert'; + import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 7a7988ab..43edb1ae 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -1,4 +1,5 @@ import 'dart:math'; + import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/init.dart'; diff --git a/lib/http/search.dart b/lib/http/search.dart index a0075737..593de2bd 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -1,6 +1,8 @@ import 'dart:convert'; + import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; @@ -10,7 +12,6 @@ import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/http/loading_state.dart'; class SearchHttp { // 获取搜索建议 diff --git a/lib/http/video.dart b/lib/http/video.dart index bf0b53e6..05742024 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:developer'; + import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/app/card/v1/card.pb.dart' as card; import 'package:PiliPlus/grpc/grpc_repo.dart'; diff --git a/lib/main.dart b/lib/main.dart index 415f7b64..d9c3bd2b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,31 +1,31 @@ import 'dart:io'; import 'package:PiliPlus/build_config.dart'; +import 'package:PiliPlus/common/widgets/custom_toast.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/common/color_type.dart'; +import 'package:PiliPlus/pages/main/view.dart'; import 'package:PiliPlus/pages/video/view.dart'; +import 'package:PiliPlus/router/app_pages.dart'; +import 'package:PiliPlus/services/loggeer.dart'; +import 'package:PiliPlus/services/service_locator.dart'; +import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/cache_manage.dart'; +import 'package:PiliPlus/utils/data.dart'; +import 'package:PiliPlus/utils/recommend_filter.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/theme_utils.dart'; +import 'package:catcher_2/catcher_2.dart'; +import 'package:dynamic_color/dynamic_color.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_displaymode/flutter_displaymode.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:flutter/material.dart'; -import 'package:dynamic_color/dynamic_color.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/common/widgets/custom_toast.dart'; -import 'package:PiliPlus/http/init.dart'; -import 'package:PiliPlus/models/common/color_type.dart'; -import 'package:PiliPlus/router/app_pages.dart'; -import 'package:PiliPlus/pages/main/view.dart'; -import 'package:PiliPlus/services/service_locator.dart'; -import 'package:PiliPlus/utils/app_scheme.dart'; -import 'package:PiliPlus/utils/data.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc. -import 'package:PiliPlus/utils/recommend_filter.dart'; -import 'package:catcher_2/catcher_2.dart'; -import 'package:PiliPlus/services/loggeer.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/models/common/sponsor_block/segment_type.dart b/lib/models/common/sponsor_block/segment_type.dart index bf675666..11fb0e0a 100644 --- a/lib/models/common/sponsor_block/segment_type.dart +++ b/lib/models/common/sponsor_block/segment_type.dart @@ -9,9 +9,12 @@ enum SegmentType { intro, outro, preview, + // ignore: constant_identifier_names music_offtopic, + // ignore: constant_identifier_names poi_highlight, filler, + // ignore: constant_identifier_names exclusive_access } diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart index 02e972f0..c264af5b 100644 --- a/lib/models/dynamics/result.dart +++ b/lib/models/dynamics/result.dart @@ -1,9 +1,8 @@ import 'dart:convert'; import 'package:PiliPlus/common/widgets/avatar.dart'; -import 'package:PiliPlus/models/model_owner.dart'; - import 'package:PiliPlus/models/dynamics/article_content_model.dart'; +import 'package:PiliPlus/models/model_owner.dart'; class DynamicsDataModel { bool? hasMore; diff --git a/lib/models/member/archive.dart b/lib/models/member/archive.dart index 23a7a8bd..6c7c85ef 100644 --- a/lib/models/member/archive.dart +++ b/lib/models/member/archive.dart @@ -1,6 +1,5 @@ -import 'package:PiliPlus/utils/utils.dart'; - import 'package:PiliPlus/models/model_video.dart'; +import 'package:PiliPlus/utils/utils.dart'; class MemberArchiveDataModel { MemberArchiveDataModel({ diff --git a/lib/models/model_hot_video_item.dart b/lib/models/model_hot_video_item.dart index 12d65e88..6547a5b3 100644 --- a/lib/models/model_hot_video_item.dart +++ b/lib/models/model_hot_video_item.dart @@ -1,8 +1,8 @@ -import 'package:PiliPlus/pages/common/multi_select_controller.dart' - show MultiSelectData; import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/model_rec_video_item.dart'; import 'package:PiliPlus/models/model_video.dart'; +import 'package:PiliPlus/pages/common/multi_select_controller.dart' + show MultiSelectData; // 稍后再看, 排行榜等网页返回也使用该类 class HotVideoItemModel extends BaseRecVideoItemModel with MultiSelectData { diff --git a/lib/models/model_owner.dart b/lib/models/model_owner.dart index ac0ce5e9..bd54b211 100644 --- a/lib/models/model_owner.dart +++ b/lib/models/model_owner.dart @@ -1,6 +1,5 @@ -import 'package:hive/hive.dart'; - import 'package:PiliPlus/models/model_video.dart'; +import 'package:hive/hive.dart'; part 'model_owner.g.dart'; diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart index 3b21d195..24cf960c 100644 --- a/lib/models/search/result.dart +++ b/lib/models/search/result.dart @@ -1,8 +1,7 @@ -import 'package:PiliPlus/utils/em.dart'; -import 'package:PiliPlus/utils/utils.dart'; - import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/model_video.dart'; +import 'package:PiliPlus/utils/em.dart'; +import 'package:PiliPlus/utils/utils.dart'; abstract class SearchNumData { SearchNumData({ diff --git a/lib/models/space_fav/datum.dart b/lib/models/space_fav/datum.dart index ff04033d..06ed2cf1 100644 --- a/lib/models/space_fav/datum.dart +++ b/lib/models/space_fav/datum.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:PiliPlus/models/space_fav/media_list_response.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'datum.g.dart'; diff --git a/lib/models/space_fav/list.dart b/lib/models/space_fav/list.dart index 0f0f63cf..79864646 100644 --- a/lib/models/space_fav/list.dart +++ b/lib/models/space_fav/list.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:PiliPlus/models/space_fav/upper.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'list.g.dart'; diff --git a/lib/models/space_fav/media_list_response.dart b/lib/models/space_fav/media_list_response.dart index e75aa6f9..4c50af7a 100644 --- a/lib/models/space_fav/media_list_response.dart +++ b/lib/models/space_fav/media_list_response.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:PiliPlus/models/space_fav/list.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'media_list_response.g.dart'; diff --git a/lib/models/space_fav/space_fav.dart b/lib/models/space_fav/space_fav.dart index d0827b05..b9cf4a5b 100644 --- a/lib/models/space_fav/space_fav.dart +++ b/lib/models/space_fav/space_fav.dart @@ -1,6 +1,5 @@ -import 'package:json_annotation/json_annotation.dart'; - import 'package:PiliPlus/models/space_fav/datum.dart'; +import 'package:json_annotation/json_annotation.dart'; part 'space_fav.g.dart'; diff --git a/lib/models/space_fav/upper.dart b/lib/models/space_fav/upper.dart index dedcb2e2..499d7cb8 100644 --- a/lib/models/space_fav/upper.dart +++ b/lib/models/space_fav/upper.dart @@ -4,13 +4,13 @@ part 'upper.g.dart'; @JsonSerializable() class Upper { - int? mid; - String? name; - String? face; + int? mid; + String? name; + String? face; - Upper({this.mid, this.name, this.face}); + Upper({this.mid, this.name, this.face}); - factory Upper.fromJson(Map json) => _$UpperFromJson(json); + factory Upper.fromJson(Map json) => _$UpperFromJson(json); - Map toJson() => _$UpperToJson(this); + Map toJson() => _$UpperToJson(this); } diff --git a/lib/models/user/fav_detail.dart b/lib/models/user/fav_detail.dart index 2a56787d..a7efb455 100644 --- a/lib/models/user/fav_detail.dart +++ b/lib/models/user/fav_detail.dart @@ -1,9 +1,8 @@ -import 'package:PiliPlus/pages/common/multi_select_controller.dart' - show MultiSelectData; - import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/model_video.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/pages/common/multi_select_controller.dart' + show MultiSelectData; class FavDetailData { FavFolderItemData? info; diff --git a/lib/models/video/reply/data.dart b/lib/models/video/reply/data.dart index 761ff2db..f762acca 100644 --- a/lib/models/video/reply/data.dart +++ b/lib/models/video/reply/data.dart @@ -1,6 +1,5 @@ -import 'package:PiliPlus/models/video/reply/item.dart'; - import 'package:PiliPlus/models/video/reply/config.dart'; +import 'package:PiliPlus/models/video/reply/item.dart'; import 'package:PiliPlus/models/video/reply/page.dart'; import 'package:PiliPlus/models/video/reply/upper.dart'; diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 9c79ceba..e5d7e5ee 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -9,14 +9,14 @@ import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/cache_manage.dart'; import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/utils/utils.dart'; class AboutPage extends StatefulWidget { const AboutPage({super.key, this.showAppBar}); diff --git a/lib/pages/bangumi/controller.dart b/lib/pages/bangumi/controller.dart index 27620ac0..5c04d387 100644 --- a/lib/pages/bangumi/controller.dart +++ b/lib/pages/bangumi/controller.dart @@ -1,13 +1,13 @@ +import 'package:PiliPlus/http/bangumi.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/bangumi/list.dart'; import 'package:PiliPlus/models/bangumi/pgc_timeline/result.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/bangumi.dart'; -import 'package:PiliPlus/utils/storage.dart'; class BangumiController extends CommonListController< List?, BangumiListItemModel> { diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 8199d590..63644f07 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -1,5 +1,7 @@ import 'dart:math'; +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'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; @@ -9,15 +11,13 @@ import 'package:PiliPlus/models/bangumi/pgc_timeline/result.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/pages/bangumi/controller.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v.dart'; -import 'package:PiliPlus/pages/pgc_index/view.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_timeline.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; +import 'package:PiliPlus/pages/pgc_index/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; class BangumiPage extends CommonPage { const BangumiPage({ diff --git a/lib/pages/bangumi/widgets/bangumi_card_v.dart b/lib/pages/bangumi/widgets/bangumi_card_v.dart index 6f081b3d..47b919aa 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v.dart @@ -1,9 +1,9 @@ -import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/utils/utils.dart'; +import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; // 视频卡片 - 垂直布局 class BangumiCardV extends StatelessWidget { diff --git a/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart b/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart index 31b37c95..8ae14d4d 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart @@ -1,9 +1,9 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:flutter/material.dart'; // 视频卡片 - 垂直布局 class BangumiCardVMemberHome extends StatelessWidget { diff --git a/lib/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart b/lib/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart index d93a12c6..6855f45b 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart @@ -1,8 +1,8 @@ +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; // 视频卡片 - 垂直布局 class BangumiCardVPgcIndex extends StatelessWidget { diff --git a/lib/pages/bangumi/widgets/bangumi_card_v_search.dart b/lib/pages/bangumi/widgets/bangumi_card_v_search.dart index 5e8f6099..1e4dcb43 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v_search.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v_search.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; // 视频卡片 - 垂直布局 class BangumiCardVSearch extends StatelessWidget { diff --git a/lib/pages/bangumi/widgets/bangumi_card_v_timeline.dart b/lib/pages/bangumi/widgets/bangumi_card_v_timeline.dart index f3116f20..9fc689cb 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v_timeline.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v_timeline.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/bangumi/pgc_timeline/episode.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; // 视频卡片 - 垂直布局 class BangumiCardVTimeline extends StatelessWidget { diff --git a/lib/pages/blacklist/view.dart b/lib/pages/blacklist/view.dart index c6ab191a..46c50b9c 100644 --- a/lib/pages/blacklist/view.dart +++ b/lib/pages/blacklist/view.dart @@ -1,14 +1,14 @@ import 'package:PiliPlus/common/skeleton/msg_feed_top.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/black.dart'; import 'package:PiliPlus/pages/blacklist/controller.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class BlackListPage extends StatefulWidget { const BlackListPage({super.key}); diff --git a/lib/pages/common/common_publish_page.dart b/lib/pages/common/common_publish_page.dart index d503ab2a..6577ceb1 100644 --- a/lib/pages/common/common_publish_page.dart +++ b/lib/pages/common/common_publish_page.dart @@ -8,15 +8,15 @@ import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactivevie show SourceModel, SourceType; import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/live/live_emoticons/emoticon.dart'; +import 'package:PiliPlus/models/video/reply/emote.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:chat_bottom_container/chat_bottom_container.dart'; import 'package:dio/dio.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/video/reply/emote.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; import 'package:image_cropper/image_cropper.dart'; import 'package:image_picker/image_picker.dart'; diff --git a/lib/pages/common/reply_controller.dart b/lib/pages/common/reply_controller.dart index fe145c4a..6fdc5e49 100644 --- a/lib/pages/common/reply_controller.dart +++ b/lib/pages/common/reply_controller.dart @@ -4,21 +4,21 @@ import 'dart:io'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/reply.dart'; +import 'package:PiliPlus/models/common/reply_sort_type.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/models/video/reply/data.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/pages/video/reply_new/view.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/request_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/reply_sort_type.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:get/get_navigation/src/dialog/dialog_route.dart'; abstract class ReplyController extends CommonListController { diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index bba57c8d..ffeac11c 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -5,12 +5,12 @@ import 'package:PiliPlus/grpc/dm/v1/dm.pb.dart'; import 'package:PiliPlus/pages/danmaku/controller.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; +import 'package:PiliPlus/utils/danmaku_utils.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/danmaku_utils.dart'; -import 'package:PiliPlus/utils/storage.dart'; /// 传入播放器控制器，监听播放进度，加载对应弹幕 class PlDanmaku extends StatefulWidget { diff --git a/lib/pages/danmaku_block/view.dart b/lib/pages/danmaku_block/view.dart index 8257887f..18e2a917 100644 --- a/lib/pages/danmaku_block/view.dart +++ b/lib/pages/danmaku_block/view.dart @@ -1,11 +1,11 @@ +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/models/user/danmaku_rule.dart'; import 'package:PiliPlus/pages/danmaku_block/controller.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class DanmakuBlockPage extends StatefulWidget { const DanmakuBlockPage({super.key}); diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index b7602d1d..624649ed 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -1,18 +1,18 @@ import 'dart:async'; +import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/follow.dart'; +import 'package:PiliPlus/models/common/dynamics_type.dart'; +import 'package:PiliPlus/models/dynamics/up.dart'; import 'package:PiliPlus/models/follow/result.dart'; import 'package:PiliPlus/pages/common/common_controller.dart'; import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; import 'package:PiliPlus/pages/dynamics_tab/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/dynamics.dart'; -import 'package:PiliPlus/models/common/dynamics_type.dart'; -import 'package:PiliPlus/models/dynamics/up.dart'; -import 'package:PiliPlus/utils/storage.dart'; class DynamicsController extends GetxController with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin { diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index 7ffa2aa5..8718bcd2 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -1,16 +1,15 @@ +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/models/common/dynamics_type.dart'; import 'package:PiliPlus/models/common/up_panel_position.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/up_panel.dart'; import 'package:PiliPlus/pages/dynamics_create/view.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:PiliPlus/pages/dynamics/controller.dart'; -import 'package:PiliPlus/pages/dynamics/widgets/up_panel.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; - enum ReplyOption { allow, close, choose } extension ReplyOptionExtension on ReplyOption { diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart index 5180c528..4ae2e35d 100644 --- a/lib/pages/dynamics/widgets/action_panel.dart +++ b/lib/pages/dynamics/widgets/action_panel.dart @@ -1,13 +1,13 @@ +import 'package:PiliPlus/http/dynamics.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/dynamics_repost/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:PiliPlus/http/dynamics.dart'; -import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; class ActionPanel extends StatefulWidget { const ActionPanel({ diff --git a/lib/pages/dynamics/widgets/additional_panel.dart b/lib/pages/dynamics/widgets/additional_panel.dart index 7610bcba..d84205d8 100644 --- a/lib/pages/dynamics/widgets/additional_panel.dart +++ b/lib/pages/dynamics/widgets/additional_panel.dart @@ -1,10 +1,10 @@ +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/http/search.dart'; /// TODO 点击跳转 Widget addWidget( diff --git a/lib/pages/dynamics/widgets/article_panel.dart b/lib/pages/dynamics/widgets/article_panel.dart index da46bfb1..9b6ec6be 100644 --- a/lib/pages/dynamics/widgets/article_panel.dart +++ b/lib/pages/dynamics/widgets/article_panel.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/dynamics/widgets/pic_panel.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; Widget articlePanel( ThemeData theme, diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart index 07dad64e..76ab7cb2 100644 --- a/lib/pages/dynamics/widgets/author_panel.dart +++ b/lib/pages/dynamics/widgets/author_panel.dart @@ -2,22 +2,22 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/dialog/report.dart'; -import 'package:PiliPlus/pages/save_panel/view.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/dynamics/controller.dart'; +import 'package:PiliPlus/pages/save_panel/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/utils.dart'; class AuthorPanel extends StatelessWidget { final DynamicItemModel item; diff --git a/lib/pages/dynamics/widgets/content_panel.dart b/lib/pages/dynamics/widgets/content_panel.dart index 4607968a..26c05e71 100644 --- a/lib/pages/dynamics/widgets/content_panel.dart +++ b/lib/pages/dynamics/widgets/content_panel.dart @@ -1,9 +1,8 @@ // 内容 import 'package:PiliPlus/common/widgets/image/image_view.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:flutter/material.dart'; - import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; +import 'package:flutter/material.dart'; Widget content( ThemeData theme, diff --git a/lib/pages/dynamics/widgets/dynamic_panel.dart b/lib/pages/dynamics/widgets/dynamic_panel.dart index e75db694..7e21f669 100644 --- a/lib/pages/dynamics/widgets/dynamic_panel.dart +++ b/lib/pages/dynamics/widgets/dynamic_panel.dart @@ -1,13 +1,13 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/pages/dynamics/widgets/action_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/content_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/forward_panel.dart'; +import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class DynamicPanel extends StatelessWidget { final DynamicItemModel item; diff --git a/lib/pages/dynamics/widgets/forward_panel.dart b/lib/pages/dynamics/widgets/forward_panel.dart index e781e728..2237d756 100644 --- a/lib/pages/dynamics/widgets/forward_panel.dart +++ b/lib/pages/dynamics/widgets/forward_panel.dart @@ -14,10 +14,10 @@ import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/video_panel.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/utils.dart'; InlineSpan picsNodes( List pics, diff --git a/lib/pages/dynamics/widgets/live_panel.dart b/lib/pages/dynamics/widgets/live_panel.dart index 097b6e2b..335a7edc 100644 --- a/lib/pages/dynamics/widgets/live_panel.dart +++ b/lib/pages/dynamics/widgets/live_panel.dart @@ -1,11 +1,10 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/utils.dart'; - -import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; Widget livePanel( ThemeData theme, diff --git a/lib/pages/dynamics/widgets/live_rcmd_panel.dart b/lib/pages/dynamics/widgets/live_rcmd_panel.dart index 20acc6a4..43094fe3 100644 --- a/lib/pages/dynamics/widgets/live_rcmd_panel.dart +++ b/lib/pages/dynamics/widgets/live_rcmd_panel.dart @@ -1,13 +1,12 @@ -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/utils/utils.dart'; - import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; Widget liveRcmdPanel( ThemeData theme, diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart index 8dd53943..e0e5c197 100644 --- a/lib/pages/dynamics/widgets/up_panel.dart +++ b/lib/pages/dynamics/widgets/up_panel.dart @@ -1,11 +1,11 @@ -import 'package:PiliPlus/pages/dynamics/controller.dart'; -import 'package:PiliPlus/utils/extension.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/dynamics/up.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; +import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class UpPanel extends StatefulWidget { final DynamicsController dynamicsController; diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart index dd034391..147bf5f2 100644 --- a/lib/pages/dynamics/widgets/video_panel.dart +++ b/lib/pages/dynamics/widgets/video_panel.dart @@ -1,13 +1,12 @@ // 视频or合集 -import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/utils.dart'; - +import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; Widget videoSeasonWidget( ThemeData theme, diff --git a/lib/pages/dynamics_create/view.dart b/lib/pages/dynamics_create/view.dart index 4711841c..b8fb9b63 100644 --- a/lib/pages/dynamics_create/view.dart +++ b/lib/pages/dynamics_create/view.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/dynamics_detail/controller.dart b/lib/pages/dynamics_detail/controller.dart index fe7f5027..d00276a5 100644 --- a/lib/pages/dynamics_detail/controller.dart +++ b/lib/pages/dynamics_detail/controller.dart @@ -1,14 +1,14 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/reply.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/reply_controller.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; -import 'package:get/get.dart'; -import 'package:PiliPlus/http/reply.dart'; import 'package:fixnum/fixnum.dart' as $fixnum; +import 'package:get/get.dart'; class DynamicDetailController extends ReplyController { DynamicDetailController(this.oid, this.type); diff --git a/lib/pages/dynamics_detail/view.dart b/lib/pages/dynamics_detail/view.dart index 6af4105e..654c157d 100644 --- a/lib/pages/dynamics_detail/view.dart +++ b/lib/pages/dynamics_detail/view.dart @@ -1,17 +1,23 @@ import 'dart:math'; +import 'package:PiliPlus/common/skeleton/video_reply.dart'; import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/reply_sort_type.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; import 'package:PiliPlus/pages/dynamics_detail/controller.dart'; import 'package:PiliPlus/pages/dynamics_repost/view.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/pages/video/reply_reply/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; @@ -22,12 +28,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_reply.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/models/common/reply_type.dart'; -import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; class DynamicDetailPage extends StatefulWidget { const DynamicDetailPage({super.key}); diff --git a/lib/pages/dynamics_repost/view.dart b/lib/pages/dynamics_repost/view.dart index 73d6157f..88abfab9 100644 --- a/lib/pages/dynamics_repost/view.dart +++ b/lib/pages/dynamics_repost/view.dart @@ -1,10 +1,10 @@ +import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/dynamics_tab/view.dart b/lib/pages/dynamics_tab/view.dart index 44c05029..2f7a579c 100644 --- a/lib/pages/dynamics_tab/view.dart +++ b/lib/pages/dynamics_tab/view.dart @@ -1,6 +1,8 @@ import 'dart:async'; +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/dynamic_card.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; @@ -13,8 +15,6 @@ import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; class DynamicsTabPage extends CommonPage { diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart index d838866a..6f8d05de 100644 --- a/lib/pages/emote/view.dart +++ b/lib/pages/emote/view.dart @@ -1,11 +1,11 @@ -import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/video/reply/emote.dart'; import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class EmotePanel extends StatefulWidget { final ValueChanged onChoose; diff --git a/lib/pages/episode_panel/view.dart b/lib/pages/episode_panel/view.dart index 5e014cd6..34251d4f 100644 --- a/lib/pages/episode_panel/view.dart +++ b/lib/pages/episode_panel/view.dart @@ -4,8 +4,8 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart index c6f00d5d..91333113 100644 --- a/lib/pages/fan/view.dart +++ b/lib/pages/fan/view.dart @@ -1,6 +1,7 @@ import 'package:PiliPlus/common/skeleton/msg_feed_top.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/fans/result.dart'; @@ -11,7 +12,6 @@ import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; class FansPage extends StatefulWidget { const FansPage({ diff --git a/lib/pages/fav/note/child_view.dart b/lib/pages/fav/note/child_view.dart index a0b114d1..10b6c5d4 100644 --- a/lib/pages/fav/note/child_view.dart +++ b/lib/pages/fav/note/child_view.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/member/article.dart'; diff --git a/lib/pages/fav/pgc/child_view.dart b/lib/pages/fav/pgc/child_view.dart index 0296df79..51d3e150 100644 --- a/lib/pages/fav/pgc/child_view.dart +++ b/lib/pages/fav/pgc/child_view.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/common/skeleton/fav_pgc_item.dart'; +import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/bangumi/list.dart'; diff --git a/lib/pages/fav/video/controller.dart b/lib/pages/fav/video/controller.dart index aef8e167..afc67078 100644 --- a/lib/pages/fav/video/controller.dart +++ b/lib/pages/fav/video/controller.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/fav/video/view.dart b/lib/pages/fav/video/view.dart index 09c193b7..96307926 100644 --- a/lib/pages/fav/video/view.dart +++ b/lib/pages/fav/video/view.dart @@ -1,15 +1,15 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/fav/video/controller.dart'; +import 'package:PiliPlus/pages/fav/video/widgets/item.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/pages/fav/video/widgets/item.dart'; class FavVideoPage extends StatefulWidget { const FavVideoPage({super.key}); diff --git a/lib/pages/fav/video/widgets/item.dart b/lib/pages/fav/video/widgets/item.dart index a4f10c89..2b7d3b0f 100644 --- a/lib/pages/fav/video/widgets/item.dart +++ b/lib/pages/fav/video/widgets/item.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; class FavItem extends StatelessWidget { final String heroTag; diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart index be7c692a..47e433e0 100644 --- a/lib/pages/fav/view.dart +++ b/lib/pages/fav/view.dart @@ -5,8 +5,8 @@ import 'package:PiliPlus/pages/fav/article/view.dart'; import 'package:PiliPlus/pages/fav/note/view.dart'; import 'package:PiliPlus/pages/fav/pgc/view.dart'; import 'package:PiliPlus/pages/fav/video/controller.dart'; -import 'package:PiliPlus/pages/fav_folder_sort/view.dart'; import 'package:PiliPlus/pages/fav/video/view.dart'; +import 'package:PiliPlus/pages/fav_folder_sort/view.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index a80bcfcf..99f82faf 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -1,5 +1,6 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/user/fav_detail.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'; @@ -10,7 +11,6 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/video.dart'; class FavDetailController extends MultiSelectController { diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index a0c3cf3c..eaa6f3fc 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -1,13 +1,16 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/fav_detail.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/fav_detail/controller.dart'; -import 'package:PiliPlus/pages/fav_sort/view.dart'; import 'package:PiliPlus/pages/fav_detail/widget/fav_video_card.dart'; +import 'package:PiliPlus/pages/fav_sort/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -16,9 +19,6 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; class FavDetailPage extends StatefulWidget { const FavDetailPage({super.key}); diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index f178c4b4..16909cff 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -1,19 +1,19 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; -import 'package:PiliPlus/models/user/fav_detail.dart'; -import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get.dart'; -import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/http/video.dart'; +import 'package:PiliPlus/models/user/fav_detail.dart'; +import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; // 收藏视频卡片 - 水平布局 class FavVideoCardH extends StatelessWidget { diff --git a/lib/pages/fav_panel/view.dart b/lib/pages/fav_panel/view.dart index d742082b..490a4562 100644 --- a/lib/pages/fav_panel/view.dart +++ b/lib/pages/fav_panel/view.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; class FavPanel extends StatefulWidget { const FavPanel({ diff --git a/lib/pages/fav_search/controller.dart b/lib/pages/fav_search/controller.dart index 9ba0b546..6e9f11bc 100644 --- a/lib/pages/fav_search/controller.dart +++ b/lib/pages/fav_search/controller.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/user/fav_detail.dart'; import 'package:PiliPlus/pages/common/common_search_controller.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; class FavSearchController extends CommonSearchController { diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart index 24dbeb4e..dbf42fbc 100644 --- a/lib/pages/fav_search/view.dart +++ b/lib/pages/fav_search/view.dart @@ -1,13 +1,12 @@ import 'package:PiliPlus/models/user/fav_detail.dart'; import 'package:PiliPlus/pages/common/common_search_page.dart'; +import 'package:PiliPlus/pages/fav_detail/widget/fav_video_card.dart'; +import 'package:PiliPlus/pages/fav_search/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/fav_detail/widget/fav_video_card.dart'; - -import 'package:PiliPlus/pages/fav_search/controller.dart'; class FavSearchPage extends CommonSearchPage { const FavSearchPage({super.key}); diff --git a/lib/pages/follow/controller.dart b/lib/pages/follow/controller.dart index fcc3704b..0b249179 100644 --- a/lib/pages/follow/controller.dart +++ b/lib/pages/follow/controller.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/models/member/tags.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/storage.dart'; class FollowController extends GetxController with GetTickerProviderStateMixin { late int mid; diff --git a/lib/pages/follow/widgets/follow_item.dart b/lib/pages/follow/widgets/follow_item.dart index a41b6a40..0d4349cb 100644 --- a/lib/pages/follow/widgets/follow_item.dart +++ b/lib/pages/follow/widgets/follow_item.dart @@ -1,11 +1,11 @@ -import 'package:PiliPlus/pages/share/view.dart' show UserModel; -import 'package:PiliPlus/utils/request_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/follow/result.dart'; +import 'package:PiliPlus/pages/share/view.dart' show UserModel; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class FollowItem extends StatelessWidget { final FollowItemModel item; diff --git a/lib/pages/follow_search/view.dart b/lib/pages/follow_search/view.dart index d2f43d0b..c8827cb4 100644 --- a/lib/pages/follow_search/view.dart +++ b/lib/pages/follow_search/view.dart @@ -1,12 +1,11 @@ import 'package:PiliPlus/models/follow/result.dart'; import 'package:PiliPlus/pages/common/common_search_page.dart'; import 'package:PiliPlus/pages/follow/widgets/follow_item.dart'; +import 'package:PiliPlus/pages/follow_search/controller.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/follow_search/controller.dart'; - class FollowSearchPage extends CommonSearchPage { const FollowSearchPage({super.key, this.mid}); diff --git a/lib/pages/group_panel/view.dart b/lib/pages/group_panel/view.dart index 59e9ed59..8c4b8515 100644 --- a/lib/pages/group_panel/view.dart +++ b/lib/pages/group_panel/view.dart @@ -1,10 +1,10 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/models/member/tags.dart'; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; class GroupPanel extends StatefulWidget { final int? mid; diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index 9ba4a2a4..625aab1a 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -1,13 +1,13 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/models/user/history.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/history/base_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; -import 'package:PiliPlus/models/user/history.dart'; -import 'package:PiliPlus/utils/storage.dart'; class HistoryController extends MultiSelectController with GetSingleTickerProviderStateMixin { diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index 03fdddf4..703ee398 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -1,4 +1,5 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; @@ -11,7 +12,6 @@ import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; class HistoryPage extends StatefulWidget { const HistoryPage({super.key, this.type}); diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart index c4786f5c..9e8391a2 100644 --- a/lib/pages/history/widgets/item.dart +++ b/lib/pages/history/widgets/item.dart @@ -1,23 +1,23 @@ -import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; -import 'package:PiliPlus/models/user/history.dart'; -import 'package:PiliPlus/pages/common/multi_select_controller.dart'; -import 'package:PiliPlus/pages/history/base_controller.dart'; -import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; +import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/common/business_type.dart'; +import 'package:PiliPlus/models/user/history.dart'; +import 'package:PiliPlus/pages/common/multi_select_controller.dart'; +import 'package:PiliPlus/pages/history/base_controller.dart'; +import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/id_utils.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class HistoryItem extends StatelessWidget { diff --git a/lib/pages/history_search/controller.dart b/lib/pages/history_search/controller.dart index 776df39a..d7068bc0 100644 --- a/lib/pages/history_search/controller.dart +++ b/lib/pages/history_search/controller.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/history.dart'; import 'package:PiliPlus/pages/common/common_search_controller.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/http/user.dart'; class HistorySearchController extends CommonSearchController { diff --git a/lib/pages/history_search/view.dart b/lib/pages/history_search/view.dart index 5c42d3b8..dd7f5f79 100644 --- a/lib/pages/history_search/view.dart +++ b/lib/pages/history_search/view.dart @@ -1,13 +1,12 @@ import 'package:PiliPlus/models/user/history.dart'; import 'package:PiliPlus/pages/common/common_search_page.dart'; import 'package:PiliPlus/pages/history/widgets/item.dart'; +import 'package:PiliPlus/pages/history_search/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/history_search/controller.dart'; - class HistorySearchPage extends CommonSearchPage { const HistorySearchPage({super.key}); diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 7566491b..c754b481 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -3,13 +3,13 @@ import 'dart:math'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/pages/common/common_controller.dart'; import 'package:PiliPlus/pages/mine/view.dart'; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/tab_type.dart'; -import 'package:PiliPlus/utils/storage.dart'; class HomeController extends GetxController with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin { diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 6373e3c8..23ddae3f 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -1,15 +1,15 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; +import 'package:PiliPlus/pages/home/controller.dart'; import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:PiliPlus/pages/home/controller.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:stream_transform/stream_transform.dart'; class HomePage extends StatefulWidget { diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index 377bad9a..5810e844 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -1,3 +1,6 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; import 'package:PiliPlus/http/loading_state.dart'; @@ -5,16 +8,13 @@ import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/home/controller.dart'; +import 'package:PiliPlus/pages/hot/controller.dart'; import 'package:PiliPlus/pages/rank/view.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/pages/hot/controller.dart'; class HotPage extends CommonPage { const HotPage({super.key}); diff --git a/lib/pages/later/child_view.dart b/lib/pages/later/child_view.dart index 0364341c..b1a06c7f 100644 --- a/lib/pages/later/child_view.dart +++ b/lib/pages/later/child_view.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart index 881c3d64..ed1689d9 100644 --- a/lib/pages/later/controller.dart +++ b/lib/pages/later/controller.dart @@ -1,5 +1,6 @@ import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/later/base_controller.dart'; @@ -12,7 +13,6 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; class LaterController extends MultiSelectController { LaterController(this.laterViewType); diff --git a/lib/pages/later_search/view.dart b/lib/pages/later_search/view.dart index 9a169733..86cb88f1 100644 --- a/lib/pages/later_search/view.dart +++ b/lib/pages/later_search/view.dart @@ -2,14 +2,13 @@ import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_search_page.dart'; +import 'package:PiliPlus/pages/later_search/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/later_search/controller.dart'; - class LaterSearchPage extends CommonSearchPage { const LaterSearchPage({super.key}); diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart index 234dc5d3..0b6a8698 100644 --- a/lib/pages/live/controller.dart +++ b/lib/pages/live/controller.dart @@ -1,5 +1,5 @@ -import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/live.dart'; +import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/live/follow.dart'; import 'package:PiliPlus/models/live/item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index a881e58e..9a9c6687 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -1,5 +1,8 @@ -import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_v.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/http/loading_state.dart'; @@ -12,9 +15,6 @@ import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/skeleton/video_card_v.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; class LivePage extends CommonPage { const LivePage({super.key}); diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index 29646141..7f14f909 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -1,10 +1,10 @@ -import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/live/item.dart'; import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; // 视频卡片 - 垂直布局 class LiveCardV extends StatelessWidget { diff --git a/lib/pages/live/widgets/live_item_follow.dart b/lib/pages/live/widgets/live_item_follow.dart index ca29c874..e1e7f552 100644 --- a/lib/pages/live/widgets/live_item_follow.dart +++ b/lib/pages/live/widgets/live_item_follow.dart @@ -1,10 +1,10 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/live/follow.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; // 视频卡片 - 垂直布局 class LiveCardVFollow extends StatelessWidget { diff --git a/lib/pages/live_emote/view.dart b/lib/pages/live_emote/view.dart index 00f55b1f..355d2ff2 100644 --- a/lib/pages/live_emote/view.dart +++ b/lib/pages/live_emote/view.dart @@ -1,7 +1,8 @@ import 'dart:math'; -import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/live/live_emoticons/datum.dart'; import 'package:PiliPlus/models/live/live_emoticons/emoticon.dart'; @@ -9,7 +10,6 @@ import 'package:PiliPlus/pages/live_emote/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class LiveEmotePanel extends StatefulWidget { final int roomId; diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index d395e586..186a555e 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -1,8 +1,11 @@ import 'dart:convert'; +import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/live.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/live/danmu_info.dart'; import 'package:PiliPlus/models/live/quality.dart'; +import 'package:PiliPlus/models/live/room_info.dart'; import 'package:PiliPlus/models/live/room_info_h5.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; @@ -17,9 +20,6 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/live.dart'; -import 'package:PiliPlus/models/live/room_info.dart'; class LiveRoomController extends GetxController { LiveRoomController(this.heroTag); diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart index 0902ee53..bf2cdceb 100644 --- a/lib/pages/live_room/send_danmaku/view.dart +++ b/lib/pages/live_room/send_danmaku/view.dart @@ -1,11 +1,11 @@ import 'dart:async'; +import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/http/live.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/live_emote/controller.dart'; import 'package:PiliPlus/pages/live_emote/view.dart'; import 'package:PiliPlus/pages/live_room/controller.dart'; -import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 6250b920..8d217af9 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:ui'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/live/room_info_h5.dart'; import 'package:PiliPlus/pages/live_room/controller.dart'; import 'package:PiliPlus/pages/live_room/send_danmaku/view.dart'; @@ -23,7 +24,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:screen_brightness/screen_brightness.dart'; class LiveRoomPage extends StatefulWidget { diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart index efc0faa4..2c46e1a2 100644 --- a/lib/pages/login/controller.dart +++ b/lib/pages/login/controller.dart @@ -5,15 +5,15 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/radio_widget.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/http/login.dart'; +import 'package:PiliPlus/models/login/model.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/login.dart'; import 'package:gt3_flutter_plugin/gt3_flutter_plugin.dart'; -import 'package:PiliPlus/models/login/model.dart'; class LoginPageController extends GetxController with GetSingleTickerProviderStateMixin { diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart index 91aa66d3..975825c3 100644 --- a/lib/pages/login/view.dart +++ b/lib/pages/login/view.dart @@ -2,6 +2,7 @@ import 'dart:ui'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; +import 'package:PiliPlus/pages/login/controller.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; @@ -11,8 +12,6 @@ import 'package:get/get.dart'; import 'package:pretty_qr_code/pretty_qr_code.dart'; import 'package:saver_gallery/saver_gallery.dart'; -import 'package:PiliPlus/pages/login/controller.dart'; - class LoginPage extends StatefulWidget { const LoginPage({super.key}); diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index fb70c2cb..451b3510 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -9,10 +9,10 @@ import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/home/view.dart'; import 'package:PiliPlus/pages/media/view.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/utils/utils.dart'; -import 'package:get/get.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class MainController extends GetxController { List pages = []; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index 49cc02f1..928a66e0 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/tabs.dart'; +import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; import 'package:PiliPlus/pages/dynamics/controller.dart'; import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/home/controller.dart'; @@ -9,16 +10,15 @@ import 'package:PiliPlus/pages/home/view.dart'; import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; +import 'package:PiliPlus/utils/event_bus.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; -import 'package:PiliPlus/utils/event_bus.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:stream_transform/stream_transform.dart'; diff --git a/lib/pages/media/controller.dart b/lib/pages/media/controller.dart index a421d227..037e8ac0 100644 --- a/lib/pages/media/controller.dart +++ b/lib/pages/media/controller.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; -import 'package:PiliPlus/utils/storage.dart'; class MediaController extends CommonDataController { diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index e6305fa6..0eda577e 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -1,15 +1,15 @@ import 'dart:async'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/pages/media/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/utils/utils.dart'; class MediaPage extends CommonPage { const MediaPage({super.key}); diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart index cb5835ed..55b2b50f 100644 --- a/lib/pages/member/view.dart +++ b/lib/pages/member/view.dart @@ -1,23 +1,23 @@ import 'package:PiliPlus/common/widgets/dynamic_sliver_appbar.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/radio_widget.dart'; +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/models/space/data.dart'; -import 'package:PiliPlus/pages/member_pgc/view.dart'; -import 'package:PiliPlus/pages/member_favorite/view.dart'; -import 'package:PiliPlus/pages/member_contribute/view.dart'; -import 'package:PiliPlus/pages/member_home/view.dart'; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/pages/member/widget/user_info_card.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart'; import 'package:PiliPlus/pages/member_dynamics/view.dart'; +import 'package:PiliPlus/pages/member_favorite/view.dart'; +import 'package:PiliPlus/pages/member_home/view.dart'; +import 'package:PiliPlus/pages/member_pgc/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class MemberPage extends StatefulWidget { const MemberPage({super.key}); diff --git a/lib/pages/member_article/controller.dart b/lib/pages/member_article/controller.dart index 12ae2419..29e5cca8 100644 --- a/lib/pages/member_article/controller.dart +++ b/lib/pages/member_article/controller.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; -import 'package:PiliPlus/models/space_article/item.dart'; import 'package:PiliPlus/models/space_article/data.dart'; +import 'package:PiliPlus/models/space_article/item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; class MemberArticleCtr diff --git a/lib/pages/member_coin/widgets/item.dart b/lib/pages/member_coin/widgets/item.dart index fcd1361f..44c56efa 100644 --- a/lib/pages/member_coin/widgets/item.dart +++ b/lib/pages/member_coin/widgets/item.dart @@ -1,14 +1,14 @@ -import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:PiliPlus/common/widgets/stat/stat.dart'; -import 'package:PiliPlus/utils/app_scheme.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; +import 'package:PiliPlus/common/widgets/image/image_save.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/member/coin.dart'; +import 'package:PiliPlus/utils/app_scheme.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/material.dart'; class MemberCoinsItem extends StatelessWidget { final MemberCoinsDataModel coinItem; diff --git a/lib/pages/member_contribute/view.dart b/lib/pages/member_contribute/view.dart index 7ab5dbb6..4be03c02 100644 --- a/lib/pages/member_contribute/view.dart +++ b/lib/pages/member_contribute/view.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/pages/member_article/view.dart'; import 'package:PiliPlus/pages/member_audio/view.dart'; +import 'package:PiliPlus/pages/member_contribute/controller.dart'; import 'package:PiliPlus/pages/member_season_series/view.dart'; import 'package:PiliPlus/pages/member_video/view.dart'; -import 'package:PiliPlus/pages/member_contribute/controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/member_dynamics/controller.dart b/lib/pages/member_dynamics/controller.dart index defa5d17..adc9612c 100644 --- a/lib/pages/member_dynamics/controller.dart +++ b/lib/pages/member_dynamics/controller.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/http/msg.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/http/member.dart'; -import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; class MemberDynamicsController diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index 444fa6ad..516abfc6 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -8,9 +8,9 @@ import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; import 'package:PiliPlus/pages/member_dynamics/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/utils/utils.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; class MemberDynamicsPage extends StatefulWidget { diff --git a/lib/pages/member_home/view.dart b/lib/pages/member_home/view.dart index 777b1322..9c8391d3 100644 --- a/lib/pages/member_home/view.dart +++ b/lib/pages/member_home/view.dart @@ -7,11 +7,11 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space/data.dart'; import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_member_home.dart'; +import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/pages/member_article/widget/item.dart'; import 'package:PiliPlus/pages/member_coin/view.dart'; import 'package:PiliPlus/pages/member_contribute/controller.dart'; import 'package:PiliPlus/pages/member_home/widget/fav_item.dart'; -import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/pages/member_like/view.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/member_pgc/controller.dart b/lib/pages/member_pgc/controller.dart index 3dcde74b..d3ae3002 100644 --- a/lib/pages/member_pgc/controller.dart +++ b/lib/pages/member_pgc/controller.dart @@ -4,8 +4,8 @@ import 'package:PiliPlus/models/space/data.dart'; import 'package:PiliPlus/models/space_archive/data.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/pages/member/controller.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:get/get.dart'; class MemberBangumiCtr diff --git a/lib/pages/member_search/controller.dart b/lib/pages/member_search/controller.dart index 92c54929..53d36d89 100644 --- a/lib/pages/member_search/controller.dart +++ b/lib/pages/member_search/controller.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/member/archive.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/member.dart'; class MemberSearchController extends GetxController with GetSingleTickerProviderStateMixin { diff --git a/lib/pages/member_search/view.dart b/lib/pages/member_search/view.dart index 0bcfcb02..6bf00cba 100644 --- a/lib/pages/member_search/view.dart +++ b/lib/pages/member_search/view.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; +import 'package:PiliPlus/pages/member_search/controller.dart'; import 'package:PiliPlus/pages/member_search/search_archive.dart'; import 'package:PiliPlus/pages/member_search/search_dynamic.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/member_search/controller.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class MemberSearchPage extends StatefulWidget { const MemberSearchPage({super.key}); diff --git a/lib/pages/member_season_series/view.dart b/lib/pages/member_season_series/view.dart index 2d6a919a..7614cd4e 100644 --- a/lib/pages/member_season_series/view.dart +++ b/lib/pages/member_season_series/view.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart'; import 'package:PiliPlus/pages/member_season_series/controller.dart'; import 'package:PiliPlus/pages/member_season_series/widget/season_series_card.dart'; import 'package:PiliPlus/pages/member_video/view.dart'; -import 'package:PiliPlus/pages/member_contribute/view.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/member_video/view.dart b/lib/pages/member_video/view.dart index 2f4f7b58..b9bd63ea 100644 --- a/lib/pages/member_video/view.dart +++ b/lib/pages/member_video/view.dart @@ -6,9 +6,9 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h_member_video.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; -import 'package:PiliPlus/pages/member_video/controller.dart'; -import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/pages/member/controller.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; +import 'package:PiliPlus/pages/member_video/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart index 4b542ceb..afc17eb0 100644 --- a/lib/pages/mine/controller.dart +++ b/lib/pages/mine/controller.dart @@ -1,13 +1,13 @@ -import 'package:PiliPlus/utils/accounts/account.dart'; -import 'package:PiliPlus/utils/login_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/models/user/stat.dart'; +import 'package:PiliPlus/utils/accounts/account.dart'; +import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; diff --git a/lib/pages/mine/view.dart b/lib/pages/mine/view.dart index d23e4a26..0ae11a20 100644 --- a/lib/pages/mine/view.dart +++ b/lib/pages/mine/view.dart @@ -1,11 +1,11 @@ -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; import 'package:PiliPlus/models/user/info.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; class MinePage extends StatefulWidget { const MinePage({super.key}); diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart index 614d96da..aa942ce1 100644 --- a/lib/pages/msg_feed_top/at_me/view.dart +++ b/lib/pages/msg_feed_top/at_me/view.dart @@ -1,17 +1,16 @@ import 'package:PiliPlus/common/skeleton/msg_feed_top.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/msgfeed_at_me.dart'; +import 'package:PiliPlus/pages/msg_feed_top/at_me/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/msg_feed_top/at_me/controller.dart'; - class AtMePage extends StatefulWidget { const AtMePage({super.key}); diff --git a/lib/pages/msg_feed_top/like_me/controller.dart b/lib/pages/msg_feed_top/like_me/controller.dart index 0e8a921e..ec04983d 100644 --- a/lib/pages/msg_feed_top/like_me/controller.dart +++ b/lib/pages/msg_feed_top/like_me/controller.dart @@ -1,9 +1,9 @@ import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/msg.dart'; +import 'package:PiliPlus/models/msg/msgfeed_like_me.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:PiliPlus/models/msg/msgfeed_like_me.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; class LikeMeController extends CommonDataController { diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart index f663019d..c71989f7 100644 --- a/lib/pages/msg_feed_top/like_me/view.dart +++ b/lib/pages/msg_feed_top/like_me/view.dart @@ -1,5 +1,6 @@ import 'package:PiliPlus/common/skeleton/msg_feed_top.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; @@ -10,7 +11,6 @@ import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; class LikeMePage extends StatefulWidget { const LikeMePage({super.key}); diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart index e51c462f..a5e39b9f 100644 --- a/lib/pages/msg_feed_top/reply_me/view.dart +++ b/lib/pages/msg_feed_top/reply_me/view.dart @@ -1,5 +1,6 @@ import 'package:PiliPlus/common/skeleton/msg_feed_top.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; @@ -9,7 +10,6 @@ import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; class ReplyMePage extends StatefulWidget { const ReplyMePage({super.key}); diff --git a/lib/pages/msg_feed_top/sys_msg/controller.dart b/lib/pages/msg_feed_top/sys_msg/controller.dart index 94a75b22..a3d6561d 100644 --- a/lib/pages/msg_feed_top/sys_msg/controller.dart +++ b/lib/pages/msg_feed_top/sys_msg/controller.dart @@ -1,9 +1,9 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/msg/msgfeed_sys_msg.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/http/msg.dart'; class SysMsgController extends CommonListController?, SystemNotifyList> { diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart index 21b9ef2d..5fd05193 100644 --- a/lib/pages/msg_feed_top/sys_msg/view.dart +++ b/lib/pages/msg_feed_top/sys_msg/view.dart @@ -6,6 +6,7 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/msgfeed_sys_msg.dart'; +import 'package:PiliPlus/pages/msg_feed_top/sys_msg/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -15,8 +16,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/msg_feed_top/sys_msg/controller.dart'; - class SysMsgPage extends StatefulWidget { const SysMsgPage({super.key}); diff --git a/lib/pages/pgc_index/view.dart b/lib/pages/pgc_index/view.dart index 1584e4d7..c88ff8f7 100644 --- a/lib/pages/pgc_index/view.dart +++ b/lib/pages/pgc_index/view.dart @@ -4,8 +4,8 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/bangumi/pgc_index/condition.dart'; -import 'package:PiliPlus/pages/pgc_index/controller.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart'; +import 'package:PiliPlus/pages/pgc_index/controller.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index f8467520..d63f38f0 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -1,10 +1,10 @@ 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'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/rank_type.dart'; class RankController extends GetxController with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin { diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart index 5d48f433..7d20fd06 100644 --- a/lib/pages/rank/view.dart +++ b/lib/pages/rank/view.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/models/common/rank_type.dart'; +import 'package:PiliPlus/pages/rank/controller.dart'; import 'package:PiliPlus/pages/rank/zone/view.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/rank/controller.dart'; class RankPage extends StatefulWidget { const RankPage({super.key}); diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 67e097ae..aa2563b4 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -1,4 +1,8 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; +import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; @@ -7,10 +11,6 @@ import 'package:PiliPlus/pages/rank/zone/widget/pgc_rank_item.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; class ZonePage extends CommonPage { const ZonePage({super.key, this.rid, this.seasonType}); diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index c46b1b93..2a0bfd0b 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -1,14 +1,14 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_v.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; +import 'package:PiliPlus/common/widgets/video_card/video_card_v.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/rcmd/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/skeleton/video_card_v.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/video_card/video_card_v.dart'; class RcmdPage extends CommonPage { const RcmdPage({super.key}); diff --git a/lib/pages/save_panel/view.dart b/lib/pages/save_panel/view.dart index dbcf9aa8..0aefadac 100644 --- a/lib/pages/save_panel/view.dart +++ b/lib/pages/save_panel/view.dart @@ -1,12 +1,13 @@ import 'dart:math'; import 'dart:typed_data'; import 'dart:ui'; + import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/utils/download.dart'; diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index 6a257531..14e8edcd 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -1,11 +1,11 @@ import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/models/search/search_trending/trending_data.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/models/search/search_trending/trending_data.dart'; import 'package:PiliPlus/models/search/suggest.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart'; class SSearchController extends GetxController { diff --git a/lib/pages/search/view.dart b/lib/pages/search/view.dart index 94350af0..03e465ab 100644 --- a/lib/pages/search/view.dart +++ b/lib/pages/search/view.dart @@ -3,13 +3,13 @@ import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/search/search_trending/trending_data.dart'; import 'package:PiliPlus/models/search/suggest.dart'; +import 'package:PiliPlus/pages/search/controller.dart'; +import 'package:PiliPlus/pages/search/widgets/hot_keyword.dart'; +import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/search/controller.dart'; -import 'package:PiliPlus/pages/search/widgets/hot_keyword.dart'; -import 'package:PiliPlus/pages/search/widgets/search_text.dart'; class SearchPage extends StatefulWidget { const SearchPage({super.key}); diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart index 7c3e74bc..78ec8fcc 100644 --- a/lib/pages/search_panel/controller.dart +++ b/lib/pages/search_panel/controller.dart @@ -1,11 +1,11 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/pages/search_result/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/search.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; class SearchPanelController, T> extends CommonListController { diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index b42b9cf7..4986ceed 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -6,13 +6,12 @@ import 'package:PiliPlus/common/skeleton/video_card_v.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; +import 'package:PiliPlus/pages/search_panel/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; - -import 'package:PiliPlus/pages/search_panel/controller.dart'; abstract class CommonSearchPanel extends StatefulWidget { const CommonSearchPanel({ diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart index e245c884..357a863b 100644 --- a/lib/pages/search_result/view.dart +++ b/lib/pages/search_result/view.dart @@ -1,15 +1,15 @@ +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/pages/search/controller.dart'; import 'package:PiliPlus/pages/search_panel/article/view.dart'; import 'package:PiliPlus/pages/search_panel/live/view.dart'; import 'package:PiliPlus/pages/search_panel/pgc/view.dart'; import 'package:PiliPlus/pages/search_panel/user/view.dart'; import 'package:PiliPlus/pages/search_panel/video/view.dart'; +import 'package:PiliPlus/pages/search_result/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; -import 'package:PiliPlus/pages/search_result/controller.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class SearchResultPage extends StatefulWidget { const SearchResultPage({super.key}); diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart index b0d18e2a..d291c9cb 100644 --- a/lib/pages/setting/pages/color_select.dart +++ b/lib/pages/setting/pages/color_select.dart @@ -1,14 +1,14 @@ +import 'package:PiliPlus/models/common/color_type.dart'; import 'package:PiliPlus/models/common/nav_bar_config.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; import 'package:PiliPlus/pages/home/view.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/models/common/color_type.dart'; -import 'package:PiliPlus/utils/storage.dart'; class ColorSelectPage extends StatefulWidget { const ColorSelectPage({super.key}); diff --git a/lib/pages/setting/pages/display_mode.dart b/lib/pages/setting/pages/display_mode.dart index 084c1758..5bbcc5ce 100644 --- a/lib/pages/setting/pages/display_mode.dart +++ b/lib/pages/setting/pages/display_mode.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter_displaymode/flutter_displaymode.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/utils/storage.dart'; class SetDisplayMode extends StatefulWidget { const SetDisplayMode({super.key}); diff --git a/lib/pages/setting/pages/font_size_select.dart b/lib/pages/setting/pages/font_size_select.dart index 9e366da3..499fa52d 100644 --- a/lib/pages/setting/pages/font_size_select.dart +++ b/lib/pages/setting/pages/font_size_select.dart @@ -1,7 +1,7 @@ +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/utils/storage.dart'; class FontSizeSelectPage extends StatefulWidget { const FontSizeSelectPage({super.key}); diff --git a/lib/pages/setting/pages/home_tabbar_set.dart b/lib/pages/setting/pages/home_tabbar_set.dart index 7b7e8253..09f6a318 100644 --- a/lib/pages/setting/pages/home_tabbar_set.dart +++ b/lib/pages/setting/pages/home_tabbar_set.dart @@ -1,7 +1,7 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; class TabbarSetPage extends StatefulWidget { const TabbarSetPage({super.key}); diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart index 7a6cc5bb..926f9251 100644 --- a/lib/pages/setting/pages/logs.dart +++ b/lib/pages/setting/pages/logs.dart @@ -1,4 +1,5 @@ import 'dart:io'; + import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/services/loggeer.dart'; import 'package:PiliPlus/utils/page_utils.dart'; diff --git a/lib/pages/setting/pages/play_speed_set.dart b/lib/pages/setting/pages/play_speed_set.dart index 71d9d4ff..9462812f 100644 --- a/lib/pages/setting/pages/play_speed_set.dart +++ b/lib/pages/setting/pages/play_speed_set.dart @@ -1,11 +1,11 @@ import 'dart:math'; +import 'package:PiliPlus/pages/setting/widgets/switch_item.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/setting/widgets/switch_item.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:hive/hive.dart'; class PlaySpeedPage extends StatefulWidget { diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart index f4853daa..87fe64e7 100644 --- a/lib/pages/setting/play_setting.dart +++ b/lib/pages/setting/play_setting.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/pages/setting/widgets/model.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/services/service_locator.dart'; +import 'package:flutter/material.dart'; class PlaySetting extends StatefulWidget { const PlaySetting({super.key, this.showAppBar}); diff --git a/lib/pages/setting/view.dart b/lib/pages/setting/view.dart index cba858cc..96297fdf 100644 --- a/lib/pages/setting/view.dart +++ b/lib/pages/setting/view.dart @@ -7,6 +7,7 @@ import 'package:PiliPlus/pages/setting/privacy_setting.dart'; import 'package:PiliPlus/pages/setting/recommend_setting.dart'; import 'package:PiliPlus/pages/setting/style_setting.dart'; import 'package:PiliPlus/pages/setting/video_setting.dart'; +import 'package:PiliPlus/pages/setting/widgets/multi_select_dialog.dart'; import 'package:PiliPlus/pages/webdav/view.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; @@ -16,8 +17,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:PiliPlus/pages/setting/widgets/multi_select_dialog.dart'; - class _SettingsModel { final String name; final String title; diff --git a/lib/pages/setting/widgets/select_item.dart b/lib/pages/setting/widgets/select_item.dart index 9064fa1e..9c5d4224 100644 --- a/lib/pages/setting/widgets/select_item.dart +++ b/lib/pages/setting/widgets/select_item.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; class SetSelectItem extends StatefulWidget { diff --git a/lib/pages/setting/widgets/switch_item.dart b/lib/pages/setting/widgets/switch_item.dart index 87c0bc79..5838f59d 100644 --- a/lib/pages/setting/widgets/switch_item.dart +++ b/lib/pages/setting/widgets/switch_item.dart @@ -1,6 +1,6 @@ +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:get/get.dart'; class SetSwitchItem extends StatefulWidget { diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart index a40c4195..67174aad 100644 --- a/lib/pages/subscription/controller.dart +++ b/lib/pages/subscription/controller.dart @@ -1,11 +1,11 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; -import 'package:PiliPlus/utils/storage.dart'; class SubController extends CommonListController?, SubFolderItemData> { diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart index 466add3b..6de3f3d6 100644 --- a/lib/pages/subscription/view.dart +++ b/lib/pages/subscription/view.dart @@ -1,13 +1,13 @@ import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/sub_folder.dart'; +import 'package:PiliPlus/pages/subscription/controller.dart'; import 'package:PiliPlus/pages/subscription/widgets/item.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/pages/subscription/controller.dart'; class SubPage extends StatefulWidget { const SubPage({super.key}); diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart index d94d9e38..dffb6df7 100644 --- a/lib/pages/subscription/widgets/item.dart +++ b/lib/pages/subscription/widgets/item.dart @@ -1,10 +1,10 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/models/user/sub_folder.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/utils.dart'; class SubItem extends StatelessWidget { final SubFolderItemData subFolderItem; diff --git a/lib/pages/subscription_detail/controller.dart b/lib/pages/subscription_detail/controller.dart index 0ac33e26..203e014b 100644 --- a/lib/pages/subscription_detail/controller.dart +++ b/lib/pages/subscription_detail/controller.dart @@ -1,9 +1,9 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/sub_detail.dart'; import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/user.dart'; class SubDetailController extends CommonListController { diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart index 9ed14a06..0b108813 100644 --- a/lib/pages/subscription_detail/view.dart +++ b/lib/pages/subscription_detail/view.dart @@ -1,3 +1,6 @@ +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/sub_detail.dart'; import 'package:PiliPlus/models/user/sub_folder.dart'; @@ -7,9 +10,6 @@ import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; class SubDetailPage extends StatefulWidget { const SubDetailPage({super.key}); diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart index fdd141e4..b76962a2 100644 --- a/lib/pages/subscription_detail/widget/sub_video_card.dart +++ b/lib/pages/subscription_detail/widget/sub_video_card.dart @@ -1,14 +1,14 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; -import 'package:PiliPlus/models/user/sub_detail.dart'; -import 'package:PiliPlus/utils/page_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/user/sub_detail.dart'; +import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:flutter/material.dart'; // 收藏视频卡片 - 水平布局 class SubVideoCardH extends StatelessWidget { diff --git a/lib/pages/video/ai/view.dart b/lib/pages/video/ai/view.dart index 64a1fcf9..9257acb1 100644 --- a/lib/pages/video/ai/view.dart +++ b/lib/pages/video/ai/view.dart @@ -1,10 +1,10 @@ +import 'package:PiliPlus/models/video/ai.dart'; import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/video/ai.dart'; -import 'package:PiliPlus/utils/utils.dart'; class AiDetail extends CommonCollapseSlidePage { final ModelResult modelResult; diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart index d189894f..0cec5861 100644 --- a/lib/pages/video/controller.dart +++ b/lib/pages/video/controller.dart @@ -2,25 +2,31 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; import 'dart:ui'; + import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/progress_bar/segment_progress_bar.dart'; +import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/main.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/action_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/post_segment_model.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_model.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/skip_type.dart'; import 'package:PiliPlus/models/video/later.dart'; +import 'package:PiliPlus/models/video/play/quality.dart'; +import 'package:PiliPlus/models/video/play/url.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/medialist/view.dart'; import 'package:PiliPlus/pages/video/note/view.dart'; import 'package:PiliPlus/pages/video/post_panel/view.dart'; import 'package:PiliPlus/pages/video/send_danmaku/view.dart'; -import 'package:PiliPlus/pages/video/medialist/view.dart'; import 'package:PiliPlus/pages/video/widgets/header_control.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/data_source.dart'; @@ -28,6 +34,9 @@ import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:PiliPlus/utils/video_utils.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; @@ -36,14 +45,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_volume_controller/flutter_volume_controller.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; -import 'package:PiliPlus/models/video/play/quality.dart'; -import 'package:PiliPlus/models/video/play/url.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/utils/utils.dart'; -import 'package:PiliPlus/utils/video_utils.dart'; import 'package:get/get_navigation/src/dialog/dialog_route.dart'; import 'package:hive/hive.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; diff --git a/lib/pages/video/introduction/pgc/controller.dart b/lib/pages/video/introduction/pgc/controller.dart index ee735821..89b13e80 100644 --- a/lib/pages/video/introduction/pgc/controller.dart +++ b/lib/pages/video/introduction/pgc/controller.dart @@ -1,31 +1,31 @@ import 'dart:convert'; +import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/http/video.dart'; +import 'package:PiliPlus/models/bangumi/info.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/pages/dynamics_repost/view.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/pages/video/pay_coins/view.dart'; import 'package:PiliPlus/pages/video/reply/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/search.dart'; -import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:html/parser.dart' as html_parser; import 'package:html/dom.dart' as dom; +import 'package:html/parser.dart' as html_parser; class BangumiIntroController extends CommonDataController { diff --git a/lib/pages/video/introduction/pgc/view.dart b/lib/pages/video/introduction/pgc/view.dart index cf0fe956..2980e0f9 100644 --- a/lib/pages/video/introduction/pgc/view.dart +++ b/lib/pages/video/introduction/pgc/view.dart @@ -1,27 +1,27 @@ import 'dart:async'; +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' show SourceModel; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; +import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/widgets/bangumi_panel.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_row_item.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/common/widgets/stat/stat.dart'; -import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/pages/video/introduction/pgc/widgets/bangumi_panel.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_row_item.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; class BangumiIntroPanel extends StatefulWidget { final int? cid; diff --git a/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart b/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart index 19f9f7fa..abfb3292 100644 --- a/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart +++ b/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart @@ -1,12 +1,12 @@ import 'dart:async'; +import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/utils/storage.dart'; class BangumiPanel extends StatefulWidget { const BangumiPanel({ diff --git a/lib/pages/video/introduction/ugc/controller.dart b/lib/pages/video/introduction/ugc/controller.dart index 8d089b0a..3e069dec 100644 --- a/lib/pages/video/introduction/ugc/controller.dart +++ b/lib/pages/video/introduction/ugc/controller.dart @@ -1,35 +1,35 @@ import 'dart:async'; import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/models/video/ai.dart'; +import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/dynamics_repost/view.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/pay_coins/view.dart'; import 'package:PiliPlus/pages/video/related/controller.dart'; import 'package:PiliPlus/pages/video/reply/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/global_data.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/user.dart'; -import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/models/video/ai.dart'; -import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/controller.dart'; -import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/id_utils.dart'; -import 'package:PiliPlus/utils/storage.dart'; class VideoIntroController extends GetxController { // 视频bvid diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart index cfd131b5..56e51fda 100644 --- a/lib/pages/video/introduction/ugc/view.dart +++ b/lib/pages/video/introduction/ugc/view.dart @@ -1,38 +1,37 @@ import 'dart:async'; +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/avatar.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; +import 'package:PiliPlus/common/widgets/stat/stat.dart'; +import 'package:PiliPlus/models/video_detail_res.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_row_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/page.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/season.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:flutter/material.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/pages/mine/controller.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/common/widgets/stat/stat.dart'; -import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/utils/utils.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_row_item.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/page.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/season.dart'; - class VideoIntroPanel extends StatefulWidget { const VideoIntroPanel({ super.key, diff --git a/lib/pages/video/introduction/ugc/widgets/action_item.dart b/lib/pages/video/introduction/ugc/widgets/action_item.dart index b1e93d16..c2ed42d5 100644 --- a/lib/pages/video/introduction/ugc/widgets/action_item.dart +++ b/lib/pages/video/introduction/ugc/widgets/action_item.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:math'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; diff --git a/lib/pages/video/introduction/ugc/widgets/action_row_item.dart b/lib/pages/video/introduction/ugc/widgets/action_row_item.dart index 0c4aba27..1a511da4 100644 --- a/lib/pages/video/introduction/ugc/widgets/action_row_item.dart +++ b/lib/pages/video/introduction/ugc/widgets/action_row_item.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:flutter/material.dart'; class ActionRowItem extends StatelessWidget { final Icon? icon; diff --git a/lib/pages/video/introduction/ugc/widgets/menu_row.dart b/lib/pages/video/introduction/ugc/widgets/menu_row.dart index 4558b71c..1e9bf989 100644 --- a/lib/pages/video/introduction/ugc/widgets/menu_row.dart +++ b/lib/pages/video/introduction/ugc/widgets/menu_row.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:flutter/material.dart'; class MenuRow extends StatelessWidget { const MenuRow({ diff --git a/lib/pages/video/introduction/ugc/widgets/page.dart b/lib/pages/video/introduction/ugc/widgets/page.dart index b05af009..b6f27c31 100644 --- a/lib/pages/video/introduction/ugc/widgets/page.dart +++ b/lib/pages/video/introduction/ugc/widgets/page.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'dart:math'; +import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/video_detail_res.dart'; class PagesPanel extends StatefulWidget { const PagesPanel({ diff --git a/lib/pages/video/introduction/ugc/widgets/season.dart b/lib/pages/video/introduction/ugc/widgets/season.dart index b5041051..e61da3d3 100644 --- a/lib/pages/video/introduction/ugc/widgets/season.dart +++ b/lib/pages/video/introduction/ugc/widgets/season.dart @@ -1,11 +1,11 @@ import 'dart:async'; +import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/video_detail_res.dart'; class SeasonPanel extends StatefulWidget { const SeasonPanel({ diff --git a/lib/pages/video/medialist/view.dart b/lib/pages/video/medialist/view.dart index 68b49606..6a4fa43a 100644 --- a/lib/pages/video/medialist/view.dart +++ b/lib/pages/video/medialist/view.dart @@ -1,18 +1,18 @@ -import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; +import 'package:PiliPlus/common/widgets/dialog/dialog.dart'; import 'package:PiliPlus/common/widgets/image/image_save.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; +import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/models/video/later.dart'; import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/http/search.dart'; -import 'package:PiliPlus/models/video/later.dart'; -import 'package:PiliPlus/utils/utils.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; diff --git a/lib/pages/video/member/view.dart b/lib/pages/video/member/view.dart index 92839117..ebb3e6d8 100644 --- a/lib/pages/video/member/view.dart +++ b/lib/pages/video/member/view.dart @@ -1,9 +1,9 @@ -import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; +import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' show SourceModel; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h_member_video.dart'; import 'package:PiliPlus/http/loading_state.dart'; diff --git a/lib/pages/video/note/view.dart b/lib/pages/video/note/view.dart index eb307dc6..d0fc43af 100644 --- a/lib/pages/video/note/view.dart +++ b/lib/pages/video/note/view.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/common/skeleton/video_reply.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/button/icon_button.dart'; import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_slide_page.dart'; diff --git a/lib/pages/video/related/controller.dart b/lib/pages/video/related/controller.dart index 10ad4901..4fe2945b 100644 --- a/lib/pages/video/related/controller.dart +++ b/lib/pages/video/related/controller.dart @@ -1,8 +1,8 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/video.dart'; class RelatedController extends CommonListController?, HotVideoItemModel> { diff --git a/lib/pages/video/related/view.dart b/lib/pages/video/related/view.dart index 0da6e8dd..432acf3d 100644 --- a/lib/pages/video/related/view.dart +++ b/lib/pages/video/related/view.dart @@ -1,13 +1,13 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/skeleton/video_card_h.dart'; +import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; +import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/video/related/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; -import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; class RelatedVideoPanel extends StatefulWidget { const RelatedVideoPanel({super.key, required this.heroTag}); diff --git a/lib/pages/video/reply/controller.dart b/lib/pages/video/reply/controller.dart index cff56923..f1826de3 100644 --- a/lib/pages/video/reply/controller.dart +++ b/lib/pages/video/reply/controller.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/pages/common/reply_controller.dart'; import 'package:PiliPlus/http/reply.dart'; +import 'package:PiliPlus/pages/common/reply_controller.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:fixnum/fixnum.dart' as $fixnum; import 'package:flutter/material.dart'; diff --git a/lib/pages/video/reply/view.dart b/lib/pages/video/reply/view.dart index b52bdfc7..d7424b69 100644 --- a/lib/pages/video/reply/view.dart +++ b/lib/pages/video/reply/view.dart @@ -1,18 +1,18 @@ +import 'package:PiliPlus/common/skeleton/video_reply.dart'; import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart'; -import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; +import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/reply_sort_type.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; +import 'package:PiliPlus/pages/video/reply/controller.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_reply.dart'; -import 'package:PiliPlus/models/common/reply_type.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/pages/video/reply/controller.dart'; class VideoReplyPanel extends StatefulWidget { final String? bvid; diff --git a/lib/pages/video/reply/widgets/reply_item_grpc.dart b/lib/pages/video/reply/widgets/reply_item_grpc.dart index 6592cf35..010e1439 100644 --- a/lib/pages/video/reply/widgets/reply_item_grpc.dart +++ b/lib/pages/video/reply/widgets/reply_item_grpc.dart @@ -3,8 +3,9 @@ import 'dart:math'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/badge.dart'; -import 'package:PiliPlus/common/widgets/image/image_view.dart'; import 'package:PiliPlus/common/widgets/dialog/report.dart'; +import 'package:PiliPlus/common/widgets/image/image_view.dart'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/video.dart'; @@ -13,19 +14,18 @@ import 'package:PiliPlus/pages/save_panel/view.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/reply/widgets/zan_grpc.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/url_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:dio/dio.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/utils/url_utils.dart'; -import 'package:PiliPlus/utils/utils.dart'; class ReplyItemGrpc extends StatelessWidget { const ReplyItemGrpc({ diff --git a/lib/pages/video/reply/widgets/zan_grpc.dart b/lib/pages/video/reply/widgets/zan_grpc.dart index 9d92b45a..a60da7ba 100644 --- a/lib/pages/video/reply/widgets/zan_grpc.dart +++ b/lib/pages/video/reply/widgets/zan_grpc.dart @@ -1,12 +1,12 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; +import 'package:PiliPlus/http/reply.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:fixnum/fixnum.dart' as $fixnum; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:PiliPlus/http/reply.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:fixnum/fixnum.dart' as $fixnum; class ZanButtonGrpc extends StatefulWidget { const ZanButtonGrpc({ diff --git a/lib/pages/video/reply_new/view.dart b/lib/pages/video/reply_new/view.dart index 535a214a..c7b0c334 100644 --- a/lib/pages/video/reply_new/view.dart +++ b/lib/pages/video/reply_new/view.dart @@ -1,15 +1,15 @@ import 'dart:async'; +import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/main.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/common/widgets/button/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/common/reply_type.dart'; class ReplyPage extends CommonPublishPage { final int? oid; diff --git a/lib/pages/video/reply_reply/controller.dart b/lib/pages/video/reply_reply/controller.dart index 76b5cefd..660fdb46 100644 --- a/lib/pages/video/reply_reply/controller.dart +++ b/lib/pages/video/reply_reply/controller.dart @@ -1,12 +1,12 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/reply.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/pages/common/reply_controller.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/reply.dart'; -import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; class VideoReplyReplyController extends ReplyController diff --git a/lib/pages/video/reply_reply/view.dart b/lib/pages/video/reply_reply/view.dart index ead5478d..ebbede3f 100644 --- a/lib/pages/video/reply_reply/view.dart +++ b/lib/pages/video/reply_reply/view.dart @@ -1,23 +1,22 @@ +import 'package:PiliPlus/common/skeleton/video_reply.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/pages/common/common_slide_page.dart'; import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/pages/video/reply_new/view.dart'; +import 'package:PiliPlus/pages/video/reply_reply/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/common/skeleton/video_reply.dart'; -import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:get/get_navigation/src/dialog/dialog_route.dart'; import 'package:scrollable_positioned_list/scrollable_positioned_list.dart'; -import 'package:PiliPlus/pages/video/reply_reply/controller.dart'; - class VideoReplyReplyPanel extends CommonSlidePage { const VideoReplyReplyPanel({ super.key, diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart index e4c91e8a..147dbdca 100644 --- a/lib/pages/video/view.dart +++ b/lib/pages/video/view.dart @@ -4,13 +4,19 @@ import 'dart:math'; import 'dart:ui'; import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/pages/episode_panel/view.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/main.dart'; +import 'package:PiliPlus/models/bangumi/info.dart' as bangumi; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/video_detail_res.dart' as video; +import 'package:PiliPlus/pages/danmaku/view.dart'; +import 'package:PiliPlus/pages/episode_panel/view.dart'; +import 'package:PiliPlus/pages/video/ai/view.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/view.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/widgets/intro_detail.dart' @@ -26,39 +32,33 @@ import 'package:PiliPlus/pages/video/reply/controller.dart'; import 'package:PiliPlus/pages/video/reply/view.dart'; import 'package:PiliPlus/pages/video/reply_reply/view.dart'; import 'package:PiliPlus/pages/video/view_point/view.dart'; -import 'package:PiliPlus/pages/video/ai/view.dart'; import 'package:PiliPlus/pages/video/widgets/header_control.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; import 'package:PiliPlus/plugin/pl_player/view.dart'; +import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/services/shutdown_timer_service.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:auto_orientation/auto_orientation.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart'; import 'package:floating/floating.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_svg/svg.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; -import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; -import 'package:PiliPlus/pages/danmaku/view.dart'; -import 'package:PiliPlus/pages/video/controller.dart'; -import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; -import 'package:PiliPlus/services/service_locator.dart'; -import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/models/bangumi/info.dart' as bangumi; -import 'package:PiliPlus/models/video_detail_res.dart' as video; import 'package:screen_brightness/screen_brightness.dart'; class VideoDetailPageV extends StatefulWidget { diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart index be32da75..055d09f0 100644 --- a/lib/pages/video/widgets/header_control.dart +++ b/lib/pages/video/widgets/header_control.dart @@ -7,17 +7,22 @@ import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/common/super_resolution_type.dart'; import 'package:PiliPlus/models/video/play/CDN.dart'; +import 'package:PiliPlus/models/video/play/quality.dart'; +import 'package:PiliPlus/models/video/play/url.dart'; import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart'; +import 'package:PiliPlus/pages/setting/widgets/switch_item.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; -import 'package:PiliPlus/pages/setting/widgets/switch_item.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; @@ -30,15 +35,10 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; +import 'package:marquee/marquee.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:media_kit/media_kit.dart'; -import 'package:PiliPlus/models/video/play/quality.dart'; -import 'package:PiliPlus/models/video/play/url.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; -import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:share_plus/share_plus.dart'; -import 'package:marquee/marquee.dart'; class HeaderControl extends StatefulWidget implements PreferredSizeWidget { const HeaderControl({ diff --git a/lib/pages/webdav/webdav.dart b/lib/pages/webdav/webdav.dart index e0e719ad..12706655 100644 --- a/lib/pages/webdav/webdav.dart +++ b/lib/pages/webdav/webdav.dart @@ -1,4 +1,5 @@ import 'dart:convert'; + import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart index 9131e86a..f07b4b04 100644 --- a/lib/pages/whisper/controller.dart +++ b/lib/pages/whisper/controller.dart @@ -1,4 +1,5 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/msg/account.dart'; import 'package:PiliPlus/models/msg/msgfeed_unread.dart'; import 'package:PiliPlus/models/msg/session.dart'; @@ -8,7 +9,6 @@ import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/msg.dart'; class WhisperController extends CommonListController?, SessionList> { diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart index 6d82de8e..0ba1d2ea 100644 --- a/lib/pages/whisper/view.dart +++ b/lib/pages/whisper/view.dart @@ -3,13 +3,12 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/session.dart'; +import 'package:PiliPlus/pages/whisper/controller.dart'; import 'package:PiliPlus/pages/whisper/widgets/item.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/whisper/controller.dart'; - class WhisperPage extends StatefulWidget { const WhisperPage({super.key}); diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index a7ce187b..5ecd0598 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/msg.dart'; +import 'package:PiliPlus/models/msg/session.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; @@ -8,8 +10,6 @@ import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/http/msg.dart'; -import 'package:PiliPlus/models/msg/session.dart'; class WhisperDetailController extends CommonListController { diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 247efe6a..98cf7012 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -1,15 +1,15 @@ import 'dart:convert'; +import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/msg/session.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:PiliPlus/common/widgets/image/network_img_layer.dart'; -import 'package:PiliPlus/utils/utils.dart'; import 'package:get/get.dart'; enum MsgType { diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index 1321e69a..f00e4b5a 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -6,16 +6,22 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/progress_bar/segment_progress_bar.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/common/audio_normalization.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/skip_type.dart'; import 'package:PiliPlus/models/user/danmaku_rule.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/data_source.dart'; import 'package:PiliPlus/plugin/pl_player/models/data_status.dart'; import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; +import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:easy_debounce/easy_throttle.dart'; @@ -27,16 +33,10 @@ import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; -import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/pages/mine/controller.dart'; -import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; -import 'package:PiliPlus/services/service_locator.dart'; -import 'package:PiliPlus/utils/feed_back.dart'; -import 'package:PiliPlus/utils/storage.dart'; +import 'package:path/path.dart' as path; import 'package:path_provider/path_provider.dart'; import 'package:screen_brightness/screen_brightness.dart'; import 'package:universal_platform/universal_platform.dart'; -import 'package:path/path.dart' as path; class PlPlayerController { Player? _videoPlayerController; diff --git a/lib/plugin/pl_player/utils/fullscreen.dart b/lib/plugin/pl_player/utils/fullscreen.dart index 25209c91..ddb1e3ff 100644 --- a/lib/plugin/pl_player/utils/fullscreen.dart +++ b/lib/plugin/pl_player/utils/fullscreen.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:io'; import 'package:PiliPlus/utils/storage.dart'; -import 'package:device_info_plus/device_info_plus.dart'; import 'package:auto_orientation/auto_orientation.dart'; +import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index eda4dd44..8fd5209c 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -11,8 +11,12 @@ import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/bottom_control_type.dart'; import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart'; +import 'package:PiliPlus/plugin/pl_player/models/duration.dart'; +import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; +import 'package:PiliPlus/plugin/pl_player/utils.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/app_bar_ani.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/backward_seek.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/bottom_control.dart'; @@ -21,6 +25,7 @@ import 'package:PiliPlus/plugin/pl_player/widgets/forward_seek.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:easy_debounce/easy_throttle.dart'; @@ -33,11 +38,6 @@ import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; -import 'package:PiliPlus/plugin/pl_player/controller.dart'; -import 'package:PiliPlus/plugin/pl_player/models/duration.dart'; -import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; -import 'package:PiliPlus/plugin/pl_player/utils.dart'; -import 'package:PiliPlus/utils/storage.dart'; import 'package:saver_gallery/saver_gallery.dart'; import 'package:screen_brightness/screen_brightness.dart'; diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 8a99f395..5d70b331 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -6,6 +6,7 @@ import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/dynamics_detail/view.dart'; import 'package:PiliPlus/pages/fan/view.dart'; import 'package:PiliPlus/pages/fav/view.dart'; +import 'package:PiliPlus/pages/fav_create/view.dart'; import 'package:PiliPlus/pages/fav_detail/view.dart'; import 'package:PiliPlus/pages/fav_search/view.dart'; import 'package:PiliPlus/pages/follow/view.dart'; @@ -23,6 +24,9 @@ import 'package:PiliPlus/pages/member/view.dart'; import 'package:PiliPlus/pages/member_dynamics/view.dart'; import 'package:PiliPlus/pages/member_profile/view.dart'; import 'package:PiliPlus/pages/member_search/view.dart'; +import 'package:PiliPlus/pages/msg_feed_top/at_me/view.dart'; +import 'package:PiliPlus/pages/msg_feed_top/like_me/view.dart'; +import 'package:PiliPlus/pages/msg_feed_top/reply_me/view.dart'; import 'package:PiliPlus/pages/msg_feed_top/sys_msg/view.dart'; import 'package:PiliPlus/pages/search/view.dart'; import 'package:PiliPlus/pages/search_result/view.dart'; @@ -33,16 +37,16 @@ import 'package:PiliPlus/pages/setting/pages/color_select.dart'; import 'package:PiliPlus/pages/setting/pages/display_mode.dart'; import 'package:PiliPlus/pages/setting/pages/font_size_select.dart'; import 'package:PiliPlus/pages/setting/pages/home_tabbar_set.dart'; +import 'package:PiliPlus/pages/setting/pages/logs.dart'; import 'package:PiliPlus/pages/setting/pages/play_speed_set.dart'; import 'package:PiliPlus/pages/setting/play_setting.dart'; import 'package:PiliPlus/pages/setting/privacy_setting.dart'; import 'package:PiliPlus/pages/setting/recommend_setting.dart'; import 'package:PiliPlus/pages/setting/style_setting.dart'; import 'package:PiliPlus/pages/setting/video_setting.dart'; +import 'package:PiliPlus/pages/setting/view.dart'; import 'package:PiliPlus/pages/settings_search/view.dart'; import 'package:PiliPlus/pages/sponsor_block/view.dart'; -import 'package:PiliPlus/pages/setting/view.dart'; -import 'package:PiliPlus/pages/fav_create/view.dart'; import 'package:PiliPlus/pages/subscription/view.dart'; import 'package:PiliPlus/pages/subscription_detail/view.dart'; import 'package:PiliPlus/pages/video/view.dart'; @@ -51,10 +55,6 @@ import 'package:PiliPlus/pages/webview/view.dart'; import 'package:PiliPlus/pages/whisper/view.dart'; import 'package:PiliPlus/pages/whisper_detail/view.dart'; import 'package:PiliPlus/utils/storage.dart'; -import 'package:PiliPlus/pages/msg_feed_top/at_me/view.dart'; -import 'package:PiliPlus/pages/msg_feed_top/reply_me/view.dart'; -import 'package:PiliPlus/pages/msg_feed_top/like_me/view.dart'; -import 'package:PiliPlus/pages/setting/pages/logs.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index 61d3afc7..93c6c9f3 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -1,11 +1,11 @@ +import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/live/room_info_h5.dart'; +import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/utils/extension.dart'; -import 'package:audio_service/audio_service.dart'; -import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:audio_service/audio_service.dart'; import 'package:get/get_utils/get_utils.dart'; Future initAudioService() async { diff --git a/lib/services/loggeer.dart b/lib/services/loggeer.dart index 8bc0ca67..c08ad3a9 100644 --- a/lib/services/loggeer.dart +++ b/lib/services/loggeer.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:logger/logger.dart'; -import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as p; +import 'package:path_provider/path_provider.dart'; final _loggerFactory = PiliLogger(); diff --git a/lib/services/shutdown_timer_service.dart b/lib/services/shutdown_timer_service.dart index 4298518d..d7a2371c 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 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/accounts/cookie_jar_adapter.dart b/lib/utils/accounts/cookie_jar_adapter.dart index 3a802e09..86fdfd4a 100644 --- a/lib/utils/accounts/cookie_jar_adapter.dart +++ b/lib/utils/accounts/cookie_jar_adapter.dart @@ -1,8 +1,7 @@ +import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:cookie_jar/cookie_jar.dart'; import 'package:hive/hive.dart'; -import 'package:PiliPlus/utils/accounts/account.dart'; - class BiliCookieJarAdapter extends TypeAdapter { @override final int typeId = 8; diff --git a/lib/utils/cache_manage.dart b/lib/utils/cache_manage.dart index 5de201fb..5693701c 100644 --- a/lib/utils/cache_manage.dart +++ b/lib/utils/cache_manage.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:io'; + import 'package:PiliPlus/utils/extension.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/lib/utils/data.dart b/lib/utils/data.dart index 0c9d453b..a0f67a7a 100644 --- a/lib/utils/data.dart +++ b/lib/utils/data.dart @@ -1,5 +1,4 @@ import 'package:PiliPlus/http/user.dart'; - import 'package:PiliPlus/utils/storage.dart'; class Data { diff --git a/lib/utils/download.dart b/lib/utils/download.dart index 51b84191..9eda5eba 100644 --- a/lib/utils/download.dart +++ b/lib/utils/download.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -10,8 +12,6 @@ import 'package:live_photo_maker/live_photo_maker.dart'; import 'package:path_provider/path_provider.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:saver_gallery/saver_gallery.dart'; -import 'dart:io'; - import 'package:share_plus/share_plus.dart'; class DownloadUtils { diff --git a/lib/utils/feed_back.dart b/lib/utils/feed_back.dart index 0ced7744..4bfc898b 100644 --- a/lib/utils/feed_back.dart +++ b/lib/utils/feed_back.dart @@ -1,5 +1,5 @@ -import 'package:flutter/services.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/services.dart'; bool enableFeedback = GStorage.feedBackEnable; void feedBack() { diff --git a/lib/utils/grid.dart b/lib/utils/grid.dart index 3cdebc7c..968a7dd6 100644 --- a/lib/utils/grid.dart +++ b/lib/utils/grid.dart @@ -1,9 +1,9 @@ import 'dart:math'; import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:PiliPlus/utils/storage.dart'; class Grid { static double smallCardWidth = GStorage.smallCardWidth; diff --git a/lib/utils/login_utils.dart b/lib/utils/login_utils.dart index 3e14937d..efe9f528 100644 --- a/lib/utils/login_utils.dart +++ b/lib/utils/login_utils.dart @@ -1,25 +1,25 @@ import 'dart:math'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/common/dynamics_type.dart'; import 'package:PiliPlus/models/common/tab_type.dart' hide tabsConfig; import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/models/user/stat.dart'; import 'package:PiliPlus/pages/bangumi/controller.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; +import 'package:PiliPlus/pages/home/controller.dart'; import 'package:PiliPlus/pages/live/controller.dart'; import 'package:PiliPlus/pages/main/controller.dart'; +import 'package:PiliPlus/pages/media/controller.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:webview_cookie_manager/webview_cookie_manager.dart'; -import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web; -import 'package:PiliPlus/pages/dynamics/controller.dart'; -import 'package:PiliPlus/pages/home/controller.dart'; -import 'package:PiliPlus/pages/media/controller.dart'; -import 'package:PiliPlus/pages/mine/controller.dart'; -import 'package:PiliPlus/http/user.dart'; class LoginUtils { static final random = Random(); diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart index 9930bf1c..e3805276 100644 --- a/lib/utils/page_utils.dart +++ b/lib/utils/page_utils.dart @@ -10,8 +10,8 @@ import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/live/item.dart'; import 'package:PiliPlus/pages/contact/view.dart'; import 'package:PiliPlus/pages/fav_panel/view.dart'; -import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/pages/share/view.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/services/shutdown_timer_service.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/extension.dart'; diff --git a/lib/utils/proxy.dart b/lib/utils/proxy.dart index cdb0b629..dae6fce3 100644 --- a/lib/utils/proxy.dart +++ b/lib/utils/proxy.dart @@ -1,4 +1,5 @@ import 'dart:io'; + import 'package:system_proxy/system_proxy.dart'; class CustomProxy { diff --git a/lib/utils/recommend_filter.dart b/lib/utils/recommend_filter.dart index 7804879b..7c7d2902 100644 --- a/lib/utils/recommend_filter.dart +++ b/lib/utils/recommend_filter.dart @@ -1,7 +1,6 @@ import 'package:PiliPlus/models/model_video.dart'; -import 'package:hive/hive.dart'; - import 'package:PiliPlus/utils/storage.dart'; +import 'package:hive/hive.dart'; class RecommendFilter { static late int minDurationForRcmd; diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart index 268c2a7b..0f1add02 100644 --- a/lib/utils/request_utils.dart +++ b/lib/utils/request_utils.dart @@ -18,8 +18,8 @@ import 'package:PiliPlus/models/login/model.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; -import 'package:PiliPlus/pages/later/controller.dart'; import 'package:PiliPlus/pages/group_panel/view.dart'; +import 'package:PiliPlus/pages/later/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 3f78a01a..674184bb 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:math'; + import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart' show kDragContainerExtentPercentage, displacement; @@ -12,8 +13,10 @@ import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; import 'package:PiliPlus/models/common/up_panel_position.dart'; import 'package:PiliPlus/models/live/quality.dart'; +import 'package:PiliPlus/models/model_owner.dart'; import 'package:PiliPlus/models/user/danmaku_rule.dart'; import 'package:PiliPlus/models/user/danmaku_rule_adapter.dart'; +import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/models/video/play/CDN.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; import 'package:PiliPlus/models/video/play/subtitle.dart'; @@ -23,8 +26,9 @@ import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart'; import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/accounts/account_adapter.dart'; -import 'package:PiliPlus/utils/accounts/cookie_jar_adapter.dart'; import 'package:PiliPlus/utils/accounts/account_type_adapter.dart'; +import 'package:PiliPlus/utils/accounts/cookie_jar_adapter.dart'; +import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/set_int_adapter.dart'; import 'package:cookie_jar/cookie_jar.dart'; @@ -32,9 +36,6 @@ import 'package:flutter/material.dart'; import 'package:get/get_navigation/src/routes/transitions_type.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:PiliPlus/models/model_owner.dart'; -import 'package:PiliPlus/models/user/info.dart'; -import 'package:PiliPlus/utils/global_data.dart'; import 'package:uuid/uuid.dart'; class GStorage { diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index fd2eae84..de0d7ffa 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'dart:math'; + import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/api.dart'; @@ -19,8 +20,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:share_plus/share_plus.dart'; import 'package:path/path.dart' as path; +import 'package:share_plus/share_plus.dart'; import 'package:uuid/v4.dart'; class Utils { diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart index c911c9c4..19a4b2ba 100644 --- a/lib/utils/wbi_sign.dart +++ b/lib/utils/wbi_sign.dart @@ -3,6 +3,7 @@ // import md5 from 'md5' // import axios from 'axios' import 'dart:convert'; + import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/utils/storage.dart';