Merge pull request #167 from colcalex/develop

Login Button fixes
code4romania · Nov 20, 2019 · d21522c · d21522c
2 parents fddb056 + 9382979
commit d21522c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/MonitorizareVot/Base.lproj/Localizable.strings b/MonitorizareVot/Base.lproj/Localizable.strings
@@ -1,5 +1,6 @@
 //  Created by Code4Romania
 
+"Button_Login" = "Login";
 "Button_Continue" = "Continue";
 "Button_ChangeDepartemnt" = "Change";
 "Button_Urban" = "Urban";

diff --git a/MonitorizareVot/Login/LoginViewController.swift b/MonitorizareVot/Login/LoginViewController.swift
@@ -79,6 +79,7 @@ class LoginViewController: MVViewController {
 
     fileprivate func updateLoginButtonState() {
         loginButton.isEnabled = model.isReady
+        loginButton.setTitle(model.buttonTitle, for: .normal)
     }
 
     fileprivate func updateInterface() {

diff --git a/MonitorizareVot/Login/LoginViewController.xib b/MonitorizareVot/Login/LoginViewController.xib
@@ -140,6 +140,10 @@
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JtC-yb-2FH">
                                             <rect key="frame" x="0.0" y="167" width="350" height="52"/>
                                             <subviews>
+                                                <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="K5b-wi-jhG">
+                                                    <rect key="frame" x="165" y="20" width="20" height="20"/>
+                                                    <color key="color" red="0.94509803920000002" green="0.58823529409999997" blue="0.23137254900000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                </activityIndicatorView>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QbI-GJ-iXY" customClass="ActionButton" customModule="MonitorizareVot" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="8" width="350" height="44"/>
                                                     <constraints>
@@ -150,10 +154,6 @@
                                                         <action selector="handleLoginButtonTap:" destination="-1" eventType="touchUpInside" id="urU-Us-quk"/>
                                                     </connections>
                                                 </button>
-                                                <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="K5b-wi-jhG">
-                                                    <rect key="frame" x="165" y="20" width="20" height="20"/>
-                                                    <color key="color" red="0.94509803920000002" green="0.58823529409999997" blue="0.23137254900000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                </activityIndicatorView>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>

diff --git a/MonitorizareVot/Login/LoginViewModel.swift b/MonitorizareVot/Login/LoginViewModel.swift
@@ -34,12 +34,17 @@ class LoginViewModel: NSObject {
         guard let phoneNumber = phoneNumber,
             let code = code,
             phoneNumber.count > 5,
-            code.count > 3 else {
+            code.count > 3,
+            !isLoading else {
             return false
         }
         return true
     }
 
+    var buttonTitle: String {
+        isLoading ? "" : "Button_Login".localized
+    }
+
     override init() {
         super.init()
         #if DEBUG

diff --git a/MonitorizareVot/ro.lproj/Localizable.strings b/MonitorizareVot/ro.lproj/Localizable.strings
@@ -1,5 +1,6 @@
 //  Created by Code4Romania
 
+"Button_Login" = "Login";
 "Button_Continue" = "Continuă";
 "Button_ChangeDepartemnt" = "Schimbă";
 "Button_Urban" = "Urban";