Various Changes

- Make `RadixSegmentedPicker` Respect `RadixAutoColor`
- Added Divider between `RadixSegmentedPicker` Options
- Mark `RadixAutoColor` as `Equatable`
- Fix Foreground Color for B&W Buttons

Author: amirsaam

Sources/RadixUI/DemoViews/PickerDemoView.swift

@@ -12,11 +12,9 @@ struct PickerDemoView: View {
 
     init() {
         RadixSegmentedPicker(
-            backgroundColor: RadixAutoColor.tomato.component1,
-            selectedColor: RadixAutoColor.tomato.solid2,
-            foregroundColor: RadixAutoColor.tomato.background2,
-            selectedFont: .systemFont(ofSize: 15),
-            unselectedFont: .systemFont(ofSize: 15)
+            color: .grass,
+            selectedFont: .systemFont(ofSize: 15, weight: .semibold),
+            notSelectedFont: .systemFont(ofSize: 15, weight: .light)
         )
     }
 

Sources/RadixUI/Helpers/Extensions/Toggle+Extensions.swift

@@ -0,0 +1,50 @@
+//
+//  Toggle+Extensions.swift
+//  RadixUI
+//
+//  Created by Amir Mohammadi on 11/20/1403 AP.
+//
+
+import SwiftUI
+
+extension ToggleStyle where Self == RadixToggleStyle {
+
+    public static func radixCheckbox(
+        bgColor: RadixAutoColor? = nil,
+        iconColor: RadixAutoColor? = nil,
+        boxSize: CGFloat? = nil
+    ) -> Self {
+        .init(
+            variant: .checkbox,
+            backgroundColor: bgColor,
+            foregroundColor: iconColor,
+            size: boxSize
+        )
+    }
+
+    public static func radixSwitch(
+        onColor: RadixAutoColor? = nil,
+        thumbColor: RadixAutoColor? = nil
+    ) -> Self {
+        .init(
+            variant: .switch,
+            backgroundColor: onColor,
+            foregroundColor: thumbColor,
+            size: nil
+        )
+    }
+
+    public static func radixToggle(
+        bgColor: RadixAutoColor? = nil,
+        iconColor: RadixAutoColor? = nil,
+        boxSize: CGFloat? = nil
+    ) -> Self {
+        .init(
+            variant: .toggle,
+            backgroundColor: bgColor,
+            foregroundColor: iconColor,
+            size: boxSize
+        )
+    }
+
+}

Sources/RadixUI/RadixColors/RadixAutoColor.swift

@@ -8,7 +8,7 @@
 import Foundation
 import SwiftUI
 
-public enum RadixAutoColor {
+public enum RadixAutoColor: Equatable {
 
     case amber
     case blackA

Sources/RadixUI/RadixPrimitives/Toggle/RadixToggleStyle.swift

@@ -99,45 +99,3 @@ public struct RadixToggleStyle: ToggleStyle {
         }
     }
 }
-
-extension ToggleStyle where Self == RadixToggleStyle {
-
-    public static func radixCheckbox(
-        bgColor: RadixAutoColor? = nil,
-        iconColor: RadixAutoColor? = nil,
-        boxSize: CGFloat? = nil
-    ) -> Self {
-        .init(
-            variant: .checkbox,
-            backgroundColor: bgColor,
-            foregroundColor: iconColor,
-            size: boxSize
-        )
-    }
-
-    public static func radixSwitch(
-        onColor: RadixAutoColor? = nil,
-        thumbColor: RadixAutoColor? = nil
-    ) -> Self {
-        .init(
-            variant: .switch,
-            backgroundColor: onColor,
-            foregroundColor: thumbColor,
-            size: nil
-        )
-    }
-
-    public static func radixToggle(
-        bgColor: RadixAutoColor? = nil,
-        iconColor: RadixAutoColor? = nil,
-        boxSize: CGFloat? = nil
-    ) -> Self {
-        .init(
-            variant: .toggle,
-            backgroundColor: bgColor,
-            foregroundColor: iconColor,
-            size: boxSize
-        )
-    }
-
-}

Sources/RadixUI/RadixThemes/Button/RadixButtonLabelStyle.swift

@@ -45,6 +45,15 @@ public struct RadixButtonLabelStyle: LabelStyle {
         return 0.6
     }
 
+    private var fgColor: Color {
+        guard color != .blackA else { return .whiteA11 }
+        guard color != .whiteA else { return .blackA11 }
+        guard variant != .solid else {
+            return colorScheme == .light ? color.background2 : color.text2
+        }
+        return color.text1
+    }
+
     public func makeBody(configuration: Configuration) -> some View {
         HStack(spacing: 8) {
             switch layout {
@@ -60,11 +69,7 @@ public struct RadixButtonLabelStyle: LabelStyle {
                     icon(configuration.icon)
             }
         }
-        .foregroundStyle(
-            variant == .solid
-            ? (colorScheme == .light ? color.background2 : color.text2)
-            : color.text1
-        )
+        .foregroundStyle(fgColor)
         .padding(.horizontal, 12)
         .padding(.vertical, 8)
         .background(shape())

Sources/RadixUI/RadixThemes/Picker/RadixSegmentedPicker.swift

@@ -9,44 +9,44 @@ import SwiftUI
 
 #if canImport(UIKit)
 public struct RadixSegmentedPicker {
-    let backgroundColor: Color
-    let selectedColor: Color
-    let foregroundColor: Color
+    let color: RadixAutoColor
     let selectedFont: UIFont
-    let unselectedFont: UIFont
+    let notSelectedFont: UIFont
 
     @discardableResult public init(
-        backgroundColor: Color,
-        selectedColor: Color,
-        foregroundColor: Color,
+        color: RadixAutoColor,
         selectedFont: UIFont,
-        unselectedFont: UIFont
+        notSelectedFont: UIFont
     ) {
-        self.backgroundColor = backgroundColor
-        self.selectedColor = selectedColor
-        self.foregroundColor = foregroundColor
+        self.color = color
         self.selectedFont = selectedFont
-        self.unselectedFont = unselectedFont
+        self.notSelectedFont = notSelectedFont
+
+        var fgColor: Color {
+            guard color != .blackA else { return .whiteA12 }
+            guard color != .whiteA else { return .blackA12 }
+            return color.background2
+        }
 
         let appeareance = UISegmentedControl.appearance()
 
-        appeareance.backgroundColor = UIColor(backgroundColor)
+        appeareance.backgroundColor = UIColor(color.component1)
         appeareance.setDividerImage(
-            UIImage(),
+            UIImage(named: "divider-vertical", in: .module, compatibleWith: nil),
             forLeftSegmentState: .normal,
             rightSegmentState: .normal,
-            barMetrics: .default
+            barMetrics: .compact
         )
-        appeareance.selectedSegmentTintColor = UIColor(selectedColor)
+        appeareance.selectedSegmentTintColor = UIColor(color.solid2)
         appeareance.setTitleTextAttributes(
             [
-                .foregroundColor: UIColor(foregroundColor),
+                .foregroundColor: UIColor(fgColor),
                 .font: selectedFont
             ],
             for: .selected
         )
         appeareance.setTitleTextAttributes(
-            [.font: unselectedFont],
+            [.font: notSelectedFont],
             for: .normal
         )