Skip to content

Fix ParticipantGrid crash with infinite height constraints #5459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −5
Open

Fix ParticipantGrid crash with infinite height constraints #5459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions app/src/main/java/com/nextcloud/talk/call/components/ParticipantGrid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.isFinite
import com.nextcloud.talk.adapters.ParticipantUiState
import org.webrtc.EglBase
import kotlin.math.ceil
Expand Down Expand Up @@ -72,17 +73,27 @@ fun ParticipantGrid(
.fillMaxSize()
.clickable { onClick() }
) {
val availableHeight = maxHeight
val hasBoundedHeight = constraints.hasBoundedHeight && maxHeight.isFinite

val gridAvailableHeight = availableHeight - totalVerticalSpacing - totalVerticalPadding
val rawItemHeight = gridAvailableHeight / rows
val itemHeight = maxOf(rawItemHeight, minItemHeight)
val itemHeight = if (hasBoundedHeight) {
val gridAvailableHeight = maxHeight - totalVerticalSpacing - totalVerticalPadding
val rawItemHeight = gridAvailableHeight / rows
maxOf(rawItemHeight, minItemHeight)
} else {
minItemHeight
}

val gridHeight = if (hasBoundedHeight) {
maxHeight
} else {
(itemHeight * rows) + totalVerticalSpacing + totalVerticalPadding
}

LazyVerticalGrid(
columns = GridCells.Fixed(columns),
modifier = Modifier
.fillMaxWidth()
.height(availableHeight),
.height(gridHeight),
verticalArrangement = Arrangement.spacedBy(itemSpacing),
horizontalArrangement = Arrangement.spacedBy(itemSpacing),
contentPadding = PaddingValues(vertical = edgePadding, horizontal = edgePadding)
Expand Down
Loading