BANKEX · vladaccess · Jan 14, 2019 · Jan 14, 2019 · Jan 14, 2019 · Jan 17, 2019
diff --git a/App/Modules/AppTimeout/AutoLockViewController.swift b/App/Modules/AppTimeout/AutoLockViewController.swift
@@ -21,7 +21,14 @@ class AutoLockViewController:BaseViewController {
     }()
 
     let cellIdentifier = "TimerCell"
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     weak var delegate:AutoLockViewControllerDelegate?
 
     override func viewDidLoad() {

diff --git a/App/Modules/CompanyProducts/ProductsViewController.swift b/App/Modules/CompanyProducts/ProductsViewController.swift
@@ -19,6 +19,14 @@ class ProductsViewController: BaseViewController {
     let viewIdentifer = "ProductDetailView"
     let heightCell:CGFloat = 70
     let inset:CGFloat = 15
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         title = "BANKEX Products"

diff --git a/App/Modules/ContactAdd/AddContactViewController.swift b/App/Modules/ContactAdd/AddContactViewController.swift
@@ -48,6 +48,14 @@ class AddContactViewController: BaseViewController,UITextFieldDelegate {
             }
         }
     }
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .blueStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     var service = ContactService()
 
     override func viewDidLoad() {
@@ -83,10 +91,6 @@ class AddContactViewController: BaseViewController,UITextFieldDelegate {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         state = .noAvailable
-        navigationController?.navigationBar.barTintColor = UIDevice.isIpad ? .white : UIColor.mainColor
-        navigationController?.navigationBar.tintColor = .white
-        UIApplication.shared.statusBarView?.backgroundColor = UIDevice.isIpad ? .clear : UIColor.mainColor
-        UIApplication.shared.statusBarStyle = UIDevice.isIpad ? .default : .lightContent
         doneButton.isHidden = UIDevice.isIpad ? true : false
         title = UIDevice.isIpad ? "New Contact" : ""
     }
@@ -96,17 +100,6 @@ class AddContactViewController: BaseViewController,UITextFieldDelegate {
         nameContactTextField.becomeFirstResponder()
     }
 
-    override func willMove(toParentViewController parent: UIViewController?) {
-        navigationController?.navigationBar.barTintColor = .white
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        //navigationController?.navigationBar.tintColor = UIColor.mainColor
-        UIApplication.shared.statusBarView?.backgroundColor = .white
-        UIApplication.shared.statusBarStyle = .default
-    }
-
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         clearInfo()

diff --git a/App/Modules/ContactDetails/ProfileContactViewController.swift b/App/Modules/ContactDetails/ProfileContactViewController.swift
@@ -60,6 +60,14 @@ class ProfileContactViewController: BaseViewController,UITextFieldDelegate,UITex
         alertVC.addAction(UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .default))
         return alertVC
     }()
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     var state:State = .loading {
         didSet {
             switch state {
@@ -169,16 +177,9 @@ class ProfileContactViewController: BaseViewController,UITextFieldDelegate,UITex
     private func manageTop(isHide:Bool = true) {
         if isHide {
             navigationController?.setNavigationBarHidden(isHide, animated: false)
-            navigationController?.navigationBar.barTintColor = UIColor.mainColor
-            navigationController?.navigationBar.tintColor = .white
-            UIApplication.shared.statusBarView?.backgroundColor = UIDevice.isIpad ? .white : UIColor.mainColor
-            UIApplication.shared.statusBarStyle = UIDevice.isIpad ? .default : .lightContent
             return
         }
         navigationController?.isNavigationBarHidden = isHide
-        navigationController?.navigationBar.barTintColor = .white
-        navigationController?.navigationBar.tintColor = UIColor.mainColor
-        UIApplication.shared.statusBarStyle = .default
     }
 
     @IBAction func seeAll() {

diff --git a/App/Modules/ContactEdit/EditViewController.swift b/App/Modules/ContactEdit/EditViewController.swift
@@ -35,6 +35,14 @@ class EditViewController: BaseViewController {
             }
         }
     }
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .blueStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     let service = ContactService()
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -58,19 +66,9 @@ class EditViewController: BaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         title = UIDevice.isIpad ? "Edit Contact" : ""
-        navigationController?.navigationBar.barTintColor = UIDevice.isIpad ? UIColor.white : UIColor.mainColor
-        navigationController?.navigationBar.tintColor = .white
-        UIApplication.shared.statusBarView?.backgroundColor = UIDevice.isIpad ? nil : UIColor.mainColor
-        UIApplication.shared.statusBarStyle = .lightContent
         updateUI()
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        UIApplication.shared.statusBarStyle = UIDevice.isIpad ? .lightContent : .default
-        navigationController?.navigationBar.barTintColor = .white
-        navigationController?.navigationBar.tintColor = UIColor.mainColor
-    }
 
     private func prepareTFs() {
         [nameTextField,addrTextField].forEach {

diff --git a/App/Modules/ContactList/ListContactsViewController.swift b/App/Modules/ContactList/ListContactsViewController.swift
@@ -37,6 +37,14 @@ class ListContactsViewController: BaseViewController,UISearchBarDelegate {
             tableView.reloadData()
         }
     }
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     @IBOutlet weak var searchBar:UISearchBar!
     @IBOutlet weak var emptyView:UIView!
 
@@ -58,9 +66,6 @@ class ListContactsViewController: BaseViewController,UISearchBarDelegate {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.setNavigationBarHidden(false, animated: false)
-        navigationController?.navigationBar.barTintColor = .white
-        navigationController?.navigationBar.tintColor = UIColor.mainColor
-        UIApplication.shared.statusBarView?.backgroundColor = .white
         if fromSendScreen {
             addLeftBtn()
             hideAddRightButton()

diff --git a/App/Modules/Home/HomeViewController.swift b/App/Modules/Home/HomeViewController.swift
@@ -43,6 +43,14 @@ class HomeViewController: BaseViewController {
             }
         }
     }
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
 
     private struct ViewModel {
 
@@ -183,7 +191,6 @@ class HomeViewController: BaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         TokenShortService.arrayTokensShort.removeAll()
-        setupStatusBarColor()
         state = isFromContact ? .fromContact : .home
         updateTableView()
     }
@@ -232,10 +239,7 @@ class HomeViewController: BaseViewController {
     @IBAction func unwindToHome(_ unwindSegue: UIStoryboardSegue) {}
 
     //Methods
-    fileprivate func setupStatusBarColor() {
-        UIApplication.shared.statusBarView?.backgroundColor = .white
-        UIApplication.shared.statusBarStyle = .default
-    }
+
 
     func catchUserActivity() {
         let appDelegate = UIApplication.shared.delegate as! AppDelegate

diff --git a/App/Modules/Menu/MenuPad.storyboard b/App/Modules/Menu/MenuPad.storyboard
@@ -13,7 +13,7 @@
         <!--Navigation Controller-->
         <scene sceneID="JmZ-3e-wvL">
             <objects>
-                <navigationController id="4hC-js-yC4" sceneMemberID="viewController">
+                <navigationController id="4hC-js-yC4" customClass="NavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="xmt-t1-43m">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>

diff --git a/App/Modules/Menu/MenuPhone.storyboard b/App/Modules/Menu/MenuPhone.storyboard
@@ -33,7 +33,7 @@
         <!--Settings-->
         <scene sceneID="DEp-oT-BDe">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="MuH-9v-MBg" customClass="BaseNavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="MuH-9v-MBg" customClass="NavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Settings" image="Setting" id="Jzc-3t-aFH">
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="accessibilityLabel" value="SettingsTab"/>
@@ -56,7 +56,7 @@
         <!--Wallet-->
         <scene sceneID="hXX-Cg-fyl">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="NSD-iW-Ldc" customClass="BaseNavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="NSD-iW-Ldc" customClass="NavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Wallet" id="6xJ-zx-tSj"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="B5k-kj-bJP">
@@ -74,7 +74,7 @@
         <!--Contacts-->
         <scene sceneID="Eg6-X9-t5b">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="WRA-cJ-AhY" customClass="BaseNavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="WRA-cJ-AhY" customClass="NavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Contacts" id="GG0-KF-d2d"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="fPu-hk-WUa">
@@ -93,7 +93,7 @@
         <!--History-->
         <scene sceneID="FfT-MI-U9F">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="pjl-Ef-vbh" customClass="BaseNavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="pjl-Ef-vbh" customClass="NavigationController" customModule="BankexWallet" customModuleProvider="target" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="History" id="Zw0-MQ-ub7"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="3l7-QJ-sQ1">

diff --git a/App/Modules/NetworkAdd/CreateNetworkViewController.swift b/App/Modules/NetworkAdd/CreateNetworkViewController.swift
@@ -23,7 +23,14 @@ class CreateNetworkViewController: UITableViewController,UITextFieldDelegate {
     @IBOutlet weak var networkIDTextField:UITextField!
     @IBOutlet var textFields:[UITextField]!
 
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     var joinButton = UIBarButtonItem(title: NSLocalizedString("Join", comment: ""), style: .done, target: self, action: #selector(joinToConnection))
     var state:State = .unavailable {
         didSet {

diff --git a/App/Modules/QRCodeGeneration/AddressQRCodeController.swift b/App/Modules/QRCodeGeneration/AddressQRCodeController.swift
@@ -27,7 +27,15 @@ class AddressQRCodeController: BaseViewController {
         clipView.backgroundColor = UIColor(hex: "B8BFC9")
         return clipView
     }()
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         setupClipboardView()

diff --git a/App/Modules/SettingsMain/SettingsViewController.swift b/App/Modules/SettingsMain/SettingsViewController.swift
@@ -25,7 +25,14 @@ class SettingsViewController: UITableViewController {
     let walletService = SingleKeyServiceImplementation()
     let networkService = NetworksServiceImplementation()
     var selectedSection:Int!
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
 
 
     override func viewDidLoad() {
@@ -38,7 +45,6 @@ class SettingsViewController: UITableViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        UIApplication.shared.statusBarView?.backgroundColor = .white
         walletService.updateSelectedWallet()
         updateUI()
     }
@@ -95,7 +101,6 @@ class SettingsViewController: UITableViewController {
 
     private func prepareNavbar() {
         navigationItem.title = NSLocalizedString("Settings", comment: "")
-        navigationController?.navigationBar.shadowImage = UIImage()
     }
 
 

diff --git a/App/Modules/SettingsNetworks/NetworksViewController.swift b/App/Modules/SettingsNetworks/NetworksViewController.swift
@@ -25,7 +25,14 @@ class NetworksViewController: BaseViewController {
     enum NetworksSections:Int,CaseIterable {
         case CurrentNetwork = 0,DefaultNetwork,CustomNetwork
     }
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     weak var delegate:NetworkDelegate?
 
     var selectedNetwork:CustomNetwork {

diff --git a/App/Modules/SettingsSecurity/SecurityViewController.swift b/App/Modules/SettingsSecurity/SecurityViewController.swift
@@ -27,7 +27,14 @@ class SecurityViewController: UITableViewController {
     enum SecuritySections:Int {
         case First = 0,Second,Third
     }
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
         setupNavbar()

diff --git a/App/Modules/TokenAddConfirmation/TokenInfoController.swift b/App/Modules/TokenAddConfirmation/TokenInfoController.swift
@@ -23,7 +23,14 @@ class TokenInfoController: BaseViewController, UITableViewDelegate, UITableViewD
     let tokensService: CustomERC20TokensService = CustomERC20TokensServiceImplementation()
     var token: ERC20TokenModel?
     let utilsService = CustomTokenUtilsServiceImplementation()
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
 
     var forAdding: Bool = false
 

diff --git a/App/Modules/TokenAddSearch/CreateTokenController.swift b/App/Modules/TokenAddSearch/CreateTokenController.swift
@@ -40,7 +40,14 @@ class CreateTokenController: BaseViewController {
         label.textAlignment = .center
         return label
     }()
-
+    override var navigationBarAppearance: NavigationBarAppearance? {
+        get {
+            return super.navigationBarAppearance ?? .whiteStyle
+        }
+        set {
+            super.navigationBarAppearance = newValue
+        }
+    }
 
 
     override func viewDidLoad() {
@@ -77,7 +84,6 @@ class CreateTokenController: BaseViewController {
 
     fileprivate func setupNavBar() {
         navigationController?.navigationBar.topItem?.title = NSLocalizedString("Wallet", comment: "")
-        navigationController?.navigationBar.shadowImage = UIImage()
     }
 
     private func showScanner() {