Convert CallingHeader texts to toasts
This commit is contained in:
parent
f180f66e77
commit
292ef1b6f5
10 changed files with 268 additions and 270 deletions
|
@ -36,7 +36,6 @@ import { AvatarColors } from '../types/Colors';
|
|||
import type { ConversationType } from '../state/ducks/conversations';
|
||||
import {
|
||||
CallingButtonToastsContainer,
|
||||
useReconnectingToast,
|
||||
useScreenSharingStoppedToast,
|
||||
} from './CallingToastManager';
|
||||
import { DirectCallRemoteParticipant } from './DirectCallRemoteParticipant';
|
||||
|
@ -61,7 +60,8 @@ import {
|
|||
import { useValueAtFixedRate } from '../hooks/useValueAtFixedRate';
|
||||
import { isReconnecting as callingIsReconnecting } from '../util/callingIsReconnecting';
|
||||
import { usePrevious } from '../hooks/usePrevious';
|
||||
import { useCallingToasts } from './CallingToast';
|
||||
import { PersistentCallingToast, useCallingToasts } from './CallingToast';
|
||||
import { Spinner } from './Spinner';
|
||||
|
||||
export type PropsType = {
|
||||
activeCall: ActiveCallType;
|
||||
|
@ -256,7 +256,6 @@ export function CallScreen({
|
|||
};
|
||||
}, [toggleAudio, toggleVideo]);
|
||||
|
||||
useReconnectingToast({ activeCall, i18n });
|
||||
useScreenSharingStoppedToast({ activeCall, i18n });
|
||||
useViewModeChangedToast({ activeCall, i18n });
|
||||
|
||||
|
@ -273,7 +272,6 @@ export function CallScreen({
|
|||
|
||||
let isRinging: boolean;
|
||||
let hasCallStarted: boolean;
|
||||
let headerTitle: string | undefined;
|
||||
let isConnected: boolean;
|
||||
let participantCount: number;
|
||||
let remoteParticipantsElement: ReactNode;
|
||||
|
@ -307,16 +305,6 @@ export function CallScreen({
|
|||
hasCallStarted = activeCall.joinState !== GroupCallJoinState.NotJoined;
|
||||
participantCount = activeCall.remoteParticipants.length + 1;
|
||||
|
||||
if (isRinging) {
|
||||
headerTitle = undefined;
|
||||
} else if (currentPresenter) {
|
||||
headerTitle = i18n('icu:calling__presenting--person-ongoing', {
|
||||
name: currentPresenter.title,
|
||||
});
|
||||
} else if (!activeCall.remoteParticipants.length) {
|
||||
headerTitle = i18n('icu:calling__in-this-call--zero');
|
||||
}
|
||||
|
||||
isConnected =
|
||||
activeCall.connectionState === GroupCallConnectionState.Connected;
|
||||
remoteParticipantsElement = (
|
||||
|
@ -487,6 +475,29 @@ export function CallScreen({
|
|||
}}
|
||||
role="group"
|
||||
>
|
||||
{isReconnecting ? (
|
||||
<PersistentCallingToast>
|
||||
<span className="CallingToast__reconnecting">
|
||||
<Spinner svgSize="small" size="16px" />
|
||||
{i18n('icu:callReconnecting')}
|
||||
</span>
|
||||
</PersistentCallingToast>
|
||||
) : null}
|
||||
|
||||
{isLonelyInCall && !isRinging ? (
|
||||
<PersistentCallingToast>
|
||||
{i18n('icu:calling__in-this-call--zero')}
|
||||
</PersistentCallingToast>
|
||||
) : null}
|
||||
|
||||
{currentPresenter ? (
|
||||
<PersistentCallingToast>
|
||||
{i18n('icu:calling__presenting--person-ongoing', {
|
||||
name: currentPresenter.title,
|
||||
})}
|
||||
</PersistentCallingToast>
|
||||
) : null}
|
||||
|
||||
{showNeedsScreenRecordingPermissionsWarning ? (
|
||||
<NeedsScreenRecordingPermissionsModal
|
||||
toggleScreenRecordingPermissionsDialog={
|
||||
|
@ -505,7 +516,6 @@ export function CallScreen({
|
|||
i18n={i18n}
|
||||
isGroupCall={isGroupCall}
|
||||
participantCount={participantCount}
|
||||
title={headerTitle}
|
||||
togglePip={togglePip}
|
||||
toggleSettings={toggleSettings}
|
||||
/>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue