NMC 2341 - Conflict resolved after NC 5.2.2 (Update UI Revert from NC)

nextmcloud · Apr 8, 2024 · b49fa7f · b49fa7f
1 parent 237e059
commit b49fa7f
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/iOSClient/Trash/NCTrash+CollectionView.swift b/iOSClient/Trash/NCTrash+CollectionView.swift
@@ -142,19 +142,48 @@ extension NCTrash: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        if kind == UICollectionView.elementKindSectionHeader {
 
-        guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as? NCSectionFooter
-        else { return UICollectionReusableView() }
+            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderMenu", for: indexPath) as? NCSectionHeaderMenu
+            else { return UICollectionReusableView() }
 
-        footer.setTitleLabel(setTextFooter(datasource: datasource))
-        footer.separatorIsHidden(true)
-
-        return footer
+            if layoutForView?.layout == NCGlobal.shared.layoutGrid {
+                header.setImageSwitchList()
+                header.buttonSwitch.accessibilityLabel = NSLocalizedString("_list_view_", comment: "")
+            } else {
+                header.setImageSwitchGrid()
+                header.buttonSwitch.accessibilityLabel = NSLocalizedString("_grid_view_", comment: "")
+            }
+
+            header.delegate = self
+            header.setStatusButtonsView(enable: !datasource.isEmpty)
+            header.setSortedTitle(layoutForView?.titleButtonHeader ?? "")
+            header.setButtonsView(height: NCGlobal.shared.heightButtonsView)
+            header.setRichWorkspaceHeight(0)
+            header.setSectionHeight(0)
+            header.setViewTransfer(isHidden: true)
+
+            return header
+
+        } else {
+            guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionFooter", for: indexPath) as? NCSectionFooter
+            else { return UICollectionReusableView() }
+
+            footer.setTitleLabel(setTextFooter(datasource: datasource))
+            footer.separatorIsHidden(true)
+
+            return footer
+        }
     }
 }
 
 // MARK: UICollectionViewDelegateFlowLayout
 extension NCTrash: UICollectionViewDelegateFlowLayout {
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return CGSize(width: collectionView.frame.width, height: NCGlobal.shared.heightButtonsView)
+    }
+
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
         return CGSize(width: collectionView.frame.width, height: NCGlobal.shared.endHeightFooter)
     }