This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 830
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement small broadcast PiP (#9755)
- Loading branch information
1 parent
9f795a4
commit ab560bb
Showing
21 changed files
with
938 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
src/voice-broadcast/components/atoms/VoiceBroadcastPlaybackControl.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from "react"; | ||
|
|
||
| import { Icon as PlayIcon } from "../../../../res/img/element-icons/play.svg"; | ||
| import { Icon as PauseIcon } from "../../../../res/img/element-icons/pause.svg"; | ||
| import { _t } from "../../../languageHandler"; | ||
| import { VoiceBroadcastControl, VoiceBroadcastPlaybackState } from "../.."; | ||
|
|
||
| interface Props { | ||
| onClick: () => void; | ||
| state: VoiceBroadcastPlaybackState; | ||
| } | ||
|
|
||
| export const VoiceBroadcastPlaybackControl: React.FC<Props> = ({ onClick, state }) => { | ||
| let controlIcon: React.FC<React.SVGProps<SVGSVGElement>>; | ||
| let controlLabel: string; | ||
| let className = ""; | ||
|
|
||
| switch (state) { | ||
| case VoiceBroadcastPlaybackState.Stopped: | ||
| controlIcon = PlayIcon; | ||
| className = "mx_VoiceBroadcastControl-play"; | ||
| controlLabel = _t("play voice broadcast"); | ||
| break; | ||
| case VoiceBroadcastPlaybackState.Paused: | ||
| controlIcon = PlayIcon; | ||
| className = "mx_VoiceBroadcastControl-play"; | ||
| controlLabel = _t("resume voice broadcast"); | ||
| break; | ||
| case VoiceBroadcastPlaybackState.Buffering: | ||
| case VoiceBroadcastPlaybackState.Playing: | ||
| controlIcon = PauseIcon; | ||
| controlLabel = _t("pause voice broadcast"); | ||
| break; | ||
| } | ||
|
|
||
| return <VoiceBroadcastControl className={className} label={controlLabel} icon={controlIcon} onClick={onClick} />; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
src/voice-broadcast/components/molecules/VoiceBroadcastSmallPlaybackBody.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from "react"; | ||
|
|
||
| import { | ||
| VoiceBroadcastHeader, | ||
| VoiceBroadcastPlayback, | ||
| VoiceBroadcastPlaybackControl, | ||
| VoiceBroadcastPlaybackState, | ||
| } from "../.."; | ||
| import AccessibleButton from "../../../components/views/elements/AccessibleButton"; | ||
| import { useVoiceBroadcastPlayback } from "../../hooks/useVoiceBroadcastPlayback"; | ||
| import { Icon as XIcon } from "../../../../res/img/element-icons/cancel-rounded.svg"; | ||
|
|
||
| interface VoiceBroadcastSmallPlaybackBodyProps { | ||
| playback: VoiceBroadcastPlayback; | ||
| } | ||
|
|
||
| export const VoiceBroadcastSmallPlaybackBody: React.FC<VoiceBroadcastSmallPlaybackBodyProps> = ({ playback }) => { | ||
| const { liveness, playbackState, room, sender, toggle } = useVoiceBroadcastPlayback(playback); | ||
| return ( | ||
| <div className="mx_VoiceBroadcastBody mx_VoiceBroadcastBody--pip mx_VoiceBroadcastBody--small"> | ||
| <VoiceBroadcastHeader | ||
| linkToRoom={true} | ||
| live={liveness} | ||
| liveBadgePosition="middle" | ||
| microphoneLabel={sender?.name} | ||
| room={room} | ||
| showBuffering={playbackState === VoiceBroadcastPlaybackState.Buffering} | ||
| bufferingPosition="title" | ||
| /> | ||
| <VoiceBroadcastPlaybackControl state={playbackState} onClick={toggle} /> | ||
| <AccessibleButton onClick={() => playback.stop()}> | ||
| <XIcon className="mx_Icon mx_Icon_8 mx_VoiceBroadcastBody__small-close" /> | ||
| </AccessibleButton> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.