Explorar o código

add scrollToFileID

Marino Faggiana %!s(int64=6) %!d(string=hai) anos
pai
achega
2586b43875
Modificáronse 2 ficheiros con 18 adicións e 1 borrados
  1. 5 1
      iOSClient/Activity/NCActivity.swift
  2. 13 0
      iOSClient/Trash/NCTrash.swift

+ 5 - 1
iOSClient/Activity/NCActivity.swift

@@ -389,7 +389,11 @@ class activityTableViewCell: UITableViewCell, UICollectionViewDelegate, UICollec
                 }
             }
             if (responder as? UIViewController)!.navigationController != nil {
-                (responder as? UIViewController)!.navigationController?.performSegue(withIdentifier: "segueTrash", sender: self)
+                
+                if let viewController = UIStoryboard.init(name: "NCTrash", bundle: nil).instantiateInitialViewController() as? NCTrash {
+                    viewController.scrollToFileID = String(activityPreview.fileId)
+                    (responder as? UIViewController)!.navigationController?.pushViewController(viewController, animated: true)
+                }
             }
             
             return

+ 13 - 0
iOSClient/Trash/NCTrash.swift

@@ -30,6 +30,7 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
 
     var path = ""
     var titleCurrentFolder = NSLocalizedString("_trash_view_", comment: "")
+    var scrollToFileID = ""
     
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
@@ -103,6 +104,18 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         loadListingTrash()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        if scrollToFileID != "" {
+            for item in 0...datasource.count-1 {
+                if datasource[item].fileID.contains(scrollToFileID) {
+                    collectionView.scrollToItem(at: IndexPath(item: item, section: 0), at: .top, animated: true)
+                }
+            }
+        }
+    }
+    
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)