Add share permission add note view

Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>

Nextcloud.xcodeproj/project.pbxproj

@@ -64,6 +64,8 @@
 		AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */; };
 		AF93471D27E2361E002537EE /* NCShareAdvancePermissionFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */; };
 		AF93474C27E34120002537EE /* NCUtility+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474B27E34120002537EE /* NCUtility+Image.swift */; };
+		AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */; };
+		AF93475027E46B2E002537EE /* XibView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474F27E46B2E002537EE /* XibView.swift */; };
 		AF935067276B84E700BD078F /* NCMenu+FloatingPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF935066276B84E700BD078F /* NCMenu+FloatingPanel.swift */; };
 		AFA2AC8527849604008E1EA7 /* NCActivityCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA2AC8427849604008E1EA7 /* NCActivityCommentView.swift */; };
 		AFD33240276A02C100F5AE02 /* UIApplication+Orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFD3323F276A02C000F5AE02 /* UIApplication+Orientation.swift */; };
@@ -518,6 +520,8 @@
 		AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareAdvancePermissionHeader.xib; sourceTree = "<group>"; };
 		AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermissionFooter.swift; sourceTree = "<group>"; };
 		AF93474B27E34120002537EE /* NCUtility+Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCUtility+Image.swift"; sourceTree = "<group>"; };
+		AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareNewUserAddComment.swift; sourceTree = "<group>"; };
+		AF93474F27E46B2E002537EE /* XibView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XibView.swift; sourceTree = "<group>"; };
 		AF935066276B84E700BD078F /* NCMenu+FloatingPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMenu+FloatingPanel.swift"; sourceTree = "<group>"; };
 		AFA2AC8427849604008E1EA7 /* NCActivityCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityCommentView.swift; sourceTree = "<group>"; };
 		AFD3323F276A02C000F5AE02 /* UIApplication+Orientation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+Orientation.swift"; sourceTree = "<group>"; };
@@ -1071,7 +1075,9 @@
 				AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
 				AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
 				AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
+				AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */,
 				AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */,
+				AF93474F27E46B2E002537EE /* XibView.swift */,
 				AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */,
 			);
 			path = Advanced;
@@ -2556,6 +2562,7 @@
 				F78A18B623CDD07D00F681F3 /* NCViewerRichWorkspaceWebView.swift in Sources */,
 				AFA2AC8527849604008E1EA7 /* NCActivityCommentView.swift in Sources */,
 				F716B75F26F09DF600D37EFC /* NCKTVHTTPCache.swift in Sources */,
+				AF93475027E46B2E002537EE /* XibView.swift in Sources */,
 				AF36077127BFA4E8001A243D /* ParallelWorker.swift in Sources */,
 				F75A9EE623796C6F0044CFCE /* NCNetworking.swift in Sources */,
 				F758B460212C56A400515F55 /* NCScan.swift in Sources */,
@@ -2623,6 +2630,7 @@
 				AF93474C27E34120002537EE /* NCUtility+Image.swift in Sources */,
 				F77EFC0C26D6751F00806ED6 /* NCShareQuickStatusMenu.swift in Sources */,
 				F702F30125EE5D2C008F8E80 /* NYMnemonic.m in Sources */,
+				AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */,
 				AF93471227E2341B002537EE /* NCShare+Menu.swift in Sources */,
 				F7EFA47825ADBA500083159A /* NCViewerProviderContextMenu.swift in Sources */,
 				F755BD9B20594AC7008C5FBB /* NCService.swift in Sources */,

iOSClient/Menu/NCShare+Menu.swift

@@ -10,9 +10,9 @@ import Foundation
 
 extension NCShare {
     func toggleShareMenu(for share: tableShare) {
-        
+
         var actions = [NCMenuAction]()
-        
+
 //        if !folder {
 //            actions.append(
 //                NCMenuAction(
@@ -24,23 +24,23 @@ extension NCShare {
 //                )
 //            )
 //        }
-        
+
         actions.append(
             NCMenuAction(
                 title: NSLocalizedString("_advance_permissions_", comment: ""),
                 icon: NCUtility.shared.loadImage(named: "rename").imageColor(NCBrandColor.shared.brandElement),
                 action: { _ in
-                    // TODO: Open Advanced permissions modal view
                     guard
                         let advancePermission = UIStoryboard(name: "NCShare", bundle: nil).instantiateViewController(withIdentifier: "NCShareAdvancePermission") as? NCShareAdvancePermission,
                         let navigationController = self.navigationController else { return }
+                    // FIXME: Fatal - Object has been deleted or invalidated
                     advancePermission.share = tableShare(value: share)
                     advancePermission.metadata = self.metadata
                     navigationController.pushViewController(advancePermission, animated: true)
                 }
             )
         )
-        
+
 //        if sendMail {
 //            actions.append(
 //                NCMenuAction(
@@ -52,7 +52,7 @@ extension NCShare {
 //                )
 //            )
 //        }
-        
+
         actions.append(
             NCMenuAction(
                 title: NSLocalizedString("_share_unshare_", comment: ""),

iOSClient/Share/Advanced/NCShareAdvancePermission.swift

@@ -11,7 +11,13 @@ import NCCommunication
 import SVGKit
 import CloudKit
 
-class NCShareAdvancePermission: UITableViewController {
+class NCShareAdvancePermission: UITableViewController, NCShareAdvanceFotterDelegate {
+    func dismissShareAdvanceView(shouldSave: Bool) {
+        defer { navigationController?.popViewController(animated: true) }
+        guard shouldSave else { return }
+        // TODO: Save / Create
+    }
+    
     var share: tableShare!
     var metadata: tableMetadata!
     var shareConfig: ShareConfig!
@@ -27,38 +33,14 @@ class NCShareAdvancePermission: UITableViewController {
         setupHeaderView()
         setupFooterView()
     }
-    @objc func cancelClicked() {
-        navigationController?.popViewController(animated: true)
-    }
-
-    @objc func nextClicked() {
-    }
 
     func setupFooterView() {
         guard let footerView = (Bundle.main.loadNibNamed("NCShareAdvancePermissionFooter", owner: self, options: nil)?.first as? NCShareAdvancePermissionFooter) else { return }
-        footerView.backgroundColor = .clear
-        footerView.addShadow(location: .top)
-
-        footerView.buttonCancel.addTarget(self, action: #selector(cancelClicked), for: .touchUpInside)
-        footerView.buttonCancel.setTitle(NSLocalizedString("_cancel_", comment: ""), for: .normal)
-        footerView.buttonCancel.layer.cornerRadius = 10
-        footerView.buttonCancel.layer.masksToBounds = true
-        footerView.buttonCancel.layer.borderWidth = 1
-
-        if NCManageDatabase.shared.getTableShare(account: share.account, idShare: share.idShare) == nil {
-            footerView.buttonNext.setTitle(NSLocalizedString("_next_", comment: ""), for: .normal)
-        } else {
-            footerView.buttonNext.setTitle(NSLocalizedString("_apply_changes_", comment: ""), for: .normal)
-        }
-        footerView.buttonNext.layer.cornerRadius = 10
-        footerView.buttonNext.layer.masksToBounds = true
-        footerView.buttonNext.backgroundColor = NCBrandColor.shared.brand
-        footerView.buttonNext.addTarget(self, action: #selector(nextClicked), for: .touchUpInside)
+        footerView.setupUI(with: share, delegate: self)
 
         footerView.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: 100)
         tableView.tableFooterView = footerView
         tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 100, right: 0)
-
         footerView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true
         footerView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor).isActive = true
         footerView.rightAnchor.constraint(equalTo: view.safeAreaLayoutGuide.rightAnchor).isActive = true
@@ -67,32 +49,8 @@ class NCShareAdvancePermission: UITableViewController {
 
     func setupHeaderView() {
         guard let headerView = (Bundle.main.loadNibNamed("NCShareAdvancePermissionHeader", owner: self, options: nil)?.first as? NCShareAdvancePermissionHeader) else { return }
-//        headerView.backgroundColor = NCBrandColor.shared.secondarySystemBackground
-        if FileManager.default.fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
-            headerView.fullWidthImageView.image = NCUtility.shared.getImageMetadata(metadata, for: headerView.frame.height)
-            headerView.fullWidthImageView.contentMode = .scaleAspectFill
-            headerView.imageView.isHidden = true
-        } else {
-            if metadata!.directory {
-                headerView.imageView.image = UIImage(named: "folder")
-            } else if !metadata.iconName.isEmpty {
-                headerView.imageView.image = UIImage(named: metadata.iconName)
-            } else {
-                headerView.imageView.image = UIImage(named: "file")
-            }
-        }
-        headerView.favorite.setNeedsUpdateConstraints()
-        headerView.favorite.layoutIfNeeded()
-        headerView.fileName.text = self.metadata?.fileNameView
-        headerView.fileName.textColor = NCBrandColor.shared.label
-//        headerView.favorite.addTarget(self, action: #selector(favoriteClicked), for: .touchUpInside)
-        if metadata.favorite {
-            headerView.favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: NCBrandColor.shared.yellowFavorite, size: 24), for: .normal)
-        } else {
-            headerView.favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: NCBrandColor.shared.systemGray, size: 24), for: .normal)
-        }
-        headerView.info.textColor = NCBrandColor.shared.secondaryLabel
-        headerView.info.text = CCUtility.transformedSize(metadata.size) + ", " + CCUtility.dateDiff(metadata.date as Date)
+        headerView.setupUI(with: metadata)
+
         headerView.frame = CGRect(x: 0, y: 0, width: self.view.frame.size.width, height: 200)
         tableView.tableHeaderView = headerView
         headerView.translatesAutoresizingMaskIntoConstraints = false
@@ -155,8 +113,13 @@ class NCShareAdvancePermission: UITableViewController {
                 alertController.addAction(okAction)
 
                 self.present(alertController, animated: true)
-            case .note: break
-                // TODO: Pushnote VC
+            case .note:
+                let storyboard = UIStoryboard(name: "NCShare", bundle: nil)
+                guard let viewNewUserComment = storyboard.instantiateViewController(withIdentifier: "NCShareNewUserAddComment") as? NCShareNewUserAddComment else { return }
+                viewNewUserComment.metadata = self.metadata
+                viewNewUserComment.share = self.share
+                viewNewUserComment.onDismiss = tableView.reloadData
+                self.navigationController?.pushViewController(viewNewUserComment, animated: true)
             }
         } else {
             cellConfig.didSelect(for: share)

iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift

@@ -8,7 +8,43 @@
 
 import UIKit
 
+protocol NCShareAdvanceFotterDelegate: AnyObject {
+    func dismissShareAdvanceView(shouldSave: Bool)
+}
+
 class NCShareAdvancePermissionFooter: UIView {
     @IBOutlet weak var buttonCancel: UIButton!
     @IBOutlet weak var buttonNext: UIButton!
+    weak var delegate: NCShareAdvanceFotterDelegate?
+    
+    func setupUI(with share: tableShare, delegate: NCShareAdvanceFotterDelegate?) {
+        self.delegate = delegate
+
+        backgroundColor = .clear
+        addShadow(location: .top)
+
+        buttonCancel.addTarget(self, action: #selector(cancelClicked), for: .touchUpInside)
+        buttonCancel.setTitle(NSLocalizedString("_cancel_", comment: ""), for: .normal)
+        buttonCancel.layer.cornerRadius = 10
+        buttonCancel.layer.masksToBounds = true
+        buttonCancel.layer.borderWidth = 1
+
+        if NCManageDatabase.shared.getTableShare(account: share.account, idShare: share.idShare) == nil {
+            buttonNext.setTitle(NSLocalizedString("_next_", comment: ""), for: .normal)
+        } else {
+            buttonNext.setTitle(NSLocalizedString("_apply_changes_", comment: ""), for: .normal)
+        }
+        buttonNext.layer.cornerRadius = 10
+        buttonNext.layer.masksToBounds = true
+        buttonNext.backgroundColor = NCBrandColor.shared.brand
+        buttonNext.addTarget(self, action: #selector(nextClicked), for: .touchUpInside)
+    }
+    
+    @objc func cancelClicked() {
+        delegate?.dismissShareAdvanceView(shouldSave: false)
+    }
+    
+    @objc func nextClicked() {
+        delegate?.dismissShareAdvanceView(shouldSave: true)
+    }
 }

iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift

@@ -14,4 +14,29 @@ class NCShareAdvancePermissionHeader: UIView {
     @IBOutlet weak var info: UILabel!
     @IBOutlet weak var favorite: UIButton!
     @IBOutlet weak var fullWidthImageView: UIImageView!
+
+    func setupUI(with metadata: tableMetadata) {
+        //        headerView.backgroundColor = NCBrandColor.shared.secondarySystemBackground
+        if FileManager.default.fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
+            fullWidthImageView.image = NCUtility.shared.getImageMetadata(metadata, for: frame.height)
+            fullWidthImageView.contentMode = .scaleAspectFill
+            imageView.isHidden = true
+        } else {
+            if metadata.directory {
+                imageView.image = UIImage(named: "folder")
+            } else if !metadata.iconName.isEmpty {
+                imageView.image = UIImage(named: metadata.iconName)
+            } else {
+                imageView.image = UIImage(named: "file")
+            }
+        }
+        favorite.setNeedsUpdateConstraints()
+        favorite.layoutIfNeeded()
+        fileName.text = metadata.fileNameView
+        fileName.textColor = NCBrandColor.shared.label
+        let starColor = metadata.favorite ? NCBrandColor.shared.yellowFavorite : NCBrandColor.shared.systemGray
+        favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: starColor, size: 24), for: .normal)
+        info.textColor = NCBrandColor.shared.secondaryLabel
+        info.text = CCUtility.transformedSize(metadata.size) + ", " + CCUtility.dateDiff(metadata.date as Date)
+    }
 }

iOSClient/Share/Advanced/NCShareNewUserAddComment.swift

@@ -0,0 +1,60 @@
+//
+//  NCShareNewUserAddComment.swift
+//  Nextcloud
+//
+//  Created by TSI-mc on 21/06/21.
+//  Copyright © 2021 Marino Faggiana. All rights reserved.
+//  Copyright © 2021 TSI-mc. All rights reserved.
+//
+
+import UIKit
+import NCCommunication
+import SVGKit
+
+class NCShareNewUserAddComment: UIViewController, UITextViewDelegate {
+    @IBOutlet weak var headerContainerView: UIView!
+    @IBOutlet weak var sharingLabel: UILabel!
+    @IBOutlet weak var sharingNote: UILabel!
+    @IBOutlet weak var noteTextField: UITextView!
+    
+    var onDismiss: (() -> Void)?
+
+    public var share: tableShare!
+    public var metadata: tableMetadata!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        guard let headerView = (Bundle.main.loadNibNamed("NCShareAdvancePermissionHeader", owner: self, options: nil)?.first as? NCShareAdvancePermissionHeader) else { return }
+        headerContainerView.addSubview(headerView)
+        headerView.frame = headerContainerView.frame
+        headerView.translatesAutoresizingMaskIntoConstraints = false
+        headerView.topAnchor.constraint(equalTo: headerContainerView.topAnchor).isActive = true
+        headerView.bottomAnchor.constraint(equalTo: headerContainerView.bottomAnchor).isActive = true
+        headerView.leftAnchor.constraint(equalTo: headerContainerView.leftAnchor).isActive = true
+        headerView.rightAnchor.constraint(equalTo: headerContainerView.rightAnchor).isActive = true
+
+        headerView.setupUI(with: metadata)
+
+        sharingLabel.text = NSLocalizedString("_sharing_", comment: "")
+        sharingNote.text = NSLocalizedString("_share_note_recipient_", comment: "")
+
+        noteTextField.text = share.note
+        noteTextField.delegate = self
+    }
+
+    func setTitle() {
+//        let defaultTitle = NSLocalizedString("_sharing_", comment: "")
+//        title = isUpdating ? (tableShare?.shareWith ?? defaultTitle) : (sharee?.shareWith ?? defaultTitle)
+    }
+
+    func textViewDidEndEditing(_ textView: UITextView) {
+        print(#function)
+//        share.note = noteTextField.text
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        share.note = noteTextField.text
+        onDismiss?()
+    }
+}

iOSClient/Share/NCShare.storyboard

@@ -165,197 +165,85 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YMG-hf-HEX">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="666"/>
+                                <rect key="frame" x="0.0" y="200" width="414" height="536"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sim-EE-o0o">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="666"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="_share_note_recipient_" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3yF-lL-GwU">
+                                        <rect key="frame" x="16" y="56.333333333333314" width="161.66666666666666" height="18"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hgf-O1-P97">
+                                        <rect key="frame" x="16" y="90.333333333333286" width="382" height="409.66666666666674"/>
                                         <subviews>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zDS-SG-Pn2">
-                                                <rect key="frame" x="0.0" y="0.0" width="414" height="150"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="150" id="HhK-zC-IyB"/>
-                                                </constraints>
-                                            </imageView>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="folder" translatesAutoresizingMaskIntoConstraints="NO" id="Ice-BM-rML">
-                                                <rect key="frame" x="10" y="20" width="120" height="120"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="120" id="3Fh-Ni-Dpc"/>
-                                                    <constraint firstAttribute="width" constant="120" id="xux-ld-eFZ"/>
-                                                </constraints>
-                                            </imageView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Message" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3yF-lL-GwU">
-                                                <rect key="frame" x="16" y="271" width="382" height="18"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hgf-O1-P97">
-                                                <rect key="frame" x="16" y="293" width="382" height="343"/>
-                                                <subviews>
-                                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="VT0-1l-5HI">
-                                                        <rect key="frame" x="16" y="16" width="350" height="311"/>
-                                                        <color key="textColor" systemColor="labelColor"/>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="boolean" keyPath="doneAccessory" value="YES"/>
-                                                        </userDefinedRuntimeAttributes>
-                                                        <connections>
-                                                            <outlet property="delegate" destination="VvU-6J-pzy" id="cAt-UZ-6KT"/>
-                                                        </connections>
-                                                    </textView>
-                                                </subviews>
-                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <constraints>
-                                                    <constraint firstItem="VT0-1l-5HI" firstAttribute="top" secondItem="hgf-O1-P97" secondAttribute="top" constant="16" id="cc9-jI-nSo"/>
-                                                    <constraint firstItem="VT0-1l-5HI" firstAttribute="centerX" secondItem="hgf-O1-P97" secondAttribute="centerX" id="cj9-1W-zVt"/>
-                                                    <constraint firstItem="VT0-1l-5HI" firstAttribute="leading" secondItem="hgf-O1-P97" secondAttribute="leading" constant="16" id="gE6-6y-BzR"/>
-                                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="90" id="oU3-bC-F89"/>
-                                                    <constraint firstItem="VT0-1l-5HI" firstAttribute="centerY" secondItem="hgf-O1-P97" secondAttribute="centerY" id="u80-BU-AcP"/>
-                                                </constraints>
-                                            </view>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QIt-ep-Hr1">
-                                                <rect key="frame" x="16" y="160" width="24" height="24"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="24" id="A84-zz-3Tn"/>
-                                                    <constraint firstAttribute="height" constant="24" id="wke-u6-2TQ"/>
-                                                </constraints>
-                                                <state key="normal" image="favorite"/>
+                                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" canCancelContentTouches="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="VT0-1l-5HI">
+                                                <rect key="frame" x="16" y="16" width="350" height="377.66666666666669"/>
+                                                <color key="textColor" systemColor="labelColor"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                                 <connections>
-                                                    <action selector="touchUpInsideFavorite:" destination="VvU-6J-pzy" eventType="touchUpInside" id="l0V-6d-c6e"/>
+                                                    <outlet property="delegate" destination="VvU-6J-pzy" id="cAt-UZ-6KT"/>
                                                 </connections>
-                                            </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zQp-lp-N4f">
-                                                <rect key="frame" x="48" y="187" width="350" height="15.666666666666657"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                <color key="textColor" red="0.76862745099999996" green="0.77647058820000003" blue="0.77647058820000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sharing" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vkm-Pe-6qd">
-                                                <rect key="frame" x="16" y="234.66666666666666" width="382" height="20.333333333333343"/>
-                                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKa-UI-MFJ">
-                                                <rect key="frame" x="48" y="165" width="350" height="18"/>
-                                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
+                                            </textView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstItem="hgf-O1-P97" firstAttribute="centerX" secondItem="Sim-EE-o0o" secondAttribute="centerX" id="2qn-4i-0mr"/>
-                                            <constraint firstItem="Ice-BM-rML" firstAttribute="top" secondItem="Sim-EE-o0o" secondAttribute="top" constant="20" symbolic="YES" id="39a-aZ-VaS"/>
-                                            <constraint firstItem="QIt-ep-Hr1" firstAttribute="centerY" secondItem="DKa-UI-MFJ" secondAttribute="centerY" constant="-2" id="3SD-Uf-acD"/>
-                                            <constraint firstItem="hgf-O1-P97" firstAttribute="centerX" secondItem="3yF-lL-GwU" secondAttribute="centerX" id="4kR-Zi-RSp"/>
-                                            <constraint firstItem="DKa-UI-MFJ" firstAttribute="top" secondItem="zDS-SG-Pn2" secondAttribute="bottom" constant="15" id="8y9-c1-hvP"/>
-                                            <constraint firstItem="vkm-Pe-6qd" firstAttribute="leading" secondItem="QIt-ep-Hr1" secondAttribute="leading" id="9VZ-sX-sG0"/>
-                                            <constraint firstItem="DKa-UI-MFJ" firstAttribute="leading" secondItem="QIt-ep-Hr1" secondAttribute="trailing" constant="8" id="AfZ-aM-u7H"/>
-                                            <constraint firstAttribute="bottom" secondItem="hgf-O1-P97" secondAttribute="bottom" constant="30" id="FLo-nJ-rMa"/>
-                                            <constraint firstItem="zQp-lp-N4f" firstAttribute="trailing" secondItem="DKa-UI-MFJ" secondAttribute="trailing" id="GZO-0a-jnE"/>
-                                            <constraint firstAttribute="trailing" secondItem="DKa-UI-MFJ" secondAttribute="trailing" constant="16" id="IXP-ON-tHe"/>
-                                            <constraint firstItem="zDS-SG-Pn2" firstAttribute="top" secondItem="Sim-EE-o0o" secondAttribute="top" id="PJt-oc-cBb"/>
-                                            <constraint firstItem="3yF-lL-GwU" firstAttribute="top" secondItem="vkm-Pe-6qd" secondAttribute="bottom" constant="16" id="Pv2-r8-csn"/>
-                                            <constraint firstItem="hgf-O1-P97" firstAttribute="leading" secondItem="vkm-Pe-6qd" secondAttribute="leading" id="Vmd-Fq-gmo"/>
-                                            <constraint firstItem="3yF-lL-GwU" firstAttribute="leading" secondItem="vkm-Pe-6qd" secondAttribute="leading" id="Xcb-zy-Cst"/>
-                                            <constraint firstItem="QIt-ep-Hr1" firstAttribute="leading" secondItem="Sim-EE-o0o" secondAttribute="leading" constant="16" id="agy-KC-GI0"/>
-                                            <constraint firstItem="Ice-BM-rML" firstAttribute="leading" secondItem="Sim-EE-o0o" secondAttribute="leading" constant="10" id="cIW-13-88i"/>
-                                            <constraint firstItem="vkm-Pe-6qd" firstAttribute="top" secondItem="zQp-lp-N4f" secondAttribute="bottom" constant="32" id="dDn-fb-wjL"/>
-                                            <constraint firstItem="zQp-lp-N4f" firstAttribute="top" secondItem="DKa-UI-MFJ" secondAttribute="bottom" constant="4" id="g6a-Mc-n7g"/>
-                                            <constraint firstItem="zDS-SG-Pn2" firstAttribute="leading" secondItem="Sim-EE-o0o" secondAttribute="leading" id="kaw-ay-diA"/>
-                                            <constraint firstItem="vkm-Pe-6qd" firstAttribute="centerX" secondItem="Sim-EE-o0o" secondAttribute="centerX" id="ljA-Uj-qZe"/>
-                                            <constraint firstItem="zQp-lp-N4f" firstAttribute="leading" secondItem="DKa-UI-MFJ" secondAttribute="leading" id="odn-aq-ZUU"/>
-                                            <constraint firstAttribute="trailing" secondItem="zDS-SG-Pn2" secondAttribute="trailing" id="wGW-eK-z82"/>
-                                            <constraint firstItem="hgf-O1-P97" firstAttribute="top" secondItem="3yF-lL-GwU" secondAttribute="bottom" constant="4" id="wue-1p-jtc"/>
+                                            <constraint firstItem="VT0-1l-5HI" firstAttribute="top" secondItem="hgf-O1-P97" secondAttribute="top" constant="16" id="cc9-jI-nSo"/>
+                                            <constraint firstItem="VT0-1l-5HI" firstAttribute="centerX" secondItem="hgf-O1-P97" secondAttribute="centerX" id="cj9-1W-zVt"/>
+                                            <constraint firstItem="VT0-1l-5HI" firstAttribute="leading" secondItem="hgf-O1-P97" secondAttribute="leading" constant="16" id="gE6-6y-BzR"/>
+                                            <constraint firstItem="VT0-1l-5HI" firstAttribute="centerY" secondItem="hgf-O1-P97" secondAttribute="centerY" id="u80-BU-AcP"/>
                                         </constraints>
                                     </view>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sharing" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vkm-Pe-6qd">
+                                        <rect key="frame" x="16.000000000000004" y="24" width="61.333333333333343" height="20.333333333333329"/>
+                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstItem="Sim-EE-o0o" firstAttribute="top" secondItem="YMG-hf-HEX" secondAttribute="top" id="AWv-WU-KAh"/>
-                                    <constraint firstAttribute="bottom" secondItem="Sim-EE-o0o" secondAttribute="bottom" id="hpz-dR-DMZ"/>
-                                    <constraint firstAttribute="trailing" secondItem="Sim-EE-o0o" secondAttribute="trailing" id="sOj-kO-pw4"/>
-                                    <constraint firstItem="Sim-EE-o0o" firstAttribute="leading" secondItem="YMG-hf-HEX" secondAttribute="leading" id="wYK-bi-7MR"/>
+                                    <constraint firstAttribute="trailing" secondItem="hgf-O1-P97" secondAttribute="trailing" constant="16" id="3wR-ue-mj3"/>
+                                    <constraint firstItem="3yF-lL-GwU" firstAttribute="leading" secondItem="YMG-hf-HEX" secondAttribute="leading" constant="16" id="3yQ-Gl-Co9"/>
+                                    <constraint firstItem="vkm-Pe-6qd" firstAttribute="leading" secondItem="YMG-hf-HEX" secondAttribute="leading" constant="16" id="Auk-mC-Mie"/>
+                                    <constraint firstItem="vkm-Pe-6qd" firstAttribute="top" secondItem="YMG-hf-HEX" secondAttribute="top" constant="24" id="L0w-Cz-uK2"/>
+                                    <constraint firstItem="hgf-O1-P97" firstAttribute="leading" secondItem="YMG-hf-HEX" secondAttribute="leading" constant="16" id="lWp-4v-Apf"/>
+                                    <constraint firstAttribute="bottom" secondItem="hgf-O1-P97" secondAttribute="bottom" constant="36" id="ozS-dU-DSE"/>
+                                    <constraint firstItem="3yF-lL-GwU" firstAttribute="top" secondItem="vkm-Pe-6qd" secondAttribute="bottom" constant="12" id="qtk-si-To3"/>
+                                    <constraint firstItem="hgf-O1-P97" firstAttribute="top" secondItem="3yF-lL-GwU" secondAttribute="bottom" constant="16" id="wXC-X4-cnJ"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Uf-aG-JJh">
-                                <rect key="frame" x="0.0" y="666" width="414" height="70"/>
-                                <subviews>
-                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="unm-n9-sCs">
-                                        <rect key="frame" x="16" y="15" width="382" height="40"/>
-                                        <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PXq-ga-Rsb">
-                                                <rect key="frame" x="0.0" y="0.0" width="183" height="40"/>
-                                                <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="40" id="iuh-tS-bO0"/>
-                                                </constraints>
-                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                <state key="normal" title="Cancel"/>
-                                                <connections>
-                                                    <action selector="cancelClicked:" destination="VvU-6J-pzy" eventType="touchUpInside" id="5cY-VF-9Ms"/>
-                                                </connections>
-                                            </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QBf-Zt-liI">
-                                                <rect key="frame" x="199" y="0.0" width="183" height="40"/>
-                                                <color key="backgroundColor" red="0.8862745098" green="0.0" blue="0.4549019608" alpha="1" colorSpace="calibratedRGB"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="40" id="kTz-NL-9BC"/>
-                                                </constraints>
-                                                <state key="normal" title="Send email"/>
-                                                <state key="highlighted">
-                                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                </state>
-                                                <connections>
-                                                    <action selector="sendShareClicked:" destination="VvU-6J-pzy" eventType="touchUpInside" id="Zcf-rt-feO"/>
-                                                </connections>
-                                            </button>
-                                        </subviews>
-                                    </stackView>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qVy-Qr-W7j">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="200"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstAttribute="centerY" secondItem="unm-n9-sCs" secondAttribute="centerY" id="CTN-XT-DKn"/>
-                                    <constraint firstAttribute="centerX" secondItem="unm-n9-sCs" secondAttribute="centerX" id="F3W-VE-Ith"/>
-                                    <constraint firstAttribute="height" constant="70" id="qwj-Ql-vHn"/>
-                                    <constraint firstItem="unm-n9-sCs" firstAttribute="leading" secondItem="6Uf-aG-JJh" secondAttribute="leading" constant="16" id="rJx-nj-7or"/>
+                                    <constraint firstAttribute="height" constant="200" id="GX8-Mb-uqf"/>
                                 </constraints>
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="8hH-o3-iQD"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="YMG-hf-HEX" firstAttribute="top" secondItem="8hH-o3-iQD" secondAttribute="top" id="30k-7u-X9U"/>
-                            <constraint firstItem="6Uf-aG-JJh" firstAttribute="trailing" secondItem="8hH-o3-iQD" secondAttribute="trailing" id="DuI-e6-F8D"/>
-                            <constraint firstItem="6Uf-aG-JJh" firstAttribute="top" secondItem="YMG-hf-HEX" secondAttribute="bottom" id="OD3-KQ-rDq"/>
-                            <constraint firstItem="6Uf-aG-JJh" firstAttribute="leading" secondItem="8hH-o3-iQD" secondAttribute="leading" id="SQ3-PT-s37"/>
-                            <constraint firstItem="YMG-hf-HEX" firstAttribute="leading" secondItem="8hH-o3-iQD" secondAttribute="leading" id="Xvq-Q6-fuk"/>
-                            <constraint firstItem="8hH-o3-iQD" firstAttribute="bottom" secondItem="6Uf-aG-JJh" secondAttribute="bottom" id="p2w-ht-7E0"/>
-                            <constraint firstItem="8hH-o3-iQD" firstAttribute="trailing" secondItem="YMG-hf-HEX" secondAttribute="trailing" id="rvY-v1-7Gj"/>
+                            <constraint firstItem="YMG-hf-HEX" firstAttribute="centerX" secondItem="8hH-o3-iQD" secondAttribute="centerX" id="AMx-HK-399"/>
+                            <constraint firstItem="qVy-Qr-W7j" firstAttribute="leading" secondItem="8hH-o3-iQD" secondAttribute="leading" id="GgF-9f-6cX"/>
+                            <constraint firstItem="YMG-hf-HEX" firstAttribute="leading" secondItem="qVy-Qr-W7j" secondAttribute="leading" id="I0h-H2-lCU"/>
+                            <constraint firstItem="8hH-o3-iQD" firstAttribute="trailing" secondItem="qVy-Qr-W7j" secondAttribute="trailing" id="d5Y-gH-Wzt"/>
+                            <constraint firstItem="8hH-o3-iQD" firstAttribute="bottom" secondItem="YMG-hf-HEX" secondAttribute="bottom" id="gCl-hx-9Wg"/>
+                            <constraint firstItem="YMG-hf-HEX" firstAttribute="top" secondItem="qVy-Qr-W7j" secondAttribute="bottom" id="jgh-Ux-svW"/>
+                            <constraint firstItem="qVy-Qr-W7j" firstAttribute="top" secondItem="8hH-o3-iQD" secondAttribute="top" id="o0L-sP-cbb"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="uC3-gg-Wos"/>
                     <connections>
-                        <outlet property="btnCancel" destination="PXq-ga-Rsb" id="AZ7-aY-ZF9"/>
-                        <outlet property="btnSendShare" destination="QBf-Zt-liI" id="6Wc-a2-0bl"/>
-                        <outlet property="buttonContainerView" destination="6Uf-aG-JJh" id="S6r-di-gKR"/>
-                        <outlet property="commentContainerView" destination="hgf-O1-P97" id="Gqp-JI-zxF"/>
-                        <outlet property="commentTextView" destination="VT0-1l-5HI" id="abA-51-Zgg"/>
-                        <outlet property="favorite" destination="QIt-ep-Hr1" id="feC-Os-QP9"/>
-                        <outlet property="folderImageView" destination="Ice-BM-rML" id="0ER-dy-s0s"/>
-                        <outlet property="imageView" destination="zDS-SG-Pn2" id="DyE-BG-z4e"/>
-                        <outlet property="labelDescription" destination="zQp-lp-N4f" id="uBe-g7-6aG"/>
-                        <outlet property="labelFileName" destination="DKa-UI-MFJ" id="k9b-uk-zfd"/>
-                        <outlet property="labelNote" destination="3yF-lL-GwU" id="uTU-0d-kfS"/>
-                        <outlet property="labelSharing" destination="vkm-Pe-6qd" id="hmo-0H-Tzb"/>
+                        <outlet property="headerContainerView" destination="qVy-Qr-W7j" id="LaE-WS-v1X"/>
+                        <outlet property="noteTextField" destination="VT0-1l-5HI" id="Ilz-T9-5BL"/>
+                        <outlet property="sharingLabel" destination="vkm-Pe-6qd" id="NVy-Ug-ipx"/>
+                        <outlet property="sharingNote" destination="3yF-lL-GwU" id="2Ur-N2-Jto"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="LJ3-hs-98b" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4262" y="-168"/>
+            <point key="canvasLocation" x="4260.8695652173919" y="-168.75"/>
         </scene>
         <!--Share Advance Permission-->
         <scene sceneID="59b-BB-FLA">
@@ -392,8 +280,6 @@
         </designable>
     </designables>
     <resources>
-        <image name="favorite" width="315" height="315"/>
-        <image name="folder" width="300" height="300"/>
         <image name="note.text" width="24" height="24"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

iOSClient/Share/NCShare.swift

@@ -303,7 +303,7 @@ extension NCShare: UITableViewDataSource {
             cell.delegate = self
             if indexPath.row == 0 {
                 cell.isInternalLink = true
-            } else {
+            } else if shares.firstShareLink?.isInvalidated != true {
                 cell.tableShare = shares.firstShareLink
             }
             cell.setupCellUI()