home/libr-ios
2
0
Fork 0
mirror of https://github.com/wahyd4/libr-ios.git synced 2026-08-09 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity

修改登录注册页面

Browse Source
This commit is contained in:
ylzheng
2015-10-27 23:52:17 +08:00
parent 1ce7879f74
commit faa008bd32
5 changed files with 131 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Podfile
+1
View File
@@ -11,6 +11,7 @@ target 'librx' do
pod 'Appirater'
pod 'SDWebImage', '~>3.7'
pod 'WeiboSDK', :git => 'https://github.com/sinaweibosdk/weibo_ios_sdk.git', :tag => '3.1.3'
pod 'SwiftColors'
# pod 'WebViewJavascriptBridge', '~> 4.0.1'
# pod 'Toast', '~> 2.4’
end
Podfile.lock
+3
View File
@@ -9,6 +9,7 @@ PODS:
- SDWebImage/Core (= 3.7.3)
- SDWebImage/Core (3.7.3)
- Spring (1.0.3)
- SwiftColors (0.3.1)
- SwiftyJSON (2.3.1)
- WeiboSDK (3.1.3)
@@ -19,6 +20,7 @@ DEPENDENCIES:
- RESideMenu (~> 4.0.7)
- SDWebImage (~> 3.7)
- Spring (from `https://github.com/MengTo/Spring.git`, branch `swift2`)
- SwiftColors
- SwiftyJSON (~> 2.3.1)
- WeiboSDK (from `https://github.com/sinaweibosdk/weibo_ios_sdk.git`, tag `3.1.3`)
@@ -46,6 +48,7 @@ SPEC CHECKSUMS:
RESideMenu: f24c508404b49c667344c54aba7e590883533958
SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
Spring: 3f02b5dc3308572ef177b3cad0fa7bbc4b0706f7
SwiftColors: 61efe0bf991cfed446684e03d1e9f635f1f11a84
SwiftyJSON: 592b53bee5ef3dd9b3bebc6b9cb7ee35426ae8c3
WeiboSDK: 5f2a707c4569a64f4641f4171acd712016f24342
librx/Base.lproj/Main.storyboard
+98 -48
View File
@@ -1109,7 +1109,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="密码" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cpu-Tk-fUU">
<rect key="frame" x="173" y="338" width="255" height="30"/>
<rect key="frame" x="173" y="318" width="255" height="30"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="255" id="e8y-Dj-khI"/>
@@ -1118,24 +1118,29 @@
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HB2-uZ-jZA">
<rect key="frame" x="173" y="376" width="255" height="32"/>
<rect key="frame" x="173" y="356" width="255" height="32"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="255" id="HX0-AF-ANq"/>
<constraint firstAttribute="width" constant="255" id="Vp7-LO-FuI"/>
<constraint firstAttribute="height" constant="32" id="rId-j3-5o2"/>
</constraints>
<fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="14"/>
<state key="normal" title="登录">
<color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</state>
<variation key="default">
<mask key="constraints">
<exclude reference="Vp7-LO-FuI"/>
</mask>
</variation>
<connections>
<action selector="signupButtonPressed:" destination="rEs-RQ-eVA" eventType="touchDown" id="LU7-xd-HFh"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sWV-hY-NHv">
<rect key="frame" x="173" y="416" width="255" height="32"/>
<rect key="frame" x="173" y="396" width="255" height="32"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="255" id="OUc-61-eJ9"/>
@@ -1151,14 +1156,16 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo_Max" translatesAutoresizingMaskIntoConstraints="NO" id="MSA-uv-1uF">
<rect key="frame" x="225" y="100" width="150" height="150"/>
<rect key="frame" x="240" y="100" width="120" height="120"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="BHT-kj-yqP"/>
<constraint firstAttribute="height" constant="150" id="pyz-wd-ECJ"/>
<constraint firstAttribute="width" constant="120" id="BHT-kj-yqP"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="120" id="DaO-Ke-Si9"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="120" id="Ino-tS-lPM"/>
<constraint firstAttribute="height" constant="120" id="pyz-wd-ECJ"/>
</constraints>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="邮箱地址" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LuJ-4O-IoB">
<rect key="frame" x="173" y="300" width="255" height="30"/>
<rect key="frame" x="173" y="280" width="255" height="30"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="255" id="1NX-lg-Z3z"/>
<constraint firstAttribute="width" constant="225" id="51z-35-rw6"/>
@@ -1175,28 +1182,33 @@
</mask>
</variation>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6ZB-oh-mVA">
<rect key="frame" x="349" y="453" width="79" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="10"/>
<state key="normal" title="返回"/>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6ZB-oh-mVA">
<rect key="frame" x="285" y="497" width="30" height="30"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="30" id="Hko-0C-dcJ"/>
<constraint firstAttribute="height" constant="30" id="QK6-YY-tW4"/>
<constraint firstAttribute="width" constant="30" id="h4y-Pu-QLr"/>
<constraint firstAttribute="height" constant="30" id="nAV-hH-0fq"/>
</constraints>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<state key="normal" image="Back2"/>
<variation key="default">
<mask key="constraints">
<exclude reference="QK6-YY-tW4"/>
</mask>
</variation>
<connections>
<segue destination="GHF-5j-X2W" kind="unwind" unwindAction="unwindToHome:" id="UlG-oi-4Lp"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Back" translatesAutoresizingMaskIntoConstraints="NO" id="HzD-5p-fyJ">
<rect key="frame" x="280" y="500" width="40" height="40"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Xa-9Y-Cal">
<rect key="frame" x="216" y="453" width="113" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="113" id="24a-Cq-J0H"/>
<constraint firstAttribute="width" constant="255" id="jS6-Dx-aTs"/>
<constraint firstAttribute="height" constant="24" id="xRY-eM-1Um"/>
</constraints>
<rect key="frame" x="250.5" y="537" width="100" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="10"/>
<state key="normal" title="还没有账号？注册一个"/>
<variation key="default">
<mask key="constraints">
<exclude reference="jS6-Dx-aTs"/>
</mask>
</variation>
<connections>
<segue destination="j4i-y0-BY9" kind="show" id="6Bx-a2-yQY"/>
</connections>
@@ -1207,28 +1219,55 @@
<constraints>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="4TE-KT-zPR"/>
<constraint firstItem="MSA-uv-1uF" firstAttribute="top" secondItem="NKw-zF-9q3" secondAttribute="bottom" constant="80" id="7pC-g9-YZB"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="0Xa-9Y-Cal" secondAttribute="bottom" constant="140" id="809-Xh-x1c"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="0Xa-9Y-Cal" secondAttribute="bottom" constant="20" id="ADb-MK-Wgw"/>
<constraint firstItem="cpu-Tk-fUU" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="D7h-3U-SKu"/>
<constraint firstItem="MSA-uv-1uF" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="Jff-z1-yey"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="0Xa-9Y-Cal" secondAttribute="bottom" constant="20" id="MAx-vZ-wjW"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="6ZB-oh-mVA" secondAttribute="bottom" constant="73" id="Mla-re-Wt1"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="top" secondItem="6ZB-oh-mVA" secondAttribute="bottom" constant="10" id="P5W-CY-Jl5"/>
<constraint firstItem="6ZB-oh-mVA" firstAttribute="trailing" secondItem="HB2-uZ-jZA" secondAttribute="trailing" id="Utj-X3-cBO"/>
<constraint firstItem="MSA-uv-1uF" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="XyQ-X5-Tfg"/>
<constraint firstItem="sWV-hY-NHv" firstAttribute="top" secondItem="HB2-uZ-jZA" secondAttribute="bottom" constant="8" id="YiN-uy-TxC"/>
<constraint firstItem="HB2-uZ-jZA" firstAttribute="top" secondItem="cpu-Tk-fUU" secondAttribute="bottom" constant="8" id="atU-2A-wcc"/>
<constraint firstItem="6ZB-oh-mVA" firstAttribute="top" secondItem="sWV-hY-NHv" secondAttribute="bottom" constant="5" id="bh9-F7-jXr"/>
<constraint firstItem="LuJ-4O-IoB" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="clt-s8-bdV"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="top" secondItem="sWV-hY-NHv" secondAttribute="bottom" constant="5" id="gG2-bE-plR"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" constant="-27.5" id="hPv-7A-vyN"/>
<constraint firstItem="sWV-hY-NHv" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="cqG-CW-el4"/>
<constraint firstItem="6ZB-oh-mVA" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="cxh-wo-icD"/>
<constraint firstItem="HB2-uZ-jZA" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="fTN-le-X4J"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="top" secondItem="sWV-hY-NHv" secondAttribute="bottom" constant="128" id="gG2-bE-plR"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" constant="0.5" id="hPv-7A-vyN"/>
<constraint firstItem="sWV-hY-NHv" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="kiF-07-yYa"/>
<constraint firstItem="0Xa-9Y-Cal" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="lJe-8h-QD7"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="6ZB-oh-mVA" secondAttribute="bottom" constant="73" id="lNZ-aW-YmE"/>
<constraint firstItem="HB2-uZ-jZA" firstAttribute="centerX" secondItem="HLZ-lg-Qw6" secondAttribute="centerX" id="prt-NB-EOe"/>
<constraint firstItem="cpu-Tk-fUU" firstAttribute="top" secondItem="LuJ-4O-IoB" secondAttribute="bottom" constant="8" symbolic="YES" id="swz-Ro-Jec"/>
<constraint firstItem="HB2-uZ-jZA" firstAttribute="top" secondItem="cpu-Tk-fUU" secondAttribute="bottom" constant="8" id="tOF-bv-WXo"/>
<constraint firstItem="6ZB-oh-mVA" firstAttribute="leading" secondItem="0Xa-9Y-Cal" secondAttribute="trailing" constant="20" id="vc3-Jj-aMB"/>
<constraint firstItem="LuJ-4O-IoB" firstAttribute="top" secondItem="MSA-uv-1uF" secondAttribute="bottom" constant="50" id="wEt-Jr-ClQ"/>
<constraint firstItem="LuJ-4O-IoB" firstAttribute="top" secondItem="MSA-uv-1uF" secondAttribute="bottom" constant="60" id="wEt-Jr-ClQ"/>
<constraint firstItem="F6i-0U-9Hk" firstAttribute="top" secondItem="0Xa-9Y-Cal" secondAttribute="bottom" constant="20" id="zQr-XX-A88"/>
</constraints>
<variation key="default">
<mask key="subviews">
<exclude reference="HzD-5p-fyJ"/>
</mask>
<mask key="constraints">
<exclude reference="prt-NB-EOe"/>
<exclude reference="Utj-X3-cBO"/>
<exclude reference="bh9-F7-jXr"/>
<exclude reference="vc3-Jj-aMB"/>
<exclude reference="809-Xh-x1c"/>
<exclude reference="ADb-MK-Wgw"/>
<exclude reference="MAx-vZ-wjW"/>
<exclude reference="Mla-re-Wt1"/>
<exclude reference="zQr-XX-A88"/>
<exclude reference="4TE-KT-zPR"/>
<exclude reference="gG2-bE-plR"/>
</mask>
</variation>
</view>
<connections>
<outlet property="backupButton" destination="6ZB-oh-mVA" id="5sG-QJ-OZb"/>
<outlet property="emailTextField" destination="LuJ-4O-IoB" id="9Vh-0m-eVR"/>
<outlet property="loginButton" destination="HB2-uZ-jZA" id="2Ol-rR-iDj"/>
<outlet property="passwordTextField" destination="cpu-Tk-fUU" id="vLI-ZW-Vs9"/>
@@ -1252,7 +1291,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="邮箱地址" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iIB-9r-imp">
<rect key="frame" x="173" y="300" width="255" height="30"/>
<rect key="frame" x="173" y="280" width="255" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="255" id="eGm-o4-qD5"/>
</constraints>
@@ -1260,7 +1299,7 @@
<textInputTraits key="textInputTraits"/>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="密码" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N24-6p-UIN">
<rect key="frame" x="173" y="338" width="255" height="30"/>
<rect key="frame" x="173" y="318" width="255" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="255" id="LaL-Xd-xh9"/>
</constraints>
@@ -1268,7 +1307,7 @@
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jg8-5r-KsY">
<rect key="frame" x="173" y="376" width="255" height="32"/>
<rect key="frame" x="173" y="356" width="255" height="32"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="255" id="ogc-7k-siZ"/>
@@ -1283,50 +1322,60 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Logo_Max" translatesAutoresizingMaskIntoConstraints="NO" id="w6U-wb-Wim">
<rect key="frame" x="225" y="100" width="150" height="150"/>
<rect key="frame" x="240" y="100" width="120" height="120"/>
<constraints>
<constraint firstAttribute="height" constant="150" id="fzJ-D9-kXt"/>
<constraint firstAttribute="width" constant="150" id="u2y-Wk-bsY"/>
<constraint firstAttribute="height" constant="120" id="fzJ-D9-kXt"/>
<constraint firstAttribute="width" constant="120" id="u2y-Wk-bsY"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Qs-7r-0jb">
<rect key="frame" x="173" y="416" width="255" height="26"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rhX-YU-lEH">
<rect key="frame" x="285" y="508" width="30" height="30"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="255" id="gm0-7S-nuO"/>
<constraint firstAttribute="width" constant="30" id="3N7-Rg-qDb"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="LvI-Pc-5b1"/>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="30" id="SWO-Y2-9cI"/>
<constraint firstAttribute="height" constant="30" id="euF-aU-d8J"/>
<constraint firstAttribute="height" constant="30" id="mbf-cS-mtt"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="30" id="o1r-5V-bYl"/>
</constraints>
<fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="10"/>
<state key="normal" title="返回">
<color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</state>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<state key="normal" image="Back2"/>
<variation key="default">
<mask key="constraints">
<exclude reference="mbf-cS-mtt"/>
</mask>
</variation>
<connections>
<action selector="signupButtonPressed:" destination="rEs-RQ-eVA" eventType="touchDown" id="yIA-rh-KZT"/>
<segue destination="f8E-VA-Fy3" kind="unwind" unwindAction="unwindToViewController:" id="uLs-bK-eRt"/>
<segue destination="f8E-VA-Fy3" kind="unwind" unwindAction="unwindToViewController:" id="E9g-sz-L8n"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="N24-6p-UIN" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="4Vf-TU-WXS"/>
<constraint firstItem="w6U-wb-Wim" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="6nh-6c-6fe"/>
<constraint firstItem="Jg8-5r-KsY" firstAttribute="top" secondItem="N24-6p-UIN" secondAttribute="bottom" constant="8" id="7j2-XY-C3p"/>
<constraint firstItem="iIB-9r-imp" firstAttribute="top" secondItem="w6U-wb-Wim" secondAttribute="bottom" constant="50" id="Nmq-j2-9Ec"/>
<constraint firstItem="rhX-YU-lEH" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="9Xi-Jl-AZ0"/>
<constraint firstItem="iIB-9r-imp" firstAttribute="top" secondItem="w6U-wb-Wim" secondAttribute="bottom" constant="60" id="Nmq-j2-9Ec"/>
<constraint firstItem="iIB-9r-imp" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="RWa-X8-c11"/>
<constraint firstItem="DqC-vn-Xo0" firstAttribute="top" secondItem="rhX-YU-lEH" secondAttribute="bottom" constant="62" id="RxO-bm-zna"/>
<constraint firstItem="w6U-wb-Wim" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" constant="-25" id="SlQ-b3-1hg"/>
<constraint firstItem="5Qs-7r-0jb" firstAttribute="top" secondItem="Jg8-5r-KsY" secondAttribute="bottom" constant="8" id="cbT-gl-Hh4"/>
<constraint firstItem="w6U-wb-Wim" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="fJa-cC-lXo"/>
<constraint firstItem="w6U-wb-Wim" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" constant="-15" id="fJa-cC-lXo"/>
<constraint firstItem="Jg8-5r-KsY" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="kx7-fo-fvL"/>
<constraint firstItem="N24-6p-UIN" firstAttribute="top" secondItem="iIB-9r-imp" secondAttribute="bottom" constant="8" id="pkY-Fm-WN0"/>
<constraint firstItem="5Qs-7r-0jb" firstAttribute="centerX" secondItem="G5V-Dp-TVN" secondAttribute="centerX" id="uJN-SD-ph5"/>
<constraint firstItem="w6U-wb-Wim" firstAttribute="top" secondItem="lOO-na-YYo" secondAttribute="bottom" constant="80" id="w8g-Y4-fxP"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="SlQ-b3-1hg"/>
<exclude reference="fJa-cC-lXo"/>
</mask>
</variation>
</view>
<connections>
<outlet property="backButton" destination="5Qs-7r-0jb" id="Xty-kZ-VKL"/>
<outlet property="backButton" destination="rhX-YU-lEH" id="7wK-3c-DKY"/>
<outlet property="emailTextField" destination="iIB-9r-imp" id="Y6E-tu-8WM"/>
<outlet property="passwordTextField" destination="N24-6p-UIN" id="pnS-MJ-Jrm"/>
<outlet property="signupButton" destination="Jg8-5r-KsY" id="NUu-RG-vRe"/>
<outlet property="usernameTextField" destination="iIB-9r-imp" id="2pL-13-9cP"/>
@@ -1717,6 +1766,7 @@
<resources>
<image name="Android" width="32" height="32"/>
<image name="Back" width="30" height="30"/>
<image name="Back2" width="25" height="25"/>
<image name="Bookmark" width="32" height="32"/>
<image name="Home" width="32" height="32"/>
<image name="Lightning" width="32" height="32"/>
@@ -1734,7 +1784,7 @@
<image name="default" width="62" height="62"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="cuN-Eg-MZE"/>
<segue reference="dIc-VY-jD3"/>
<segue reference="bKV-Tl-jmb"/>
</inferredMetricsTieBreakers>
</document>
librx/LoginViewController.swift
+14 -1
View File
@@ -17,6 +17,8 @@ class LoginViewController: UIViewController {
@IBOutlet weak var emailTextField: UITextField!
@IBOutlet weak var passwordTextField: UITextField!
@IBOutlet weak var loginButton: UIButton!
@IBOutlet weak var backupButton: UIButton!
weak var delegate: LoginViewControllerDelegate?
@@ -25,7 +27,18 @@ class LoginViewController: UIViewController {
super.viewDidLoad()
passwordTextField.secureTextEntry = true
self.loginButton.layer.borderWidth = 1
self.loginButton.layer.borderColor = UIColor.lightGrayColor().CGColor
self.loginButton.layer.borderColor = UIColor(hexString: "#3FB5A3")?.CGColor
self.loginButton.tintColor = UIColor(hexString: "#3FB5A3")
self.loginButton.layer.cornerRadius = 5
self.loginButton.clipsToBounds = true
self.backupButton.layer.cornerRadius = self.backupButton.frame.width / 2
self.backupButton.clipsToBounds = true
self.backupButton.layer.borderWidth = 1
self.backupButton.layer.borderColor=UIColor(hexString: "#3FB5A3")?.CGColor
self.backupButton.tintColor = UIColor(hexString: "#3FB5A3")
self.backupButton.backgroundColor = UIColor(hexString: "#3FB5A3")
}
librx/LogupViewController.swift
+15 -2
View File
@@ -7,6 +7,7 @@
//
import UIKit
import SwiftColors
class LogupViewController: UIViewController {
@@ -14,6 +15,8 @@ class LogupViewController: UIViewController {
@IBOutlet weak var passwordTextField: UITextField!
@IBOutlet weak var signupButton: UIButton!
@IBOutlet weak var backButton: UIButton!
@IBOutlet weak var emailTextField: UITextField!
func alert(message: String) {
let alc = UIAlertController(title: message, message: nil, preferredStyle: UIAlertControllerStyle.Alert)
@@ -25,11 +28,21 @@ class LogupViewController: UIViewController {
super.viewDidLoad()
self.passwordTextField.secureTextEntry = true
self.signupButton.layer.borderWidth = 1
self.signupButton.layer.borderColor = UIColor.lightGrayColor().CGColor
self.signupButton.layer.borderColor = UIColor(hexString: "#3FB5A3")?.CGColor
self.signupButton.tintColor = UIColor(hexString: "#3FB5A3")
self.signupButton.layer.cornerRadius = 5
self.signupButton.clipsToBounds = true
self.backButton.layer.cornerRadius = self.backButton.frame.width / 2
self.backButton.clipsToBounds = true
self.backButton.layer.borderWidth = 1
self.backButton.layer.borderColor=UIColor(hexString: "#3FB5A3")?.CGColor
self.backButton.tintColor = UIColor(hexString: "#3FB5A3")
self.backButton.backgroundColor = UIColor(hexString: "#3FB5A3")
}
@IBAction func sigupBtnPressed(sender: AnyObject) {
let username: String = usernameTextField.text!