diff --git a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard
index a82dbc10..e21b8223 100644
--- a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard
+++ b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard
@@ -9,6 +9,11 @@
+
+
+ SanFranciscoDisplay-Regular
+
+
@@ -26,10 +31,10 @@
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
@@ -125,8 +154,11 @@
+
+
+
diff --git a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift
index b4fc3526..e10b13be 100644
--- a/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift
+++ b/GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift
@@ -26,13 +26,6 @@ protocol SendMoneyExchangeRateActionDelegate {
func calculated(model: SendMoneyExchangeRateModel?)
}
-
-//public string deliveryMethodId { get; set; }
-//public string pBranch { get; set; } id
-//public string PAgent { get; set; } id
-
-
-
class SendMoneyRequestModel {
var paymemtMode: SendMoneyPayoutMode?
var bank: SendMoneyBank?
@@ -54,6 +47,7 @@ class SendMoneyParentViewController: UIViewController {
struct Constants {
static let stateRedColor = UIColor.init(hex: "#EC1C24")
static let stateGreenColor = UIColor.init(hex: "8CC241")
+ static let stateLabelGreyColor = UIColor.init(hex: "4a4a4a")
}
// MARK: IBOutlets
@@ -62,6 +56,11 @@ class SendMoneyParentViewController: UIViewController {
@IBOutlet weak var paymentModeButton: UIButton!
@IBOutlet weak var exchangeRateButton: UIButton!
@IBOutlet weak var verificationButton: UIButton!
+ @IBOutlet weak var paymentModeLabel: UILabel!
+ @IBOutlet weak var exchangeRateLabel: UILabel!
+ @IBOutlet weak var verificationLabel: UILabel!
+
+
// MARK: Properties
var paymentModeViewController: UIViewController?
@@ -171,23 +170,44 @@ class SendMoneyParentViewController: UIViewController {
func updateState(state: StateButtons) {
switch state {
case .paymentMode:
+ // buttons
self.paymentModeButton.backgroundColor = Constants.stateGreenColor
self.exchangeRateButton.backgroundColor = Constants.stateRedColor
self.verificationButton.backgroundColor = Constants.stateRedColor
+
self.exchangeRateButton.isUserInteractionEnabled = false
self.verificationButton.isUserInteractionEnabled = false
+ // labels
+ self.paymentModeLabel.textColor = Constants.stateGreenColor
+ self.exchangeRateLabel.textColor = Constants.stateLabelGreyColor
+ self.verificationLabel.textColor = Constants.stateLabelGreyColor
+
case .exchange:
+ // buttons
self.paymentModeButton.backgroundColor = Constants.stateGreenColor
self.exchangeRateButton.backgroundColor = Constants.stateGreenColor
self.verificationButton.backgroundColor = Constants.stateRedColor
self.exchangeRateButton.isUserInteractionEnabled = true
self.verificationButton.isUserInteractionEnabled = false
+
+ // labels
+ self.paymentModeLabel.textColor = Constants.stateLabelGreyColor
+ self.exchangeRateLabel.textColor = Constants.stateGreenColor
+ self.verificationLabel.textColor = Constants.stateLabelGreyColor
+
case .verification:
+
+ // button
self.paymentModeButton.backgroundColor = Constants.stateGreenColor
self.exchangeRateButton.backgroundColor = Constants.stateGreenColor
self.verificationButton.backgroundColor = Constants.stateGreenColor
self.exchangeRateButton.isUserInteractionEnabled = true
+
+ // labels
+ self.paymentModeLabel.textColor = Constants.stateLabelGreyColor
+ self.exchangeRateLabel.textColor = Constants.stateLabelGreyColor
+ self.verificationLabel.textColor = Constants.stateGreenColor
}
}