From 8a1da4ea1033e6e8eff3bf1df0cb4f37622aee4b Mon Sep 17 00:00:00 2001 From: kevinzhow Date: Thu, 8 Oct 2015 03:11:47 +0800 Subject: [PATCH] Better navigation bar logic --- Yep/Info.plist | 4 +-- .../EditSkills/EditSkillsViewController.swift | 2 +- .../Profile/ProfileViewController.swift | 2 +- .../Settings/SettingsViewController.swift | 2 +- .../SkillHome/SkillHomeViewController.swift | 30 +------------------ .../SocialWorkDribbbleViewController.swift | 2 +- .../SocialWorkGithubViewController.swift | 2 +- .../SocialWorkInstagramViewController.swift | 2 +- 8 files changed, 9 insertions(+), 37 deletions(-) diff --git a/Yep/Info.plist b/Yep/Info.plist index c9b60d69..2f25ed3c 100644 --- a/Yep/Info.plist +++ b/Yep/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 1.1 CFBundleSignature ???? CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 102 + 103 Fabric APIKey diff --git a/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift b/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift index 6f40c1ff..a4f97de7 100644 --- a/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift +++ b/Yep/ViewControllers/EditSkills/EditSkillsViewController.swift @@ -35,7 +35,7 @@ class EditSkillsViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - animatedOnNavigationBar = false +// animatedOnNavigationBar = false title = skillSet?.name diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift index 045199b2..2301812a 100644 --- a/Yep/ViewControllers/Profile/ProfileViewController.swift +++ b/Yep/ViewControllers/Profile/ProfileViewController.swift @@ -1044,7 +1044,7 @@ class ProfileViewController: UIViewController { if segue.identifier == "showSkillHome" { - noNeedToChangeStatusBar = true + noNeedToChangeStatusBar = false } else { noNeedToChangeStatusBar = false } diff --git a/Yep/ViewControllers/Settings/SettingsViewController.swift b/Yep/ViewControllers/Settings/SettingsViewController.swift index e61c7db3..b2169d8b 100644 --- a/Yep/ViewControllers/Settings/SettingsViewController.swift +++ b/Yep/ViewControllers/Settings/SettingsViewController.swift @@ -51,7 +51,7 @@ class SettingsViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - animatedOnNavigationBar = false +// animatedOnNavigationBar = false title = NSLocalizedString("Settings", comment: "") diff --git a/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift b/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift index 133a833b..f13cfecd 100644 --- a/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift +++ b/Yep/ViewControllers/SkillHome/SkillHomeViewController.swift @@ -77,8 +77,6 @@ class SkillHomeViewController: BaseViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! - var statusBarShouldLight = true - var discoveredMasterUsers = [DiscoveredUser]() { didSet { dispatch_async(dispatch_get_main_queue()) { @@ -94,15 +92,7 @@ class SkillHomeViewController: BaseViewController { } } } - - override func viewDidAppear(animated: Bool) { - super.viewDidAppear(animated) - - statusBarShouldLight = true - - self.setNeedsStatusBarAppearanceUpdate() - } override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() @@ -122,18 +112,9 @@ class SkillHomeViewController: BaseViewController { } } - override func preferredStatusBarStyle() -> UIStatusBarStyle { - if statusBarShouldLight { - return UIStatusBarStyle.LightContent - } else { - return UIStatusBarStyle.Default - } - - } - override func viewDidLoad() { super.viewDidLoad() - + if let skillCategory = skill?.category { headerView.skillCategory = skillCategory } @@ -262,15 +243,6 @@ class SkillHomeViewController: BaseViewController { } } - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - - self.navigationController?.setNavigationBarHidden(false, animated: true) - - statusBarShouldLight = true - - self.setNeedsStatusBarAppearanceUpdate() - } // MARK: UI diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift index afeecf98..977e2466 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift @@ -42,7 +42,7 @@ class SocialWorkDribbbleViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - animatedOnNavigationBar = false +// animatedOnNavigationBar = false if let socialAccount = socialAccount { let accountImageView = UIImageView(image: UIImage(named: socialAccount.iconName)!) diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift index 2727dccf..0e9c5a7f 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift @@ -67,7 +67,7 @@ class SocialWorkGithubViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - animatedOnNavigationBar = false +// animatedOnNavigationBar = false if let socialAccount = socialAccount { let accountImageView = UIImageView(image: UIImage(named: socialAccount.iconName)!) diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift index c754bb6a..0874f24a 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift @@ -44,7 +44,7 @@ class SocialWorkInstagramViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - animatedOnNavigationBar = false +// animatedOnNavigationBar = false if let socialAccount = socialAccount { let accountImageView = UIImageView(image: UIImage(named: socialAccount.iconName)!)