feat(design-v2): call scene container and top call components

packages/react-native-sdk/src/components/Call/CallContent/CallContent.tsx

@@ -1,11 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import InCallManager from 'react-native-incall-manager';
-
-import {
-  CallTopView as DefaultCallTopView,
-  CallTopViewProps,
-} from '../CallTopView';
 import {
   CallParticipantsGrid,
   CallParticipantsGridProps,
@@ -48,7 +43,7 @@ type CallContentComponentProps = ParticipantViewComponentProps &
     /**
      * Component to customize the CallTopView component.
      */
-    CallTopView?: React.ComponentType<CallTopViewProps> | null;
+    CallTopView?: React.ComponentType<any> | null;
     /**
      * Component to customize the CallControls component.
      */
@@ -71,7 +66,6 @@ export type CallContentProps = Pick<
   HangUpCallButtonProps,
   'onHangupCallHandler'
 > &
-  Pick<CallTopViewProps, 'onBackPressed'> &
   CallContentComponentProps & {
     /**
      * This switches the participant's layout between the grid and the spotlight mode.
@@ -97,10 +91,9 @@ export type CallContentProps = Pick<
   };
 
 export const CallContent = ({
-  onBackPressed,
   onHangupCallHandler,
   CallParticipantsList,
-  CallTopView = DefaultCallTopView,
+  CallTopView,
   CallControls = DefaultCallControls,
   FloatingParticipantView = DefaultFloatingParticipantView,
   ScreenShareOverlay = DefaultScreenShareOverlay,
@@ -204,16 +197,16 @@ export const CallContent = ({
         />
       )}
       <View style={[styles.container, callContent.container]}>
-        <View style={[styles.content, callContent.callParticipantsContainer]}>
+        <View style={[styles.container, callContent.callParticipantsContainer]}>
+          {!isInPiPMode && CallTopView && (
+            <CallTopView onHangupCallHandler={onHangupCallHandler} />
+          )}
           <View
             style={[styles.view, callContent.topContainer]}
             // "box-none" disallows the container view to be not take up touches
             // and allows only the top and floating view (its child views) to take up the touches
             pointerEvents="box-none"
           >
-            {!isInPiPMode && CallTopView && (
-              <CallTopView onBackPressed={onBackPressed} />
-            )}
             {showFloatingView && FloatingParticipantView && (
               <FloatingParticipantView
                 participant={

packages/react-native-sdk/src/components/Call/CallControls/CallControlsButton.tsx

@@ -18,6 +18,10 @@ interface CallControlsButtonProps {
    * The background color of the button rendered.
    */
   color?: ColorValue;
+  /**
+   * The background color of the disabled button.
+   */
+  disabledColor?: ColorValue;
   /**
    * Boolean to enable/disable the button
    */
@@ -49,6 +53,7 @@ export const CallControlsButton = (
     children,
     disabled,
     color: colorProp,
+    disabledColor: disabledColorProp,
     style: styleProp,
     size,
     testID,
@@ -68,7 +73,7 @@ export const CallControlsButton = (
     styles.container,
     {
       backgroundColor: disabled
-        ? colors.buttonPrimaryDisabled
+        ? disabledColorProp || colors.buttonPrimaryDisabled
         : colorProp || colors.buttonSecondaryDefault,
       opacity: pressed ? 0.2 : 1,
       height: size || roundButtonSizes.lg,

packages/react-native-sdk/src/components/Call/CallControls/HangupCallButton.tsx

@@ -6,6 +6,7 @@ import { ButtonTestIds } from '../../../constants/TestIds';
 import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
 import { CallingState } from '@stream-io/video-client';
 import { useTheme } from '../../../contexts/ThemeContext';
+import { IconWrapper } from '../../../icons/IconWrapper';
 
 /**
  * The props for the Hang up call button in the Call Controls.
@@ -42,7 +43,7 @@ export const HangUpCallButton = ({
   const { useCallCallingState } = useCallStateHooks();
   const callingState = useCallCallingState();
   const {
-    theme: { colors, hangupCallButton },
+    theme: { colors, hangupCallButton, variants },
   } = useTheme();
 
   const onPress = async () => {
@@ -72,15 +73,12 @@ export const HangUpCallButton = ({
       size={size}
       testID={ButtonTestIds.HANG_UP_CALL}
     >
-      <PhoneDown color={colors.base1} />
+      <IconWrapper>
+        <PhoneDown
+          color={colors.iconPrimaryDefault}
+          size={variants.iconSizes.md}
+        />
+      </IconWrapper>
     </CallControlsButton>
   );
 };
-
-// TODO: Check if this style is needed
-// This was passed to CallControlsButton as style prop
-// const styles = StyleSheet.create({
-//   button: {
-//     shadowColor: theme.light.error,
-//   },
-// });

packages/react-native-sdk/src/components/Call/CallControls/RejectCallButton.tsx

@@ -38,7 +38,7 @@ export const RejectCallButton = ({
     theme: {
       colors,
       rejectCallButton,
-      variants: { buttonSizes },
+      variants: { buttonSizes, iconSizes },
     },
   } = useTheme();
   const rejectCallHandler = async () => {
@@ -69,7 +69,7 @@ export const RejectCallButton = ({
       // svgContainerStyle={theme.icon.lg}
       style={rejectCallButton}
     >
-      <PhoneDown color={colors.base1} />
+      <PhoneDown color={colors.iconPrimaryDefault} size={iconSizes.md} />
     </CallControlsButton>
   );
 };

packages/react-native-sdk/src/components/Call/CallControls/ToggleCameraFaceButton.tsx

@@ -2,7 +2,7 @@ import { OwnCapability } from '@stream-io/video-client';
 import { Restricted, useCallStateHooks } from '@stream-io/video-react-bindings';
 import React from 'react';
 import { CallControlsButton } from './CallControlsButton';
-import { CameraSwitch } from '../../../icons';
+import { CameraSwitch, IconWrapper } from '../../../icons';
 import { useTheme } from '../../../contexts/ThemeContext';
 
 /**
@@ -28,7 +28,7 @@ export const ToggleCameraFaceButton = ({
   const isVideoEnabledInCall = callSettings?.video.enabled;
 
   const {
-    theme: { colors, toggleCameraFaceButton },
+    theme: { colors, toggleCameraFaceButton, defaults },
   } = useTheme();
   const onPress = async () => {
     if (onPressHandler) {
@@ -47,17 +47,23 @@ export const ToggleCameraFaceButton = ({
     <Restricted requiredGrants={[OwnCapability.SEND_VIDEO]}>
       <CallControlsButton
         onPress={onPress}
-        color={direction === 'back' ? colors.background4 : colors.base1}
+        color={colors.sheetPrimary}
+        disabledColor={colors.sheetPrimary}
         disabled={optimisticIsMute}
         style={toggleCameraFaceButton}
       >
-        <CameraSwitch
-          color={
-            direction === 'front' || direction === undefined
-              ? colors.base5
-              : colors.base1
-          }
-        />
+        <IconWrapper>
+          <CameraSwitch
+            size={defaults.iconSize}
+            color={
+              optimisticIsMute
+                ? colors.buttonPrimaryDisabled
+                : direction === 'front' || direction === undefined
+                  ? colors.iconPrimaryDefault
+                  : colors.buttonPrimaryDefault
+            }
+          />
+        </IconWrapper>
       </CallControlsButton>
     </Restricted>
   );

packages/react-native-sdk/src/components/Call/CallLayout/CallParticipantsGrid.tsx

@@ -100,7 +100,7 @@ export const CallParticipantsGrid = ({
       style={[
         styles.container,
         landscapeStyles,
-        { backgroundColor: colors.background2 },
+        { backgroundColor: colors.sheetPrimary },
         callParticipantsGrid.container,
       ]}
       testID={ComponentTestIds.CALL_PARTICIPANTS_GRID}
@@ -118,7 +118,5 @@ export const CallParticipantsGrid = ({
 };
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
+  container: { flex: 1 },
 });

packages/react-native-sdk/src/components/Call/CallParticipantsList/CallParticipantsList.tsx

@@ -252,9 +252,7 @@ export const CallParticipantsList = ({
 };
 
 const styles = StyleSheet.create({
-  flexed: {
-    flex: 1,
-  },
+  flexed: { flex: 1 },
   participantWrapperHorizontal: {
     // note: if marginHorizontal is changed, be sure to change the width calculation in calculateParticipantViewSize function
     marginHorizontal: 8,

packages/react-native-sdk/src/components/Call/RingingCallContent/IncomingCall.tsx

@@ -12,10 +12,6 @@ import {
   useI18n,
 } from '@stream-io/video-react-bindings';
 import { UserInfo } from './UserInfo';
-import {
-  CallTopView as DefaultCallTopView,
-  CallTopViewProps,
-} from '../CallTopView';
 import {
   IncomingCallControls as DefaultIncomingCallControls,
   IncomingCallControlsProps,
@@ -30,7 +26,7 @@ export type IncomingCallProps = IncomingCallControlsProps & {
   /**
    * Prop to customize the CallTopView component in the IncomingCall component.
    */
-  CallTopView?: React.ComponentType<CallTopViewProps> | null;
+  CallTopView?: React.ComponentType<any> | null;
   /**
    * Prop to customize the IncomingCall controls.
    */
@@ -49,7 +45,7 @@ export type IncomingCallProps = IncomingCallControlsProps & {
 export const IncomingCall = ({
   onAcceptCallHandler,
   onRejectCallHandler,
-  CallTopView = DefaultCallTopView,
+  CallTopView,
   IncomingCallControls = DefaultIncomingCallControls,
   landscape,
 }: IncomingCallProps) => {