Skip to content
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

fix: In call video flickering on opening emojy drawer #WPB-15549 #3853

Merged
merged 4 commits into from
Feb 3, 2025
Merged

fix: In call video flickering on opening emojy drawer #WPB-15549 #3853

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99e3d2a
fix: App closing after back-click on Settings
borichellow Jan 30, 2025
474d2a0
Merge branch 'develop' into fix/app_closing_after_back_click_on_settings
borichellow Jan 30, 2025
dbf9ecd
fix: In Call: video flickering on openning emojy drawer
borichellow Jan 31, 2025
b0431d9
Merge branch 'develop' into fix/in_call_video_flickering_on_openning_…
borichellow Jan 31, 2025
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
24 changes: 5 additions & 19 deletions app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ import android.content.pm.PackageManager
import android.view.View
import androidx.activity.compose.BackHandler
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
Expand Down Expand Up @@ -496,21 +492,11 @@ private fun OngoingCallContent(
}
}

AnimatedContent(
targetState = showInCallReactionsPanel && !inPictureInPictureMode,
transitionSpec = {
val enter = slideInVertically(initialOffsetY = { it })
val exit = slideOutVertically(targetOffsetY = { it })
enter.togetherWith(exit)
},
label = "InCallReactions"
) { show ->
if (show) {
InCallReactionsPanel(
onReactionClick = onReactionClick,
onMoreClick = { showEmojiPicker = true }
)
}
if (showInCallReactionsPanel && !inPictureInPictureMode) {
InCallReactionsPanel(
onReactionClick = onReactionClick,
onMoreClick = { showEmojiPicker = true }
)
}

EmojiPickerBottomSheet(
Expand Down
Loading