Merge pull request #102 from mattrubin/bar-appearance

Bar appearance
mattrubin · Feb 1, 2016 · 725c37e · 725c37e
2 parents 26f62ff + 605517b
commit 725c37e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Authenticator/Source/OTPAppDelegate.swift b/Authenticator/Source/OTPAppDelegate.swift
@@ -34,16 +34,6 @@ class OTPAppDelegate: UIResponder, UIApplicationDelegate {
     let app = AppController()
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
-        UINavigationBar.appearance().barTintColor = UIColor.otpBarBackgroundColor
-        UINavigationBar.appearance().tintColor = UIColor.otpBarForegroundColor
-        UINavigationBar.appearance().titleTextAttributes = [
-            NSForegroundColorAttributeName: UIColor.otpBarForegroundColor,
-            NSFontAttributeName: UIFont(name: "HelveticaNeue-Light", size: 20)!
-        ]
-
-        UIToolbar.appearance().barTintColor = UIColor.otpBarBackgroundColor
-        UIToolbar.appearance().tintColor = UIColor.otpBarForegroundColor
-
         UIBarButtonItem.appearance().setTitleTextAttributes([NSFontAttributeName: UIFont(name: "HelveticaNeue-Light", size: 17)!], forState: UIControlState.Normal)
 
         // Restore white-on-black style

diff --git a/Authenticator/Source/RootViewController.swift b/Authenticator/Source/RootViewController.swift
@@ -26,10 +26,20 @@
 import UIKit
 
 class OpaqueNavigationController: UINavigationController {
-    override func viewWillAppear(animated: Bool) {
-        super.viewWillAppear(animated)
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
         navigationBar.translucent = false
+        navigationBar.barTintColor = UIColor.otpBarBackgroundColor
+        navigationBar.tintColor = UIColor.otpBarForegroundColor
+        navigationBar.titleTextAttributes = [
+            NSForegroundColorAttributeName: UIColor.otpBarForegroundColor,
+            NSFontAttributeName: UIFont(name: "HelveticaNeue-Light", size: 20)!
+        ]
+
         toolbar.translucent = false
+        toolbar.barTintColor = UIColor.otpBarBackgroundColor
+        toolbar.tintColor = UIColor.otpBarForegroundColor
     }
 }