diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-12-14 17:12:59 -0600 |
---|---|---|
committer | Eric Kuck <eric@bluelinelabs.com> | 2018-12-14 17:15:22 -0600 |
commit | 7a24f18eb753180800f9b44a767b0d59e4e702b7 (patch) | |
tree | 0e02b3ff59a672b0b25eb7bcc195e23730abec40 /WireGuard/WireGuard/UI/iOS/MainViewController.swift | |
parent | Prettier log time format (diff) | |
download | wireguard-apple-7a24f18eb753180800f9b44a767b0d59e4e702b7.tar.xz wireguard-apple-7a24f18eb753180800f9b44a767b0d59e4e702b7.zip |
Most similar views now shared between ViewControllers
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to '')
-rw-r--r-- | WireGuard/WireGuard/UI/iOS/MainViewController.swift | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WireGuard/WireGuard/UI/iOS/MainViewController.swift b/WireGuard/WireGuard/UI/iOS/MainViewController.swift index 2fc46b2..82e6f81 100644 --- a/WireGuard/WireGuard/UI/iOS/MainViewController.swift +++ b/WireGuard/WireGuard/UI/iOS/MainViewController.swift @@ -12,20 +12,20 @@ class MainViewController: UISplitViewController { init() { let detailVC = UIViewController() - detailVC.view.backgroundColor = UIColor.white + detailVC.view.backgroundColor = .white let detailNC = UINavigationController(rootViewController: detailVC) let masterVC = TunnelsListTableViewController() let masterNC = UINavigationController(rootViewController: masterVC) - self.tunnelsListVC = masterVC + tunnelsListVC = masterVC super.init(nibName: nil, bundle: nil) - self.viewControllers = [ masterNC, detailNC ] + viewControllers = [ masterNC, detailNC ] // State restoration - self.restorationIdentifier = "MainVC" + restorationIdentifier = "MainVC" masterNC.restorationIdentifier = "MasterNC" detailNC.restorationIdentifier = "DetailNC" } @@ -35,10 +35,10 @@ class MainViewController: UISplitViewController { } override func viewDidLoad() { - self.delegate = self + delegate = self // On iPad, always show both masterVC and detailVC, even in portrait mode, like the Settings app - self.preferredDisplayMode = .allVisible + preferredDisplayMode = .allVisible // Create the tunnels manager, and when it's ready, inform tunnelsListVC TunnelsManager.create { [weak self] result in @@ -56,7 +56,7 @@ class MainViewController: UISplitViewController { tunnelsManager.activationDelegate = self self.onTunnelsManagerReady?(tunnelsManager) - self.onTunnelsManagerReady = nil + self.onTunnelsManagerReady = nil } } } |