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

Merge pull request 'Change Request #379 Test Defect #411' (#10) from #411 into feature/bugfixes 

Reviewed-on: http://202.166.220.79:3000/JME-JAPAN/JME-IOS/pulls/10
pull/12/head
Yajan 3 years ago
parent
7cb88e81b4 abfd52be6e
commit
1d0b996ffd
52 changed files with 218 additions and 156 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. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 12
      GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  3. 2
      GME Remit/Modules/ForgotPassword/User Interface/View/ForgotPasswordViewController.swift
  4. 2
      GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
  5. 2
      GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
  6. 2
      GME Remit/Modules/Profile/ChangePinAndPasswordViewController.swift
  7. 3
      GME Remit/Modules/Profile/ProfileChangePasswordViewController.swift
  8. 2
      GME Remit/Modules/Profile/ProfileChangePinViewController.swift
  9. 2
      GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift
  10. 9
      GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard
  11. 4
      GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift
  12. 2
      GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift
  13. 9
      GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard
  14. 2
      GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift
  15. 2
      GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift
  16. 60
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard
  17. 10
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
  18. 7
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
  19. 6
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  20. 2
      GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceiptViewController.swift
  21. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift
  22. 40
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  23. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  24. 4
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  25. 5
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
  26. 2
      GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift
  27. 12
      GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift
  28. 4
      GME Remit/Modules/SideMenu/SettingViewController.swift
  29. 6
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreen.storyboard
  30. 2
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
  31. 2
      GME Remit/Modules/Withdraw/WithdrawFromWallet/User Interface/View/WithdrawFromWalletViewController.swift
  32. 2
      GME Remit/Modules/Withdraw/WithdrawFromWalletDetail/User Interface/View/WithdrawFromWalletDetailViewController.swift
  33. 1
      GME Remit/MultiLanguages/bn.lproj/Localizable.strings
  34. 9
      GME Remit/MultiLanguages/en.lproj/Localizable.strings
  35. 1
      GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings
  36. 1
      GME Remit/MultiLanguages/id.lproj/Localizable.strings
  37. 1
      GME Remit/MultiLanguages/km.lproj/Localizable.strings
  38. 1
      GME Remit/MultiLanguages/ko.lproj/Localizable.strings
  39. 1
      GME Remit/MultiLanguages/mn.lproj/Localizable.strings
  40. 1
      GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings
  41. 1
      GME Remit/MultiLanguages/my.lproj/Localizable.strings
  42. 13
      GME Remit/MultiLanguages/ne.lproj/Localizable.strings
  43. 1
      GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings
  44. 1
      GME Remit/MultiLanguages/si.lproj/Localizable.strings
  45. 1
      GME Remit/MultiLanguages/th.lproj/Localizable.strings
  46. 1
      GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings
  47. 1
      GME Remit/MultiLanguages/uz.lproj/Localizable.strings
  48. 4
      GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
  49. 31
      GME Remit/Shared/PasswordInputViewController.xib
  50. 8
      GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib
  51. 63
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard
  52. 6
      GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenterViewController.swift

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -7565,7 +7565,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 16;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
@ -7605,7 +7605,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13;
CURRENT_PROJECT_VERSION = 16;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;

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

@ -243,12 +243,12 @@ class ExchangeRatesViewController: UIViewController {
[backgroundViewCountryLabel1, backgroundViewCountryLabel2]
.forEach { $0?.layer.cornerRadius = 5 }
[exchangeBackground1, exchangeBackground2]
.forEach {
$0?.layer.borderWidth = 1
$0?.layer.borderColor = UIColor.themeSeparate.cgColor //init(hex: "#E0E0E0").cgColor
$0?.layer.cornerRadius = 5
}
// [exchangeBackground1, exchangeBackground2]
// .forEach {
// $0?.layer.borderWidth = 1
// $0?.layer.borderColor = UIColor.themeSeparate.cgColor //init(hex: "#E0E0E0").cgColor
// $0?.layer.cornerRadius = 5
// }
let dropDownImage = #imageLiteral(resourceName: "dropdown_grey").withRenderingMode(.alwaysOriginal)
let image = dropDownImage

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

@ -159,7 +159,7 @@ extension ForgotPasswordViewController: ForgotPasswordViewInterface {
}
func show(message: String) {
self.alertWithOk(type: .normal, message: message, title: "Success", okTitle: "Ok") {
self.alertWithOk(type: .normal, message: message, title: "success_text".localized(), okTitle: "Ok") {
self.presenter?.cancel()
}
}

2
GME Remit/Modules/Home/User Interface/View/Cell/HomeCollectionTableViewCell.swift
View File

@ -113,7 +113,7 @@ class HomeCollectionTableViewCell: UITableViewCell, UICollectionViewDelegateFlow
let receiversMenu = HomeCollectionModel()
receiversMenu.index = 5
receiversMenu.title = "Renew ID"
receiversMenu.title = "renewId_text".localized()
let receiverImage = UIImage.init(named: "renew_id")
receiversMenu.icon = receiverImage

2
GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
View File

@ -600,7 +600,7 @@ extension HomeViewController: HomeViewInterface {
}
func success() {
self.alertWithOk(type: .success, message: "OTP Verification completed", title: "Success", okTitle: "ok_text".localized()) {
self.alertWithOk(type: .success, message: "OTP Verification completed", title: "success_text".localized(), okTitle: "ok_text".localized()) {
self.presenter?.viewIsReady()
}
}

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

@ -205,7 +205,7 @@ class ChangePinAndPasswordViewController: UIViewController {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok") {
KeyChain.shared.save(data: self.encryptedNewPassword, key: .password)
self.navigationController?.popViewController(animated: true)

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

@ -87,6 +87,7 @@ class ProfileChangePasswordViewController: UIViewController {
configureLanguage()
saveButton.layer.cornerRadius = 6
saveButton.setTitle("save_text".localized(), for: .normal)
}
override func viewWillAppear(_ animated: Bool) {
@ -149,7 +150,7 @@ class ProfileChangePasswordViewController: UIViewController {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok") {
KeyChain.shared.save(data: self.encryptedPassword, key: .password)
self.navigationController?.popViewController(animated: true)

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

@ -87,7 +87,7 @@ class ProfileChangePinViewController: UIViewController {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok") {
self.navigationController?.popViewController(animated: true)
}

2
GME Remit/Modules/RedeemCashPickUp/User Interface/View/RedeemCashPickUpViewController.swift
View File

@ -97,7 +97,7 @@ extension RedeemCashPickUpViewController: RedeemCashPickUpViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
}

9
GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistration.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -95,7 +95,7 @@
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lfW-YA-IwJ">
<rect key="frame" x="20" y="508" width="335" height="50"/>
<color key="backgroundColor" name="ThemeText"/>
<color key="backgroundColor" name="ThemeRed"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="62Z-tl-gf9"/>
</constraints>
@ -223,6 +223,9 @@ User Registration</string>
<image name="ic_mobile" width="14" height="24"/>
<image name="jme_logo" width="93" height="60"/>
<image name="profile" width="26" height="26"/>
<namedColor name="ThemeRed">
<color red="0.86274509803921573" green="0.078431372549019607" blue="0.19215686274509805" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="ThemeText">
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>

4
GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift
View File

@ -50,7 +50,7 @@ class ExistingUserRegistrationViewController: UIViewController {
private var isValid = false {
didSet {
proceedBttn.isEnabled = isValid
proceedBttn.backgroundColor = isValid ? .themeRed : .themeText
proceedBttn.backgroundColor = isValid ? .themeRed : .themeRed
}
}
@ -203,7 +203,7 @@ extension ExistingUserRegistrationViewController: ExistingUserRegistrationViewIn
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
guard let id = self.idNumberTxtField.text else {

2
GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift
View File

@ -245,7 +245,7 @@ extension UserRegistrationViewController: UserRegistrationViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
guard let id = self.userIDTxtField.text else{

9
GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -194,7 +194,7 @@ JME</string>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Already have an Account?" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ym6-5o-j11">
<rect key="frame" x="0.0" y="0.0" width="153.5" height="30"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<color key="textColor" systemColor="secondaryLabelColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lxk-cQ-atB">
@ -315,6 +315,9 @@ JME</string>
<namedColor name="ThemeText">
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="secondaryLabelColor">
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>

2
GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift
View File

@ -213,7 +213,7 @@ extension NewUserRegisterViewController: NewUserRegisterViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
guard let id = self.idTextField.text else {

2
GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift
View File

@ -72,7 +72,7 @@ extension OtpVerificationViewController: OtpVerificationViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
}

60
GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -124,7 +124,7 @@
<rect key="frame" x="0.0" y="130" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isUseTitle" value="YES"/>
@ -188,7 +188,7 @@
<rect key="frame" x="0.0" y="325" width="315" height="45"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Address" textAlignment="natural" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="g6b-c1-elD" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="283" height="45"/>
<rect key="frame" x="0.0" y="0.0" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
@ -202,17 +202,16 @@
<userDefinedRuntimeAttribute type="string" keyPath="titleText" value="Address"/>
</userDefinedRuntimeAttributes>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jrn-Np-285">
<rect key="frame" x="283" y="0.0" width="32" height="45"/>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jrn-Np-285">
<rect key="frame" x="0.0" y="0.0" width="7" height="45"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p8D-ri-Y0a">
<rect key="frame" x="5" y="13" width="25" height="25"/>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p8D-ri-Y0a">
<rect key="frame" x="5" y="13" width="0.0" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="eZc-Pm-Uun"/>
<constraint firstAttribute="width" constant="25" id="jP2-kv-ZoD"/>
<constraint firstAttribute="width" id="jP2-kv-ZoD"/>
</constraints>
<color key="tintColor" name="ThemeRed"/>
<state key="normal" image="gps"/>
<connections>
<action selector="gpsButtonTapped:" destination="HSb-ou-7T5" eventType="touchUpInside" id="ntz-f5-p7K"/>
</connections>
@ -309,7 +308,7 @@
</stackView>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EE0-NK-Hdn">
<rect key="frame" x="0.0" y="715" width="315" height="50"/>
<color key="backgroundColor" name="ThemeText"/>
<color key="backgroundColor" name="ThemeRed"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="D00-1q-w5H"/>
</constraints>
@ -394,13 +393,13 @@
<rect key="frame" x="110" y="8" width="203" height="116"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wP4-uJ-zT1">
<rect key="frame" x="49.5" y="5" width="54" height="17.5"/>
<rect key="frame" x="51" y="5" width="51.5" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jpj-a0-JRM">
<rect key="frame" x="135" y="86" width="58" height="24"/>
<rect key="frame" x="138" y="86" width="55" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" name="ThemeBlue"/>
@ -479,13 +478,13 @@
<rect key="frame" x="110" y="8" width="203" height="116"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ctu-95-Rc0">
<rect key="frame" x="50" y="5" width="53" height="17.5"/>
<rect key="frame" x="52.5" y="5" width="48.5" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U0s-mL-64k">
<rect key="frame" x="135" y="86" width="58" height="24"/>
<rect key="frame" x="138" y="86" width="55" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" name="ThemeBlue"/>
@ -564,16 +563,16 @@
<rect key="frame" x="110" y="8" width="203" height="92"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="29w-jx-D6N">
<rect key="frame" x="0.0" y="20" width="203" height="52.5"/>
<rect key="frame" x="0.0" y="19.5" width="203" height="53"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Side ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YT8-le-Q7t">
<rect key="frame" x="0.0" y="0.0" width="49" height="17.5"/>
<rect key="frame" x="0.0" y="0.0" width="45.5" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WTJ-BS-43g">
<rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
<rect key="frame" x="0.0" y="29" width="55" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@ -633,7 +632,7 @@
</view>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QBC-Fu-PsV">
<rect key="frame" x="0.0" y="383" width="315" height="45"/>
<color key="backgroundColor" name="ThemeText"/>
<color key="backgroundColor" name="ThemeRed"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="0FB-Ok-i85"/>
</constraints>
@ -792,42 +791,41 @@
</scenes>
<designables>
<designable name="0Lm-Yp-fcs">
<size key="intrinsicContentSize" width="124.5" height="34"/>
<size key="intrinsicContentSize" width="120" height="34"/>
</designable>
<designable name="4Ht-H7-uZe">
<size key="intrinsicContentSize" width="188.5" height="34"/>
<size key="intrinsicContentSize" width="181.5" height="34"/>
</designable>
<designable name="IsM-vf-1HP">
<size key="intrinsicContentSize" width="118" height="34"/>
<size key="intrinsicContentSize" width="113.5" height="34"/>
</designable>
<designable name="JfT-uS-a2a">
<size key="intrinsicContentSize" width="140" height="34"/>
<size key="intrinsicContentSize" width="134" height="34"/>
</designable>
<designable name="SVD-OG-9os">
<size key="intrinsicContentSize" width="170" height="34"/>
<size key="intrinsicContentSize" width="160.5" height="34"/>
</designable>
<designable name="g6b-c1-elD">
<size key="intrinsicContentSize" width="80" height="34"/>
<size key="intrinsicContentSize" width="77.5" height="34"/>
</designable>
<designable name="hEr-Pf-Iwt">
<size key="intrinsicContentSize" width="73.5" height="34"/>
<size key="intrinsicContentSize" width="70" height="34"/>
</designable>
<designable name="hX6-tX-ygh">
<size key="intrinsicContentSize" width="185" height="34"/>
<size key="intrinsicContentSize" width="177.5" height="34"/>
</designable>
<designable name="kXC-Oc-efk">
<size key="intrinsicContentSize" width="129" height="34"/>
<size key="intrinsicContentSize" width="124.5" height="34"/>
</designable>
<designable name="pay-02-uVZ">
<size key="intrinsicContentSize" width="144" height="34"/>
<size key="intrinsicContentSize" width="138" height="34"/>
</designable>
<designable name="qzT-Cz-Kp8">
<size key="intrinsicContentSize" width="140" height="34"/>
<size key="intrinsicContentSize" width="134" height="34"/>
</designable>
</designables>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="gps" width="20" height="20"/>
<image name="ic_passport_picture" width="256" height="256"/>
<image name="passport_new" width="80" height="72"/>
<image name="personal_info" width="24" height="24"/>

10
GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
View File

@ -278,7 +278,7 @@ class ExistingUserKycViewController: UIViewController {
case monthlyIncome:
if !textField.isValid {
textField.errorMessage = "invalidEmailId_text".localized()
textField.errorMessage = "invalidMonthlyIncome_text".localized()
textField.errorColor = .themeRed
}
@ -650,7 +650,7 @@ class ExistingUserKycViewController: UIViewController {
.asDriverOnErrorJustComplete().drive(onNext: {[weak self] isEnable in
DispatchQueue.main.async {
self?.personalInfoSaveBttn.isEnabled = isEnable
self?.personalInfoSaveBttn.backgroundColor = isEnable ? .themeRed : .themeText
self?.personalInfoSaveBttn.backgroundColor = isEnable ? .themeRed : .themeRed
}
}).disposed(by: disposeBag)
@ -659,7 +659,7 @@ class ExistingUserKycViewController: UIViewController {
.asDriverOnErrorJustComplete().drive(onNext: {[weak self] isEnable in
DispatchQueue.main.async {
self?.pictureSaveBttn.isEnabled = isEnable
self?.pictureSaveBttn.backgroundColor = isEnable ? .themeRed : .themeText
self?.pictureSaveBttn.backgroundColor = isEnable ? .themeRed : .themeRed
}
}).disposed(by: disposeBag)
@ -681,8 +681,8 @@ class ExistingUserKycViewController: UIViewController {
self.businessType.titleText = "employee_business_type_text".localized()
self.emailAddress.placeholder = "email_address_text".localized()
self.emailAddress.titleText = "email_address_text".localized()
self.address.placeholder = "address_text".localized()
self.address.titleText = "address_text".localized()
self.address.placeholder = "additional_address_text".localized()
self.address.titleText = "additional_address_text".localized()
self.idInfoLabel.text = "id_information_text".localized()
self.idType.placeholder = "id_type_text".localized()
self.idType.titleText = "id_type_text".localized()

7
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -122,7 +122,7 @@
<rect key="frame" x="0.0" y="130" width="335" height="45"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<textInputTraits key="textInputTraits"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isShowTitle" value="NO"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isUseTitle" value="YES"/>
@ -1146,6 +1146,7 @@
<outlet property="idTypeTextField" destination="Vgo-ox-p7M" id="PbL-4l-Wk9"/>
<outlet property="mobileNumberTextField" destination="tYu-as-9PW" id="2TB-6E-zDL"/>
<outlet property="monthlyIncomeTextField" destination="g3f-ps-0B2" id="r2v-cC-Z1W"/>
<outlet property="nameNationalityLabel" destination="wAi-G0-dKu" id="9sc-Up-NW3"/>
<outlet property="occupationTxtField" destination="wSR-s5-0bP" id="Y8l-tN-8mn"/>
<outlet property="personalInformationGroupImageView" destination="tfT-KO-WMf" id="7jl-kI-cE2"/>
<outlet property="personalInformationLabel" destination="ijC-7a-ShJ" id="Lvm-JE-siJ"/>

6
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
View File

@ -116,6 +116,7 @@ class KYCVerifyStep1ViewController: UIViewController {
@IBOutlet weak var checkButton: UIButton!
@IBOutlet weak var termsWebView: WKWebView!
@IBOutlet weak var nameNationalityLabel: UILabel!
// MARK: VC's Life cycle
var isURLLoaded = false
@ -124,6 +125,7 @@ class KYCVerifyStep1ViewController: UIViewController {
self.isFirst = (self.step == .first)
setup()
setWebViewDelegate()
nameNationalityLabel.text = "saveButtonInfo_text".localized()
}
override func viewWillAppear(_ animated: Bool) {
@ -847,7 +849,7 @@ extension KYCVerifyStep1ViewController {
print("enabled:\(isEnable)")
DispatchQueue.main.async {
self?.personalSaveButton.isEnabled = isEnable
self?.personalSaveButton.backgroundColor = isEnable ? .themeRed : .themeText
self?.personalSaveButton.backgroundColor = isEnable ? .themeRed : .themeRed
}
}).disposed(by: disposeBag)
@ -856,7 +858,7 @@ extension KYCVerifyStep1ViewController {
.asDriverOnErrorJustComplete().drive(onNext: {[weak self] isEnable in
DispatchQueue.main.async {
self?.pictureSaveButton.isEnabled = isEnable
self?.pictureSaveButton.backgroundColor = isEnable ? .themeRed : .themeText
self?.pictureSaveButton.backgroundColor = isEnable ? .themeRed : .themeRed
}
}).disposed(by: disposeBag)

2
GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceiptViewController.swift
View File

@ -388,7 +388,7 @@ extension InboundReceiptViewController: InboundReceiptViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
self.navigationController?.popToRootViewController(animated: true)

2
GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift
View File

@ -181,7 +181,7 @@ extension CDDIViewControllerViewController: CDDIViewControllerViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
}

40
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -50,39 +50,37 @@
<rect key="frame" x="0.0" y="0.0" width="355" height="270"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Successful!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JkE-DM-feU">
<rect key="frame" x="77.666666666666671" y="116.33333333333333" width="199.66666666666663" height="26.333333333333329"/>
<rect key="frame" x="77.666666666666671" y="168.33333333333334" width="199.66666666666663" height="26.333333333333343"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="22"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N0H-j3-s7Q">
<rect key="frame" x="177.66666666666666" y="150.66666666666666" width="0.0" height="0.0"/>
<rect key="frame" x="177.66666666666666" y="202.66666666666666" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="30"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send to" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLY-tl-YiX">
<rect key="frame" x="147.33333333333334" y="158.66666666666666" width="60.333333333333343" height="21.666666666666657"/>
<rect key="frame" x="147.33333333333334" y="210.66666666666666" width="60.333333333333343" height="21.666666666666657"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oTd-t6-aTn">
<rect key="frame" x="177.66666666666666" y="188.33333333333334" width="0.0" height="0.0"/>
<rect key="frame" x="177.66666666666666" y="240.33333333333331" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="24"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JME Control No. XXXXXXXXX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NUp-Lj-dKf">
<rect key="frame" x="62.333333333333329" y="196.33333333333334" width="230.66666666666669" height="21.666666666666657"/>
<rect key="frame" x="62.333333333333329" y="248.33333333333329" width="230.66666666666669" height="21.666666666666657"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iff-4Y-StW">
<rect key="frame" x="10" y="226" width="335" height="36"/>
<string key="text">Please keep this Japan Money Express control no.
very secure.</string>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iff-4Y-StW">
<rect key="frame" x="10" y="270" width="335" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -98,9 +96,9 @@ very secure.</string>
<constraint firstItem="NUp-Lj-dKf" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="OOv-1u-5XS"/>
<constraint firstItem="pLY-tl-YiX" firstAttribute="top" secondItem="N0H-j3-s7Q" secondAttribute="bottom" constant="8" id="P6x-4M-xJP"/>
<constraint firstItem="NUp-Lj-dKf" firstAttribute="top" secondItem="oTd-t6-aTn" secondAttribute="bottom" constant="8" id="QxP-4N-s7X"/>
<constraint firstAttribute="bottom" secondItem="iff-4Y-StW" secondAttribute="bottom" constant="8" id="YPp-Tc-Cz3"/>
<constraint firstAttribute="bottom" secondItem="iff-4Y-StW" secondAttribute="bottom" id="YPp-Tc-Cz3"/>
<constraint firstItem="N0H-j3-s7Q" firstAttribute="top" secondItem="JkE-DM-feU" secondAttribute="bottom" constant="8" id="YSd-yf-ddm"/>
<constraint firstItem="iff-4Y-StW" firstAttribute="top" secondItem="NUp-Lj-dKf" secondAttribute="bottom" constant="8" id="dSC-Ug-btC"/>
<constraint firstItem="iff-4Y-StW" firstAttribute="top" secondItem="NUp-Lj-dKf" secondAttribute="bottom" id="dSC-Ug-btC"/>
<constraint firstItem="N0H-j3-s7Q" firstAttribute="centerX" secondItem="rub-fY-JfS" secondAttribute="centerX" id="pCQ-F8-hp1"/>
<constraint firstAttribute="trailing" secondItem="iff-4Y-StW" secondAttribute="trailing" constant="10" id="xrc-1S-xao"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="270" id="z7w-5x-v3N"/>
@ -174,13 +172,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0F1-wm-gWq" userLabel="Relation">
<rect key="frame" x="0.0" y="0.0" width="75" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="75.666666666666671" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Qz4-OT-jiF">
<rect key="frame" x="75" y="0.0" width="238" height="50"/>
<rect key="frame" x="75.666666666666671" y="0.0" width="237.33333333333331" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -307,13 +305,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="900" text="Payout Agent" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bL-P8-CBf" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="155.66666666666666" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="85" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgd" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="98o-ui-Lmx">
<rect key="frame" x="157.66666666666663" y="0.0" width="155.33333333333337" height="50"/>
<rect key="frame" x="87" y="0.0" width="226" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -396,13 +394,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AIR-Co-29n" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="107" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="107.33333333333333" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Mle-zI-ZDV">
<rect key="frame" x="109" y="0.0" width="204" height="0.0"/>
<rect key="frame" x="109.33333333333336" y="0.0" width="203.66666666666663" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -454,13 +452,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ex Rate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pTI-kV-y2i" userLabel="Reciever">
<rect key="frame" x="0.0" y="0.0" width="47.666666666666664" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="47.333333333333336" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="E9N-rz-5eO">
<rect key="frame" x="49.666666666666657" y="0.0" width="263.33333333333337" height="50"/>
<rect key="frame" x="49.333333333333343" y="0.0" width="263.66666666666663" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>

2
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -32,7 +32,7 @@ class SendMoneyReceiptViewController: UIViewController {
let transferSuccessText = "transfer_success_text".localized()
let transactionDateText = "transaction_date_text".localized()
let recieverText = "receiver_text".localized()
let addressText = "address_text".localized()
let addressText = "address_key_text".localized()
let mobileNoText = "mobile_number_title".localized()
let payoutAgentText = "payout_agent_text".localized()
let totalSentAmountText = "total_sent_amount_text".localized()

4
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
View File

@ -235,8 +235,8 @@ extension SendMoneyVerificationViewController: SendMoneyVerificationViewInterfac
self.alertWithOk(
type: .success,
message: "Transfer Successful",
title: "Success",
message: "Transfer Successful!",
title: "success_text".localized(),
okTitle: "OK"
) {
if let id = model?.id {

5
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
View File

@ -59,6 +59,7 @@ class TermsAndConditionViewController: UIViewController {
self.webView.scrollView.bounces = false
self.setup()
self.setWebViewDelegate()
self.continueButton.setTitle("send_money_text".localized(), for: .normal)
}
// MARK: IBActions
@ -127,7 +128,7 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
}
@ -142,7 +143,7 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface {
self.alertWithOk(
type: .success,
message: "Transfer Successful",
title: "Success",
title: "success_text".localized(),
okTitle: "OK"
) {
if let id = model?.id {

2
GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift
View File

@ -22,7 +22,7 @@ class DatePickerViewController: UIViewController {
let fromPlaceholderText = "placeholder_from_text".localized()
let toPlaceholderText = "placeholder_to_text".localized()
let cancelButtonText = "cancel_text".localized()
let searchButtonText = "search_text".localized()
let searchButtonText = "ok_text".localized()
}
var completion: ((_ from: String?, _ to: String?) -> Void)?

12
GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift
View File

@ -51,6 +51,7 @@ class RenewIDViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setup()
self.setupLocalization()
}
// MARK: IBActions
@ -74,6 +75,11 @@ class RenewIDViewController: UIViewController {
setUI()
setUIBinding()
setBinding()
setTitle(title: "renewId_text".localized())
}
private func setTitle(title: String) {
self.navigationItem.title = title
}
private func setUI() {
@ -91,6 +97,10 @@ class RenewIDViewController: UIViewController {
renewButton.layer.cornerRadius = 6
}
private func setupLocalization() {
self.primaryIdTitleLabel.text = "primaryIdDocuments_text".localized()
}
private func showSample(type: PhotoType) {
let image: UIImage?
switch type {
@ -300,7 +310,7 @@ extension RenewIDViewController: RenewIDViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
print("hi")

4
GME Remit/Modules/SideMenu/SettingViewController.swift
View File

@ -138,14 +138,14 @@ class SettingViewController: UIViewController {
self.changePinButton.setTitle("changepin_text".localized(), for: .normal)
self.settingButton.setTitle("language_text".localized(), for: .normal)
self.settingLabel.text = "setting_text".localized()
useBiometricAuthLabel.text = "Login Biometric Setup"
useBiometricAuthLabel.text = "biometric_setup".localized()
}
private func configureLanguage() {
self.changePasswordButton.setTitle("change_password_text".localized(), for: .normal)
self.settingButton.setTitle("language_text".localized(), for: .normal)
self.changePinButton.setTitle("changepin_text".localized(), for: .normal)
self.useBiometricAuthLabel.text = "Login Biometric Setup"
self.useBiometricAuthLabel.text = "biometric_setup".localized()
}

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_0" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -288,7 +288,7 @@
<constraint firstAttribute="width" constant="1" id="Pm5-X5-Cis"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bebeficiary Gets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W2o-HO-SMm">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Beneficiary Gets" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W2o-HO-SMm">
<rect key="frame" x="8" y="106" width="133" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="B5Y-5s-2wp"/>

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

@ -246,7 +246,7 @@ class SplashScreenViewController: UIViewController {
hideNavBar()
setUpButtons()
appVersionLabel.text = Utility.getAppVersion()
appVersionLabel.text = "\(Utility.getAppVersion() ?? "") (jme)"
// appVersionLabel.text = "0.0.1(jme)"
setExchangeRateUI()
setSegmentedControl()

2
GME Remit/Modules/Withdraw/WithdrawFromWallet/User Interface/View/WithdrawFromWalletViewController.swift
View File

@ -94,7 +94,7 @@ extension WithdrawFromWalletViewController: WithdrawFromWalletViewInterface {
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
}

2
GME Remit/Modules/Withdraw/WithdrawFromWalletDetail/User Interface/View/WithdrawFromWalletDetailViewController.swift
View File

@ -112,7 +112,7 @@ extension WithdrawFromWalletDetailViewController: WithdrawFromWalletDetailViewIn
self.alertWithOk(
type: .success,
message: message,
title: "Success",
title: "success_text".localized(),
okTitle: "Ok"
) {
self.navigationController?.popToRootViewController(animated: true)

1
GME Remit/MultiLanguages/bn.lproj/Localizable.strings
View File

@ -84,6 +84,7 @@
"country_text" = " দেশ";
"placeholder_select_country_text" = " দেশ নির্বাচন করুণ ";
"address_text" = " ঠিকানা";
"address_key_text" = " ঠিকানা";
"placeholder_enter_receiver_address_text" = "প্রাপকের ঠিকানা";
"relation_text" = "সম্পর্ক";
"placeholder_select_relation_text" = "সম্পর্ক বাছাই করুণ";

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

@ -112,7 +112,7 @@
"placeholder_enter_receiver_lastname_text" = "Enter receiver's last name";
"country_text" = "Select Payout Country";
"placeholder_select_country_text" = "Select language";
"address_text" = "Address";
"address_key_text" = "Address";
"placeholder_enter_receiver_address_text" = "Enter receiver's address";
"relation_text" = "Relation";
"placeholder_select_relation_text" = " Select relation";
@ -481,7 +481,7 @@
"no_control_id_error_text" = "Japan Money Express Number Not found";
"no_transaction_id_error_text" = "Transaction ID Not Found";
"support_description_text" = "We are always here to help you.";
"support_description_text" = "We are always there to help you.";
// ReferalCode
"referral_code_text" = "Memebership ID";
@ -925,3 +925,8 @@
"send_money_success_header_text" = "We have received your\nremittance request for";
"send_money_success_body_text" = "Please make payment of";
"send_money_success_footer_text" = "to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number\nfor this transfer.";
"renewId_text" = "Renew ID";
"saveButtonInfo_text" = "Name, Nationality, Address and Sex are stated in the personal identification document submitted here.";
"biometric_setup" = "Login Biometric Setup";
"invalidMonthlyIncome_text" = "Invalid Monthly Income";

1
GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings
View File

@ -31,6 +31,7 @@
"transaction_date_text"="Petsa ng transaksyon";
"receiver_text"="Tagatanggap";
"address_text"="Address";
"address_key_text"="Address";
"payout_agent_text"="Ahente ng pagbabayad";
"mobile_text"="Mobile No.";
"account_number_text"="Account Number";

1
GME Remit/MultiLanguages/id.lproj/Localizable.strings
View File

@ -81,6 +81,7 @@
"country_text" = "Negara";
"placeholder_select_country_text" = "Pilih Negara";
"address_text" = "Alamat";
"address_key_text" = "Alamat";
"placeholder_enter_receiver_address_text" = "Masukan alamat penerima";
"relation_text" = "Relasi";
"placeholder_select_relation_text" = "Pilih Relasi";

1
GME Remit/MultiLanguages/km.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "ប្រទេស";
"placeholder_select_country_text" = "ជ្រើសរើសប្រទេស";
"address_text" = "អាស័យដ្ឋាន";
"address_key_text" = "អាស័យដ្ឋាន";
"placeholder_enter_receiver_address_text" = "បញ្ចូលអាស័យដ្ឋាន";
"relation_text" = "ទំនាក់ទំនង";
"placeholder_select_relation_text" = "ជ្រើសរើសទំនាក់ទំនង";

1
GME Remit/MultiLanguages/ko.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "국가";
"placeholder_select_country_text" = "국가 선택";
"address_text" = "주소";
"address_key_text" = "주소";
"placeholder_enter_receiver_address_text" = "수취인의 주소를 입력하세요.";
"relation_text" = "수취인과의 관계";
"placeholder_select_relation_text" = "관계 선택";

1
GME Remit/MultiLanguages/mn.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "Улс";
"placeholder_select_country_text" = "Улсын сонгоно уу";
"address_text" = "Хаяг";
"address_key_text" = "Хаяг";
"placeholder_enter_receiver_address_text" = "Хүлээн авагчийн хаягийг оруулна уу";
"relation_text" = "Таны хэн болох";
"placeholder_select_relation_text" = "Хүлээн авагчтай ямар холбоотой болохыг сонгоно уу";

1
GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings
View File

@ -81,6 +81,7 @@
"country_text" = "ႏိုင္ငံ";
"placeholder_select_country_text" = "ႏိုင္ငံ ေရြးခ်ယ္ရန္";
"address_text" = "လိပ္စာ";
"address_key_text" = "လိပ္စာ";
"placeholder_enter_receiver_address_text" = "ေငြလက္ခံသူလိပ္စာ ျဖည့္ပါ";
"relation_text" = "ေတာ္စပ္ပံု";
"placeholder_select_relation_text" = "ေတာ္စပ္ပံု ေရြးခ်ယ္ပါ";

1
GME Remit/MultiLanguages/my.lproj/Localizable.strings
View File

@ -87,6 +87,7 @@
"country_text" = "ႏိုင္ငံ";
"placeholder_select_country_text" = "ႏိုိုင္ငံေရြးခ်ယ္ရန္";
"address_text" = "လိပ္စာ";
"address_key_text" = "လိပ္စာ";
"placeholder_enter_receiver_address_text" = "ေငြလက္ခံသူလိပ္စာျဖည့္ပါ";
"relation_text" = "ေတာ္စပ္ပံု";
"placeholder_select_relation_text" = "ေတာ္္စပ္ပံုေရြးခ်ယ္ပါ";

13
GME Remit/MultiLanguages/ne.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "देश ";
"placeholder_select_country_text" = "देश छान्नुहोस ";
"address_text" = "ठेगाना ";
"address_key_text" = "ठेगाना ";
"placeholder_enter_receiver_address_text" = "पाउने व्यक्तिको ठेगाना ";
"relation_text" = "नाता ";
"placeholder_select_relation_text" = "नाता छान्नुहोस ";
@ -1339,3 +1340,15 @@
"requestedAmt_text"="अनुरोध गरिएको रकम";
"confirmSendingAmt_text"="रकम पठाउन निश्चित गर्नुहोस्";
"agree_and_submit_text" = "सहमत र बुझाउनुहोस्";
"success_text" = "सफल";
"renewId_text" = "ID नविकरण गर्नुहोस्";
"additional_address_text" = "थप ठेगाना";
"purpose_of_registration_text" = "दर्ता गर्ने उद्देश्य";
"saveButtonInfo_text" = "नाम, राष्ट्रीयता, ठेगाना र लिड़ग यहाँ पेश गरिएको व्यक्तिगत परिचय कागजातमा उल्लेख गरिएका छन्";
"changepin_text" = "PIN परिवर्तन गर्नुहोस्";
"biometric_setup" = "लगइन बायोमेट्रिक सेटअप गर्नुहोस्";
"invalidMonthlyIncome_text" = "उल्लेख गरिएको मासिक आय मिलेन";

1
GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings
View File

@ -87,6 +87,7 @@
"country_text" = "Страна";
"placeholder_select_country_text" = "Выбрать страну";
"address_text" = "Адрес";
"address_key_text" = "Адрес";
"placeholder_enter_receiver_address_text" = "Введите адрес получателя";
"relation_text" = "Кем приходитcя:";
"placeholder_select_relation_text" = "Выбрать из списка";

1
GME Remit/MultiLanguages/si.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "රට";
"placeholder_select_country_text" = "රට තෝරන්න";
"address_text" = "ලිපිනය";
"address_key_text" = "ලිපිනය";
"placeholder_enter_receiver_address_text" = "මුදල් ලබන්නාගේ ලිපිනය ඇතුලත් කරන්න";
"relation_text" = "නෑදෑකම";
"placeholder_select_relation_text" = "නෑදෑකම තෝරන්න";

1
GME Remit/MultiLanguages/th.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "ประเทศ";
"placeholder_select_country_text" = "เลือกประเทศ";
"address_text" = "ที่อยู่";
"address_key_text" = "ที่อยู่";
"placeholder_enter_receiver_address_text" = "กรุณาใส่ที่อยู่ของผู้รับเงิน";
"relation_text" = "ความสัมพันธ์กับผู้รับเงิน";
"placeholder_select_relation_text" = "กรุณาเลือกความสัมพันธ์";

1
GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings
View File

@ -81,6 +81,7 @@
"country_text" = "ملک";
"placeholder_select_country_text" = "ملک کا انتخاب کیجئے";
"address_text" = "پتہ";
"address_key_text" = "پتہ";
"placeholder_enter_receiver_address_text" = "وصول کنندہ کا پتہ درج کریں";
"relation_text" = "تعلق";
"placeholder_select_relation_text" = "تعلق منتخب کریں";

1
GME Remit/MultiLanguages/uz.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "Mamlakat";
"placeholder_select_country_text" = "Mamlakatni tanlang";
"address_text" = "Manzil";
"address_key_text" = "Manzil";
"placeholder_enter_receiver_address_text" = "Qabul qiluvchining manzilini keltiring";
"relation_text" = "Qabul qiluvchi sizga kim bo'ladi";
"placeholder_select_relation_text" = "Munosabatni tanlash";

4
GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
View File

@ -85,6 +85,7 @@
"country_text" = "Quốc gia";
"placeholder_select_country_text" = "Chọn quốc gia";
"address_text" = "Địa chỉ nhà";
"address_key_text" = "Địa chỉ nhà";
"placeholder_enter_receiver_address_text" = "Nhập địa chỉ của người nhận";
"relation_text" = "Mối quan hệ";
"placeholder_select_relation_text" = " Chọn mối quan hệ";
@ -1332,3 +1333,6 @@
"requestedAmt_text"="Số tiền yêu cầu";
"confirmSendingAmt_text"="Xác nhận tổng số tiền gửi";
"agree_and_submit_text" = "Đồng ý và nộp";
"invalidMonthlyIncome_text" = "Thu nhập hàng tháng không hợp lệ";

31
GME Remit/Shared/PasswordInputViewController.xib
View File

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
@ -36,7 +37,7 @@
<color key="backgroundColor" white="0.0" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lm9-mE-DvR">
<rect key="frame" x="41.5" y="287.5" width="331" height="241.5"/>
<rect key="frame" x="41.5" y="287" width="331" height="242"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ck8-hS-ja1">
<rect key="frame" x="291" y="0.0" width="40" height="40"/>
@ -59,19 +60,19 @@
</connections>
</button>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="t8a-3j-3ci">
<rect key="frame" x="10" y="50" width="311" height="171.5"/>
<rect key="frame" x="10" y="50" width="311" height="172"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="25" translatesAutoresizingMaskIntoConstraints="NO" id="98D-4F-BNg">
<rect key="frame" x="0.0" y="0.0" width="311" height="86.5"/>
<rect key="frame" x="0.0" y="0.0" width="311" height="87"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter your password of Japan Money Express" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9O2-th-BZw">
<rect key="frame" x="0.0" y="0.0" width="311" height="16.5"/>
<rect key="frame" x="0.0" y="0.0" width="311" 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="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your password of Japan Money Express" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="j4D-Kt-Mxd" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="41.5" width="311" height="45"/>
<rect key="frame" x="0.0" y="42" width="311" height="45"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
@ -91,8 +92,8 @@
</textField>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PSF-KN-CxT">
<rect key="frame" x="0.0" y="121.5" width="311" height="50"/>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PSF-KN-CxT">
<rect key="frame" x="0.0" y="122" width="311" height="50"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="hm3-Xa-5s5"/>
@ -113,7 +114,7 @@
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="t8a-3j-3ci" firstAttribute="leading" secondItem="Lm9-mE-DvR" secondAttribute="leading" constant="10" id="H6C-EK-tNb"/>
<constraint firstAttribute="trailing" secondItem="t8a-3j-3ci" secondAttribute="trailing" constant="10" id="Qru-gW-Bli"/>
@ -124,6 +125,7 @@
</constraints>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Lm9-mE-DvR" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" multiplier="0.8:1" id="1tE-Tp-TIn"/>
@ -134,15 +136,22 @@
<constraint firstItem="Rxr-wR-r2x" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="YuN-BO-3JK"/>
<constraint firstItem="Rxr-wR-r2x" firstAttribute="trailing" secondItem="i5M-Pr-FkT" secondAttribute="trailing" id="uWx-qv-1D3"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="137.68115942028987" y="116.51785714285714"/>
</view>
</objects>
<designables>
<designable name="j4D-Kt-Mxd">
<size key="intrinsicContentSize" width="298" height="34"/>
</designable>
</designables>
<resources>
<image name="ic_cancel" width="12" height="12"/>
<image name="ic_password" width="24" height="24"/>
<namedColor name="ThemeText">
<color red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>

8
GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -63,11 +63,11 @@
<view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dwd-4A-fUB">
<rect key="frame" x="0.0" y="85" width="300" height="169"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="61r-PG-8gH">
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="61r-PG-8gH">
<rect key="frame" x="20" y="10" width="260" height="139"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Would you like to renew your token now?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="rfn-wg-MBE">
<rect key="frame" x="0.0" y="0.0" width="260" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="260" height="43"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/>
<color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/>

63
GME Remit/Utilities/TablePresenter/User Interface/View/TablePresenter.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -29,22 +29,22 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xw3-lN-oJG" userLabel="mainView">
<rect key="frame" x="0.0" y="133.5" width="375" height="533.5"/>
<rect key="frame" x="24" y="67" width="327" height="533.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="AXP-W2-TIC">
<rect key="frame" x="0.0" y="5" width="375" height="100"/>
<rect key="frame" x="0.0" y="0.0" width="327" height="106"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2JE-Hq-V0f">
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="327" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Presenter Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jvk-DD-Fur">
<rect key="frame" x="139.5" y="13.5" width="96.5" height="17.5"/>
<rect key="frame" x="117" y="16" width="93" height="18"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iQt-DI-xho">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iQt-DI-xho">
<rect key="frame" x="269" y="0.0" width="50" height="50"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="iQt-DI-xho" secondAttribute="height" multiplier="1:1" id="UBr-Bb-U1j"/>
@ -58,32 +58,32 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" name="ThemeMainBackground"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="jvk-DD-Fur" firstAttribute="centerX" secondItem="2JE-Hq-V0f" secondAttribute="centerX" id="B4y-2h-FQD"/>
<constraint firstItem="iQt-DI-xho" firstAttribute="centerY" secondItem="jvk-DD-Fur" secondAttribute="centerY" id="IxC-DP-wjp"/>
<constraint firstItem="iQt-DI-xho" firstAttribute="leading" secondItem="2JE-Hq-V0f" secondAttribute="leading" id="T3W-1g-Gab"/>
<constraint firstAttribute="trailing" secondItem="iQt-DI-xho" secondAttribute="trailing" constant="8" id="gg0-Vp-agj"/>
<constraint firstItem="iQt-DI-xho" firstAttribute="height" secondItem="2JE-Hq-V0f" secondAttribute="height" id="iRD-H6-mag"/>
<constraint firstAttribute="height" constant="44" id="jpD-qg-5ay"/>
<constraint firstAttribute="height" constant="50" id="jpD-qg-5ay"/>
<constraint firstItem="jvk-DD-Fur" firstAttribute="centerY" secondItem="2JE-Hq-V0f" secondAttribute="centerY" id="s8y-oH-Iuk"/>
</constraints>
</view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dlq-37-tEm">
<rect key="frame" x="0.0" y="44" width="375" height="0.5"/>
<color key="backgroundColor" red="0.6705882353" green="0.6705882353" blue="0.6705882353" alpha="0.50572183100000001" colorSpace="custom" customColorSpace="sRGB"/>
<rect key="frame" x="0.0" y="50" width="327" height="0.5"/>
<color key="backgroundColor" red="0.6705882353" green="0.6705882353" blue="0.6705882353" alpha="0.51000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="w6w-5s-3Dl"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7zN-Gw-dJN">
<rect key="frame" x="0.0" y="44" width="375" height="56"/>
<rect key="frame" x="0.0" y="50" width="327" height="56"/>
<subviews>
<searchBar contentMode="redraw" searchBarStyle="minimal" translatesAutoresizingMaskIntoConstraints="NO" id="bDX-DE-rTc">
<rect key="frame" x="20" y="0.0" width="335" height="56"/>
<rect key="frame" x="20" y="0.0" width="287" height="56"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
</subviews>
<color key="backgroundColor" name="ThemeMainBackground"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="bDX-DE-rTc" firstAttribute="leading" secondItem="7zN-Gw-dJN" secondAttribute="leading" constant="20" id="CQO-kP-Ynf"/>
<constraint firstItem="bDX-DE-rTc" firstAttribute="top" secondItem="7zN-Gw-dJN" secondAttribute="top" id="We6-ld-DQi"/>
@ -98,17 +98,17 @@
</constraints>
</stackView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" allowsMultipleSelection="YES" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="IH7-nK-nTw">
<rect key="frame" x="10" y="110" width="355" height="413.5"/>
<rect key="frame" x="10" y="111" width="307" height="412.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="separatorColor" red="0.87450980389999999" green="0.87450980389999999" blue="0.87450980389999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
<view key="tableFooterView" contentMode="scaleToFill" id="az9-LK-5ZG">
<rect key="frame" x="0.0" y="116" width="355" height="44"/>
<rect key="frame" x="0.0" y="127" width="307" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OZZ-An-Xpk">
<rect key="frame" x="0.0" y="0.0" width="355" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="307" height="44"/>
<fontDescription key="fontDescription" name="Roboto-MediumItalic" family="Roboto" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -124,17 +124,17 @@
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="TableCell" rowHeight="60" id="Vxa-Gw-LH4" customClass="TableCell" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="355" height="60"/>
<rect key="frame" x="0.0" y="44.5" width="307" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Vxa-Gw-LH4" id="WeG-Q7-FtG">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="307" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nxP-L8-I6f">
<rect key="frame" x="10" y="10" width="335" height="40"/>
<rect key="frame" x="10" y="10" width="287" height="40"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Rti-WB-QBf">
<rect key="frame" x="10" y="0.0" width="315" height="40"/>
<rect key="frame" x="10" y="0.0" width="267" height="40"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="252" verticalHuggingPriority="251" image="flag_vietnam" translatesAutoresizingMaskIntoConstraints="NO" id="dLg-4E-6az">
<rect key="frame" x="0.0" y="0.0" width="53.5" height="40"/>
@ -144,7 +144,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cell Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="J9n-Ka-9S8">
<rect key="frame" x="63.5" y="0.0" width="251.5" height="40"/>
<rect key="frame" x="63.5" y="0.0" width="203.5" height="40"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="16"/>
<color key="textColor" name="ThemeText"/>
@ -186,8 +186,8 @@
<constraints>
<constraint firstAttribute="bottom" secondItem="IH7-nK-nTw" secondAttribute="bottom" constant="10" id="3cj-mS-8FZ"/>
<constraint firstItem="IH7-nK-nTw" firstAttribute="top" secondItem="AXP-W2-TIC" secondAttribute="bottom" constant="5" id="Bol-Ku-cTR"/>
<constraint firstItem="AXP-W2-TIC" firstAttribute="top" secondItem="xw3-lN-oJG" secondAttribute="top" constant="5" id="UUP-9k-Ug9"/>
<constraint firstAttribute="trailing" secondItem="AXP-W2-TIC" secondAttribute="trailing" id="VQR-jA-Kos"/>
<constraint firstItem="AXP-W2-TIC" firstAttribute="top" secondItem="xw3-lN-oJG" secondAttribute="top" id="Xbj-Oq-pmE"/>
<constraint firstItem="IH7-nK-nTw" firstAttribute="leading" secondItem="xw3-lN-oJG" secondAttribute="leading" constant="10" id="gGt-tA-GY6"/>
<constraint firstItem="AXP-W2-TIC" firstAttribute="leading" secondItem="xw3-lN-oJG" secondAttribute="leading" id="iMf-sq-Eh6"/>
<constraint firstAttribute="height" constant="533.5" id="jBu-a6-4Ns"/>
@ -197,10 +197,11 @@
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.70164178568904101" colorSpace="custom" customColorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="xw3-lN-oJG" firstAttribute="leading" secondItem="wxC-au-MnL" secondAttribute="leading" id="1dV-iG-Jo4"/>
<constraint firstItem="xw3-lN-oJG" firstAttribute="leading" secondItem="wxC-au-MnL" secondAttribute="leading" constant="24" id="1dV-iG-Jo4"/>
<constraint firstAttribute="bottom" secondItem="xw3-lN-oJG" secondAttribute="bottom" constant="40" id="GPF-qa-7As"/>
<constraint firstAttribute="trailing" secondItem="xw3-lN-oJG" secondAttribute="trailing" id="GcY-2L-pLj"/>
<constraint firstAttribute="bottom" secondItem="xw3-lN-oJG" secondAttribute="bottom" id="TUU-ji-zeL"/>
<constraint firstAttribute="trailing" secondItem="xw3-lN-oJG" secondAttribute="trailing" constant="24" id="GcY-2L-pLj"/>
<constraint firstItem="xw3-lN-oJG" firstAttribute="centerY" secondItem="wxC-au-MnL" secondAttribute="centerY" id="Otw-nG-Ja2"/>
<constraint firstItem="xw3-lN-oJG" firstAttribute="centerX" secondItem="wxC-au-MnL" secondAttribute="centerX" id="kic-fA-7aH"/>
<constraint firstItem="xw3-lN-oJG" firstAttribute="top" secondItem="wxC-au-MnL" secondAttribute="top" constant="60" id="l2f-gv-5kp"/>
</constraints>
<variation key="default">
@ -211,6 +212,7 @@
</variation>
</view>
</subviews>
<viewLayoutGuide key="safeArea" id="Zal-2g-TeO"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="wxC-au-MnL" secondAttribute="bottom" id="5Xl-SS-jBR"/>
@ -218,7 +220,6 @@
<constraint firstItem="wxC-au-MnL" firstAttribute="leading" secondItem="Zal-2g-TeO" secondAttribute="leading" id="b2z-ua-egm"/>
<constraint firstItem="wxC-au-MnL" firstAttribute="top" secondItem="G1l-40-p6X" secondAttribute="top" id="sKn-N8-L6J"/>
</constraints>
<viewLayoutGuide key="safeArea" id="Zal-2g-TeO"/>
</view>
<connections>
<outlet property="closeButton" destination="iQt-DI-xho" id="CSx-Nu-AhP"/>
@ -234,9 +235,10 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="4kF-sV-Gmo" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-806" y="271"/>
<point key="canvasLocation" x="-807.20000000000005" y="270.31484257871068"/>
</scene>
</scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="flag_vietnam" width="512" height="512"/>
<image name="ic_cancel" width="12" height="12"/>
@ -253,5 +255,4 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</document>

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

@ -82,7 +82,7 @@ class TablePresenterViewController: UIViewController {
searchBarContainerView.isHidden = false
dynamicHeight = view.frame.height * 0.8
default :
searchBarContainerView.isHidden = (model?.count ?? 0) < 10 ? true : false
searchBarContainerView.isHidden = (model?.count ?? 0) < 1 ? true : false
dynamicHeight = calculateHeight(count: model?.count ?? 0)
}
isFirst = false
@ -150,7 +150,7 @@ class TablePresenterViewController: UIViewController {
}
private func calculateHeight(count: Int) -> CGFloat {
let calculatedHeight = CGFloat(count) * cellHeight + 115.5
let calculatedHeight = CGFloat(count) * cellHeight + (view.frame.height - 200)
return min(calculatedHeight, view.frame.height * 0.8)
}
@ -201,7 +201,7 @@ extension TablePresenterViewController {
titleLabel.text = configuration?.presenterTitle
notFoundLabel.text = configuration?.notFoundTitle
searchBar.placeholder = configuration?.searchBarPlaceHolder
searchBar.placeholder = configuration?.presenterTitle
// searchBar.isHidden = !(configuration?.isUseSearchBar ?? true)
}

Write Preview
Loading…
Cancel
Save