diff --git a/Yep/ViewControllers/Base/BaseViewController.swift b/Yep/ViewControllers/Base/BaseViewController.swift index 6c3f2c28..ce256b5f 100644 --- a/Yep/ViewControllers/Base/BaseViewController.swift +++ b/Yep/ViewControllers/Base/BaseViewController.swift @@ -15,11 +15,6 @@ class BaseViewController: UIViewController { // Do any additional setup after loading the view. } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } override func viewWillAppear(animated: Bool) { super.viewWillAppear(animated) @@ -40,6 +35,8 @@ class BaseViewController: UIViewController { navigationController.navigationBar.titleTextAttributes = textAttributes navigationController.navigationBar.tintColor = nil } + + self.navigationController?.setNavigationBarHidden(false, animated: true) } /* diff --git a/Yep/ViewControllers/Contacts/ContactsViewController.swift b/Yep/ViewControllers/Contacts/ContactsViewController.swift index 9ae2564d..44e9415a 100644 --- a/Yep/ViewControllers/Contacts/ContactsViewController.swift +++ b/Yep/ViewControllers/Contacts/ContactsViewController.swift @@ -9,7 +9,7 @@ import UIKit import RealmSwift -class ContactsViewController: UIViewController { +class ContactsViewController: BaseViewController { @IBOutlet weak var contactsTableView: UITableView! @@ -21,10 +21,6 @@ class ContactsViewController: UIViewController { NSNotificationCenter.defaultCenter().removeObserver(self) } - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - self.navigationController?.setNavigationBarHidden(false, animated: true) - } override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift index 29771fbb..53835d9c 100644 --- a/Yep/ViewControllers/Conversation/ConversationViewController.swift +++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift @@ -161,12 +161,6 @@ class ConversationViewController: BaseViewController { NSNotificationCenter.defaultCenter().removeObserver(self) } - - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - self.navigationController?.setNavigationBarHidden(false, animated: true) - } - override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/Discover/DiscoverViewController.swift b/Yep/ViewControllers/Discover/DiscoverViewController.swift index fb8d035b..cbc55b1a 100644 --- a/Yep/ViewControllers/Discover/DiscoverViewController.swift +++ b/Yep/ViewControllers/Discover/DiscoverViewController.swift @@ -8,7 +8,7 @@ import UIKit -class DiscoverViewController: UIViewController { +class DiscoverViewController: BaseViewController { @IBOutlet weak var discoverTableView: UITableView! @@ -37,10 +37,6 @@ class DiscoverViewController: UIViewController { } } - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - self.navigationController?.setNavigationBarHidden(false, animated: true) - } override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/OAuth/OAuthViewController.swift b/Yep/ViewControllers/OAuth/OAuthViewController.swift index c7f71da1..1d6dc9a2 100644 --- a/Yep/ViewControllers/OAuth/OAuthViewController.swift +++ b/Yep/ViewControllers/OAuth/OAuthViewController.swift @@ -9,7 +9,7 @@ import UIKit import WebViewJavascriptBridge -class OAuthViewController: UIViewController, UIWebViewDelegate, NSURLConnectionDelegate, NSURLConnectionDataDelegate { +class OAuthViewController: BaseViewController, UIWebViewDelegate, NSURLConnectionDelegate, NSURLConnectionDataDelegate { var socialAccount: SocialAccount! var afterOAuthAction: ((socialAccount: SocialAccount) -> Void)? @@ -17,6 +17,7 @@ class OAuthViewController: UIViewController, UIWebViewDelegate, NSURLConnectionD @IBOutlet weak var webView: UIWebView! @IBOutlet weak var activityIndicator: UIActivityIndicatorView! + var bridge: WebViewJavascriptBridge! var authenticated = false diff --git a/Yep/ViewControllers/Settings/SettingsViewController.swift b/Yep/ViewControllers/Settings/SettingsViewController.swift index 0ee83a03..9c5d9807 100644 --- a/Yep/ViewControllers/Settings/SettingsViewController.swift +++ b/Yep/ViewControllers/Settings/SettingsViewController.swift @@ -8,7 +8,7 @@ import UIKit -class SettingsViewController: UIViewController { +class SettingsViewController: BaseViewController { @IBOutlet weak var settingsTableView: UITableView! @@ -39,12 +39,6 @@ class SettingsViewController: UIViewController { settingsTableView.registerNib(UINib(nibName: settingsMoreCellIdentifier, bundle: nil), forCellReuseIdentifier: settingsMoreCellIdentifier) } - - - override func viewWillAppear(animated: Bool) { - super.viewWillAppear(animated) - self.navigationController?.setNavigationBarHidden(false, animated: true) - } } diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift index 6c4fec98..646b94b8 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkDribbbleViewController.swift @@ -9,7 +9,7 @@ import UIKit import Kingfisher -class SocialWorkDribbbleViewController: UIViewController { +class SocialWorkDribbbleViewController: BaseViewController { var socialAccount: SocialAccount? var profileUser: ProfileUser? diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift index cac32632..5b7eb98f 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkGithubViewController.swift @@ -8,7 +8,7 @@ import UIKit -class SocialWorkGithubViewController: UIViewController { +class SocialWorkGithubViewController: BaseViewController { var socialAccount: SocialAccount? var profileUser: ProfileUser? diff --git a/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift b/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift index 45044305..cf365fad 100644 --- a/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift +++ b/Yep/ViewControllers/SocialWorks/SocialWorkInstagramViewController.swift @@ -8,7 +8,7 @@ import UIKit -class SocialWorkInstagramViewController: UIViewController { +class SocialWorkInstagramViewController: BaseViewController { var socialAccount: SocialAccount? var profileUser: ProfileUser?