Merge branch 'dev' into modal-swiftui

Author: mikhailChelbaev

Examples/DemosApp/DemosApp/ComponentsPreview/Helpers/PreviewWrapper.swift

@@ -5,8 +5,6 @@ struct PreviewWrapper<Content: View>: View {
   let title: String
   @ViewBuilder let content: () -> Content
 
-  @Environment(\.colorScheme) private var colorScheme
-
   var body: some View {
     ZStack(alignment: Alignment(horizontal: .leading, vertical: .top)) {
       self.content()
@@ -21,8 +19,8 @@ struct PreviewWrapper<Content: View>: View {
             LinearGradient(
               gradient: Gradient(
                 colors: [
-                  UniversalColor.blue.color(for: self.colorScheme),
-                  UniversalColor.purple.color(for: self.colorScheme),
+                  UniversalColor.blue.color,
+                  UniversalColor.purple.color,
                 ]
               ),
               startPoint: .topLeading,

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ButtonPreview.swift

@@ -29,6 +29,7 @@ struct ButtonPreview: View {
         Picker("Style", selection: self.$model.style) {
           Text("Filled").tag(ButtonVM.Style.filled)
           Text("Plain").tag(ButtonVM.Style.plain)
+          Text("Light").tag(ButtonVM.Style.light)
           Text("Bordered with small border").tag(ButtonVM.Style.bordered(.small))
           Text("Bordered with medium border").tag(ButtonVM.Style.bordered(.medium))
           Text("Bordered with large border").tag(ButtonVM.Style.bordered(.large))

Examples/DemosApp/DemosApp/Demos/Login/SwiftUILogin.swift

@@ -34,11 +34,9 @@ struct SwiftUILogin: View {
     )
   }
 
-  @Environment(\.colorScheme) var colorScheme
-
   var body: some View {
     ZStack {
-      UniversalColor.background.color(for: self.colorScheme)
+      UniversalColor.background.color
 
       ScrollView {
         VStack(spacing: 20) {

Sources/ComponentsKit/Components/Button/Models/ButtonStyle.swift

@@ -7,6 +7,8 @@ extension ButtonVM {
     case filled
     /// A button with a transparent background.
     case plain
+    /// A button with a partially transparent background.
+    case light
     /// A button with a transparent background and a border.
     case bordered(BorderWidth)
   }

Sources/ComponentsKit/Components/Button/Models/ButtonVM.swift

@@ -50,44 +50,38 @@ public struct ButtonVM: ComponentVM {
 // MARK: Shared Helpers
 
 extension ButtonVM {
-  private var mainColor: UniversalColor {
-    let color = self.color?.main ?? .content2
-    return color.enabled(self.isEnabled)
-  }
-  private var contrastColor: UniversalColor {
-    let color = self.color?.contrast ?? .foreground
-    return color.enabled(self.isEnabled)
-  }
   var backgroundColor: UniversalColor? {
     switch self.style {
     case .filled:
-      return self.mainColor
+      let color = self.color?.main ?? .content2
+      return color.enabled(self.isEnabled)
+    case .light:
+      let color = self.color?.background ?? .content1
+      return color.enabled(self.isEnabled)
     case .plain, .bordered:
       return nil
     }
   }
   var foregroundColor: UniversalColor {
-    switch self.style {
+    let color = switch self.style {
     case .filled:
-      return self.contrastColor
-    case .plain:
-      return self.mainColor
-    case .bordered:
-      let color = self.color?.main ?? .foreground
-      return color.enabled(self.isEnabled)
+      self.color?.contrast ?? .foreground
+    case .plain, .light, .bordered:
+      self.color?.main ?? .foreground
     }
+    return color.enabled(self.isEnabled)
   }
   var borderWidth: CGFloat {
     switch self.style {
-    case .filled, .plain:
+    case .filled, .plain, .light:
       return 0.0
     case .bordered(let borderWidth):
       return borderWidth.value
     }
   }
   var borderColor: UniversalColor? {
     switch self.style {
-    case .filled, .plain:
+    case .filled, .plain, .light:
       return nil
     case .bordered:
       if let color {

Sources/ComponentsKit/Components/Button/SUButton.swift

@@ -62,9 +62,9 @@ private struct CustomButtonStyle: SwiftUI.ButtonStyle {
       .padding(.trailing, self.model.horizontalPadding)
       .frame(maxWidth: self.model.width)
       .frame(height: self.model.height)
-      .foregroundStyle(self.model.foregroundColor.color(for: self.colorScheme))
+      .foregroundStyle(self.model.foregroundColor.color)
       .background(
-        self.model.backgroundColor?.color(for: self.colorScheme) ?? Color.clear
+        self.model.backgroundColor?.color ?? Color.clear
       )
       .clipShape(
         RoundedRectangle(
@@ -76,7 +76,7 @@ private struct CustomButtonStyle: SwiftUI.ButtonStyle {
           cornerRadius: self.model.cornerRadius.value()
         )
         .stroke(
-          self.model.borderColor?.color(for: self.colorScheme) ?? .clear,
+          self.model.borderColor?.color ?? .clear,
           lineWidth: self.model.borderWidth
         )
       }

Sources/ComponentsKit/Components/Checkbox/SUCheckbox.swift

@@ -12,7 +12,6 @@ public struct SUCheckbox: View {
 
   @State private var checkmarkStroke: CGFloat
   @State private var borderOpacity: CGFloat
-  @Environment(\.colorScheme) private var colorScheme
 
   // MARK: Initialization
 
@@ -35,7 +34,7 @@ public struct SUCheckbox: View {
   public var body: some View {
     HStack(spacing: self.model.spacing) {
       ZStack {
-        self.model.backgroundColor.color(for: self.colorScheme)
+        self.model.backgroundColor.color
           .clipShape(
             RoundedRectangle(cornerRadius: self.model.checkboxCornerRadius)
           )
@@ -66,12 +65,12 @@ public struct SUCheckbox: View {
           lineCap: .round,
           lineJoin: .round
         ))
-        .foregroundStyle(self.model.foregroundColor.color(for: self.colorScheme))
+        .foregroundStyle(self.model.foregroundColor.color)
       }
       .overlay {
         RoundedRectangle(cornerRadius: self.model.checkboxCornerRadius)
           .stroke(
-            self.model.borderColor.color(for: self.colorScheme),
+            self.model.borderColor.color,
             lineWidth: self.model.borderWidth
           )
           .opacity(self.borderOpacity)
@@ -84,7 +83,7 @@ public struct SUCheckbox: View {
 
       if let title = self.model.title {
         Text(title)
-          .foregroundStyle(self.model.titleColor.color(for: self.colorScheme))
+          .foregroundStyle(self.model.titleColor.color)
           .font(self.model.titleFont.font)
       }
     }

Sources/ComponentsKit/Components/Countdown/SUCountdown.swift

@@ -12,8 +12,6 @@ public struct SUCountdown: View {
   /// The countdown manager handling the countdown logic.
   @StateObject private var manager = CountdownManager()
 
-  @Environment(\.colorScheme) private var colorScheme
-
   // MARK: - Initializer
 
   /// Initializer.
@@ -86,7 +84,7 @@ public struct SUCountdown: View {
   private var colonView: some View {
     Text(":")
       .font(self.model.preferredMainFont.font)
-      .foregroundColor(self.model.colonColor.color(for: self.colorScheme))
+      .foregroundColor(self.model.colonColor.color)
   }
 
   private func lightStyledTime(
@@ -97,7 +95,7 @@ public struct SUCountdown: View {
       .frame(minHeight: self.model.lightBackgroundMinHight)
       .frame(minWidth: self.model.lightBackgroundMinWidth)
       .background(RoundedRectangle(cornerRadius: 8)
-        .fill(self.model.backgroundColor.color(for: self.colorScheme))
+        .fill(self.model.backgroundColor.color)
       )
   }
 }

Sources/ComponentsKit/Components/Divider/SUDivider.swift

@@ -7,8 +7,6 @@ public struct SUDivider: View {
   /// A model that defines the appearance properties.
   public var model: DividerVM
 
-  @Environment(\.colorScheme) private var colorScheme
-
   // MARK: - Initialization
 
   /// Initializer.
@@ -22,7 +20,7 @@ public struct SUDivider: View {
 
   public var body: some View {
     Rectangle()
-      .fill(self.model.lineColor.color(for: self.colorScheme))
+      .fill(self.model.lineColor.color)
       .frame(
         maxWidth: self.model.orientation == .vertical ? self.model.lineSize : nil,
         maxHeight: self.model.orientation == .horizontal ? self.model.lineSize : nil

Sources/ComponentsKit/Components/InputField/SUInputField.swift

@@ -26,8 +26,6 @@ public struct SUInputField<FocusValue: Hashable>: View {
   /// text inputs and input fields within the same view can be independently focused based on the shared `globalFocus`.
   public var localFocus: FocusValue
 
-  @Environment(\.colorScheme) private var colorScheme
-
   // MARK: Initialization
 
   /// Initializer.
@@ -61,18 +59,18 @@ public struct SUInputField<FocusValue: Hashable>: View {
         if self.model.isSecureInput {
           SecureField(text: self.$text, label: {
             Text(self.model.placeholder ?? "")
-              .foregroundStyle(self.model.placeholderColor.color(for: self.colorScheme))
+              .foregroundStyle(self.model.placeholderColor.color)
           })
         } else {
           TextField(text: self.$text, label: {
             Text(self.model.placeholder ?? "")
-              .foregroundStyle(self.model.placeholderColor.color(for: self.colorScheme))
+              .foregroundStyle(self.model.placeholderColor.color)
           })
         }
       }
-      .tint(self.model.tintColor.color(for: self.colorScheme))
+      .tint(self.model.tintColor.color)
       .font(self.model.preferredFont.font)
-      .foregroundStyle(self.model.foregroundColor.color(for: self.colorScheme))
+      .foregroundStyle(self.model.foregroundColor.color)
       .focused(self.$globalFocus, equals: self.localFocus)
       .disabled(!self.model.isEnabled)
       .keyboardType(self.model.keyboardType)
@@ -82,7 +80,7 @@ public struct SUInputField<FocusValue: Hashable>: View {
     }
     .padding(.horizontal, self.model.horizontalPadding)
     .frame(height: self.model.height)
-    .background(self.model.backgroundColor.color(for: self.colorScheme))
+    .background(self.model.backgroundColor.color)
     .onTapGesture {
       self.globalFocus = self.localFocus
     }