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

Jump to bottom

chore: revert changes of #2246 #2265

Merged
merged 1 commit into from
Sep 25, 2023
Merged

chore: revert changes of #2246 #2265

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ fun ParticipantTile(
onSelfUserVideoPreviewCreated: (view: View) -> Unit,
onClearSelfUserVideoPreview: () -> Unit
) {
val alpha = if (participantTitleState.hasEstablishedAudio) ContentAlpha.high else ContentAlpha.medium
val alpha =
if (participantTitleState.hasEstablishedAudio) ContentAlpha.high else ContentAlpha.medium
Surface(
modifier = modifier,
color = colorsScheme().callingParticipantTileBackgroundColor,
Expand Down Expand Up @@ -220,9 +221,9 @@ private fun CameraPreview(
}
}
AndroidView(
factory = { videoPreview },
update = {
factory = {
onSelfUserVideoPreviewCreated(videoPreview)
videoPreview
}
)
} else {
Expand All @@ -245,7 +246,8 @@ private fun OthersVideoRenderer(
var offsetY by remember { mutableStateOf(0f) }

val context = LocalContext.current
val rendererFillColor = (colorsScheme().callingParticipantTileBackgroundColor.value shr 32).toLong()
val rendererFillColor =
(colorsScheme().callingParticipantTileBackgroundColor.value shr 32).toLong()
if (isCameraOn || isSharingScreen) {

val videoRenderer = remember {
Expand Down
12 changes: 2 additions & 10 deletions ...src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantsTiles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ fun VerticalCallingPager(
isSelfUserMuted = isSelfUserMuted,
isSelfUserCameraOn = isSelfUserCameraOn,
contentHeight = contentHeight,
onSelfVideoPreviewCreated = {
if (pagerState.currentPage == 0) {
onSelfVideoPreviewCreated(it)
}
},
onSelfVideoPreviewCreated = onSelfVideoPreviewCreated,
onSelfClearVideoPreview = onSelfClearVideoPreview,
onDoubleTap = onDoubleTap
)
Expand All @@ -118,11 +114,7 @@ fun VerticalCallingPager(
isSelfUserMuted = isSelfUserMuted,
isSelfUserCameraOn = isSelfUserCameraOn,
contentHeight = contentHeight,
onSelfVideoPreviewCreated = {
if (pagerState.currentPage == 0) {
onSelfVideoPreviewCreated(it)
}
},
onSelfVideoPreviewCreated = onSelfVideoPreviewCreated,
onSelfClearVideoPreview = onSelfClearVideoPreview,
onDoubleTap = onDoubleTap
)
Expand Down
2 changes: 1 addition & 1 deletion ...n/kotlin/com/wire/android/ui/calling/ongoing/participantsview/gridview/CallingGridView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ fun GroupCallGrid(

ParticipantTile(
modifier = Modifier
.pointerInput(isSelfUserCameraOn, isSelfUserMuted) {
.pointerInput(Unit) {
detectTapGestures(
onDoubleTap = {
onDoubleTap(
Expand Down
2 changes: 1 addition & 1 deletion .../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fun CallingHorizontalView(

ParticipantTile(
modifier = Modifier
.pointerInput(isSelfUserCameraOn, isSelfUserMuted) {
.pointerInput(Unit) {
detectTapGestures(
onDoubleTap = {
onDoubleTap(
Expand Down