diff --git a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard index 6a1c282e..626076f6 100644 --- a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard +++ b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard @@ -287,10 +287,13 @@ + + + diff --git a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index b0ab4557..694d540d 100644 --- a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -30,6 +30,10 @@ class SendMoneyPaymentModeViewController: UIViewController { @IBOutlet weak var accountNumberStackView: UIStackView! @IBOutlet weak var accountTextField: UITextField! + @IBOutlet weak var bankStackViewConstraint: NSLayoutConstraint! + @IBOutlet weak var branchStackViewConstraint: NSLayoutConstraint! + @IBOutlet weak var accountNumberStackViewConstraint: NSLayoutConstraint! + @IBOutlet weak var branchTextField: UITextField! @IBOutlet weak var bankTextField: UITextField! // MARK: Properties @@ -56,14 +60,26 @@ class SendMoneyPaymentModeViewController: UIViewController { self.accountTextField.text = "" self.bankTextField.text = "" self.branchTextField.text = "" - self.bankStackView.isHidden = true - self.branchStackView.isHidden = true - self.accountNumberStackView.isHidden = true + +// self.bankStackView.isHidden = true + self.bankStackViewConstraint.constant = 0 +// self.branchStackView.isHidden = true + self.branchStackViewConstraint.constant = 0 +// self.accountNumberStackView.isHidden = true + self.accountNumberStackViewConstraint.constant = 0 + + self.bankStackView.alpha = 0 + self.branchStackView.alpha = 0 + self.accountNumberStackView.alpha = 0 + if (self.selectedPayoutMode?.bankRequired ?? "false").lowercased() == "true" { - self.bankStackView.isHidden = false - +// self.bankStackView.isHidden = false + UIView.animate(withDuration: 0.33) { + self.bankStackViewConstraint.constant = 44 + self.bankStackView.alpha = 1 + } }else { - + } collectionView.reloadData() } @@ -74,9 +90,33 @@ class SendMoneyPaymentModeViewController: UIViewController { self.bankTextField.text = selectedBank?.name let shouldShowBranch = (self.selectedBank?.branchRequired ?? "false").lowercased() == "true" - self.branchStackView.isHidden = !shouldShowBranch +// self.branchStackView.isHidden = !shouldShowBranch + if shouldShowBranch { + UIView.animate(withDuration: 0.33) { + self.branchStackViewConstraint.constant = 44 + self.branchStackView.alpha = 1 + } + }else { + UIView.animate(withDuration: 0.33) { + self.branchStackViewConstraint.constant = 0 + self.branchStackView.alpha = 0 + } + } + + let shouldShowAccountNumber = (self.selectedBank?.accountRequired ?? "false").lowercased() == "true" - self.accountNumberStackView.isHidden = !shouldShowAccountNumber +// self.accountNumberStackView.isHidden = !shouldShowAccountNumber + if shouldShowAccountNumber { + UIView.animate(withDuration: 0.33) { + self.accountNumberStackViewConstraint.constant = 44 + self.accountNumberStackView.alpha = 1 + } + }else { + UIView.animate(withDuration: 0.33) { + self.accountNumberStackViewConstraint.constant = 0 + self.accountNumberStackView.alpha = 0 + } + } } } @@ -170,9 +210,15 @@ class SendMoneyPaymentModeViewController: UIViewController { self.view.layer.cornerRadius = 8 self.countinueButton.rounded() DispatchQueue.main.async { - self.bankStackView.isHidden = true - self.branchStackView.isHidden = true - self.accountNumberStackView.isHidden = true + self.bankStackView.alpha = 0 + self.branchStackView.alpha = 0 + self.accountNumberStackView.alpha = 0 + self.bankStackViewConstraint.constant = 0 + self.branchStackViewConstraint.constant = 0 + self.accountNumberStackViewConstraint.constant = 0 +// self.bankStackView.isHidden = true +// self.branchStackView.isHidden = true +// self.accountNumberStackView.isHidden = true } }