marinofaggiana 4 년 전
부모
커밋
04442d6fe6
2개의 변경된 파일16개의 추가작업 그리고 1개의 파일을 삭제
  1. 0 1
      iOSClient/FileViewInFolder/NCFileViewInFolder.swift
  2. 16 0
      iOSClient/Main/NCCollectionViewCommon.swift

+ 0 - 1
iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -26,7 +26,6 @@ import NCCommunication
 
 class NCFileViewInFolder: NCCollectionViewCommon  {
     
-    internal var isRoot: Bool = true
     internal var fileName: String?
 
     required init?(coder aDecoder: NSCoder) {

+ 16 - 0
iOSClient/Main/NCCollectionViewCommon.swift

@@ -1163,6 +1163,16 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                 }
             }
             
+            if layoutKey == k_layout_view_viewInFolder {
+                
+                let vcFileViewInFolder:NCFileViewInFolder = UIStoryboard(name: "NCFileViewInFolder", bundle: nil).instantiateInitialViewController() as! NCFileViewInFolder
+                
+                vcFileViewInFolder.serverUrl = serverUrlPush
+                vcFileViewInFolder.titleCurrentFolder = metadataTouch!.fileNameView
+                                
+                self.navigationController?.pushViewController(vcFileViewInFolder, animated: true)
+            }
+            
         } else {
             
             if metadata.typeFile == k_metadataTypeFile_document && NCUtility.shared.isDirectEditing(account: metadata.account, contentType: metadata.contentType) != nil {
@@ -1188,6 +1198,12 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             } else {
                 NCNetworking.shared.download(metadata: metadataTouch!, selector: selectorLoadFileView) { (_) in }
             }
+            
+            if layoutKey == k_layout_view_viewInFolder {
+                dismiss(animated: true) {
+                    self.appDelegate.activeFileViewInFolder = nil
+                }
+            }
         }
     }