diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 36b3581a..14412029 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -914,38 +914,34 @@ class _VideoDetailPageState extends State backgroundColor: Colors.black, toolbarHeight: 0, ), - body: Container( - color: Theme.of(context).colorScheme.surface, - child: SafeArea( - left: !removeSafeArea && !isFullScreen, - right: !removeSafeArea && !isFullScreen, - top: !removeSafeArea, - bottom: false, //!removeSafeArea, - child: childWhenDisabledLandscapeInner), + body: SafeArea( + left: !removeSafeArea && !isFullScreen, + right: !removeSafeArea && !isFullScreen, + top: !removeSafeArea, + bottom: false, //!removeSafeArea, + child: childWhenDisabledLandscapeInner, ), ), ], ); - Widget get childWhenDisabledAlmostSquare => Stack(children: [ - Scaffold( - resizeToAvoidBottomInset: false, - key: videoDetailController.scaffoldKey, - appBar: removeSafeArea - ? null - : AppBar( - backgroundColor: Colors.black, - toolbarHeight: 0, - ), - body: Container( - color: Theme.of(context).colorScheme.surface, - child: SafeArea( - left: !removeSafeArea && !isFullScreen, - right: !removeSafeArea && !isFullScreen, - top: !removeSafeArea, - bottom: false, //!removeSafeArea, - child: childWhenDisabledAlmostSquareInner))) - ]); + Widget get childWhenDisabledAlmostSquare => Scaffold( + resizeToAvoidBottomInset: false, + key: videoDetailController.scaffoldKey, + appBar: removeSafeArea + ? null + : AppBar( + backgroundColor: Colors.black, + toolbarHeight: 0, + ), + body: SafeArea( + left: !removeSafeArea && !isFullScreen, + right: !removeSafeArea && !isFullScreen, + top: !removeSafeArea, + bottom: false, //!removeSafeArea, + child: childWhenDisabledAlmostSquareInner, + ), + ); Widget get childWhenEnabled => Obx( () => !videoDetailController.autoPlay.value @@ -992,6 +988,8 @@ class _VideoDetailPageState extends State left: 0, right: 0, child: AppBar( + elevation: 0, + scrolledUnderElevation: 0, primary: false, foregroundColor: Colors.white, backgroundColor: Colors.transparent, diff --git a/lib/pages/video/detail/view_v.dart b/lib/pages/video/detail/view_v.dart index 2f5fc2af..f0dc58de 100644 --- a/lib/pages/video/detail/view_v.dart +++ b/lib/pages/video/detail/view_v.dart @@ -719,6 +719,8 @@ class _VideoDetailPageVState extends State (BuildContext context, bool innerBoxIsScrolled) { return [ SliverAppBar( + elevation: 0, + scrolledUnderElevation: 0, primary: false, automaticallyImplyLeading: false, pinned: true, @@ -1300,38 +1302,34 @@ class _VideoDetailPageVState extends State backgroundColor: Colors.black, toolbarHeight: 0, ), - body: Container( - color: Theme.of(context).colorScheme.surface, - child: SafeArea( - left: !removeSafeArea && !isFullScreen, - right: !removeSafeArea && !isFullScreen, - top: !removeSafeArea, - bottom: false, //!removeSafeArea, - child: childWhenDisabledLandscapeInner), + body: SafeArea( + left: !removeSafeArea && !isFullScreen, + right: !removeSafeArea && !isFullScreen, + top: !removeSafeArea, + bottom: false, //!removeSafeArea, + child: childWhenDisabledLandscapeInner, ), ), ], ); - Widget get childWhenDisabledAlmostSquare => Stack(children: [ - Scaffold( - resizeToAvoidBottomInset: false, - key: videoDetailController.scaffoldKey, - appBar: removeSafeArea - ? null - : AppBar( - backgroundColor: Colors.black, - toolbarHeight: 0, - ), - body: Container( - color: Theme.of(context).colorScheme.surface, - child: SafeArea( - left: !removeSafeArea && !isFullScreen, - right: !removeSafeArea && !isFullScreen, - top: !removeSafeArea, - bottom: false, //!removeSafeArea, - child: childWhenDisabledAlmostSquareInner))) - ]); + Widget get childWhenDisabledAlmostSquare => Scaffold( + resizeToAvoidBottomInset: false, + key: videoDetailController.scaffoldKey, + appBar: removeSafeArea + ? null + : AppBar( + backgroundColor: Colors.black, + toolbarHeight: 0, + ), + body: SafeArea( + left: !removeSafeArea && !isFullScreen, + right: !removeSafeArea && !isFullScreen, + top: !removeSafeArea, + bottom: false, //!removeSafeArea, + child: childWhenDisabledAlmostSquareInner, + ), + ); Widget get childWhenEnabled => Obx( () => !videoDetailController.autoPlay.value @@ -1379,6 +1377,8 @@ class _VideoDetailPageVState extends State right: 0, child: AppBar( primary: false, + elevation: 0, + scrolledUnderElevation: 0, foregroundColor: Colors.white, backgroundColor: Colors.transparent, automaticallyImplyLeading: false, diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart index 61c0d732..4f6ce5d7 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/detail/widgets/header_control.dart @@ -1745,6 +1745,8 @@ class _HeaderControlState extends State { } Widget _buildHeader(bool showFSActionItem) => AppBar( + elevation: 0, + scrolledUnderElevation: 0, backgroundColor: Colors.transparent, foregroundColor: Colors.white, primary: false,