From ea65706588727d32e88fbfb4302d7dc719730725 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 22 Mar 2025 12:34:37 +0100
Subject: [PATCH] fix bottom app bar and thread view in edge-to-edge mode
 (#5003)

closes #5002
---
 app/src/main/java/com/keylesspalace/tusky/MainActivity.kt      | 1 -
 .../tusky/components/viewthread/ViewThreadFragment.kt          | 3 +++
 app/src/main/res/layout/activity_main.xml                      | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 0c72251fd..3c01eb2c4 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -271,7 +271,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
                     binding.bottomNav.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                         height = bottomBarHeight + bottomInsets
                     }
-                    binding.bottomNav.updatePadding(bottom = bottomInsets)
                     binding.bottomTabLayout.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                         bottomMargin = bottomInsets
                     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
index 56347aabd..44fd3bacd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
@@ -48,6 +48,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
 import com.keylesspalace.tusky.util.CardViewMode
 import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate
 import com.keylesspalace.tusky.util.StatusDisplayOptions
+import com.keylesspalace.tusky.util.ensureBottomPadding
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.openLink
 import com.keylesspalace.tusky.util.show
@@ -133,6 +134,8 @@ class ViewThreadFragment :
 
         binding.swipeRefreshLayout.setOnRefreshListener(this)
 
+        binding.recyclerView.ensureBottomPadding()
+
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(context)
         binding.recyclerView.setAccessibilityDelegateCompat(
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9fa91e80b..e16683cf5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -69,11 +69,12 @@
             android:layout_height="@dimen/bottomAppBarHeight"
             android:layout_gravity="bottom"
             android:backgroundTint="?attr/colorSurface"
+            app:buttonGravity="center_vertical"
             app:contentInsetStart="0dp"
             app:contentInsetStartWithNavigation="0dp"
             app:fabAlignmentMode="end"
             app:menuAlignmentMode="auto"
-            app:navigationContentDescription="@string/action_open_drawer" >
+            app:navigationContentDescription="@string/action_open_drawer">
 
             <com.keylesspalace.tusky.view.AdaptiveTabLayout
                 android:id="@+id/bottomTabLayout"