pepepper/fluxer
1
0
Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-07 19:22:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Weblate
2026-09-24 12:04:11 +00:00
parent f67786ba0a c2c0fdb445
commit f4dd892343
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluxer_app/src/features/voice/components/VoiceCallCornerControls.tsx
+8 -1
View File
@@ -24,6 +24,7 @@ interface VoiceCallCornerControlsProps {
fullscreenLabel: string;
fullscreenIcon: Icon;
onToggleFullscreen: () => void;
volumeControl?: React.ReactNode;
}
export const VoiceCallCornerControls: React.FC<VoiceCallCornerControlsProps> = ({
@@ -36,6 +37,7 @@ export const VoiceCallCornerControls: React.FC<VoiceCallCornerControlsProps> = (
fullscreenLabel,
fullscreenIcon,
onToggleFullscreen,
volumeControl,
}) => {
const {i18n} = useLingui();
const PopOutIcon = useMemo(() => {
@@ -52,7 +54,12 @@ export const VoiceCallCornerControls: React.FC<VoiceCallCornerControlsProps> = (
}, []);
return (
<div className={wrapClassName} data-flx="voice.voice-call-corner-controls.wrap">
<CallVolumeControl className={buttonClassName} data-flx="voice.voice-call-corner-controls.call-volume-control" />
{volumeControl ?? (
<CallVolumeControl
className={buttonClassName}
data-flx="voice.voice-call-corner-controls.call-volume-control"
/>
)}
{showPopout && onPopOut && (
<ChannelHeaderIcon
icon={PopOutIcon}
fluxer_app/src/features/voice/components/VoiceCallView.tsx
+16 -14
View File
@@ -627,20 +627,6 @@ const VoiceCallViewInner = observer(
{connectionStateText}
</div>
)}
{isFocusedOnScreenShare && focusedStreamKey && hasFocusedStreamAudio && canControlFocusedStreamVolume && (
<MediaVerticalVolumeControl
volume={focusedStreamVolume / 100}
isMuted={isFocusedStreamMuted}
maxVolume={VOICE_VOLUME_MAX_SLIDER_VOLUME}
onVolumeChange={handleFocusedStreamVolumeChange}
onToggleMute={handleFocusedStreamToggleMute}
iconSize={18}
className={styles.voiceHeaderIconButton}
position="below"
ariaLabel={i18n._(STREAM_VOLUME_DESCRIPTOR)}
data-flx="voice.voice-call-view.voice-call-view-inner.hud-stream-volume-control"
/>
)}
{statsButton}
{isMobile && (
<ChannelHeaderIcon
@@ -712,6 +698,22 @@ const VoiceCallViewInner = observer(
fullscreenLabel={fullscreenButtonLabel}
fullscreenIcon={FullscreenButtonIcon}
onToggleFullscreen={handleToggleVoiceCallAppFullscreen}
volumeControl={
isFocusedOnScreenShare && focusedStreamKey && hasFocusedStreamAudio && canControlFocusedStreamVolume ? (
<MediaVerticalVolumeControl
volume={focusedStreamVolume / 100}
isMuted={isFocusedStreamMuted}
maxVolume={VOICE_VOLUME_MAX_SLIDER_VOLUME}
onVolumeChange={handleFocusedStreamVolumeChange}
onToggleMute={handleFocusedStreamToggleMute}
iconSize={18}
className={styles.voiceHeaderIconButton}
position="above"
ariaLabel={i18n._(STREAM_VOLUME_DESCRIPTOR)}
data-flx="voice.voice-call-view.voice-call-view-inner.stream-volume-control"
/>
) : undefined
}
data-flx="voice.voice-call-view.voice-call-view-inner.voice-call-corner-controls"
/>
{isMobile && (