Merge pull request #26 from apptekstudios/dev

Remove ASCollectionLayoutFlow in favour of UICollectionViewFlowLayout
apptekstudios · Oct 22, 2019 · 16657fa · 16657fa
2 parents 732b02d + 31eddce
commit 16657fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Demo/ASCollectionViewDemo/Screens/Tags/TagsScreen.swift b/Demo/ASCollectionViewDemo/Screens/Tags/TagsScreen.swift
@@ -18,11 +18,11 @@ struct TagsScreen: View {
                 .font(.title)
             ASCollectionView(
                 data: store.items,
-                layout: .init(layout: {
+                layout: ASCollectionViewLayout(customLayout: {
                     let fl = AlignedFlowLayout()
                     fl.estimatedItemSize = UICollectionViewFlowLayout.automaticSize
                     return fl
-                }())
+                })
             ) { item in
                 Text(item.displayString)
                     .fixedSize()

diff --git a/Sources/ASCollectionView/ASCollectionViewLayout.swift b/Sources/ASCollectionView/ASCollectionViewLayout.swift
@@ -29,9 +29,9 @@ public struct ASCollectionViewLayout<SectionID: Hashable>
 		self.layout = .compositional({ _ in layout }, interSectionSpacing: interSectionSpacing, scrollDirection: scrollDirection) // ignore section ID -> all have same layout
 	}
 
-	public init(layout: UICollectionViewLayout)
+	public init(customLayout: (() -> UICollectionViewLayout))
 	{
-		self.layout = .custom(layout)
+		self.layout = .custom(customLayout())
 	}
 
 	public func makeLayout(withCoordinator coordinator: ASCollectionView<SectionID>.Coordinator) -> UICollectionViewLayout
@@ -134,7 +134,9 @@ public struct ASCollectionViewLayoutList: ASCollectionViewLayoutSection
 		return section
 	}
 }
-
+/*
+ //It is recommended to use UICollectionViewFlowLayout instead (see demo project). The new CompositionalLayout doesn't yet handle flow layouts well.
+ 
 public struct ASCollectionViewLayoutFlow: ASCollectionViewLayoutSection
 {
 	var itemSpacing: CGFloat
@@ -192,7 +194,7 @@ public struct ASCollectionViewLayoutFlow: ASCollectionViewLayoutSection
 		return section
 	}
 }
-
+*/
 public struct ASCollectionViewLayoutGrid: ASCollectionViewLayoutSection
 {
 	var layoutMode: LayoutMode