view builder inits (#29)

Author: ay42

Examples/GridExamples/SingleColumnLayoutView.swift

@@ -3,8 +3,17 @@ import Grid
 
 struct SingleColumnLayoutView: View {
     var body: some View {
-        Grid(0...100) { number in
-            Card(title: "\(number)")
+        Grid {
+            Card(title: "1")
+            Card(title: "2")
+            Card(title: "3")
+            Card(title: "4")
+            Card(title: "5")
+            Card(title: "6")
+            Card(title: "7")
+            Card(title: "8")
+            Card(title: "9")
+            Card(title: "10")
         }
         .padding()
         .gridStyle(

README.md

@@ -42,8 +42,10 @@ Grid {
 ### FixedColumnsGridStyle
 
 ```swift
-Grid(0...100) { number in
-    Card(title: "\(number)")
+Grid {
+    Card(title: "1")
+    Card(title: "2")
+    Card(title: "3")
 }
 .gridStyle(
     FixedColumnsGridStyle(columns: 3, itemHeight: 160)

Sources/Grid/Grid+Inits.swift

@@ -1,12 +1,50 @@
 import SwiftUI
 
 extension Grid {
-    public init<Data: RandomAccessCollection>(_ data: Data, @ViewBuilder content: @escaping (Data.Element) -> Content) {
+    public init<Data: RandomAccessCollection, Content: View>(_ data: Data, @ViewBuilder content: @escaping (Data.Element) -> Content) {
         self.items = data.map({ AnyView(content($0)) })
     }
 
-    public init<Data: RandomAccessCollection, ID, Item: View>(@ViewBuilder content: () -> Content) where Content == ForEach<Data, ID, Item> {
+    public init<Data: RandomAccessCollection, ID, Item: View>(@ViewBuilder content: () -> ForEach<Data, ID, Item>) {
         let views = content()
         self.items = views.data.map { AnyView(views.content($0)) }
     }
 }
+
+extension Grid {
+    public init<C0: View>(@ViewBuilder content: () -> C0) {
+        self.items = [AnyView(content())]
+    }
+    
+    public init<C0: View, C1: View>(@ViewBuilder content: () -> TupleView<(C0, C1)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1)]
+    }
+    
+    public init<C0: View, C1: View, C2: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View, C4: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3, C4)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3), AnyView(content().value.4)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View, C4: View, C5: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3, C4, C5)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3), AnyView(content().value.4), AnyView(content().value.5)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View, C4: View, C5: View, C6: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3, C4, C5, C6)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3), AnyView(content().value.4), AnyView(content().value.5), AnyView(content().value.6)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View, C4: View, C5: View, C6: View, C7: View, C8: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3, C4, C5, C6, C7, C8)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3), AnyView(content().value.4), AnyView(content().value.5), AnyView(content().value.6), AnyView(content().value.7), AnyView(content().value.8)]
+    }
+    
+    public init<C0: View, C1: View, C2: View, C3: View, C4: View, C5: View, C6: View, C7: View, C8: View, C9: View>(@ViewBuilder content: () -> TupleView<(C0, C1, C2, C3, C4, C5, C6, C7, C8, C9)>) {
+        self.items = [AnyView(content().value.0), AnyView(content().value.1), AnyView(content().value.2), AnyView(content().value.3), AnyView(content().value.4), AnyView(content().value.5), AnyView(content().value.6), AnyView(content().value.7), AnyView(content().value.8), AnyView(content().value.9)]
+    }
+}

Sources/Grid/Grid.swift

@@ -1,7 +1,7 @@
 import SwiftUI
 
 /// A view that arranges its children in a grid.
-public struct Grid<Content> : View where Content : View {
+public struct Grid: View {
     @Environment(\.gridStyle) var style
 
     let items: [AnyView]