Browse Source

Merge branch 'new-home' of https://bitbucket.org/Swift_Pankaj/gme-ios into new-home

pull/1/head
gme_2 6 years ago
parent
commit
999e1f66e4
  1. 2
      GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist
  2. BIN
      GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate
  3. 14
      GMERemittance/Module/Login/User Interface/View/Login.storyboard
  4. 72
      GMERemittance/Module/Login/User Interface/View/LoginViewController.swift
  5. 94
      Pods/Pods.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist

2
GMERemittance.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist

@ -7,7 +7,7 @@
<key>GMERemittance.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>33</integer>
</dict>
</dict>
</dict>

BIN
GMERemittance.xcworkspace/xcuserdata/shishir.xcuserdatad/UserInterfaceState.xcuserstate

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

@ -1,5 +1,5 @@
<?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" useSafeAreas="YES" colorMatched="YES" initialViewController="ezR-vY-eSd">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ezR-vY-eSd">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@ -101,7 +101,7 @@
<textInputTraits key="textInputTraits" autocorrectionType="no"/>
</textField>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="W4D-Nm-wm2" firstAttribute="top" secondItem="tpm-9M-7fS" secondAttribute="top" constant="7" id="3Mm-jZ-J2N"/>
<constraint firstAttribute="trailing" secondItem="VQh-fp-vLH" secondAttribute="trailing" id="DPg-43-FF7"/>
@ -134,7 +134,7 @@
<textInputTraits key="textInputTraits" secureTextEntry="YES"/>
</textField>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="O4n-cb-5n6" firstAttribute="leading" secondItem="R26-UF-dDJ" secondAttribute="leading" id="GYD-yw-dW4"/>
<constraint firstItem="QK2-zk-MJD" firstAttribute="leading" secondItem="R26-UF-dDJ" secondAttribute="leading" id="RZ1-6L-4bw"/>
@ -279,7 +279,15 @@
</view>
<navigationItem key="navigationItem" id="J8O-o1-aen"/>
<connections>
<outlet property="backgroundTextfieldsView" destination="kcx-QD-njR" id="TE5-4n-XMY"/>
<outlet property="forgotPasswordView" destination="T4Z-0g-COi" id="Y6x-bL-34m"/>
<outlet property="headerTitle" destination="dYY-qS-wfk" id="WkD-vI-fRr"/>
<outlet property="loginButton" destination="5Un-Jj-Afo" id="Mkf-hN-nhv"/>
<outlet property="logoImageView" destination="Nln-OL-oSs" id="pux-Q4-R75"/>
<outlet property="passwordBackgroundView" destination="R26-UF-dDJ" id="dx5-Av-U0f"/>
<outlet property="passwordTextField" destination="QK2-zk-MJD" id="T4q-gs-lt0"/>
<outlet property="subtitle" destination="KXD-E1-iQq" id="ZFR-T0-5Nx"/>
<outlet property="userIdBackgroundView" destination="tpm-9M-7fS" id="NMU-tb-11I"/>
<outlet property="userNameTextField" destination="VQh-fp-vLH" id="3eA-oq-xs5"/>
</connections>
</viewController>

72
GMERemittance/Module/Login/User Interface/View/LoginViewController.swift

@ -15,8 +15,19 @@ class LoginViewController: UIViewController {
@IBOutlet weak var userNameTextField: UITextField!
@IBOutlet weak var passwordTextField: UITextField!
// MARK: Properties
// views
@IBOutlet weak var backgroundTextfieldsView: UIView!
@IBOutlet weak var userIdBackgroundView: UIView!
@IBOutlet weak var passwordBackgroundView: UIView!
@IBOutlet weak var headerTitle: UILabel!
@IBOutlet weak var subtitle: UILabel!
@IBOutlet weak var forgotPasswordView: UIView!
@IBOutlet weak var logoImageView: UIImageView!
@IBOutlet weak var loginButton: UIButton!
// MARK: Properties
var presenter: LoginModuleInterface?
@ -51,6 +62,65 @@ class LoginViewController: UIViewController {
private func setup() {
// all setup should be done here
setupNavBar()
setupInitialPositionsOfviews()
animateViews()
}
private func setupInitialPositionsOfviews() {
self.userIdBackgroundView.center.x -= self.view.bounds.width
self.passwordBackgroundView.center.x -= self.view.bounds.width
self.loginButton.transform = CGAffineTransform.init(scaleX: 0, y: 1)
self.headerTitle.alpha = 0
self.headerTitle.center.y -= 200
self.subtitle.alpha = 0
self.forgotPasswordView.alpha = 0
self.logoImageView.center.y += (self.logoImageView.bounds.height + 20)
self.loginButton.setTitle("", for: UIControlState.normal)
}
private func animateViews() {
// user id
UIView.animate(withDuration: 0.5, animations: {
self.userIdBackgroundView.center.x += self.view.bounds.width
})
// password
UIView.animate(withDuration: 0.5, delay: 0.3, options: [], animations: {
self.passwordBackgroundView.center.x += self.view.bounds.width
}, completion: nil)
// login button
UIView.animate(withDuration: 0.5, delay: 0.4, options: [], animations: {
self.loginButton.transform = CGAffineTransform.identity
}, completion: { (_) in
self.loginButton.setTitle("Login", for: UIControlState.normal)
})
// subtitle
UIView.animate(withDuration: 0.5, delay: 0.7, options: [], animations: {
self.subtitle.alpha = 1
}, completion: nil)
// forgot password
UIView.animate(withDuration: 0.5, delay: 0.9, options: [], animations: {
self.forgotPasswordView.alpha = 1
})
// header title
// logoimageview
UIView.animate(withDuration: 0.7, delay: 0, options: [], animations: {
// todo
self.headerTitle.alpha = 1
self.headerTitle.center.y += 200
self.logoImageView.center.y -= (self.logoImageView.bounds.height + 20)
}, completion: nil)
}
private func setupNavBar() {

94
Pods/Pods.xcodeproj/xcuserdata/shishir.xcuserdatad/xcschemes/xcschememanagement.plist

@ -9,100 +9,135 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>AlamofireNetworkActivityLogger.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>BRYXBanner.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>3</integer>
</dict>
<key>Bolts.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>1</integer>
</dict>
<key>FBSDKCoreKit.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>6</integer>
</dict>
<key>FBSDKShareKit.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
<integer>7</integer>
</dict>
<key>FLAnimatedImage.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
<integer>11</integer>
</dict>
<key>FacebookCore.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
<integer>4</integer>
</dict>
<key>FacebookShare.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
<integer>5</integer>
</dict>
<key>FirebaseAuth.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
<integer>8</integer>
</dict>
<key>FirebaseCore.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
<integer>9</integer>
</dict>
<key>FirebaseMessaging.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
<integer>10</integer>
</dict>
<key>GTMSessionFetcher.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
<integer>13</integer>
</dict>
<key>GoogleToolboxForMac.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
<integer>12</integer>
</dict>
<key>Hex.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>14</integer>
</dict>
<key>MBProgressHUD.xcscheme</key>
<key>IQKeyboardManagerSwift.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>ObjectMapper.xcscheme</key>
<key>LGSideMenuController.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>MBProgressHUD.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>ObjectMapper.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>PMAlertController-PMAlertController.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>PMAlertController.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>Pods-GMERemittance.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>22</integer>
</dict>
<key>Pods-GMERemittanceTests.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
<integer>23</integer>
</dict>
<key>Pods-GMERemittanceUITests.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
<integer>24</integer>
</dict>
<key>Protobuf.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
<integer>25</integer>
</dict>
<key>RAMAnimatedTabBarController.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>26</integer>
</dict>
<key>RSKImageCropper.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>27</integer>
</dict>
<key>ReadMoreTextView.xcscheme</key>
<dict>
@ -112,17 +147,32 @@
<key>SDWebImage.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
<integer>28</integer>
</dict>
<key>SwiftyJSON.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>23</integer>
<integer>29</integer>
</dict>
<key>XLPagerTabStrip-XLPagerTabStrip.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>32</integer>
</dict>
<key>XLPagerTabStrip.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>31</integer>
</dict>
<key>nanopb.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
<integer>18</integer>
</dict>
<key>thenPromise.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>30</integer>
</dict>
</dict>
</dict>

Loading…
Cancel
Save