diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 66a15f6e7..8e2b9df89 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -535,10 +535,10 @@ class _LiveRoomPageState extends State Widget get _buildInputWidget => Container( padding: EdgeInsets.only( + top: 5, left: 10, - top: 10, right: 10, - bottom: 25 + MediaQuery.paddingOf(context).bottom, + bottom: 15 + MediaQuery.paddingOf(context).bottom, ), decoration: const BoxDecoration( borderRadius: BorderRadius.only( @@ -550,39 +550,42 @@ class _LiveRoomPageState extends State ), color: Color(0x1AFFFFFF), ), - child: Row( - children: [ - Obx( - () => IconButton( - onPressed: () { - plPlayerController.isOpenDanmu.value = - !plPlayerController.isOpenDanmu.value; - GStorage.setting.put(SettingBoxKey.enableShowDanmaku, - plPlayerController.isOpenDanmu.value); - }, - icon: Icon( - plPlayerController.isOpenDanmu.value - ? Icons.subtitles_outlined - : Icons.subtitles_off_outlined, - color: _color, + child: GestureDetector( + onTap: onSendDanmaku, + behavior: HitTestBehavior.opaque, + child: Padding( + padding: const EdgeInsets.only(top: 5, bottom: 10), + child: Row( + children: [ + Obx( + () => IconButton( + onPressed: () { + plPlayerController.isOpenDanmu.value = + !plPlayerController.isOpenDanmu.value; + GStorage.setting.put(SettingBoxKey.enableShowDanmaku, + plPlayerController.isOpenDanmu.value); + }, + icon: Icon( + plPlayerController.isOpenDanmu.value + ? Icons.subtitles_outlined + : Icons.subtitles_off_outlined, + color: _color, + ), + ), ), - ), - ), - Expanded( - child: GestureDetector( - onTap: onSendDanmaku, - behavior: HitTestBehavior.opaque, - child: Text( - '发送弹幕', - style: TextStyle(color: _color), + Expanded( + child: Text( + '发送弹幕', + style: TextStyle(color: _color), + ), ), - ), + IconButton( + onPressed: () => onSendDanmaku(true), + icon: Icon(Icons.emoji_emotions_outlined, color: _color), + ), + ], ), - IconButton( - onPressed: () => onSendDanmaku(true), - icon: Icon(Icons.emoji_emotions_outlined, color: _color), - ), - ], + ), ), ); diff --git a/lib/pages/live_room/widgets/header_control.dart b/lib/pages/live_room/widgets/header_control.dart index 065a88fa7..c27355222 100644 --- a/lib/pages/live_room/widgets/header_control.dart +++ b/lib/pages/live_room/widgets/header_control.dart @@ -4,6 +4,7 @@ import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; @@ -32,6 +33,23 @@ class LiveHeaderControl extends StatelessWidget { title: Row( spacing: 10, children: [ + if (plPlayerController.isFullScreen.value) + SizedBox( + width: 35, + height: 35, + child: IconButton( + tooltip: '返回', + icon: const Icon( + FontAwesomeIcons.arrowLeft, + size: 15, + ), + style: ButtonStyle( + padding: WidgetStateProperty.all(EdgeInsets.zero), + ), + onPressed: () => + plPlayerController.triggerFullScreen(status: false), + ), + ), if (title != null) Expanded( child: Column(