new view share

iOSClient/Share/NCShareComments.swift

@@ -251,8 +251,6 @@ extension NCShareComments: UITableViewDataSource {
     }
 }
 
-
-
 // MARK: - NCShareCommentsCell
 
 class NCShareCommentsCell: UITableViewCell {

iOSClient/Share/NCShareLinkMenuView.swift

@@ -69,10 +69,11 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
     var metadata: tableMetadata?
     var shareViewController: NCShare?
     private var networking: NCShareNetworking?
-
+    
     var viewWindow: UIView?
     var viewWindowCalendar: UIView?
-    
+    private var calendar: FSCalendar?
+
     override func awakeFromNib() {
         
         layer.borderColor = UIColor.lightGray.cgColor
@@ -204,6 +205,21 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         fieldNoteToRecipient.text = tableShare.note
     }
     
+    // MARK: - Tap viewWindowCalendar
+    @objc func tapViewWindowCalendar(gesture: UITapGestureRecognizer) {
+        calendar?.removeFromSuperview()
+        viewWindowCalendar?.removeFromSuperview()
+        
+        calendar = nil
+        viewWindowCalendar = nil
+        
+        reloadData(idRemoteShared: tableShare?.idRemoteShared ?? 0)
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        return gestureRecognizer.view == touch.view
+    }
+    
     // MARK: - IBAction
 
     // Allow editing (file)
@@ -316,7 +332,12 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         
         let calendar = NCShareCommon.sharedInstance.openCalendar(view: self, width: width, height: height)
         calendar.calendarView.delegate = self
+        self.calendar = calendar.calendarView
         viewWindowCalendar = calendar.viewWindow
+        
+        let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewWindowCalendar))
+        tap.delegate = self
+        viewWindowCalendar?.addGestureRecognizer(tap)
     }
     
     // Note to recipient

iOSClient/Share/NCShareUserMenuView.swift

@@ -61,7 +61,8 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
 
     var viewWindow: UIView?
     var viewWindowCalendar: UIView?
-    
+    private var calendar: FSCalendar?
+
     override func awakeFromNib() {
         
         layer.borderColor = UIColor.lightGray.cgColor
@@ -159,6 +160,21 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         fieldNoteToRecipient.text = tableShare.note
     }
     
+    // MARK: - Tap viewWindowCalendar
+    @objc func tapViewWindowCalendar(gesture: UITapGestureRecognizer) {
+        calendar?.removeFromSuperview()
+        viewWindowCalendar?.removeFromSuperview()
+        
+        calendar = nil
+        viewWindowCalendar = nil
+        
+        reloadData(idRemoteShared: tableShare?.idRemoteShared ?? 0)
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        return gestureRecognizer.view == touch.view
+    }
+    
     // MARK: - IBAction
 
     // Can reshare
@@ -257,7 +273,12 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         
         let calendar = NCShareCommon.sharedInstance.openCalendar(view: self, width: width, height: height)
         calendar.calendarView.delegate = self
+        self.calendar = calendar.calendarView
         viewWindowCalendar = calendar.viewWindow
+        
+        let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewWindowCalendar))
+        tap.delegate = self
+        viewWindowCalendar?.addGestureRecognizer(tap)
     }
     
     // Note to recipient