Fix nav bar styling

alexcurylo · Aug 25, 2018 · 58aa8c2 · 58aa8c2
1 parent c7b7aef
commit 58aa8c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -30,7 +30,7 @@ opt_in_rules:
 #- explicit_top_level_acl
 #- explicit_type_interface
   - extension_access_modifier
-#- fallthrough
+  - fallthrough
   - fatal_error_message
   - file_header
   - file_name

diff --git a/MTP/source/interface/LoginFailVC.swift b/MTP/source/interface/LoginFailVC.swift
@@ -34,7 +34,7 @@ final class LoginFailVC: UIViewController {
         switch true {
         case R.segue.loginFailVC.dismissLoginFail(segue: segue) != nil:
             presentingViewController?.navigationController?.setNavigationBarHidden(false, animated: true)
-            fallthrough
+            log.verbose(segue.name)
         case R.segue.loginFailVC.switchForgotPassword(segue: segue) != nil:
             log.verbose(segue.name)
         default:

diff --git a/MTP/source/interface/LoginVC.swift b/MTP/source/interface/LoginVC.swift
@@ -29,7 +29,7 @@ final class LoginVC: UIViewController {
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        navigationController?.delegate = self
+        navigationController?.delegate = nil
    }
 
     override func viewDidDisappear(_ animated: Bool) {
@@ -47,7 +47,10 @@ final class LoginVC: UIViewController {
              R.segue.loginVC.presentLoginFail(segue: segue) != nil:
             navigationController?.setNavigationBarHidden(true, animated: true)
             UserDefaults.standard.email = emailTextField?.text ?? ""
-            fallthrough
+            log.verbose(segue.name)
+        case R.segue.loginVC.showMain(segue: segue) != nil:
+            style.standard.apply()
+            log.verbose(segue.name)
         case R.segue.loginVC.switchSignup(segue: segue) != nil,
              R.segue.loginVC.unwindFromLogin(segue: segue) != nil:
             log.verbose(segue.name)

diff --git a/MTP/source/interface/WelcomeVC.swift b/MTP/source/interface/WelcomeVC.swift
@@ -25,9 +25,10 @@ final class WelcomeVC: UIViewController {
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         switch true {
         case R.segue.welcomeVC.showSettings(segue: segue) != nil:
+            style.standard.apply()
             let settings = R.segue.welcomeVC.showSettings(segue: segue)
             settings?.destination.destination = .editProfile
-            fallthrough
+            log.verbose(segue.name)
         case R.segue.welcomeVC.showMain(segue: segue) != nil:
             log.verbose(segue.name)
         default: