chore: revert changes of #2246

wireapp · Sep 22, 2023 · 3b7e520 · 3b7e520
1 parent b6dd35d
commit 3b7e520
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
@@ -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,
@@ -220,9 +221,9 @@ private fun CameraPreview(
             }
         }
         AndroidView(
-            factory = { videoPreview },
-            update = {
+            factory = {
                 onSelfUserVideoPreviewCreated(videoPreview)
+                videoPreview
             }
         )
     } else {
@@ -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 {

diff --git a/...src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantsTiles.kt b/...src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantsTiles.kt
@@ -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
                         )
@@ -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
                         )

diff --git a/...n/kotlin/com/wire/android/ui/calling/ongoing/participantsview/gridview/CallingGridView.kt b/...n/kotlin/com/wire/android/ui/calling/ongoing/participantsview/gridview/CallingGridView.kt
@@ -98,7 +98,7 @@ fun GroupCallGrid(
 
             ParticipantTile(
                 modifier = Modifier
-                    .pointerInput(isSelfUserCameraOn, isSelfUserMuted) {
+                    .pointerInput(Unit) {
                         detectTapGestures(
                             onDoubleTap = {
                                 onDoubleTap(

diff --git a/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt b/.../wire/android/ui/calling/ongoing/participantsview/horizentalview/CallingHorizontalView.kt
@@ -80,7 +80,7 @@ fun CallingHorizontalView(
 
             ParticipantTile(
                 modifier = Modifier
-                    .pointerInput(isSelfUserCameraOn, isSelfUserMuted) {
+                    .pointerInput(Unit) {
                         detectTapGestures(
                             onDoubleTap = {
                                 onDoubleTap(