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

major fixes

pull/1/head
gme_2 6 years ago
parent
ffc2aeeea5
commit
7c42f481e3
13 changed files with 73 additions and 76 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. BIN
      GMERemittance/Assets.xcassets/.DS_Store
  2. BIN
      GMERemittance/Assets.xcassets/kyc_samples/.DS_Store
  3. BIN
      GMERemittance/Assets.xcassets/kyc_samples/sampleSelfie.imageset/.DS_Store
  4. 44
      GMERemittance/Module/AddReciepient/User Interface/View/AddReciepient.storyboard
  5. 4
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRateCollectionViewCell.swift
  6. 1
      GMERemittance/Module/New Group/Kyc/Application Logic/Interactor/KycInteractor.swift
  7. 2
      GMERemittance/Module/New Group/kycForm1/Application Logic/Interactor/kycForm1Interactor.swift
  8. 48
      GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1.storyboard
  9. 8
      GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift
  10. 2
      GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift
  11. 1
      GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift
  12. 21
      GMERemittance/Module/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
  13. 18
      GMERemittance/Module/WalletStatement/User Interface/View/WalletStatement.storyboard

BIN
GMERemittance/Assets.xcassets/.DS_Store
View File

BIN
GMERemittance/Assets.xcassets/kyc_samples/.DS_Store
View File

BIN
GMERemittance/Assets.xcassets/kyc_samples/sampleSelfie.imageset/.DS_Store
View File

44
GMERemittance/Module/AddReciepient/User Interface/View/AddReciepient.storyboard
View File

@ -33,7 +33,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Lsn-v9-r4g">
<rect key="frame" x="10" y="0.0" width="355" height="758"/>
<rect key="frame" x="10" y="0.0" width="355" height="618"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Fgq-xq-dmN">
<rect key="frame" x="0.0" y="0.0" width="355" height="63"/>
@ -51,18 +51,18 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="4GX-ko-nbw">
<rect key="frame" x="0.0" y="68" width="355" height="690"/>
<rect key="frame" x="0.0" y="68" width="355" height="550"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="e8u-s3-fVl">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="First Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RPh-p3-dap">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Full Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RPh-p3-dap">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's first name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ydp-IU-Ddb">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's full name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ydp-IU-Ddb">
<rect key="frame" x="0.0" y="17" width="355" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="afy-81-2it"/>
@ -73,17 +73,17 @@
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="BQc-tA-RUn">
<rect key="frame" x="0.0" y="70" width="355" height="60"/>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="BQc-tA-RUn">
<rect key="frame" x="0.0" y="65" width="355" height="43"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Middle Name (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lwa-xS-Mou">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's middle name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Bgi-hL-Wf6">
<rect key="frame" x="0.0" y="17" width="355" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="tLl-P0-Zbh"/>
</constraints>
@ -93,17 +93,17 @@
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="A3K-Ig-mN9">
<rect key="frame" x="0.0" y="140" width="355" height="60"/>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="A3K-Ig-mN9">
<rect key="frame" x="0.0" y="65" width="355" height="43"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aos-AF-iaO">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter receiver's last name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xvn-Xq-Poa">
<rect key="frame" x="0.0" y="17" width="355" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="Ls2-ds-JKU"/>
</constraints>
@ -114,7 +114,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="kmX-kn-0uS">
<rect key="frame" x="0.0" y="210" width="355" height="60"/>
<rect key="frame" x="0.0" y="70" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Country" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-aR-bJE">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -134,7 +134,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Uwb-JF-Lu9">
<rect key="frame" x="0.0" y="280" width="355" height="60"/>
<rect key="frame" x="0.0" y="140" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="State/Province" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hX8-qF-mLG">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -154,7 +154,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="EtN-9R-GQt">
<rect key="frame" x="0.0" y="350" width="355" height="60"/>
<rect key="frame" x="0.0" y="210" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="District" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QCa-CZ-ElQ">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -174,7 +174,7 @@
</subviews>
</stackView>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="fh8-Q6-q8A">
<rect key="frame" x="0.0" y="415" width="355" height="43"/>
<rect key="frame" x="0.0" y="275" width="355" height="43"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="City" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="woC-KH-z7x">
<rect key="frame" x="0.0" y="0.0" width="355" height="0.0"/>
@ -194,7 +194,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="blF-qq-qJe">
<rect key="frame" x="0.0" y="420" width="355" height="60"/>
<rect key="frame" x="0.0" y="280" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y1V-LP-rwg">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -214,7 +214,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="O4c-KR-vEE">
<rect key="frame" x="0.0" y="490" width="355" height="60"/>
<rect key="frame" x="0.0" y="350" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Relation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aVB-K7-liY">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -234,7 +234,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="7Tk-n4-kZ1">
<rect key="frame" x="0.0" y="560" width="355" height="60"/>
<rect key="frame" x="0.0" y="420" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile No." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s2u-oR-Os8">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -254,7 +254,7 @@
</subviews>
</stackView>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="2Kh-Q2-iMo">
<rect key="frame" x="0.0" y="625" width="355" height="43"/>
<rect key="frame" x="0.0" y="485" width="355" height="43"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rIa-a1-cYb">
<rect key="frame" x="0.0" y="0.0" width="355" height="0.0"/>
@ -274,7 +274,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="iLj-pG-L6B">
<rect key="frame" x="0.0" y="630" width="355" height="60"/>
<rect key="frame" x="0.0" y="490" width="355" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Reason" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F7d-NL-98o">
<rect key="frame" x="0.0" y="0.0" width="355" height="17"/>
@ -298,7 +298,7 @@
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BKY-7W-R56">
<rect key="frame" x="87.5" y="788" width="200" height="50"/>
<rect key="frame" x="87.5" y="648" width="200" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="H0T-Sg-A4P"/>

4
GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRateCollectionViewCell.swift
View File

@ -30,12 +30,14 @@ class ExchangeRateCollectionViewCell: UICollectionViewCell {
}
private func showBorderColor() {
self.cellBackgroundview.layer.borderWidth = 1
self.cellBackgroundview.layer.borderWidth = 0.3
self.cellBackgroundview.layer.borderColor = UIColor.red.cgColor
self.layer.addShadow(with: UIColor.red)
}
private func hideBorderColor() {
cellBackgroundview.layer.borderWidth = 0
cellBackgroundview.layer.borderColor = UIColor.clear.cgColor
self.layer.addShadow(with: UIColor.clear)
}
}

1
GMERemittance/Module/New Group/Kyc/Application Logic/Interactor/KycInteractor.swift
View File

@ -32,7 +32,6 @@ class KycInteractor {
let formDick =
[
KycForm1FieldKeys.firstName: model?.firstName,
KycForm1FieldKeys.lastName: model?.lastName,
KycForm1FieldKeys.gender: model?.gender,
KycForm1FieldKeys.email: model?.email,
// KycForm1FieldKeys.dob: model?.dob,

2
GMERemittance/Module/New Group/kycForm1/Application Logic/Interactor/kycForm1Interactor.swift
View File

@ -28,10 +28,8 @@ class KycForm1Interactor {
let formDick =
[
KycForm1FieldKeys.firstName: model.firstName,
KycForm1FieldKeys.lastName: model.lastName,
KycForm1FieldKeys.gender: model.gender,
KycForm1FieldKeys.email: model.email,
// KycForm1FieldKeys.dob: model.dob,
KycForm1FieldKeys.nativeCountry: model.nativeCountry,
KycForm1FieldKeys.country: model.country,
KycForm1FieldKeys.occupation: model.occupation,

48
GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1.storyboard
View File

@ -30,10 +30,10 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="1300"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ulz-yj-JUf">
<rect key="frame" x="0.0" y="0.0" width="375" height="983"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="799.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cx7-yC-Iyy">
<rect key="frame" x="0.0" y="0.0" width="15" height="983"/>
<rect key="frame" x="0.0" y="0.0" width="15" height="799.5"/>
<constraints>
<constraint firstAttribute="width" constant="15" id="Loe-0S-vzZ"/>
</constraints>
@ -42,7 +42,7 @@
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="5Yj-58-A1e">
<rect key="frame" x="15" y="0.0" width="345" height="983"/>
<rect key="frame" x="15" y="0.0" width="345" height="799.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="fHx-i6-TAt">
<rect key="frame" x="0.0" y="0.0" width="345" height="50"/>
@ -60,13 +60,13 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="QtF-v5-ULz">
<rect key="frame" x="0.0" y="70" width="345" height="913"/>
<rect key="frame" x="0.0" y="70" width="345" height="729.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="MuX-Si-40N">
<rect key="frame" x="0.0" y="0.0" width="345" height="82"/>
<rect key="frame" x="0.0" y="0.0" width="345" height="82.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="First Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWL-1e-dX6">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Full Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWL-1e-dX6">
<rect key="frame" x="0.0" y="0.0" width="345" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="6OC-Dh-iss"/>
</constraints>
@ -75,7 +75,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="error" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Gb-uL-YsM">
<rect key="frame" x="0.0" y="19.5" width="345" height="14.5"/>
<rect key="frame" x="0.0" y="20" width="345" height="14.5"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="ovN-KL-w3Z"/>
</constraints>
@ -83,8 +83,8 @@
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your First Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wBc-TT-A5d">
<rect key="frame" x="0.0" y="39" width="345" height="43"/>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter your Full Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wBc-TT-A5d">
<rect key="frame" x="0.0" y="39.5" width="345" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="Psk-Sn-kig"/>
</constraints>
@ -94,8 +94,8 @@
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="8pV-0F-5Pb">
<rect key="frame" x="0.0" y="92" width="345" height="82"/>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="8pV-0F-5Pb">
<rect key="frame" x="0.0" y="87.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Middle Name (Optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vgx-6G-7I7">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -126,8 +126,8 @@
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="mME-2B-4tJ">
<rect key="frame" x="0.0" y="184" width="345" height="82"/>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="mME-2B-4tJ">
<rect key="frame" x="0.0" y="87.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9oM-HO-xMi">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -159,7 +159,7 @@
</subviews>
</stackView>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="tlY-ip-g4p">
<rect key="frame" x="0.0" y="271" width="345" height="82"/>
<rect key="frame" x="0.0" y="87.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date of Birth" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="exz-v7-Ii8">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -191,7 +191,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="ZS4-HL-Kzg">
<rect key="frame" x="0.0" y="276" width="345" height="82"/>
<rect key="frame" x="0.0" y="92.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile No." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pOi-J4-HpV">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -223,7 +223,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="aBI-2t-Tak">
<rect key="frame" x="0.0" y="368" width="345" height="82"/>
<rect key="frame" x="0.0" y="184.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrG-sR-08m">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -255,7 +255,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="9IE-gI-ZYn">
<rect key="frame" x="0.0" y="460" width="345" height="82"/>
<rect key="frame" x="0.0" y="276.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Gender" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bPf-Nl-7DP">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -287,7 +287,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Oi0-Od-8ks">
<rect key="frame" x="0.0" y="552" width="345" height="83"/>
<rect key="frame" x="0.0" y="368.5" width="345" height="83"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Native Country" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UGo-bk-Rq9">
<rect key="frame" x="0.0" y="0.0" width="345" height="15"/>
@ -319,7 +319,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="VKC-oG-zQf">
<rect key="frame" x="0.0" y="645" width="345" height="83"/>
<rect key="frame" x="0.0" y="461.5" width="345" height="83"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address In Korea" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qfd-4I-OvP">
<rect key="frame" x="0.0" y="0.0" width="345" height="15"/>
@ -351,7 +351,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="dAp-gm-h7D">
<rect key="frame" x="0.0" y="738" width="345" height="83"/>
<rect key="frame" x="0.0" y="554.5" width="345" height="83"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Province" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d1k-Xs-axj">
<rect key="frame" x="0.0" y="0.0" width="345" height="15"/>
@ -383,7 +383,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="T5L-LD-asN">
<rect key="frame" x="0.0" y="831" width="345" height="82"/>
<rect key="frame" x="0.0" y="647.5" width="345" height="82"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Occupation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aYD-8r-p9B">
<rect key="frame" x="0.0" y="0.0" width="345" height="14.5"/>
@ -420,7 +420,7 @@
</subviews>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cn4-Hf-O4w">
<rect key="frame" x="360" y="0.0" width="15" height="983"/>
<rect key="frame" x="360" y="0.0" width="15" height="799.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -431,7 +431,7 @@
</constraints>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4QD-n7-cbc">
<rect key="frame" x="87" y="1033" width="200" height="50"/>
<rect key="frame" x="87" y="849.5" width="200" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="Fgp-3E-J5P"/>

8
GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift
View File

@ -30,10 +30,7 @@ class Occupation {
struct KycForm1FieldKeys {
static let firstName = "firstname"
static let middleName = "middlename"
static let lastName = "lastname"
static let gender = "gender"
// static let dob = "date of birth"
static let mobileNumber = "mobile number"
static let email = "email"
static let nativeCountry = "native country"
@ -253,8 +250,6 @@ class KycForm1ViewController: UIViewController {
self.errorLabelsDict =
[
KycForm1FieldKeys.firstName: self.firstNameErrorLabel,
KycForm1FieldKeys.middleName: self.middleNameErrorLabel,
KycForm1FieldKeys.lastName: self.lastNameErrorLabel,
KycForm1FieldKeys.gender: self.genderErrorLabel,
// KycForm1FieldKeys.dob: self.dobErrorLabel,
KycForm1FieldKeys.mobileNumber: self.mobileNumberErrorLabel,
@ -285,10 +280,7 @@ class KycForm1ViewController: UIViewController {
self.errorTextFieldDict =
[
KycForm1FieldKeys.firstName: self.firstNameTextField,
KycForm1FieldKeys.middleName: self.middleNmaeTextField,
KycForm1FieldKeys.lastName: self.lastNameTextField,
KycForm1FieldKeys.gender: self.genderTextField,
// KycForm1FieldKeys.dob: self.dobTextField,
KycForm1FieldKeys.mobileNumber: self.mobileNumberTextField,
KycForm1FieldKeys.email: self.emailTextField,
KycForm1FieldKeys.nativeCountry: self.nativeCountryTextField,

2
GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift
View File

@ -143,7 +143,7 @@ class RegisterInteractor {
}
if dob.isEmpty {
error = error + "\n Please enter a balid date of birth"
error = error + "\n Please enter a valid date of birth"
isValid = false
}

1
GMERemittance/Module/SplashScreen/User Interface/View/SplashScreenViewController.swift
View File

@ -50,6 +50,7 @@ class SplashScreenViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setup()
self.buttonLogin.backgroundColor = AppConstants.themeBlueColor
}
override func viewWillAppear(_ animated: Bool) {

21
GMERemittance/Module/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
View File

@ -13,6 +13,7 @@ class WalletStatementTableViewCell: UITableViewCell {
enum WalletInOutType: String {
case walletIn = "WalletIn"
case walletOut = "WalletOut"
case closingAmount = "ClosingAmount"
}
@IBOutlet weak var dateLabel: UILabel!
@ -24,6 +25,13 @@ class WalletStatementTableViewCell: UITableViewCell {
var model: WalletStatement?
func getType() -> WalletInOutType {
if (model?.particular ?? "").lowercased() == "Balance Brought Forward".lowercased() {
return .closingAmount
}
return (model?.walletOut ?? "") == "₩0" ? .walletIn : .walletOut
}
func setup() {
self.dateLabel.text = model?.transactionDate
self.particularLabel.text = model?.particular
@ -31,25 +39,22 @@ class WalletStatementTableViewCell: UITableViewCell {
let type: WalletInOutType = (model?.walletOut ?? "") == "₩0" ? .walletIn : .walletOut
let type: WalletInOutType = getType()
self.walletAmountLabel.layer.cornerRadius = 4
self.walletAmountLabel.clipsToBounds = true
walletAmountLabel.textColor = .white
switch type {
case .walletIn:
if (model?.particular ?? "").lowercased() == "Balance Brought Forward".lowercased() {
self.walletAmountLabel.text = ""
self.walletAmountLabel.backgroundColor = AppConstants.themWhiteColor
}else {
self.walletAmountLabel.backgroundColor = AppConstants.themeBlueColor
self.walletAmountLabel.text = "IN: \(self.model?.walletIn ?? "")"
}
case .walletOut:
self.walletAmountLabel.backgroundColor = AppConstants.themeRedColor
self.walletAmountLabel.text = "OUT: \(model?.walletOut ?? "")"
case .closingAmount:
self.walletAmountLabel.text = ""
self.walletAmountLabel.backgroundColor = AppConstants.themWhiteColor
}
}
}

18
GMERemittance/Module/WalletStatement/User Interface/View/WalletStatement.storyboard
View File

@ -50,19 +50,19 @@
<rect key="frame" x="15" y="10" width="315" height="94"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbP-sK-VqU">
<rect key="frame" x="0.0" y="0.0" width="315" height="48"/>
<rect key="frame" x="0.0" y="0.0" width="315" height="49"/>
<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"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pFg-LK-KPZ">
<rect key="frame" x="0.0" y="53" width="315" height="18"/>
<rect key="frame" x="0.0" y="54" width="315" height="17.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M1E-8L-a1t">
<rect key="frame" x="0.0" y="0.0" width="247" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="242" height="17.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" text="To: Dhan Singh Saud To: Dhan Singh Saud" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uog-tj-cso">
<rect key="frame" x="0.0" y="0.0" width="247" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="242" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -70,10 +70,10 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BD2-GC-dic">
<rect key="frame" x="247" y="0.0" width="68" height="18"/>
<rect key="frame" x="242" y="0.0" width="73" height="17.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="255" verticalHuggingPriority="251" horizontalCompressionResistancePriority="755" text="-1,000,000" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZlX-mu-6jx">
<rect key="frame" x="0.0" y="0.0" width="68" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="73" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -83,16 +83,16 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZWQ-9g-g0t">
<rect key="frame" x="0.0" y="76" width="315" height="18"/>
<rect key="frame" x="0.0" y="76.5" width="315" height="17.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Closing Balance" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MKf-Bc-j5A">
<rect key="frame" x="0.0" y="0.0" width="157.5" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="157.5" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="13"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="255" verticalHuggingPriority="251" horizontalCompressionResistancePriority="755" text="-1,000,000" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6ee-Ey-bqV">
<rect key="frame" x="157.5" y="0.0" width="157.5" height="18"/>
<rect key="frame" x="157.5" y="0.0" width="157.5" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>

Write Preview
Loading…
Cancel
Save