marinofaggiana 3 年之前
父節點
當前提交
d8af3c4439
共有 2 個文件被更改,包括 14 次插入1 次删除
  1. 13 1
      iOSClient/AppDelegate.swift
  2. 1 0
      iOSClient/Login/NCLogin.swift

+ 13 - 1
iOSClient/AppDelegate.swift

@@ -480,7 +480,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
         
         // Nextcloud standard login
-        if NCBrandOptions.shared.disable_intro && NCBrandOptions.shared.disable_request_login_url {
+        if selector == NCGlobal.shared.introSignup {
+            
+            if activeLoginWeb?.view.window == nil {
+                activeLoginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb
+                if selector == NCGlobal.shared.introSignup {
+                    activeLoginWeb?.urlBase = NCBrandOptions.shared.linkloginPreferredProviders
+                } else {
+                    activeLoginWeb?.urlBase = self.urlBase
+                }
+                showLoginViewController(activeLoginWeb, contextViewController: viewController)
+            }
+            
+        } else if NCBrandOptions.shared.disable_intro && NCBrandOptions.shared.disable_request_login_url {
             
             if activeLoginWeb?.view.window == nil {
                 activeLoginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb

+ 1 - 0
iOSClient/Login/NCLogin.swift

@@ -61,6 +61,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         
         // Url
         baseUrl.textColor = textColor
+        baseUrl.tintColor = textColor
         baseUrl.layer.cornerRadius = 10
         baseUrl.layer.borderWidth = 1
         baseUrl.layer.borderColor = textColor.cgColor