Add Platform and minor bug fixes (#42)

* Add Platform and minor bug fixes
oversizedev · Sep 26, 2024 · 84cd160 · 84cd160
1 parent 8d673c9
commit 84cd160
Show file tree

Hide file tree

Showing 24 changed files with 337 additions and 231 deletions.
diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml
diff --git a/.github/workflows/ci-release.yml → .github/workflows/ci.yml b/.github/workflows/ci-release.yml → .github/workflows/ci.yml
@@ -1,10 +1,13 @@
-name: CI - Release
+name: CI
 on:
   pull_request:
     types:
       - closed
     branches:
       - main
+  push:
+    branches:
+      - '**'
   workflow_dispatch:
 
 jobs:
@@ -13,9 +16,14 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-swiftpm.yml@main
     strategy:
       matrix:
-        packages: [OversizeUI]
+        destination:
+          - platform=iOS Simulator,name=iPhone 16,OS=18.0
+          - platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=11.0
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=18.0
+          - platform=macOS,arch=arm64
     with:
-      package: ${{ matrix.packages }}
+      package: OversizeUI
+      destination: ${{ matrix.destination }}
     secrets: inherit
 
   build-iOS-example:
@@ -24,7 +32,9 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main
     strategy:
       matrix:
-        destination: ['platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2', 'platform=iOS Simulator,name=iPad Pro (12.9-inch) (6th generation),OS=17.2']
+        destination:
+          - platform=iOS Simulator,name=iPhone 16 Pro,OS=18.0
+          - platform=iOS Simulator,name=iPad (10th generation),OS=18.0
     with:
       path: Example/Example
       scheme: Example (iOS)
@@ -47,7 +57,9 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main
     strategy:
       matrix:
-        destination: ['platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=17.2', 'platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=16.4']
+        destination:
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=18.0
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.0
     with:
       path: Example/Example
       scheme: Example (tvOS)
@@ -60,22 +72,23 @@ jobs:
     uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main
     strategy:
       matrix:
-        destination: ['platform=watchOS Simulator,name=Apple Watch SE (44mm) (2nd generation),OS=10.5']
+        destination:
+          - platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=11.0
     with:
       path: Example/Example
       scheme: Example (watchOS)
       destination: ${{ matrix.destination }}
     secrets: inherit
-    
+
   bump:
     name: Bump version
-    needs: [build-swiftpm, build-iOS-example, build-macOS-example, build-tvOS-example, build-watchOS-example]
+    if: github.ref == 'refs/heads/main'
+    needs:
+      - build-swiftpm
+      - build-iOS-example
+      - build-macOS-example
+      - build-tvOS-example
+      - build-watchOS-example
+
     uses: oversizedev/GithubWorkflows/.github/workflows/bump.yml@main
     secrets: inherit
-
-  publish-docc:
-    name: Publish docc
-    needs: bump
-    uses: ./.github/workflows/publish-docc.yml
-    secrets: inherit
-
diff --git a/.github/workflows/publish-docc.yml b/.github/workflows/publish-docc.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # OversizeUI
 
-[![Build Example](https://github.com/oversizedev/OversizeUI/actions/workflows/build-example.yml/badge.svg)](https://github.com/oversizedev/OversizeUI/actions/workflows/build-example.yml) [![Deploy DocC](https://github.com/oversizedev/OversizeUI/actions/workflows/publish-docc.yml/badge.svg)](https://github.com/oversizedev/OversizeUI/actions/workflows/publish-docc.yml)
+[![Build Example](https://github.com/oversizedev/OversizeUI/actions/workflows/build-example.yml/badge.svg)](https://github.com/oversizedev/OversizeUI/actions/workflows/ci-release.yml)
 
 Yet another component library on SwiftUI
 

diff --git a/Sources/OversizeUI/Controls/ContentView/ContentView.swift b/Sources/OversizeUI/Controls/ContentView/ContentView.swift
@@ -88,7 +88,6 @@ extension ContentView {
             #if os(macOS)
             .controlSize(.large)
             #endif
-
         case .back:
 
             Button(action: { dismiss() }) {
@@ -247,7 +246,6 @@ extension ContentView {
             .buttonStyle(.tertiary)
             #endif
             .disabled(true)
-
         case .none:
             EmptyView()
         }

diff --git a/Sources/OversizeUI/Controls/Divider/Separator.swift b/Sources/OversizeUI/Controls/Divider/Separator.swift
@@ -24,24 +24,40 @@ public struct Separator: View {
 
         return Rectangle()
             .fill(Color.border)
-            .frame(width: isHorizontal ? nil : 0.5,
-                   height: isHorizontal ? 0.5 : nil)
+            .frame(
+                width: isHorizontal ? nil : lineWidth,
+                height: isHorizontal ? lineWidth : nil
+            )
+        #if !os(macOS)
             .padding(insets(isHorizontal))
+        #endif
     }
 
     private func insets(_ isHorizontal: Bool) -> EdgeInsets {
         if isHorizontal {
-            EdgeInsets(top: 0.5,
-                       leading: padding.rawValue,
-                       bottom: 0,
-                       trailing: padding.rawValue)
+            EdgeInsets(
+                top: 0.5,
+                leading: padding.rawValue,
+                bottom: 0,
+                trailing: padding.rawValue
+            )
         } else {
-            EdgeInsets(top: padding.rawValue,
-                       leading: 0.5,
-                       bottom: padding.rawValue,
-                       trailing: 0)
+            EdgeInsets(
+                top: padding.rawValue,
+                leading: 0.5,
+                bottom: padding.rawValue,
+                trailing: 0
+            )
         }
     }
+
+    var lineWidth: CGFloat {
+        #if os(macOS)
+        return 1
+        #else
+        return 0.5
+        #endif
+    }
 }
 
 struct Separator_Preview: PreviewProvider {

diff --git a/Sources/OversizeUI/Controls/PageControl/PageIndexView.swift b/Sources/OversizeUI/Controls/PageControl/PageIndexView.swift
@@ -6,11 +6,11 @@
 import SwiftUI
 
 public struct PageIndexView: View {
-    @Binding private var index: Int
+    private var index: Int
     private let maxIndex: Int
 
-    public init(_ index: Binding<Int>, maxIndex: Int) {
-        _index = index
+    public init(_ index: Int, maxIndex: Int) {
+        self.index = index
         self.maxIndex = maxIndex
     }
 

diff --git a/Sources/OversizeUI/Controls/PriceField/PriceField.swift b/Sources/OversizeUI/Controls/PriceField/PriceField.swift
@@ -22,17 +22,16 @@ public struct PriceField: View {
         return formatter
     }
 
-    private var strValue2: String { value.components(separatedBy: CharacterSet(charactersIn: "0123456789").inverted).joined() } // value.filter { !$0.isWhitespace } }
-    private var doubleValue2: Double { .init((Double(strValue2) ?? 0) / 100.0) ?? 0 }
+    private var stringValue2: String { value.components(separatedBy: CharacterSet(charactersIn: "0123456789").inverted).joined() }
+    private var doubleValue2: Double { .init((Double(stringValue2) ?? 0) / 100.0) ?? 0 }
 
-    private var strValue3: String { value.components(separatedBy: CharacterSet(charactersIn: "0123456789").inverted).joined() } // value.filter { !$0.isWhitespace } }
-    private var doubleValue3: Double { .init((Double(strValue3) ?? 0) * 100) ?? 0 }
+    private var stringValue3: String { value.components(separatedBy: CharacterSet(charactersIn: "0123456789").inverted).joined() }
+    private var doubleValue3: Double { .init((Double(stringValue3) ?? 0) * 100) ?? 0 }
 
     private var strValue: String { value.filter { !$0.isWhitespace } }
     private var doubleValue: Double { .init(strValue) ?? 0 }
     private var formattedValue: String {
         let value = doubleValue
-
         return formatter.string(for: value) ?? ""
     }
 
@@ -80,7 +79,6 @@ public struct PriceField: View {
                     .padding(.leading, .xSmall)
 
                 Text(dispalySymbol)
-
                     .onChange(of: currency) { _ in
                         validate()
                     }

diff --git a/Sources/OversizeUI/Controls/Row/Row.swift b/Sources/OversizeUI/Controls/Row/Row.swift
@@ -47,12 +47,13 @@ public struct Row<LeadingLabel, TrailingLabel>: View where LeadingLabel: View, T
         (subtitle?.isEmpty) != nil
     }
 
-    public init(_ title: String,
-                subtitle: String? = nil,
-                action: (() -> Void)? = nil,
-                @ViewBuilder leading: () -> LeadingLabel,
-                @ViewBuilder trailing: () -> TrailingLabel)
-    {
+    public init(
+        _ title: String,
+        subtitle: String? = nil,
+        action: (() -> Void)? = nil,
+        @ViewBuilder leading: () -> LeadingLabel,
+        @ViewBuilder trailing: () -> TrailingLabel
+    ) {
         self.title = title
         self.subtitle = subtitle
         self.action = action

diff --git a/Sources/OversizeUI/Controls/ScrollView/ScrollViewWithOffset.swift b/Sources/OversizeUI/Controls/ScrollView/ScrollViewWithOffset.swift
@@ -6,6 +6,14 @@
 import SwiftUI
 
 public struct ScrollViewWithOffsetTracking<Content: View>: View {
+    public typealias ScrollAction = (_ offset: CGPoint) -> Void
+
+    private let axes: Axis.Set
+    private let showsIndicators: Bool
+    private let cordinateSpaceName: String
+    private let onScroll: ScrollAction
+    private let content: () -> Content
+
     public init(
         _ axes: Axis.Set = .vertical,
         showsIndicators: Bool = true,
@@ -20,14 +28,6 @@ public struct ScrollViewWithOffsetTracking<Content: View>: View {
         self.content = content
     }
 
-    public typealias ScrollAction = (_ offset: CGPoint) -> Void
-
-    private let axes: Axis.Set
-    private let showsIndicators: Bool
-    private let cordinateSpaceName: String
-    private let onScroll: ScrollAction
-    private let content: () -> Content
-
     public var body: some View {
         ScrollView(axes, showsIndicators: showsIndicators) {
             ScrollViewOffsetTracker {