chore: use the new CameraPreviewBuilder to get CameraPreview (#2291)

wireapp · Sep 29, 2023 · 30f7cac · 30f7cac
1 parent b7d4c8d
commit 30f7cac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/common/CallVideoPreview.kt b/app/src/main/kotlin/com/wire/android/ui/calling/common/CallVideoPreview.kt
@@ -25,9 +25,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.viewinterop.AndroidView
-import com.waz.avs.VideoPreview
+import com.waz.avs.CameraPreviewBuilder
 
 @Composable
 fun CallVideoPreview(
@@ -37,11 +38,13 @@ fun CallVideoPreview(
 ) {
     if (isCameraOn) {
         Box {
+            val context = LocalContext.current
             AndroidView(
                 modifier = Modifier.fillMaxSize(),
                 factory = {
-                    val videoPreview = VideoPreview(it)
-                    videoPreview.setShouldFill(true)
+                    val videoPreview = CameraPreviewBuilder(context)
+                        .shouldFill(true)
+                        .build()
                     onVideoPreviewCreated(videoPreview)
                     videoPreview
                 }

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
@@ -68,7 +68,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
-import com.waz.avs.VideoPreview
+import com.waz.avs.CameraPreviewBuilder
 import com.waz.avs.VideoRenderer
 import com.wire.android.R
 import com.wire.android.model.UserAvatarData
@@ -214,11 +214,12 @@ private fun CameraPreview(
 ) {
     if (isCameraOn) {
         val context = LocalContext.current
+        val backgroundColor = colorsScheme().callingParticipantTileBackgroundColor.value.toInt()
         val videoPreview = remember {
-            VideoPreview(context).apply {
-                layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
-                setShouldFill(false)
-            }
+            CameraPreviewBuilder(context)
+                .setBackgroundColor(backgroundColor)
+                .shouldFill(false)
+                .build()
         }
         AndroidView(
             factory = {

diff --git a/kalium b/kalium
+1 −1		gradle/libs.versions.toml
+1 −1		logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt