Skip to content

Commit aa0b2ce

Browse files
committed
chore: fixed demo app
1 parent 5ffd8de commit aa0b2ce

File tree

4 files changed

+8
-24
lines changed

4 files changed

+8
-24
lines changed

SDDSDemoApp/SDDSDemoApp/Views/ButtonView/ButtonViewModel.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ final class ButtonViewModel: ObservableObject {
5757
if value {
5858
self.appearance = self.appearance.shapeStyle(.pilled)
5959
} else {
60-
self.appearance = self.appearance.shapeStyle(.default)
60+
self.appearance = self.appearance.shapeStyle(.cornered)
6161
}
6262
}
6363
.store(in: &cancellables)

SDDSDemoApp/SDDSDemoApp/Views/ChipGroupView/ChipGroupViewModel.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import SDDSServTheme
66

77
final class ChipGroupViewModel: ObservableObject {
88
@Published var chipTitle: String = ""
9-
@Published var chipSize: SDDSChipSize = .medium(.pilled)
9+
@Published var chipSize: SDDSChipSize = .medium
1010
@Published var chipGroupSize: DefaultChipGroupSize = .init(alignment: .left)
1111
@Published var chips: [ChipData] = []
1212
@Published var appearance: ChipAppearance = SDDSChip.default.appearance {

SDDSDemoApp/SDDSDemoApp/Views/ChipView/ChipView.swift

+3-6
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ struct ChipView: View {
5454
}
5555
}
5656

57-
Picker("Border Style", selection: $viewModel.borderStyle) {
58-
Text("Default").tag(ChipBorderStyle.default(viewModel.size.shapeToken.cornerRadius))
59-
Text("Pilled").tag(ChipBorderStyle.pilled)
57+
Picker("Border Style", selection: $viewModel.shapeStyle) {
58+
Text("Default").tag(ComponentShapeStyle.cornered)
59+
Text("Pilled").tag(ComponentShapeStyle.pilled)
6060
}
6161

6262
HStack {
@@ -91,9 +91,6 @@ struct ChipView: View {
9191
viewModel.buttonImage = nil
9292
}
9393
}
94-
.onChange(of: viewModel.borderStyle) { borderStyle in
95-
viewModel.updateBorderStyle(borderStyle: borderStyle)
96-
}
9794
}
9895
}
9996

SDDSDemoApp/SDDSDemoApp/Views/ChipView/ChipViewModel.swift

+3-16
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ final class ChipViewModel: ObservableObject {
99
@Published var isEnabled: Bool = true
1010
@Published var iconImageEnabled: Bool = true
1111
@Published var buttomImageEnabled: Bool = true
12-
@Published var size: SDDSChipSize = .medium(.default(8))
13-
@Published var borderStyle: ChipBorderStyle = .default(8)
12+
@Published var size: SDDSChipSize = .medium
13+
@Published var shapeStyle: ComponentShapeStyle = .cornered
1414
@Published var appearance: ChipAppearance = SDDSChip.accent.appearance
1515
@Published var variationName: String = SDDSChip.accent.name
1616
@Published var iconImage: Image? = nil
@@ -47,26 +47,13 @@ final class ChipViewModel: ObservableObject {
4747
func setButtonImage() {
4848
buttonImage = Image.image("chipClose")
4949
}
50-
51-
func updateBorderStyle(borderStyle: ChipBorderStyle) {
52-
switch size {
53-
case .small:
54-
size = .small(borderStyle)
55-
case .medium:
56-
size = .medium(borderStyle)
57-
case .large:
58-
size = .large(borderStyle)
59-
case .extraSmall:
60-
size = .extraSmall(borderStyle)
61-
}
62-
}
6350
}
6451

6552
// MARK: - SDDSChipSize Extensions
6653

6754
extension SDDSChipSize: Hashable, CaseIterable {
6855
public static var allCases: [SDDSChipSize] {
69-
[.large(.default(8)), .medium(.default(8)), .small(.default(8)), .extraSmall(.default(8))]
56+
[.large, .medium, .small, .extraSmall]
7057
}
7158

7259
public var debugDescription: String {

0 commit comments

Comments
 (0)