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

renew id navigation issue resolved

pull/1/head
Dibya Malla 3 years ago
parent
933e910ed2
commit
4febefb3f7
9 changed files with 134 additions and 123 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. 14
      GME Remit.xcodeproj/project.pbxproj
  2. 24
      GME Remit/Modules/Login/User Interface/View/Login.storyboard
  3. 44
      GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard
  4. 12
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
  5. 66
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
  6. 76
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  7. 10
      GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift
  8. 10
      GME Remit/Supported Files/GoogleService-Info.plist
  9. 1
      GME Remit/Utilities/AppConstants.swift

14
GME Remit.xcodeproj/project.pbxproj
View File

@ -332,6 +332,10 @@
73AEFF792334A13100A967FB /* TransactionHistoryGroupViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73AEFF6D2334A13100A967FB /* TransactionHistoryGroupViewModel.swift */; };
73AEFF7A2334A13100A967FB /* TransactionHistoryGroup.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 73AEFF6E2334A13100A967FB /* TransactionHistoryGroup.storyboard */; };
73AEFF7B2334A13100A967FB /* TransactionHistoryGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73AEFF6F2334A13100A967FB /* TransactionHistoryGroupViewController.swift */; };
73AF9C6C275CB708003A701E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73AF9C6B275CB708003A701E /* GoogleService-Info.plist */; };
73AF9C6D275CB708003A701E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73AF9C6B275CB708003A701E /* GoogleService-Info.plist */; };
73AF9C6E275CB708003A701E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73AF9C6B275CB708003A701E /* GoogleService-Info.plist */; };
73AF9C6F275CB708003A701E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 73AF9C6B275CB708003A701E /* GoogleService-Info.plist */; };
73B6D68423063DFD00A0CB6E /* ResponseContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68323063DFD00A0CB6E /* ResponseContainer.swift */; };
73B6D68623063F7D00A0CB6E /* Recipient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68523063F7D00A0CB6E /* Recipient.swift */; };
73B6D6882306402200A0CB6E /* PaymentMethodModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D6872306402200A0CB6E /* PaymentMethodModel.swift */; };
@ -378,7 +382,6 @@
7E364CEC24A4455A007D6E02 /* PasswordInputViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */; };
7E364CEF24A46D27007D6E02 /* BalanceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E364CEE24A46D27007D6E02 /* BalanceModel.swift */; };
7E4DC74F24AB035C00815FA8 /* ActionSheetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4DC74E24AB035C00815FA8 /* ActionSheetHelper.swift */; };
7E81F23F255E73320062F387 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7E81F23E255E6E9F0062F387 /* GoogleService-Info.plist */; };
7EC9DE0124A9AECE004A0AD8 /* RewardProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */; };
7EC9DE0324A9AEEC004A0AD8 /* Branch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */; };
7EC9DE0524A9AF65004A0AD8 /* BranchContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */; };
@ -1068,6 +1071,7 @@
73AEFF6D2334A13100A967FB /* TransactionHistoryGroupViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionHistoryGroupViewModel.swift; sourceTree = "<group>"; };
73AEFF6E2334A13100A967FB /* TransactionHistoryGroup.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TransactionHistoryGroup.storyboard; sourceTree = "<group>"; };
73AEFF6F2334A13100A967FB /* TransactionHistoryGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionHistoryGroupViewController.swift; sourceTree = "<group>"; };
73AF9C6B275CB708003A701E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
73B6D68323063DFD00A0CB6E /* ResponseContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseContainer.swift; sourceTree = "<group>"; };
73B6D68523063F7D00A0CB6E /* Recipient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Recipient.swift; sourceTree = "<group>"; };
73B6D6872306402200A0CB6E /* PaymentMethodModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodModel.swift; sourceTree = "<group>"; };
@ -1114,7 +1118,6 @@
7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasswordInputViewController.xib; sourceTree = "<group>"; };
7E364CEE24A46D27007D6E02 /* BalanceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BalanceModel.swift; sourceTree = "<group>"; };
7E4DC74E24AB035C00815FA8 /* ActionSheetHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionSheetHelper.swift; sourceTree = "<group>"; };
7E81F23E255E6E9F0062F387 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardProduct.swift; sourceTree = "<group>"; };
7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Branch.swift; sourceTree = "<group>"; };
7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BranchContainer.swift; sourceTree = "<group>"; };
@ -2332,9 +2335,9 @@
73168A1D22F3CAB600878038 /* Supported Files */ = {
isa = PBXGroup;
children = (
73AF9C6B275CB708003A701E /* GoogleService-Info.plist */,
731D05722341BE78005E6F7C /* Colors.xcassets */,
9FD260FE1FD00458007A511D /* Assets.xcassets */,
7E81F23E255E6E9F0062F387 /* GoogleService-Info.plist */,
72688D0D2060F7CF000A86C1 /* GMERemittance-Bridging-Header.h */,
9FD261031FD00458007A511D /* Info.plist */,
9FD261001FD00458007A511D /* LaunchScreen.storyboard */,
@ -6231,6 +6234,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73AF9C6F275CB708003A701E /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -6250,6 +6254,7 @@
73157BA522DC1EEC009B836F /* PopupNotification.storyboard in Resources */,
7389601222C2F208003FEA90 /* TablePresenter.storyboard in Resources */,
5565FF2E1FE275E5002934E9 /* SanFranciscoText-Semibold.otf in Resources */,
73AF9C6C275CB708003A701E /* GoogleService-Info.plist in Resources */,
9FD260FF1FD00458007A511D /* Assets.xcassets in Resources */,
D946719E21426DFB003924DB /* Login.storyboard in Resources */,
041A86A221D1F4F60044C83C /* WKWebView.storyboard in Resources */,
@ -6299,7 +6304,6 @@
5565FF271FE275E5002934E9 /* README.md in Resources */,
D95B5E4221311057000C0B33 /* GmeContacts.storyboard in Resources */,
89EA0D25243EC0D2003ACCC8 /* Profile.storyboard in Resources */,
7E81F23F255E73320062F387 /* GoogleService-Info.plist in Resources */,
D950BED921549242008367A1 /* Home.storyboard in Resources */,
40B33AAD24CAF87A00AFE2AB /* ExistingUserRegistration.storyboard in Resources */,
D931E22A216DCC2A008A8CD1 /* MessageCompose.storyboard in Resources */,
@ -6330,6 +6334,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73AF9C6D275CB708003A701E /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -6337,6 +6342,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73AF9C6E275CB708003A701E /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

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

@ -30,10 +30,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Agq-fu-l8O">
<rect key="frame" x="0.0" y="40" width="320" height="140.5"/>
<rect key="frame" x="0.0" y="40" width="320" height="139"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="wyS-aR-V4y">
<rect key="frame" x="0.0" y="0.0" width="320" height="132.5"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="131"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jme_logo" translatesAutoresizingMaskIntoConstraints="NO" id="4YQ-BK-vPB">
<rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
@ -42,7 +42,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sYy-2S-Te1">
<rect key="frame" x="0.0" y="70" width="320" height="62.5"/>
<rect key="frame" x="0.0" y="70" width="320" height="61"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<string key="text">Welcome to
JME</string>
@ -71,7 +71,7 @@ JME</string>
</constraints>
</view>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="Qm0-Vh-TcC">
<rect key="frame" x="20" y="210.5" width="280" height="120"/>
<rect key="frame" x="20" y="209" width="280" height="120"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your ID for using JME" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="GkK-3R-8Nq" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="280" height="50"/>
@ -134,7 +134,7 @@ JME</string>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7fh-7w-AcM">
<rect key="frame" x="20" y="370.5" width="280" height="50"/>
<rect key="frame" x="20" y="369" width="280" height="50"/>
<color key="backgroundColor" name="ThemeText"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="Lcl-2a-6hA"/>
@ -153,7 +153,7 @@ JME</string>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dKp-tX-RZc">
<rect key="frame" x="106" y="488.5" width="108" height="21"/>
<rect key="frame" x="103" y="487" width="114" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="IZ0-en-iCE"/>
</constraints>
@ -166,16 +166,16 @@ JME</string>
</connections>
</button>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="qZ0-Mc-eUA">
<rect key="frame" x="76.5" y="517.5" width="167.5" height="27"/>
<rect key="frame" x="70" y="516" width="180.5" height="27"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="New to JME?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vyR-zb-CBC">
<rect key="frame" x="0.0" y="0.0" width="75.5" height="27"/>
<rect key="frame" x="0.0" y="0.0" width="84.5" height="27"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GFb-Or-Tqp">
<rect key="frame" x="85.5" y="0.0" width="82" height="27"/>
<rect key="frame" x="94.5" y="0.0" width="86" height="27"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<state key="normal" title="Register Here">
<color key="titleColor" name="ThemeBlue"/>
@ -192,7 +192,7 @@ JME</string>
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yYl-oW-RDD">
<rect key="frame" x="40.5" y="432.5" width="239.5" height="40"/>
<rect key="frame" x="40.5" y="431" width="239.5" height="40"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fingerprint" translatesAutoresizingMaskIntoConstraints="NO" id="2x6-yn-YbR">
<rect key="frame" x="0.0" y="0.0" width="30" height="40"/>
@ -261,10 +261,10 @@ JME</string>
</scenes>
<designables>
<designable name="GkK-3R-8Nq">
<size key="intrinsicContentSize" width="187.5" height="34"/>
<size key="intrinsicContentSize" width="200" height="34"/>
</designable>
<designable name="pCq-Gh-cKW">
<size key="intrinsicContentSize" width="79" height="34"/>
<size key="intrinsicContentSize" width="67.5" height="34"/>
</designable>
</designables>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

44
GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard
View File

@ -1,11 +1,12 @@
<?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" useSafeAreas="YES" colorMatched="YES" initialViewController="kME-hR-NgN">
<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" initialViewController="kME-hR-NgN">
<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="19144"/>
<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">
@ -27,21 +28,21 @@
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fmg-qn-Ab0">
<rect key="frame" x="0.0" y="44" width="375" height="623"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="separatorColor" name="ThemeSeparate"/>
<inset key="separatorInset" minX="15" minY="0.0" maxX="15" maxY="0.0"/>
<view key="tableFooterView" contentMode="scaleToFill" id="dt8-5N-azE">
<rect key="frame" x="0.0" y="146" width="375" height="44"/>
<rect key="frame" x="0.0" y="157" width="375" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="There is no notice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hII-jh-P5Z">
<rect key="frame" x="120" y="12" width="135.5" height="20"/>
<rect key="frame" x="123" y="12" width="129" height="20.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="hII-jh-P5Z" firstAttribute="centerX" secondItem="dt8-5N-azE" secondAttribute="centerX" id="aHt-jb-fDd"/>
<constraint firstItem="hII-jh-P5Z" firstAttribute="centerY" secondItem="dt8-5N-azE" secondAttribute="centerY" id="oMI-tR-I1e"/>
@ -49,17 +50,21 @@
</view>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="NotificationCell" rowHeight="90" id="vWC-07-oo2" customClass="NotificationCell" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="90"/>
<rect key="frame" x="0.0" y="44.5" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vWC-07-oo2" id="jsL-8r-w5O">
<rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fU1-Cn-PMg">
<rect key="frame" x="16" y="11" width="37" height="63"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="3Id-Zk-2a3">
<rect key="frame" x="20" y="16" width="315" height="58"/>
<rect key="frame" x="36" y="16" width="299" height="58"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="nRW-4q-6W0">
<rect key="frame" x="0.0" y="0.0" width="315" height="38"/>
<rect key="frame" x="0.0" y="0.0" width="299" height="38"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1FP-bq-7Wa">
<rect key="frame" x="0.0" y="0.0" width="36" height="38"/>
@ -67,14 +72,8 @@
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="new" translatesAutoresizingMaskIntoConstraints="NO" id="tgE-Ed-yVU">
<rect key="frame" x="41" y="0.0" width="20" height="38"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="m7D-Ev-6yI"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CcW-YB-c6O">
<rect key="frame" x="66" y="0.0" width="249" height="38"/>
<rect key="frame" x="41" y="0.0" width="258" height="38"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
@ -82,7 +81,7 @@
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwW-XM-PeE">
<rect key="frame" x="0.0" y="38" width="315" height="20"/>
<rect key="frame" x="0.0" y="38" width="299" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="DCY-zs-RDF"/>
</constraints>
@ -105,19 +104,19 @@
<constraint firstItem="3Id-Zk-2a3" firstAttribute="top" secondItem="jsL-8r-w5O" secondAttribute="topMargin" constant="5" id="p0I-oM-urg"/>
<constraint firstAttribute="bottom" secondItem="afR-Xv-eGp" secondAttribute="bottom" constant="5" id="tR3-t1-gpm"/>
<constraint firstItem="afR-Xv-eGp" firstAttribute="leading" secondItem="3Id-Zk-2a3" secondAttribute="trailing" constant="5" id="wqz-N9-lGz"/>
<constraint firstItem="3Id-Zk-2a3" firstAttribute="leading" secondItem="jsL-8r-w5O" secondAttribute="leadingMargin" constant="5" id="zkO-2c-37b"/>
<constraint firstItem="3Id-Zk-2a3" firstAttribute="leading" secondItem="jsL-8r-w5O" secondAttribute="leadingMargin" constant="20" id="zkO-2c-37b"/>
<constraint firstAttribute="bottomMargin" secondItem="3Id-Zk-2a3" secondAttribute="bottom" constant="5" id="zw9-nN-gfO"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="dateLabel" destination="dwW-XM-PeE" id="kd7-8a-HPB"/>
<outlet property="newIconImageView" destination="tgE-Ed-yVU" id="m1x-cJ-TPf"/>
<outlet property="titleLabel" destination="1FP-bq-7Wa" id="djE-Vd-glM"/>
</connections>
</tableViewCell>
</prototypes>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="O1T-1R-Sun"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="fmg-qn-Ab0" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" id="Iab-am-UFi"/>
@ -125,7 +124,6 @@
<constraint firstItem="fmg-qn-Ab0" firstAttribute="trailing" secondItem="O1T-1R-Sun" secondAttribute="trailing" id="dSo-q4-mWS"/>
<constraint firstItem="fmg-qn-Ab0" firstAttribute="top" secondItem="O1T-1R-Sun" secondAttribute="top" id="wDW-Oa-CNU"/>
</constraints>
<viewLayoutGuide key="safeArea" id="O1T-1R-Sun"/>
</view>
<navigationItem key="navigationItem" id="XcP-xq-HWI">
<barButtonItem key="leftBarButtonItem" image="ic_cancel" id="XEy-ga-xCy">
@ -161,9 +159,9 @@
<point key="canvasLocation" x="-92" y="232.53373313343329"/>
</scene>
</scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="ic_cancel" width="12" height="12"/>
<image name="new" width="17" height="5"/>
<image name="right_arrow" width="128" height="128"/>
<namedColor name="ThemeBlack">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -174,6 +172,8 @@
<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>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</document>

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

@ -292,20 +292,20 @@ class ExistingUserKycViewController: UIViewController {
private func setUIBinding() {
frontIdButton.rx.tap.bind {[weak self] in
self?.photoType = .frontID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
backIdButton.rx.tap.bind {[weak self] in
self?.photoType = .backID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
sideIdButton.rx.tap.bind {[weak self] in
self?.photoType = .sideID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
frontIDImageTrigger

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

@ -33,16 +33,16 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="2500"/>
<subviews>
<view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="594.5" translatesAutoresizingMaskIntoConstraints="NO" id="h62-Bc-pZz">
<rect key="frame" x="0.0" y="0.0" width="375" height="2372"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="2370"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1BC-po-v3w">
<rect key="frame" x="0.0" y="0.0" width="375" height="2372"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="2370"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="ztF-Hd-9ij">
<rect key="frame" x="20" y="20" width="335" height="2332"/>
<rect key="frame" x="20" y="20" width="335" height="2330"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="KOC-Gh-ufv">
<rect key="frame" x="0.0" y="0.0" width="335" height="879"/>
<rect key="frame" x="0.0" y="0.0" width="335" height="877"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="cDv-xz-NaI">
<rect key="frame" x="0.0" y="0.0" width="335" height="25"/>
@ -307,7 +307,7 @@
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="justified" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAi-G0-dKu">
<rect key="frame" x="0.0" y="715" width="335" height="84"/>
<rect key="frame" x="0.0" y="715" width="335" height="82"/>
<string key="text">Name, Nationality, Address and Sex are stated in the personal identification document submitted here. 名前、国籍、住所、誕生日、性別等の項目は確認書類記載内容の通りです。
</string>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
@ -315,7 +315,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IcD-pK-L7f">
<rect key="frame" x="0.0" y="829" width="335" height="50"/>
<rect key="frame" x="0.0" y="827" width="335" height="50"/>
<color key="backgroundColor" name="ThemeRed"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="xYG-Pj-I7Y"/>
@ -328,7 +328,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="JKV-BI-zAm">
<rect key="frame" x="0.0" y="884" width="335" height="835"/>
<rect key="frame" x="0.0" y="882" width="335" height="835"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="i7W-0A-Wvh">
<rect key="frame" x="0.0" y="0.0" width="335" height="25"/>
@ -401,13 +401,13 @@
<rect key="frame" x="110" y="8" width="223" 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="udZ-3K-h3F">
<rect key="frame" x="61" y="5" width="51.5" height="18"/>
<rect key="frame" x="59.5" y="5" width="54" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7ar-IW-cpc">
<rect key="frame" x="158" y="86" width="55" height="24"/>
<rect key="frame" x="155" y="86" width="58" 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"/>
@ -489,13 +489,13 @@
<rect key="frame" x="110" y="8" width="223" 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="yOu-pI-8Mc">
<rect key="frame" x="62.5" y="5" width="48.5" height="18"/>
<rect key="frame" x="60" y="5" width="53" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="grJ-Fd-QJ0">
<rect key="frame" x="158" y="86" width="55" height="24"/>
<rect key="frame" x="155" y="86" width="58" 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"/>
@ -577,16 +577,16 @@
<rect key="frame" x="110" y="8" width="223" height="92"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="30c-ar-bYD">
<rect key="frame" x="0.0" y="22.5" width="223" height="53"/>
<rect key="frame" x="0.0" y="23" width="223" height="52.5"/>
<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="mOl-NR-fPf" userLabel="Side ID">
<rect key="frame" x="0.0" y="0.0" width="45.5" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="49" height="17.5"/>
<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="epM-zy-5Td">
<rect key="frame" x="0.0" y="29" width="55" height="24"/>
<rect key="frame" x="0.0" y="28.5" width="58" 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"/>
@ -708,16 +708,16 @@
<rect key="frame" x="110" y="2" width="223" height="90"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="ny2-zL-SXm">
<rect key="frame" x="0.0" y="18.5" width="223" height="53"/>
<rect key="frame" x="0.0" y="19" width="223" height="52.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Face Picture" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Iyj-5P-WEX">
<rect key="frame" x="0.0" y="0.0" width="113.5" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="118.5" height="17.5"/>
<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="N8X-Wj-Aba">
<rect key="frame" x="0.0" y="29" width="55" height="24"/>
<rect key="frame" x="0.0" y="28.5" width="58" 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"/>
@ -840,13 +840,13 @@
<rect key="frame" x="0.0" y="0.0" width="223" height="130"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Additional ID Front" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="InS-yw-Z3w">
<rect key="frame" x="0.0" y="0.0" width="122" height="130"/>
<rect key="frame" x="0.0" y="0.0" width="125.5" height="130"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dyf-3R-H2F">
<rect key="frame" x="0.0" y="0.0" width="55" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="58" height="0.0"/>
<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"/>
@ -931,13 +931,13 @@
<rect key="frame" x="0.0" y="0.0" width="223" height="130"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Additional ID Back" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JFN-s7-JYX">
<rect key="frame" x="0.0" y="0.0" width="119" height="130"/>
<rect key="frame" x="0.0" y="0.0" width="124.5" height="130"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.5490196078431373" green="0.58823529411764708" blue="0.62745098039215685" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D9a-om-46a">
<rect key="frame" x="0.0" y="0.0" width="55" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="58" height="0.0"/>
<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"/>
@ -1010,7 +1010,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sRy-AC-Qee">
<rect key="frame" x="0.0" y="1724" width="335" height="608"/>
<rect key="frame" x="0.0" y="1722" width="335" height="608"/>
<subviews>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0fZ-XA-Bzr">
<rect key="frame" x="0.0" y="538" width="335" height="50"/>
@ -1172,37 +1172,37 @@
</scenes>
<designables>
<designable name="36b-sy-wJ9">
<size key="intrinsicContentSize" width="177.5" height="34"/>
<size key="intrinsicContentSize" width="185" height="34"/>
</designable>
<designable name="FSM-6E-es0">
<size key="intrinsicContentSize" width="134" height="34"/>
<size key="intrinsicContentSize" width="140" height="34"/>
</designable>
<designable name="TV5-Pc-Gg6">
<size key="intrinsicContentSize" width="181.5" height="34"/>
<size key="intrinsicContentSize" width="188.5" height="34"/>
</designable>
<designable name="Vgo-ox-p7M">
<size key="intrinsicContentSize" width="70" height="34"/>
<size key="intrinsicContentSize" width="73.5" height="34"/>
</designable>
<designable name="byd-K4-3eK">
<size key="intrinsicContentSize" width="160.5" height="34"/>
<size key="intrinsicContentSize" width="170" height="34"/>
</designable>
<designable name="g3f-ps-0B2">
<size key="intrinsicContentSize" width="124.5" height="34"/>
<size key="intrinsicContentSize" width="129" height="34"/>
</designable>
<designable name="kmb-93-d6k">
<size key="intrinsicContentSize" width="141.5" height="34"/>
<size key="intrinsicContentSize" width="146.5" height="34"/>
</designable>
<designable name="sBp-CJ-Ygw">
<size key="intrinsicContentSize" width="134" height="34"/>
<size key="intrinsicContentSize" width="140" height="34"/>
</designable>
<designable name="tYu-as-9PW">
<size key="intrinsicContentSize" width="120" height="34"/>
<size key="intrinsicContentSize" width="124.5" height="34"/>
</designable>
<designable name="uC6-BE-YHM">
<size key="intrinsicContentSize" width="113.5" height="34"/>
<size key="intrinsicContentSize" width="118" height="34"/>
</designable>
<designable name="wSR-s5-0bP">
<size key="intrinsicContentSize" width="138" height="34"/>
<size key="intrinsicContentSize" width="144" height="34"/>
</designable>
</designables>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

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

@ -120,9 +120,6 @@ class KYCVerifyStep1ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
let url = URL(string: "http://211.25.249.199:9093/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
self.termsWebView.load(URLRequest(url: url))
self.termsWebView.scrollView.bounces = false
self.isFirst = (self.step == .first)
setup()
}
@ -240,19 +237,19 @@ class KYCVerifyStep1ViewController: UIViewController {
textField.errorColor = .themeRed
}
case monthlyIncomeTextField:
textField.removeNonASCII()
if !textField.isValid {
textField.errorMessage = "invalidEmailId_text".localized()
textField.errorColor = .themeRed
}
// case monthlyIncomeTextField:
// textField.removeNonASCII()
// if !textField.isValid {
// textField.errorMessage = "invalidEmailId_text".localized()
// textField.errorColor = .themeRed
// }
case emailTextField:
if !textField.isValid {
textField.errorMessage = "invalidEmailId_text".localized()
textField.errorColor = .themeRed
}
// case emailTextField:
// if !textField.isValid {
// textField.errorMessage = "invalidEmailId_text".localized()
// textField.errorColor = .themeRed
// }
default: ()
}
@ -264,6 +261,10 @@ class KYCVerifyStep1ViewController: UIViewController {
extension KYCVerifyStep1ViewController {
private func setup() {
let url = URL(string: "http://211.25.249.199:9093/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
self.termsWebView.load(URLRequest(url: url))
self.termsWebView.scrollView.bounces = false
multiMediaManager = MultiMediaManager(presenter: self)
multiMediaManager?.delegate = self
@ -328,46 +329,46 @@ extension KYCVerifyStep1ViewController {
additionalIDTextField.validCondition = {!$0.isEmpty}
mobileNumberTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
monthlyIncomeTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
emailTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
// monthlyIncomeTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
// emailTextField.addTarget(self, action: #selector(editingChanged(_:)), for: .editingChanged)
}
private func setUIBinding() {
frontIDImageButton.rx.tap.bind {[weak self] in
self?.photoType = .frontID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
anotherIDImageButton.rx.tap.bind {[weak self] in
self?.photoType = .anotherID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
anotherIDBackImageButton.rx.tap.bind {[weak self] in
self?.photoType = .anotherIdBack
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
backIDImageButton.rx.tap.bind {[weak self] in
self?.photoType = .backID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
sideIDImageButton.rx.tap.bind {[weak self] in
self?.photoType = .sideID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
facePictureImageButton.rx.tap.bind {[weak self] in
self?.photoType = .facePicture
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
frontIDImageTrigger
@ -572,7 +573,7 @@ extension KYCVerifyStep1ViewController {
}).disposed(by: disposeBag)
emailTextField.rx.filterBy(.alphabetNumbericSpecial).disposed(by: disposeBag)
// emailTextField.rx.filterBy(.alphabetNumbericSpecial).disposed(by: disposeBag)
addressTextField.rx.filterBy(.alphabet, isUppercase: true).disposed(by: disposeBag)
}
@ -583,7 +584,7 @@ extension KYCVerifyStep1ViewController {
let isValidPersonalInfo = Observable.combineLatest(
[
emailTextField.valid,
// emailTextField.valid,
addressTextField.valid,
mobileNumberTextField.valid,
sourceOfFundTextField.valid,
@ -617,7 +618,7 @@ extension KYCVerifyStep1ViewController {
let editingPersonalInfo = Observable.combineLatest(
Observable.combineLatest(
emailTextField.rx.controlEvent(.editingChanged),
// emailTextField.rx.controlEvent(.editingChanged),
addressTextField.rx.controlEvent(.editingChanged),
occupationTxtField.rx.controlEvent(.editingChanged),
sourceOfFundTextField.rx.controlEvent(.editingChanged),
@ -778,8 +779,8 @@ extension KYCVerifyStep1ViewController {
self?.anotherIdBackImageBase64.onNext("dummy")
self?.additionalIDBackContainer.isHidden = true
}
self?.emailTextField.text = personalInformation.email
self?.emailTextField.sendActions(for: .editingChanged)
// self?.emailTextField.text = personalInformation.email
// self?.emailTextField.sendActions(for: .editingChanged)
self?.addressTextField.text = personalInformation.address
self?.addressTextField.sendActions(for: .editingChanged)
@ -787,7 +788,7 @@ extension KYCVerifyStep1ViewController {
self?.mobileNumberTextField.text = personalInformation.mobile
self?.mobileNumberTextField.sendActions(for: .editingChanged)
self?.monthlyIncomeTextField.sendActions(for: .editingChanged)
// self?.monthlyIncomeTextField.sendActions(for: .editingChanged)//
self?.employerNameTxtField.text = personalInformation.employeerName
self?.employerNameTxtField.sendActions(for: .editingChanged)
@ -840,6 +841,7 @@ extension KYCVerifyStep1ViewController {
isValidPersonalInfo
.distinctUntilChanged()
.asDriverOnErrorJustComplete().drive(onNext: {[weak self] isEnable in
print("enabled:\(isEnable)")
DispatchQueue.main.async {
self?.personalSaveButton.isEnabled = isEnable
self?.personalSaveButton.backgroundColor = isEnable ? .themeRed : .themeText
@ -871,10 +873,10 @@ extension KYCVerifyStep1ViewController {
self.mobileNumberTextField.titleText = "mobileNumber_text".localized()
self.businessTypeTextField.placeholder = "employee_business_type_text".localized()
self.businessTypeTextField.titleText = "employee_business_type_text".localized()
self.emailTextField.placeholder = "email_address_text".localized()
self.emailTextField.titleText = "email_address_text".localized()
// self.emailTextField.placeholder = "email_address_text".localized()
// self.emailTextField.titleText = "email_address_text".localized()
self.addressTextField.placeholder = "additional_address_text".localized()
self.addressTextField.titleText = "address_text".localized()
self.addressTextField.titleText = "additional_address_text".localized()
self.idInformationlabel.text = "id_information_text".localized()
self.idTypeTextField.placeholder = "id_type_text".localized()
self.idTypeTextField.titleText = "id_type_text".localized()

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

@ -112,14 +112,14 @@ class RenewIDViewController: UIViewController {
private func setUIBinding() {
frontIdImageButton.rx.tap.bind {[weak self] in
self?.photoType = .frontID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
backIdImageButton.rx.tap.bind {[weak self] in
self?.photoType = .backID
// self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
self?.multiMediaManager?.openCameraPicker()
self?.multiMediaManager?.openPicker(mode: UIImagePickerController.CameraCaptureMode.photo)
// self?.multiMediaManager?.openCameraPicker()
}.disposed(by: disposeBag)
@ -303,6 +303,8 @@ extension RenewIDViewController: RenewIDViewInterface {
title: "Success",
okTitle: "Ok"
) {
print("hi")
self.navigationController?.popViewController(animated: true)
}
}
}

10
GME Remit/Supported Files/GoogleService-Info.plist
View File

@ -3,9 +3,11 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>746847094670-3vkv62rguqv9905e08vcqldskgts7sce.apps.googleusercontent.com</string>
<string>746847094670-md2lpu97r78npnhf0rmqom68mscfflig.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.746847094670-3vkv62rguqv9905e08vcqldskgts7sce</string>
<string>com.googleusercontent.apps.746847094670-md2lpu97r78npnhf0rmqom68mscfflig</string>
<key>ANDROID_CLIENT_ID</key>
<string>746847094670-975vstjgdf1nskp84i55hrmj1nibgdm8.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyDyVnEEyFL4NYlFb-6mnZNTpqErUVrBFLI</string>
<key>GCM_SENDER_ID</key>
@ -13,7 +15,7 @@
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.japan.jme</string>
<string>com.japan.jmeremit</string>
<key>PROJECT_ID</key>
<string>jmeapp-f2e0c</string>
<key>STORAGE_BUCKET</key>
@ -29,7 +31,7 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:746847094670:ios:4cc4fd1b4cbfe878da86df</string>
<string>1:746847094670:ios:d3d32984ae451c9bda86df</string>
<key>DATABASE_URL</key>
<string>https://jmeapp-f2e0c.firebaseio.com</string>
</dict>

1
GME Remit/Utilities/AppConstants.swift
View File

@ -207,7 +207,6 @@ class Utility {
static func didSubmitKyc() -> Bool {
return database.user.bool(.kyc)
}
static func isExistingUser() -> Bool {

Write Preview
Loading…
Cancel
Save