style (#30)

Author: ay42

Sources/Grid/Grid.swift

@@ -16,7 +16,6 @@ public struct Grid: View {
                                 width: self.style.frameWidth(at: index, with: geometry, itemsCount: self.items.count),
                                 height: self.style.frameHeight(at: index, with: geometry, itemsCount: self.items.count)
                             )
-
                             .position(self.style.position(at: index, with: geometry, itemsCount: self.items.count))
                             .anchorPreference(key: GridItemPreferences.Key.self, value: .rect(self.style.itemRect(at: index, with: geometry, itemsCount: self.items.count))) {
                                 [GridItemPreferences(index: index, bounds: $0)]

Sources/Grid/AutoColumnsGridStyle.swift renamed to Sources/Grid/Styles/AutoColumnsGridStyle.swift

@@ -0,0 +1,12 @@
+import SwiftUI
+
+extension EnvironmentValues {
+    var gridStyle: GridStyle {
+        get {
+            return self[GridStyleKey.self]
+        }
+        set {
+            self[GridStyleKey.self] = newValue
+        }
+    }
+}

Sources/Grid/FixedColumnsGridStyle.swift renamed to Sources/Grid/Styles/FixedColumnsGridStyle.swift

@@ -37,27 +37,3 @@ extension GridStyle {
         return usableWidth / CGFloat(columns)
     }
 }
-
-extension View {
-
-    /// Sets the style for `Grid` within the environment of `self`.
-    public func gridStyle<S>(_ style: S) -> some View where S : GridStyle {
-        self.environment(\.gridStyle, style)
-    }
-
-}
-
-struct GridStyleKey: EnvironmentKey {
-    static let defaultValue: GridStyle = AutoColumnsGridStyle()
-}
-
-extension EnvironmentValues {
-    var gridStyle: GridStyle {
-        get {
-            return self[GridStyleKey.self]
-        }
-        set {
-            self[GridStyleKey.self] = newValue
-        }
-    }
-}

Sources/Grid/SingleColumnGridStyle.swift renamed to Sources/Grid/Styles/SingleColumnGridStyle.swift

@@ -0,0 +1,5 @@
+import SwiftUI
+
+struct GridStyleKey: EnvironmentKey {
+    static let defaultValue: GridStyle = AutoColumnsGridStyle()
+}

Sources/Grid/Styles/Style/EnvironmentValues+GridStyle.swift

@@ -0,0 +1,8 @@
+import SwiftUI
+
+extension View {
+    /// Sets the style for `Grid` within the environment of `self`.
+    public func gridStyle<S>(_ style: S) -> some View where S : GridStyle {
+        self.environment(\.gridStyle, style)
+    }
+}