SwiftFormat for code-style consistency

.gitignore

@@ -0,0 +1 @@
+Demo/BuildTools/.build

.swiftformat

@@ -20,9 +20,6 @@
 --fractiongrouping disabled
 --ifdef outdent
 --importgrouping testable-top
---operatorfunc no-space
---ranges no-space
---selfrequired validate
 --stripunusedargs closure-only
 --wraparguments before-first
---wrapcollections before-first
+--wrapcollections after-first

Demo/ASCollectionViewDemo.xcodeproj/project.pbxproj

@@ -256,6 +256,7 @@
 				B86C6F0F234B078600522AEF /* Sources */,
 				B86C6F10234B078600522AEF /* Frameworks */,
 				B86C6F11234B078600522AEF /* Resources */,
+				B8E6691323C2C8700034A9C1 /* SwiftFormat */,
 			);
 			buildRules = (
 			);
@@ -319,6 +320,27 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		B8E6691323C2C8700034A9C1 /* SwiftFormat */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = SwiftFormat;
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cd BuildTools\n\n#Temporarily uncomment the following line to update your packages (based on the versions defined in BuildTools/Package.swift)\n#swift package update\n\n#swift run -c release swiftformat \"$SRCROOT/../\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		B86C6F0F234B078600522AEF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

Demo/ASCollectionViewDemo/Screens/AdjustableLayout/AdjustableGridScreen.swift

@@ -63,9 +63,9 @@ struct AdjustableGridScreen: View
 	{
 		VStack
 		{
-			Stepper("Number of columns", value: self.$layoutState.numberOfColumns, in: 0...10)
+			Stepper("Number of columns", value: self.$layoutState.numberOfColumns, in: 0 ... 10)
 				.padding()
-			Stepper("Item inset", value: self.$layoutState.itemInset, in: 0...5)
+			Stepper("Item inset", value: self.$layoutState.itemInset, in: 0 ... 5)
 				.padding()
 			Toggle(isOn: self.$animateChange) { Text("Animate layout change") }
 				.padding()
@@ -83,7 +83,7 @@ struct AdjustableGridScreen: View
 			ASCollectionView(
 				section: section)
 				.layout(self.layout)
-				.shouldInvalidateLayoutOnStateChange(true, animated: self.animateChange) ///////////////////////// TELLS ASCOLLECTIONVIEW TO INVALIDATE THE LAYOUT WHEN THE VIEW IS UPDATED
+				.shouldInvalidateLayoutOnStateChange(true, animated: self.animateChange) /// ////////////////////// TELLS ASCOLLECTIONVIEW TO INVALIDATE THE LAYOUT WHEN THE VIEW IS UPDATED
 				.navigationBarTitle("Adjustable Layout", displayMode: .inline)
 		}
 		.navigationBarItems(

Demo/ASCollectionViewDemo/Screens/AppStore/AppStoreScreen.swift

@@ -5,7 +5,7 @@ import SwiftUI
 
 struct AppStoreScreen: View
 {
-	@State var data: [(sectionTitle: String, apps: [App])] = (0...20).map
+	@State var data: [(sectionTitle: String, apps: [App])] = (0 ... 20).map
 	{
 		(Lorem.title, DataSource.appsForSection($0))
 	}

Demo/ASCollectionViewDemo/Screens/InstaFeed/InstaFeedScreen.swift

@@ -7,9 +7,10 @@ import UIKit
 struct InstaFeedScreen: View
 {
 	@State var storiesData: [Post] = DataSource.postsForInstaSection(0, number: 12)
-	@State var data: [[Post]] = (0...1).map { DataSource.postsForInstaSection($0 + 1) }
+	@State var data: [[Post]] = (0 ... 1).map { DataSource.postsForInstaSection($0 + 1) }
 
-	var storiesCollectionView: some View {
+	var storiesCollectionView: some View
+	{
 		ASCollectionView(
 			section:
 			ASCollectionViewSection(
@@ -20,52 +21,54 @@ struct InstaFeedScreen: View
 				StoryView(post: item)
 		})
 			.layout(scrollDirection: .horizontal)
-			{
-				.list(itemSize: .absolute(100), sectionInsets: NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
+		{
+			.list(itemSize: .absolute(100), sectionInsets: NSDirectionalEdgeInsets(top: 0, leading: 10, bottom: 0, trailing: 10))
 		}
 		.frame(height: 100)
 		.scrollIndicatorsEnabled(false)
 		.onCollectionViewReachedBoundary
-			{ boundary in
-				print("Reached the \(boundary) boundary")
+		{ boundary in
+			print("Reached the \(boundary) boundary")
 		}
 	}
-
-	var storiesSection: ASTableViewSection<Int> {
-		return ASTableViewSection(id: 0)
+
+	var storiesSection: ASTableViewSection<Int>
+	{
+		ASTableViewSection(id: 0)
 		{
 			storiesCollectionView
 		}
 	}
-
-	var postSections: [ASTableViewSection<Int>] {
+
+	var postSections: [ASTableViewSection<Int>]
+	{
 		data.enumerated().map
-			{ i, sectionData in
-				return ASTableViewSection(
-					id: i + 1,
-					data: sectionData,
-					onCellEvent: onCellEventPosts)
-				{ item, _ in
-					PostView(post: item)
-				}
-					.tableViewSetEstimatedSizes(rowHeight: 500, headerHeight: 50) // Optional: Provide reasonable estimated heights for this section
-					.sectionHeader
+		{ i, sectionData in
+			ASTableViewSection(
+				id: i + 1,
+				data: sectionData,
+				onCellEvent: onCellEventPosts)
+			{ item, _ in
+				PostView(post: item)
+			}
+			.tableViewSetEstimatedSizes(rowHeight: 500, headerHeight: 50) // Optional: Provide reasonable estimated heights for this section
+			.sectionHeader
+			{
+				VStack(spacing: 0)
+				{
+					HStack
 					{
-						VStack(spacing: 0)
-						{
-							HStack
-								{
-									Text("Demo sticky header view")
-										.padding(EdgeInsets(top: 4, leading: 20, bottom: 4, trailing: 20))
-									Spacer()
-							}
-							Divider()
-						}
-						.background(Color(.secondarySystemBackground))
+						Text("Demo sticky header view")
+							.padding(EdgeInsets(top: 4, leading: 20, bottom: 4, trailing: 20))
+						Spacer()
+					}
+					Divider()
 				}
+				.background(Color(.secondarySystemBackground))
+			}
 		}
 	}
-	
+
 	var sections: [ASTableViewSection<Int>]
 	{
 		[storiesSection] + postSections
@@ -77,21 +80,21 @@ struct InstaFeedScreen: View
 			.tableViewSeparatorsEnabled(false)
 			.onTableViewPullToRefresh { endRefreshing in
 				print("PULL TO REFRESH")
-				Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { (_) in
+				Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { _ in
 					endRefreshing()
 				}
-		}
+			}
 			.onTableViewReachedBottom
-			{
-				self.loadMoreContent() // REACHED BOTTOM, LOADING MORE CONTENT
+		{
+			self.loadMoreContent() // REACHED BOTTOM, LOADING MORE CONTENT
 		}
 		.navigationBarTitle("Insta Feed (tableview)", displayMode: .inline)
 	}
 
 	func loadMoreContent()
 	{
 		let a = data.count
-		data.append(DataSource.postsForInstaSection(a+1))
+		data.append(DataSource.postsForInstaSection(a + 1))
 	}
 
 	func onCellEventStories(_ event: CellEvent<Post>)

Demo/ASCollectionViewDemo/Screens/InstaFeed/PostView.swift

@@ -116,6 +116,6 @@ struct PostView_Previews: PreviewProvider
 {
 	static var previews: some View
 	{
-		PostView(post: Post.randomPost(Int.random(in: 0...1000), aspectRatio: 1))
+		PostView(post: Post.randomPost(Int.random(in: 0 ... 1000), aspectRatio: 1))
 	}
 }

Demo/ASCollectionViewDemo/Screens/InstaFeed/StoryView.swift

@@ -27,6 +27,6 @@ struct StoryView_Previews: PreviewProvider
 {
 	static var previews: some View
 	{
-		StoryView(post: Post.randomPost(Int.random(in: 0...1000), aspectRatio: 1))
+		StoryView(post: Post.randomPost(Int.random(in: 0 ... 1000), aspectRatio: 1))
 	}
 }

Demo/ASCollectionViewDemo/Screens/MagazineLayout/MagazineLayoutScreen.swift

@@ -7,7 +7,7 @@ import UIKit
 
 struct MagazineLayoutScreen: View
 {
-	@State var data: [[Post]] = (0...5).map
+	@State var data: [[Post]] = (0 ... 5).map
 	{
 		DataSource.postsForGridSection($0, number: 10)
 	}

Demo/ASCollectionViewDemo/Screens/PhotoGrid/PhotoGridScreen.swift

@@ -110,14 +110,15 @@ struct PhotoGridScreen: View
 			}
 		}
 	}
-
-	func destinationForItem(_ item: Post) -> some View {
+
+	func destinationForItem(_ item: Post) -> some View
+	{
 		ScrollView {
 			PostView(post: item)
 				.onAppear {
 					ASRemoteImageManager.shared.load(item.url)
 					ASRemoteImageManager.shared.load(item.usernamePhotoURL)
-			}
+				}
 		}
 	}
 

Demo/ASCollectionViewDemo/Screens/Reminders/GroupModel.swift

@@ -7,7 +7,7 @@ struct GroupModel: Identifiable
 {
 	var icon: String
 	var title: String
-	var contentCount: Int? = Int.random(in: 0...20)
+	var contentCount: Int? = Int.random(in: 0 ... 20)
 	var color: Color = [Color.red, Color.orange, Color.blue, Color.purple].randomElement()!
 
 	static var demo = GroupModel(icon: "paperplane", title: "Test category", contentCount: 19)

Demo/ASCollectionViewDemo/Screens/Reminders/RemindersScreen.swift

@@ -13,18 +13,14 @@ struct RemindersScreen: View
 		case footnote
 	}
 
-	@State var upperData: [GroupModel] = [
-		GroupModel(icon: "calendar", title: "Today", color: .blue),
-		GroupModel(icon: "clock.fill", title: "Scheduled", color: .orange),
-		GroupModel(icon: "tray.fill", title: "All", color: .gray),
-		GroupModel(icon: "flag.fill", title: "Flagged", color: .red)
-	]
-	@State var lowerData: [GroupModel] = [
-		GroupModel(icon: "list.bullet", title: "Todo"),
-		GroupModel(icon: "cart.fill", title: "Groceries"),
-		GroupModel(icon: "house.fill", title: "House renovation"),
-		GroupModel(icon: "book.fill", title: "Reading list")
-	]
+	@State var upperData: [GroupModel] = [GroupModel(icon: "calendar", title: "Today", color: .blue),
+										  GroupModel(icon: "clock.fill", title: "Scheduled", color: .orange),
+										  GroupModel(icon: "tray.fill", title: "All", color: .gray),
+										  GroupModel(icon: "flag.fill", title: "Flagged", color: .red)]
+	@State var lowerData: [GroupModel] = [GroupModel(icon: "list.bullet", title: "Todo"),
+										  GroupModel(icon: "cart.fill", title: "Groceries"),
+										  GroupModel(icon: "house.fill", title: "House renovation"),
+										  GroupModel(icon: "book.fill", title: "Reading list")]
 
 	let addNewModel = GroupModel(icon: "plus", title: "Create new list", contentCount: nil, color: .green)
 
@@ -64,15 +60,15 @@ struct RemindersScreen: View
 			{
 				GroupSmall(model: self.addNewModel)
 			}
-			
+
 			ASCollectionViewSection<Section>(id: .footnote)
 			{
 				HStack
-					{
-						Spacer()
-						Text("Try rotating the screen")
-							.padding()
-						Spacer()
+				{
+					Spacer()
+					Text("Try rotating the screen")
+						.padding()
+					Spacer()
 				}
 			}
 		}
@@ -113,7 +109,7 @@ struct RemindersScreen: View
 
 					let section = NSCollectionLayoutSection(group: group)
 					section.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 20)
-					
+
 					let supplementarySize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0), heightDimension: .estimated(50))
 					let headerSupplementary = NSCollectionLayoutBoundarySupplementaryItem(
 						layoutSize: supplementarySize,

Demo/ASCollectionViewDemo/Screens/Tags/TagStore.swift

@@ -25,7 +25,7 @@ class TagStore: ObservableObject
 
 	static func randomItems() -> [Item]
 	{
-		TagStore.allWords.indices.shuffled()[0...Int.random(in: 8...18)].map
+		TagStore.allWords.indices.shuffled()[0 ... Int.random(in: 8 ... 18)].map
 		{
 			Item(id: $0, displayString: TagStore.allWords[$0])
 		}

Demo/ASCollectionViewDemo/Screens/Tags/TagsScreen.swift

@@ -138,7 +138,7 @@ class AlignedFlowLayout: UICollectionViewFlowLayout
 		}
 		guard
 			indexPath.item > 0,
-			let previousAttributes = self.layoutAttributesForItem(at: IndexPath(item: indexPath.item - 1, section: indexPath.section))
+			let previousAttributes = layoutAttributesForItem(at: IndexPath(item: indexPath.item - 1, section: indexPath.section))
 		else
 		{
 			attributes.frame.origin.x = leftEdge // first item of the section should always be left aligned

Demo/ASCollectionViewDemo/Screens/Waterfall/WaterfallScreen.swift

@@ -76,7 +76,7 @@ struct WaterfallScreen: View
 				HStack
 				{
 					Text("Min. column size")
-					Slider(value: self.$columnMinSize, in: 60...200)
+					Slider(value: self.$columnMinSize, in: 60 ... 200)
 				}.padding()
 			}