From 004b596671358f3baa2c548c14e1653bdd177618 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 31 Mar 2021 17:36:52 -0400
Subject: [PATCH] Fix Browse sources padding

---
 .../kanade/tachiyomi/ui/source/BrowseController.kt   | 12 +++++++++++-
 app/src/main/res/layout/browse_controller.xml        |  2 --
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
index 99ed22b885..bad7977b8a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
@@ -131,9 +131,13 @@ class BrowseController :
         array.recycle()
         scrollViewWith(
             binding.sourceRecycler,
+            customPadding = true,
             afterInsets = {
                 headerHeight = it.systemWindowInsetTop + appBarHeight
-                binding.sourceRecycler.updatePaddingRelative(bottom = activityBinding?.bottomNav?.height ?: 0)
+                binding.sourceRecycler.updatePaddingRelative(
+                    top = activityBinding?.appBar?.height ?: 0,
+                    bottom = (activityBinding?.bottomNav?.height ?: 0) + 58.spToPx
+                )
             },
             onBottomNavUpdate = {
                 setBottomPadding()
@@ -146,6 +150,9 @@ class BrowseController :
                 if (binding.bottomSheet.root.sheetBehavior.isCollapsed()) 0f else 1f * 15f,
                 if (binding.sourceRecycler.canScrollVertically(-1)) 15f else 0f
             )
+            binding.sourceRecycler.updatePaddingRelative(
+                bottom = (activityBinding?.bottomNav?.height ?: 0) + 58.spToPx
+            )
         }
 
         requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 301)
@@ -270,6 +277,9 @@ class BrowseController :
         binding.bottomSheet.root.migrationFrameLayout?.binding?.fastScroller?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             bottomMargin = -pad.toInt()
         }
+        binding.sourceRecycler.updatePaddingRelative(
+            bottom = (activityBinding?.bottomNav?.height ?: 0) + 58.spToPx
+        )
     }
 
     override fun showSheet() {
diff --git a/app/src/main/res/layout/browse_controller.xml b/app/src/main/res/layout/browse_controller.xml
index 2be0617022..c8cee122cf 100644
--- a/app/src/main/res/layout/browse_controller.xml
+++ b/app/src/main/res/layout/browse_controller.xml
@@ -17,8 +17,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:layout_marginBottom="30dp"
-            android:paddingBottom="20dp"
             tools:listitem="@layout/source_header_item" />
 
     </FrameLayout>