noTitle

chuntangwang · Jun 6, 2016 · 9bfafef · 9bfafef
1 parent e325bd1
commit 9bfafef
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/Yep/ViewControllers/Contacts/ContactsViewController.swift b/Yep/ViewControllers/Contacts/ContactsViewController.swift
@@ -95,7 +95,7 @@ final class ContactsViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        title = NSLocalizedString("Contacts", comment: "")
+        navigationItem.title = NSLocalizedString("Contacts", comment: "")
 
         NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ContactsViewController.syncFriendships(_:)), name: FriendsInContactsViewController.Notification.NewFriends, object: nil)
         NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ContactsViewController.deactiveSearchController(_:)), name: YepConfig.Notification.switchedToOthersFromContactsTab, object: nil)

diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -380,7 +380,7 @@ final class FeedsViewController: BaseViewController {
             }
         }
 
-        title = NSLocalizedString("Feeds", comment: "")
+        navigationItem.title = NSLocalizedString("Feeds", comment: "")
 
         searchBar.placeholder = NSLocalizedString("Search Feeds", comment: "")
 

diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift
@@ -341,7 +341,7 @@ final class ProfileViewController: SegueViewController {
             }
         })
 
-        title = NSLocalizedString("Profile", comment: "")
+        navigationItem.title = NSLocalizedString("Profile", comment: "")
 
         view.addSubview(customNavigationBar)
 

diff --git a/Yep/ViewControllers/TabBar/YepTabBarController.swift b/Yep/ViewControllers/TabBar/YepTabBarController.swift
@@ -97,22 +97,24 @@ final class YepTabBarController: UITabBarController {
 
     func setTabBarItems() {
 
-        // 将 UITabBarItem 的 image 下移一些，也不显示 title 了
-        /*
-        if let items = tabBar.items as? [UITabBarItem] {
-            for item in items {
-                item.imageInsets = UIEdgeInsetsMake(6, 0, -6, 0)
-                item.title = nil
+        let noTitle = true
+
+        if noTitle {
+            // 将 UITabBarItem 的 image 下移一些，也不显示 title 了
+            if let items = tabBar.items {
+                for item in items {
+                    item.imageInsets = UIEdgeInsetsMake(6, 0, -6, 0)
+                    item.title = nil
+                }
             }
-        }
-        */
 
-        // Set Titles
-
-        if let items = tabBar.items {
-            for i in 0..<items.count {
-                let item = items[i]
-                item.title = Tab(rawValue: i)?.title
+        } else {
+            // Set Titles
+            if let items = tabBar.items {
+                for i in 0..<items.count {
+                    let item = items[i]
+                    item.title = Tab(rawValue: i)?.title
+                }
             }
         }
     }