Browse Source

transaction history added to sidemenu

pull/1/head
gme_2 6 years ago
parent
commit
9851a7be6a
  1. 4
      GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
  2. 12
      GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
  3. 5
      GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift
  4. 2
      GMERemittance/SideMenu/SideMenu.storyboard
  5. 9
      GMERemittance/SideMenu/SideMenuViewController.swift

4
GMERemittance/Module/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift

@ -185,10 +185,10 @@ extension HomeCollectionTableViewCell: UICollectionViewDelegate {
return Notification.Name.init(rawValue: MenuNotificationName.todaysRate) return Notification.Name.init(rawValue: MenuNotificationName.todaysRate)
} }
func getTrackYourTransferNotificationName() -> Notification.Name { func getTrackYourTransferNotificationName() -> Notification.Name {
return Notification.Name.init(rawValue: MenuNotificationName.resend)
return Notification.Name.init(rawValue: MenuNotificationName.transactionStatement)
} }
func getResendNotificationName() -> Notification.Name { func getResendNotificationName() -> Notification.Name {
return Notification.Name.init(rawValue: MenuNotificationName.transactionStatement)
return Notification.Name.init(rawValue: MenuNotificationName.resend)
} }
func getWalletToWalletNotificationName() -> Notification.Name { func getWalletToWalletNotificationName() -> Notification.Name {
return Notification.Name.init(rawValue: MenuNotificationName.walletToWallet) return Notification.Name.init(rawValue: MenuNotificationName.walletToWallet)

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

@ -181,12 +181,18 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSupport), name: self.getSupportNotificationName(), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSupport), name: self.getSupportNotificationName(), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSetting), name: self.getSettingNotificationName(), object: nil) NotificationCenter.default.addObserver(self, selector: #selector(self.showSideMenuSetting), name: self.getSettingNotificationName(), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(self.showTransactionStatement), name: self.getTransactionHistoryNotificationName(), object: nil)
} }
private func getAboutMeNotificationName() -> Notification.Name { private func getAboutMeNotificationName() -> Notification.Name {
return Notification.Name.init(SideMenuNavigationNotifications.aboutGme) return Notification.Name.init(SideMenuNavigationNotifications.aboutGme)
} }
private func getTransactionHistoryNotificationName() -> Notification.Name {
return Notification.Name.init(SideMenuNavigationNotifications.transactionHistory)
}
private func getSupportNotificationName() -> Notification.Name { private func getSupportNotificationName() -> Notification.Name {
return Notification.Name.init(SideMenuNavigationNotifications.support) return Notification.Name.init(SideMenuNavigationNotifications.support)
} }
@ -306,9 +312,9 @@ class HomeViewController: UIViewController, UICollectionViewDelegateFlowLayout {
center.addObserver(self, selector: #selector(self.showSendMoney), name: self.getSendMoneyNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showSendMoney), name: self.getSendMoneyNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showMobileRecharge), name: self.getMobileRechargeNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showMobileRecharge), name: self.getMobileRechargeNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showTodaysRate), name: self.getTodaysRateNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showTodaysRate), name: self.getTodaysRateNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showTrackYourTransfer), name: self.getTrackYourTransferNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showTransactionStatement), name: self.getTransactionStatementNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getWalletToWalletNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getTrackYourTransferNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showTrackYourTransfer), name: self.getTransactionStatementNotificationName(), object: nil)
// center.addObserver(self, selector: #selector(self.showResendMoney), name: self.getWalletToWalletNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.setupHeight(sender:)), name: self.getCollectionHeightNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.setupHeight(sender:)), name: self.getCollectionHeightNotificationName(), object: nil)
center.addObserver(self, selector: #selector(self.showUnVerifiedMessage), name: self.getMainControllerNotificationName(), object: nil) center.addObserver(self, selector: #selector(self.showUnVerifiedMessage), name: self.getMainControllerNotificationName(), object: nil)

5
GMERemittance/Module/Home/User Interface/Wireframe/HomeWireframe.swift

@ -19,7 +19,7 @@ class HomeWireframe {
private lazy var pennyTestWireFrame = PennyTestWireframe() private lazy var pennyTestWireFrame = PennyTestWireframe()
private lazy var pennyTestSubmitWireFrame = PennyTestSubmitWireframe() private lazy var pennyTestSubmitWireFrame = PennyTestSubmitWireframe()
private lazy var appUpdateWireFrame = AppUpdateWireframe() private lazy var appUpdateWireFrame = AppUpdateWireframe()
private lazy var resendWireframe: ResendWireframe = ResendWireframe()
// private lazy var resendWireframe: ResendWireframe = ResendWireframe()
} }
extension HomeWireframe: HomeWireframeInput { extension HomeWireframe: HomeWireframeInput {
@ -44,8 +44,7 @@ extension HomeWireframe: HomeWireframeInput {
func openTransactionHistory() { func openTransactionHistory() {
if let navigation = self.view.navigationController { if let navigation = self.view.navigationController {
// self.transactionHistoryWireframe.pushMainView(in: navigation)
self.resendWireframe.pushMainView(in: navigation)
self.transactionHistoryWireframe.pushMainView(in: navigation)
} }
} }

2
GMERemittance/SideMenu/SideMenu.storyboard

@ -295,7 +295,7 @@
<color key="titleColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
</state> </state>
<connections> <connections>
<action selector="transactionHistory:" destination="XQF-oH-rUR" eventType="touchUpInside" id="QjJ-3J-DDB"/>
<action selector="openTransactionHistory:" destination="XQF-oH-rUR" eventType="touchUpInside" id="J2V-je-jDI"/>
</connections> </connections>
</button> </button>
</subviews> </subviews>

9
GMERemittance/SideMenu/SideMenuViewController.swift

@ -18,6 +18,7 @@ struct SideMenuNavigationNotifications {
static let availableBalance = "Available_Balance" static let availableBalance = "Available_Balance"
static let withdraw = "withdraw" static let withdraw = "withdraw"
static let KftcAccountList = "KftcAccountList" static let KftcAccountList = "KftcAccountList"
static let transactionHistory = "transaction_History_from_sidemenu"
} }
@ -136,6 +137,10 @@ class SideMenuViewController: UIViewController {
NotificationCenter.default.post(name: self.getWithdrawNotificationName(), object: nil, userInfo: nil) NotificationCenter.default.post(name: self.getWithdrawNotificationName(), object: nil, userInfo: nil)
} }
@IBAction func openTransactionHistory(_ sender: Any) {
self.sideMenuController?.hideLeftView()
NotificationCenter.default.post(name: self.getTransactionHistoryNotificationName(), object: nil, userInfo: nil)
}
@IBAction func openKftcAccountList(_ sender: UIButton) { @IBAction func openKftcAccountList(_ sender: UIButton) {
self.sideMenuController?.hideLeftView() self.sideMenuController?.hideLeftView()
@ -244,6 +249,10 @@ class SideMenuViewController: UIViewController {
return Notification.Name.init(SideMenuNavigationNotifications.withdraw) return Notification.Name.init(SideMenuNavigationNotifications.withdraw)
} }
func getTransactionHistoryNotificationName() -> Notification.Name {
return Notification.Name.init(SideMenuNavigationNotifications.transactionHistory)
}
func getKftcAccountListNotificationName() -> Notification.Name { func getKftcAccountListNotificationName() -> Notification.Name {
return Notification.Name.init(SideMenuNavigationNotifications.KftcAccountList) return Notification.Name.init(SideMenuNavigationNotifications.KftcAccountList)

Loading…
Cancel
Save