HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: pages

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-02-21 18:40:39 +08:00
parent 4c56fcd6a8
commit f94cb2a4b5
21 changed files with 728 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/common/widgets/list_sheet.dart
View File

@@ -275,9 +275,7 @@ class _ListSheetContentState extends State<ListSheetContent>
@override
Widget build(BuildContext context) {
return ColoredBox(
color: Theme.of(context).colorScheme.surface,
child: Column(
return Column(
children: [
Container(
height: 45,
@@ -410,9 +408,7 @@ class _ListSheetContentState extends State<ListSheetContent>
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
if (_isList)
Material(
color: Theme.of(context).colorScheme.surface,
child: TabBar(
TabBar(
controller: _ctr,
padding: const EdgeInsets.only(right: 60),
isScrollable: true,
@@ -422,11 +418,10 @@ class _ListSheetContentState extends State<ListSheetContent>
dividerHeight: 1,
dividerColor: Theme.of(context).dividerColor.withOpacity(0.1),
),
),
Expanded(
child: _isList
? Material(
color: Theme.of(context).colorScheme.surface,
color: Colors.transparent,
child: TabBarView(
controller: _ctr,
children: List.generate(
@@ -437,12 +432,11 @@ class _ListSheetContentState extends State<ListSheetContent>
),
)
: Material(
color: Theme.of(context).colorScheme.surface,
color: Colors.transparent,
child: _buildBody(null, episodes),
),
),
],
),
);
}

14
lib/common/widgets/video_card_h.dart
View File

@@ -42,7 +42,8 @@ class VideoCardH extends StatelessWidget {
try {
type = videoItem.type;
} catch (_) {}
return Stack(children: [
return Stack(
children: [
Semantics(
label: Utils.videoItemSemantics(videoItem),
excludeSemantics: true,
@@ -85,8 +86,8 @@ class VideoCardH extends StatelessWidget {
}
}
try {
final int cid =
videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
final int cid = videoItem.cid ??
await SearchHttp.ab2c(aid: aid, bvid: bvid);
Get.toNamed(
'/video?bvid=$bvid&cid=$cid',
arguments: {
@@ -110,8 +111,8 @@ class VideoCardH extends StatelessWidget {
AspectRatio(
aspectRatio: StyleString.aspectRatio,
child: LayoutBuilder(
builder:
(BuildContext context, BoxConstraints boxConstraints) {
builder: (BuildContext context,
BoxConstraints boxConstraints) {
final double maxWidth = boxConstraints.maxWidth;
final double maxHeight = boxConstraints.maxHeight;
return Stack(
@@ -168,7 +169,8 @@ class VideoCardH extends StatelessWidget {
videoItem: videoItem,
),
),
]);
],
);
}
Widget videoContent(context) {

2
lib/main.dart
View File

@@ -53,7 +53,7 @@ void main() async {
],
);
}
if (GStorage.badCertificateCallback) {
if (BuildConfig.isDebug || GStorage.badCertificateCallback) {
HttpOverrides.global = _CustomHttpOverrides();
}
await setupServiceLocator();

4
lib/pages/bangumi/introduction/widgets/intro_detail.dart
View File

@@ -22,10 +22,8 @@ class IntroDetail extends StatelessWidget {
fontSize: 12,
color: Theme.of(context).colorScheme.onSurface,
);
return Container(
color: Theme.of(context).colorScheme.surface,
return Padding(
padding: const EdgeInsets.only(left: 14, right: 14),
// height: Utils.getSheetHeight(context),
child: Column(
children: [
Container(

2
lib/pages/common/reply_controller.dart
View File

@@ -329,7 +329,7 @@ abstract class ReplyController extends CommonController {
dynamic mid,
}) async {
// biliSendCommAntifraud
if (_biliSendCommAntifraud && Platform.isAndroid) {
if (Platform.isAndroid && _biliSendCommAntifraud) {
try {
List<Cookie> cookies = await Request.cookieManager.cookieJar
.loadForRequest(Uri.parse(HttpString.apiBaseUrl));

1
lib/pages/dynamics/detail/view.dart
View File

@@ -179,6 +179,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
ScaffoldState? scaffoldState = Scaffold.maybeOf(context);
if (scaffoldState != null) {
scaffoldState.showBottomSheet(
backgroundColor: Colors.transparent,
(context) => MediaQuery.removePadding(
context: context,
removeLeft: true,

1
lib/pages/html/view.dart
View File

@@ -168,6 +168,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
ScaffoldState? scaffoldState = Scaffold.maybeOf(context);
if (scaffoldState != null) {
scaffoldState.showBottomSheet(
backgroundColor: Colors.transparent,
(context) => MediaQuery.removePadding(
context: context,
removeLeft: true,

1
lib/pages/member/controller.dart
View File

@@ -120,6 +120,7 @@ class MemberController extends GetxController {
await Get.bottomSheet(
GroupPanel(mid: mid),
isScrollControlled: true,
backgroundColor: Theme.of(context).colorScheme.surface,
);
Get.back();
},

1
lib/pages/setting/pages/play_speed_set.dart
View File

@@ -133,6 +133,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
context: context,
isScrollControlled: true,
clipBehavior: Clip.hardEdge,
backgroundColor: Theme.of(context).colorScheme.surface,
builder: (context) {
return Column(
mainAxisSize: MainAxisSize.min,

4
lib/pages/video/detail/controller.dart
View File

@@ -298,9 +298,10 @@ class VideoDetailController extends GetxController
}
// 稍后再看面板展开
showMediaListPanel() {
showMediaListPanel(context) {
if (mediaList.isNotEmpty) {
childKey.currentState?.showBottomSheet(
backgroundColor: Theme.of(context).colorScheme.surface,
(context) => MediaListPanel(
mediaList: mediaList,
changeMediaList: (bvid, cid, aid, cover) {
@@ -1235,6 +1236,7 @@ class VideoDetailController extends GetxController
childKey.currentState?.showBottomSheet(
enableDrag: false,
(context) => _postPanel(),
backgroundColor: Colors.transparent,
);
}
}

12
lib/pages/video/detail/introduction/controller.dart
View File

@@ -28,7 +28,6 @@ import 'package:share_plus/share_plus.dart';
import '../../../../http/search.dart';
import '../../../../models/model_hot_video_item.dart';
import '../related/index.dart';
import 'widgets/group_panel.dart';
class VideoIntroController extends GetxController
with GetTickerProviderStateMixin {
@@ -852,17 +851,6 @@ class VideoIntroController extends GetxController
return true;
}
// 设置关注分组
void setFollowGroup() {
if (videoDetail.value.owner == null) {
return;
}
Get.bottomSheet(
GroupPanel(mid: videoDetail.value.owner!.mid!),
isScrollControlled: true,
);
}
// ai总结
Future aiConclusion() async {
SmartDialog.showLoading(msg: '正在获取AI总结');

38
lib/pages/video/detail/introduction/widgets/fav_panel.dart
View File

@@ -38,19 +38,10 @@ class _FavPanelState extends State<FavPanel> {
}
return false;
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(18),
color: Theme.of(context).colorScheme.surface,
),
child: Column(
children: [
AppBar(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(18),
),
),
backgroundColor: Colors.transparent,
leading: IconButton(
tooltip: '关闭',
onPressed: Get.back,
@@ -75,8 +66,8 @@ class _FavPanelState extends State<FavPanel> {
),
label: const Text('新建收藏夹'),
style: TextButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 18, vertical: 14),
padding:
const EdgeInsets.symmetric(horizontal: 18, vertical: 14),
visualDensity: const VisualDensity(
horizontal: -2,
vertical: -2,
@@ -87,8 +78,6 @@ class _FavPanelState extends State<FavPanel> {
],
),
Expanded(
child: Material(
color: Theme.of(context).colorScheme.surface,
child: FutureBuilder(
future: _futureBuilderFuture,
builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -98,18 +87,18 @@ class _FavPanelState extends State<FavPanel> {
return HttpError(
isSliver: false,
callback: () => setState(() {
_futureBuilderFuture =
widget.ctr.queryVideoInFolder();
_futureBuilderFuture = widget.ctr.queryVideoInFolder();
}),
);
}
Map data = snapshot.data as Map;
if (data['status']) {
return Obx(
() => ListView.builder(
() => Material(
color: Colors.transparent,
child: ListView.builder(
controller: widget.scrollController,
itemCount:
widget.ctr.favFolderData.value.list.length,
itemCount: widget.ctr.favFolderData.value.list.length,
itemBuilder: (context, index) {
return ListTile(
onTap: () => widget.ctr.onChoose(
@@ -118,13 +107,13 @@ class _FavPanelState extends State<FavPanel> {
1,
index),
dense: true,
leading: Utils.isPublic(widget.ctr.favFolderData
.value.list[index].attr)
leading: Utils.isPublic(widget
.ctr.favFolderData.value.list[index].attr)
? const Icon(Icons.folder_outlined)
: const Icon(Icons.lock_outline),
minLeadingWidth: 0,
title: Text(widget.ctr.favFolderData.value
.list[index].title!),
title: Text(widget
.ctr.favFolderData.value.list[index].title!),
subtitle: Text(
'${widget.ctr.favFolderData.value.list[index].mediaCount}个内容 . ${Utils.isPublicText(widget.ctr.favFolderData.value.list[index].attr)}',
),
@@ -141,6 +130,7 @@ class _FavPanelState extends State<FavPanel> {
);
},
),
),
);
} else {
return CustomScrollView(
@@ -165,7 +155,6 @@ class _FavPanelState extends State<FavPanel> {
},
),
),
),
Divider(
height: 1,
color: Theme.of(context).disabledColor.withOpacity(0.08),
@@ -216,7 +205,6 @@ class _FavPanelState extends State<FavPanel> {
),
],
),
),
);
}
}

20
lib/pages/video/detail/introduction/widgets/group_panel.dart
View File

@@ -77,19 +77,10 @@ class _GroupPanelState extends State<GroupPanel> {
}
return false;
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(18),
color: Theme.of(context).colorScheme.surface,
),
child: Column(
children: <Widget>[
AppBar(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(18),
),
),
backgroundColor: Colors.transparent,
leading: IconButton(
tooltip: '关闭',
onPressed: Get.back,
@@ -97,8 +88,6 @@ class _GroupPanelState extends State<GroupPanel> {
title: const Text('设置关注分组'),
),
Expanded(
child: Material(
color: Theme.of(context).colorScheme.surface,
child: FutureBuilder(
future: _futureBuilderFuture,
builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -114,7 +103,9 @@ class _GroupPanelState extends State<GroupPanel> {
}
Map data = snapshot.data as Map;
if (data['status']) {
return ListView.builder(
return Material(
color: Colors.transparent,
child: ListView.builder(
controller: widget.scrollController,
itemCount: tagsList.length,
itemBuilder: (context, index) {
@@ -147,6 +138,7 @@ class _GroupPanelState extends State<GroupPanel> {
),
);
},
),
);
} else {
return CustomScrollView(
@@ -168,7 +160,6 @@ class _GroupPanelState extends State<GroupPanel> {
},
),
),
),
Divider(
height: 1,
color: Theme.of(context).disabledColor.withOpacity(0.08),
@@ -197,7 +188,6 @@ class _GroupPanelState extends State<GroupPanel> {
),
],
),
),
);
}
}

4
lib/pages/video/detail/introduction/widgets/intro_detail.dart
View File

@@ -19,10 +19,8 @@ class IntroDetail extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
color: Theme.of(context).colorScheme.surface,
return Padding(
padding: const EdgeInsets.only(left: 14, right: 14),
// height: Utils.getSheetHeight(context),
child: Column(
children: [
InkWell(

39
lib/pages/video/detail/member/horizontal_member_page.dart
View File

@@ -64,24 +64,8 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
automaticallyImplyLeading: false,
toolbarHeight: 36,
actions: [
iconButton(
context: context,
onPressed: Get.back,
tooltip: '关闭',
icon: Icons.clear,
size: 28,
),
const SizedBox(width: 16),
],
),
body: Obx(
return Obx(
() => _buildUserPage(_controller.userState.value),
),
);
}
@@ -90,11 +74,25 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
Loading() => loadingWidget,
Success() => Column(
children: [
const SizedBox(height: 4),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
iconButton(
context: context,
onPressed: Get.back,
tooltip: '关闭',
icon: Icons.clear,
size: 32,
),
const SizedBox(width: 16),
],
),
_buildUserInfo(userState.response),
const SizedBox(height: 5),
Expanded(
child: Obx(() => _buildVideoList(_controller.loadingState.value)),
)
),
],
),
Error() => errorWidget(
@@ -159,7 +157,9 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
Widget _buildVideoList(LoadingState loadingState) {
return switch (loadingState) {
Loading() => loadingWidget,
Success() => CustomScrollView(
Success() => Material(
color: Colors.transparent,
child: CustomScrollView(
slivers: [
_buildSliverHeader,
SliverPadding(
@@ -200,6 +200,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
),
],
),
),
Error() => errorWidget(
errMsg: loadingState.errMsg,
callback: _controller.onReload,

2
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@@ -1116,7 +1116,7 @@ class MorePanel extends StatelessWidget {
@override
Widget build(BuildContext context) {
Color errorColor = Theme.of(context).colorScheme.error;
return Container(
return Padding(
padding: EdgeInsets.only(
bottom: MediaQueryData.fromView(
WidgetsBinding.instance.platformDispatcher.views.single)

2
lib/pages/video/detail/reply/widgets/reply_item_grpc.dart
View File

@@ -1159,7 +1159,7 @@ class ReplyItemGrpc extends StatelessWidget {
}
Color errorColor = Theme.of(context).colorScheme.error;
return Container(
return Padding(
padding: EdgeInsets.only(
bottom: MediaQueryData.fromView(
WidgetsBinding.instance.platformDispatcher.views.single)

1
lib/pages/video/detail/reply_reply/view.dart
View File

@@ -497,6 +497,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel>
upMid: _videoReplyReplyController.upMid,
showDialogue: () {
_key.currentState?.showBottomSheet(
backgroundColor: Colors.transparent,
(context) => VideoReplyReplyPanel(
oid: replyItem.oid.toInt(),
rpid: replyItem.root.toInt(),

32
lib/pages/video/detail/view.dart
View File

@@ -887,7 +887,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
if (videoDetailController.videoType ==
SearchType.video &&
videoDetailController.showRelatedVideo)
CustomScrollView(
Material(
color: Colors.transparent,
child: CustomScrollView(
controller: _introController,
slivers: [
RelatedVideoPanel(
@@ -895,6 +897,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag),
],
),
),
if (videoDetailController.showReply)
videoReplyPanel,
if (_shouldShowSeasonPanel) seasonPanel,
@@ -1502,7 +1505,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
);
Widget videoIntro([bool needRelated = true]) {
Widget introPanel() => CustomScrollView(
Widget introPanel() => Material(
color: Colors.transparent,
child: CustomScrollView(
key: const PageStorageKey<String>('简介'),
controller: needRelated ? _introController : null,
slivers: [
@@ -1517,7 +1522,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
if (needRelated && videoDetailController.showRelatedVideo) ...[
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.only(top: StyleString.safeSpace),
padding:
const EdgeInsets.only(top: StyleString.safeSpace),
child: Divider(
height: 1,
indent: 12,
@@ -1529,7 +1535,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
),
),
),
RelatedVideoPanel(key: relatedVideoPanelKey, heroTag: heroTag),
RelatedVideoPanel(
key: relatedVideoPanelKey, heroTag: heroTag),
] else
SliverToBoxAdapter(
child: SizedBox(
@@ -1558,6 +1565,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
),
)
],
),
);
if (videoDetailController.isPlayAll) {
return Stack(
@@ -1570,7 +1578,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: videoDetailController.showMediaListPanel,
onTap: () => videoDetailController.showMediaListPanel(context),
borderRadius: const BorderRadius.all(Radius.circular(14)),
child: Container(
height: 54,
@@ -1745,6 +1753,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
int oid = replyItem.oid.toInt();
int rpid = GlobalData().grpcReply ? replyItem.id.toInt() : replyItem.rpid;
videoDetailController.childKey.currentState?.showBottomSheet(
backgroundColor: Colors.transparent,
(context) => VideoReplyReplyPanel(
id: id,
oid: oid,
@@ -1764,6 +1773,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
showAiBottomSheet() {
videoDetailController.childKey.currentState?.showBottomSheet(
enableDrag: true,
backgroundColor: Theme.of(context).colorScheme.surface,
(context) => AiDetail(modelResult: videoIntroController.modelResult),
);
}
@@ -1771,6 +1781,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
showIntroDetail(videoDetail, videoTags) {
videoDetailController.childKey.currentState?.showBottomSheet(
enableDrag: true,
backgroundColor: Theme.of(context).colorScheme.surface,
(context) => videoDetail is BangumiInfoModel
? bangumi.IntroDetail(
bangumiDetail: videoDetail,
@@ -1814,9 +1825,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
},
);
if (isFullScreen) {
Utils.showFSSheet(child: listSheetContent(), isFullScreen: isFullScreen);
Utils.showFSSheet(
child: Material(
color: Theme.of(context).colorScheme.surface,
child: listSheetContent(),
),
isFullScreen: isFullScreen,
);
} else {
videoDetailController.childKey.currentState?.showBottomSheet(
backgroundColor: Theme.of(context).colorScheme.surface,
(context) => listSheetContent(),
);
}
@@ -2035,6 +2053,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
Utils.showFSSheet(child: listSheetContent(), isFullScreen: isFullScreen);
} else {
videoDetailController.childKey.currentState?.showBottomSheet(
backgroundColor: Colors.transparent,
(context) => listSheetContent(),
);
}
@@ -2056,6 +2075,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
void onShowMemberPage(mid) {
videoDetailController.childKey.currentState?.showBottomSheet(
backgroundColor: Theme.of(context).colorScheme.surface,
(context) {
return HorizontalMemberPage(
mid: mid,

10
lib/pages/video/detail/widgets/watch_later_list.dart
View File

@@ -63,11 +63,7 @@ class _MediaListPanelState extends State<MediaListPanel> {
@override
Widget build(BuildContext context) {
return DecoratedBox(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
),
child: Column(
return Column(
children: [
AppBar(
toolbarHeight: 45,
@@ -96,8 +92,6 @@ class _MediaListPanelState extends State<MediaListPanel> {
],
),
Expanded(
child: Material(
color: Theme.of(context).colorScheme.surface,
child: widget.loadPrevious != null
? refreshIndicator(
onRefresh: () async {
@@ -107,9 +101,7 @@ class _MediaListPanelState extends State<MediaListPanel> {
)
: _buildList,
),
),
],
),
);
}

2
lib/utils/utils.dart
View File

@@ -320,6 +320,7 @@ class Utils {
context: context,
useSafeArea: true,
isScrollControlled: true,
backgroundColor: Theme.of(context).colorScheme.surface,
sheetAnimationStyle: AnimationStyle(curve: Curves.ease),
builder: (BuildContext context) {
return DraggableScrollableSheet(
@@ -701,6 +702,7 @@ class Utils {
context: context,
useSafeArea: true,
isScrollControlled: true,
backgroundColor: Theme.of(context).colorScheme.surface,
sheetAnimationStyle: AnimationStyle(curve: Curves.ease),
builder: (BuildContext context) {
return DraggableScrollableSheet(