浏览代码

iPAD compatibility

Marino Faggiana 6 年之前
父节点
当前提交
80c37f2187
共有 3 个文件被更改,包括 15 次插入11 次删除
  1. 5 3
      iOSClient/Trash/NCTrash.swift
  2. 5 4
      iOSClient/Trash/NCTrashGridCell.swift
  3. 5 4
      iOSClient/Trash/NCTrashListCell.swift

+ 5 - 3
iOSClient/Trash/NCTrash.swift

@@ -67,11 +67,11 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
     
     
     // MARK: tap
     // MARK: tap
     
     
-    func tapRestoreItem(with fileID: String) {
+    func tapRestoreItem(with fileID: String, sender: Any) {
         restoreItem(with: fileID)
         restoreItem(with: fileID)
     }
     }
     
     
-    func tapMoreItem(with fileID: String) {
+    func tapMoreItem(with fileID: String, sender: Any) {
         
         
         var items = [ActionSheetItem]()
         var items = [ActionSheetItem]()
         
         
@@ -84,7 +84,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
             if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
         }
         }
         
         
-        actionSheet.present(in: self, from: self.view)
+        actionSheet.present(in: self, from: sender as! UIButton)
     }
     }
     
     
     func tapSwitchHeaderMenu() {
     func tapSwitchHeaderMenu() {
@@ -241,6 +241,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             cell.delegate = self
             cell.delegate = self
             
             
             cell.fileID = tableTrash.fileID
             cell.fileID = tableTrash.fileID
+            cell.indexPath = indexPath
             cell.labelTitle.text = tableTrash.trashbinFileName
             cell.labelTitle.text = tableTrash.trashbinFileName
             
             
             if tableTrash.directory {
             if tableTrash.directory {
@@ -259,6 +260,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             cell.delegate = self
             cell.delegate = self
             
             
             cell.fileID = tableTrash.fileID
             cell.fileID = tableTrash.fileID
+            cell.indexPath = indexPath
             cell.labelTitle.text = tableTrash.trashbinFileName
             cell.labelTitle.text = tableTrash.trashbinFileName
             
             
             if tableTrash.directory {
             if tableTrash.directory {

+ 5 - 4
iOSClient/Trash/NCTrashGridCell.swift

@@ -23,6 +23,7 @@ class NCTrashGridCell: UICollectionViewCell {
     var delegate: NCTrashGridDelegate?
     var delegate: NCTrashGridDelegate?
     
     
     var fileID = ""
     var fileID = ""
+    var indexPath = IndexPath()
 
 
     override func awakeFromNib() {
     override func awakeFromNib() {
         super.awakeFromNib()
         super.awakeFromNib()
@@ -32,15 +33,15 @@ class NCTrashGridCell: UICollectionViewCell {
     }
     }
     
     
     @IBAction func touchUpInsideMore(_ sender: Any) {
     @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapMoreItem(with: fileID)
+        delegate?.tapMoreItem(with: fileID, sender: sender)
     }
     }
     
     
     @IBAction func touchUpInsideRestore(_ sender: Any) {
     @IBAction func touchUpInsideRestore(_ sender: Any) {
-        delegate?.tapRestoreItem(with: fileID)
+        delegate?.tapRestoreItem(with: fileID, sender: sender)
     }
     }
 }
 }
 
 
 protocol NCTrashGridDelegate {
 protocol NCTrashGridDelegate {
-    func tapRestoreItem(with fileID: String)
-    func tapMoreItem(with fileID: String)
+    func tapRestoreItem(with fileID: String, sender: Any)
+    func tapMoreItem(with fileID: String, sender: Any)
 }
 }

+ 5 - 4
iOSClient/Trash/NCTrashListCell.swift

@@ -27,6 +27,7 @@ class NCTrashListCell: UICollectionViewCell {
     var delegate: NCTrashListDelegate?
     var delegate: NCTrashListDelegate?
     
     
     var fileID = ""
     var fileID = ""
+    var indexPath = IndexPath()
 
 
     override func awakeFromNib() {
     override func awakeFromNib() {
         super.awakeFromNib()
         super.awakeFromNib()
@@ -38,15 +39,15 @@ class NCTrashListCell: UICollectionViewCell {
     }
     }
     
     
     @IBAction func touchUpInsideMore(_ sender: Any) {
     @IBAction func touchUpInsideMore(_ sender: Any) {
-        delegate?.tapMoreItem(with: fileID)
+        delegate?.tapMoreItem(with: fileID, sender: sender)
     }
     }
     
     
     @IBAction func touchUpInsideRestore(_ sender: Any) {
     @IBAction func touchUpInsideRestore(_ sender: Any) {
-        delegate?.tapRestoreItem(with: fileID)
+        delegate?.tapRestoreItem(with: fileID, sender: sender)
     }
     }
 }
 }
 
 
 protocol NCTrashListDelegate {
 protocol NCTrashListDelegate {
-    func tapRestoreItem(with fileID: String)
-    func tapMoreItem(with fileID: String)
+    func tapRestoreItem(with fileID: String, sender: Any)
+    func tapMoreItem(with fileID: String, sender: Any)
 }
 }