diff --git a/GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist b/GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist
index 4dd94d1f..e9dc79b2 100644
--- a/GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
GMERemittance.xcscheme
orderHint
- 1
+ 0
diff --git a/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate b/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate
index 23d53009..022b2f9c 100644
Binary files a/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate and b/GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/GMERemittance/Extension/UIViewControllerExtension.swift b/GMERemittance/Extension/UIViewControllerExtension.swift
index e0f9387c..a43acde6 100644
--- a/GMERemittance/Extension/UIViewControllerExtension.swift
+++ b/GMERemittance/Extension/UIViewControllerExtension.swift
@@ -31,6 +31,13 @@ extension UIViewController {
imageView.image = image
self.navigationItem.titleView = imageView
}
+
+ func setupNormalNavigation() {
+ self.navigationController?.navigationBar.backIndicatorImage = UIImage(named: "backIconBlack")
+ self.navigationController?.navigationBar.backIndicatorTransitionMaskImage = UIImage(named: "backIconBlack")
+ self.navigationController?.navigationBar.tintColor = .black
+ self.navigationController?.navigationBar.barTintColor = .white
+ }
}
extension UIViewController {
diff --git a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
index a10639c9..f762ad0a 100644
--- a/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
+++ b/GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
@@ -68,17 +68,19 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
@IBAction func closeVerificationNotice(_ sender: UIButton) {
return
- let animator = UIViewPropertyAnimator(duration: 0.4, curve: .easeOut )
- animator.addAnimations {
- self.verificationNoticeView.alpha = 0
- }
+ if #available(iOS 10.0, *) {
+ let animator = UIViewPropertyAnimator(duration: 0.4, curve: .easeOut )
+ animator.addAnimations {
+ self.verificationNoticeView.alpha = 0
+ }
- animator.addAnimations({
- self.verificationNoticeHeightConstraint.constant = 0
- self.view.layoutIfNeeded()
- }, delayFactor: 0.5)
-
- animator.startAnimation()
+ animator.addAnimations({
+ self.verificationNoticeHeightConstraint.constant = 0
+ self.view.layoutIfNeeded()
+ }, delayFactor: 0.5)
+
+ animator.startAnimation()
+ }
}
@@ -299,7 +301,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
}
@objc private func showSendMoney() {
- if !isUserVerified() {
+ if isUserVerified() {
// remaining of previous developer. I dont have much time. Later. TODO: refracor
let viewcontroller = UIStoryboard.init(name:
"RecipientListViewController", bundle: nil).instantiateViewController(withIdentifier: "RecipientListViewController") as! RecipientListViewController
diff --git a/GMERemittance/Recipient/RecipientListViewController.swift b/GMERemittance/Recipient/RecipientListViewController.swift
index c69ef25d..9b859bbc 100644
--- a/GMERemittance/Recipient/RecipientListViewController.swift
+++ b/GMERemittance/Recipient/RecipientListViewController.swift
@@ -16,7 +16,6 @@ class RecipientListViewController: UIViewController {
var reciepients: [Recipient]? {
didSet {
if (reciepients ?? []).isEmpty {
-// self.showAddNewReciepientViewController()
}else {
self.tableView.isHidden = false
self.labelSwipeInfo.isHidden = false
@@ -27,8 +26,7 @@ class RecipientListViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
- setupNavigation()
-// self.title = "Send Money"
+ self.setupNormalNavigation()
self.navigationItem.title = "Send Money"
fetchReceipients()
}
@@ -169,13 +167,7 @@ extension RecipientListViewController: UITableViewDelegate,UITableViewDataSource
}
// private func
- private func setupNavigation() {
- self.navigationController?.navigationBar
- self.navigationController?.navigationBar.backIndicatorImage = UIImage(named: "backIconBlack")
- self.navigationController?.navigationBar.backIndicatorTransitionMaskImage = UIImage(named: "backIconBlack")
- self.navigationController?.navigationBar.tintColor = .black
- self.navigationController?.navigationBar.barTintColor = .white
- }
+
private func showAddNewReciepientViewController() {
let viewcontroller = AddReciepientWireframe().getMainView()
diff --git a/GMERemittance/SideMenu/AboutGMEViewController.swift b/GMERemittance/SideMenu/AboutGMEViewController.swift
index 1dfead74..36cc3c98 100644
--- a/GMERemittance/SideMenu/AboutGMEViewController.swift
+++ b/GMERemittance/SideMenu/AboutGMEViewController.swift
@@ -19,9 +19,12 @@ class AboutGMEViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
-
- setUpNavBar(id: 202, title: "")
-
+ }
+
+ override func viewWillAppear(_ animated: Bool) {
+ super.viewWillAppear(animated)
+ self.setupNormalNavigation()
+ self.navigationItem.title = "About Gme"
}
override func didReceiveMemoryWarning() {
diff --git a/GMERemittance/SideMenu/SettingViewController.swift b/GMERemittance/SideMenu/SettingViewController.swift
index 2ad83e0e..3b3cf4d9 100644
--- a/GMERemittance/SideMenu/SettingViewController.swift
+++ b/GMERemittance/SideMenu/SettingViewController.swift
@@ -12,12 +12,12 @@ class SettingViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
-
- setUpNavBar(id: 202, title: "")
}
override func viewWillAppear(_ animated: Bool) {
- setUpNavBar(id: 202, title: "")
+ super.viewWillAppear(animated)
+ self.setupNormalNavigation()
+ self.navigationItem.title = "Setting"
}
override func didReceiveMemoryWarning() {
diff --git a/GMERemittance/_Home/_Home.storyboard b/GMERemittance/_Home/_Home.storyboard
index 8b394275..af8f74b7 100644
--- a/GMERemittance/_Home/_Home.storyboard
+++ b/GMERemittance/_Home/_Home.storyboard
@@ -1,5 +1,5 @@
-
+
@@ -1155,10 +1155,10 @@
-
+