#1037

Nextcloud.xcodeproj/project.pbxproj

@@ -394,6 +394,7 @@
 		F781996B22636BFA00EBDF6A /* HCFeatures.m in Sources */ = {isa = PBXBuildFile; fileRef = F781996822636BFA00EBDF6A /* HCFeatures.m */; };
 		F78295311F962EFA00A572F5 /* NCEndToEndEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CAE391F8CF31A008125FD /* NCEndToEndEncryption.m */; };
 		F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F787704E22E7019900F287A9 /* NCShareLinkCell.xib */; };
+		F78A18B623CDD07D00F681F3 /* NCViewerRichWorkspace.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78A18B523CDD07D00F681F3 /* NCViewerRichWorkspace.swift */; };
 		F78AA20621F783E900D0F205 /* SwiftRichString.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F78AA20521F783E900D0F205 /* SwiftRichString.framework */; };
 		F78ACD4021903CC20088454D /* NCGridCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD3F21903CC20088454D /* NCGridCell.swift */; };
 		F78ACD4221903CE00088454D /* NCListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F78ACD4121903CE00088454D /* NCListCell.swift */; };
@@ -1108,6 +1109,7 @@
 		F781996722636BFA00EBDF6A /* HCFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCFeatures.h; sourceTree = "<group>"; };
 		F781996822636BFA00EBDF6A /* HCFeatures.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCFeatures.m; sourceTree = "<group>"; };
 		F787704E22E7019900F287A9 /* NCShareLinkCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareLinkCell.xib; sourceTree = "<group>"; };
+		F78A18B523CDD07D00F681F3 /* NCViewerRichWorkspace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerRichWorkspace.swift; sourceTree = "<group>"; };
 		F78AA20521F783E900D0F205 /* SwiftRichString.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftRichString.framework; path = Carthage/Build/iOS/SwiftRichString.framework; sourceTree = "<group>"; };
 		F78ACD3F21903CC20088454D /* NCGridCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCGridCell.swift; sourceTree = "<group>"; };
 		F78ACD4121903CE00088454D /* NCListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCListCell.swift; sourceTree = "<group>"; };
@@ -2229,6 +2231,7 @@
 			isa = PBXGroup;
 			children = (
 				F790110D21415BF600D7B136 /* NCViewerRichdocument.swift */,
+				F78A18B523CDD07D00F681F3 /* NCViewerRichWorkspace.swift */,
 				F7FB1D3D215E191D00D669EA /* NCViewerDocumentWeb.swift */,
 				F7233CED23A24F990011D898 /* NCViewerNextcloudText.swift */,
 				F79630ED215527D40015EEA5 /* NCViewerMedia.swift */,
@@ -3516,6 +3519,7 @@
 				F73B4F111F470D9100BBEE4B /* nsSBCSGroupProber.cpp in Sources */,
 				F7B6ACD622FC2BD4008AB646 /* NCXMLCommentsParser.m in Sources */,
 				F738E8421F90FFD100F95C8E /* NCManageEndToEndEncryption.m in Sources */,
+				F78A18B623CDD07D00F681F3 /* NCViewerRichWorkspace.swift in Sources */,
 				F75A9EE623796C6F0044CFCE /* NCNetworking.swift in Sources */,
 				F760F79D21F21F61006B1A73 /* CropRectView.swift in Sources */,
 				F73B4F091F470D9100BBEE4B /* nsEUCKRProber.cpp in Sources */,

iOSClient/RichWorkspace/NCRichWorkspace.swift

@@ -50,25 +50,3 @@ import Foundation
         webView.isUserInteractionEnabled = false
     }
 }
-
-@objc class NCViewerRichWorkspace: NSObject {
-
-    let appDelegate = UIApplication.shared.delegate as! AppDelegate
-    var safeAreaBottom: Int = 0
-    var mimeType: String?
-    
-    @objc static let shared: NCViewerRichWorkspace = {
-        let instance = NCViewerRichWorkspace()
-        return instance
-    }()
-    
-    @objc func viewerRichWorkspaceAt(_ metadata: tableMetadata, detail: CCDetail) {
-        
-        let viewRichWorkspace = Bundle.main.loadNibNamed("NCRichWorkspace", owner: self, options: nil)?.first as! UIView
-        
-        
-       
-        
-        detail.view.addSubview(viewRichWorkspace)
-    }
-}

iOSClient/Viewer/NCViewerRichWorkspace.swift

@@ -0,0 +1,40 @@
+//
+//  NCViewerRichWorkspace.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 14/01/2020.
+//  Copyright © 2020 TWS. All rights reserved.
+//
+
+import Foundation
+
+@objc class NCViewerRichWorkspace: NSObject {
+
+    let appDelegate = UIApplication.shared.delegate as! AppDelegate
+    var safeAreaBottom: CGFloat = 0
+    
+    @objc static let shared: NCViewerRichWorkspace = {
+        let instance = NCViewerRichWorkspace()
+        return instance
+    }()
+    
+    @objc func viewerRichWorkspaceAt(_ metadata: tableMetadata, detail: CCDetail) {
+        
+        if #available(iOS 11.0, *) {
+            safeAreaBottom = (UIApplication.shared.keyWindow?.safeAreaInsets.bottom)!
+        }
+        
+        let width: CGFloat = detail.view.frame.size.width
+        let height: CGFloat = detail.view.frame.size.height - safeAreaBottom - CGFloat(k_detail_Toolbar_Height)
+        
+        let viewRichWorkspace = Bundle.main.loadNibNamed("NCRichWorkspace", owner: self, options: nil)?.first as! NCViewRichWorkspace
+        viewRichWorkspace.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        viewRichWorkspace.frame = CGRect(x: CGFloat(0), y: CGFloat(0), width: width, height: height)
+        
+        if let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
+            viewRichWorkspace.setRichWorkspaceText(directory.richWorkspace)
+        }
+        
+        detail.view.addSubview(viewRichWorkspace)
+    }
+}