new view share

Nextcloud.xcodeproj/project.pbxproj

@@ -421,6 +421,7 @@
 		F790110E21415BF600D7B136 /* NCViewerRichdocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F790110D21415BF600D7B136 /* NCViewerRichdocument.swift */; };
 		F79630EE215527D40015EEA5 /* NCViewerMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = F79630ED215527D40015EEA5 /* NCViewerMedia.swift */; };
 		F79728D422F96F2E003CACA7 /* NCShareLinkFolderMenuView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F79728D322F96F2D003CACA7 /* NCShareLinkFolderMenuView.xib */; };
+		F79728D622F9A0B1003CACA7 /* NCShareUserFolderMenuView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F79728D522F9A0B0003CACA7 /* NCShareUserFolderMenuView.xib */; };
 		F79918A221997FA300C2E308 /* UICKeyChainStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F79918A021997F9000C2E308 /* UICKeyChainStore.framework */; };
 		F79918A42199806500C2E308 /* UICKeyChainStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F79918A021997F9000C2E308 /* UICKeyChainStore.framework */; };
 		F79918A52199816500C2E308 /* UICKeyChainStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F79918A021997F9000C2E308 /* UICKeyChainStore.framework */; };
@@ -1206,6 +1207,7 @@
 		F7956FCB1B4886E60085DEA3 /* CCUploadFromOtherUpp.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CCUploadFromOtherUpp.storyboard; sourceTree = "<group>"; };
 		F79630ED215527D40015EEA5 /* NCViewerMedia.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCViewerMedia.swift; sourceTree = "<group>"; };
 		F79728D322F96F2D003CACA7 /* NCShareLinkFolderMenuView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareLinkFolderMenuView.xib; sourceTree = "<group>"; };
+		F79728D522F9A0B0003CACA7 /* NCShareUserFolderMenuView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareUserFolderMenuView.xib; sourceTree = "<group>"; };
 		F79918A021997F9000C2E308 /* UICKeyChainStore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UICKeyChainStore.framework; path = Carthage/Build/iOS/UICKeyChainStore.framework; sourceTree = "<group>"; };
 		F79918A72199840500C2E308 /* Sheeeeeeeeet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sheeeeeeeeet.framework; path = Carthage/Build/iOS/Sheeeeeeeeet.framework; sourceTree = "<group>"; };
 		F79A65C22191D90F00FF6DCC /* NCSelect.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCSelect.storyboard; sourceTree = "<group>"; };
@@ -1780,6 +1782,7 @@
 				F7DFAA8922E22EF100FC4527 /* NCShareLinkMenuView.xib */,
 				F79728D322F96F2D003CACA7 /* NCShareLinkFolderMenuView.xib */,
 				F769453D22E9E97D000A798A /* NCShareUserMenuView.xib */,
+				F79728D522F9A0B0003CACA7 /* NCShareUserFolderMenuView.xib */,
 				F774264822EB4D0000B23912 /* NCShareUserDropDownCell.xib */,
 				F769453F22E9F077000A798A /* NCSharePaging.swift */,
 				F7E4D9C322ED929B003675FD /* NCShareComments.swift */,
@@ -3364,6 +3367,7 @@
 				F7B2DEF11F976859007CF4D2 /* english.txt in Resources */,
 				F7F54D051E5B14C800E19C62 /* VideoOverlay@3x.png in Resources */,
 				F7F54D011E5B14C700E19C62 /* UIBarButtonItemGrid@2x.png in Resources */,
+				F79728D622F9A0B1003CACA7 /* NCShareUserFolderMenuView.xib in Resources */,
 				F7DFAA8A22E22EF100FC4527 /* NCShareLinkMenuView.xib in Resources */,
 				F7C9555321F0C4CA0024296E /* NCActivity.storyboard in Resources */,
 				F7F54CE71E5B14C700E19C62 /* ImageError@3x.png in Resources */,

iOSClient/Share/NCShareCommon.swift

@@ -121,6 +121,7 @@ class NCShareCommon: NSObject {
         } else {
             shareLinkMenuView.height = 440
         }
+        
         shareLinkMenuView.metadata = metadata
         shareLinkMenuView.viewWindow = viewWindow
         shareLinkMenuView.reloadData(idRemoteShared: tableShare?.idRemoteShared ?? 0)
@@ -136,17 +137,32 @@ class NCShareCommon: NSObject {
     
     func openViewMenuUser(view: UIView, tableShare: tableShare?, metadata: tableMetadata) -> (shareUserMenuView: NCShareUserMenuView, viewWindow: UIView) {
         
+        var shareUserMenuView: NCShareUserMenuView
+        
         let globalPoint = view.superview?.convert(view.frame.origin, to: nil)
         
         let window = UIApplication.shared.keyWindow!
         let viewWindow = UIView(frame: window.bounds)
         window.addSubview(viewWindow)
         
-        let shareUserMenuView = Bundle.main.loadNibNamed("NCShareUserMenuView", owner: self, options: nil)?.first as! NCShareUserMenuView
+        if metadata.directory {
+            shareUserMenuView = Bundle.main.loadNibNamed("NCShareUserFolderMenuView", owner: self, options: nil)?.first as! NCShareUserMenuView
+        } else {
+            shareUserMenuView = Bundle.main.loadNibNamed("NCShareUserMenuView", owner: self, options: nil)?.first as! NCShareUserMenuView
+        }
+        
+        shareUserMenuView.width = 250
+        if metadata.directory {
+            shareUserMenuView.height = 540
+        } else {
+            shareUserMenuView.height = 260
+        }
+        
         shareUserMenuView.metadata = metadata
         shareUserMenuView.viewWindow = viewWindow
         shareUserMenuView.reloadData(idRemoteShared: tableShare?.idRemoteShared ?? 0)
-        let shareUserMenuViewX = view.bounds.width/2 - shareUserMenuView.frame.width/2 + globalPoint!.x
+        
+        let shareUserMenuViewX = view.bounds.width/2 - shareUserMenuView.width/2 + globalPoint!.x
         let shareUserMenuViewY = globalPoint!.y + 100
         
         shareUserMenuView.frame = CGRect(x: shareUserMenuViewX, y: shareUserMenuViewY, width: shareUserMenuView.width, height: shareUserMenuView.height)

iOSClient/Share/NCShareUserMenuView.swift

@@ -28,6 +28,15 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
     @IBOutlet weak var switchCanReshare: UISwitch!
     @IBOutlet weak var labelCanReshare: UILabel!
     
+    @IBOutlet weak var switchCanCreate: UISwitch!
+    @IBOutlet weak var labelCanCreate: UILabel!
+    
+    @IBOutlet weak var switchCanChange: UISwitch!
+    @IBOutlet weak var labelCanChange: UILabel!
+    
+    @IBOutlet weak var switchCanDelete: UISwitch!
+    @IBOutlet weak var labelCanDelete: UILabel!
+    
     @IBOutlet weak var switchSetExpirationDate: UISwitch!
     @IBOutlet weak var labelSetExpirationDate: UILabel!
     @IBOutlet weak var fieldSetExpirationDate: UITextField!
@@ -42,19 +51,17 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
     
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
-    public let width: CGFloat = 250
-    public let height: CGFloat = 260
+    var width: CGFloat = 0
+    var height: CGFloat = 0
+    
     private var tableShare: tableShare?
-    public var metadata: tableMetadata?
+    var metadata: tableMetadata?
     
-    public var viewWindow: UIView?
-    public var viewWindowCalendar: UIView?
+    var viewWindow: UIView?
+    var viewWindowCalendar: UIView?
     
     override func awakeFromNib() {
         
-        self.frame.size.width = width
-        self.frame.size.height = height
-        
         layer.borderColor = UIColor.lightGray.cgColor
         layer.borderWidth = 0.5
         layer.cornerRadius = 5
@@ -64,6 +71,12 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         
         switchCanReshare.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
         switchCanReshare.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanCreate?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
+        switchCanCreate?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanChange?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
+        switchCanChange?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanDelete?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
+        switchCanDelete?.onTintColor = NCBrandColor.sharedInstance.brand
         switchSetExpirationDate.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
         switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brand
         
@@ -143,6 +156,15 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         networking.updateShare(idRemoteShared: tableShare.idRemoteShared, password: nil, permission: permission, note: nil, expirationTime: nil, hideDownload: tableShare.hideDownload)
     }
     
+    @IBAction func switchCanCreate(sender: UISwitch) {
+    }
+    
+    @IBAction func switchCanChange(sender: UISwitch) {
+    }
+    
+    @IBAction func switchCanDelete(sender: UISwitch) {
+    }
+    
     // Set expiration date
     @IBAction func switchSetExpirationDate(sender: UISwitch) {