Format and updates for macOS

oversizedev · Dec 25, 2024 · b327e44 · b327e44
1 parent 9de4f8d
commit b327e44
Show file tree

Hide file tree

Showing 35 changed files with 1,084 additions and 828 deletions.
diff --git a/Example/Shared/DemoPages/GridSelectDemo.swift b/Example/Shared/DemoPages/GridSelectDemo.swift
@@ -17,24 +17,30 @@ struct GridSelectDemo: View {
         PageView("Grid select") {
             VStack(spacing: .xSmall) {
                 ScrollView {
-                    GridSelect(items, selection: $selection,
-                               content: { item, _ in
-                                   VStack {
-                                       IconDeprecated(.circle)
-                                       Text(item)
-                                   }.padding()
-                               })
+                    GridSelect(
+                        items,
+                        selection: $selection,
+                        content: { item, _ in
+                            VStack {
+                                IconDeprecated(.circle)
+                                Text(item)
+                            }.padding()
+                        }
+                    )
                 }
 
-                GridSelect(items2, selection: $selection,
-                           content: { item, _ in
-                               VStack {
-                                   IconDeprecated(.circle)
-                                   Text(item)
-                               }.padding()
-                           })
+                GridSelect(
+                    items2,
+                    selection: $selection,
+                    content: { item, _ in
+                        VStack {
+                            IconDeprecated(.circle)
+                            Text(item)
+                        }.padding()
+                    }
+                )
 
-                           .gridSelectStyle(SelectionOnlyGridSelectStyle())
+                .gridSelectStyle(SelectionOnlyGridSelectStyle())
             }
             .padding()
         }

diff --git a/Sources/OversizeUI/Controls/Background/Background.swift b/Sources/OversizeUI/Controls/Background/Background.swift
@@ -33,10 +33,11 @@ public struct Background<Content: View>: View {
     private let background: BackgroundColor
     public var padding: BackgroundPadding
 
-    public init(background: BackgroundColor = .primary,
-                padding: BackgroundPadding = .medium,
-                @ViewBuilder content: () -> Content)
-    {
+    public init(
+        background: BackgroundColor = .primary,
+        padding: BackgroundPadding = .medium,
+        @ViewBuilder content: () -> Content
+    ) {
         self.content = content()
         self.padding = padding
         self.background = background

diff --git a/Sources/OversizeUI/Controls/Badge/Bage.swift b/Sources/OversizeUI/Controls/Badge/Bage.swift
@@ -26,18 +26,22 @@ public struct Bage<Label: View>: View {
         .padding(.vertical, .xxxSmall)
         .padding(.horizontal, .xxSmall)
         .background(
-            RoundedRectangle(cornerRadius: controlRadius,
-                             style: .continuous)
-                .fill(color.opacity(0.1))
-                .overlay(
-                    RoundedRectangle(cornerRadius: controlRadius,
-                                     style: .continuous)
-                        .stroke(
-                            theme.borderSurface
-                                ? Color.border
-                                : Color.clear
-                        )
+            RoundedRectangle(
+                cornerRadius: controlRadius,
+                style: .continuous
+            )
+            .fill(color.opacity(0.1))
+            .overlay(
+                RoundedRectangle(
+                    cornerRadius: controlRadius,
+                    style: .continuous
                 )
+                .stroke(
+                    theme.borderSurface
+                        ? Color.border
+                        : Color.clear
+                )
+            )
         )
     }
 }
diff --git a/Sources/OversizeUI/Controls/Button/FieldButtonStyle.swift b/Sources/OversizeUI/Controls/Button/FieldButtonStyle.swift
@@ -30,31 +30,44 @@ public struct FieldButtonStyle: ButtonStyle {
                 .fill(isPressed ? Color.surfaceTertiary : Color.surfaceSecondary)
                 .overlay(
                     RoundedRectangleCorner(radius: Radius.medium, corners: backgroundShapeCorners)
-                        .stroke(theme.borderTextFields
-                            ? Color.border
-                            : Color.surfaceSecondary, lineWidth: CGFloat(theme.borderSize))
+                        .stroke(
+                            theme.borderTextFields
+                                ? Color.border
+                                : Color.surfaceSecondary,
+                            lineWidth: CGFloat(theme.borderSize)
+                        )
                 )
             #else
             RoundedRectangle(cornerRadius: Radius.medium, style: .continuous)
                 .fill(isPressed ? Color.surfaceTertiary : Color.surfaceSecondary)
                 .overlay(
-                    RoundedRectangle(cornerRadius: Radius.medium,
-                                     style: .continuous)
-                        .stroke(theme.borderTextFields
+                    RoundedRectangle(
+                        cornerRadius: Radius.medium,
+                        style: .continuous
+                    )
+                    .stroke(
+                        theme.borderTextFields
                             ? Color.border
-                            : Color.surfaceSecondary, lineWidth: CGFloat(theme.borderSize))
+                            : Color.surfaceSecondary,
+                        lineWidth: CGFloat(theme.borderSize)
+                    )
                 )
             #endif
 
         default:
             RoundedRectangle(cornerRadius: Radius.medium, style: .continuous)
                 .fill(isPressed ? Color.surfaceTertiary : Color.surfaceSecondary)
                 .overlay(
-                    RoundedRectangle(cornerRadius: Radius.medium,
-                                     style: .continuous)
-                        .stroke(theme.borderTextFields
+                    RoundedRectangle(
+                        cornerRadius: Radius.medium,
+                        style: .continuous
+                    )
+                    .stroke(
+                        theme.borderTextFields
                             ? Color.border
-                            : Color.surfaceSecondary, lineWidth: CGFloat(theme.borderSize))
+                            : Color.surfaceSecondary,
+                        lineWidth: CGFloat(theme.borderSize)
+                    )
                 )
         }
     }

diff --git a/Sources/OversizeUI/Controls/Checkbox/Checkbox.swift b/Sources/OversizeUI/Controls/Checkbox/Checkbox.swift
@@ -18,11 +18,12 @@ public struct Checkbox<Label: View>: View {
     private var title: String?
     private let action: (() -> Void)?
 
-    public init(isOn: Binding<Bool>,
-                alignment: CheckboxAlignment = .trailing,
-                action: (() -> Void)? = nil,
-                @ViewBuilder label: @escaping () -> Label? = { nil })
-    {
+    public init(
+        isOn: Binding<Bool>,
+        alignment: CheckboxAlignment = .trailing,
+        action: (() -> Void)? = nil,
+        @ViewBuilder label: @escaping () -> Label? = { nil }
+    ) {
         _isOn = isOn
         self.alignment = alignment
         self.action = action
@@ -102,11 +103,12 @@ public struct Checkbox<Label: View>: View {
 }
 
 public extension Checkbox where Label == EmptyView {
-    init(_ title: String,
-         isOn: Binding<Bool>,
-         alignment: CheckboxAlignment = .trailing,
-         action: (() -> Void)? = nil)
-    {
+    init(
+        _ title: String,
+        isOn: Binding<Bool>,
+        alignment: CheckboxAlignment = .trailing,
+        action: (() -> Void)? = nil
+    ) {
         self.title = title
         _isOn = isOn
         self.alignment = alignment

diff --git a/Sources/OversizeUI/Controls/ColorSelector/ColorSelector.swift b/Sources/OversizeUI/Controls/ColorSelector/ColorSelector.swift
@@ -90,9 +90,13 @@ public struct ColorPickerWithoutBorder: View {
             .cornerRadius(19.0)
             .background(
                 ZStack {
-                    AngularGradient(gradient: Gradient(colors:
-                        [.red, .yellow, .green, .blue, .purple, .red]),
-                    center: .center, startAngle: .zero, endAngle: .degrees(360)).cornerRadius(16)
+                    AngularGradient(
+                        gradient: Gradient(colors:
+                            [.red, .yellow, .green, .blue, .purple, .red]),
+                        center: .center,
+                        startAngle: .zero,
+                        endAngle: .degrees(360)
+                    ).cornerRadius(16)
                         .frame(width: 32, height: 32)
 
                     Circle()

diff --git a/Sources/OversizeUI/Controls/ContentView/ContentView.swift b/Sources/OversizeUI/Controls/ContentView/ContentView.swift
@@ -27,12 +27,13 @@ public struct ContentView: View {
     private let primaryButton: ContenButtonType?
     private let secondaryButton: ContenButtonType?
 
-    public init(image: Image? = nil,
-                title: String,
-                subtitle: String? = nil,
-                primaryButton: ContenButtonType? = nil,
-                secondaryButton: ContenButtonType? = nil)
-    {
+    public init(
+        image: Image? = nil,
+        title: String,
+        subtitle: String? = nil,
+        primaryButton: ContenButtonType? = nil,
+        secondaryButton: ContenButtonType? = nil
+    ) {
         self.image = image
         self.title = title
         self.subtitle = subtitle
@@ -45,7 +46,8 @@ public struct ContentView: View {
         VStack(alignment: vStackAlignment, spacing: .large) {
             if let image {
                 image
-                    .frame(width: 218, height: 218, alignment: .bottom)
+                    .resizable()
+                    .frame(width: 128, height: 128, alignment: .bottom)
             }
 
             TextBox(