mirror of https://github.com/oxen-io/session-ios
add preview before staring video
parent
7b23b8f601
commit
1231b9c20a
@ -0,0 +1,123 @@
|
|||||||
|
import UIKit
|
||||||
|
import WebRTC
|
||||||
|
|
||||||
|
public protocol VideoPreviewDelegate : AnyObject {
|
||||||
|
func cameraDidConfirmTurningOn()
|
||||||
|
}
|
||||||
|
|
||||||
|
class VideoPreviewVC: UIViewController, CameraManagerDelegate {
|
||||||
|
weak var delegate: VideoPreviewDelegate?
|
||||||
|
|
||||||
|
lazy var cameraManager: CameraManager = {
|
||||||
|
let result = CameraManager()
|
||||||
|
result.delegate = self
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
// MARK: UI Components
|
||||||
|
private lazy var renderView: RenderView = {
|
||||||
|
let result = RenderView()
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
private lazy var fadeView: UIView = {
|
||||||
|
let result = UIView()
|
||||||
|
let height: CGFloat = 64
|
||||||
|
var frame = UIScreen.main.bounds
|
||||||
|
frame.size.height = height
|
||||||
|
let layer = CAGradientLayer()
|
||||||
|
layer.frame = frame
|
||||||
|
layer.colors = [ UIColor(hex: 0x000000).withAlphaComponent(0.4).cgColor, UIColor(hex: 0x000000).withAlphaComponent(0).cgColor ]
|
||||||
|
result.layer.insertSublayer(layer, at: 0)
|
||||||
|
result.set(.height, to: height)
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
private lazy var closeButton: UIButton = {
|
||||||
|
let result = UIButton(type: .custom)
|
||||||
|
let image = UIImage(named: "X")!.withTint(.white)
|
||||||
|
result.setImage(image, for: UIControl.State.normal)
|
||||||
|
result.set(.width, to: 60)
|
||||||
|
result.set(.height, to: 60)
|
||||||
|
result.addTarget(self, action: #selector(cancel), for: UIControl.Event.touchUpInside)
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
private lazy var confirmButton: UIButton = {
|
||||||
|
let result = UIButton(type: .custom)
|
||||||
|
let image = UIImage(named: "Check")!.withTint(.white)
|
||||||
|
result.setImage(image, for: UIControl.State.normal)
|
||||||
|
result.set(.width, to: 60)
|
||||||
|
result.set(.height, to: 60)
|
||||||
|
result.addTarget(self, action: #selector(confirm), for: UIControl.Event.touchUpInside)
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
private lazy var titleLabel: UILabel = {
|
||||||
|
let result = UILabel()
|
||||||
|
result.text = "Preview"
|
||||||
|
result.textColor = .white
|
||||||
|
result.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
|
||||||
|
result.textAlignment = .center
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
// MARK: Lifecycle
|
||||||
|
override func viewDidLoad() {
|
||||||
|
super.viewDidLoad()
|
||||||
|
view.backgroundColor = .black
|
||||||
|
setUpViewHierarchy()
|
||||||
|
cameraManager.prepare()
|
||||||
|
}
|
||||||
|
|
||||||
|
func setUpViewHierarchy() {
|
||||||
|
// Preview video view
|
||||||
|
view.addSubview(renderView)
|
||||||
|
renderView.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
renderView.pin(to: view)
|
||||||
|
// Fade view
|
||||||
|
view.addSubview(fadeView)
|
||||||
|
fadeView.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
fadeView.pin([ UIView.HorizontalEdge.left, UIView.VerticalEdge.top, UIView.HorizontalEdge.right ], to: view)
|
||||||
|
// Close button
|
||||||
|
view.addSubview(closeButton)
|
||||||
|
closeButton.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
closeButton.pin(.left, to: .left, of: view)
|
||||||
|
closeButton.center(.vertical, in: fadeView)
|
||||||
|
// Confirm button
|
||||||
|
view.addSubview(confirmButton)
|
||||||
|
confirmButton.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
confirmButton.pin(.right, to: .right, of: view)
|
||||||
|
confirmButton.center(.vertical, in: fadeView)
|
||||||
|
// Title label
|
||||||
|
view.addSubview(titleLabel)
|
||||||
|
titleLabel.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
titleLabel.center(.vertical, in: closeButton)
|
||||||
|
titleLabel.center(.horizontal, in: view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func viewDidAppear(_ animated: Bool) {
|
||||||
|
super.viewDidAppear(animated)
|
||||||
|
cameraManager.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
override func viewWillDisappear(_ animated: Bool) {
|
||||||
|
super.viewWillDisappear(animated)
|
||||||
|
cameraManager.stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Interaction
|
||||||
|
@objc func confirm() {
|
||||||
|
delegate?.cameraDidConfirmTurningOn()
|
||||||
|
self.dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
@objc func cancel() {
|
||||||
|
self.dismiss(animated: true, completion: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: CameraManagerDelegate
|
||||||
|
func handleVideoOutputCaptured(sampleBuffer: CMSampleBuffer) {
|
||||||
|
renderView.enqueue(sampleBuffer: sampleBuffer)
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
// Copyright © 2021 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import UIKit
|
||||||
|
import CoreMedia
|
||||||
|
|
||||||
|
class RenderView: UIView {
|
||||||
|
|
||||||
|
private lazy var displayLayer: AVSampleBufferDisplayLayer = {
|
||||||
|
let result = AVSampleBufferDisplayLayer()
|
||||||
|
result.videoGravity = .resizeAspectFill
|
||||||
|
return result
|
||||||
|
}()
|
||||||
|
|
||||||
|
init() {
|
||||||
|
super.init(frame: CGRect.zero)
|
||||||
|
self.layer.addSublayer(displayLayer)
|
||||||
|
}
|
||||||
|
|
||||||
|
override init(frame: CGRect) {
|
||||||
|
preconditionFailure("Use init(message:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
required init?(coder: NSCoder) {
|
||||||
|
preconditionFailure("Use init(coder:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
override func layoutSubviews() {
|
||||||
|
super.layoutSubviews()
|
||||||
|
displayLayer.frame = self.bounds
|
||||||
|
}
|
||||||
|
|
||||||
|
public func enqueue(sampleBuffer: CMSampleBuffer) {
|
||||||
|
displayLayer.enqueue(sampleBuffer)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,65 @@
|
|||||||
|
|
||||||
|
final class CallModal : Modal {
|
||||||
|
private let onCallEnabled: () -> Void
|
||||||
|
|
||||||
|
// MARK: Lifecycle
|
||||||
|
init(onCallEnabled: @escaping () -> Void) {
|
||||||
|
self.onCallEnabled = onCallEnabled
|
||||||
|
super.init(nibName: nil, bundle: nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
required init?(coder: NSCoder) {
|
||||||
|
preconditionFailure("Use init(onCallEnabled:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
override init(nibName: String?, bundle: Bundle?) {
|
||||||
|
preconditionFailure("Use init(onCallEnabled:) instead.")
|
||||||
|
}
|
||||||
|
|
||||||
|
override func populateContentView() {
|
||||||
|
// Title
|
||||||
|
let titleLabel = UILabel()
|
||||||
|
titleLabel.textColor = Colors.text
|
||||||
|
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
|
||||||
|
titleLabel.text = NSLocalizedString("modal_call_title", comment: "")
|
||||||
|
titleLabel.textAlignment = .center
|
||||||
|
// Message
|
||||||
|
let messageLabel = UILabel()
|
||||||
|
messageLabel.textColor = Colors.text
|
||||||
|
messageLabel.font = .systemFont(ofSize: Values.smallFontSize)
|
||||||
|
let message = NSLocalizedString("modal_call_explanation", comment: "")
|
||||||
|
messageLabel.text = message
|
||||||
|
messageLabel.numberOfLines = 0
|
||||||
|
messageLabel.lineBreakMode = .byWordWrapping
|
||||||
|
messageLabel.textAlignment = .center
|
||||||
|
// Enable button
|
||||||
|
let enableButton = UIButton()
|
||||||
|
enableButton.set(.height, to: Values.mediumButtonHeight)
|
||||||
|
enableButton.layer.cornerRadius = Modal.buttonCornerRadius
|
||||||
|
enableButton.backgroundColor = Colors.buttonBackground
|
||||||
|
enableButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize)
|
||||||
|
enableButton.setTitleColor(Colors.text, for: UIControl.State.normal)
|
||||||
|
enableButton.setTitle(NSLocalizedString("modal_link_previews_button_title", comment: ""), for: UIControl.State.normal)
|
||||||
|
enableButton.addTarget(self, action: #selector(enable), for: UIControl.Event.touchUpInside)
|
||||||
|
// Button stack view
|
||||||
|
let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, enableButton ])
|
||||||
|
buttonStackView.axis = .horizontal
|
||||||
|
buttonStackView.spacing = Values.mediumSpacing
|
||||||
|
buttonStackView.distribution = .fillEqually
|
||||||
|
// Main stack view
|
||||||
|
let mainStackView = UIStackView(arrangedSubviews: [ titleLabel, messageLabel, buttonStackView ])
|
||||||
|
mainStackView.axis = .vertical
|
||||||
|
mainStackView.spacing = Values.largeSpacing
|
||||||
|
contentView.addSubview(mainStackView)
|
||||||
|
mainStackView.pin(.leading, to: .leading, of: contentView, withInset: Values.largeSpacing)
|
||||||
|
mainStackView.pin(.top, to: .top, of: contentView, withInset: Values.largeSpacing)
|
||||||
|
contentView.pin(.trailing, to: .trailing, of: mainStackView, withInset: Values.largeSpacing)
|
||||||
|
contentView.pin(.bottom, to: .bottom, of: mainStackView, withInset: Values.largeSpacing)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: Interaction
|
||||||
|
@objc private func enable() {
|
||||||
|
presentingViewController?.dismiss(animated: true, completion: nil)
|
||||||
|
onCallEnabled()
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "check.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
Binary file not shown.
Loading…
Reference in New Issue