valign capture, switch, and done buttons

Purelayout doesn't support UILayoutGuide =(
pull/2/head
Michael Kirk 7 years ago
parent 27cad276c4
commit 458564262f

@ -88,7 +88,7 @@ class PhotoCaptureViewController: OWSViewController {
return true return true
} }
// MARK - // MARK: -
var isRecordingMovie: Bool = false var isRecordingMovie: Bool = false
let recordingTimerView = RecordingTimerView() let recordingTimerView = RecordingTimerView()
@ -325,8 +325,7 @@ class PhotoCaptureViewController: OWSViewController {
view.addSubview(captureButton) view.addSubview(captureButton)
captureButton.autoHCenterInSuperview() captureButton.autoHCenterInSuperview()
captureButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: SendMediaNavigationController.bottomButtonsCenterOffset).isActive = true
captureButton.autoPinEdge(toSuperviewMargin: .bottom, withInset: 10)
} }
private func showFailureUI(error: Error) { private func showFailureUI(error: Error) {
@ -425,7 +424,7 @@ class CaptureButton: UIView {
weak var delegate: CaptureButtonDelegate? weak var delegate: CaptureButtonDelegate?
let defaultDiameter: CGFloat = ScaleFromIPhone5To7Plus(60, 80) let defaultDiameter: CGFloat = ScaleFromIPhone5To7Plus(60, 80)
let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(90, 120) let recordingDiameter: CGFloat = ScaleFromIPhone5To7Plus(68, 120)
var innerButtonSizeConstraints: [NSLayoutConstraint]! var innerButtonSizeConstraints: [NSLayoutConstraint]!
var zoomIndicatorSizeConstraints: [NSLayoutConstraint]! var zoomIndicatorSizeConstraints: [NSLayoutConstraint]!

@ -18,6 +18,10 @@ protocol SendMediaNavDelegate: AnyObject {
@objc @objc
class SendMediaNavigationController: OWSNavigationController { class SendMediaNavigationController: OWSNavigationController {
// This is a sensitive constant, if you change it make sure to check
// on iPhone5, 6, 6+, X, layouts.
static let bottomButtonsCenterOffset: CGFloat = -50
// MARK: - Overrides // MARK: - Overrides
override var prefersStatusBarHidden: Bool { return true } override var prefersStatusBarHidden: Bool { return true }
@ -27,24 +31,26 @@ class SendMediaNavigationController: OWSNavigationController {
self.delegate = self self.delegate = self
let bottomButtonsCenterOffset = SendMediaNavigationController.bottomButtonsCenterOffset
view.addSubview(batchModeButton) view.addSubview(batchModeButton)
batchModeButton.setCompressionResistanceHigh() batchModeButton.setCompressionResistanceHigh()
batchModeButton.autoPinEdge(toSuperviewMargin: .bottom) batchModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true
batchModeButton.autoPinEdge(toSuperviewMargin: .trailing) batchModeButton.autoPinEdge(toSuperviewMargin: .trailing)
view.addSubview(doneButton) view.addSubview(doneButton)
doneButton.setCompressionResistanceHigh() doneButton.setCompressionResistanceHigh()
doneButton.autoPinEdge(toSuperviewMargin: .bottom) doneButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true
doneButton.autoPinEdge(toSuperviewMargin: .trailing) doneButton.autoPinEdge(toSuperviewMargin: .trailing)
view.addSubview(cameraModeButton) view.addSubview(cameraModeButton)
cameraModeButton.setCompressionResistanceHigh() cameraModeButton.setCompressionResistanceHigh()
cameraModeButton.autoPinEdge(toSuperviewMargin: .bottom) cameraModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true
cameraModeButton.autoPinEdge(toSuperviewMargin: .leading) cameraModeButton.autoPinEdge(toSuperviewMargin: .leading)
view.addSubview(mediaLibraryModeButton) view.addSubview(mediaLibraryModeButton)
mediaLibraryModeButton.setCompressionResistanceHigh() mediaLibraryModeButton.setCompressionResistanceHigh()
mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .bottom) mediaLibraryModeButton.centerYAnchor.constraint(equalTo: view.layoutMarginsGuide.bottomAnchor, constant: bottomButtonsCenterOffset).isActive = true
mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .leading) mediaLibraryModeButton.autoPinEdge(toSuperviewMargin: .leading)
} }
@ -439,7 +445,7 @@ private struct AttachmentDraftCollection {
return AttachmentDraftCollection(attachmentDrafts: []) return AttachmentDraftCollection(attachmentDrafts: [])
} }
// MARK - // MARK: -
var count: Int { var count: Int {
return attachmentDrafts.count return attachmentDrafts.count

Loading…
Cancel
Save