IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

edit validate condition of fields

pull/1/head
InKwon James Kim 5 years ago
parent
fbfc3c366a
commit
8e7aad1a22
40 changed files with 351 additions and 243 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      GME Remit/Modules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift
  2. 2
      GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRateCollectionViewCell.swift
  3. 2
      GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  4. 6
      GME Remit/Modules/ForgotPassword/User Interface/View/ForgotPassword.storyboard
  5. 2
      GME Remit/Modules/ForgotPassword/User Interface/View/ForgotPasswordViewController.swift
  6. 12
      GME Remit/Modules/Login/User Interface/View/Login.storyboard
  7. 2
      GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
  8. 2
      GME Remit/Modules/Profile/ProfileChangePasswordViewController.swift
  9. 12
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/RecipientCell.swift
  10. 37
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
  11. 22
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
  12. 8
      GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Response/DynamicFieldModel.swift
  13. 44
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard
  14. 130
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  15. 24
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
  16. 2
      GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
  17. 2
      GME Remit/Modules/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift
  18. 4
      GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3ViewController.swift
  19. 2
      GME Remit/Modules/RegisterModules/PennyTest/User Interface/View/PennyTestViewController.swift
  20. 4
      GME Remit/Modules/RegisterModules/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift
  21. 2
      GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift
  22. 2
      GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
  23. 2
      GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
  24. 2
      GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift
  25. 2
      GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
  26. 2
      GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
  27. 6
      GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift
  28. 2
      GME Remit/Modules/SendMoneyModules/SelectCoupon/User Interface/View/SelectCouponViewController.swift
  29. 4
      GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
  30. 10
      GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
  31. 4
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift
  32. 4
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPickerViewController.swift
  33. 121
      GME Remit/Modules/SendMoneyModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  34. 22
      GME Remit/Modules/SendMoneyModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  35. 16
      GME Remit/Modules/SendMoneyModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  36. 2
      GME Remit/Modules/SideMenu/Auto refund/AutoRefundsViewController.swift
  37. 8
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
  38. 56
      GME Remit/MultiLanguages/en.lproj/Localizable.strings
  39. 2
      GME Remit/Utilities/SearchAddress/User Interface/View/Cell/AddressTableViewCell.swift
  40. 4
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

2
GME Remit/Modules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift
View File

@ -89,7 +89,7 @@ class AutoDebitViewController: UIViewController {
setupDelegates()
viewAddAccount.layer.cornerRadius = 10
viewAddAccount.layer.cornerRadius = 5
if self.presentingViewController == nil {
self.navigationItem.leftBarButtonItem = nil

2
GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRateCollectionViewCell.swift
View File

@ -24,7 +24,7 @@ class ExchangeRateCollectionViewCell: UICollectionViewCell {
self.imageview.image = image
self.paymentLabel.text = paymentServiceMethod?.subtitle
self.subtitleLabel.text = ""
cellBackgroundview.layer.cornerRadius = 10
cellBackgroundview.layer.cornerRadius = 5
cellSelected ? showBorderColor() : hideBorderColor()
}

2
GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
View File

@ -596,7 +596,7 @@ class ExchangeRatesViewController: UIViewController {
})
setupLanguage()
executeButton.layer.cornerRadius = 10
executeButton.layer.cornerRadius = 5
executeButton.backgroundColor = .themeRed
senderTextField.textColor = .themeRed
reciepientTextField.textColor = .themeRed

6
GME Remit/Modules/ForgotPassword/User Interface/View/ForgotPassword.storyboard
View File

@ -63,12 +63,12 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="2Kw-5W-wyP">
<rect key="frame" x="30" y="184" width="354" height="43"/>
<rect key="frame" x="30" y="184" width="354" height="60"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User ID" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Zkc-4R-XZf" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="354" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="354" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="lXb-LU-xu9"/>
<constraint firstAttribute="height" constant="60" id="lXb-LU-xu9"/>
</constraints>
<nil key="textColor"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>

2
GME Remit/Modules/ForgotPassword/User Interface/View/ForgotPasswordViewController.swift
View File

@ -68,7 +68,7 @@ class ForgotPasswordViewController: UIViewController {
return self.isValid
}
}
resetButton.layer.cornerRadius = 10
resetButton.layer.cornerRadius = 5
}
func configureLanguage() {

12
GME Remit/Modules/Login/User Interface/View/Login.storyboard
View File

@ -36,12 +36,12 @@
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="Qm0-Vh-TcC">
<rect key="frame" x="30" y="157" width="315" height="116"/>
<rect key="frame" x="30" y="157" width="315" height="150"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your ID for using GME" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="GkK-3R-8Nq" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="315" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="WZt-ZD-X43"/>
<constraint firstAttribute="height" constant="60" id="WZt-ZD-X43"/>
</constraints>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>
@ -51,7 +51,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your password of GME" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="pCq-Gh-cKW" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="73" width="315" height="43"/>
<rect key="frame" x="0.0" y="90" width="315" height="60"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>
@ -63,7 +63,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="qZ0-Mc-eUA">
<rect key="frame" x="112.5" y="325" width="150" height="35"/>
<rect key="frame" x="112.5" y="359" width="150" height="35"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="New to GME?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vyR-zb-CBC">
<rect key="frame" x="0.0" y="0.0" width="67" height="35"/>
@ -116,7 +116,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dKp-tX-RZc">
<rect key="frame" x="133.5" y="288" width="108" height="29"/>
<rect key="frame" x="133.5" y="322" width="108" height="29"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<state key="normal" title="Forgot password?">
<color key="titleColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>

2
GME Remit/Modules/Login/User Interface/View/LoginViewController.swift
View File

@ -120,7 +120,7 @@ class LoginViewController: UIViewController {
passwordTextField.errorMessage = "password_policy_error".localized()
passwordTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
loginButton.layer.cornerRadius = 10
loginButton.layer.cornerRadius = 5
}

2
GME Remit/Modules/Profile/ProfileChangePasswordViewController.swift
View File

@ -91,7 +91,7 @@ class ProfileChangePasswordViewController: UIViewController {
configureLanguage()
saveButton.backgroundColor = .themeRed
saveButton.layer.cornerRadius = 10
saveButton.layer.cornerRadius = 5
}
override func viewWillAppear(_ animated: Bool) {

12
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/RecipientCell.swift
View File

@ -27,33 +27,33 @@ class RecipientCell: UITableViewCell {
let country = CountryEnum(rawValue: model?.countryCode?.lowercased() ?? "")
countryFlagImageView.image = country?.flag
labelRecipientName.text = model?.fullName
paymentMethodNameLabel.text = model?.paymentMethod?.name
labelRecipientName.text = model?.fullName?.uppercased()
paymentMethodNameLabel.text = model?.paymentMethod?.name?.uppercased()
if let agentName = model?.agent?.name {
agentNameLabel.isHidden = false
agentNameLabel.text = agentName
agentNameLabel.text = agentName.uppercased()
} else {
agentNameLabel.isHidden = true
}
if let branchName = model?.agent?.branch?.name {
branchNameLabel.isHidden = false
branchNameLabel.text = branchName
branchNameLabel.text = branchName.uppercased()
} else {
branchNameLabel.isHidden = true
}
if let accountNumber = model?.agent?.accountNumber {
agentAccountLabel.isHidden = false
agentAccountLabel.text = accountNumber
agentAccountLabel.text = accountNumber.uppercased()
} else {
agentAccountLabel.isHidden = true
}
// bgView.layer.borderColor = UIColor(red:0.91, green:0.93, blue:0.95, alpha:1.0).cgColor
// bgView.layer.borderWidth = 1
// bgView.layer.cornerRadius = 10
// bgView.layer.cornerRadius = 5
// bgView.clipsToBounds = true
}
}

37
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
View File

@ -73,30 +73,30 @@
<color key="separatorColor" white="0.85577197490000001" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<inset key="separatorInset" minX="15" minY="0.0" maxX="15" maxY="0.0"/>
<view key="tableFooterView" contentMode="scaleToFill" id="IIt-Yb-InY">
<rect key="frame" x="0.0" y="138" width="335" height="44"/>
<rect key="frame" x="0.0" y="178" width="335" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RecipientCell" rowHeight="110" id="hGj-Pf-Qj3" customClass="RecipientCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="335" height="110"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RecipientCell" rowHeight="150" id="hGj-Pf-Qj3" customClass="RecipientCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="335" height="150"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hGj-Pf-Qj3" id="sz3-Ck-jnS">
<rect key="frame" x="0.0" y="0.0" width="335" height="109.5"/>
<rect key="frame" x="0.0" y="0.0" width="335" height="149.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FsO-FW-udC">
<rect key="frame" x="0.0" y="2.5" width="355" height="105"/>
<rect key="frame" x="0.0" y="2.5" width="335" height="144.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Bj6-79-KCV">
<rect key="frame" x="90" y="10" width="245" height="80"/>
<rect key="frame" x="90" y="10" width="225" height="119.5"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hSW-KF-x2L">
<rect key="frame" x="0.0" y="0.0" width="245" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="225" height="1.5"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="James Kim" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="xrV-Uw-p0g">
<rect key="frame" x="0.0" y="2" width="245" height="20.5"/>
<rect key="frame" x="0.0" y="3.5" width="225" height="20.5"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20.5" id="byb-sc-gnt"/>
</constraints>
@ -104,29 +104,29 @@
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="JRd-10-b03">
<rect key="frame" x="0.0" y="24.5" width="245" height="53.5"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="JRd-10-b03">
<rect key="frame" x="0.0" y="26" width="225" height="90.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BankDeposit" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="fp5-32-al9">
<rect key="frame" x="0.0" y="0.0" width="245" height="12"/>
<rect key="frame" x="0.0" y="0.0" width="225" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ShinhanBank" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="llO-GY-kgJ">
<rect key="frame" x="0.0" y="14" width="245" height="12"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ShinhanBank ShinhanBank ShinhanBank ShinhanBank ShinhanBank ShinhanBank" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="llO-GY-kgJ">
<rect key="frame" x="0.0" y="19" width="225" height="33.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Seoul" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="e6I-QA-szH">
<rect key="frame" x="0.0" y="28" width="245" height="11.5"/>
<rect key="frame" x="0.0" y="54.5" width="225" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="110224458044" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VyT-Xs-vLr">
<rect key="frame" x="0.0" y="41.5" width="245" height="12"/>
<rect key="frame" x="0.0" y="73.5" width="225" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -134,7 +134,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZJH-xy-Ztg">
<rect key="frame" x="0.0" y="80" width="245" height="0.0"/>
<rect key="frame" x="0.0" y="118.5" width="225" height="1"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
@ -143,7 +143,7 @@
</constraints>
</stackView>
<imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="flag_south_korea" translatesAutoresizingMaskIntoConstraints="NO" id="W49-dR-oEY">
<rect key="frame" x="20" y="27.5" width="50" height="50"/>
<rect key="frame" x="20" y="47.5" width="50" height="50"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="TVV-si-CbV"/>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="50" id="fSM-56-REM"/>
@ -155,10 +155,11 @@
<constraints>
<constraint firstItem="Bj6-79-KCV" firstAttribute="leading" secondItem="W49-dR-oEY" secondAttribute="trailing" constant="20" id="2xF-Wb-PFV"/>
<constraint firstItem="W49-dR-oEY" firstAttribute="centerY" secondItem="FsO-FW-udC" secondAttribute="centerY" id="OEw-Yr-k71"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="105" id="R1N-Dg-1nK"/>
<constraint firstItem="Bj6-79-KCV" firstAttribute="top" secondItem="FsO-FW-udC" secondAttribute="top" constant="10" id="WR4-9i-dGX"/>
<constraint firstAttribute="bottom" secondItem="Bj6-79-KCV" secondAttribute="bottom" constant="15" id="Zcr-wn-bN2"/>
<constraint firstAttribute="trailing" secondItem="Bj6-79-KCV" secondAttribute="trailing" constant="20" id="pUA-fE-0v2"/>
<constraint firstAttribute="height" constant="105" id="shM-dD-W05"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="150" id="shM-dD-W05"/>
<constraint firstItem="W49-dR-oEY" firstAttribute="leading" secondItem="FsO-FW-udC" secondAttribute="leading" constant="20" id="xPb-F4-shJ"/>
</constraints>
</view>

22
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
View File

@ -85,8 +85,8 @@ extension RecipientsViewController {
tableView.separatorColor = .themeBorderColor
self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
self.navigationController?.navigationBar.shadowImage = UIImage()
// self.navigationController?.navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default)
// self.navigationController?.navigationBar.shadowImage = UIImage()
NotificationCenter.default.addObserver(
self,
@ -147,14 +147,16 @@ extension RecipientsViewController {
.isNeedEdit
.drive(
onNext: {
self.alertWithOkCancel(
type: .normal,
message: "These Recipient have to edit \n(Add Payment mode information)",
okTitle: "Ok",
cancelTitle: "No",
okAction: { needEditTrigger.onNext(()) },
cancelAction: nil
)
DispatchQueue.main.async {
self.alertWithOkCancel(
type: .normal,
message: "These Recipient have to edit \n(Add Payment mode information)",
okTitle: "Ok",
cancelTitle: "No",
okAction: { needEditTrigger.onNext(()) },
cancelAction: nil
)
}
})
.disposed(by: disposeBag)

8
GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Response/DynamicFieldModel.swift
View File

@ -21,12 +21,12 @@ struct DynamicFieldModel: Mappable {
init?(map: Map) {}
mutating func mapping(map: Map) {
dynamicField <- map["dynamicField"]
dynamicField <- map["DynamicField"]
transferReasons <- map["Reason"]
relations <- map["Relations"]
idTypes <- map["ReseaverIdType"]
banks <- map["bankList"]
idTypes <- map["ReceiverIdType"]
banks <- map["BankList"]
provinces <- map["Provinces"]
payoutPartner <- map["payoutPartner"]
payoutPartner <- map["PayoutPartner"]
}
}

44
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipient.storyboard
View File

@ -85,8 +85,21 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select branch" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3m4-pD-BGm" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter account" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="8Rm-uv-VaK" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="80" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="KWx-fs-CHt"/>
</constraints>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="titleText" value="Account Number"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select branch" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3m4-pD-BGm" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="160" width="315" height="60"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="WzS-LY-K95"/>
@ -100,7 +113,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter first name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="o95-4S-dG9" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="160" width="315" height="60"/>
<rect key="frame" x="0.0" y="240" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="P2d-VY-2aL"/>
</constraints>
@ -113,7 +126,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter middle name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="YHH-Sk-Jvp" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="240" width="315" height="60"/>
<rect key="frame" x="0.0" y="320" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="xqz-7b-HaO"/>
</constraints>
@ -126,7 +139,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter last name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="DQC-Eg-Hmj" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="320" width="315" height="60"/>
<rect key="frame" x="0.0" y="400" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="UDe-WR-3XW"/>
</constraints>
@ -139,7 +152,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter full name" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="eAK-nt-rtc" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="400" width="315" height="60"/>
<rect key="frame" x="0.0" y="480" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="vpZ-Se-UIi"/>
</constraints>
@ -152,7 +165,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter first name in local" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4gU-jr-Ts7" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="480" width="315" height="60"/>
<rect key="frame" x="0.0" y="560" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="67N-5d-v7M"/>
</constraints>
@ -165,7 +178,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter middle name in local" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="55n-GU-u5y" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="560" width="315" height="60"/>
<rect key="frame" x="0.0" y="640" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="2Tp-mr-OHB"/>
</constraints>
@ -178,7 +191,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter last name in local" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="8Ce-0k-aZt" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="640" width="315" height="60"/>
<rect key="frame" x="0.0" y="720" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="vSq-nR-gfO"/>
</constraints>
@ -191,7 +204,7 @@
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter full name in local" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="SpL-EQ-pgM" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="720" width="315" height="60"/>
<rect key="frame" x="0.0" y="800" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="r2y-Qh-sgE"/>
</constraints>
@ -203,19 +216,6 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter account" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="8Rm-uv-VaK" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="800" width="315" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="KWx-fs-CHt"/>
</constraints>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="titleText" value="Account Number"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select id type" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cPO-Ql-d08" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="880" width="315" height="60"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

130
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
View File

@ -64,7 +64,7 @@ class SetupRecipientViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
title = "Recipient"
title = "recipient_text".localized()
}
// MARK: IBActions
@ -78,9 +78,62 @@ extension SetupRecipientViewController {
private func setup() {
// all setup should be done here
setUI()
setMultiLanguage()
setBinding()
}
private func setMultiLanguage() {
countryTextField.titleText = "country_text".localized()
paymentModeTextField.titleText = "payment_mode_text".localized()
bankTextField.titleText = "bank_text".localized()
branchTextField.titleText = "branch_text".localized()
accountTextField.titleText = "account_text".localized()
firstNameTextField.titleText = "first_name_text".localized()
middleNameTextField.titleText = "middle_name_text".localized()
lastNameTextField.titleText = "last_name_text".localized()
fullNameTextField.titleText = "full_name_text".localized()
firstNameLocalTextField.titleText = "first_name_local_text".localized()
middleNameLocalTextField.titleText = "middle_name_local_text".localized()
lastNameLocalTextField.titleText = "last_name_local_text".localized()
fullNameLocalTextField.titleText = "full_name_local_text".localized()
idTextField.titleText = "id_type_text".localized()
idNumberTextField.titleText = "id_number_text".localized()
mobileTextField.titleText = "mobile_text".localized()
emailTextField.titleText = "email_text".localized()
stateProvinceTextField.titleText = "state_province_text".localized()
districtTextField.titleText = "district_text".localized()
cityTextField.titleText = "city_text".localized()
addressTextField.titleText = "address_text".localized()
relationTextField.titleText = "relation_text".localized()
reasonTextField.titleText = "reason_text".localized()
countryTextField.placeholder = "country_placeholder_text".localized()
paymentModeTextField.placeholder = "payment_mode_placeholder_text".localized()
bankTextField.placeholder = "bank_placeholder_text".localized()
branchTextField.placeholder = "branch_placeholder_text".localized()
accountTextField.placeholder = "account_placeholder_text".localized()
firstNameTextField.placeholder = "first_name_placeholder_text".localized()
middleNameTextField.placeholder = "middle_name_placeholder_text".localized()
lastNameTextField.placeholder = "last_name_placeholder_text".localized()
fullNameTextField.placeholder = "full_name_placeholder_text".localized()
firstNameLocalTextField.placeholder = "first_name_local_placeholder_text".localized()
middleNameLocalTextField.placeholder = "middle_name_local_placeholder_text".localized()
lastNameLocalTextField.placeholder = "last_name_local_placeholder_text".localized()
fullNameLocalTextField.placeholder = "full_name_local_placeholder_text".localized()
idTextField.placeholder = "id_type_placeholder_text".localized()
idNumberTextField.placeholder = "id_number_placeholder_text".localized()
mobileTextField.placeholder = "mobile_placeholder_text".localized()
emailTextField.placeholder = "email_placeholder_text".localized()
stateProvinceTextField.placeholder = "stateProvince_placeholder_text".localized()
districtTextField.placeholder = "district_placeholder_text".localized()
cityTextField.placeholder = "city_placeholder_text".localized()
addressTextField.placeholder = "address_placeholder_text".localized()
relationTextField.placeholder = "relation_placeholder_text".localized()
reasonTextField.placeholder = "reason_placeholder_text".localized()
saveButton.setTitle("save_text".localized(), for: .normal)
}
private func setSelectTextFields(of textFields: [UITextField]) {
textFields.forEach {
$0.inputView = UIView()
@ -89,7 +142,7 @@ extension SetupRecipientViewController {
}
private func setUI() {
saveButton.layer.cornerRadius = 10
saveButton.layer.cornerRadius = 5
countryTextField.statusImageView.isHidden = true
@ -109,6 +162,7 @@ extension SetupRecipientViewController {
recipientInformationContainerView.travelSubView { (view, _) in
if let textField = view as? ValidationTextField {
textField.statusImageView.isHidden = true
textField.isHidden = true
}
}
@ -145,18 +199,18 @@ extension SetupRecipientViewController {
let saveTrigger = saveButton.rx.tap.flatMap { _ -> Observable<Recipient> in
var recipient = Recipient()
recipient.firstName = self.firstNameTextField.text
recipient.middleName = self.middleNameTextField.text
recipient.lastName = self.lastNameTextField.text
recipient.localFirstName = self.firstNameLocalTextField.text
recipient.localMiddleName = self.middleNameLocalTextField.text
recipient.localLastName = self.lastNameLocalTextField.text
recipient.fullName = self.fullNameTextField.text
recipient.localFullName = self.fullNameLocalTextField.text
recipient.address = self.addressTextField.text
recipient.city = self.cityTextField.text
recipient.email = self.emailTextField.text
recipient.mobile = self.mobileTextField.mobileNumberText
recipient.idNumber = self.idNumberTextField.text
recipient.middleName = self.middleNameTextField.text
recipient.lastName = self.lastNameTextField.text
recipient.localFirstName = self.firstNameLocalTextField.text
recipient.localMiddleName = self.middleNameLocalTextField.text
recipient.localLastName = self.lastNameLocalTextField.text
recipient.fullName = self.fullNameTextField.text
recipient.localFullName = self.fullNameLocalTextField.text
recipient.address = self.addressTextField.text
recipient.city = self.cityTextField.text
recipient.email = self.emailTextField.text
recipient.mobile = self.mobileTextField.mobileNumberText
recipient.idNumber = self.idNumberTextField.text
recipient.agent?.accountNumber = self.accountTextField.text
return Observable.just(recipient)
@ -188,14 +242,17 @@ extension SetupRecipientViewController {
output.success
.drive(onNext: { successObject in
let message = "Do you want to send money to\n\"\(successObject.data?.fullName ?? "")\""
let message = "recipient_add_success_message_text".localized().replacingOccurrences(
of: "xxx",
with: successObject.data?.fullName ?? ""
)
self.alertWithOkCancel(
type: .normal,
message: "\(successObject.message ?? "")\n\(message)",
title: "Success",
okTitle: "Ok",
cancelTitle: "No",
title: "success_text".localized(),
okTitle: "yes_text".localized(),
cancelTitle: "no_text".localized(),
okAction: {
self.dismiss(animated: true) {
self.delegate?.setupRecieient(
@ -290,26 +347,31 @@ extension SetupRecipientViewController {
textField.isHidden = isRequire == "M" ? false : true
if isRequire == "M" {
textField.validCondition = { ($0.count > min && $0.count < max) && !$0.isEmpty }
textField.errorMessage = "It must be at least \(min) and less than \(max) characters."
if max == min && min == -1 {
textField.validCondition = { !$0.isEmpty }
textField.errorMessage = nil
} else {
textField.validCondition = { ($0.count >= min && $0.count <= max) && !$0.isEmpty }
textField.errorMessage = "general_length_error_text".localized().replacingOccurrences(
of: "xxx",
with: "\(min)"
).replacingOccurrences(of: "ooo", with: "\(max)")
}
}
if !key.contains("Local") {
if key.contains("Local") {
textField.keyboardType = .default
} else {
switch keyboardType {
case "N": textField.keyboardType = .numberPad
default: textField.keyboardType = .asciiCapable
}
textField.rx.controlEvent(.editingChanged).asDriver()
.drive(onNext: { _ in
switch keyboardType {
case "AN":
textField.keyboardType = .asciiCapable
textField.filterForUserIDFormat(isSendAction: false)
case "N":
textField.keyboardType = .numberPad
textField.removeNonASCII(isSendAction: false)
case "ANS":
textField.keyboardType = .asciiCapable
textField.removeNonASCII(isSendAction: false)
default:
textField.keyboardType = .asciiCapable
textField.removeNonASCII(isSendAction: false)
case "AN": textField.filterForUserIDFormat(isSendAction: false)
default: textField.removeNonASCII(isSendAction: false)
}
}).disposed(by: disposeBag)
}

24
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
View File

@ -85,10 +85,10 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput {
extension SetupRecipientWireframe: TablePresenterDelegate {
func tablePresenterView(_ viewController: TablePresenterViewController) -> TablePresenterConfiguration {
var configure = TablePresenterConfiguration(
presenterTitle: "Select Country",
closeButtonTitle: "Close",
notFoundTitle: "do not search",
searchBarPlaceHolder: "search",
presenterTitle: "select_country_text".localized(),
closeButtonTitle: "penny_test_close_text".localized(),
notFoundTitle: "no_search_orders_message_text".localized(),
searchBarPlaceHolder: "search_text".localized(),
isUseSearchBar: true
)
@ -100,28 +100,28 @@ extension SetupRecipientWireframe: TablePresenterDelegate {
case .country:
return configure
case .paymentMode:
configure.presenterTitle = "Select PaymentMode"
configure.presenterTitle = "select_country_text".localized()
configure.isUseSearchBar = false
case .bank:
configure.presenterTitle = "Select Bank"
configure.presenterTitle = "select_bank_text".localized()
configure.isUseSearchBar = true
case .branch:
configure.presenterTitle = "Select branch"
configure.presenterTitle = "select_branch_text".localized()
configure.isUseSearchBar = true
case .idType:
configure.presenterTitle = "Select ID Type"
configure.presenterTitle = "placeholder_enter_id_type_text".localized()
configure.isUseSearchBar = true
case .stateProvince:
configure.presenterTitle = "Select State / Provice"
configure.presenterTitle = "state_province_text".localized()
configure.isUseSearchBar = true
case .district:
configure.presenterTitle = "Select District"
configure.presenterTitle = "select_district_text".localized()
configure.isUseSearchBar = true
case .relation:
configure.presenterTitle = "Select Relation"
configure.presenterTitle = "select_relation_text".localized()
configure.isUseSearchBar = true
case .reason:
configure.presenterTitle = "Select Reason"
configure.presenterTitle = "select_transfer_reason_text".localized()
configure.isUseSearchBar = true
}

2
GME Remit/Modules/RegisterModules/KYC/kycForm1/User Interface/View/kycForm1ViewController.swift
View File

@ -176,7 +176,7 @@ class KycForm1ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setup()
saveButton.layer.cornerRadius = 10
saveButton.layer.cornerRadius = 5
presenter?.viewIsReady()
}

2
GME Remit/Modules/RegisterModules/KYC/kycForm2/User Interface/View/kycForm2ViewController.swift
View File

@ -229,7 +229,7 @@ class KycForm2ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setup()
saveAndContinueButton.layer.cornerRadius = 10
saveAndContinueButton.layer.cornerRadius = 5
}
override func viewWillDisappear(_ animated: Bool) {

4
GME Remit/Modules/RegisterModules/KYC/kycForm3/User Interface/View/kycForm3ViewController.swift
View File

@ -139,7 +139,7 @@ class KycForm3ViewController: UIViewController {
configureLanguage()
submitButton.layer.cornerRadius = 10
submitButton.layer.cornerRadius = 5
}
@ -170,7 +170,7 @@ class KycForm3ViewController: UIViewController {
}
// show alert
let alertVC = PMAlertController(title: "", description: "", image: image, style: .alert)
alertVC.alertView.layer.cornerRadius = 10
alertVC.alertView.layer.cornerRadius = 5
let action = PMAlertAction(title: "ok_text".localized(), style: .cancel)
alertVC.addAction(action)
self.present(alertVC, animated: true, completion: nil)

2
GME Remit/Modules/RegisterModules/PennyTest/User Interface/View/PennyTestViewController.swift
View File

@ -61,7 +61,7 @@ class PennyTestViewController: UIViewController {
private func setup() {
// all setup should be done here
self.setupNormalNavigation()
self.proceedButton.layer.cornerRadius = 10
self.proceedButton.layer.cornerRadius = 5
iconImageView.rounded()
iconImageView.layer.borderColor = UIColor.themeRed.cgColor
iconImageView.layer.borderWidth = 2

4
GME Remit/Modules/RegisterModules/PennyTestSubmit/User Interface/View/PennyTestSubmitViewController.swift
View File

@ -66,7 +66,7 @@ class PennyTestSubmitViewController: UIViewController {
self.titleLabel.text = message
configureText()
submitButton.layer.cornerRadius = 10
submitButton.layer.cornerRadius = 5
verificationCodeTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
}
@ -109,7 +109,7 @@ class PennyTestSubmitViewController: UIViewController {
func showSampleImage() {
let image = #imageLiteral(resourceName: "penny3.jpg")
let alertVC = PMAlertController(title: "", description: "", image: image, style: .alert)
alertVC.alertView.layer.cornerRadius = 10
alertVC.alertView.layer.cornerRadius = 5
let action = PMAlertAction(title: "ok_text".localized(), style: .cancel)
alertVC.addAction(action)
self.present(alertVC, animated: true, completion: nil)

2
GME Remit/Modules/RegisterModules/Register/User Interface/View/RegisterViewController.swift
View File

@ -145,7 +145,7 @@ class RegisterViewController: UIViewController {
]
)
registerButton.layer.cornerRadius = 10
registerButton.layer.cornerRadius = 5
}
private func setCustomTextFields() {

2
GME Remit/Modules/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
View File

@ -114,7 +114,7 @@ extension DetailOrderViewController {
// all setup should be done here
presenter?.fetchOrder()
summaryView.layer.cornerRadius = 10
summaryView.layer.cornerRadius = 5
navigationController?.interactivePopGestureRecognizer?.delegate = self
navigationController?.interactivePopGestureRecognizer?.isEnabled = true

2
GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
View File

@ -96,7 +96,7 @@ class OrderCell: UITableViewCell {
orderStatusLabel.layer.cornerRadius = 5
orderStatusLabel.backgroundColor = status.color
cellContentView.layer.cornerRadius = 10
cellContentView.layer.cornerRadius = 5
}
}

2
GME Remit/Modules/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift
View File

@ -155,7 +155,7 @@ extension OrderHistoryViewController {
receivedColorLabel.layer.cornerRadius = 5
canceledColorLabel.layer.cornerRadius = 5
perioidContentView.layer.cornerRadius = 10
perioidContentView.layer.cornerRadius = 5
canceledColorLabel.backgroundColor = .themeRed
}

2
GME Remit/Modules/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
View File

@ -342,7 +342,7 @@ extension RedeemViewController: SearchAddressDelegate {
extension RedeemViewController {
private func setButton() {
submitButton.layer.cornerRadius = 10
submitButton.layer.cornerRadius = 5
}
private func setDefaultState() {

2
GME Remit/Modules/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
View File

@ -37,7 +37,7 @@ class RewardItemCollectionViewCell: UICollectionViewCell {
}
private func setUI(){
self.contentsView.layer.cornerRadius = 10
self.contentsView.layer.cornerRadius = 5
self.setButton()
setMultiLanguage()
}

6
GME Remit/Modules/SendMoneyModules/PaymentSelection/User Interface/View/PaymentSelectionViewController.swift
View File

@ -48,14 +48,14 @@ class PaymentSelectionViewController: UIViewController {
private func setup() {
// all setup should be done here
self.mainView.layer.cornerRadius = 10
self.mainView.layer.cornerRadius = 5
self.mainView.clipsToBounds = true
self.tableView.dataSource = self
self.tableView.delegate = self
self.tableView.reloadData()
configureText()
mainView.layer.cornerRadius = 10
closeButton.layer.cornerRadius = 10
mainView.layer.cornerRadius = 5
closeButton.layer.cornerRadius = 5
}
private func configureText() {

2
GME Remit/Modules/SendMoneyModules/SelectCoupon/User Interface/View/SelectCouponViewController.swift
View File

@ -62,7 +62,7 @@ class SelectCouponViewController: UIViewController {
setup()
tableView.dataSource = self
tableView.delegate = self
couponButton.layer.cornerRadius = 10
couponButton.layer.cornerRadius = 5
presenter?.fetchCoupons()
}

4
GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
View File

@ -145,7 +145,7 @@ class SendMoneyCodeViewController: UIViewController {
verificationCodeTextField.delegate = self
self.backGourndBorderView.layer.borderWidth = 0.5
self.backGourndBorderView.layer.borderColor = UIColor.init(hex: "#EBECED").cgColor
self.backGourndBorderView.layer.cornerRadius = 10
self.backGourndBorderView.layer.cornerRadius = 5
}
private func configureText() {
@ -181,7 +181,7 @@ class SendMoneyCodeViewController: UIViewController {
func showSampleImage() {
let image = #imageLiteral(resourceName: "penny3.jpg")
let alertVC = PMAlertController(title: "", description: "", image: image, style: .alert)
alertVC.alertView.layer.cornerRadius = 10
alertVC.alertView.layer.cornerRadius = 5
let action = PMAlertAction(title: "ok_text".localized(), style: .cancel)
alertVC.addAction(action)
self.present(alertVC, animated: true, completion: nil)

10
GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
View File

@ -165,10 +165,6 @@ class SendMoneyExchangeRateViewController: UIViewController {
senderTextField.receiverNativeCountry = reciepient?.countryCode ?? ""
reciepientTextField.receiverNativeCountry = reciepient?.countryCode ?? ""
if senderTextField.text != "" || reciepientTextField.text != "" {
calculate()
}
}
override func viewDidAppear(_ animated: Bool) {
@ -211,7 +207,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
configureLanguage()
continueButton.layer.cornerRadius = 10
continueButton.layer.cornerRadius = 5
continueButton.backgroundColor = .themeRed
continueButton.titleLabel?.font = .sanfrancisco(.medium, size: 18)
@ -476,6 +472,10 @@ extension SendMoneyExchangeRateViewController: SendMoneyExchangeRateViewInterfac
extension SendMoneyExchangeRateViewController {
override func didMove(toParent parent: UIViewController?) {
self.viewWillAppear(true)
if senderTextField.text != "" || reciepientTextField.text != "" {
calculate()
}
}
}

4
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/BankBranchPicker/BankBranchPickerViewController.swift
View File

@ -81,8 +81,8 @@ class BankBranchPickerViewController: UIViewController {
self.setupPlaces()
self.setupTarget()
// self.titleView.layer.cornerRadius = 10
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
self.mainview.layer.cornerRadius = 5
cancelButton.layer.cornerRadius = 5
self.showProgressHud()
self.fetchBranch(searchString: "")

4
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/ViewModels/BankPicker/BankPickerViewController.swift
View File

@ -75,8 +75,8 @@ class BankPickerViewController: UIViewController {
self.setupSearchService()
self.setupPlaces()
self.mainview.layer.cornerRadius = 10
cancelButton.layer.cornerRadius = 10
self.mainview.layer.cornerRadius = 5
cancelButton.layer.cornerRadius = 5
let tapGestureRecognizer = UITapGestureRecognizer()
transparentView.addGestureRecognizer(tapGestureRecognizer)

121
GME Remit/Modules/SendMoneyModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
View File

@ -35,14 +35,14 @@
<objects>
<viewController storyboardIdentifier="SendMoneyReceiptViewController" id="qyY-tG-aFa" customClass="SendMoneyReceiptViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="J2b-F0-dkp">
<rect key="frame" x="0.0" y="0.0" width="375" height="910"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ht-uj-bS8">
<rect key="frame" x="0.0" y="0.0" width="375" height="910"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="894.5" translatesAutoresizingMaskIntoConstraints="NO" id="WYP-Q8-sI7">
<rect key="frame" x="0.0" y="0.0" width="375" height="946"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="934"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rub-fY-JfS">
<rect key="frame" x="10" y="12" width="355" height="222"/>
@ -126,7 +126,7 @@ Share with concerned party only</string>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="b46-CG-sdO" firstAttribute="leading" secondItem="hp2-4c-2z6" secondAttribute="trailing" constant="4" id="6Wc-rf-EA3"/>
<constraint firstItem="JkE-DM-feU" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="ATM-U6-Ecn"/>
@ -153,26 +153,26 @@ Share with concerned party only</string>
<constraint firstAttribute="height" constant="222" id="z7w-5x-v3N"/>
</constraints>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gNN-Ad-hRc">
<rect key="frame" x="10" y="246" width="355" height="38"/>
<view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKI-eb-ZTN" customClass="ShadowView" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="10" y="244" width="355" height="600"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Twl-GO-G3M">
<rect key="frame" x="0.0" y="0.0" width="355" height="38"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="N4e-L0-lEA">
<rect key="frame" x="0.0" y="0.0" width="355" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6lh-Ni-vRa">
<rect key="frame" x="0.0" y="0.0" width="355" height="38"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" translatesAutoresizingMaskIntoConstraints="NO" id="jgE-EV-S3e">
<rect key="frame" x="13" y="0.0" width="329" height="38"/>
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0F1-wm-gWq" userLabel="Relation">
<rect key="frame" x="0.0" y="0.0" width="108.5" height="38"/>
<rect key="frame" x="0.0" y="0.0" width="108.5" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qz4-OT-jiF">
<rect key="frame" x="108.5" y="0.0" width="220.5" height="38"/>
<rect key="frame" x="108.5" y="0.0" width="220.5" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -180,7 +180,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="jgE-EV-S3e" firstAttribute="leading" secondItem="6lh-Ni-vRa" secondAttribute="leading" constant="13" id="UoD-HV-raR"/>
<constraint firstAttribute="bottom" secondItem="jgE-EV-S3e" secondAttribute="bottom" id="i2e-FA-WyD"/>
@ -188,31 +188,8 @@ Share with concerned party only</string>
<constraint firstItem="jgE-EV-S3e" firstAttribute="top" secondItem="6lh-Ni-vRa" secondAttribute="top" id="slo-S0-ZBv"/>
</constraints>
</view>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="Twl-GO-G3M" firstAttribute="leading" secondItem="gNN-Ad-hRc" secondAttribute="leading" id="CR0-b1-6tU"/>
<constraint firstAttribute="trailing" secondItem="Twl-GO-G3M" secondAttribute="trailing" id="Ekr-FH-d82"/>
<constraint firstAttribute="height" constant="38" id="O15-sr-q0Q"/>
<constraint firstItem="Twl-GO-G3M" firstAttribute="top" secondItem="gNN-Ad-hRc" secondAttribute="top" id="Z5C-aO-vde"/>
<constraint firstAttribute="bottom" secondItem="Twl-GO-G3M" secondAttribute="bottom" id="hq1-jh-tNF"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="10"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKI-eb-ZTN">
<rect key="frame" x="10" y="291" width="355" height="565"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="1.5" translatesAutoresizingMaskIntoConstraints="NO" id="N4e-L0-lEA">
<rect key="frame" x="0.0" y="0.0" width="355" height="565"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P8E-dB-3bF">
<rect key="frame" x="0.0" y="0.0" width="355" height="50"/>
<rect key="frame" x="0.0" y="50" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="TDp-3K-1pj">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -232,7 +209,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="TDp-3K-1pj" secondAttribute="trailing" constant="13" id="IIJ-4e-pm2"/>
<constraint firstItem="TDp-3K-1pj" firstAttribute="leading" secondItem="P8E-dB-3bF" secondAttribute="leading" constant="13" id="bVb-nX-ZzC"/>
@ -242,7 +219,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="irh-VO-Gyg" userLabel="DeliveryAddress">
<rect key="frame" x="0.0" y="51.5" width="355" height="50"/>
<rect key="frame" x="0.0" y="100" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Lxb-PQ-Hhf">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -262,7 +239,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Lxb-PQ-Hhf" firstAttribute="top" secondItem="irh-VO-Gyg" secondAttribute="top" id="27F-gy-RSF"/>
<constraint firstItem="Lxb-PQ-Hhf" firstAttribute="leading" secondItem="irh-VO-Gyg" secondAttribute="leading" constant="13" id="lKE-Ye-txe"/>
@ -271,7 +248,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="v7t-Na-CRJ">
<rect key="frame" x="0.0" y="102.5" width="355" height="0.0"/>
<rect key="frame" x="0.0" y="150" width="355" height="0.0"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jxz-4v-H4R">
<rect key="frame" x="13" y="0.0" width="329" height="0.0"/>
@ -291,7 +268,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="jxz-4v-H4R" firstAttribute="top" secondItem="v7t-Na-CRJ" secondAttribute="top" id="4of-5X-NQ1"/>
<constraint firstItem="jxz-4v-H4R" firstAttribute="leading" secondItem="v7t-Na-CRJ" secondAttribute="leading" constant="13" id="axs-Py-KA9"/>
@ -300,7 +277,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W4g-Xv-Fmk">
<rect key="frame" x="0.0" y="103" width="355" height="50"/>
<rect key="frame" x="0.0" y="150" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Wyj-Nd-gbc">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -320,7 +297,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Wyj-Nd-gbc" firstAttribute="leading" secondItem="W4g-Xv-Fmk" secondAttribute="leading" constant="13" id="H1q-js-f5n"/>
<constraint firstAttribute="trailing" secondItem="Wyj-Nd-gbc" secondAttribute="trailing" constant="13" id="a7u-SP-wdj"/>
@ -329,7 +306,7 @@ Share with concerned party only</string>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Kml-N2-XoF">
<rect key="frame" x="0.0" y="154.5" width="355" height="50"/>
<rect key="frame" x="0.0" y="200" width="355" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wY4-w4-PU9">
<rect key="frame" x="0.0" y="0.0" width="355" height="50"/>
@ -352,7 +329,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="ICP-f3-wmK" secondAttribute="trailing" constant="13" id="45u-AK-Us5"/>
<constraint firstItem="ICP-f3-wmK" firstAttribute="leading" secondItem="wY4-w4-PU9" secondAttribute="leading" constant="13" id="chf-CR-Cow"/>
@ -363,7 +340,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ybw-0P-ctF">
<rect key="frame" x="0.0" y="206" width="355" height="50"/>
<rect key="frame" x="0.0" y="250" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="2AA-tv-LcD">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -383,7 +360,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="2AA-tv-LcD" firstAttribute="top" secondItem="ybw-0P-ctF" secondAttribute="top" id="Bg8-Hq-Clu"/>
<constraint firstAttribute="bottom" secondItem="2AA-tv-LcD" secondAttribute="bottom" id="MKn-Be-ehH"/>
@ -392,7 +369,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FWa-U9-qgm">
<rect key="frame" x="0.0" y="257.5" width="355" height="50"/>
<rect key="frame" x="0.0" y="300" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="YS3-bl-jeT">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -412,7 +389,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="YS3-bl-jeT" firstAttribute="leading" secondItem="FWa-U9-qgm" secondAttribute="leading" constant="13" id="OKU-fF-GOM"/>
<constraint firstItem="YS3-bl-jeT" firstAttribute="top" secondItem="FWa-U9-qgm" secondAttribute="top" id="TdQ-KE-eGp"/>
@ -421,7 +398,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z4W-0Y-NE6">
<rect key="frame" x="0.0" y="309" width="355" height="50"/>
<rect key="frame" x="0.0" y="350" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="MsX-KY-7UY">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -441,7 +418,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="MsX-KY-7UY" secondAttribute="bottom" id="AIA-AL-YOa"/>
<constraint firstItem="MsX-KY-7UY" firstAttribute="top" secondItem="Z4W-0Y-NE6" secondAttribute="top" id="Hkm-Ql-cd2"/>
@ -450,7 +427,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I1w-qc-GAw">
<rect key="frame" x="0.0" y="360.5" width="355" height="50"/>
<rect key="frame" x="0.0" y="400" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="p5h-cX-mhA">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -470,7 +447,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="p5h-cX-mhA" firstAttribute="top" secondItem="I1w-qc-GAw" secondAttribute="top" id="CNE-u6-bbd"/>
<constraint firstItem="p5h-cX-mhA" firstAttribute="leading" secondItem="I1w-qc-GAw" secondAttribute="leading" constant="13" id="XrQ-Kq-o0u"/>
@ -479,7 +456,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2P3-eK-NLt">
<rect key="frame" x="0.0" y="412" width="355" height="50"/>
<rect key="frame" x="0.0" y="450" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="SYa-o4-Mha">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -499,7 +476,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="SYa-o4-Mha" firstAttribute="top" secondItem="2P3-eK-NLt" secondAttribute="top" id="4OJ-CN-zjR"/>
<constraint firstItem="SYa-o4-Mha" firstAttribute="leading" secondItem="2P3-eK-NLt" secondAttribute="leading" constant="13" id="5Ip-SG-EQB"/>
@ -508,7 +485,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hzj-s4-Pz9">
<rect key="frame" x="0.0" y="463.5" width="355" height="50"/>
<rect key="frame" x="0.0" y="500" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="7XD-gU-m2o">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -528,7 +505,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="7XD-gU-m2o" secondAttribute="bottom" id="Lb0-Gd-6Yb"/>
<constraint firstItem="7XD-gU-m2o" firstAttribute="leading" secondItem="Hzj-s4-Pz9" secondAttribute="leading" constant="13" id="mSy-4h-Yal"/>
@ -537,7 +514,7 @@ Share with concerned party only</string>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fMD-Tq-Dwt">
<rect key="frame" x="0.0" y="515" width="355" height="50"/>
<rect key="frame" x="0.0" y="550" width="355" height="50"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="yct-cx-mP3">
<rect key="frame" x="13" y="0.0" width="329" height="50"/>
@ -557,7 +534,7 @@ Share with concerned party only</string>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="0.84999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="yct-cx-mP3" firstAttribute="top" secondItem="fMD-Tq-Dwt" secondAttribute="top" id="HtR-q2-hKS"/>
<constraint firstAttribute="bottom" secondItem="yct-cx-mP3" secondAttribute="bottom" id="VrV-Rf-xuP"/>
@ -566,9 +543,10 @@ Share with concerned party only</string>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</stackView>
</subviews>
<color key="backgroundColor" red="0.90688699480000001" green="0.92901235820000005" blue="0.95113462209999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="N4e-L0-lEA" secondAttribute="trailing" id="0tR-Oo-fjK"/>
<constraint firstItem="N4e-L0-lEA" firstAttribute="leading" secondItem="fKI-eb-ZTN" secondAttribute="leading" id="aKH-TJ-1lN"/>
@ -582,7 +560,7 @@ Share with concerned party only</string>
</userDefinedRuntimeAttributes>
</view>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="PMG-MW-2Jh">
<rect key="frame" x="10" y="876" width="355" height="40"/>
<rect key="frame" x="10" y="864" width="355" height="40"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CVW-u5-4q0">
<rect key="frame" x="0.0" y="0.0" width="172.5" height="40"/>
@ -617,15 +595,15 @@ Share with concerned party only</string>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="lEd-uL-dXI"/>
</constraints>
</stackView>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vlt-YJ-pwY">
<rect key="frame" x="87.5" y="876" width="200" height="50"/>
<rect key="frame" x="10" y="864" width="355" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Cb6-zf-RuS"/>
<constraint firstAttribute="height" constant="50" id="ROj-N3-WAp"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
@ -642,19 +620,18 @@ Share with concerned party only</string>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="PMG-MW-2Jh" secondAttribute="trailing" constant="10" id="831-dZ-Vik"/>
<constraint firstItem="gNN-Ad-hRc" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="bottom" constant="12" id="8pK-hR-sy9"/>
<constraint firstItem="fKI-eb-ZTN" firstAttribute="top" secondItem="gNN-Ad-hRc" secondAttribute="bottom" constant="7" id="CsL-Eg-FPJ"/>
<constraint firstItem="vlt-YJ-pwY" firstAttribute="top" secondItem="fKI-eb-ZTN" secondAttribute="bottom" constant="20" id="ElZ-WX-icZ"/>
<constraint firstAttribute="trailing" secondItem="rub-fY-JfS" secondAttribute="trailing" constant="10" id="GkZ-Am-SyU"/>
<constraint firstItem="PMG-MW-2Jh" firstAttribute="top" secondItem="fKI-eb-ZTN" secondAttribute="bottom" constant="20" id="HlG-3a-SmK"/>
<constraint firstItem="fKI-eb-ZTN" firstAttribute="top" secondItem="rub-fY-JfS" secondAttribute="bottom" constant="10" id="WuG-Zm-WBG"/>
<constraint firstItem="PMG-MW-2Jh" firstAttribute="leading" secondItem="WYP-Q8-sI7" secondAttribute="leading" constant="10" id="X5v-mL-Bmy"/>
<constraint firstAttribute="trailing" secondItem="gNN-Ad-hRc" secondAttribute="trailing" constant="10" id="YSc-vY-1xO"/>
<constraint firstItem="vlt-YJ-pwY" firstAttribute="centerX" secondItem="WYP-Q8-sI7" secondAttribute="centerX" id="aEn-Sa-xTB"/>
<constraint firstAttribute="trailing" secondItem="vlt-YJ-pwY" secondAttribute="trailing" constant="10" id="cRU-Ki-yku"/>
<constraint firstAttribute="bottom" secondItem="vlt-YJ-pwY" secondAttribute="bottom" constant="20" id="dMa-dL-WG0"/>
<constraint firstItem="fKI-eb-ZTN" firstAttribute="leading" secondItem="WYP-Q8-sI7" secondAttribute="leading" constant="10" id="dhq-Qt-gwk"/>
<constraint firstItem="gNN-Ad-hRc" firstAttribute="leading" secondItem="WYP-Q8-sI7" secondAttribute="leading" constant="10" id="dlX-io-HHS"/>
<constraint firstItem="vlt-YJ-pwY" firstAttribute="leading" secondItem="WYP-Q8-sI7" secondAttribute="leading" constant="10" id="gAf-dx-kHP"/>
<constraint firstItem="rub-fY-JfS" firstAttribute="top" secondItem="WYP-Q8-sI7" secondAttribute="top" constant="12" id="p1U-v5-4uD"/>
<constraint firstItem="rub-fY-JfS" firstAttribute="leading" secondItem="WYP-Q8-sI7" secondAttribute="leading" constant="10" id="pCf-Us-tao"/>
<constraint firstAttribute="bottom" secondItem="PMG-MW-2Jh" secondAttribute="bottom" constant="30" id="pc0-At-uRu"/>
@ -671,7 +648,7 @@ Share with concerned party only</string>
</constraints>
</scrollView>
</subviews>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="7Ht-uj-bS8" firstAttribute="trailing" secondItem="12g-Fg-xfs" secondAttribute="trailing" id="6Jw-eI-bzl"/>
<constraint firstItem="7Ht-uj-bS8" firstAttribute="top" secondItem="J2b-F0-dkp" secondAttribute="top" id="Au3-iH-Ovc"/>
@ -680,7 +657,7 @@ Share with concerned party only</string>
</constraints>
<viewLayoutGuide key="safeArea" id="12g-Fg-xfs"/>
</view>
<size key="freeformSize" width="375" height="910"/>
<size key="freeformSize" width="375" height="1000"/>
<connections>
<outlet property="accountNoLabel" destination="Mle-zI-ZDV" id="Q1w-Ff-TGE"/>
<outlet property="accountNoView" destination="Z4W-0Y-NE6" id="du4-ij-gJO"/>

22
GME Remit/Modules/SendMoneyModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -65,7 +65,6 @@ class SendMoneyReceiptViewController: UIViewController {
@IBOutlet weak var successMessageTitleLabel: UILabel!
@IBOutlet weak var concernedPartyText: UILabel!
@IBOutlet weak var tansactionDateTitleLabel: UILabel!
@IBOutlet weak var recieverTitleLabel: UILabel!
@IBOutlet weak var addressTitleLabel: UILabel!
@ -175,16 +174,27 @@ class SendMoneyReceiptViewController: UIViewController {
func setupBackButton() {
if shouldShowCancelAmmendButton {
self.navigationController?.navigationItem.hidesBackButton = false
let button = UIBarButtonItem.init(image: #imageLiteral(resourceName: "backIconBlack"), style: UIBarButtonItem.Style.plain, target: self, action: #selector(self.back))
let button = UIBarButtonItem.init(
image: #imageLiteral(resourceName: "backIconBlack"), style: UIBarButtonItem.Style.plain,
target: self,
action: #selector(self.back)
)
self.navigationItem.backBarButtonItem = button
self.doneButton.isHidden = true
self.transactionReportButtonStackView.isHidden = false
}
else {
} else {
self.doneButton.isHidden = false
self.doneButton.backgroundColor = .themeRed
self.doneButton.layer.cornerRadius = 5
self.transactionReportButtonStackView.isHidden = true
self.navigationController?.navigationItem.hidesBackButton = true
let button = UIBarButtonItem.init(title: nil, style: UIBarButtonItem.Style.plain, target: nil, action: nil)
let button = UIBarButtonItem.init(
title: nil,
style: UIBarButtonItem.Style.plain,
target: nil,
action: nil
)
self.navigationItem.leftBarButtonItem = button
}
}
@ -199,7 +209,6 @@ class SendMoneyReceiptViewController: UIViewController {
let lastName = self.reciept?.rLastName ?? ""
let middleName = self.reciept?.rMiddleName ?? ""
let fullName = firstName + " " + middleName + " " + lastName
self.recieverNameLabelLabel.text = fullName.uppercased()
@ -251,4 +260,3 @@ extension SendMoneyReceiptViewController: SendMoneyReceiptViewInterface {
self.reciept = model
}
}

16
GME Remit/Modules/SendMoneyModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
View File

@ -136,7 +136,7 @@ class SendMoneyVerificationViewController: UITableViewController {
private func setup() {
configureLanguage()
agreeAndSendButton.layer.cornerRadius = 10
agreeAndSendButton.layer.cornerRadius = 5
agreeAndSendButton.backgroundColor = .themeRed
agreeAndSendButton.titleLabel?.font = .sanfrancisco(.medium, size: 18)
@ -182,7 +182,7 @@ class SendMoneyVerificationViewController: UITableViewController {
}
func showSecureKeypad(){
func showSecureKeypad() {
let secureKeypad = SecureKeypad(target: self)
secureKeypad.delegate = self
secureKeypad.present(animated: true)
@ -253,9 +253,9 @@ extension SendMoneyVerificationViewController: SendMoneyVerificationViewInterfac
}
func showLoading() {
if let _ = hudDelegate {
if hudDelegate != nil {
self.hudDelegate?.showLoading()
}else {
} else {
self.showProgressHud()
}
@ -276,14 +276,18 @@ extension SendMoneyVerificationViewController {
// MARK: - BiometricAuthenticationViewControllerDelegate
extension SendMoneyVerificationViewController: BiometricAuthenticationViewControllerDelegate {
func viewController(_ viewController: BiometricAuthenticationViewController, informationTitleLabel titleLabel: UILabel, authenticationButton button: UIButton) {
func viewController(
_ viewController: BiometricAuthenticationViewController,
informationTitleLabel titleLabel: UILabel,
authenticationButton button: UIButton
) {
titleLabel.text = "bio_sendmoney_intro_text".localized()
button.setTitle("send_money_text".localized(), for: .normal)
}
func didComplete(_ viewController: BiometricAuthenticationViewController) {
self.isUsingBiometricAuth = true
viewController.dismiss(animated: true){
viewController.dismiss(animated: true) {
guard let encryptedPW = KeyChain.shared.get(key: .password) else{
MainWireframe.logoutWarningAlert(message: "To use biometrics authentication you have to login again.")
return

2
GME Remit/Modules/SideMenu/Auto refund/AutoRefundsViewController.swift
View File

@ -61,7 +61,7 @@ class AutoRefundsViewController: UIViewController {
headerTitleLabel.textColor = .themeRed
refundButton.backgroundColor = .themeRed
amountTextfield.textColor = .themeRed
refundButton.layer.cornerRadius = 10
refundButton.layer.cornerRadius = 5
}
@objc private func editingChanged(_ sender: UITextField) {

8
GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
View File

@ -262,7 +262,7 @@ class SplashScreenViewController: UIViewController {
dropDownImageView.image = image
dropDownImageView.tintColor = UIColor.white
exchangeRootView.layer.cornerRadius = 10
exchangeRootView.layer.cornerRadius = 5
exchangeRootView.clipsToBounds = true
exchangeRootView.layer.addShadow(offset: CGSize(width: 2, height: 2))
@ -285,7 +285,7 @@ class SplashScreenViewController: UIViewController {
languageBackGroundView.addGestureRecognizer(languageSelectionGuesture)
languageBackGroundView.layer.cornerRadius = 10
languageBackGroundView.layer.cornerRadius = 5
languageBackGroundView.clipsToBounds = true
languageBackGroundView.layer.addShadow(offset: CGSize.init(width: 2, height: 2))
NotificationCenter.default.addObserver(
@ -336,8 +336,8 @@ class SplashScreenViewController: UIViewController {
}
private func setUpButtons() {
buttonSignUp.layer.cornerRadius = 10
buttonLogin.layer.cornerRadius = 10
buttonSignUp.layer.cornerRadius = 5
buttonLogin.layer.cornerRadius = 5
buttonLogin.layer.borderWidth = 1
buttonLogin.layer.borderColor = UIColor.white.cgColor
buttonSignUp.layer.borderWidth = 1

56
GME Remit/MultiLanguages/en.lproj/Localizable.strings
View File

@ -94,7 +94,7 @@
"state_text" = "State/Province";
"state_placeholder_text" = "Please select a state/province";
"district_text" = "District";
"district_placeholder_text" = "Please select a state/province";
"district_placeholder_text" = "Please select a district";
"email_text_optional" = "Email";
"placeholder_enter_receiver_email_text" = "Enter receiver's email address";
"transfer_reason_text" = "Transfer Reason";
@ -540,3 +540,57 @@
// Home's messageView
"autodebit_account_required_message" = "Please add your Auto Debit account to start using GME services.";
// Dynamic recipient
"recipient_text" = "Recipient";
"country_text" = "Country";
"payment_mode_text" = "Payment Mode";
"bank_text" = "Bank";
"branch_text" = "Branch";
"account_text" = "Account";
"first_name_text" = "First Name";
"middle_name_text" = "Middle Name";
"last_name_text" = "Last Name";
"full_name_text" = "Full Name";
"first_name_local_text" = "First Name as Your Language";
"middle_name_local_text" = "Middle Name as Your Language";
"last_name_local_text" = "Last Name as Your Language";
"full_name_local_text" = "Full Name as Your Language";
"id_type_text" = "ID Type";
"id_number_text" = "ID Number";
"mobile_text" = "Mobile No.";
"email_text" = "Email";
"state_province_text" = "State/Province";
"district_text" = "District";
"city_text" = "City";
"address_text" = "Address";
"relation_text" = "Relation";
"reason_text" = "Transfer Reason";
"country_placeholder_text" = "Select Recipient's Country";
"payment_mode_placeholder_text" = "Select Recipient's Payment Mode";
"bank_placeholder_text" = "Select Recipient's Bank";
"branch_placeholder_text" = "Select Recipient's Branch";
"account_placeholder_text" = "Enter Recipient's Bank Account";
"first_name_placeholder_text" = "Enter Recipient's First Name";
"middle_name_placeholder_text" = "Enter Recipient's Middle Name";
"last_name_placeholder_text" = "Enter Recipient's Last Name";
"full_name_placeholder_text" = "Enter Recipient's Full Name";
"first_name_local_placeholder_text" = "Enter Recipient's First Name as Your Language";
"middle_name_local_placeholder_text" = "Enter Recipient's Middle Name as Your Language";
"last_name_local_placeholder_text" = "Enter Recipient's Last Name as Your Language";
"full_name_local_placeholder_text" = "Enter Recipient's Full Name as Your Language";
"id_type_placeholder_text" = "Select Recipient's ID Type";
"id_number_placeholder_text" = "Enter Recipient's ID Number";
"mobile_placeholder_text" = "Enter Recipient's Mobile No.";
"email_placeholder_text" = "Enter Recipient's Email";
"stateProvince_placeholder_text" = "Select Recipient's State/Province";
"district_placeholder_text" = "Select Recipient's District";
"city_placeholder_text" = "Enter Recipient's City";
"address_placeholder_text" = "Enter Recipient's Address";
"relation_placeholder_text" = "Select Recipient's Relation";
"reason_placeholder_text" = "Select Recipient's Transfer Reason";
"recipient_add_success_message_text" = "Do you want to send money to\n xxx?";
"general_length_error_text" = "It must be at least xxx and less than ooo characters.";

2
GME Remit/Utilities/SearchAddress/User Interface/View/Cell/AddressTableViewCell.swift
View File

@ -19,7 +19,7 @@ class AddressTableViewCell: UITableViewCell {
self.jibunAddress.text = model.jibunAddr
self.zipCodeLabel.text = model.zipNo
self.contentView.layer.cornerRadius = 10
self.contentView.layer.cornerRadius = 5
}
}

4
GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift
View File

@ -105,8 +105,8 @@ extension TablePresenterViewController: TablePresenterViewInterface {
// MARK: Other Functions
extension TablePresenterViewController {
private func setup() {
mainView.layer.cornerRadius = 10
closeButton.layer.cornerRadius = 10
mainView.layer.cornerRadius = 5
closeButton.layer.cornerRadius = 5
searchBar.delegate = self

Write Preview
Loading…
Cancel
Save