Add RoundedRectangleCorner for macOS, update filed position and etc

oversizedev · Oct 6, 2024 · 48fd61f · 48fd61f
1 parent bf97a4c
commit 48fd61f
Show file tree

Hide file tree

Showing 20 changed files with 365 additions and 112 deletions.
diff --git a/Sources/OversizeUI/Controls/Avatar/Avatar.swift b/Sources/OversizeUI/Controls/Avatar/Avatar.swift
@@ -41,6 +41,9 @@ public struct Avatar: View {
     /// Sets a  stroke color for the Avatar.
     var strokeColor: Color = .clear
 
+    /// Sets a  stroke width for the Avatar.
+    var strokeLineWidth: CGFloat = 2
+
     /// Sets a custom background color for the Avatar.
     var background: AvatarBackgroundType = .color(.surfaceSecondary)
 
@@ -82,13 +85,23 @@ public struct Avatar: View {
                 .scaledToFill()
                 .frame(width: avatarSize, height: avatarSize)
                 .clipShape(Circle())
-                .overlay(Circle().stroke(strokeColor, lineWidth: 2))
+                .overlay(
+                    Circle().stroke(
+                        strokeColor,
+                        lineWidth: strokeLineWidth
+                    )
+                )
 
         } else {
             ZStack {
                 avatarSurface
                     .frame(width: avatarSize, height: avatarSize)
-                    .overlay(Circle().stroke(strokeColor, lineWidth: 2))
+                    .overlay(
+                        Circle().stroke(
+                            strokeColor,
+                            lineWidth: strokeLineWidth
+                        )
+                    )
 
                 avatarLabel
             }
@@ -106,13 +119,23 @@ public struct Avatar: View {
                 .scaledToFill()
                 .frame(width: Space.xxxLarge.rawValue, height: Space.xxxLarge.rawValue)
                 .clipShape(Circle())
-                .overlay(Circle().stroke(strokeColor, lineWidth: 2))
+                .overlay(
+                    Circle().stroke(
+                        strokeColor,
+                        lineWidth: strokeLineWidth
+                    )
+                )
 
         } else {
             ZStack {
                 avatarSurface
                     .frame(width: Space.xxxLarge.rawValue, height: Space.xxxLarge.rawValue)
-                    .overlay(Circle().stroke(strokeColor, lineWidth: 2))
+                    .overlay(
+                        Circle().stroke(
+                            strokeColor,
+                            lineWidth: strokeLineWidth
+                        )
+                    )
             }
         }
     }

diff --git a/Sources/OversizeUI/Controls/Avatar/AvatarModifiers.swift b/Sources/OversizeUI/Controls/Avatar/AvatarModifiers.swift
@@ -27,9 +27,10 @@ public extension Avatar {
     /// Sets a stroke for the Avatar
     /// - Parameter strokeColor: Color for Avatar stroke
     /// - Returns: The modified view with stroke.
-    func avatarStroke(_ strokeColor: Color = .surfacePrimary) -> Avatar {
+    func avatarStroke(_ strokeColor: Color = .surfacePrimary, lineWidth: CGFloat = 2) -> Avatar {
         var control = self
         control.strokeColor = strokeColor
+        control.strokeLineWidth = lineWidth
         return control
     }
 }
diff --git a/Sources/OversizeUI/Controls/Button/FieldButtonStyle.swift b/Sources/OversizeUI/Controls/Button/FieldButtonStyle.swift
@@ -7,7 +7,7 @@ import SwiftUI
 
 public struct FieldButtonStyle: ButtonStyle {
     @Environment(\.theme) private var theme: ThemeSettings
-    @Environment(\.fieldPosition) private var fieldPosition: FieldPosition
+    @Environment(\.fieldPosition) private var fieldPosition: VerticalAlignment?
 
     public init() {}
 
@@ -24,16 +24,6 @@ public struct FieldButtonStyle: ButtonStyle {
     @ViewBuilder
     private func fieldBackground(isPressed: Bool) -> some View {
         switch fieldPosition {
-        case .default:
-            RoundedRectangle(cornerRadius: Radius.medium, style: .continuous)
-                .fill(isPressed ? Color.surfaceTertiary : Color.surfaceSecondary)
-                .overlay(
-                    RoundedRectangle(cornerRadius: Radius.medium,
-                                     style: .continuous)
-                        .stroke(theme.borderTextFields
-                            ? Color.border
-                            : Color.surfaceSecondary, lineWidth: CGFloat(theme.borderSize))
-                )
         case .top, .bottom, .center:
             #if os(iOS)
             RoundedRectangleCorner(radius: Radius.medium, corners: backgroundShapeCorners)
@@ -55,6 +45,17 @@ public struct FieldButtonStyle: ButtonStyle {
                             : 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
+                            ? Color.border
+                            : Color.surfaceSecondary, lineWidth: CGFloat(theme.borderSize))
+                )
         }
     }
 

diff --git a/Sources/OversizeUI/Controls/IconPicker/IconPicker.swift b/Sources/OversizeUI/Controls/IconPicker/IconPicker.swift
@@ -5,9 +5,7 @@
 
 import SwiftUI
 
-@available(macOS, unavailable)
-@available(watchOS, unavailable)
-@available(tvOS, unavailable)
+#if os(iOS)
 public struct IconPicker: View {
     @Environment(\.theme) private var theme: ThemeSettings
     @Environment(\.horizontalSizeClass) var horizontalSizeClass
@@ -109,3 +107,4 @@ public struct IconPicker: View {
         }
     }
 }
+#endif
diff --git a/Sources/OversizeUI/Controls/PageControl/PageIndexView.swift b/Sources/OversizeUI/Controls/PageControl/PageIndexView.swift
@@ -19,7 +19,11 @@ public struct PageIndexView: View {
             ForEach(0 ..< maxIndex, id: \.self) { index in
                 Capsule()
                     .fill(index == self.index ? Color.accent : Color.surfaceTertiary)
+                #if os(iOS)
                     .frame(width: index == self.index ? 28 : 8, height: 8)
+                #else
+                    .frame(width: index == self.index ? 24 : 6, height: 6)
+                #endif
                     .animation(.default, value: index)
             }
         }

diff --git a/Sources/OversizeUI/Controls/PageView/Page.swift b/Sources/OversizeUI/Controls/PageView/Page.swift
@@ -1109,7 +1109,7 @@ struct SeartchTextFieldButtonStyle: ButtonStyle {
 private extension View {
     @ViewBuilder
     func prefersNavigationBarHidden() -> some View {
-        #if os(watchOS)
+        #if os(watchOS) || os(macOS)
         self
         #else
         if #available(iOS 16.0, macOS 13.0, tvOS 16.0, *) {

diff --git a/Sources/OversizeUI/Controls/PriceField/PriceField.swift b/Sources/OversizeUI/Controls/PriceField/PriceField.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import UIKit
 #endif
 
-@available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
+@available(macOS 14, iOS 16, tvOS 16, watchOS 9, *)
 public struct PriceField: View {
     private var formatter: NumberFormatter {
         let formatter = NumberFormatter()

diff --git a/Sources/OversizeUI/Controls/Select/MultiSelect.swift b/Sources/OversizeUI/Controls/Select/MultiSelect.swift
@@ -6,6 +6,7 @@
 import SwiftUI
 
 // swiftlint:disable all
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public struct MultiSelect<Element: Equatable, Content, Selection, Actions, ContentUnavailable>: View
     where
     Content: View,
@@ -143,6 +144,7 @@ public struct MultiSelect<Element: Equatable, Content, Selection, Actions, Conte
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension MultiSelect where ContentUnavailable == Never {
     init(
         _ label: String,
@@ -164,6 +166,7 @@ public extension MultiSelect where ContentUnavailable == Never {
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension MultiSelect where Actions == Never {
     init(
         _ label: String,
@@ -185,6 +188,7 @@ public extension MultiSelect where Actions == Never {
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension MultiSelect where ContentUnavailable == Never, Actions == Never {
     init(
         _ label: String,
@@ -206,6 +210,7 @@ public extension MultiSelect where ContentUnavailable == Never, Actions == Never
 }
 
 // swiftlint:disable all
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 struct MultiSelect_Preview: PreviewProvider {
     struct SelectPreview: View {
         var items = ["One", "Two", "Three", "Four"]

diff --git a/Sources/OversizeUI/Controls/Select/Select.swift b/Sources/OversizeUI/Controls/Select/Select.swift
@@ -6,6 +6,7 @@
 import SwiftUI
 
 // swiftlint:disable all
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public struct Select<Element: Equatable, Content, Selection, Actions, ContentUnavailable: View>: View
     where
     Content: View,
@@ -138,6 +139,7 @@ public struct Select<Element: Equatable, Content, Selection, Actions, ContentUna
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension Select where ContentUnavailable == Never {
     init(
         _ label: String,
@@ -159,6 +161,7 @@ public extension Select where ContentUnavailable == Never {
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension Select where Actions == Never {
     init(
         _ label: String,
@@ -180,6 +183,7 @@ public extension Select where Actions == Never {
     }
 }
 
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 public extension Select where ContentUnavailable == Never, Actions == Never {
     init(
         _ label: String,
@@ -201,6 +205,7 @@ public extension Select where ContentUnavailable == Never, Actions == Never {
 }
 
 // swiftlint:disable all
+@available(iOS 15.0, macOS 14, tvOS 15.0, watchOS 9.0, *)
 struct Select_Preview: PreviewProvider {
     struct SelectPreview: View {
         var items = ["One", "Two", "Three", "Four"]

diff --git a/Sources/OversizeUI/Controls/TextBox/TextBox.swift b/Sources/OversizeUI/Controls/TextBox/TextBox.swift
@@ -31,12 +31,14 @@ public struct TextBox: View {
 
     public var body: some View {
         VStack(alignment: textStackAlignment, spacing: textSpacing) {
-            titleText
+            Text(title)
+                .font(titleFont)
+                .onSurfaceHighEmphasisForegroundColor()
 
-            if let subtitle {
-                Text(subtitle)
-                    .body(.medium)
-                    .foregroundColor(.onSurfaceMediumEmphasis)
+            subtitle.map {
+                Text($0)
+                    .font(subtitleFont)
+                    .onSurfaceMediumEmphasisForegroundColor()
             }
         }
         .multilineTextAlignment(multilineTextAlignment)
@@ -68,21 +70,26 @@ public struct TextBox: View {
         }
     }
 
-    private var titleText: some View {
-        Group {
-            switch size {
-            case .small:
-                Text(title)
-                    .headline(.semibold)
-            case .medium:
-                Text(title)
-                    .title2(true)
-            case .large:
-                Text(title)
-                    .title(true)
-            }
+    private var titleFont: Font {
+        switch size {
+        case .small:
+            .headline.weight(.semibold)
+
+        case .medium:
+            .title2.weight(.bold)
+
+        case .large:
+            .title.weight(.semibold)
+        }
+    }
+
+    private var subtitleFont: Font {
+        switch size {
+        case .small:
+            .callout.weight(.regular)
+        default:
+            .body.weight(.medium)
         }
-        .onSurfaceHighEmphasisForegroundColor()
     }
 
     public func textBoxSize(_ size: TextBoxSize) -> TextBox {