Merge pull request #27 from kamaal111/release/3.3.0

Redesinging steppers for macOS
kamaal111 · Mar 23, 2021 · 36e4b6f · 36e4b6f
2 parents 864c236 + 0151442
commit 36e4b6f
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/Sources/SalmonUI/Views/KStepper.swift b/Sources/SalmonUI/Views/KStepper.swift
@@ -33,7 +33,7 @@ public struct KStepper: View {
         self.onDecrement = onDecrement
     }
 
-    #if !os(macOS) && !targetEnvironment(macCatalyst)
+    #if os(iOS)
     public var body: some View {
         HStack {
             Image(systemName: "minus.rectangle.fill")
@@ -65,7 +65,24 @@ public struct KStepper: View {
         }
         .foregroundColor(.accentColor)
     }
-    #else
+    #elseif targetEnvironment(macCatalyst)
+    public var body: some View {
+        HStack {
+            Button(action: onDecrement) {
+                Image(systemName: "minus.rectangle.fill")
+                    .size(size)
+                    .foregroundColor(.accentColor)
+            }
+            .disabled(disableDecrement)
+            Button(action: onIncrement) {
+                Image(systemName: "plus.rectangle.fill")
+                    .size(size)
+                    .foregroundColor(.accentColor)
+            }
+            .disabled(disableIncrement)
+        }
+    }
+    #elseif os(macOS)
     public var body: some View {
         HStack {
             Button(action: onDecrement) {
@@ -74,12 +91,14 @@ public struct KStepper: View {
                     .foregroundColor(.accentColor)
             }
             .disabled(disableDecrement)
+            .buttonStyle(PlainButtonStyle())
             Button(action: onIncrement) {
                 Image(systemName: "plus.rectangle.fill")
                     .size(size)
                     .foregroundColor(.accentColor)
             }
             .disabled(disableIncrement)
+            .buttonStyle(PlainButtonStyle())
         }
     }
     #endif