Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed weird display when pausing conference the first time while in Grid layout

Browse source
This commit is contained in:
Sylvain Berfini 2022-04-22 13:26:25 +02:00
parent 85b0d8e6ae
commit 8866b19b7f
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/linphone/activities/voip/views/GridBoxLayout.kt
View file

@ -27,7 +27,6 @@ import androidx.core.view.children
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
class GridBoxLayout : GridLayout { class GridBoxLayout : GridLayout {
companion object { companion object {
private val placementMatrix = arrayOf(intArrayOf(1, 2, 3, 4, 5, 6), intArrayOf(1, 1, 2, 2, 3, 3), intArrayOf(1, 1, 1, 2, 2, 2), intArrayOf(1, 1, 1, 1, 2, 2), intArrayOf(1, 1, 1, 1, 1, 2), intArrayOf(1, 1, 1, 1, 1, 1)) private val placementMatrix = arrayOf(intArrayOf(1, 2, 3, 4, 5, 6), intArrayOf(1, 1, 2, 2, 3, 3), intArrayOf(1, 1, 1, 2, 2, 2), intArrayOf(1, 1, 1, 1, 2, 2), intArrayOf(1, 1, 1, 1, 1, 2), intArrayOf(1, 1, 1, 1, 1, 1))
} }
@ -42,16 +41,30 @@ class GridBoxLayout : GridLayout {
var centerContent: Boolean = false var centerContent: Boolean = false
var previousChildCount = 0 var previousChildCount = 0
var previousCellSize = 0
@SuppressLint("DrawAllocation") @SuppressLint("DrawAllocation")
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
if (childCount == 0 || (!changed && previousChildCount == childCount)) { if (childCount == 0 || (!changed && previousChildCount == childCount)) {
super.onLayout(changed, left, top, right, bottom) super.onLayout(changed, left, top, right, bottom)
// To prevent display issue the first time conference is locally paused
children.forEach { child ->
child.post {
child.layoutParams.width = previousCellSize
child.layoutParams.height = previousCellSize
child.requestLayout()
}
}
return return
} }
// To prevent java.lang.IllegalArgumentException: columnCount must be greater than or equal
// to the maximum of all grid indices (and spans) defined in the LayoutParams of each child.
children.forEach { child ->
child.layoutParams = LayoutParams()
}
val availableSize = Pair(right - left, bottom - top) val availableSize = Pair(right - left, bottom - top)
previousChildCount = childCount
children.forEach { it.layoutParams = LayoutParams() }
var cellSize = 0 var cellSize = 0
for (index in 1..childCount) { for (index in 1..childCount) {
val neededColumns = placementMatrix[index - 1][childCount - 1] val neededColumns = placementMatrix[index - 1][childCount - 1]
@ -64,6 +77,9 @@ class GridBoxLayout : GridLayout {
cellSize = candidateSize cellSize = candidateSize
} }
} }
previousCellSize = cellSize
previousChildCount = childCount
super.onLayout(changed, left, top, right, bottom) super.onLayout(changed, left, top, right, bottom)
children.forEach { child -> children.forEach { child ->
child.layoutParams.width = cellSize child.layoutParams.width = cellSize
@ -72,6 +88,7 @@ class GridBoxLayout : GridLayout {
child.requestLayout() child.requestLayout()
} }
} }
if (centerContent) { if (centerContent) {
setPadding((availableSize.first - (columnCount * cellSize)) / 2, (availableSize.second - (rowCount * cellSize)) / 2, (availableSize.first - (columnCount * cellSize)) / 2, (availableSize.second - (rowCount * cellSize)) / 2) setPadding((availableSize.first - (columnCount * cellSize)) / 2, (availableSize.second - (rowCount * cellSize)) / 2, (availableSize.first - (columnCount * cellSize)) / 2, (availableSize.second - (rowCount * cellSize)) / 2)
} }