coding

iOSClient/Activity/NCActivity.swift

@@ -166,12 +166,13 @@ extension NCActivity: UITableViewDelegate {
 extension NCActivity: UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
+        emptyDataSet?.numberOfSections(sectionDate.count)
         return sectionDate.count
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         let numberItems = getTableActivitiesFromSection(section).count
-        emptyDataSet?.numberOfItemsInSection(numberItems)
+        emptyDataSet?.numberOfItemsInSection(numberItems, section: section)
         return numberItems
     }
     

iOSClient/EmptyView/NCEmptyDataSet.swift

@@ -17,7 +17,7 @@ class NCEmptyDataSet: NSObject {
     var emptyView: NCEmptyView?
     var delegate: NCEmptyDataSetDelegate?
     var timer: Timer?
-    var numberItems: Int = 0
+    var numberItemsForSection: [Int:Int] = [:]
     
     init(view: UIView, offset: CGFloat = 0, delegate: NCEmptyDataSetDelegate?) {
         super.init()
@@ -43,22 +43,37 @@ class NCEmptyDataSet: NSObject {
         }
     }
     
-    func numberOfItemsInSection(_ numberItems: Int) {
+    func numberOfSections(_ num: Int) {
+        self.numberItemsForSection.removeAll()
+    }
+    
+    func numberOfItemsInSection(_ num: Int, section: Int) {
+        
         if let emptyView = emptyView {
             self.delegate?.emptyDataSetView?(emptyView)
             
             if !(timer?.isValid ?? false) && emptyView.isHidden == true {
                 timer = Timer.scheduledTimer(timeInterval: 0.5, target: self, selector: #selector(timerHandler(_:)), userInfo: nil, repeats: false)
             }
+            
+            var numberItems: Int = 0
+            for (_, value) in numberItemsForSection {
+                numberItems += value
+            }
             if numberItems > 0 {
                 self.emptyView?.isHidden = true
             }
             
-            self.numberItems = numberItems
+            numberItemsForSection[section] = num
         }
     }
     
     @objc func timerHandler(_ timer: Timer) {
+        
+        var numberItems: Int = 0
+        for (_, value) in numberItemsForSection {
+            numberItems += value
+        }
         if numberItems == 0 {
             self.emptyView?.isHidden = false
         } else {

iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1291,7 +1291,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         let numberItems = dataSource.numberOfItems()
-        emptyDataSet?.numberOfItemsInSection(numberItems)
+        emptyDataSet?.numberOfItemsInSection(numberItems, section: section)
         return numberItems
     }
     

iOSClient/Media/NCMedia.swift

@@ -556,7 +556,7 @@ extension NCMedia: UICollectionViewDataSource {
     }
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        emptyDataSet?.numberOfItemsInSection(metadatas.count)
+        emptyDataSet?.numberOfItemsInSection(metadatas.count, section: section)
         return metadatas.count
     }
 

iOSClient/Notification/NCNotification.swift

@@ -85,7 +85,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
     }
     
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        emptyDataSet?.numberOfItemsInSection(notifications.count)
+        emptyDataSet?.numberOfItemsInSection(notifications.count, section: section)
         return notifications.count
     }
     

iOSClient/Select/NCSelect.swift

@@ -438,7 +438,7 @@ extension NCSelect: UICollectionViewDataSource {
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         let numberOfItems = dataSource.numberOfItems()
-        emptyDataSet?.numberOfItemsInSection(numberOfItems)
+        emptyDataSet?.numberOfItemsInSection(numberOfItems, section:section)
         return numberOfItems
     }
     

iOSClient/Trash/NCTrash.swift

@@ -437,7 +437,7 @@ extension NCTrash: UICollectionViewDataSource {
     }
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        emptyDataSet?.numberOfItemsInSection(datasource.count)
+        emptyDataSet?.numberOfItemsInSection(datasource.count, section: section)
         return datasource.count
     }