diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt index 864219f20c6..529c306b99d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt +++ b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt @@ -417,7 +417,10 @@ private fun OngoingCallContent( Box( modifier = Modifier .fillMaxSize() - .drawInCallReactions(state = inCallReactionsState) + .drawInCallReactions( + state = inCallReactionsState, + enabled = !inPictureInPictureMode, + ) ) { // if there is only one in the call, do not allow full screen @@ -494,7 +497,7 @@ private fun OngoingCallContent( } AnimatedContent( - targetState = showInCallReactionsPanel, + targetState = showInCallReactionsPanel && !inPictureInPictureMode, transitionSpec = { val enter = slideInVertically(initialOffsetY = { it }) val exit = slideOutVertically(targetOffsetY = { it }) diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/incallreactions/InCallReactionsModifier.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/incallreactions/InCallReactionsModifier.kt index eaafe6c35fd..295ac31930b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/incallreactions/InCallReactionsModifier.kt +++ b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/incallreactions/InCallReactionsModifier.kt @@ -47,6 +47,7 @@ fun Modifier.drawInCallReactions( state: InCallReactionsState, labelTextColor: Color = Color.White, labelColor: Color = Color.Black, + enabled: Boolean = true, emojiBackgroundColor: Color = colorsScheme().emojiBackgroundColor, emojiBackgroundSize: Dp = dimensions().inCallReactionButtonSize, emojiTextStyle: TextStyle = typography().inCallReactionEmoji, @@ -64,6 +65,8 @@ fun Modifier.drawInCallReactions( drawContent() + if (!enabled) return@drawWithContent + clipRect(left = 0f, top = 0f, right = size.width, bottom = size.height) { state.getReactions().forEach { reaction ->