HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-23 10:36:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt ui

Browse Source 
Closes #1050

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-08-20 22:04:39 +08:00
parent e096ebcbba
commit 76f1d0129b
171 changed files with 2190 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/live_room/send_danmaku/view.dart
View File

@@ -1,6 +1,7 @@
import 'dart:async';
import 'package:PiliPlus/common/widgets/text_field/text_field.dart';
import 'package:PiliPlus/common/widgets/view_safe_area.dart';
import 'package:PiliPlus/http/live.dart';
import 'package:PiliPlus/models/common/publish_panel_type.dart';
import 'package:PiliPlus/pages/common/publish/common_rich_text_pub_page.dart';
@@ -49,8 +50,7 @@ class _ReplyPageState extends CommonRichTextPubPageState<LiveSendDmPanel> {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return SafeArea(
bottom: false,
return ViewSafeArea(
child: Align(
alignment: Alignment.bottomCenter,
child: Container(

226
lib/pages/live_room/view.dart
View File

@@ -161,30 +161,27 @@ class _LiveRoomPageState extends State<LiveRoomPage>
late double maxWidth;
late double maxHeight;
late EdgeInsets padding;
late bool isPortrait;
@override
Widget build(BuildContext context) {
padding = MediaQuery.paddingOf(context);
return LayoutBuilder(
builder: (context, constraints) {
maxWidth = constraints.maxWidth;
maxHeight = constraints.maxHeight;
final isPortrait = maxHeight >= maxWidth;
if (Platform.isAndroid) {
return Floating().isPipMode
? videoPlayerPanel(
isFullScreen,
width: maxWidth,
height: maxHeight,
isPipMode: true,
)
: childWhenDisabled(isPortrait);
} else {
return childWhenDisabled(isPortrait);
}
},
);
padding = MediaQuery.viewPaddingOf(context);
final size = MediaQuery.sizeOf(context);
maxWidth = size.width;
maxHeight = size.height;
isPortrait = maxHeight >= maxWidth;
if (Platform.isAndroid) {
return Floating().isPipMode
? videoPlayerPanel(
isFullScreen,
width: maxWidth,
height: maxHeight,
isPipMode: true,
)
: childWhenDisabled;
} else {
return childWhenDisabled;
}
}
Widget videoPlayerPanel(
@@ -257,7 +254,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
);
}
Widget childWhenDisabled(bool isPortrait) {
Widget get childWhenDisabled {
return AnnotatedRegion<SystemUiOverlayStyle>(
value: _systemOverlayStyleForBrightness(
Brightness.dark,
@@ -297,22 +294,17 @@ class _LiveRoomPageState extends State<LiveRoomPage>
);
},
),
SafeArea(
top: !isFullScreen,
left: !isFullScreen,
right: !isFullScreen,
bottom: false,
child: isPortrait
? Obx(
() {
if (_liveRoomController.isPortrait.value) {
return _buildPP;
}
return _buildPH;
},
)
: _buildBodyH,
),
if (isPortrait)
Obx(
() {
if (_liveRoomController.isPortrait.value) {
return _buildPP;
}
return _buildPH;
},
)
else
_buildBodyH,
],
),
),
@@ -321,67 +313,86 @@ class _LiveRoomPageState extends State<LiveRoomPage>
Widget get _buildPH {
final isFullScreen = this.isFullScreen;
final height = isFullScreen ? maxHeight : maxWidth * 9 / 16;
final height = maxWidth * 9 / 16;
final videoHeight = isFullScreen ? maxHeight : height;
return Column(
children: [
if (!isFullScreen) _buildAppBar,
Offstage(
offstage: isFullScreen,
child: _buildAppBar,
),
SizedBox(
width: maxWidth,
height: height,
height: videoHeight,
child: videoPlayerPanel(
isFullScreen,
width: maxWidth,
height: height,
height: videoHeight,
),
),
Offstage(
offstage: isFullScreen,
child: SizedBox(
width: maxWidth,
height: maxHeight - padding.top - height - kToolbarHeight,
child: _buildBottomWidget,
),
),
..._buildBottomWidget,
],
);
}
Widget get _buildPP {
final isFullScreen = this.isFullScreen;
final bottomHeight = 85.0 + padding.bottom;
final height = isFullScreen
? maxHeight
: maxHeight - padding.top - kToolbarHeight - bottomHeight;
Widget child = Stack(
final bottomHeight = 80.0 + padding.bottom;
final topPadding = padding.top + kToolbarHeight;
final videoHeight = maxHeight - bottomHeight - topPadding;
return Stack(
clipBehavior: Clip.none,
children: [
Positioned.fill(
top: isFullScreen ? 0 : topPadding,
bottom: isFullScreen ? 0 : bottomHeight,
child: videoPlayerPanel(
width: maxWidth,
height: height,
height: videoHeight,
isFullScreen,
alignment: isFullScreen ? null : Alignment.topCenter,
needDm: isFullScreen,
alignment: isFullScreen ? null : Alignment.topCenter,
),
),
Positioned(
top: 0,
left: 0,
right: 0,
child: Offstage(
offstage: isFullScreen,
child: _buildAppBar,
),
),
Positioned(
left: 0,
right: 0,
bottom: 55,
child: Visibility(
maintainState: true,
visible: !isFullScreen,
bottom: 55 + bottomHeight,
child: Offstage(
offstage: isFullScreen,
child: SizedBox(
height: maxHeight * 0.32,
child: _buildChatWidget(true),
),
),
),
],
);
if (isFullScreen) {
return child;
}
return Column(
children: [
_buildAppBar,
Expanded(child: child),
SizedBox(
height: bottomHeight,
child: _buildInputWidget,
Positioned(
left: 0,
right: 0,
bottom: 0,
child: Offstage(
offstage: isFullScreen,
child: SizedBox(
height: bottomHeight,
child: _buildInputWidget,
),
),
),
],
);
@@ -550,57 +561,69 @@ class _LiveRoomPageState extends State<LiveRoomPage>
}
Widget get _buildBodyH {
double videoWidth =
final videoWidth =
clampDouble(maxHeight / maxWidth * 1.08, 0.58, 0.75) * maxWidth;
final videoHeight = maxHeight - padding.top;
return Obx(
() {
final isFullScreen = this.isFullScreen;
final width = isFullScreen ? maxWidth : videoWidth;
final height = isFullScreen ? maxHeight : maxWidth * 9 / 16;
Widget child = Row(
children: [
Container(
margin: EdgeInsets.only(bottom: padding.bottom),
width: width,
height: height,
child: videoPlayerPanel(
isFullScreen,
fill: Colors.transparent,
width: width,
height: height,
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildBottomWidget,
),
),
],
);
if (isFullScreen) {
return child;
}
final height = isFullScreen ? maxHeight : videoHeight;
return Column(
children: [
_buildAppBar,
Expanded(child: child),
Offstage(
offstage: isFullScreen,
child: _buildAppBar,
),
Expanded(
child: Padding(
padding: isFullScreen
? EdgeInsets.zero
: EdgeInsets.only(left: padding.left, right: padding.right),
child: Row(
children: [
Container(
margin: EdgeInsets.only(bottom: padding.bottom),
width: width,
height: height,
child: videoPlayerPanel(
isFullScreen,
fill: Colors.transparent,
width: width,
height: height,
),
),
Offstage(
offstage: isFullScreen,
child: SizedBox(
width: maxWidth - videoWidth - padding.horizontal,
height: videoHeight,
child: _buildBottomWidget,
),
),
],
),
),
),
],
);
},
);
}
List<Widget> get _buildBottomWidget => [
Expanded(child: _buildChatWidget()),
_buildInputWidget,
];
Widget get _buildBottomWidget => Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: _buildChatWidget()),
_buildInputWidget,
],
);
Widget _buildChatWidget([bool? isPP]) => Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
Widget _buildChatWidget([bool isPP = false]) => Padding(
padding: EdgeInsets.only(bottom: 16, top: !isPortrait ? 0 : 16),
child: LiveRoomChat(
key: chatKey,
isPP: isPP ?? false,
isPP: isPP,
roomId: _liveRoomController.roomId,
liveRoomController: _liveRoomController,
),
@@ -613,6 +636,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
right: 10,
bottom: 15 + padding.bottom,
),
height: 80 + padding.bottom,
decoration: const BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),