Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 08:09:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter sheet bottom buttons when keyboard was previously showing

Browse Source
This commit is contained in:
Jays2Kings 2021-05-10 15:06:27 -04:00
parent 8ead904def
commit c020d4d45d
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/SourceFilterSheet.kt
View File

@ -5,6 +5,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewTreeObserver.OnGlobalLayoutListener import android.view.ViewTreeObserver.OnGlobalLayoutListener
import android.view.WindowInsets
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
@ -13,6 +14,7 @@ import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.databinding.SourceFilterSheetBinding import eu.kanade.tachiyomi.databinding.SourceFilterSheetBinding
import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.util.view.collapse import eu.kanade.tachiyomi.util.view.collapse
import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsets
import eu.kanade.tachiyomi.util.view.updateLayoutParams import eu.kanade.tachiyomi.util.view.updateLayoutParams
import eu.kanade.tachiyomi.util.view.updatePaddingRelative import eu.kanade.tachiyomi.util.view.updatePaddingRelative
import eu.kanade.tachiyomi.widget.E2EBottomSheetDialog import eu.kanade.tachiyomi.widget.E2EBottomSheetDialog
@ -39,14 +41,11 @@ class SourceFilterSheet(val activity: Activity) :
sheetBehavior.peekHeight = 450.dpToPx sheetBehavior.peekHeight = 450.dpToPx
sheetBehavior.collapse() sheetBehavior.collapse()
binding.titleLayout.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener { binding.titleLayout.viewTreeObserver.addOnGlobalLayoutListener(object :
OnGlobalLayoutListener {
override fun onGlobalLayout() { override fun onGlobalLayout() {
binding.cardView.updateLayoutParams<ConstraintLayout.LayoutParams> { activity.window.decorView.rootWindowInsets?.let {
val fullHeight = activity.window.decorView.height setCardViewMax(it)
val insets = activity.window.decorView.rootWindowInsets
matchConstraintMaxHeight =
fullHeight - (insets?.systemWindowInsetTop ?: 0) -
binding.titleLayout.height - 75.dpToPx
} }
if (binding.titleLayout.height > 0) { if (binding.titleLayout.height > 0) {
binding.titleLayout.viewTreeObserver.removeOnGlobalLayoutListener(this) binding.titleLayout.viewTreeObserver.removeOnGlobalLayoutListener(this)
@ -54,6 +53,29 @@ class SourceFilterSheet(val activity: Activity) :
} }
}) })
binding.cardView.doOnApplyWindowInsets { _, insets, _ ->
binding.cardView.updateLayoutParams<ConstraintLayout.LayoutParams> {
val fullHeight = activity.window.decorView.height
matchConstraintMaxHeight =
fullHeight - insets.systemWindowInsetTop -
binding.titleLayout.height - 75.dpToPx
}
}
val attrsArray = intArrayOf(android.R.attr.actionBarSize)
val array = context.obtainStyledAttributes(attrsArray)
val headerHeight = array.getDimensionPixelSize(0, 0)
array.recycle()
binding.root.doOnApplyWindowInsets { _, insets, _ ->
binding.titleLayout.updatePaddingRelative(
bottom = insets.systemWindowInsetBottom
)
binding.titleLayout.updateLayoutParams<ConstraintLayout.LayoutParams> {
height = headerHeight + binding.titleLayout.paddingBottom
}
setCardViewMax(insets)
}
(binding.root.parent.parent as? View)?.viewTreeObserver?.addOnGlobalLayoutListener(object : OnGlobalLayoutListener { (binding.root.parent.parent as? View)?.viewTreeObserver?.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
override fun onGlobalLayout() { override fun onGlobalLayout() {
updateBottomButtons() updateBottomButtons()
@ -85,6 +107,17 @@ class SourceFilterSheet(val activity: Activity) :
) )
} }
fun setCardViewMax(insets: WindowInsets) {
val fullHeight = activity.window.decorView.height
val newHeight = fullHeight - insets.systemWindowInsetTop -
binding.titleLayout.height - 75.dpToPx
if ((binding.cardView.layoutParams as ConstraintLayout.LayoutParams).matchConstraintMaxHeight != newHeight) {
binding.cardView.updateLayoutParams<ConstraintLayout.LayoutParams> {
matchConstraintMaxHeight = newHeight
}
}
}
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
sheetBehavior.collapse() sheetBehavior.collapse()