Allow to extend Incoming and Outgoing calls separately (#1066)

GetStream · Apr 15, 2024 · e27dfba · e27dfba
1 parent 284336a
commit e27dfba
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 4 deletions.
diff --git a/stream-video-android-ui-compose/api/stream-video-android-ui-compose.api b/stream-video-android-ui-compose/api/stream-video-android-ui-compose.api
@@ -374,6 +374,8 @@ public class io/getstream/video/android/compose/ui/StreamCallActivityComposeDele
 	public fun DefaultCallContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun NoAnswerContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun NoPermissions (Lio/getstream/video/android/ui/common/StreamCallActivity;Ljava/util/List;Ljava/util/List;ZLandroidx/compose/runtime/Composer;II)V
+	public fun OnIncomingCallContent (Landroidx/compose/ui/Modifier;Lio/getstream/video/android/core/Call;ZZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V
+	public fun OnOutgoingCallContent (Landroidx/compose/ui/Modifier;Lio/getstream/video/android/core/Call;ZZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;I)V
 	public fun RejectedContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun RootContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;Landroidx/compose/runtime/Composer;I)V
 	public fun setContent (Lio/getstream/video/android/ui/common/StreamCallActivity;Lio/getstream/video/android/core/Call;)V
@@ -1584,7 +1586,7 @@ public final class io/getstream/video/android/compose/ui/components/call/ringing
 }
 
 public final class io/getstream/video/android/compose/ui/components/call/ringing/RingingCallContentKt {
-	public static final fun RingingCallContent (Lio/getstream/video/android/core/Call;Landroidx/compose/ui/Modifier;ZZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V
+	public static final fun RingingCallContent (Lio/getstream/video/android/core/Call;Landroidx/compose/ui/Modifier;ZZLkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function5;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function11;Lkotlin/jvm/functions/Function11;Landroidx/compose/runtime/Composer;III)V
 }
 
 public final class io/getstream/video/android/compose/ui/components/call/ringing/incomingcall/ComposableSingletons$IncomingCallContentKt {

diff --git a/...rc/main/kotlin/io/getstream/video/android/compose/ui/StreamCallActivityComposeDelegate.kt b/...rc/main/kotlin/io/getstream/video/android/compose/ui/StreamCallActivityComposeDelegate.kt
@@ -22,6 +22,8 @@ import android.net.Uri
 import android.provider.Settings
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Text
@@ -33,6 +35,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -46,12 +49,17 @@ import io.getstream.video.android.compose.ui.components.base.styling.StreamDialo
 import io.getstream.video.android.compose.ui.components.base.styling.StyleSize
 import io.getstream.video.android.compose.ui.components.call.activecall.CallContent
 import io.getstream.video.android.compose.ui.components.call.ringing.RingingCallContent
+import io.getstream.video.android.compose.ui.components.call.ringing.incomingcall.IncomingCallContent
+import io.getstream.video.android.compose.ui.components.call.ringing.outgoingcall.OutgoingCallContent
 import io.getstream.video.android.core.Call
+import io.getstream.video.android.core.MemberState
 import io.getstream.video.android.core.RealtimeConnection
+import io.getstream.video.android.core.call.state.CallAction
 import io.getstream.video.android.core.call.state.DeclineCall
 import io.getstream.video.android.core.call.state.LeaveCall
 import io.getstream.video.android.ui.common.StreamActivityUiDelegate
 import io.getstream.video.android.ui.common.StreamCallActivity
+import io.getstream.video.android.ui.common.util.StreamCallActivityDelicateApi
 
 /**
  * A default implementation of the compose delegate for the call activity.
@@ -87,6 +95,7 @@ public open class StreamCallActivityComposeDelegate : StreamActivityUiDelegate<S
      *
      * @param call the call object.
      */
+    @OptIn(StreamCallActivityDelicateApi::class)
     @Composable
     public open fun StreamCallActivity.RootContent(call: Call) {
         VideoTheme {
@@ -113,6 +122,59 @@ public open class StreamCallActivityComposeDelegate : StreamActivityUiDelegate<S
                         onBackPressed = {
                             onBackPressed(call)
                         },
+                        onOutgoingContent = { modifier: Modifier,
+                                              call: Call,
+                                              isVideoType: Boolean,
+                                              isShowingHeader: Boolean,
+                                              headerContent: @Composable (ColumnScope.() -> Unit)?,
+                                              detailsContent: @Composable (
+                                                  ColumnScope.(
+                                                      participants: List<MemberState>,
+                                                      topPadding: Dp,
+                                                  ) -> Unit
+                                              )?,
+                                              controlsContent: @Composable (BoxScope.() -> Unit)?,
+                                              onBackPressed: () -> Unit,
+                                              onCallAction: (CallAction) -> Unit,
+                            ->
+                            OnOutgoingCallContent(
+                                call = call,
+                                isVideoType = isVideoType,
+                                modifier = modifier,
+                                isShowingHeader = isShowingHeader,
+                                headerContent = headerContent,
+                                detailsContent = detailsContent,
+                                controlsContent = controlsContent,
+                                onBackPressed = onBackPressed,
+                                onCallAction = onCallAction,
+                            )
+                        },
+                        onIncomingContent = { modifier: Modifier,
+                                              call: Call,
+                                              isVideoType: Boolean, isShowingHeader: Boolean,
+                                              headerContent: @Composable (ColumnScope.() -> Unit)?,
+                                              detailsContent: @Composable (
+                                                  ColumnScope.(
+                                                      participants: List<MemberState>,
+                                                      topPadding: Dp,
+                                                  ) -> Unit
+                                              )?,
+                                              controlsContent: @Composable (BoxScope.() -> Unit)?,
+                                              onBackPressed: () -> Unit,
+                                              onCallAction: (CallAction) -> Unit,
+                            ->
+                            OnIncomingCallContent(
+                                call = call,
+                                isVideoType = isVideoType,
+                                modifier = modifier,
+                                isShowingHeader = isShowingHeader,
+                                headerContent = headerContent,
+                                detailsContent = detailsContent,
+                                controlsContent = controlsContent,
+                                onBackPressed = onBackPressed,
+                                onCallAction = onCallAction,
+                            )
+                        },
                         onAcceptedContent = {
                             if (isVideoCall(call)) {
                                 DefaultCallContent(call = call)
@@ -154,6 +216,66 @@ public open class StreamCallActivityComposeDelegate : StreamActivityUiDelegate<S
         }
     }
 
+    @Composable
+    public open fun OnOutgoingCallContent(
+        modifier: Modifier,
+        call: Call,
+        isVideoType: Boolean,
+        isShowingHeader: Boolean,
+        headerContent: (@Composable ColumnScope.() -> Unit)?,
+        detailsContent: (
+            @Composable ColumnScope.(
+                participants: List<MemberState>,
+                topPadding: Dp,
+            ) -> Unit
+        )?,
+        controlsContent: (@Composable BoxScope.() -> Unit)?,
+        onBackPressed: () -> Unit,
+        onCallAction: (CallAction) -> Unit,
+    ) {
+        OutgoingCallContent(
+            call = call,
+            isVideoType = isVideoType,
+            modifier = modifier,
+            isShowingHeader = isShowingHeader,
+            headerContent = headerContent,
+            detailsContent = detailsContent,
+            controlsContent = controlsContent,
+            onBackPressed = onBackPressed,
+            onCallAction = onCallAction,
+        )
+    }
+
+    @Composable
+    public open fun OnIncomingCallContent(
+        modifier: Modifier,
+        call: Call,
+        isVideoType: Boolean,
+        isShowingHeader: Boolean,
+        headerContent: (@Composable ColumnScope.() -> Unit)?,
+        detailsContent: (
+            @Composable ColumnScope.(
+                participants: List<MemberState>,
+                topPadding: Dp,
+            ) -> Unit
+        )?,
+        controlsContent: (@Composable BoxScope.() -> Unit)?,
+        onBackPressed: () -> Unit,
+        onCallAction: (CallAction) -> Unit,
+    ) {
+        IncomingCallContent(
+            call = call,
+            isVideoType = isVideoType,
+            modifier = modifier,
+            isShowingHeader = isShowingHeader,
+            headerContent = headerContent,
+            detailsContent = detailsContent,
+            controlsContent = controlsContent,
+            onBackPressed = onBackPressed,
+            onCallAction = onCallAction,
+        )
+    }
+
     /**
      * Content when the call is not answered.
      *
@@ -193,7 +315,8 @@ public open class StreamCallActivityComposeDelegate : StreamActivityUiDelegate<S
             onCallAction = {
                 onCallAction(call, it)
             },
-            durationPlaceholder = duration ?: stringResource(id = R.string.stream_audio_call_ui_calling),
+            durationPlaceholder = duration
+                ?: stringResource(id = R.string.stream_audio_call_ui_calling),
         )
     }
 

diff --git a/...otlin/io/getstream/video/android/compose/ui/components/call/ringing/RingingCallContent.kt b/...otlin/io/getstream/video/android/compose/ui/components/call/ringing/RingingCallContent.kt
@@ -74,12 +74,58 @@ public fun RingingCallContent(
     onAcceptedContent: @Composable () -> Unit,
     onRejectedContent: @Composable () -> Unit = {},
     onNoAnswerContent: @Composable () -> Unit = {},
+    onIncomingContent: (
+        @Composable (
+            modifier: Modifier,
+            call: Call,
+            isVideoType: Boolean,
+            isShowingHeader: Boolean,
+            headerContent: (@Composable ColumnScope.() -> Unit)?,
+            detailsContent: (
+                @Composable ColumnScope.(
+                    participants: List<MemberState>,
+                    topPadding: Dp,
+                ) -> Unit
+            )?,
+            controlsContent: (@Composable BoxScope.() -> Unit)?,
+            onBackPressed: () -> Unit,
+            onCallAction: (CallAction) -> Unit,
+        ) -> Unit
+    )? = null,
+    onOutgoingContent: (
+        @Composable (
+            modifier: Modifier,
+            call: Call,
+            isVideoType: Boolean,
+            isShowingHeader: Boolean,
+            headerContent: (@Composable ColumnScope.() -> Unit)?,
+            detailsContent: (
+                @Composable ColumnScope.(
+                    participants: List<MemberState>,
+                    topPadding: Dp,
+                ) -> Unit
+            )?,
+            controlsContent: (@Composable BoxScope.() -> Unit)?,
+            onBackPressed: () -> Unit,
+            onCallAction: (CallAction) -> Unit,
+        ) -> Unit
+    )? = null,
 ) {
     val ringingState by call.state.ringingState.collectAsStateWithLifecycle()
 
     when (ringingState) {
         is RingingState.Incoming -> {
-            IncomingCallContent(
+            onIncomingContent?.invoke(
+                modifier,
+                call,
+                isVideoType,
+                isShowingHeader,
+                headerContent,
+                detailsContent,
+                controlsContent,
+                onBackPressed,
+                onCallAction,
+            ) ?: IncomingCallContent(
                 call = call,
                 isVideoType = isVideoType,
                 modifier = modifier,
@@ -93,7 +139,17 @@ public fun RingingCallContent(
         }
 
         is RingingState.Outgoing -> {
-            OutgoingCallContent(
+            onOutgoingContent?.invoke(
+                modifier,
+                call,
+                isVideoType,
+                isShowingHeader,
+                headerContent,
+                detailsContent,
+                controlsContent,
+                onBackPressed,
+                onCallAction,
+            ) ?: OutgoingCallContent(
                 call = call,
                 isVideoType = isVideoType,
                 modifier = modifier,