From 16e735bdb87237bb5e519e609269482f15dd2edc Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Thu, 15 Jul 2021 14:51:29 +0900
Subject: [PATCH] minor fixes

---
 lib/widgets/common/fx/blurred.dart            | 12 ++++++------
 lib/widgets/viewer/info/maps/common.dart      |  5 +++--
 lib/widgets/viewer/overlay/bottom/common.dart |  5 +++--
 lib/widgets/viewer/overlay/bottom/video.dart  |  5 +++--
 lib/widgets/viewer/overlay/common.dart        | 12 +++++++-----
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/widgets/common/fx/blurred.dart b/lib/widgets/common/fx/blurred.dart
index 693ca01a9..f98b7c63e 100644
--- a/lib/widgets/common/fx/blurred.dart
+++ b/lib/widgets/common/fx/blurred.dart
@@ -65,13 +65,13 @@ class BlurredOval extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return enabled
-        ? ClipOval(
-            child: BackdropFilter(
+    return ClipOval(
+      child: enabled
+          ? BackdropFilter(
               filter: _filter,
               child: child,
-            ),
-          )
-        : child;
+            )
+          : child,
+    );
   }
 }
diff --git a/lib/widgets/viewer/info/maps/common.dart b/lib/widgets/viewer/info/maps/common.dart
index 9a23db5f3..429343e83 100644
--- a/lib/widgets/viewer/info/maps/common.dart
+++ b/lib/widgets/viewer/info/maps/common.dart
@@ -152,11 +152,12 @@ class MapOverlayButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final blurred = settings.enableOverlayBlurEffect;
     return BlurredOval(
-      enabled: settings.enableOverlayBlurEffect,
+      enabled: blurred,
       child: Material(
         type: MaterialType.circle,
-        color: kOverlayBackgroundColor,
+        color: overlayBackgroundColor(blurred: blurred),
         child: Ink(
           decoration: BoxDecoration(
             border: AvesBorder.border,
diff --git a/lib/widgets/viewer/overlay/bottom/common.dart b/lib/widgets/viewer/overlay/bottom/common.dart
index 64409eb3d..460f1d58c 100644
--- a/lib/widgets/viewer/overlay/bottom/common.dart
+++ b/lib/widgets/viewer/overlay/bottom/common.dart
@@ -77,8 +77,9 @@ class _ViewerBottomOverlayState extends State<ViewerBottomOverlay> {
   @override
   Widget build(BuildContext context) {
     final hasEdgeContent = settings.showOverlayInfo || multiPageController != null;
+    final blurred = settings.enableOverlayBlurEffect;
     return BlurredRect(
-      enabled: hasEdgeContent && settings.enableOverlayBlurEffect,
+      enabled: hasEdgeContent && blurred,
       child: Selector<MediaQueryData, Tuple3<double, EdgeInsets, EdgeInsets>>(
         selector: (c, mq) => Tuple3(mq.size.width, mq.viewInsets, mq.viewPadding),
         builder: (c, mq, child) {
@@ -91,7 +92,7 @@ class _ViewerBottomOverlayState extends State<ViewerBottomOverlay> {
           final availableWidth = mqWidth - viewPadding.horizontal;
 
           return Container(
-            color: hasEdgeContent ? kOverlayBackgroundColor : Colors.transparent,
+            color: hasEdgeContent ? overlayBackgroundColor(blurred: blurred) : Colors.transparent,
             padding: EdgeInsets.only(
               left: max(viewInsets.left, viewPadding.left),
               top: 0,
diff --git a/lib/widgets/viewer/overlay/bottom/video.dart b/lib/widgets/viewer/overlay/bottom/video.dart
index d637d80a3..89aceb7f3 100644
--- a/lib/widgets/viewer/overlay/bottom/video.dart
+++ b/lib/widgets/viewer/overlay/bottom/video.dart
@@ -114,10 +114,11 @@ class _VideoControlOverlayState extends State<VideoControlOverlay> with SingleTi
 
   Widget _buildProgressBar() {
     const progressBarBorderRadius = 123.0;
+    final blurred = settings.enableOverlayBlurEffect;
     return SizeTransition(
       sizeFactor: scale,
       child: BlurredRRect(
-        enabled: settings.enableOverlayBlurEffect,
+        enabled: blurred,
         borderRadius: progressBarBorderRadius,
         child: GestureDetector(
           onTapDown: (details) {
@@ -136,7 +137,7 @@ class _VideoControlOverlayState extends State<VideoControlOverlay> with SingleTi
           child: Container(
             padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16) + const EdgeInsets.only(bottom: 16),
             decoration: BoxDecoration(
-              color: kOverlayBackgroundColor,
+              color: overlayBackgroundColor(blurred: blurred),
               border: AvesBorder.border,
               borderRadius: const BorderRadius.all(Radius.circular(progressBarBorderRadius)),
             ),
diff --git a/lib/widgets/viewer/overlay/common.dart b/lib/widgets/viewer/overlay/common.dart
index 8029a0428..d209f4f1b 100644
--- a/lib/widgets/viewer/overlay/common.dart
+++ b/lib/widgets/viewer/overlay/common.dart
@@ -3,7 +3,7 @@ import 'package:aves/widgets/common/fx/blurred.dart';
 import 'package:aves/widgets/common/fx/borders.dart';
 import 'package:flutter/material.dart';
 
-const kOverlayBackgroundColor = Colors.black26;
+Color overlayBackgroundColor({required bool blurred}) => blurred ? Colors.black26 : Colors.black38;
 
 class OverlayButton extends StatelessWidget {
   final Animation<double> scale;
@@ -17,13 +17,14 @@ class OverlayButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final blurred = settings.enableOverlayBlurEffect;
     return ScaleTransition(
       scale: scale,
       child: BlurredOval(
-        enabled: settings.enableOverlayBlurEffect,
+        enabled: blurred,
         child: Material(
           type: MaterialType.circle,
-          color: kOverlayBackgroundColor,
+          color: overlayBackgroundColor(blurred: blurred),
           child: Ink(
             decoration: BoxDecoration(
               border: AvesBorder.border,
@@ -57,15 +58,16 @@ class OverlayTextButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final blurred = settings.enableOverlayBlurEffect;
     return SizeTransition(
       sizeFactor: scale,
       child: BlurredRRect(
-        enabled: settings.enableOverlayBlurEffect,
+        enabled: blurred,
         borderRadius: _borderRadius,
         child: OutlinedButton(
           onPressed: onPressed,
           style: ButtonStyle(
-            backgroundColor: MaterialStateProperty.all<Color>(kOverlayBackgroundColor),
+            backgroundColor: MaterialStateProperty.all<Color>(overlayBackgroundColor(blurred: blurred)),
             foregroundColor: MaterialStateProperty.all<Color>(Colors.white),
             overlayColor: MaterialStateProperty.all<Color>(Colors.white.withOpacity(0.12)),
             minimumSize: _minSize,