Opaque navigation bar background for iPad

icodetolive · Jan 3, 2016 · 3a63403 · 3a63403
1 parent 595cc5a
commit 3a63403
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Client/Post List/NewsViewController.swift b/Client/Post List/NewsViewController.swift
@@ -27,7 +27,7 @@ class NewsViewController : UITableViewController, UISplitViewControllerDelegate,
 
         splitViewController!.delegate = self
 
-        Theme.setNavigationBarBackgroundGradient(navigationController!.navigationBar)
+        Theme.setNavigationBarBackground(navigationController!.navigationBar)
         loadPosts()
     }
 

diff --git a/Client/Post/CommentsViewController.swift b/Client/Post/CommentsViewController.swift
@@ -26,6 +26,7 @@ class CommentsViewController : UIViewController, UITableViewDelegate, UITableVie
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        Theme.setNavigationBarBackground(navigationController!.navigationBar)
         setupPostTitleView()
         tableView.estimatedRowHeight = 44.0
         tableView.rowHeight = UITableViewAutomaticDimension

diff --git a/Client/Theme.swift b/Client/Theme.swift
@@ -14,7 +14,7 @@ class Theme {
     static let orangeColour = UIColor(colorLiteralRed: 223/255.0, green: 111/255.0, blue: 4/255.0, alpha: 1)
     static let backgroundGreyColour = UIColor(red:0.937, green:0.937, blue:0.956, alpha:1)
 
-    static func setNavigationBarBackgroundGradient(navigationBar: UINavigationBar) {
+    static private func setNavigationBarBackgroundGradient(navigationBar: UINavigationBar) {
         var frame = navigationBar.frame
         frame.size.height += 20 // include status bar
 
@@ -32,4 +32,12 @@ class Theme {
 
         navigationBar.setBackgroundImage(image, forBarMetrics: UIBarMetrics.Default)
     }
+
+    static func setNavigationBarBackground(navigationBar: UINavigationBar) {
+        if UIDevice.currentDevice().userInterfaceIdiom == .Phone {
+            setNavigationBarBackgroundGradient(navigationBar)
+        } else {
+            navigationBar.barTintColor = purpleColour
+        }
+    }
 }