Merge branch 'refs/heads/develop'

Author: aleksandar-apostolov

buildSrc/src/main/kotlin/io/getstream/video/android/Configuration.kt

@@ -6,11 +6,11 @@ object Configuration {
     const val minSdk = 24
     const val majorVersion = 1
     const val minorVersion = 0
-    const val patchVersion = 18
+    const val patchVersion = 19
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 41
+    const val versionCode = 42
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "io.getstream"
-    const val streamVideoCallGooglePlayVersion = "1.1.11"
+    const val streamVideoCallGooglePlayVersion = "1.1.12"
     const val streamWebRtcVersionName = "1.2.1"
 }

demo-app/src/main/kotlin/io/getstream/video/android/ui/call/CallScreen.kt

@@ -91,6 +91,7 @@ import io.getstream.video.android.compose.ui.components.call.renderer.LayoutType
 import io.getstream.video.android.compose.ui.components.call.renderer.ParticipantVideo
 import io.getstream.video.android.compose.ui.components.call.renderer.RegularVideoRendererStyle
 import io.getstream.video.android.compose.ui.components.call.renderer.copy
+import io.getstream.video.android.compose.ui.components.video.VideoScalingType
 import io.getstream.video.android.core.Call
 import io.getstream.video.android.core.RealtimeConnection
 import io.getstream.video.android.core.call.state.ChooseLayout
@@ -149,6 +150,7 @@ fun CallScreen(
     val scope = rememberCoroutineScope()
     val messageScope = rememberCoroutineScope()
     var showingLandscapeControls by remember { mutableStateOf(false) }
+    var preferredScaleType by remember { mutableStateOf(VideoScalingType.SCALE_ASPECT_FILL) }
 
     val connection by call.state.connection.collectAsStateWithLifecycle()
     val me by call.state.me.collectAsState()
@@ -320,6 +322,7 @@ fun CallScreen(
                                 call = call,
                                 participant = participant,
                                 style = style,
+                                scalingType = preferredScaleType,
                                 reactionContent = {
                                     CustomReactionContent(
                                         participant = participant,
@@ -501,6 +504,10 @@ fun CallScreen(
                 onNoiseCancellation = {
                     isNoiseCancellationEnabled = call.toggleAudioProcessing()
                 },
+                onSelectScaleType = {
+                    preferredScaleType = it
+                    isShowingSettingMenu = false
+                },
                 onShowCallStats = {
                     isShowingStats = true
                     isShowingSettingMenu = false

demo-app/src/main/kotlin/io/getstream/video/android/ui/join/CallJoinScreen.kt

@@ -461,7 +461,7 @@ private fun JoinCallForm(
         mutableStateOf(
             TextFieldValue(
                 if (BuildConfig.FLAVOR == StreamFlavors.development) {
-                    "default:123lexgvg"
+                    "default:79cYh3J5JgGk"
                 } else {
                     ""
                 },

demo-app/src/main/kotlin/io/getstream/video/android/ui/menu/MenuDefinitions.kt

@@ -21,9 +21,13 @@ import android.os.Build
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.MobileScreenShare
 import androidx.compose.material.icons.automirrored.filled.ReadMore
+import androidx.compose.material.icons.filled.AspectRatio
 import androidx.compose.material.icons.filled.Audiotrack
 import androidx.compose.material.icons.filled.AutoGraph
+import androidx.compose.material.icons.filled.Balance
 import androidx.compose.material.icons.filled.BluetoothAudio
+import androidx.compose.material.icons.filled.Crop
+import androidx.compose.material.icons.filled.CropFree
 import androidx.compose.material.icons.filled.Feedback
 import androidx.compose.material.icons.filled.Headphones
 import androidx.compose.material.icons.filled.HeadsetMic
@@ -37,6 +41,7 @@ import androidx.compose.material.icons.filled.SwitchLeft
 import androidx.compose.material.icons.filled.VideoFile
 import androidx.compose.material.icons.filled.VideoLibrary
 import androidx.compose.material.icons.filled.VideoSettings
+import io.getstream.video.android.compose.ui.components.video.VideoScalingType
 import io.getstream.video.android.core.audio.StreamAudioDevice
 import io.getstream.video.android.ui.menu.base.ActionMenuItem
 import io.getstream.video.android.ui.menu.base.DynamicSubMenuItem
@@ -64,6 +69,7 @@ fun defaultStreamMenu(
     onDeviceSelected: (StreamAudioDevice) -> Unit,
     onSfuRejoinClick: () -> Unit,
     onSfuFastReconnectClick: () -> Unit,
+    onSelectScaleType: (VideoScalingType) -> Unit,
     availableDevices: List<StreamAudioDevice>,
     loadRecordings: suspend () -> List<MenuItem>,
 ) = buildList<MenuItem> {
@@ -138,6 +144,7 @@ fun defaultStreamMenu(
                     onSwitchSfuClick,
                     onSfuRejoinClick,
                     onSfuFastReconnectClick,
+                    onSelectScaleType,
                 ),
             ),
         )
@@ -196,6 +203,24 @@ fun reconnectMenu(
     ),
 )
 
+fun scaleTypeMenu(onSelectScaleType: (VideoScalingType) -> Unit): List<MenuItem> = listOf(
+    ActionMenuItem(
+        title = "Scale FIT",
+        icon = Icons.Default.CropFree,
+        action = { onSelectScaleType(VideoScalingType.SCALE_ASPECT_FIT) },
+    ),
+    ActionMenuItem(
+        title = "Scale FILL",
+        icon = Icons.Default.Crop,
+        action = { onSelectScaleType(VideoScalingType.SCALE_ASPECT_FILL) },
+    ),
+    ActionMenuItem(
+        title = "Scale BALANCED",
+        icon = Icons.Default.Balance,
+        action = { onSelectScaleType(VideoScalingType.SCALE_ASPECT_BALANCED) },
+    ),
+)
+
 /**
  * Optionally defines the debug sub-menu of the demo app.
  */
@@ -208,6 +233,7 @@ fun debugSubmenu(
     onSwitchSfuClick: () -> Unit,
     onSfuRejoinClick: () -> Unit,
     onSfuFastReconnectClick: () -> Unit,
+    onSelectScaleType: (VideoScalingType) -> Unit,
 ) = listOf(
     SubMenuItem(
         title = "Available video codecs",
@@ -219,6 +245,13 @@ fun debugSubmenu(
         icon = Icons.Default.Audiotrack,
         action = onToggleAudioFilterClick,
     ),
+    SubMenuItem(
+        title = "Scale type",
+        icon = Icons.Default.AspectRatio,
+        items = scaleTypeMenu(
+            onSelectScaleType,
+        ),
+    ),
     SubMenuItem(
         title = "Reconnect V2",
         icon = Icons.Default.Replay,

demo-app/src/main/kotlin/io/getstream/video/android/ui/menu/SettingsMenu.kt

@@ -50,6 +50,7 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.rememberPermissionState
 import io.getstream.video.android.compose.theme.VideoTheme
+import io.getstream.video.android.compose.ui.components.video.VideoScalingType
 import io.getstream.video.android.core.Call
 import io.getstream.video.android.core.call.audio.InputAudioFilter
 import io.getstream.video.android.core.mapper.ReactionMapper
@@ -75,6 +76,7 @@ internal fun SettingsMenu(
     onShowFeedback: () -> Unit,
     onNoiseCancellation: () -> Unit,
     onShowCallStats: () -> Unit,
+    onSelectScaleType: (VideoScalingType) -> Unit,
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -237,6 +239,7 @@ internal fun SettingsMenu(
                 onSfuRejoinClick = onSfuRejoinClick,
                 onSfuFastReconnectClick = onSfuFastReconnectClick,
                 isScreenShareEnabled = isScreenSharing,
+                onSelectScaleType = onSelectScaleType,
                 loadRecordings = onLoadRecordings,
             ),
         )
@@ -298,6 +301,7 @@ private fun SettingsMenuPreview() {
                 availableDevices = emptyList(),
                 onDeviceSelected = {},
                 onShowFeedback = {},
+                onSelectScaleType = {},
                 onNoiseCancellation = {},
                 loadRecordings = { emptyList() },
             ),

demo-app/src/main/kotlin/io/getstream/video/android/ui/menu/base/DynamicMenu.kt

@@ -225,6 +225,7 @@ private fun DynamicMenuPreview() {
                 onDeviceSelected = {},
                 onShowFeedback = {},
                 onNoiseCancellation = {},
+                onSelectScaleType = {},
                 loadRecordings = { emptyList() },
             ),
         )
@@ -252,6 +253,7 @@ private fun DynamicMenuDebugOptionPreview() {
                 availableDevices = emptyList(),
                 onDeviceSelected = {},
                 onShowFeedback = {},
+                onSelectScaleType = { },
                 onNoiseCancellation = {},
                 loadRecordings = { emptyList() },
             ),
@@ -272,6 +274,7 @@ private fun DynamicMenuDebugPreview() {
                 onRestartPublisherIceClick = { },
                 onRestartSubscriberIceClick = { },
                 onToggleAudioFilterClick = { },
+                onSelectScaleType = { },
                 onSwitchSfuClick = { },
             ),
         )