Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-14 23:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add audio-indicator slot to use for single-remote-participant calls.

Browse Source
This commit is contained in:
Alex Hart
2026-02-06 11:24:28 -04:00
committed by Greyson Parrelli
parent 09c07f0707
commit 7741844055
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallElementsLayout.kt
View File

@@ -43,7 +43,8 @@ private enum class BlurrableContentSlot {
BARS,
GRID,
REACTIONS,
OVERFLOW
OVERFLOW,
AUDIO_INDICATOR
}
@Composable
@@ -54,6 +55,7 @@ fun CallElementsLayout(
raiseHandSlot: @Composable () -> Unit,
callLinkBarSlot: @Composable () -> Unit,
callOverflowSlot: @Composable () -> Unit,
audioIndicatorSlot: @Composable () -> Unit,
bottomInset: Dp,
bottomSheetWidth: Dp,
localRenderState: WebRtcLocalRenderState,
@@ -100,6 +102,7 @@ fun CallElementsLayout(
callGridSlot = callGridSlot,
reactionsSlot = reactionsSlot,
callOverflowSlot = callOverflowSlot,
audioIndicatorSlot = audioIndicatorSlot,
onMeasured = { barsHeight, barsWidth ->
measuredBarsHeightPx = barsHeight
measuredBarsWidthPx = barsWidth
@@ -146,6 +149,7 @@ private fun BlurrableContentLayer(
callGridSlot: @Composable () -> Unit,
reactionsSlot: @Composable () -> Unit,
callOverflowSlot: @Composable () -> Unit,
audioIndicatorSlot: @Composable () -> Unit,
onMeasured: (barsHeight: Int, barsWidth: Int) -> Unit
) {
BlurContainer(
@@ -187,6 +191,9 @@ private fun BlurrableContentLayer(
val reactionsPlaceables = subcompose(BlurrableContentSlot.REACTIONS, reactionsSlot)
.map { it.measure(reactionsConstraints) }
val audioIndicatorPlaceables = subcompose(BlurrableContentSlot.AUDIO_INDICATOR, audioIndicatorSlot)
.map { it.measure(looseConstraints) }
layout(looseConstraints.maxWidth, looseConstraints.maxHeight) {
overflowPlaceables.forEach {
if (isPortrait) {
@@ -208,6 +215,17 @@ private fun BlurrableContentLayer(
reactionsPlaceables.forEach {
it.place(0, 0)
}
audioIndicatorPlaceables.forEach {
val gutterWidth = (looseConstraints.maxWidth - bottomSheetWidthPx) / 2
val fitsInGutter = gutterWidth >= it.width
val y = if (fitsInGutter) {
looseConstraints.maxHeight - it.height
} else {
looseConstraints.maxHeight - bottomInsetPx - barsHeightPx - it.height
}
it.place(0, y)
}
}
}
}
@@ -322,6 +340,21 @@ private fun CallElementsLayoutPreview() {
.background(color = Color.Red)
)
},
audioIndicatorSlot = {
val mutedParticipant = CallParticipant(
recipient = Recipient(
id = RecipientId.from(2L),
isResolving = false,
systemContactName = "Muted Participant"
),
audioLevel = null
)
ParticipantAudioIndicator(
participant = mutedParticipant,
selfPipMode = SelfPipMode.NOT_SELF_PIP
)
},
bottomInset = 120.dp,
bottomSheetWidth = CallScreenMetrics.SheetMaxWidth,
localRenderState = localRenderState

1
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallParticipantsPager.kt
View File

@@ -53,6 +53,7 @@ fun CallParticipantsPager(
renderInPip = state.isRenderInPip,
raiseHandAllowed = false,
onInfoMoreInfoClick = null,
showAudioIndicator = state.callParticipants.size > 1,
modifier = itemModifier
)
}

9
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt
View File

@@ -383,6 +383,15 @@ fun CallScreen(
)
}
},
audioIndicatorSlot = {
if (callParticipantsPagerState.callParticipants.size == 1) {
val participant = callParticipantsPagerState.callParticipants.first()
ParticipantAudioIndicator(
participant = participant,
selfPipMode = SelfPipMode.NOT_SELF_PIP
)
}
},
bottomInset = padding,
bottomSheetWidth = CallScreenMetrics.SheetMaxWidth,
localRenderState = localRenderState,