소스 검색

Parameter Color on LoginWeb

Marino Faggiana 8 년 전
부모
커밋
4fcff70036
2개의 변경된 파일9개의 추가작업 그리고 5개의 파일을 삭제
  1. 7 3
      iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift
  2. 2 2
      iOSClient/Login/CCLoginWeb.swift

+ 7 - 3
iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

@@ -32,15 +32,19 @@ public class SwiftModalWebVC: UINavigationController {
         self.init(pageURL: URL(string: urlString)!, theme: theme)
     }
     
+    public convenience init(urlString: String, theme: SwiftModalWebVCTheme, color: UIColor, colorText: UIColor) {
+        self.init(pageURL: URL(string: urlString)!, theme: theme, color: color, colorText: colorText)
+    }
+    
     public convenience init(pageURL: URL) {
         self.init(request: URLRequest(url: pageURL))
     }
     
-    public convenience init(pageURL: URL, theme: SwiftModalWebVCTheme) {
-        self.init(request: URLRequest(url: pageURL), theme: theme)
+    public convenience init(pageURL: URL, theme: SwiftModalWebVCTheme, color : UIColor = UIColor.clear, colorText: UIColor = UIColor.black) {
+        self.init(request: URLRequest(url: pageURL), theme: theme, color: color, colorText: colorText)
     }
    
-    public init(request: URLRequest, theme: SwiftModalWebVCTheme = .dark, color : UIColor = UIColor.clear) {
+    public init(request: URLRequest, theme: SwiftModalWebVCTheme = .dark, color: UIColor = UIColor.clear, colorText: UIColor = UIColor.black) {
         
         let webViewController = SwiftWebVC(aRequest: request)
         webViewController.storedStatusColor = UINavigationBar.appearance().barStyle

+ 2 - 2
iOSClient/Login/CCLoginWeb.swift

@@ -24,9 +24,9 @@ public class CCLoginWeb: UIViewController {
         
         self.viewController = vc
         
-        let webVC = SwiftModalWebVC(urlString: k_loginBaseUrl, theme: .loginWeb)
+        let webVC = SwiftModalWebVC(urlString: k_loginBaseUrl, theme: .loginWeb, color: Constant.GlobalConstants.k_Color_NavigationBar, colorText: Constant.GlobalConstants.k_Color_NavigationBar_Text)
         webVC.delegateWeb = self
-        vc.present(webVC, animated: true, completion: nil)
+        vc.present(webVC, animated: false, completion: nil)
     }
 }