marinofaggiana пре 4 година
родитељ
комит
091376e048

+ 4 - 4
Nextcloud.xcodeproj/project.pbxproj

@@ -73,7 +73,7 @@
 		F7226EDC1EE4089300EBECB1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7226EDB1EE4089300EBECB1 /* Main.storyboard */; };
 		F722814323C8C34500C41898 /* NCRichWorkspace.xib in Resources */ = {isa = PBXBuildFile; fileRef = F722814223C8C34500C41898 /* NCRichWorkspace.xib */; };
 		F723985C253C95CE00257F49 /* NCViewerRichdocument.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */; };
-		F7239871253D86B600257F49 /* NCEmpty.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7239870253D86B600257F49 /* NCEmpty.swift */; };
+		F7239871253D86B600257F49 /* NCEmptyDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7239870253D86B600257F49 /* NCEmptyDataSet.swift */; };
 		F7239877253D86D300257F49 /* NCEmptyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7239876253D86D300257F49 /* NCEmptyView.xib */; };
 		F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F723B3DC22FC6D1C00301EFE /* NCShareCommentsCell.xib */; };
 		F726EEEC1FED1C820030B9C8 /* NCEndToEndInitialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = F726EEEB1FED1C820030B9C8 /* NCEndToEndInitialize.swift */; };
@@ -417,7 +417,7 @@
 		F722814223C8C34500C41898 /* NCRichWorkspace.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCRichWorkspace.xib; sourceTree = "<group>"; };
 		F7229B491DF71BB300E8C4E7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = SOURCE_ROOT; };
 		F723985B253C95CE00257F49 /* NCViewerRichdocument.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerRichdocument.storyboard; sourceTree = "<group>"; };
-		F7239870253D86B600257F49 /* NCEmpty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCEmpty.swift; sourceTree = "<group>"; };
+		F7239870253D86B600257F49 /* NCEmptyDataSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCEmptyDataSet.swift; sourceTree = "<group>"; };
 		F7239876253D86D300257F49 /* NCEmptyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCEmptyView.xib; sourceTree = "<group>"; };
 		F723B3DC22FC6D1C00301EFE /* NCShareCommentsCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareCommentsCell.xib; sourceTree = "<group>"; };
 		F7267A81225DFCE100D6DB7D /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/iOS/AFNetworking.framework; sourceTree = "<group>"; };
@@ -933,7 +933,7 @@
 		F723986F253D867900257F49 /* EmptyView */ = {
 			isa = PBXGroup;
 			children = (
-				F7239870253D86B600257F49 /* NCEmpty.swift */,
+				F7239870253D86B600257F49 /* NCEmptyDataSet.swift */,
 				F7239876253D86D300257F49 /* NCEmptyView.xib */,
 			);
 			path = EmptyView;
@@ -2118,7 +2118,7 @@
 				F7651A8B23A2A3F2001403D2 /* NCCreateFormUploadDocuments.swift in Sources */,
 				F74AF3A4247FB6AE00AC767B /* NCUtilityFileSystem.swift in Sources */,
 				F7417DB3216CE925007D05F5 /* NCTrashSectionHeaderFooter.swift in Sources */,
-				F7239871253D86B600257F49 /* NCEmpty.swift in Sources */,
+				F7239871253D86B600257F49 /* NCEmptyDataSet.swift in Sources */,
 				F7F878AE1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
 				F7DBC37C23325E02001A85BA /* NCAppConfigView.swift in Sources */,
 				F738143A240FE48D00404AC7 /* NCViewerImageCommon.swift in Sources */,

+ 9 - 9
iOSClient/EmptyView/NCEmpty.swift → iOSClient/EmptyView/NCEmptyDataSet.swift

@@ -1,5 +1,5 @@
 //
-//  NCEmpty.swift
+//  NCEmptyDataSet.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 19/10/2020.
@@ -8,15 +8,15 @@
 
 import Foundation
 
-class NCEmpty: NSObject {
+class NCEmptyDataSet: NSObject {
     
     var emptyView: NCEmptyView?
-    var collectioView: UICollectionView?
+    var collectionView: UICollectionView?
     
-    init(collectioView: UICollectionView, image: UIImage?, title: String, description: String) {
+    init(collectionView: UICollectionView, image: UIImage?, title: String, description: String) {
         super.init()
 
-        self.collectioView = collectioView
+        self.collectionView = collectionView
         if let emptyView = UINib(nibName: "NCEmptyView", bundle: nil).instantiate(withOwner: self, options: nil).first as? NCEmptyView {
         
             self.emptyView = emptyView
@@ -29,17 +29,17 @@ class NCEmpty: NSObject {
             emptyView.emptyTtle.text = NSLocalizedString(title, comment: "")
             emptyView.emptyDescription.text = NSLocalizedString(description, comment: "")
                        
-            collectioView.addSubview(emptyView)
+            collectionView.addSubview(emptyView)
 
-            emptyView.centerXAnchor.constraint(equalTo: collectioView.centerXAnchor, constant: 0).isActive = true
-            emptyView.topAnchor.constraint(equalTo: collectioView.topAnchor).isActive = true
+            emptyView.centerXAnchor.constraint(equalTo: collectionView.centerXAnchor, constant: 0).isActive = true
+            emptyView.topAnchor.constraint(equalTo: collectionView.topAnchor).isActive = true
             
             emptyView.layoutIfNeeded()
         }
     }
     
     func reload() {
-        let items = collectioView?.numberOfItems(inSection: 0)
+        let items = collectionView?.numberOfItems(inSection: 0)
         if items == 0 {
             emptyView?.isHidden = false
         } else {

+ 2 - 2
iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -32,7 +32,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
 
     internal let refreshControl = UIRefreshControl()
     internal var searchController: UISearchController?
-    internal var empty: NCEmpty?
+    internal var emptyDataSet: NCEmptyDataSet?
     
     internal var serverUrl: String = ""
     internal var isEncryptedFolder = false
@@ -115,7 +115,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         refreshControl.addTarget(self, action: #selector(reloadDataSourceNetworkRefreshControl), for: .valueChanged)
         
         // Empty
-        empty = NCEmpty.init(collectioView: collectionView, image: emptyImage, title: emptyTitle, description: emptyDescription)
+        emptyDataSet = NCEmptyDataSet.init(collectionView: collectionView, image: emptyImage, title: emptyTitle, description: emptyDescription)
         
         // 3D Touch peek and pop
         if traitCollection.forceTouchCapability == .available {