-
Notifications
You must be signed in to change notification settings - Fork 493
Add two-way audio to the WebRTC camera player #4994
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
bgoncal
wants to merge
2
commits into
main
Choose a base branch
from
2wayaudio
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
147 changes: 147 additions & 0 deletions
147
Sources/App/Cameras/CameraPlayer/WebRTC/WebRTCVideoPlayerControlsView.swift
This file contains hidden or 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,147 @@ | ||
| import HADesignSystem | ||
| import SFSafeSymbols | ||
| import Shared | ||
| import SwiftUI | ||
|
|
||
| struct WebRTCVideoPlayerControlsView<Content: View>: View { | ||
| @Binding private var controlsVisible: Bool | ||
|
|
||
| private let isTalkbackSupported: Bool | ||
| private let isTalking: Bool | ||
| private let isMuted: Bool | ||
| private let onToggleTalkback: () -> Void | ||
| private let onToggleMute: () -> Void | ||
| private let content: Content | ||
|
|
||
| init( | ||
| controlsVisible: Binding<Bool>, | ||
| isTalkbackSupported: Bool, | ||
| isTalking: Bool, | ||
| isMuted: Bool, | ||
| onToggleTalkback: @escaping () -> Void, | ||
| onToggleMute: @escaping () -> Void, | ||
| @ViewBuilder content: () -> Content | ||
| ) { | ||
| self._controlsVisible = controlsVisible | ||
| self.isTalkbackSupported = isTalkbackSupported | ||
| self.isTalking = isTalking | ||
| self.isMuted = isMuted | ||
| self.onToggleTalkback = onToggleTalkback | ||
| self.onToggleMute = onToggleMute | ||
| self.content = content() | ||
| } | ||
|
|
||
| var body: some View { | ||
| content | ||
| .overlay { | ||
| if controlsVisible, isTalkbackSupported { | ||
| VStack(spacing: 0) { | ||
| Spacer(minLength: 0) | ||
| LinearGradient( | ||
| colors: [.clear, .black.opacity(0.6)], | ||
| startPoint: .top, | ||
| endPoint: .bottom | ||
| ) | ||
| .frame(height: 180) | ||
| } | ||
| .allowsHitTesting(false) | ||
| .ignoresSafeArea() | ||
| .transition(.opacity) | ||
| } | ||
| } | ||
| .toolbar { | ||
| talkbackToolbarItem | ||
| muteToolbarItem | ||
| } | ||
| } | ||
|
|
||
| @ToolbarContentBuilder | ||
| private var talkbackToolbarItem: some ToolbarContent { | ||
| ToolbarItem(placement: .bottomBar) { | ||
| if controlsVisible, isTalkbackSupported { | ||
| Button(action: onToggleTalkback) { | ||
| HStack { | ||
| if isTalking { | ||
| Text(L10n.CameraPlayer.Talkback.stop) | ||
| .font(.headline) | ||
| .padding(.trailing, DesignSystem.Spaces.one) | ||
| } | ||
| Image(systemSymbol: isTalking ? .micSlash : .micFill) | ||
| .font(DesignSystem.Font.title3) | ||
| } | ||
| .padding(.vertical, DesignSystem.Spaces.four) | ||
| .padding(.horizontal, isTalking ? DesignSystem.Spaces.one : DesignSystem.Spaces.four) | ||
| .transition(.move(edge: .trailing).combined(with: .scale)) | ||
| } | ||
| .modify({ view in | ||
| if #available(iOS 26.0, *) { | ||
| view | ||
| .buttonStyle(.glassProminent) | ||
| } else { | ||
| view | ||
| } | ||
| }) | ||
| .tint(isTalking ? Color.orange : Color.haPrimary) | ||
| .contentShape(.capsule) | ||
| .accessibilityLabel( | ||
| isTalking ? L10n.CameraPlayer.Talkback.stop : L10n.CameraPlayer.Talkback.start | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @ToolbarContentBuilder | ||
| private var muteToolbarItem: some ToolbarContent { | ||
| ToolbarItem(placement: .topBarTrailing) { | ||
| if controlsVisible { | ||
| Button(action: onToggleMute) { | ||
| Image(systemSymbol: isMuted ? .speakerSlashFill : .speakerWave3) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #if DEBUG | ||
| #Preview("Mic standby") { | ||
| NavigationStack { | ||
| WebRTCVideoPlayerControlsView( | ||
| controlsVisible: .constant(true), | ||
| isTalkbackSupported: true, | ||
| isTalking: false, | ||
| isMuted: false, | ||
| onToggleTalkback: {}, | ||
| onToggleMute: {} | ||
| ) { | ||
| Rectangle() | ||
| .fill(.black) | ||
| .overlay { | ||
| Text("Camera preview") | ||
| .foregroundStyle(.white) | ||
| } | ||
| .ignoresSafeArea() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #Preview("Mic on") { | ||
| NavigationStack { | ||
| WebRTCVideoPlayerControlsView( | ||
| controlsVisible: .constant(true), | ||
| isTalkbackSupported: true, | ||
| isTalking: true, | ||
| isMuted: false, | ||
| onToggleTalkback: {}, | ||
| onToggleMute: {} | ||
| ) { | ||
| Rectangle() | ||
| .fill(.black) | ||
| .overlay { | ||
| Text("Camera preview") | ||
| .foregroundStyle(.white) | ||
| } | ||
| .ignoresSafeArea() | ||
| } | ||
| } | ||
| } | ||
| #endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.