From c053fb28188cefaaa0dc15a8b8ca04e7b3175127 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Mon, 10 Sep 2018 14:38:45 +0900 Subject: [PATCH] navigation bar fixed --- GMERemittance/AppDelegate.swift | 9 ++++- .../Extension/UIViewControllerExtension.swift | 33 +++++++++++-------- GMERemittance/Home/HomeViewController.swift | 13 ++------ .../View/LoginViewController.swift | 7 +++- .../View/SplashScreenViewController.swift | 17 +++++++++- 5 files changed, 51 insertions(+), 28 deletions(-) diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift index 51540591..d143c3de 100644 --- a/GMERemittance/AppDelegate.swift +++ b/GMERemittance/AppDelegate.swift @@ -56,7 +56,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD let uuid = UUID().uuidString UserDefaults.standard.set(uuid, forKey: AppConstants.uuid) } - + setupNavBar() setEntryPoint() // if (UserDefaults.standard.object(forKey: "com.gmeremit.loginStatus")) != nil{ @@ -66,6 +66,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD return true } + private func setupNavBar() { + let appearance = UINavigationBar.appearance() + appearance.backIndicatorImage = #imageLiteral(resourceName: "backIconBlack") + appearance.backIndicatorTransitionMaskImage = #imageLiteral(resourceName: "backIconBlack") + appearance.tintColor = UIColor.black + } + private func setEntryPoint() { let _default = UserDefaults.standard if let loginStatus = _default.string(forKey: UserKeys.accessCode) { diff --git a/GMERemittance/Extension/UIViewControllerExtension.swift b/GMERemittance/Extension/UIViewControllerExtension.swift index 7aa7afda..f044bfaf 100644 --- a/GMERemittance/Extension/UIViewControllerExtension.swift +++ b/GMERemittance/Extension/UIViewControllerExtension.swift @@ -13,6 +13,24 @@ import MBProgressHUD // MARK: Alerts +extension UIViewController { + func setupPicturedNavBar(sideMenuAction: Selector? = nil) { + self.navigationController?.navigationBar.isTranslucent = false + if let selector = sideMenuAction { + let leftButton = UIBarButtonItem(image: UIImage(named: "ic_hamburger"), style: .plain, target: self, action: selector) + self.navigationItem.leftBarButtonItem = leftButton + self.navigationItem.leftBarButtonItem?.tintColor = UIColor.white + } + self.navigationController?.navigationBar.tintColor = .white + self.navigationController?.navigationBar.barTintColor = UIColor(hex:0xec1c24) + let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 125, height: 30)) + imageView.contentMode = .scaleAspectFit + let image = UIImage(named: "ic_gme_new") + imageView.image = image + self.navigationItem.titleView = imageView + } +} + extension UIViewController { func confirmationAlert(title: String, message: String, confirmTitle: String, style: UIAlertActionStyle = .destructive, confirmAction: @escaping () -> Void) { @@ -663,20 +681,7 @@ extension UIViewController { } func setUpAnotherLoginListener(genericviewmodel: ModelExtension) { -// genericviewmodel.anotherLogin.bind { [weak self] in - -// guard let context = self else { -// return -// } -// guard $0 != nil else { -// return -// } -// if $0! { -// context.view.endEditing(true) -// context.enableUserInteractions() -// context.logOutUser() -// } -// } + } diff --git a/GMERemittance/Home/HomeViewController.swift b/GMERemittance/Home/HomeViewController.swift index b672d591..b90d0869 100644 --- a/GMERemittance/Home/HomeViewController.swift +++ b/GMERemittance/Home/HomeViewController.swift @@ -151,17 +151,8 @@ class HomeViewController: UIViewController, TableViewCellDelegate, FBSDKSharing //--ALL NAV BAR FUNCTIONS HERE func setNavBar() { - self.navigationController?.navigationBar.isTranslucent = false - let rightButton = UIBarButtonItem(image: UIImage(named: "ic_hamburger"), style: .plain, target: self, action: #selector(showSideMenu)) - - self.navigationItem.leftBarButtonItem = rightButton - self.navigationItem.leftBarButtonItem?.tintColor = UIColor.white - self.navigationController?.navigationBar.barTintColor = UIColor(hex:0xec1c24) - let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 125, height: 30)) - imageView.contentMode = .scaleAspectFit - let image = UIImage(named: "ic_gme_new") - imageView.image = image - self.navigationItem.titleView = imageView + let selector = #selector(self.showSideMenu) + self.setupPicturedNavBar(sideMenuAction: selector) } @objc func showSideMenu() { diff --git a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift index 6afa0419..3801e24e 100644 --- a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift +++ b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift @@ -31,7 +31,12 @@ class LoginViewController: UIViewController { private func setup() { // all setup should be done here - + setupNavBar() + } + + private func setupNavBar() { + self.navigationController?.isNavigationBarHidden = false + self.setupPicturedNavBar() } } diff --git a/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift b/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift index 52b53b20..6c414ffe 100644 --- a/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift +++ b/GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift @@ -52,6 +52,17 @@ class SplashScreenViewController: UIViewController { self.setup() } + override func viewWillAppear(_ animated: Bool) { + super.viewWillDisappear(animated) + self.navigationItem.title = "" + hideNavBar() + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + self.navigationItem.title = "" + } + // MARK: IBActions @IBAction func login(_ sender: UIButton) { @@ -65,10 +76,14 @@ class SplashScreenViewController: UIViewController { // MARK: Other Functions + private func hideNavBar() { + self.navigationController?.isNavigationBarHidden = true + } + private func setup() { // all setup should be done here + hideNavBar() setUpButtons() - self.navigationController?.isNavigationBarHidden = true imageViewDotLeft.image = UIImage(named: "dotSelected") let leftSwipe = UISwipeGestureRecognizer(target: self, action: #selector(_SplashScreenViewController.handleSwipes(_:))) let rightSwipe = UISwipeGestureRecognizer(target: self, action: #selector(_SplashScreenViewController.handleSwipes(_:)))