Remove .drawingGroup()

eneko · Jan 24, 2021 · d533fd4 · d533fd4
1 parent fc1112d
commit d533fd4
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 11 deletions.
diff --git a/Demo/StripesDemo/Shared/ContentView.swift b/Demo/StripesDemo/Shared/ContentView.swift
@@ -11,9 +11,13 @@ import Stripes
 struct ContentView: View {
     var body: some View {
         ZStack {
-            Stripes(config: StripesConfig(background: Color.green.opacity(0.6),
-                                          foreground: Color.white.opacity(0.3), degrees: 0,
-                                          barWidth: 50, barSpacing: 50))
+            Stripes(config: StripesConfig(background: Color.red.opacity(0.2),
+                                          foreground: Color.blue.opacity(0.6),
+                                          degrees: 45, barWidth: 50, barSpacing: 20))
+            Stripes(config: StripesConfig(background: Color.red.opacity(0.2),
+                                          foreground: Color.white.opacity(0.15),
+                                          degrees: -45, barWidth: 50, barSpacing: 20))
+
             Text("Hello, world!")
                 .font(.system(size: 50))
                 .foregroundColor(.white)

diff --git a/Demo/StripesDemo/StripesDemo.xcodeproj/project.pbxproj b/Demo/StripesDemo/StripesDemo.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.16;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.enekoalonso.apps.StripesDemo;
 				PRODUCT_NAME = StripesDemo;
 				SDKROOT = macosx;
@@ -421,7 +421,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.16;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.enekoalonso.apps.StripesDemo;
 				PRODUCT_NAME = StripesDemo;
 				SDKROOT = macosx;

diff --git a/README.md b/README.md
@@ -2,18 +2,61 @@
 
 Beautiful background pattern views for SwiftUI. 
 
+## Example Patterns
+
+### Diagonal Bars
+
 ![Stripes SwiftUI](Documentation/stripes-swiftui-macos.png)
 
-## Example Patterns
+```swift
+import SwiftUI
+import Stripes
+
+struct ContentView: View {
+    var body: some View {
+        ZStack {
+            Stripes(config: .default)
+
+            Text("Hello, world!")
+                .font(.system(size: 50))
+                .foregroundColor(.white)
+                .bold()
+        }
+        .background(Color.black)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .edgesIgnoringSafeArea(.all)
+    }
+}
+```
 
 ### Vertical Bars
 ![Stripes SwiftUI](Documentation/stripes-swiftui-ipad.png)
 
-### Overlapping Patterns
-![Stripes SwiftUI](Documentation/stripes-swiftui-iphone.png)
+```swift
+import SwiftUI
+import Stripes
 
+struct ContentView: View {
+    var body: some View {
+        ZStack {
+            Stripes(config: StripesConfig(background: Color.green.opacity(0.6),
+                                          foreground: Color.white.opacity(0.3), degrees: 0,
+                                          barWidth: 50, barSpacing: 50))
+
+            Text("Hello, world!")
+                .font(.system(size: 50))
+                .foregroundColor(.white)
+                .bold()
+        }
+        .background(Color.black)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .edgesIgnoringSafeArea(.all)
+    }
+}
+```
 
-## Usage
+### Overlapping Patterns
+![Stripes SwiftUI](Documentation/stripes-swiftui-iphone.png)
 
 ```swift
 import SwiftUI
@@ -22,16 +65,26 @@ import Stripes
 struct ContentView: View {
     var body: some View {
         ZStack {
-            Stripes(config: .default)
+            Stripes(config: StripesConfig(background: Color.red.opacity(0.2),
+                                          foreground: Color.blue.opacity(0.6),
+                                          degrees: 45, barWidth: 50, barSpacing: 20))
+            Stripes(config: StripesConfig(background: Color.red.opacity(0.2),
+                                          foreground: Color.white.opacity(0.15),
+                                          degrees: -45, barWidth: 50, barSpacing: 20))
+
             Text("Hello, world!")
                 .font(.system(size: 50))
+                .foregroundColor(.white)
                 .bold()
         }
+        .background(Color.black)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .edgesIgnoringSafeArea(.all)
     }
 }
 ```
 
+
 ## Installation
 
 ### Preferred: Add package to Xcode project
@@ -46,3 +99,53 @@ struct ContentView: View {
 
     ![Stripes Install](Documentation/stripes-install-2.png)
 
+### Avoid dependencies, copy the code
+
+```swift
+public struct StripesConfig {
+    var background: Color
+    var foreground: Color
+    var degrees: Double
+    var barWidth: CGFloat
+    var barSpacing: CGFloat
+
+    public init(background: Color = Color.pink.opacity(0.5), foreground: Color = Color.pink.opacity(0.8),
+                degrees: Double = 30, barWidth: CGFloat = 20, barSpacing: CGFloat = 20) {
+        self.background = background
+        self.foreground = foreground
+        self.degrees = degrees
+        self.barWidth = barWidth
+        self.barSpacing = barSpacing
+    }
+
+    public static let `default` = StripesConfig()
+}
+
+
+public struct Stripes: View {
+    var config: StripesConfig
+
+    public init(config: StripesConfig) {
+        self.config = config
+    }
+
+    public var body: some View {
+        GeometryReader { geometry in
+            let longSide = max(geometry.size.width, geometry.size.height)
+            let itemWidth = config.barWidth + config.barSpacing
+            let items = Int(2 * longSide / itemWidth)
+            HStack(spacing: config.barSpacing) {
+                ForEach(0..<items) { index in
+                    config.foreground
+                        .frame(width: config.barWidth, height: 2 * longSide)
+                }
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .rotationEffect(Angle(degrees: config.degrees), anchor: .center)
+            .offset(x: -longSide / 2, y: -longSide / 2)
+            .background(config.background)
+        }
+        .clipped()
+    }
+}
+```
diff --git a/Sources/Stripes/Stripes.swift b/Sources/Stripes/Stripes.swift
@@ -51,7 +51,6 @@ public struct Stripes: View {
             .background(config.background)
         }
         .clipped()
-        .drawingGroup()
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,6 @@ public struct Stripes: View { @@
                 .background(config.background)
             }
             .clipped()
-            .drawingGroup()
         }
     }
@@ Expand Down @@