Skip to content

New button style: light #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikhailChelbaev merged 2 commits into from
Dec 21, 2024
Merged

New button style: light #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b10de5e
add light button style
mikhailChelbaev Dec 20, 2024
bf0773e
Merge branch 'refactor/config' into button/light-style
mikhailChelbaev Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ButtonPreview.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 2 additions & 0 deletions Sources/ComponentsKit/Components/Button/Models/ButtonStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
30 changes: 12 additions & 18 deletions Sources/ComponentsKit/Components/Button/Models/ButtonVM.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading