new NCLogin

Nextcloud.xcodeproj/project.pbxproj

@@ -814,6 +814,7 @@
 		F70211F31BAC56E9003FC03E /* Main */ = {
 			isa = PBXGroup;
 			children = (
+				F7E0E1DA22327885006B0911 /* AudioRecorder */,
 				F710D1FA24057E5E00A6033D /* ActionSheetHeaderView */,
 				371B5A2F23D0B04B00FAFAE9 /* Menu */,
 				F7DFB7E9219C5A0500680748 /* Create cloud */,
@@ -1427,7 +1428,6 @@
 				F7C1CDD91E6DFC6F005D92BE /* Brand */,
 				F70211F31BAC56E9003FC03E /* Main */,
 				F7A321621E9E37960069AD1B /* Activity */,
-				F7E0E1DA22327885006B0911 /* AudioRecorder */,
 				F7AE00F6230E8191007ACF8A /* BrowserWeb */,
 				F7BAAD951ED5A63D00B7EAD4 /* Data */,
 				F73FAEE224D2CA830090692E /* Diagnostics */,

iOSClient/Login/NCLogin.storyboard

@@ -166,11 +166,11 @@
                         <outlet property="imageBrand" destination="BpI-xK-1SU" id="0tB-69-RNs"/>
                         <outlet property="imagePassword" destination="7q8-rl-x2M" id="Cr5-Te-Rkq"/>
                         <outlet property="imageUser" destination="4OF-5u-Hd1" id="MJa-4H-w7m"/>
-                        <outlet property="login" destination="HQd-pF-3cE" id="dpI-ns-Ivh"/>
-                        <outlet property="loginTypeView" destination="owR-PS-F32" id="Rdw-tW-R0G"/>
+                        <outlet property="loginButton" destination="HQd-pF-3cE" id="XOc-dS-QZ8"/>
+                        <outlet property="loginTypeViewButton" destination="owR-PS-F32" id="7dm-jk-nek"/>
                         <outlet property="password" destination="jU7-Iw-XfU" id="OWi-V0-Eij"/>
                         <outlet property="qrCode" destination="6tp-bh-Z9k" id="Tw3-op-BgR"/>
-                        <outlet property="toggleVisiblePassword" destination="fhk-o9-J0l" id="aco-hl-Ban"/>
+                        <outlet property="toggleVisiblePasswordButton" destination="fhk-o9-J0l" id="e0X-WA-5cz"/>
                         <outlet property="user" destination="1Gf-Bw-Nim" id="BUW-sz-I3f"/>
                     </connections>
                 </viewController>

iOSClient/Login/NCLogin.swift

@@ -38,17 +38,16 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
 
     @IBOutlet weak var activity: UIActivityIndicatorView!
 
-    @IBOutlet weak var login: UIButton!
-    @IBOutlet weak var toggleVisiblePassword: UIButton!
-    @IBOutlet weak var loginTypeView: UIButton!
+    @IBOutlet weak var loginButton: UIButton!
+    @IBOutlet weak var toggleVisiblePasswordButton: UIButton!
+    @IBOutlet weak var loginTypeViewButton: UIButton!
     
     @IBOutlet weak var qrCode: UIButton!
 
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     var textColor: UIColor = .white
     var textColorOpponent: UIColor = .black
-    var cancelButton: UIBarButtonItem?
-
+    
 
     // MARK: - Life Cycle
 
@@ -72,10 +71,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         // Image Brand
         imageBrand.image = UIImage(named: "logo")
         
-        // Cancel Button
-        cancelButton = UIBarButtonItem.init(barButtonSystemItem: .stop, target: self, action: #selector(self.actionCancel))
-        cancelButton?.tintColor = textColor
-        
         // Url
         imageBaseUrl.image = UIImage(named: "loginURL")?.image(color: textColor, size: 50)
         baseUrl.textColor = textColor
@@ -98,18 +93,18 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         password.delegate = self
         
         // toggle visible password
-        toggleVisiblePassword.setImage(UIImage(named: "visiblePassword")?.image(color: textColor, size: 50), for: .normal)
+        toggleVisiblePasswordButton.setImage(UIImage(named: "visiblePassword")?.image(color: textColor, size: 50), for: .normal)
         
         // login
-        login.setTitle(NSLocalizedString("_login_", comment: ""), for: .normal)
-        login.backgroundColor = textColor
-        login.tintColor = textColor
-        login.layer.cornerRadius = 20
-        login.clipsToBounds = true
+        loginButton.setTitle(NSLocalizedString("_login_", comment: ""), for: .normal)
+        loginButton.backgroundColor = textColor
+        loginButton.tintColor = textColorOpponent
+        loginButton.layer.cornerRadius = 20
+        loginButton.clipsToBounds = true
         
         // type of login
-        loginTypeView.setTitle(NSLocalizedString("_traditional_login_", comment: ""), for: .normal)
-        loginTypeView.setTitleColor(textColor.withAlphaComponent(0.5), for: .normal)
+        loginTypeViewButton.setTitle(NSLocalizedString("_traditional_login_", comment: ""), for: .normal)
+        loginTypeViewButton.setTitleColor(textColor.withAlphaComponent(0.5), for: .normal)
      
         // brand
         if NCBrandOptions.shared.disable_request_login_url {
@@ -131,9 +126,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             user.isHidden = true
             imagePassword.isHidden = true
             password.isHidden = true
-            navigationItem.leftBarButtonItem = cancelButton
+            
+            // Cancel Button
+            let navigationItemCancel = UIBarButtonItem.init(barButtonSystemItem: .stop, target: self, action: #selector(self.actionCancel))
+            navigationItemCancel.tintColor = textColor
+            navigationItem.leftBarButtonItem = navigationItemCancel
         }
-
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -157,13 +155,13 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
     
     func textFieldDidBeginEditing(_ textField: UITextField) {
         if textField == password {
-            toggleVisiblePassword.isHidden = false
+            toggleVisiblePasswordButton.isHidden = false
         }
     }
     
     func textFieldDidEndEditing(_ textField: UITextField) {
         if textField == password {
-            toggleVisiblePassword.isHidden = true
+            toggleVisiblePasswordButton.isHidden = true
         }
     }
     
@@ -193,12 +191,12 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 url = String(url.dropLast())
             }
             
-            login.isEnabled = false
+            loginButton.isEnabled = false
             activity.startAnimating()
             
             NCCommunication.shared.getAppPassword(serverUrl: url, username: user.text!, password: password.text!) { (token, errorCode, errorDescription) in
                 
-                self.login.isEnabled = true
+                self.loginButton.isEnabled = true
                 self.activity.stopAnimating()
                 
                 self.standardLogin(urlBase: url, user: self.user.text ?? "", token: token ?? "", errorCode: errorCode, errorDescription: errorDescription)
@@ -223,7 +221,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             imagePassword.isHidden = false
             password.isHidden = false
             
-            loginTypeView.setTitle(NSLocalizedString("_web_login_", comment: ""), for: .normal)
+            loginTypeViewButton.setTitle(NSLocalizedString("_web_login_", comment: ""), for: .normal)
             
         } else {
             
@@ -232,7 +230,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
             imagePassword.isHidden = true
             password.isHidden = true
             
-            loginTypeView.setTitle(NSLocalizedString("_traditional_login_", comment: ""), for: .normal)
+            loginTypeViewButton.setTitle(NSLocalizedString("_traditional_login_", comment: ""), for: .normal)
         }
     }
     
@@ -253,7 +251,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         
         guard var url = baseUrl.text else { return }
         
-        login.isEnabled = false
+        loginButton.isEnabled = false
         activity.startAnimating()
         
         if url.hasSuffix("/") {
@@ -266,7 +264,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 
                 NCCommunication.shared.getLoginFlowV2(serverUrl: url) { (token, endpoint, login, errorCode, errorDescription) in
                     
-                    self.login.isEnabled = true
+                    self.loginButton.isEnabled = true
                     self.activity.stopAnimating()
                     
                     if errorCode == 0 && NCBrandOptions.shared.use_loginflowv2 && token != nil && endpoint != nil && login != nil {
@@ -291,7 +289,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                         
                     } else if versionMajor < NCGlobal.shared.nextcloudVersion12 {
                         
-                        self.loginTypeView.isHidden = true
+                        self.loginTypeViewButton.isHidden = true
                         
                         self.imageUser.isHidden = false
                         self.user.isHidden = false
@@ -303,7 +301,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 
             } else {
                
-                self.login.isEnabled = true
+                self.loginButton.isEnabled = true
                 self.activity.stopAnimating()
                 
                 if errorCode == NSURLErrorServerCertificateUntrusted {
@@ -411,7 +409,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                     self.baseUrl.text = "https://" + (self.baseUrl.text ?? "")
                 }
                 
-                login.isEnabled = false
+                loginButton.isEnabled = false
                 activity.startAnimating()
                 
                 let webDAV = NCUtilityFileSystem.shared.getWebDAV(account: appDelegate.account)
@@ -420,7 +418,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                 NCCommunication.shared.checkServer(serverUrl: serverUrl) { (errorCode, errorDescription) in
                     
                     self.activity.stopAnimating()
-                    self.login.isEnabled = true
+                    self.loginButton.isEnabled = true
                     
                     self.standardLogin(urlBase: self.baseUrl.text!, user: self.user.text!, token: self.password.text!, errorCode: errorCode, errorDescription: errorDescription)
                 }