Label padding fix on bottomsheet after updating dependencies

DerTyp7214 · Mar 8, 2022 · ccd931d · ccd931d
1 parent 249b64a
commit ccd931d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Context.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Context.kt
@@ -1,5 +1,6 @@
 package de.dertyp7214.rboardthememanager.core
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
 import android.os.Handler
@@ -18,6 +19,7 @@ fun Context.getAttr(@AttrRes attr: Int): Int {
     return typedValue.data
 }
 
+@SuppressLint("DiscouragedApi")
 fun Context.getNavigationBarHeight(): Int {
     val resourceId: Int = resources.getIdentifier("navigation_bar_height", "dimen", "android")
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/MainActivity.kt
@@ -117,6 +117,7 @@ class MainActivity : AppCompatActivity() {
         searchBar.menuVisible = !preferences.getBoolean("demo_shown", false)
 
         navigation.setHeight((resources.getDimension(R.dimen.bottomBarHeight) + getNavigationBarHeight()).roundToInt())
+        navigation.itemPaddingBottom = 8.dpToPx(this).toInt()
 
         val reloadThemesLauncher =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -230,14 +231,14 @@ class MainActivity : AppCompatActivity() {
 
                 binding.fragmentContainerView.setMargin(
                     bottomMargin = resources.getDimension(R.dimen.bottomBarHeight)
-                        .toInt() + 18.dpToPx(this)
+                        .toInt() + 28.dpToPx(this)
                         .toInt() + getNavigationBarHeight()
                 )
 
                 bottomSheetBehavior.isFitToContents = true
                 bottomSheetBehavior.skipCollapsed = true
                 bottomSheetBehavior.peekHeight =
-                    resources.getDimension(R.dimen.bottomBarHeight).toInt() + 8.dpToPx(this)
+                    resources.getDimension(R.dimen.bottomBarHeight).toInt() + 18.dpToPx(this)
                         .toInt() + getNavigationBarHeight()
                 bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED