Fix attachment keyboard not showing.

This commit is contained in:
Cody Henthorne
2023-07-31 14:09:11 -04:00
parent 3acd68e0b3
commit adf3d74d91

View File

@@ -12,6 +12,7 @@ import androidx.core.graphics.Insets
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsAnimationCompat import androidx.core.view.WindowInsetsAnimationCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.util.ServiceUtil import org.thoughtcrime.securesms.util.ServiceUtil
@@ -45,6 +46,7 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
) : ConstraintLayout(context, attrs, defStyleAttr) { ) : ConstraintLayout(context, attrs, defStyleAttr) {
companion object { companion object {
private val TAG = Log.tag(InsetAwareConstraintLayout::class.java)
private val keyboardType = WindowInsetsCompat.Type.ime() private val keyboardType = WindowInsetsCompat.Type.ime()
private val windowTypes = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() private val windowTypes = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
} }
@@ -144,10 +146,12 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
SignalStore.misc().keyboardPortraitHeight SignalStore.misc().keyboardPortraitHeight
} }
return if (height <= 0) { val minHeight = resources.getDimensionPixelSize(R.dimen.default_custom_keyboard_size)
resources.getDimensionPixelSize(R.dimen.default_custom_keyboard_size) return if (height > minHeight) {
} else {
height height
} else {
Log.w(TAG, "Saved keyboard height ($height) is too low, using default size ($minHeight)")
minHeight
} }
} }