Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-04-29 12:47:14 +08:00
parent c7864ff4a3
commit cd26cf6d98
104 changed files with 482 additions and 391 deletions

View File

@@ -13,7 +13,6 @@ 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/account_type.dart';
import 'package:PiliPlus/models/common/sponsor_block/action_type.dart';
import 'package:PiliPlus/models/common/sponsor_block/post_segment_model.dart';
@@ -53,6 +52,7 @@ import 'package:PiliPlus/plugin/pl_player/models/heart_beat_type.dart';
import 'package:PiliPlus/plugin/pl_player/models/play_status.dart';
import 'package:PiliPlus/services/download/download_service.dart';
import 'package:PiliPlus/utils/accounts.dart';
import 'package:PiliPlus/utils/connectivity_utils.dart';
import 'package:PiliPlus/utils/extension/context_ext.dart';
import 'package:PiliPlus/utils/extension/file_ext.dart';
import 'package:PiliPlus/utils/extension/iterable_ext.dart';
@@ -63,6 +63,7 @@ import 'package:PiliPlus/utils/path_utils.dart';
import 'package:PiliPlus/utils/platform_utils.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:PiliPlus/utils/storage_pref.dart';
import 'package:PiliPlus/utils/theme_utils.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:PiliPlus/utils/video_utils.dart';
import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
@@ -523,11 +524,8 @@ class VideoDetailController extends GetxController
if (plPlayerController.isFullScreen.value || showVideoSheet) {
PageUtils.showVideoBottomSheet(
context,
child: plPlayerController.darkVideoPage && MyApp.darkThemeData != null
? Theme(
data: MyApp.darkThemeData!,
child: panel(),
)
child: plPlayerController.darkVideoPage
? Theme(data: ThemeUtils.darkTheme, child: panel())
: panel(),
isFullScreen: () => plPlayerController.isFullScreen.value,
);
@@ -574,7 +572,7 @@ class VideoDetailController extends GetxController
@override
Widget buildItem(Object item, Animation<double> animation) {
final theme = Get.theme;
final theme = ThemeUtils.theme;
return Align(
alignment: Alignment.centerLeft,
child: SlideTransition(
@@ -838,7 +836,7 @@ class VideoDetailController extends GetxController
querySponsorBlock(bvid: bvid, cid: cid.value);
}
if (plPlayerController.cacheVideoQa == null) {
final isWiFi = await Utils.isWiFi;
final isWiFi = await ConnectivityUtils.isWiFi;
plPlayerController
..cacheVideoQa = isWiFi
? Pref.defaultVideoQa
@@ -1031,9 +1029,9 @@ class VideoDetailController extends GetxController
if (plPlayerController.isFullScreen.value || showVideoSheet) {
PageUtils.showVideoBottomSheet(
context,
child: plPlayerController.darkVideoPage && MyApp.darkThemeData != null
child: plPlayerController.darkVideoPage
? Theme(
data: MyApp.darkThemeData!,
data: ThemeUtils.darkTheme,
child: PostPanel(
enableSlide: false,
videoDetailController: this,
@@ -1370,9 +1368,9 @@ class VideoDetailController extends GetxController
if (plPlayerController.isFullScreen.value || showVideoSheet) {
PageUtils.showVideoBottomSheet(
context,
child: plPlayerController.darkVideoPage && MyApp.darkThemeData != null
child: plPlayerController.darkVideoPage
? Theme(
data: MyApp.darkThemeData!,
data: ThemeUtils.darkTheme,
child: NoteListPage(
oid: aid,
enableSlide: false,