Restructed.

sparrowcode · Sep 13, 2023 · b6ea9bb · b6ea9bb
1 parent e98b133
commit b6ea9bb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/Sources/SwiftUIExtension/Compability/WidgetViewCompability.swift b/Sources/SwiftUIExtension/Compability/WidgetViewCompability.swift
@@ -6,6 +6,10 @@ extension View {
     public func containerBackgroundForWidgetCompability<Background>(background: @escaping () -> Background) -> some View where Background: View {
         modifier(ContainerBackgroundForWidgetCompabilityModifier(background: background))
     }
+
+    public func containerBackgroundForWidget<Background>(@ViewBuilder background: @escaping () -> Background) -> some View where Background: View {
+        modifier(ContainerBackgroundForWidgetModifier(background: background))
+    }
 }
 
 struct ContainerBackgroundForWidgetCompabilityModifier<Background>: ViewModifier where Background: View {
@@ -23,3 +27,23 @@ struct ContainerBackgroundForWidgetCompabilityModifier<Background>: ViewModifier
         }
     }
 }
+
+struct ContainerBackgroundForWidgetModifier<Background>: ViewModifier where Background: View {
+
+    let background: () -> Background
+
+    func body(content: Content) -> some View {
+        if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, macOS 14.0, *) {
+            content
+                .containerBackground(for: .widget) {
+                    background()
+                }
+        } else {
+            ZStack {
+                background()
+                content
+                    .padding()
+            }
+        }
+    }
+}
diff --git a/Sources/SwiftUIExtension/Extensions/ViewExtension.swift b/Sources/SwiftUIExtension/Extensions/ViewExtension.swift
@@ -5,30 +5,6 @@ extension View {
     public func onReceive(notification name: Notification.Name, perform action: @escaping (NotificationCenter.Publisher.Output) -> Void) -> some View {
         self.onReceive(NotificationCenter.default.publisher(for: name), perform: action)
     }
-
-    public func containerBackgroundForWidget<Background>(@ViewBuilder background: @escaping () -> Background) -> some View where Background: View {
-        modifier(ContainerBackgroundForWidgetModifier(background: background))
-    }
-}
-
-struct ContainerBackgroundForWidgetModifier<Background>: ViewModifier where Background: View {
-
-    let background: () -> Background
-
-    func body(content: Content) -> some View {
-        if #available(iOS 17.0, iOSApplicationExtension 17.0, watchOS 10.0, watchOSApplicationExtension 10.0, macOS 14.0, *) {
-            content
-                .containerBackground(for: .widget) {
-                    background()
-                }
-        } else {
-            ZStack {
-                background()
-                content
-                    .padding()
-            }
-        }
-    }
 }
 
 // MARK: - Only iOS