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

added password policies message

pull/1/head
gme_2 6 years ago
parent
5b523b742e
commit
6c1bfc472c
6 changed files with 81 additions and 73 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. 48
      GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard
  2. 4
      GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift
  3. 57
      GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
  4. 28
      GMERemittance/Profile/Profile.storyboard
  5. 13
      GMERemittance/Profile/ProfileChangePasswordViewController.swift
  6. 4
      GMERemittance/Profile/ProfileViewController.swift

48
GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard
View File

@ -36,7 +36,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="EEF-HP-StG">
<rect key="frame" x="10" y="20" width="355" height="368"/>
<rect key="frame" x="10" y="20" width="355" height="388"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="qGh-mt-tYG">
<rect key="frame" x="0.0" y="0.0" width="355" height="154"/>
@ -136,16 +136,16 @@
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="25L-1L-t4e">
<rect key="frame" x="0.0" y="174" width="355" height="60"/>
<rect key="frame" x="0.0" y="174" width="355" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AGt-UA-d1E">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aph-by-xzw">
<rect key="frame" x="8" y="0.0" width="347" height="60"/>
<rect key="frame" x="8" y="0.0" width="347" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" translatesAutoresizingMaskIntoConstraints="NO" id="tLv-zB-NOh">
<rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="222" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZ5-gd-eBb">
<rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
@ -163,21 +163,21 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,000,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g3K-Yw-9MX">
<rect key="frame" x="0.0" y="20" width="222" height="40"/>
<rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="zxw-hb-bmw"/>
<constraint firstAttribute="height" constant="50" id="zxw-hb-bmw"/>
</constraints>
<color key="textColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="28"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Iu4-4L-RhQ">
<rect key="frame" x="222" y="0.0" width="125" height="60"/>
<rect key="frame" x="222" y="0.0" width="125" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="n3f-Vu-f8f">
<rect key="frame" x="25.5" y="17" width="74" height="26"/>
<rect key="frame" x="25.5" y="22" width="74" height="26"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="y0f-Vr-Roy">
<rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@ -215,11 +215,11 @@
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="60" id="sKB-V9-sb2"/>
<constraint firstAttribute="height" constant="70" id="sKB-V9-sb2"/>
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="eZQ-ZM-qFq">
<rect key="frame" x="0.0" y="254" width="355" height="34"/>
<rect key="frame" x="0.0" y="264" width="355" height="34"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zIZ-e5-h3R">
<rect key="frame" x="0.0" y="0.0" width="355" height="34"/>
@ -256,16 +256,16 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2dJ-m4-ieK">
<rect key="frame" x="0.0" y="308" width="355" height="60"/>
<rect key="frame" x="0.0" y="318" width="355" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xnw-Oo-65c">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GaA-e0-GMM">
<rect key="frame" x="8" y="0.0" width="347" height="60"/>
<rect key="frame" x="8" y="0.0" width="347" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" translatesAutoresizingMaskIntoConstraints="NO" id="hEM-6z-LUa">
<rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="222" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9ee-w5-Wse">
<rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
@ -283,24 +283,24 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,00,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dTw-1k-6zQ">
<rect key="frame" x="0.0" y="20" width="222" height="40"/>
<rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="trM-sN-aGf"/>
<constraint firstAttribute="height" constant="50" id="trM-sN-aGf"/>
</constraints>
<color key="textColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="28"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="XAz-ee-bHP">
<rect key="frame" x="222" y="0.0" width="125" height="60"/>
<rect key="frame" x="222" y="0.0" width="125" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xgx-rs-oxc">
<rect key="frame" x="0.0" y="0.0" width="125" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="125" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="T9h-bm-oDr">
<rect key="frame" x="7.5" y="17" width="110" height="26"/>
<rect key="frame" x="7.5" y="22" width="110" height="26"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="Avu-kr-1cs">
<rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@ -352,13 +352,13 @@
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="60" id="ME8-ck-qSj"/>
<constraint firstAttribute="height" constant="70" id="ME8-ck-qSj"/>
</constraints>
</stackView>
</subviews>
</stackView>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6t-AW-Fpn">
<rect key="frame" x="87.5" y="412" width="200" height="50"/>
<rect key="frame" x="87.5" y="432" width="200" height="50"/>
<color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="Z0u-lJ-VEU"/>

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

@ -55,7 +55,7 @@ class RegisterInteractor {
}else {
if !isValidLength() {
error = error + "\n Password should be greater than 8 character."
error = error + "\n Password should have at least 9 characters"
isValid = false
return (isValid, error)
}
@ -64,7 +64,7 @@ class RegisterInteractor {
if !validPassword {
isValid = false
error = error + "\n Password should contain at least 1 number, 1 letter and 1 special character"
error = error + "\n Password should contain at least one symbol, one capital letter and one number"
return (isValid, error)
}

57
GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
View File

@ -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">
<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">
<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="14283.14"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -16,12 +16,15 @@
<array key="SanFranciscoDisplay-Regular.otf">
<string>SanFranciscoDisplay-Regular</string>
</array>
<array key="SanFranciscoDisplay-Semibold.otf">
<string>SanFranciscoDisplay-Semibold</string>
</array>
</customFonts>
<scenes>
<!--Send Money Exchange Rate View Controller-->
<scene sceneID="lRH-k8-ECt">
<objects>
<viewController storyboardIdentifier="SendMoneyExchangeRateViewController" id="SBO-Ku-vj1" customClass="SendMoneyExchangeRateViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="SendMoneyExchangeRateViewController" id="SBO-Ku-vj1" customClass="SendMoneyExchangeRateViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Oiz-Y5-Rzy">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -33,19 +36,19 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="sHP-5O-mqU">
<rect key="frame" x="10" y="20" width="355" height="206"/>
<rect key="frame" x="10" y="20" width="355" height="226"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="sCj-Y4-1QK">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NIQ-jY-bKH">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r9f-9N-T4W">
<rect key="frame" x="8" y="0.0" width="347" height="60"/>
<rect key="frame" x="8" y="0.0" width="347" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" translatesAutoresizingMaskIntoConstraints="NO" id="aj0-Nh-bdK">
<rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="222" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZt-Xi-hDQ">
<rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
@ -63,21 +66,21 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,000,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bIP-Bh-GBC">
<rect key="frame" x="0.0" y="20" width="222" height="40"/>
<rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="kAI-1o-NdR"/>
<constraint firstAttribute="height" constant="50" id="kAI-1o-NdR"/>
</constraints>
<color key="textColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K75-46-fqN">
<rect key="frame" x="222" y="0.0" width="125" height="60"/>
<rect key="frame" x="222" y="0.0" width="125" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="D8a-kf-6NY">
<rect key="frame" x="25.5" y="17" width="74" height="26"/>
<rect key="frame" x="25.5" y="22" width="74" height="26"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="8MB-bv-CXz">
<rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@ -115,11 +118,11 @@
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="60" id="7aX-4B-zge"/>
<constraint firstAttribute="height" constant="70" id="7aX-4B-zge"/>
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="jwn-As-sSE">
<rect key="frame" x="0.0" y="80" width="355" height="46"/>
<rect key="frame" x="0.0" y="90" width="355" height="46"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kzR-QC-upj">
<rect key="frame" x="0.0" y="0.0" width="355" height="20.5"/>
@ -175,16 +178,16 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2vf-uc-jsQ">
<rect key="frame" x="0.0" y="146" width="355" height="60"/>
<rect key="frame" x="0.0" y="156" width="355" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dQS-XD-HRg">
<rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N2X-R4-0o1">
<rect key="frame" x="8" y="0.0" width="347" height="60"/>
<rect key="frame" x="8" y="0.0" width="347" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalCentering" translatesAutoresizingMaskIntoConstraints="NO" id="WUQ-5H-Jbs">
<rect key="frame" x="0.0" y="0.0" width="222" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="222" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="daY-gh-f5z">
<rect key="frame" x="0.0" y="0.0" width="222" height="6"/>
@ -202,24 +205,24 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="10,00,000" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GQa-1w-7Uz">
<rect key="frame" x="0.0" y="20" width="222" height="40"/>
<rect key="frame" x="0.0" y="20" width="222" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="PBJ-ZP-E9h"/>
<constraint firstAttribute="height" constant="50" id="PBJ-ZP-E9h"/>
</constraints>
<color key="textColor" red="0.92941176469999998" green="0.1137254902" blue="0.1960784314" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="33"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="u3H-in-pKR">
<rect key="frame" x="222" y="0.0" width="125" height="60"/>
<rect key="frame" x="222" y="0.0" width="125" height="70"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uw9-Za-23R">
<rect key="frame" x="0.0" y="0.0" width="125" height="60"/>
<rect key="frame" x="0.0" y="0.0" width="125" height="70"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="tjZ-9f-eMI">
<rect key="frame" x="8" y="17" width="110" height="26"/>
<rect key="frame" x="7.5" y="22" width="110" height="26"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="PqL-FQ-Cs6">
<rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@ -271,13 +274,13 @@
</view>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="60" id="Gtb-gT-2sP"/>
<constraint firstAttribute="height" constant="70" id="Gtb-gT-2sP"/>
</constraints>
</stackView>
</subviews>
</stackView>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mLq-cC-0T4">
<rect key="frame" x="87.5" y="250" width="200" height="50"/>
<rect key="frame" x="87.5" y="270" 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="QvC-tl-7ln"/>

28
GMERemittance/Profile/Profile.storyboard
View File

@ -325,7 +325,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LU1-7H-4oT">
<rect key="frame" x="10" y="65" width="355" height="264"/>
<rect key="frame" x="10" y="88" width="355" height="264"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="9" translatesAutoresizingMaskIntoConstraints="NO" id="zMD-Ic-UA3">
<rect key="frame" x="0.0" y="0.0" width="355" height="264"/>
@ -447,17 +447,25 @@
<constraint firstItem="zMD-Ic-UA3" firstAttribute="leading" secondItem="LU1-7H-4oT" secondAttribute="leading" id="xQK-KS-acg"/>
</constraints>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Change Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cdu-5Q-Z5A">
<rect key="frame" x="10" y="21" width="355" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="80F-mp-eYg"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="18"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cdu-5Q-Z5A">
<rect key="frame" x="10" y="21" width="355" height="44"/>
<attributedString key="attributedText">
<fragment>
<string key="content">Password should be At least one symbol,
At least one capital letter, At least one number
Be at least 9 characters</string>
<attributes>
<font key="NSFont" size="12" name="HelveticaNeue"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="leftToRight" lineSpacing="1" defaultTabInterval="28" tighteningFactorForTruncation="0.0" allowsDefaultTighteningForTruncation="NO">
<tabStops/>
</paragraphStyle>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XqZ-xO-HOx">
<rect key="frame" x="87.5" y="369" width="200" height="50"/>
<rect key="frame" x="87.5" y="392" 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="width" constant="200" id="eUk-6j-8wv"/>
@ -639,7 +647,7 @@
</scene>
</scenes>
<resources>
<image name="ic-profile" width="20" height="20"/>
<image name="ic-profile" width="20.5" height="20.5"/>
<image name="ic_profile_bg" width="355" height="226"/>
<image name="ic_profile_camara" width="16" height="16"/>
<image name="ic_profile_edit" width="42" height="15"/>

13
GMERemittance/Profile/ProfileChangePasswordViewController.swift
View File

@ -27,6 +27,8 @@ class ProfileChangePasswordViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setupNormalNavigation()
topLabel.font = UIFont.init(name: Fonts.Family.regular, size: 14)
topLabel.textColor = UIColor.init(hex: "4a4a4a")
}
@ -40,13 +42,6 @@ class ProfileChangePasswordViewController: UIViewController {
self.navigationItem.title = ""
}
// "{
// ""UserId"":""pathaksumitra4@gmail.com"",
// ""OldPassword"":""P23FAB"",
// ""NewPassword"":""swift""
//
//}"
@IBAction func savePasswordChanges(_ sender: Any) {
let currentPassword = self.textFieldCurrentPassword.text!
let newPassword = self.textFieldNewPassword.text!
@ -114,7 +109,7 @@ extension ProfileChangePasswordViewController {
}else {
if !isValidLength() {
error = error + "\n Password should be greater than 8 character."
error = error + "\n Password should have at least 9 characters"
isValid = false
return (isValid, error)
}
@ -123,7 +118,7 @@ extension ProfileChangePasswordViewController {
if !validPassword {
isValid = false
error = error + "\n Password should contain at least 1 number, 1 letter and 1 special character"
error = error + "\n Password should contain at least one symbol, one capital letter and one number"
return (isValid, error)
}

4
GMERemittance/Profile/ProfileViewController.swift
View File

@ -17,7 +17,9 @@ class ProfileViewController: UIViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillDisappear(animated)
self.setupPicturedNavBar()
// self.setupPicturedNavBar()
self.setupNormalNavigation()
self.navigationItem.title = "Profile"
}
override func viewWillDisappear(_ animated: Bool) {

Write Preview
Loading…
Cancel
Save