From 50717ebbd3ad6fcfe0c4ecafa89c3f7c87d0101e Mon Sep 17 00:00:00 2001 From: Pato05 Date: Mon, 29 Apr 2024 16:51:04 +0200 Subject: [PATCH] fix pop, fix gradient background looking bad --- lib/ui/fancy_scaffold.dart | 2 +- lib/ui/player_screen.dart | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ui/fancy_scaffold.dart b/lib/ui/fancy_scaffold.dart index 511ee8a..fe0cfd9 100644 --- a/lib/ui/fancy_scaffold.dart +++ b/lib/ui/fancy_scaffold.dart @@ -74,7 +74,7 @@ class FancyScaffoldState extends State return ValueListenableBuilder( valueListenable: statusNotifier, builder: (context, state, child) => PopScope( - canPop: state != AnimationStatus.dismissed, + canPop: state == AnimationStatus.dismissed, onPopInvoked: state == AnimationStatus.dismissed ? null : (_) => dragController.fling(velocity: -1.0), diff --git a/lib/ui/player_screen.dart b/lib/ui/player_screen.dart index 9206e7c..8b7cfa2 100644 --- a/lib/ui/player_screen.dart +++ b/lib/ui/player_screen.dart @@ -195,7 +195,8 @@ class PlayerScreenBackground extends StatelessWidget { end: Alignment.bottomCenter, colors: [ if (provider.dominantColor != null) - provider.dominantColor!, + Color.lerp(provider.dominantColor, + isLightMode ? Colors.white : Colors.black, 0.5)!, Theme.of(context).scaffoldBackgroundColor, ], stops: const [0.0, 0.6],