Browse Source

added function to move the view avove

pull/1/head
gme_2 6 years ago
parent
commit
fa28a72248
  1. 5
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard
  2. 54
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift

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

@ -162,7 +162,7 @@
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,000,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g3K-Yw-9MX">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="100,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g3K-Yw-9MX">
<rect key="frame" x="0.0" y="20" width="222" height="50"/> <rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="50" id="zxw-hb-bmw"/> <constraint firstAttribute="height" constant="50" id="zxw-hb-bmw"/>
@ -282,7 +282,7 @@
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,00,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dTw-1k-6zQ">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="100,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dTw-1k-6zQ">
<rect key="frame" x="0.0" y="20" width="222" height="50"/> <rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="50" id="trM-sN-aGf"/> <constraint firstAttribute="height" constant="50" id="trM-sN-aGf"/>
@ -423,6 +423,7 @@
<outlet property="paymentModeStackView" destination="eZQ-ZM-qFq" id="5S2-5n-A53"/> <outlet property="paymentModeStackView" destination="eZQ-ZM-qFq" id="5S2-5n-A53"/>
<outlet property="paymentModeStackViewConstraint" destination="GgL-cn-eyU" id="iNe-p5-0At"/> <outlet property="paymentModeStackViewConstraint" destination="GgL-cn-eyU" id="iNe-p5-0At"/>
<outlet property="reciepientTextField" destination="dTw-1k-6zQ" id="MRk-KS-OWU"/> <outlet property="reciepientTextField" destination="dTw-1k-6zQ" id="MRk-KS-OWU"/>
<outlet property="scrollView" destination="EcO-VE-kpa" id="LQ0-cc-8In"/>
<outlet property="senderTextField" destination="g3K-Yw-9MX" id="tT2-Dp-c29"/> <outlet property="senderTextField" destination="g3K-Yw-9MX" id="tT2-Dp-c29"/>
<outlet property="transferFeeInfoLabel" destination="5j8-YV-UND" id="Wa0-5G-EXA"/> <outlet property="transferFeeInfoLabel" destination="5j8-YV-UND" id="Wa0-5G-EXA"/>
</connections> </connections>

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

@ -42,6 +42,7 @@ class ExchangeRatesViewController: UIViewController {
// MARK: IBOutlets // MARK: IBOutlets
@IBOutlet weak var scrollView: UIScrollView!
@IBOutlet weak var collectionView: UICollectionView! @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!
@ -65,7 +66,7 @@ class ExchangeRatesViewController: UIViewController {
var presenter: ExchangeRatesModuleInterface? var presenter: ExchangeRatesModuleInterface?
var countryListTapGuesture: UITapGestureRecognizer? var countryListTapGuesture: UITapGestureRecognizer?
var selectedPaymentIndex: IndexPath = IndexPath.init(row: 0, section: 0) var selectedPaymentIndex: IndexPath = IndexPath.init(row: 0, section: 0)
var translated: Bool = false
var nativeCountryCode: String? = "np" var nativeCountryCode: String? = "np"
var calcBy = "" var calcBy = ""
@ -228,6 +229,7 @@ class ExchangeRatesViewController: UIViewController {
// show country with flag. // show country with flag.
} }
@objc private func textChanged(sender: UITextField) { @objc private func textChanged(sender: UITextField) {
switch sender { switch sender {
case senderTextField: case senderTextField:
@ -235,6 +237,7 @@ class ExchangeRatesViewController: UIViewController {
self.calcBy = "c" self.calcBy = "c"
senderTextField.text = Utility.getCommaSeperatedString(numberString: senderTextField.text!) senderTextField.text = Utility.getCommaSeperatedString(numberString: senderTextField.text!)
case reciepientTextField: case reciepientTextField:
self.senderTextField.text = "" self.senderTextField.text = ""
self.calcBy = "p" self.calcBy = "p"
reciepientTextField.text = Utility.getCommaSeperatedString(numberString: reciepientTextField.text!) reciepientTextField.text = Utility.getCommaSeperatedString(numberString: reciepientTextField.text!)
@ -243,6 +246,8 @@ class ExchangeRatesViewController: UIViewController {
} }
} }
private func setCountryFlag(countryCode: String) { private func setCountryFlag(countryCode: String) {
let flag = CountryInfo().getFlag(for: countryCode) let flag = CountryInfo().getFlag(for: countryCode)
self.countryFlagImage.image = flag self.countryFlagImage.image = flag
@ -325,6 +330,33 @@ class ExchangeRatesViewController: UIViewController {
self.reciepientTextField.addTarget(self, action: #selector(self.textChanged(sender:)), for: UIControlEvents.editingChanged) self.reciepientTextField.addTarget(self, action: #selector(self.textChanged(sender:)), for: UIControlEvents.editingChanged)
self.senderTextField.addTarget(self, action: #selector(self.textChanged(sender:)), for: UIControlEvents.editingChanged) self.senderTextField.addTarget(self, action: #selector(self.textChanged(sender:)), for: UIControlEvents.editingChanged)
self.reciepientTextField.addTarget(self, action: #selector(self.textFieldSelected(sender:)), for: UIControlEvents.editingDidBegin)
self.senderTextField.addTarget(self, action: #selector(self.textFieldSelected(sender:)), for: UIControlEvents.editingDidBegin)
}
@objc private func textFieldSelected(sender: UITextField) {
switch sender {
case senderTextField:
if Utility.getDeviceModel() == .iphone678 {
let x = self.scrollView.contentOffset.x
let y = self.scrollView.contentOffset.y
let newOffset = CGPoint.init(x: x, y: y + 100)
scrollView.setContentOffset(newOffset, animated: true)
}
if Utility.getDeviceModel() == .iphone5 {
let x = self.scrollView.contentOffset.x
let y = self.scrollView.contentOffset.y
let newOffset = CGPoint.init(x: x, y: y + 150)
scrollView.setContentOffset(newOffset, animated: true)
}
case reciepientTextField:
break
default:
break
}
} }
private func setupDelegates() { private func setupDelegates() {
@ -454,26 +486,8 @@ extension ExchangeRatesViewController: FetchCountryCurrencyInformation, getExcha
extension ExchangeRatesViewController: UITextFieldDelegate { extension ExchangeRatesViewController: UITextFieldDelegate {
func textFieldDidBeginEditing(_ textField: UITextField) {
if textField == senderTextField {
if Utility.getDeviceModel() == .iphone678 || Utility.getDeviceModel() == .iphone5 {
let transformDistance: CGFloat = -75
UIView.animate(withDuration: 0.33) {
self.view.transform = CGAffineTransform.init(translationX: 0, y: transformDistance)
}
}
}
}
func textFieldDidEndEditing(_ textField: UITextField) { func textFieldDidEndEditing(_ textField: UITextField) {
if textField == senderTextField {
UIView.animate(withDuration: 0.22, animations: {
self.view.transform = CGAffineTransform.identity
}) { (_) in
self.calculateExchangeRate(nil)
}
}
self.calculateExchangeRate(nil)
} }
} }

Loading…
Cancel
Save