oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/fix-video-layout'

Browse source
This commit is contained in:
Michael Kirk 2018-06-05 07:58:39 -06:00
parent 7ebad71a7d e2eb772ff6
commit a881d57dd5
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Signal/src/ViewControllers/CallViewController.swift
View file

@ -503,11 +503,16 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
// Dark blurred background.
blurView.autoPinEdgesToSuperviewEdges()
leaveCallViewButton.autoPinEdge(toSuperviewMargin: .leading)
leaveCallViewButton.autoPinEdge(toSuperviewMargin: .top)
leaveCallViewButton.autoPinEdge(toSuperviewEdge: .leading)
if #available(iOS 11, *) {
leaveCallViewButton.autoPinEdge(toSuperviewMargin: .top)
contactNameLabel.autoPinEdge(toSuperviewMargin: .top)
} else {
leaveCallViewButton.autoPin(toTopLayoutGuideOf: self, withInset: 0)
contactNameLabel.autoPin(toTopLayoutGuideOf: self, withInset: 0)
}
// MJK TODO height of contact name label should be ~same as back button
contactNameLabel.autoPinEdge(toSuperviewMargin: .top)
contactNameLabel.autoPinEdge(.leading, to: .trailing, of: leaveCallViewButton, withOffset: 8, relation: .greaterThanOrEqual)
contactNameLabel.autoHCenterInSuperview()
contactNameLabel.setContentHuggingVerticalHigh()
@ -519,7 +524,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
callStatusLabel.setCompressionResistanceHigh()
localVideoView.autoPinTrailingToSuperviewMargin(withInset: videoPreviewHMargin)
// MJK TODO, depends on whether contactNameLabel is visible
self.localVideoViewTopConstraintDefault = localVideoView.autoPinEdge(.top, to: .bottom, of: callStatusLabel, withOffset: 4)
self.localVideoViewTopConstraintHidden = localVideoView.autoPinEdge(toSuperviewMargin: .top)
let localVideoSize = ScaleFromIPhone5To7Plus(80, 100)