Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sticker grid sometimes getting stuck on 2 columns.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-02-10 13:12:44 -05:00
committed by Michelle Tang
parent 20a05220ea
commit 611b52780e
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt
View File

@@ -203,11 +203,20 @@ open class StickerKeyboardPageFragment :
}
override fun onLayoutChange(v: View?, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int) {
onScreenWidthChanged(view?.width ?: 0)
onScreenWidthChanged(right - left)
}
private fun onScreenWidthChanged(@Px newWidth: Int) {
layoutManager.spanCount = calculateColumnCount(newWidth)
if (newWidth <= 0) {
return
}
val newSpanCount = calculateColumnCount(newWidth)
if (layoutManager.spanCount != newSpanCount) {
stickerList.post {
layoutManager.spanCount = newSpanCount
}
}
}
private fun calculateColumnCount(@Px screenWidth: Int): Int {

12
app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerSearchDialogFragment.kt
View File

@@ -79,7 +79,17 @@ class StickerSearchDialogFragment : DialogFragment(), KeyboardStickerListAdapter
}
override fun onLayoutChange(v: View?, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int) {
layoutManager.spanCount = calculateColumnCount(view?.width ?: 0)
val width = right - left
if (width <= 0) {
return
}
val newSpanCount = calculateColumnCount(width)
if (layoutManager.spanCount != newSpanCount) {
list.post {
layoutManager.spanCount = newSpanCount
}
}
}
private fun calculateColumnCount(@Px screenWidth: Int): Int {