home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-11 22:06:40 +10:00
Code Issues Packages Projects Releases Wiki Activity

Better navigation bar logic

Browse Source
This commit is contained in:
kevinzhow
2015-10-08 03:11:47 +08:00
parent 8b49dcfe5d
commit 8a1da4ea10
8 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Info.plist
+2 -2
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>102</string>
<string>103</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Yep/ViewControllers/EditSkills/EditSkillsViewController.swift
+1 -1
View File
@@ -35,7 +35,7 @@ class EditSkillsViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
animatedOnNavigationBar = false
// animatedOnNavigationBar = false
title = skillSet?.name
Yep/ViewControllers/Profile/ProfileViewController.swift
+1 -1
View File
@@ -1044,7 +1044,7 @@ class ProfileViewController: UIViewController {
if segue.identifier == "showSkillHome" {
noNeedToChangeStatusBar = true
noNeedToChangeStatusBar = false
} else {
noNeedToChangeStatusBar = false
}
Yep/ViewControllers/Settings/SettingsViewController.swift
+1 -1
View File
@@ -51,7 +51,7 @@ class SettingsViewController: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
animatedOnNavigationBar = false
// animatedOnNavigationBar = false
title = NSLocalizedString("Settings", comment: "")
Yep/ViewControllers/SkillHome/SkillHomeViewController.swift
+1 -29
View File
@@ -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
Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift
+1 -1
View File
@@ -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)!)
Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift
+1 -1
View File
@@ -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)!)
Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift
+1 -1
View File
@@ -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)!)