Browse Source

continue to verification action added

pull/1/head
gme_2 6 years ago
parent
commit
fcb04d17e6
  1. 5
      GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
  2. 11
      GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
  3. 8
      GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift
  4. 2
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

5
GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard

@ -259,7 +259,7 @@
<constraint firstAttribute="width" constant="200" id="qyA-1P-YAH"/> <constraint firstAttribute="width" constant="200" id="qyA-1P-YAH"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<state key="normal" title="Calculate">
<state key="normal" title="Continue">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</state> </state>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
@ -268,7 +268,7 @@
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="calculateExchangeRate:" destination="SBO-Ku-vj1" eventType="touchUpInside" id="YbY-3q-OcB"/>
<action selector="continueButton:" destination="SBO-Ku-vj1" eventType="touchUpInside" id="YMn-kL-DEI"/>
</connections> </connections>
</button> </button>
</subviews> </subviews>
@ -306,6 +306,7 @@
<connections> <connections>
<outlet property="backgroundViewCountryLabel1" destination="K75-46-fqN" id="duv-bS-sVa"/> <outlet property="backgroundViewCountryLabel1" destination="K75-46-fqN" id="duv-bS-sVa"/>
<outlet property="backgroundViewCountryLabel2" destination="uw9-Za-23R" id="EN1-WJ-PZj"/> <outlet property="backgroundViewCountryLabel2" destination="uw9-Za-23R" id="EN1-WJ-PZj"/>
<outlet property="continueButton" destination="mLq-cC-0T4" id="lpo-BL-i56"/>
<outlet property="countryCodeLabel" destination="MCZ-I5-c8K" id="nqr-zw-Zll"/> <outlet property="countryCodeLabel" destination="MCZ-I5-c8K" id="nqr-zw-Zll"/>
<outlet property="countryFlagImage" destination="PqL-FQ-Cs6" id="UBH-eo-vzk"/> <outlet property="countryFlagImage" destination="PqL-FQ-Cs6" id="UBH-eo-vzk"/>
<outlet property="countryListStackView" destination="u3H-in-pKR" id="ygL-fP-YtG"/> <outlet property="countryListStackView" destination="u3H-in-pKR" id="ygL-fP-YtG"/>

11
GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@ -12,7 +12,6 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: IBOutlets // MARK: IBOutlets
@IBOutlet weak var collectionView: UICollectionView!
@IBOutlet weak var exchangeBackground1: UIView! @IBOutlet weak var exchangeBackground1: UIView!
@IBOutlet weak var exchangeBackground2: UIView! @IBOutlet weak var exchangeBackground2: UIView!
@IBOutlet weak var dropDownImageView: UIImageView! @IBOutlet weak var dropDownImageView: UIImageView!
@ -22,14 +21,14 @@ class SendMoneyExchangeRateViewController: UIViewController {
@IBOutlet weak var countryCodeLabel: UILabel! @IBOutlet weak var countryCodeLabel: UILabel!
@IBOutlet weak var countryFlagImage: UIImageView! @IBOutlet weak var countryFlagImage: UIImageView!
@IBOutlet weak var paymentModeStackViewConstraint: NSLayoutConstraint!
@IBOutlet weak var continueButton: UIButton!
@IBOutlet weak var paymentModeStackView: UIStackView! @IBOutlet weak var paymentModeStackView: UIStackView!
@IBOutlet weak var senderTextField: UITextField! @IBOutlet weak var senderTextField: UITextField!
@IBOutlet weak var reciepientTextField: UITextField! @IBOutlet weak var reciepientTextField: UITextField!
@IBOutlet weak var transferFeeInfoLabel: UILabel! @IBOutlet weak var transferFeeInfoLabel: UILabel!
@IBOutlet weak var exchangeRateInfoLabel: UILabel!
var countryListTapGuesture: UITapGestureRecognizer? var countryListTapGuesture: UITapGestureRecognizer?
// MARK: Properties // MARK: Properties
@ -37,7 +36,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
var presenter: SendMoneyExchangeRateModuleInterface? var presenter: SendMoneyExchangeRateModuleInterface?
var reciepient: Recipient? var reciepient: Recipient?
var hudDelegate: HUDStatusDelegate? var hudDelegate: HUDStatusDelegate?
var actionDelegate: SendMoneyPaymentModeActionDelegate?
var actionDelegate: SendMoneyExchangeRateActionDelegate?
// MARK: VC's Life cycle // MARK: VC's Life cycle
@ -49,6 +48,10 @@ class SendMoneyExchangeRateViewController: UIViewController {
// MARK: IBActions // MARK: IBActions
@IBAction func continueButton(_ sender: UIButton) {
self.actionDelegate?.continueToVerificationAction()
}
// MARK: Other Functions // MARK: Other Functions
private func setup() { private func setup() {

8
GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift

@ -14,11 +14,11 @@ protocol HUDStatusDelegate {
} }
protocol SendMoneyPaymentModeActionDelegate { protocol SendMoneyPaymentModeActionDelegate {
func continueAction()
func continueToExchangeAction()
} }
protocol SendMoneyExchangeRateActionDelegate { protocol SendMoneyExchangeRateActionDelegate {
func continueAction()
func continueToVerificationAction()
} }
@ -172,13 +172,13 @@ extension SendMoneyParentViewController: HUDStatusDelegate {
} }
extension SendMoneyParentViewController: SendMoneyPaymentModeActionDelegate { extension SendMoneyParentViewController: SendMoneyPaymentModeActionDelegate {
func continueAction() {
func continueToExchangeAction() {
self.addExchangeViewController() self.addExchangeViewController()
} }
} }
extension SendMoneyParentViewController: SendMoneyExchangeRateActionDelegate { extension SendMoneyParentViewController: SendMoneyExchangeRateActionDelegate {
func continueAction() {
func continueToVerificationAction() {
self.addVerificationViewController() self.addVerificationViewController()
} }
} }

2
GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

@ -52,7 +52,7 @@ class SendMoneyPaymentModeViewController: UIViewController {
// MARK: IBActions // MARK: IBActions
@IBAction func _continue(_ sender: UIButton) { @IBAction func _continue(_ sender: UIButton) {
self.actionDelegate?.continueAction()
self.actionDelegate?.continueToExchangeAction()
} }
// MARK: Other Functions // MARK: Other Functions

Loading…
Cancel
Save