Browse Source

kyc fomr 4 and forgot password text managed

pull/1/head
gme_2 6 years ago
parent
commit
b0b35253cf
  1. 14
      GMERemittance/Module/ForgotPassword/User Interface/View/ForgotPassword.storyboard
  2. 23
      GMERemittance/Module/ForgotPassword/User Interface/View/ForgotPasswordViewController.swift
  3. 30
      GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard
  4. 53
      GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3ViewController.swift

14
GMERemittance/Module/ForgotPassword/User Interface/View/ForgotPassword.storyboard

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -21,7 +21,7 @@
<!--ForgotPassword-->
<scene sceneID="R60-Pu-Hpy">
<objects>
<viewController storyboardIdentifier="ForgotPasswordViewController" title="ForgotPassword" id="HSb-ou-7T5" customClass="ForgotPasswordViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ForgotPasswordViewController" title="ForgotPassword" id="HSb-ou-7T5" customClass="ForgotPasswordViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y1H-iV-BwG"/>
<viewControllerLayoutGuide type="bottom" id="PYB-Kq-ghm"/>
@ -144,7 +144,7 @@
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KBc-q5-Ydw">
<rect key="frame" x="88" y="376" width="200" height="50"/>
<rect key="frame" x="87.5" y="376" 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="Xfe-PO-wfr"/>
@ -164,7 +164,7 @@
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nlp-1I-0gr">
<rect key="frame" x="152" y="447" width="72" height="42"/>
<rect key="frame" x="151.5" y="447" width="72" height="42"/>
<constraints>
<constraint firstAttribute="width" constant="72" id="d9U-EO-UY1"/>
<constraint firstAttribute="height" constant="42" id="syv-Ef-t4W"/>
@ -218,7 +218,11 @@
</constraints>
</view>
<connections>
<outlet property="cancelButton" destination="nlp-1I-0gr" id="2tp-W8-Oci"/>
<outlet property="dobTextField" destination="kED-Up-SXs" id="Ec3-fd-IqX"/>
<outlet property="headerLabel" destination="0gz-Yf-aYX" id="pMD-xR-0kV"/>
<outlet property="resetButton" destination="KBc-q5-Ydw" id="AyU-2X-uRy"/>
<outlet property="subHeaderLabel" destination="pgg-Ez-CdO" id="qB8-eR-etg"/>
<outlet property="userNameTextField" destination="rW7-qU-MLF" id="mPg-Gf-YUR"/>
</connections>
</viewController>

23
GMERemittance/Module/ForgotPassword/User Interface/View/ForgotPasswordViewController.swift

@ -10,10 +10,22 @@ import UIKit
class ForgotPasswordViewController: UIViewController {
// MARK: IBOutlets
struct StringConstants {
static let headerTitle = "Need Help with your password?"
static let subHeaderTitle = "Reset your password using your email address linked to your GME account."
static let userIdPlaceholder = "Registered Email"
static let dobPlaceholder = "Date Of Birth"
static let resetText = "Reset"
static let cancelText = "Cancel"
}
// MARK: IBOutlets
@IBOutlet weak var headerLabel: UILabel!
@IBOutlet weak var subHeaderLabel: UILabel!
@IBOutlet weak var userNameTextField: UITextField!
@IBOutlet weak var dobTextField: UITextField!
@IBOutlet weak var resetButton: UIButton!
@IBOutlet weak var cancelButton: UIButton!
// MARK: Properties
@ -47,6 +59,15 @@ class ForgotPasswordViewController: UIViewController {
self.setupPicturedNavBar()
}
func configureLanguage() {
self.userNameTextField.placeholder = StringConstants.userIdPlaceholder
self.dobTextField.placeholder = StringConstants.dobPlaceholder
self.resetButton.setTitle(StringConstants.resetText, for: UIControlState.normal)
self.cancelButton.setTitle(StringConstants.cancelText, for: UIControlState.normal)
self.headerLabel.text = StringConstants.headerTitle
self.subHeaderLabel.text = StringConstants.subHeaderTitle
}
private func setupDatePicker() {
self.datePicker.datePickerMode = .date
self.dobTextField.inputView = datePicker

30
GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3.storyboard

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
@ -30,7 +30,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rUB-Um-w1X">
<rect key="frame" x="0.0" y="0.0" width="375" height="668"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload your documents" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVf-MD-cFF">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
@ -43,13 +43,13 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note: Verification Id can be your National ID or Alien Reg ID or Passport Front selected on Security Screen" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tXr-oG-t5s">
<rect key="frame" x="24" y="58" width="327" height="29"/>
<rect key="frame" x="24" y="58" width="327" height="28"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VoJ-vJ-v30">
<rect key="frame" x="24" y="98" width="327" height="412"/>
<rect key="frame" x="24" y="97" width="327" height="412"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="dk7-gc-v1u">
<rect key="frame" x="0.0" y="0.0" width="327" height="406"/>
@ -90,7 +90,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3JW-bb-MGf">
<rect key="frame" x="156" y="54" width="55" height="35"/>
<rect key="frame" x="153" y="54" width="58" height="35"/>
<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"/>
@ -154,7 +154,7 @@
<rect key="frame" x="102" y="2" width="223" height="90"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tZR-gX-bEM">
<rect key="frame" x="156" y="54" width="55" height="35"/>
<rect key="frame" x="153" y="54" width="58" height="35"/>
<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"/>
@ -236,7 +236,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lFh-Zy-f4Y">
<rect key="frame" x="156" y="54" width="55" height="35"/>
<rect key="frame" x="153" y="54" width="58" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="loD-1d-eq2"/>
</constraints>
@ -307,7 +307,7 @@
<rect key="frame" x="102" y="2" width="223" height="90"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lBN-We-WE8">
<rect key="frame" x="156" y="54" width="55" height="35"/>
<rect key="frame" x="153" y="54" width="58" height="35"/>
<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"/>
@ -370,7 +370,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w8k-2p-JDg">
<rect key="frame" x="87.5" y="518" width="200" height="50"/>
<rect key="frame" x="87.5" y="517" width="200" height="50"/>
<color key="backgroundColor" red="0.91372549020000005" green="0.2470588235" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="H19-mH-yjS"/>
@ -431,10 +431,20 @@
<outlet property="backImageView" destination="qgv-aT-tmu" id="16D-OL-dz6"/>
<outlet property="frontButton" destination="Bqb-j0-JNj" id="HxW-pT-5kx"/>
<outlet property="frontImageView" destination="sSt-BJ-VAQ" id="kzP-Bu-dVH"/>
<outlet property="headerTitle" destination="mVf-MD-cFF" id="to5-fI-MbV"/>
<outlet property="passBookView" destination="1Q5-WL-G5r" id="ic7-Nw-NcY"/>
<outlet property="passbook" destination="bKZ-ZC-fJo" id="gk4-sg-uzL"/>
<outlet property="passbookSampleButotn" destination="lBN-We-WE8" id="4ul-XO-7Lm"/>
<outlet property="passbookTitleLabel" destination="q7T-EI-vI2" id="2tE-Z1-Phn"/>
<outlet property="selfieButton" destination="HD5-L5-Jn7" id="ihX-q1-URd"/>
<outlet property="selfieSampleButton" destination="lFh-Zy-f4Y" id="XON-mP-pes"/>
<outlet property="selfieTitleLabel" destination="o0x-xD-J2G" id="hLD-sc-8gP"/>
<outlet property="selfieView" destination="oMK-PG-o8t" id="TXL-Cd-KnV"/>
<outlet property="sutTitleLabel" destination="tXr-oG-t5s" id="L0A-mN-kL2"/>
<outlet property="verificationBackSampleButton" destination="tZR-gX-bEM" id="AKQ-Qy-xc4"/>
<outlet property="verificationFrontButton" destination="3JW-bb-MGf" id="oqH-ZL-f6h"/>
<outlet property="verificationIdBackTitleLabel" destination="i47-Zo-hqH" id="KaP-qP-g4L"/>
<outlet property="verificationIdFrontTitleLabel" destination="PAv-7J-bBT" id="ib1-T0-aYa"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>

53
GMERemittance/Module/New Group/kycForm3/User Interface/View/kycForm3ViewController.swift

@ -40,6 +40,16 @@ class KycForm3ViewController: UIViewController {
static let errorBorderSize = AppConstants.errorBorderWidth
}
struct StringConstants {
static let verificationIdFrontTitle = "Verification Id Front"
static let verificationIdBackTitle = "Verification Id Back"
static let selfieFrontTitle = "Selfie with Verification Id Front"
static let passBookTitle = "Bank Passbook"
static let veiwSampleText = "View Sample"
static let noteText = "Note: Verification Id can be your National ID or Alien Reg ID or Passport Front selected on Security Screen"
static let headerText = "Upload your documents"
}
// MARK: IBOutlets
@IBOutlet weak var selfieButton: UIButton!
@ -56,6 +66,34 @@ class KycForm3ViewController: UIViewController {
@IBOutlet weak var passBookView: UIView!
@IBOutlet weak var passportView: UIView!
// titles
@IBOutlet weak var verificationIdFrontTitleLabel: UILabel!
@IBOutlet weak var verificationIdBackTitleLabel: UILabel!
@IBOutlet weak var selfieTitleLabel: UILabel!
@IBOutlet weak var passbookTitleLabel: UILabel!
@IBOutlet weak var headerTitle: UILabel!
@IBOutlet weak var sutTitleLabel: UILabel!
// buttons
@IBOutlet weak var verificationFrontSampleButton: UIButton!
@IBOutlet weak var verificationBackSampleButton: UIButton!
@IBOutlet weak var selfieSampleButton: UIButton!
@IBOutlet weak var passbookSampleButotn: UIButton!
private func configureLanguage() {
self.headerTitle.text = StringConstants.headerText
self.sutTitleLabel.text = StringConstants.noteText
self.verificationIdFrontTitleLabel.text = StringConstants.verificationIdFrontTitle
self.verificationIdBackTitleLabel.text = StringConstants.verificationIdBackTitle
self.selfieTitleLabel.text = StringConstants.selfieFrontTitle
self.passbookTitleLabel.text = StringConstants.passBookTitle
[verificationBackSampleButton, selfieSampleButton,verificationFrontSampleButton, passbookSampleButotn].forEach({
$0?.setTitle(StringConstants.veiwSampleText, for: .normal)
})
}
// MARK: Properties
@ -100,14 +138,9 @@ class KycForm3ViewController: UIViewController {
}
@IBAction func passbook(_ sender: UIButton) {
showSample(type: .passbook, titleString: "Passbook")
}
// @IBAction func passport(_ sender: UIButton) {
// showSample(type: .passport, titleString: "Passport")
// }
// camera actions
@ -134,13 +167,6 @@ class KycForm3ViewController: UIViewController {
self.showPicker()
}
// @IBAction func passportCamera(_ sender: UIButton) {
// self.currentPictureType = .passport
// print("passport")
// self.showPicker()
// }
// submit action
@ -149,7 +175,6 @@ class KycForm3ViewController: UIViewController {
}
// MARK: Other Functions
private func setup() {
@ -159,8 +184,10 @@ class KycForm3ViewController: UIViewController {
self.imageCropper = ImageCroper(presentingViewController: self)
imageCropper?.delegate = self
setupErrorViews()
configureLanguage()
}
private func setupErrorViews() {
self.errorViewsDict =
[

Loading…
Cancel
Save