pr fix

- BadgeFontPicker deleted
- code style fix
- paddings fix
- deleted optional for font and backgroundColor

Author: VislovIvan

Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/PreviewPickers.swift

@@ -123,26 +123,6 @@ struct ContainerRadiusPicker<Custom: View>: View {
 
 // MARK: - FontPickers
 
-struct BadgeFontPicker: View {
-  let title: String
-  @Binding var selection: UniversalFont?
-  
-  init(title: String = "Font", selection: Binding<UniversalFont?>) {
-    self.title = title
-    self._selection = selection
-  }
-  
-  var body: some View {
-    Picker(self.title, selection: self.$selection) {
-      Text("Default").tag(Optional<UniversalFont>.none)
-      Text("Small").tag(UniversalFont.smButton)
-      Text("Medium").tag(UniversalFont.mdButton)
-      Text("Large").tag(UniversalFont.lgButton)
-      Text("Custom: system bold of size 16").tag(UniversalFont.system(size: 16, weight: .bold))
-    }
-  }
-}
-
 struct BodyFontPicker: View {
   let title: String
   @Binding var selection: UniversalFont?

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/BadgePreview.swift

@@ -13,7 +13,13 @@ struct BadgePreview: View {
         SUBadge(model: self.model)
       }
       Form {
-        BadgeFontPicker(selection: self.$model.font)
+        Picker("Font", selection: self.$model.font) {
+          Text("Default").tag(Optional<UniversalFont>.none)
+          Text("Small").tag(UniversalFont.smButton)
+          Text("Medium").tag(UniversalFont.mdButton)
+          Text("Large").tag(UniversalFont.lgButton)
+          Text("Custom: system bold of size 16").tag(UniversalFont.system(size: 16, weight: .bold))
+        }
         ComponentOptionalColorPicker(selection: self.$model.color)
         ComponentRadiusPicker(selection: self.$model.cornerRadius) {
           Text("Custom: 20px").tag(ComponentRadius.custom(20))

Sources/ComponentsKit/Components/Badge/Models/BadgeVM.swift

@@ -10,29 +10,21 @@ public struct BadgeVM: ComponentVM {
 
   /// The visual style of the badge.
   ///
-  /// Can be either `.filled` or `.light`.
   /// Defaults to `.filled`.
   public var style: Style = .filled
 
   /// The font used for the badge's text.
   ///
   /// Defaults to `.smButton`.
-  public var font: UniversalFont? = .smButton
+  public var font: UniversalFont = .smButton
 
   /// The corner radius of the badge.
   ///
   /// Defaults to `.medium`.
   public var cornerRadius: ComponentRadius = .medium
 
-  /// Vertical padding for the badge.
-  ///
-  /// Defaults to `8`.
-  public var verticalPadding: CGFloat = 8
-
-  /// Horizontal padding for the badge.
-  ///
-  /// Defaults to `10`.
-  public var horizontalPadding: CGFloat = 10
+  /// Paddings for the badge.
+  public var paddings: Paddings = .init(horizontal: 10, vertical: 8)
 
   /// Initializes a new instance of `BadgeVM` with default values.
   public init() {}
@@ -42,32 +34,22 @@ public struct BadgeVM: ComponentVM {
 
 extension BadgeVM {
   /// Returns the background color of the badge based on its style.
-  var backgroundColor: UniversalColor? {
+  var backgroundColor: UniversalColor {
     switch self.style {
     case .filled:
-      let color = self.color?.main ?? .content2
-      return color.enabled(true) // Badges are always "enabled"
+      return self.color?.main ?? .content2
     case .light:
-      let color = self.color?.background ?? .content1
-      return color.enabled(true)
+      return self.color?.background ?? .content1
     }
   }
 
   /// Returns the foreground color of the badge based on its style.
   var foregroundColor: UniversalColor {
     switch self.style {
     case .filled:
-      return (self.color?.contrast ?? .foreground).enabled(true)
+      return self.color?.contrast ?? .foreground
     case .light:
-      return (self.color?.main ?? .foreground).enabled(true)
-    }
-  }
-
-  /// Returns the preferred font for the badge text.
-  var preferredFont: UniversalFont {
-    if let font {
-      return font
+      return self.color?.main ?? .foreground
     }
-    return .smButton
   }
 }

Sources/ComponentsKit/Components/Badge/SUBadge.swift

@@ -19,11 +19,10 @@ public struct SUBadge: View {
 
   public var body: some View {
     Text(self.model.title)
-      .font(self.model.preferredFont.font)
-      .padding(.vertical, self.model.verticalPadding)
-      .padding(.horizontal, self.model.horizontalPadding)
+      .font(self.model.font.font)
+      .padding(self.model.paddings.edgeInsets)
       .foregroundStyle(self.model.foregroundColor.color)
-      .background(self.model.backgroundColor?.color ?? .clear)
+      .background(self.model.backgroundColor.color)
       .clipShape(
         RoundedRectangle(cornerRadius: self.model.cornerRadius.value())
       )