Browse Source

bug fixed side menu overlapping

pull/1/head
gme_2 6 years ago
parent
commit
dfab6f6533
  1. 5
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  2. 11
      GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
  3. 1
      GMERemittance/SideMenu/SideMenuViewController.swift
  4. 2
      GMERemittance/Utility/AppConstants.swift

5
GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

@ -457,7 +457,7 @@ extension ExchangeRatesViewController: UITextFieldDelegate {
func textFieldDidBeginEditing(_ textField: UITextField) { func textFieldDidBeginEditing(_ textField: UITextField) {
if textField == senderTextField { if textField == senderTextField {
if Utility.getDeviceModel() == .iphone678 || Utility.getDeviceModel() == .iphone5 {
if Utility.getDeviceModel() == .iphone678 || Utility.getDeviceModel() == .iphone5 {
let transformDistance: CGFloat = -75 let transformDistance: CGFloat = -75
UIView.animate(withDuration: 0.33) { UIView.animate(withDuration: 0.33) {
self.view.transform = CGAffineTransform.init(translationX: 0, y: transformDistance) self.view.transform = CGAffineTransform.init(translationX: 0, y: transformDistance)
@ -467,9 +467,6 @@ extension ExchangeRatesViewController: UITextFieldDelegate {
} }
func textFieldDidEndEditing(_ textField: UITextField) { func textFieldDidEndEditing(_ textField: UITextField) {
if textField == senderTextField { if textField == senderTextField {
UIView.animate(withDuration: 0.22, animations: { UIView.animate(withDuration: 0.22, animations: {
self.view.transform = CGAffineTransform.identity self.view.transform = CGAffineTransform.identity

11
GMERemittance/Module/Home/User Interface/View/HomeViewController.swift

@ -39,9 +39,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
self.save(user: user) self.save(user: user)
self.showUnverifiedNotice() self.showUnverifiedNotice()
self.tableView.reloadData() self.tableView.reloadData()
let balance = user?.availableBalance ?? ""
let userInfo = [SideMenuNavigationNotifications.availableBalance : balance]
NotificationCenter.default.post(name: self.getAvailableBalanceNotificationName(), object: nil, userInfo: userInfo)
updateBalance()
} }
} }
var sections: [Sections] = [.balance, .collection] var sections: [Sections] = [.balance, .collection]
@ -62,6 +60,7 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
configureViews() configureViews()
updateBalance()
self.setActionBarIcons(showNotificationParameter: false) // set true if there is unread notification self.setActionBarIcons(showNotificationParameter: false) // set true if there is unread notification
} }
@ -99,6 +98,12 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
self.presenter?.refreshData() self.presenter?.refreshData()
} }
private func updateBalance() {
let balance = user?.availableBalance ?? ""
let userInfo = [SideMenuNavigationNotifications.availableBalance : balance]
NotificationCenter.default.post(name: self.getAvailableBalanceNotificationName(), object: nil, userInfo: userInfo)
}
private func setupNavigationNotifications() { private func setupNavigationNotifications() {
NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuAboutGme), name: self.getAboutMeNotificationName(), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuAboutGme), name: self.getAboutMeNotificationName(), object: nil)

1
GMERemittance/SideMenu/SideMenuViewController.swift

@ -55,6 +55,7 @@ class SideMenuViewController: UIViewController {
private func setup() { private func setup() {
self.view.backgroundColor = AppConstants.themeRedColor self.view.backgroundColor = AppConstants.themeRedColor
self.roundedBgView.layer.cornerRadius = 20 self.roundedBgView.layer.cornerRadius = 20
self.labelBalance.text = "0"
NotificationCenter.default.addObserver(self, selector: #selector(self.updateBalance(sender:)), name: self.getAvailableBalanceNotificationName(), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(self.updateBalance(sender:)), name: self.getAvailableBalanceNotificationName(), object: nil)
} }

2
GMERemittance/Utility/AppConstants.swift

@ -126,7 +126,7 @@ class Utility {
} }
save(value: user?.userId ?? "", forKey: UserKeys.userId) save(value: user?.userId ?? "", forKey: UserKeys.userId)
save(value: user?.nickName ?? "", forKey: UserKeys.nickName) save(value: user?.nickName ?? "", forKey: UserKeys.nickName)
save(value: user?.availableBalance ?? "", forKey: user?.availableBalance ?? "" )
save(value: user?.availableBalance ?? "", forKey: user?.availableBalance ?? "0" )
save(value: user?.rewardPoint ?? "", forKey: UserKeys.rewardPoint) save(value: user?.rewardPoint ?? "", forKey: UserKeys.rewardPoint)
save(value: user?.verified ?? false, forKey: UserKeys.verified) save(value: user?.verified ?? false, forKey: UserKeys.verified)
save(value: user?.kyc ?? "", forKey: UserKeys.kyc) save(value: user?.kyc ?? "", forKey: UserKeys.kyc)

Loading…
Cancel
Save