From c5f8981a7e930f3a3f7562014ade05c849e3dd39 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Fri, 2 Sep 2022 19:45:12 +0200
Subject: [PATCH] fixed viewer feedback bottom padding with nav gestures

---
 lib/widgets/common/action_mixins/feedback.dart | 1 +
 lib/widgets/viewer/overlay/bottom.dart         | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/widgets/common/action_mixins/feedback.dart b/lib/widgets/common/action_mixins/feedback.dart
index 0d5dbbfcb..a0694c98b 100644
--- a/lib/widgets/common/action_mixins/feedback.dart
+++ b/lib/widgets/common/action_mixins/feedback.dart
@@ -60,6 +60,7 @@ mixin FeedbackMixin {
         OverlaySupportEntry? notificationOverlayEntry;
         notificationOverlayEntry = showOverlayNotification(
           (context) => SafeArea(
+            bottom: false,
             child: Padding(
               padding: margin,
               child: OverlaySnackBar(
diff --git a/lib/widgets/viewer/overlay/bottom.dart b/lib/widgets/viewer/overlay/bottom.dart
index 3adfb4576..41caf8f84 100644
--- a/lib/widgets/viewer/overlay/bottom.dart
+++ b/lib/widgets/viewer/overlay/bottom.dart
@@ -37,7 +37,11 @@ class ViewerBottomOverlay extends StatefulWidget {
   State<StatefulWidget> createState() => _ViewerBottomOverlayState();
 
   static double actionSafeHeight(BuildContext context) {
-    return ViewerButtons.preferredHeight(context) + (settings.showOverlayThumbnailPreview ? ViewerThumbnailPreview.preferredHeight : 0);
+    final mq = context.read<MediaQueryData>();
+    final mqPaddingBottom = max(mq.effectiveBottomPadding, mq.systemGestureInsets.bottom);
+    final buttonHeight = ViewerButtons.preferredHeight(context);
+    final thumbnailHeight = (settings.showOverlayThumbnailPreview ? ViewerThumbnailPreview.preferredHeight : 0);
+    return mqPaddingBottom + buttonHeight + thumbnailHeight;
   }
 }