marinofaggiana vor 4 Jahren
Ursprung
Commit
a38b2d5d44

+ 3 - 3
iOSClient/Favorites/NCFavorite.swift

@@ -33,9 +33,9 @@ class NCFavorite: NCCollectionViewCommon  {
         titleCurrentFolder = NSLocalizedString("_favorites_", comment: "")
         layoutKey = k_layout_view_favorite
         enableSearchBar = true
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "favorite"), width: 300, height: 300, color: NCBrandColor.sharedInstance.yellowFavorite)
-        DZNtitle = "_favorite_no_files_"
-        DZNdescription = "_tutorial_favorite_view_"
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "favorite"), width: 300, height: 300, color: NCBrandColor.sharedInstance.yellowFavorite)
+        emptyTitle = "_favorite_no_files_"
+        emptyDescription = "_tutorial_favorite_view_"
     }
     
     // MARK: - DataSource + NC Endpoint

+ 3 - 3
iOSClient/FileViewInFolder/NCFileViewInFolder.swift

@@ -34,9 +34,9 @@ class NCFileViewInFolder: NCCollectionViewCommon  {
         appDelegate.activeFileViewInFolder = self
         layoutKey = k_layout_view_viewInFolder
         enableSearchBar = false
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
-        DZNtitle = "_files_no_files_"
-        DZNdescription = "_no_file_pull_down_"
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
+        emptyTitle = "_files_no_files_"
+        emptyDescription = "_no_file_pull_down_"
     }
     
     override func viewWillAppear(_ animated: Bool) {

+ 3 - 3
iOSClient/Files/NCFiles.swift

@@ -35,9 +35,9 @@ class NCFiles: NCCollectionViewCommon  {
         titleCurrentFolder = NCBrandOptions.sharedInstance.brand
         layoutKey = k_layout_view_files
         enableSearchBar = true
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
-        DZNtitle = "_files_no_files_"
-        DZNdescription = "_no_file_pull_down_"
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
+        emptyTitle = "_files_no_files_"
+        emptyDescription = "_no_file_pull_down_"
     }
     
     override func viewWillAppear(_ animated: Bool) {

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

@@ -71,9 +71,9 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     internal var layoutKey = ""
     internal var titleCurrentFolder = ""
     internal var enableSearchBar: Bool = false
-    internal var DZNimage: UIImage?
-    internal var DZNtitle: String = ""
-    internal var DZNdescription: String = ""
+    internal var emptyImage: UIImage?
+    internal var emptyTitle: String = ""
+    internal var emptyDescription: String = ""
     
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
@@ -549,7 +549,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         }
     }
         
-    // MARK: - DZNEmpty
+    // MARK: - Empty
     
     func backgroundColor(forEmptyDataSet scrollView: UIScrollView) -> UIColor? {
         return NCBrandColor.sharedInstance.backgroundView
@@ -565,12 +565,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             return CCGraphics.changeThemingColorImage(UIImage.init(named: "networkInProgress"), width: 300, height: 300, color: .gray)
         }
         
-        return DZNimage
+        return emptyImage
     }
     
     func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
         
-        var text = "\n"+NSLocalizedString(DZNtitle, comment: "")
+        var text = "\n"+NSLocalizedString(emptyTitle, comment: "")
         
         if isReloadDataSourceNetworkInProgress {
             text = "\n"+NSLocalizedString("_request_in_progress_", comment: "")
@@ -590,7 +590,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     
     func description(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
         
-        var text = "\n"+NSLocalizedString(DZNdescription, comment: "")
+        var text = "\n"+NSLocalizedString(emptyDescription, comment: "")
         
         if isReloadDataSourceNetworkInProgress {
             text = ""

+ 3 - 3
iOSClient/Offline/NCOffline.swift

@@ -33,9 +33,9 @@ class NCOffline: NCCollectionViewCommon  {
         titleCurrentFolder = NSLocalizedString("_manage_file_offline_", comment: "")
         layoutKey = k_layout_view_offline
         enableSearchBar = true
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
-        DZNtitle = "_files_no_files_"
-        DZNdescription = "_tutorial_offline_view_"
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "folder"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
+        emptyTitle = "_files_no_files_"
+        emptyDescription = "_tutorial_offline_view_"
     }
     
     // MARK: - DataSource + NC Endpoint

+ 3 - 3
iOSClient/Recent/NCRecent.swift

@@ -33,9 +33,9 @@ class NCRecent: NCCollectionViewCommon  {
         titleCurrentFolder = NSLocalizedString("_recent_", comment: "")
         layoutKey = k_layout_view_recent
         enableSearchBar = false
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "recent"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
-        DZNtitle = "_files_no_files_"
-        DZNdescription = ""
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "recent"), width: 300, height: 300, color: NCBrandColor.sharedInstance.brandElement)
+        emptyTitle = "_files_no_files_"
+        emptyDescription = ""
     }
     
     // MARK: - Collection View

+ 3 - 3
iOSClient/Transfers/NCTransfers.swift

@@ -35,9 +35,9 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate  {
         titleCurrentFolder = NSLocalizedString("_transfers_", comment: "")
         layoutKey = k_layout_view_transfers
         enableSearchBar = false
-        DZNimage = CCGraphics.changeThemingColorImage(UIImage.init(named: "load"), width: 300, height: 300, color: .gray)
-        DZNtitle = "_no_transfer_"
-        DZNdescription = "_no_transfer_sub_"
+        emptyImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "load"), width: 300, height: 300, color: .gray)
+        emptyTitle = "_no_transfer_"
+        emptyDescription = "_no_transfer_sub_"
     }
     
     override func viewDidLoad() {