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

remove number keyboard type validate

pull/1/head
InKwon James Kim 5 years ago
parent
826571ac40
commit
290c264b50
9 changed files with 203 additions and 196 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  2. 3
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
  3. 1
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  4. 112
      GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
  5. 39
      GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
  6. 8
      GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift
  7. 11
      GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
  8. 2
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

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

@ -14,6 +14,7 @@ enum PaymentMode: String {
case bankDeposite = "2" case bankDeposite = "2"
case homeDelivery = "12" case homeDelivery = "12"
case mobileWallet = "13" case mobileWallet = "13"
case cardPayment = "14"
} }
class ExchangeRatesViewController: UIViewController { class ExchangeRatesViewController: UIViewController {
@ -659,10 +660,12 @@ extension ExchangeRatesViewController: UICollectionViewDataSource {
return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath) return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
case .homeDelivery: case .homeDelivery:
return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath) return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath)
case .mobileWallet: case .mobileWallet:
return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath) return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath)
default:
return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
} }
} }
func configureBankDepositeCell( func configureBankDepositeCell(

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

@ -77,6 +77,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="tintColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/> <color key="tintColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
<textInputTraits key="textInputTraits" textContentType="name"/> <textInputTraits key="textInputTraits" textContentType="name"/>
<scopeButtonTitles>
<string>Title</string>
</scopeButtonTitles>
</searchBar> </searchBar>
<view key="tableFooterView" contentMode="scaleToFill" id="IIt-Yb-InY"> <view key="tableFooterView" contentMode="scaleToFill" id="IIt-Yb-InY">
<rect key="frame" x="0.0" y="445.5" width="315" height="44"/> <rect key="frame" x="0.0" y="445.5" width="315" height="44"/>

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

@ -398,7 +398,6 @@ extension SetupRecipientViewController {
switch keyboardType { switch keyboardType {
case "AN": textField.setKeyboardType(type: .an, isSendAction: false) case "AN": textField.setKeyboardType(type: .an, isSendAction: false)
case "ANS": textField.setKeyboardType(type: .ans, isSendAction: false) case "ANS": textField.setKeyboardType(type: .ans, isSendAction: false)
case "N": textField.setKeyboardType(type: .n, isSendAction: false)
default: textField.setKeyboardType(type: .ans, isSendAction: false) default: textField.setKeyboardType(type: .ans, isSendAction: false)
} }
}).disposed(by: disposeBag) }).disposed(by: disposeBag)

112
GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/View/SendMoneyCode.storyboard
View File

@ -27,23 +27,19 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6HB-NO-P3C"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6HB-NO-P3C">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="toU-KE-Ttn">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TwN-Xt-aVu" userLabel="contentview"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TwN-Xt-aVu" userLabel="contentview">
<rect key="frame" x="0.0" y="0.0" width="375" height="646"/>
<rect key="frame" x="10" y="10" width="355" height="627"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="glg-iv-MSv">
<rect key="frame" x="10" y="20" width="355" height="606"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="glg-iv-MSv" customClass="ShadowView" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="10" y="10" width="335" height="607"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ibk-1l-bfT"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ibk-1l-bfT">
<rect key="frame" x="77.5" y="318" width="200" height="50"/>
<rect key="frame" x="20" y="484" width="295" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="50" id="rKm-eW-nXc"/> <constraint firstAttribute="height" constant="50" id="rKm-eW-nXc"/>
<constraint firstAttribute="width" constant="200" id="tdo-Ke-KBO"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<state key="normal" title="Submit"> <state key="normal" title="Submit">
@ -59,9 +55,8 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enm-wU-bXW"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enm-wU-bXW">
<rect key="frame" x="77.5" y="403" width="200" height="33"/>
<rect key="frame" x="20" y="554" width="295" height="33"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="200" id="16u-4C-OWp"/>
<constraint firstAttribute="height" constant="33" id="1z2-hd-CDm"/> <constraint firstAttribute="height" constant="33" id="1z2-hd-CDm"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
@ -72,30 +67,11 @@
<action selector="dismiss:" destination="qLl-8V-Zim" eventType="touchUpInside" id="PIF-V1-0c2"/> <action selector="dismiss:" destination="qLl-8V-Zim" eventType="touchUpInside" id="PIF-V1-0c2"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mpj-Sq-1Kl">
<rect key="frame" x="77.5" y="234" width="200" height="34"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="cV7-dn-svV"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<state key="normal" title="Resend Code">
<color key="titleColor" red="0.94117647059999998" green="0.21960784310000001" blue="0.2156862745" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="resend:" destination="qLl-8V-Zim" eventType="touchUpInside" id="pVa-gq-pQV"/>
</connections>
</button>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="grq-kj-9ru"> <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="grq-kj-9ru">
<rect key="frame" x="30" y="150" width="295" height="44"/>
<rect key="frame" x="30" y="150" width="275" height="44"/>
<subviews> <subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="4 Digit OTP" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oez-3d-bvG"> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="4 Digit OTP" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oez-3d-bvG">
<rect key="frame" x="0.0" y="0.0" width="295" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="275" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="44" id="wig-XX-Cwa"/> <constraint firstAttribute="height" constant="44" id="wig-XX-Cwa"/>
</constraints> </constraints>
@ -106,13 +82,13 @@
</subviews> </subviews>
</stackView> </stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 digit OTP code has been sent to your mobile." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zwG-M8-9S2"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 digit OTP code has been sent to your mobile." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zwG-M8-9S2">
<rect key="frame" x="30" y="40" width="295" height="70"/>
<rect key="frame" x="30" y="40" width="275" height="70"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jkc-rY-cKa"> <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jkc-rY-cKa">
<rect key="frame" x="130.5" y="244" width="94" height="14.5"/>
<rect key="frame" x="120.5" y="224" width="94" height="14.5"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Try again in :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIg-Bj-Ocp"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Try again in :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIg-Bj-Ocp">
<rect key="frame" x="0.0" y="0.0" width="64" height="14.5"/> <rect key="frame" x="0.0" y="0.0" width="64" height="14.5"/>
@ -128,26 +104,49 @@
</label> </label>
</subviews> </subviews>
</stackView> </stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mpj-Sq-1Kl">
<rect key="frame" x="67.5" y="258.5" width="200" height="34"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="cV7-dn-svV"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<state key="normal" title="Resend Code">
<color key="titleColor" red="0.94117647059999998" green="0.21960784310000001" blue="0.2156862745" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="25"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="resend:" destination="qLl-8V-Zim" eventType="touchUpInside" id="pVa-gq-pQV"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstItem="mpj-Sq-1Kl" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="77X-5f-TVm"/> <constraint firstItem="mpj-Sq-1Kl" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="77X-5f-TVm"/>
<constraint firstAttribute="trailing" secondItem="grq-kj-9ru" secondAttribute="trailing" constant="30" id="Ae6-3w-sai"/> <constraint firstAttribute="trailing" secondItem="grq-kj-9ru" secondAttribute="trailing" constant="30" id="Ae6-3w-sai"/>
<constraint firstAttribute="height" constant="606" id="F9L-Ex-PIY"/>
<constraint firstItem="ibk-1l-bfT" firstAttribute="top" secondItem="mpj-Sq-1Kl" secondAttribute="bottom" constant="50" id="FtB-Qk-57G"/>
<constraint firstItem="jkc-rY-cKa" firstAttribute="top" secondItem="grq-kj-9ru" secondAttribute="bottom" constant="50" id="Lkh-bO-5ek"/>
<constraint firstItem="Enm-wU-bXW" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="20" id="Dzo-0K-elT"/>
<constraint firstItem="ibk-1l-bfT" firstAttribute="top" relation="greaterThanOrEqual" secondItem="mpj-Sq-1Kl" secondAttribute="bottom" constant="50" id="FtB-Qk-57G"/>
<constraint firstAttribute="trailing" secondItem="ibk-1l-bfT" secondAttribute="trailing" constant="20" id="Hon-6L-X6I"/>
<constraint firstItem="jkc-rY-cKa" firstAttribute="top" secondItem="grq-kj-9ru" secondAttribute="bottom" constant="30" id="Lkh-bO-5ek"/>
<constraint firstItem="zwG-M8-9S2" firstAttribute="top" secondItem="glg-iv-MSv" secondAttribute="top" constant="40" id="OBf-rj-zHp"/> <constraint firstItem="zwG-M8-9S2" firstAttribute="top" secondItem="glg-iv-MSv" secondAttribute="top" constant="40" id="OBf-rj-zHp"/>
<constraint firstItem="grq-kj-9ru" firstAttribute="top" secondItem="glg-iv-MSv" secondAttribute="top" constant="150" id="R2Q-zv-Gqw"/> <constraint firstItem="grq-kj-9ru" firstAttribute="top" secondItem="glg-iv-MSv" secondAttribute="top" constant="150" id="R2Q-zv-Gqw"/>
<constraint firstItem="Enm-wU-bXW" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="TLd-39-ow1"/> <constraint firstItem="Enm-wU-bXW" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="TLd-39-ow1"/>
<constraint firstItem="jkc-rY-cKa" firstAttribute="centerX" secondItem="mpj-Sq-1Kl" secondAttribute="centerX" id="UDW-Qv-hDW"/> <constraint firstItem="jkc-rY-cKa" firstAttribute="centerX" secondItem="mpj-Sq-1Kl" secondAttribute="centerX" id="UDW-Qv-hDW"/>
<constraint firstAttribute="trailing" secondItem="zwG-M8-9S2" secondAttribute="trailing" constant="30" id="Xh0-RH-sgK"/> <constraint firstAttribute="trailing" secondItem="zwG-M8-9S2" secondAttribute="trailing" constant="30" id="Xh0-RH-sgK"/>
<constraint firstItem="mpj-Sq-1Kl" firstAttribute="top" secondItem="grq-kj-9ru" secondAttribute="bottom" constant="40" id="ZDn-um-ydG"/>
<constraint firstItem="ibk-1l-bfT" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="20" id="ZoV-jY-FbU"/>
<constraint firstAttribute="trailing" secondItem="Enm-wU-bXW" secondAttribute="trailing" constant="20" id="bRS-gq-ieY"/>
<constraint firstItem="mpj-Sq-1Kl" firstAttribute="top" secondItem="jkc-rY-cKa" secondAttribute="bottom" constant="20" id="ddn-Y2-zqZ"/>
<constraint firstItem="zwG-M8-9S2" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="iIJ-QQ-f2z"/> <constraint firstItem="zwG-M8-9S2" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="iIJ-QQ-f2z"/>
<constraint firstAttribute="bottom" secondItem="Enm-wU-bXW" secondAttribute="bottom" constant="20" id="itv-ab-kpg"/>
<constraint firstItem="ibk-1l-bfT" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="lkV-Cq-pHg"/> <constraint firstItem="ibk-1l-bfT" firstAttribute="centerX" secondItem="glg-iv-MSv" secondAttribute="centerX" id="lkV-Cq-pHg"/>
<constraint firstItem="grq-kj-9ru" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="30" id="nRn-Mc-kl1"/> <constraint firstItem="grq-kj-9ru" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="30" id="nRn-Mc-kl1"/>
<constraint firstItem="zwG-M8-9S2" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="30" id="r9I-ej-pZM"/> <constraint firstItem="zwG-M8-9S2" firstAttribute="leading" secondItem="glg-iv-MSv" secondAttribute="leading" constant="30" id="r9I-ej-pZM"/>
<constraint firstItem="grq-kj-9ru" firstAttribute="top" secondItem="zwG-M8-9S2" secondAttribute="bottom" constant="40" id="teF-Ut-8gg"/> <constraint firstItem="grq-kj-9ru" firstAttribute="top" secondItem="zwG-M8-9S2" secondAttribute="bottom" constant="40" id="teF-Ut-8gg"/>
<constraint firstItem="Enm-wU-bXW" firstAttribute="top" secondItem="ibk-1l-bfT" secondAttribute="bottom" constant="35" id="z9D-jD-WWU"/>
<constraint firstItem="Enm-wU-bXW" firstAttribute="top" secondItem="ibk-1l-bfT" secondAttribute="bottom" constant="20" id="z9D-jD-WWU"/>
</constraints> </constraints>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@ -158,38 +157,27 @@
</subviews> </subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="glg-iv-MSv" secondAttribute="bottom" constant="20" id="Ety-Or-S9u"/>
<constraint firstItem="glg-iv-MSv" firstAttribute="leading" secondItem="TwN-Xt-aVu" secondAttribute="leading" constant="10" id="ZEV-Va-Fd5"/>
<constraint firstItem="glg-iv-MSv" firstAttribute="top" secondItem="TwN-Xt-aVu" secondAttribute="top" constant="20" id="rj6-Ld-RFF"/>
<constraint firstAttribute="trailing" secondItem="glg-iv-MSv" secondAttribute="trailing" constant="10" id="x0j-e8-w5Z"/>
<constraint firstAttribute="bottom" secondItem="glg-iv-MSv" secondAttribute="bottom" constant="10" id="IfF-9M-1SS"/>
<constraint firstItem="glg-iv-MSv" firstAttribute="top" secondItem="TwN-Xt-aVu" secondAttribute="top" constant="10" id="aZ8-il-jgu"/>
<constraint firstAttribute="trailing" secondItem="glg-iv-MSv" secondAttribute="trailing" constant="10" id="cyz-Io-bra"/>
<constraint firstItem="glg-iv-MSv" firstAttribute="leading" secondItem="TwN-Xt-aVu" secondAttribute="leading" constant="10" id="dKx-H8-1bc"/>
</constraints> </constraints>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="width" secondItem="toU-KE-Ttn" secondAttribute="width" id="1aJ-M1-wUg"/>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="leading" secondItem="toU-KE-Ttn" secondAttribute="leading" id="1n9-pd-eFn"/>
<constraint firstAttribute="trailing" secondItem="TwN-Xt-aVu" secondAttribute="trailing" id="Ebh-W3-Ltj"/>
<constraint firstAttribute="bottom" secondItem="TwN-Xt-aVu" secondAttribute="bottom" id="lhd-kO-Kcc"/>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="height" secondItem="toU-KE-Ttn" secondAttribute="height" priority="250" id="q88-74-e7E"/>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="top" secondItem="toU-KE-Ttn" secondAttribute="top" id="zYk-4u-Vdz"/>
</constraints>
</scrollView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="toU-KE-Ttn" secondAttribute="bottom" id="QM4-ux-7oJ"/>
<constraint firstAttribute="trailing" secondItem="toU-KE-Ttn" secondAttribute="trailing" id="cTu-XN-kRz"/>
<constraint firstItem="toU-KE-Ttn" firstAttribute="leading" secondItem="6HB-NO-P3C" secondAttribute="leading" id="gmp-rd-QOL"/>
<constraint firstItem="toU-KE-Ttn" firstAttribute="top" secondItem="6HB-NO-P3C" secondAttribute="top" id="siE-pi-aXV"/>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="top" secondItem="6HB-NO-P3C" secondAttribute="top" constant="10" id="Et9-a3-RwI"/>
<constraint firstAttribute="bottom" secondItem="TwN-Xt-aVu" secondAttribute="bottom" constant="10" id="Kyv-uP-Sna"/>
<constraint firstAttribute="trailing" secondItem="TwN-Xt-aVu" secondAttribute="trailing" constant="10" id="cib-zG-62N"/>
<constraint firstItem="TwN-Xt-aVu" firstAttribute="leading" secondItem="6HB-NO-P3C" secondAttribute="leading" constant="10" id="kN3-Cp-bWj"/>
</constraints> </constraints>
</view> </view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="6HB-NO-P3C" secondAttribute="bottom" id="VIJ-ZC-a28"/>
<constraint firstItem="0lZ-ZE-nYs" firstAttribute="bottom" secondItem="6HB-NO-P3C" secondAttribute="bottom" id="VIJ-ZC-a28"/>
<constraint firstAttribute="trailing" secondItem="6HB-NO-P3C" secondAttribute="trailing" id="XjV-OE-3KF"/> <constraint firstAttribute="trailing" secondItem="6HB-NO-P3C" secondAttribute="trailing" id="XjV-OE-3KF"/>
<constraint firstItem="6HB-NO-P3C" firstAttribute="top" secondItem="Gqk-Nu-VeH" secondAttribute="top" id="d94-sm-Iis"/>
<constraint firstItem="6HB-NO-P3C" firstAttribute="top" secondItem="0lZ-ZE-nYs" secondAttribute="top" id="d94-sm-Iis"/>
<constraint firstItem="6HB-NO-P3C" firstAttribute="leading" secondItem="Gqk-Nu-VeH" secondAttribute="leading" id="v5n-Kh-iJ2"/> <constraint firstItem="6HB-NO-P3C" firstAttribute="leading" secondItem="Gqk-Nu-VeH" secondAttribute="leading" id="v5n-Kh-iJ2"/>
</constraints> </constraints>
<viewLayoutGuide key="safeArea" id="0lZ-ZE-nYs"/> <viewLayoutGuide key="safeArea" id="0lZ-ZE-nYs"/>

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

@ -49,7 +49,7 @@ class SendMoneyCodeViewController: UIViewController {
var numberCipherString : String! var numberCipherString : String!
var presenter: SendMoneyCodeModuleInterface? var presenter: SendMoneyCodeModuleInterface?
var completion: ((String) -> ())?
var completion: ((String) -> Void)?
var encryptedNumber: String! { var encryptedNumber: String! {
didSet { didSet {
@ -74,12 +74,10 @@ class SendMoneyCodeViewController: UIViewController {
mNumberTransKeyView?.mTK_ClearDelegateSubviews() mNumberTransKeyView?.mTK_ClearDelegateSubviews()
if isTranskeyShowing == false { if isTranskeyShowing == false {
mNumberTransKeyView?.delegate = nil;
mNumberTransKeyView?.delegate = nil
} }
} }
private func keyboardSetup() { private func keyboardSetup() {
isShowNumber = false isShowNumber = false
isTranskeyShowing = false isTranskeyShowing = false
@ -107,7 +105,8 @@ class SendMoneyCodeViewController: UIViewController {
mNumberTransKeyView?.mTK_SetControlCenter(false) mNumberTransKeyView?.mTK_SetControlCenter(false)
mNumberTransKeyView?.mTK_UseAllDeleteButton(false) mNumberTransKeyView?.mTK_UseAllDeleteButton(false)
mNumberTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape) mNumberTransKeyView?.mTK_Supported(byDeviceOrientation: SupportedByDevicePortraitAndLandscape)
mNumberTransKeyView?.setKeyboardType(self,
mNumberTransKeyView?.setKeyboardType(
self,
keypadType: TransKeyKeypadTypeText, keypadType: TransKeyKeypadTypeText,
mTK_inputType: 2, mTK_inputType: 2,
mTK_inputTitle: "password", mTK_inputTitle: "password",
@ -115,7 +114,8 @@ class SendMoneyCodeViewController: UIViewController {
mTK_maxLength: 16, mTK_maxLength: 16,
mTK_minLength: 0, mTK_minLength: 0,
mTK_keypadUpper: false, mTK_keypadUpper: false,
mTK_languageType: Int(mTK_Language_English.rawValue))
mTK_languageType: Int(mTK_Language_English.rawValue)
)
if let mNumberTransKeyView = mNumberTransKeyView { if let mNumberTransKeyView = mNumberTransKeyView {
self.present(mNumberTransKeyView, animated: true, completion: nil) self.present(mNumberTransKeyView, animated: true, completion: nil)
} }
@ -143,9 +143,11 @@ class SendMoneyCodeViewController: UIViewController {
self.submitButton.setTitle("submit_text".localized(), for: .normal) self.submitButton.setTitle("submit_text".localized(), for: .normal)
self.notNowButton.setTitle("not_now_text".localized(), for: .normal) self.notNowButton.setTitle("not_now_text".localized(), for: .normal)
verificationCodeTextField.delegate = self verificationCodeTextField.delegate = self
self.backGourndBorderView.layer.borderWidth = 0.5
self.backGourndBorderView.layer.borderColor = UIColor.init(hex: "#EBECED").cgColor
self.backGourndBorderView.layer.cornerRadius = 5
submitButton.layer.cornerRadius = 5
submitButton.backgroundColor = .themeRed
resendButton.setTitleColor(.themeRed, for: .normal)
counterLabel.textColor = .themeRed
} }
private func configureText() { private func configureText() {
@ -163,7 +165,6 @@ class SendMoneyCodeViewController: UIViewController {
self.showSampleImage() self.showSampleImage()
} }
@IBAction func resend(_ sender: Any) { @IBAction func resend(_ sender: Any) {
self.requestOtpCode() self.requestOtpCode()
} }
@ -187,10 +188,8 @@ class SendMoneyCodeViewController: UIViewController {
self.present(alertVC, animated: true, completion: nil) self.present(alertVC, animated: true, completion: nil)
} }
// resend // resend
private func requestOtpCode() { private func requestOtpCode() {
// request otp // request otp
self.presenter?.viewIsReady() self.presenter?.viewIsReady()
@ -199,7 +198,13 @@ class SendMoneyCodeViewController: UIViewController {
} }
private func startTimer() { private func startTimer() {
self.timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(self.updateCounter), userInfo: nil, repeats: true)
self.timer = Timer.scheduledTimer(
timeInterval: 1,
target: self,
selector: #selector(self.updateCounter),
userInfo: nil,
repeats: true
)
self.timer?.fire() self.timer?.fire()
self.resendButton.isUserInteractionEnabled = false self.resendButton.isUserInteractionEnabled = false
self.counterStackView.isHidden = false self.counterStackView.isHidden = false
@ -238,7 +243,6 @@ extension SendMoneyCodeViewController: SendMoneyCodeViewInterface {
} }
} }
extension SendMoneyCodeViewController: TransKeyViewDelegate { extension SendMoneyCodeViewController: TransKeyViewDelegate {
func secureInputFinish(_ type: Int) { func secureInputFinish(_ type: Int) {
@ -266,9 +270,4 @@ extension SendMoneyCodeViewController: UITextFieldDelegate {
} }
} }
extension SendMoneyCodeViewController: OtpCodeRequestApiService {
}
extension SendMoneyCodeViewController: OtpCodeRequestApiService {}

8
GME Remit/Modules/SendMoneyModules/SendMoneyCode/User Interface/Wireframe/SendMoneyCodeWireframe.swift
View File

@ -10,7 +10,7 @@ import UIKit
class SendMoneyCodeWireframe { class SendMoneyCodeWireframe {
weak var view: UIViewController! weak var view: UIViewController!
var completion: ((String) -> ())?
var completion: ((String) -> Void)?
var request: SendMoneyRequestModel? var request: SendMoneyRequestModel?
} }
@ -34,7 +34,11 @@ extension SendMoneyCodeWireframe: SendMoneyCodeWireframeInput {
return viewController return viewController
} }
func open(requestmodel: SendMoneyRequestModel?, completion: @escaping (String) -> (), source: UIViewController) {
func open(
requestmodel: SendMoneyRequestModel?,
completion: @escaping (String) -> Void,
source: UIViewController
) {
self.completion = completion self.completion = completion
self.request = requestmodel self.request = requestmodel
self.openMainView(source: source) self.openMainView(source: source)

11
GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
View File

@ -344,11 +344,20 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z5y-QS-qrM"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z5y-QS-qrM">
<rect key="frame" x="65" y="0.0" width="274" height="50"/>
<rect key="frame" x="65" y="0.0" width="259" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfi-y4-1K1">
<rect key="frame" x="334" y="0.0" width="5" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="5" id="Uy0-Mu-rNY"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HCb-nM-epJ"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HCb-nM-epJ">
<rect key="frame" x="339" y="0.0" width="20" height="50"/> <rect key="frame" x="339" y="0.0" width="20" height="50"/>
<subviews> <subviews>

2
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
View File

@ -352,6 +352,8 @@ extension SendMoneyPaymentModeViewController: UICollectionViewDataSource {
return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath) return configureHomeDeliveryCell(collectionView: collectionView, indexPath: indexPath)
case .mobileWallet: case .mobileWallet:
return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath) return configureWalletDeliveryCell(collectionView: collectionView, indexPath: indexPath)
default:
return configureCashDeliveryCell(collectionView: collectionView, indexPath: indexPath)
} }
} }

Write Preview
Loading…
Cancel
Save