Commit 321d15fb by Daniel Dahan

development: progression commit for CaptureController

parent baa54bba
...@@ -519,9 +519,9 @@ ...@@ -519,9 +519,9 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96717B0D1DBE6AF600DA84DB /* Capture.swift */, 96717B0D1DBE6AF600DA84DB /* Capture.swift */,
96717B0E1DBE6AF600DA84DB /* CaptureController.swift */,
96717B0F1DBE6AF600DA84DB /* CapturePreview.swift */, 96717B0F1DBE6AF600DA84DB /* CapturePreview.swift */,
96717B101DBE6AF600DA84DB /* CaptureSession.swift */, 96717B101DBE6AF600DA84DB /* CaptureSession.swift */,
96717B0E1DBE6AF600DA84DB /* CaptureController.swift */,
); );
path = Capture; path = Capture;
sourceTree = "<group>"; sourceTree = "<group>";
......
...@@ -59,6 +59,7 @@ open class StatusBarController: RootController { ...@@ -59,6 +59,7 @@ open class StatusBarController: RootController {
*/ */
open override func layoutSubviews() { open override func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
statusBar.width = view.width
statusBar.zPosition = Device.isLandscape && .phone == Device.userInterfaceIdiom ? 0 : 3000 statusBar.zPosition = Device.isLandscape && .phone == Device.userInterfaceIdiom ? 0 : 3000
rootViewController.view.frame = view.bounds rootViewController.view.frame = view.bounds
} }
...@@ -78,6 +79,7 @@ open class StatusBarController: RootController { ...@@ -78,6 +79,7 @@ open class StatusBarController: RootController {
/// Prepares the statusBar. /// Prepares the statusBar.
private func prepareStatusBar() { private func prepareStatusBar() {
statusBar.backgroundColor = .white statusBar.backgroundColor = .white
view.layout(statusBar).top().horizontally().height(20) statusBar.height = 20
view.addSubview(statusBar)
} }
} }
...@@ -173,7 +173,7 @@ open class ToolbarController: StatusBarController { ...@@ -173,7 +173,7 @@ open class ToolbarController: StatusBarController {
super.layoutSubviews() super.layoutSubviews()
statusBar.layoutIfNeeded() statusBar.layoutIfNeeded()
let y = 0 == statusBar.zPosition ? 0 : statusBar.height let y = 0 == statusBar.zPosition || statusBar.isHidden ? 0 : statusBar.height
let p = y + toolbar.height let p = y + toolbar.height
toolbar.y = y toolbar.y = y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment