marinofaggiana 5 år sedan
förälder
incheckning
b87374ee7b
2 ändrade filer med 23 tillägg och 21 borttagningar
  1. 6 1
      iOSClient/BrowserWeb/NCBrowserWeb.swift
  2. 17 20
      iOSClient/Main/CCMore.swift

+ 6 - 1
iOSClient/BrowserWeb/NCBrowserWeb.swift

@@ -18,6 +18,7 @@ class NCBrowserWeb: UIViewController {
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
     @objc var urlBase = ""
+    @objc var isHiddenButtonExit = false
     @objc weak var delegate: NCBrowserWebDelegate?
     
     @IBOutlet weak var buttonExit: UIButton!
@@ -35,7 +36,11 @@ class NCBrowserWeb: UIViewController {
         webView!.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
         
         // button exit
-        self.view.bringSubviewToFront(buttonExit)
+        if isHiddenButtonExit {
+            buttonExit.isHidden = true
+        } else {
+            self.view.bringSubviewToFront(buttonExit)
+        }
         
         loadWebPage(webView: webView!, url: URL(string: urlBase)!)
     }

+ 17 - 20
iOSClient/Main/CCMore.swift

@@ -410,20 +410,19 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             
             if (self.splitViewController?.isCollapsed)! {
                 
-                /*
-                let webVC = SwiftWebVC(urlString: item.url, hideToolbar: false)
-                webVC.delegate = self
-                self.navigationController?.pushViewController(webVC, animated: true)
+                let browserWebVC = UIStoryboard(name: "NCBrowserWeb", bundle: nil).instantiateInitialViewController() as! NCBrowserWeb
+                browserWebVC.urlBase = item.url
+                browserWebVC.isHiddenButtonExit = true
+                
+                self.navigationController?.pushViewController(browserWebVC, animated: true)
                 self.navigationController?.navigationBar.isHidden = false
-                */
                 
             } else {
                 
-                /*
-                let webVC = SwiftModalWebVC(urlString: item.url, colorText: UIColor.white, colorDoneButton: UIColor.black, doneButtonVisible: true)
-                webVC.delegateWeb = self
-                self.present(webVC, animated: true, completion: nil)
-                */
+                let browserWebVC = UIStoryboard(name: "NCBrowserWeb", bundle: nil).instantiateInitialViewController() as! NCBrowserWeb
+                browserWebVC.urlBase = item.url
+
+                self.present(browserWebVC, animated: true, completion: nil)
             }
             
         } else if item.url == "logout" {
@@ -456,21 +455,19 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
             
             if (self.splitViewController?.isCollapsed)! {
                 
-                /*
-                let webVC = SwiftWebVC(urlString: item.url, hideToolbar: true)
-                webVC.delegate = self
-                self.navigationController?.pushViewController(webVC, animated: true)
+                let browserWebVC = UIStoryboard(name: "NCBrowserWeb", bundle: nil).instantiateInitialViewController() as! NCBrowserWeb
+                browserWebVC.urlBase = item.url
+                browserWebVC.isHiddenButtonExit = true
+                
+                self.navigationController?.pushViewController(browserWebVC, animated: true)
                 self.navigationController?.navigationBar.isHidden = false
-                */
                 
             } else {
                 
-                /*
-                let webVC = SwiftModalWebVC(urlString: item.url, colorText: UIColor.white, colorDoneButton: UIColor.black, doneButtonVisible: true, hideToolbar: false)
-                webVC.delegateWeb = self
-                self.present(webVC, animated: true, completion: nil)
-                */
+                let browserWebVC = UIStoryboard(name: "NCBrowserWeb", bundle: nil).instantiateInitialViewController() as! NCBrowserWeb
+                browserWebVC.urlBase = item.url
                 
+                self.present(browserWebVC, animated: true, completion: nil)
             }
         }
     }