EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-08-05 18:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt ui

Browse Source 
Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-08-04 17:11:34 +08:00
parent 8077573c50
commit 0e9a372b82
8 changed files with 448 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/pages/contact/view.dart
View File

@@ -43,13 +43,6 @@ class _ContactPageState extends State<ContactPage>
return SimpleScaffold(
appBar: AppBar(
title: const Text('通讯录'),
bottom: TabBar(
controller: _controller,
tabs: const [
Tab(text: '我的关注'),
Tab(text: '我的粉丝'),
],
),
actions: [
IconButton(
onPressed: () async {
@@ -70,16 +63,29 @@ class _ContactPageState extends State<ContactPage>
const SizedBox(width: 16),
],
),
body: tabBarView(
controller: _controller,
body: Column(
children: [
FollowChildPage(
mid: mid,
onSelect: widget.isFromSelect ? onSelect : null,
TabBar(
controller: _controller,
tabs: const [
Tab(text: '我的关注'),
Tab(text: '我的粉丝'),
],
),
FansPage(
showName: false,
onSelect: widget.isFromSelect ? onSelect : null,
Expanded(
child: tabBarView(
controller: _controller,
children: [
FollowChildPage(
mid: mid,
onSelect: widget.isFromSelect ? onSelect : null,
),
FansPage(
showName: false,
onSelect: widget.isFromSelect ? onSelect : null,
),
],
),
),
],
),

55
lib/pages/danmaku_block/view.dart
View File

@@ -51,32 +51,37 @@ class _DanmakuBlockPageState extends State<DanmakuBlockPage> {
@override
Widget build(BuildContext context) {
return SimpleScaffold(
appBar: AppBar(
title: const Text('弹幕屏蔽'),
bottom: TabBar(
controller: _controller.tabController,
tabs: DmBlockType.values
.map(
(e) => Obx(
() => Tab(
text: '${e.label}(${_controller.rules[e.index].length})',
appBar: AppBar(title: const Text('弹幕屏蔽')),
body: Column(
children: [
TabBar(
controller: _controller.tabController,
tabs: DmBlockType.values
.map(
(e) => Obx(
() => Tab(
text: '${e.label}(${_controller.rules[e.index].length})',
),
),
),
)
.toList(),
),
),
body: tabBarView(
controller: _controller.tabController,
children: DmBlockType.values
.map(
(e) => KeepAliveWrapper(
child: Obx(
() => tabViewBuilder(e.index, _controller.rules[e.index]),
),
),
)
.toList(),
)
.toList(),
),
Expanded(
child: tabBarView(
controller: _controller.tabController,
children: DmBlockType.values
.map(
(e) => KeepAliveWrapper(
child: Obx(
() =>
tabViewBuilder(e.index, _controller.rules[e.index]),
),
),
)
.toList(),
),
),
],
),
fab: Padding(
padding: .only(

183
lib/pages/fav/note/child_view.dart
View File

@@ -6,6 +6,7 @@ import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/fav/fav_note/list.dart';
import 'package:PiliPlus/pages/fav/note/controller.dart';
import 'package:PiliPlus/pages/fav/note/widget/item.dart';
import 'package:PiliPlus/pages/fav/pgc/pgc_layout.dart';
import 'package:PiliPlus/utils/grid.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
@@ -37,109 +38,99 @@ class _FavNoteChildPageState extends State<FavNoteChildPage>
super.build(context);
final theme = Theme.of(context);
final padding = MediaQuery.viewPaddingOf(context);
final bottomH = 50 + padding.bottom;
return Stack(
clipBehavior: Clip.none,
children: [
refreshIndicator(
onRefresh: _favNoteController.onRefresh,
child: CustomScrollView(
controller: _favNoteController.scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverPadding(
padding: EdgeInsets.only(bottom: padding.bottom + 100),
sliver: Obx(
() => _buildBody(_favNoteController.loadingState.value),
),
return PgcLayout(
body: refreshIndicator(
onRefresh: _favNoteController.onRefresh,
child: CustomScrollView(
controller: _favNoteController.scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverPadding(
padding: EdgeInsets.only(bottom: padding.bottom + 100),
sliver: Obx(
() => _buildBody(_favNoteController.loadingState.value),
),
],
),
),
],
),
Positioned(
left: 0,
right: 0,
bottom: -bottomH,
child: Obx(
() => AnimatedSlide(
offset: _favNoteController.enableMultiSelect.value
? const Offset(0, -1)
: Offset.zero,
duration: const Duration(milliseconds: 150),
child: Container(
height: bottomH,
padding: padding,
decoration: BoxDecoration(
color: theme.colorScheme.onInverseSurface,
border: Border(
top: BorderSide(
width: 0.5,
color: theme.colorScheme.outline.withValues(alpha: 0.5),
),
),
),
child: Row(
children: [
const SizedBox(width: 16),
iconButton(
size: 32,
tooltip: '取消',
context: context,
icon: const Icon(Icons.clear),
onPressed: _favNoteController.onDisable,
),
const SizedBox(width: 12),
Obx(
() => Checkbox(
value: _favNoteController.allSelected.value,
onChanged: (value) {
_favNoteController.handleSelect(
checked: !_favNoteController.allSelected.value,
disableSelect: false,
);
},
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => _favNoteController.handleSelect(
checked: !_favNoteController.allSelected.value,
disableSelect: false,
),
child: const Padding(
padding: EdgeInsets.only(
top: 14,
bottom: 14,
right: 12,
),
child: Text('全选'),
),
),
const Spacer(),
FilledButton.tonal(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: () {
if (_favNoteController.checkedCount != 0) {
showConfirmDialog(
context: context,
title: const Text('确定删除已选中的笔记吗？'),
onConfirm: _favNoteController.onRemove,
);
}
},
child: const Text('删除'),
),
const SizedBox(width: 16),
],
),
toolbar: Obx(
() => AnimatedSlide(
offset: _favNoteController.enableMultiSelect.value
? const Offset(0, -1)
: Offset.zero,
duration: const Duration(milliseconds: 150),
child: Container(
padding: .only(bottom: padding.bottom),
decoration: BoxDecoration(
color: theme.colorScheme.onInverseSurface,
border: Border(
top: BorderSide(
width: 0.5,
color: theme.colorScheme.outline.withValues(alpha: 0.5),
),
),
),
child: Row(
children: [
const SizedBox(width: 16),
iconButton(
size: 32,
tooltip: '取消',
context: context,
icon: const Icon(Icons.clear),
onPressed: _favNoteController.onDisable,
),
const SizedBox(width: 12),
Obx(
() => Checkbox(
value: _favNoteController.allSelected.value,
onChanged: (value) {
_favNoteController.handleSelect(
checked: !_favNoteController.allSelected.value,
disableSelect: false,
);
},
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => _favNoteController.handleSelect(
checked: !_favNoteController.allSelected.value,
disableSelect: false,
),
child: const Padding(
padding: EdgeInsets.only(
top: 14,
bottom: 14,
right: 12,
),
child: Text('全选'),
),
),
const Spacer(),
FilledButton.tonal(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: () {
if (_favNoteController.checkedCount != 0) {
showConfirmDialog(
context: context,
title: const Text('确定删除已选中的笔记吗？'),
onConfirm: _favNoteController.onRemove,
);
}
},
child: const Text('删除'),
),
const SizedBox(width: 16),
],
),
),
),
],
),
);
}

209
lib/pages/fav/pgc/child_view.dart
View File

@@ -6,6 +6,7 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/fav/fav_pgc/list.dart';
import 'package:PiliPlus/pages/fav/pgc/controller.dart';
import 'package:PiliPlus/pages/fav/pgc/pgc_layout.dart';
import 'package:PiliPlus/pages/fav/pgc/widget/item.dart';
import 'package:PiliPlus/utils/grid.dart';
import 'package:flutter/material.dart';
@@ -43,128 +44,118 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
super.build(context);
final theme = Theme.of(context);
final padding = MediaQuery.viewPaddingOf(context);
final bottomH = 50 + padding.bottom;
return Stack(
clipBehavior: Clip.none,
children: [
refreshIndicator(
onRefresh: _favPgcController.onRefresh,
child: CustomScrollView(
controller: _favPgcController.scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverPadding(
padding: EdgeInsets.only(bottom: padding.bottom + 100),
sliver: Obx(
() => _buildBody(_favPgcController.loadingState.value),
return PgcLayout(
body: refreshIndicator(
onRefresh: _favPgcController.onRefresh,
child: CustomScrollView(
controller: _favPgcController.scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverPadding(
padding: EdgeInsets.only(bottom: padding.bottom + 100),
sliver: Obx(
() => _buildBody(_favPgcController.loadingState.value),
),
),
],
),
),
toolbar: Obx(
() => AnimatedSlide(
offset: _favPgcController.enableMultiSelect.value
? const Offset(0, -1)
: Offset.zero,
duration: const Duration(milliseconds: 150),
child: Container(
padding: .only(bottom: padding.bottom),
decoration: BoxDecoration(
color: theme.colorScheme.onInverseSurface,
border: Border(
top: BorderSide(
width: 0.5,
color: theme.colorScheme.outline.withValues(alpha: 0.5),
),
),
],
),
),
Positioned(
left: 0,
right: 0,
bottom: -bottomH,
child: Obx(
() => AnimatedSlide(
offset: _favPgcController.enableMultiSelect.value
? const Offset(0, -1)
: Offset.zero,
duration: const Duration(milliseconds: 150),
child: Container(
height: bottomH,
padding: padding,
decoration: BoxDecoration(
color: theme.colorScheme.onInverseSurface,
border: Border(
top: BorderSide(
width: 0.5,
color: theme.colorScheme.outline.withValues(alpha: 0.5),
),
),
),
child: Row(
children: [
const SizedBox(width: 16),
iconButton(
size: 32,
tooltip: '取消',
context: context,
icon: const Icon(Icons.clear),
onPressed: _favPgcController.onDisable,
),
child: Row(
children: [
const SizedBox(width: 16),
iconButton(
size: 32,
tooltip: '取消',
context: context,
icon: const Icon(Icons.clear),
onPressed: _favPgcController.onDisable,
),
const SizedBox(width: 12),
Obx(
() => Checkbox(
value: _favPgcController.allSelected.value,
onChanged: (value) {
_favPgcController.handleSelect(
checked: !_favPgcController.allSelected.value,
disableSelect: false,
);
},
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => _favPgcController.handleSelect(
const SizedBox(width: 12),
Obx(
() => Checkbox(
value: _favPgcController.allSelected.value,
onChanged: (value) {
_favPgcController.handleSelect(
checked: !_favPgcController.allSelected.value,
disableSelect: false,
),
child: const Padding(
padding: EdgeInsets.only(
top: 14,
bottom: 14,
right: 12,
),
child: Text('全选'),
),
);
},
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => _favPgcController.handleSelect(
checked: !_favPgcController.allSelected.value,
disableSelect: false,
),
child: const Padding(
padding: EdgeInsets.only(
top: 14,
bottom: 14,
right: 12,
),
const Spacer(),
...const [
(followStatus: 1, title: '想看'),
(followStatus: 2, title: '在看'),
(followStatus: 3, title: '看过'),
]
.where(
(item) => item.followStatus != widget.followStatus,
)
.map(
(item) => Padding(
padding: const EdgeInsets.only(left: 25),
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (_favPgcController.checkedCount != 0) {
_favPgcController.onUpdateList(
item.followStatus,
);
}
},
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 5,
),
child: Text(
'标记为${item.title}',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
child: Text('全选'),
),
),
const Spacer(),
...const [
(followStatus: 1, title: '想看'),
(followStatus: 2, title: '在看'),
(followStatus: 3, title: '看过'),
]
.where(
(item) => item.followStatus != widget.followStatus,
)
.map(
(item) => Padding(
padding: const EdgeInsets.only(left: 25),
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (_favPgcController.checkedCount != 0) {
_favPgcController.onUpdateList(
item.followStatus,
);
}
},
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 14,
horizontal: 5,
),
child: Text(
'标记为${item.title}',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
),
),
const SizedBox(width: 20),
],
),
),
),
),
const SizedBox(width: 20),
],
),
),
),
],
),
);
}

86
lib/pages/fav/pgc/pgc_layout.dart Normal file
View File

@@ -0,0 +1,86 @@
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart' show BoxHitTestResult, BoxParentData;
enum PgcType { toolbar, body }
class PgcLayout
extends SlottedMultiChildRenderObjectWidget<PgcType, RenderBox> {
const PgcLayout({
super.key,
required this.body,
required this.toolbar,
});
final Widget body;
final Widget toolbar;
@override
Iterable<PgcType> get slots => PgcType.values;
@override
Widget childForSlot(slot) => switch (slot) {
.toolbar => toolbar,
.body => body,
};
@override
SlottedContainerRenderObjectMixin<PgcType, RenderBox> createRenderObject(
BuildContext context,
) {
return _RenderPgcLayout();
}
}
class _RenderPgcLayout extends RenderBox
with SlottedContainerRenderObjectMixin<PgcType, RenderBox> {
RenderBox get body => childForSlot(.body)!;
RenderBox get toolbar => childForSlot(.toolbar)!;
Offset _getOffset(RenderBox child) {
return (child.parentData as BoxParentData).offset;
}
void _setOffset(RenderBox child, Offset offset) {
(child.parentData as BoxParentData).offset = offset;
}
@override
void performLayout() {
final constraints = this.constraints;
size = constraints.biggest;
final body = this.body..layout(constraints);
_setOffset(body, .zero);
final toolbar = this.toolbar
..layout(BoxConstraints.tightFor(width: constraints.maxWidth));
_setOffset(toolbar, Offset(0, constraints.maxHeight));
}
@override
void paint(PaintingContext context, Offset offset) {
void doPaint(RenderBox child) {
context.paintChild(child, _getOffset(child) + offset);
}
doPaint(body);
doPaint(toolbar);
}
@override
bool hitTestChildren(BoxHitTestResult result, {required Offset position}) {
for (final child in children) {
final bool isHit = result.addWithPaintOffset(
offset: _getOffset(child),
position: position,
hitTest: (BoxHitTestResult result, Offset transformed) {
return child.hitTest(result, position: transformed);
},
);
if (isHit) {
return true;
}
}
return false;
}
}

65
lib/pages/fav/view.dart
View File

@@ -126,36 +126,45 @@ class _FavPageState extends State<FavPage> with SingleTickerProviderStateMixin {
),
const SizedBox(width: 6),
],
bottom: TabBar(
controller: _tabController,
isScrollable: true,
tabAlignment: TabAlignment.start,
tabs: FavTabType.values.map((item) => Tab(text: item.title)).toList(),
onTap: (index) {
try {
if (!_tabController.indexIsChanging) {
switch (FavTabType.values[index]) {
case FavTabType.video:
_favController.scrollController.animToTop();
case FavTabType.article:
Get.find<FavArticleController>().scrollController
.animToTop();
case FavTabType.topic:
Get.find<FavTopicController>().scrollController.animToTop();
case FavTabType.cheese:
Get.find<FavCheeseController>().scrollController
.animToTop();
default:
}
}
} catch (_) {}
},
),
),
body: ViewSafeArea(
child: tabBarView(
controller: _tabController,
children: FavTabType.values.map((item) => item.page).toList(),
child: Column(
children: [
TabBar(
controller: _tabController,
isScrollable: true,
tabAlignment: TabAlignment.start,
tabs: FavTabType.values
.map((item) => Tab(text: item.title))
.toList(),
onTap: (index) {
try {
if (!_tabController.indexIsChanging) {
switch (FavTabType.values[index]) {
case FavTabType.video:
_favController.scrollController.animToTop();
case FavTabType.article:
Get.find<FavArticleController>().scrollController
.animToTop();
case FavTabType.topic:
Get.find<FavTopicController>().scrollController
.animToTop();
case FavTabType.cheese:
Get.find<FavCheeseController>().scrollController
.animToTop();
default:
}
}
} catch (_) {}
},
),
Expanded(
child: tabBarView(
controller: _tabController,
children: FavTabType.values.map((item) => item.page).toList(),
),
),
],
),
),
);

98
lib/pages/history/view.dart
View File

@@ -104,51 +104,62 @@ class _HistoryPageState extends State<HistoryPage>
left: padding.left,
right: padding.right,
),
child: Obx(() {
final tabs = _historyController.tabs;
if (tabs.isEmpty) {
return child;
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
controller: _historyController.tabController,
onTap: (index) {
if (!_historyController
.tabController!
.indexIsChanging) {
currCtr().scrollController.animToTop();
} else {
if (enableMultiSelect) {
currCtr(
_historyController.tabController!.previousIndex,
).handleSelect();
}
}
},
tabs: [
const Tab(text: '全部'),
...tabs.map((item) => Tab(text: item.name)),
],
),
Expanded(
child: TabBarView(
physics: enableMultiSelect
? const NeverScrollableScrollPhysics()
: tabBarScrollPhysics,
controller: _historyController.tabController,
horizontalDragGestureRecognizer:
CustomHorizontalDragGestureRecognizer.new,
child: Column(
children: [
?_buildPauseTip,
Expanded(
child: Obx(() {
final tabs = _historyController.tabs;
if (tabs.isEmpty) {
return child;
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
KeepAliveWrapper(child: child),
...tabs.map((item) => HistoryPage(type: item.type)),
TabBar(
controller: _historyController.tabController,
onTap: (index) {
if (!_historyController
.tabController!
.indexIsChanging) {
currCtr().scrollController.animToTop();
} else {
if (enableMultiSelect) {
currCtr(
_historyController
.tabController!
.previousIndex,
).handleSelect();
}
}
},
tabs: [
const Tab(text: '全部'),
...tabs.map((item) => Tab(text: item.name)),
],
),
Expanded(
child: TabBarView(
physics: enableMultiSelect
? const NeverScrollableScrollPhysics()
: tabBarScrollPhysics,
controller: _historyController.tabController,
horizontalDragGestureRecognizer:
CustomHorizontalDragGestureRecognizer.new,
children: [
KeepAliveWrapper(child: child),
...tabs.map(
(item) => HistoryPage(type: item.type),
),
],
),
),
],
),
),
],
);
}),
);
}),
),
],
),
),
),
);
@@ -158,7 +169,6 @@ class _HistoryPageState extends State<HistoryPage>
AppBar get _buildAppBar => AppBar(
title: const Text('观看记录'),
bottom: _buildPauseTip,
actions: [
IconButton(
tooltip: '搜索',

61
lib/pages/login/view.dart
View File

@@ -569,36 +569,41 @@ class _LoginPageState extends State<LoginPage> {
),
],
),
bottom: !isLandscape
? TabBar(
tabs: const [
Tab(icon: Icon(Icons.password), text: '密码'),
Tab(icon: Icon(Icons.sms_outlined), text: '短信'),
Tab(icon: Icon(Icons.qr_code), text: '扫码'),
Tab(icon: Icon(Icons.cookie_outlined), text: 'Cookie'),
],
controller: _loginPageCtr.tabController,
)
: null,
),
body: NotificationListener<ScrollStartNotification>(
onNotification: (notification) {
if (notification.metrics.axis == Axis.horizontal) {
FocusScope.of(context).unfocus();
}
return false;
},
child: ViewInsetsSafeArea(
child: tabBarView(
controller: _loginPageCtr.tabController,
children: [
tabViewOuter(loginByPassword(theme)),
tabViewOuter(loginBySmS(theme)),
tabViewOuter(loginByQRCode(theme)),
tabViewOuter(loginByCookie(theme)),
],
body: Column(
children: [
if (!isLandscape)
TabBar(
tabs: const [
Tab(icon: Icon(Icons.password), text: '密码'),
Tab(icon: Icon(Icons.sms_outlined), text: '短信'),
Tab(icon: Icon(Icons.qr_code), text: '扫码'),
Tab(icon: Icon(Icons.cookie_outlined), text: 'Cookie'),
],
controller: _loginPageCtr.tabController,
),
Expanded(
child: NotificationListener<ScrollStartNotification>(
onNotification: (notification) {
if (notification.metrics.axis == Axis.horizontal) {
FocusScope.of(context).unfocus();
}
return false;
},
child: ViewInsetsSafeArea(
child: tabBarView(
controller: _loginPageCtr.tabController,
children: [
tabViewOuter(loginByPassword(theme)),
tabViewOuter(loginBySmS(theme)),
tabViewOuter(loginByQRCode(theme)),
tabViewOuter(loginByCookie(theme)),
],
),
),
),
),
),
],
),
);
}