Skip to content

Commit ac2a7fa

Browse files
pylapppylapp
committed
refactor: move to components (#521)
Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent 32006bc commit ac2a7fa

22 files changed

+156
-121
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818

1919
### Changed
2020

21-
- [Library] Update the OUDSColoredSurface to fix color available ([#521](https://github.com/Orange-OpenSource/ouds-ios/issues/521))
21+
- [Library] Update the OUDSColoredSurface component to fix color available ([#521](https://github.com/Orange-OpenSource/ouds-ios/issues/521))
2222
- [Tool] Migration to Xcode 16.3 ([#580](https://github.com/Orange-OpenSource/ouds-ios/issues/580))
2323
- [Library] Update the OUDSColoredSurface to fix color available ([#521](https://github.com/Orange-OpenSource/ouds-ios/issues/521))
2424
- [Tool] Remove dead code and add `periphery` in CI/CD pipes

‎DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj

+27-27
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
07B3CCB12D40E34700DBB10A /* LinkConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCAE2D40E34700DBB10A /* LinkConfiguration.swift */; };
8383
07B3CCB22D40E34700DBB10A /* LinkElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCAF2D40E34700DBB10A /* LinkElement.swift */; };
8484
07B3CCB32D40E34700DBB10A /* LinkPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCB02D40E34700DBB10A /* LinkPage.swift */; };
85-
07B3CCB52D40F37000DBB10A /* DesignToolboxColoredBackgroundModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredBackgroundModifier.swift */; };
86-
07B3CCB62D40F37000DBB10A /* DesignToolboxColoredBackgroundModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredBackgroundModifier.swift */; };
85+
07B3CCB52D40F37000DBB10A /* DesignToolboxColoredSurfaceModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredSurfaceModifier.swift */; };
86+
07B3CCB62D40F37000DBB10A /* DesignToolboxColoredSurfaceModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredSurfaceModifier.swift */; };
8787
07C54EC12DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07C54EC02DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift */; };
8888
07C54EC22DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07C54EC02DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift */; };
8989
07CAE7682CEE20A600D6C5D1 /* SpaceTokenCommonIllustration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075C71322CEB743300B93FC3 /* SpaceTokenCommonIllustration.swift */; };
@@ -100,12 +100,12 @@
100100
07CF42842CA45DA9000BD03E /* BorderTokenElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CF42812CA45DA9000BD03E /* BorderTokenElement.swift */; };
101101
07CF42852CA45DA9000BD03E /* BorderTokenPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CF42822CA45DA9000BD03E /* BorderTokenPage.swift */; };
102102
07CF42892CA55BC8000BD03E /* ThemeSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CF42882CA55BC8000BD03E /* ThemeSelection.swift */; };
103-
07D3DBF12DA5084500D8A57F /* ColoredBackgroundConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBED2DA5084500D8A57F /* ColoredBackgroundConfiguration.swift */; };
104-
07D3DBF22DA5084500D8A57F /* ColoredBackgroundPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEF2DA5084500D8A57F /* ColoredBackgroundPage.swift */; };
105-
07D3DBF32DA5084500D8A57F /* ColoredBackgroundElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEE2DA5084500D8A57F /* ColoredBackgroundElement.swift */; };
106-
07D3DBF42DA5084500D8A57F /* ColoredBackgroundConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBED2DA5084500D8A57F /* ColoredBackgroundConfiguration.swift */; };
107-
07D3DBF52DA5084500D8A57F /* ColoredBackgroundPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEF2DA5084500D8A57F /* ColoredBackgroundPage.swift */; };
108-
07D3DBF62DA5084500D8A57F /* ColoredBackgroundElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEE2DA5084500D8A57F /* ColoredBackgroundElement.swift */; };
103+
07D3DBF12DA5084500D8A57F /* ColoredSurfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBED2DA5084500D8A57F /* ColoredSurfaceConfiguration.swift */; };
104+
07D3DBF22DA5084500D8A57F /* ColoredSurfacePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEF2DA5084500D8A57F /* ColoredSurfacePage.swift */; };
105+
07D3DBF32DA5084500D8A57F /* ColoredSurfaceElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEE2DA5084500D8A57F /* ColoredSurfaceElement.swift */; };
106+
07D3DBF42DA5084500D8A57F /* ColoredSurfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBED2DA5084500D8A57F /* ColoredSurfaceConfiguration.swift */; };
107+
07D3DBF52DA5084500D8A57F /* ColoredSurfacePage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEF2DA5084500D8A57F /* ColoredSurfacePage.swift */; };
108+
07D3DBF62DA5084500D8A57F /* ColoredSurfaceElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D3DBEE2DA5084500D8A57F /* ColoredSurfaceElement.swift */; };
109109
07D7E1972D035566006472EB /* ButtonConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D7E1962D035566006472EB /* ButtonConfiguration.swift */; };
110110
07D7E1982D035566006472EB /* ButtonConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D7E1962D035566006472EB /* ButtonConfiguration.swift */; };
111111
07F0AFD72CFDB3CC00D334DD /* ComponentPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F0AFD62CFDB3C300D334DD /* ComponentPage.swift */; };
@@ -325,7 +325,7 @@
325325
07B3CCAE2D40E34700DBB10A /* LinkConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkConfiguration.swift; sourceTree = "<group>"; };
326326
07B3CCAF2D40E34700DBB10A /* LinkElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkElement.swift; sourceTree = "<group>"; };
327327
07B3CCB02D40E34700DBB10A /* LinkPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkPage.swift; sourceTree = "<group>"; };
328-
07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredBackgroundModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignToolboxColoredBackgroundModifier.swift; sourceTree = "<group>"; };
328+
07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredSurfaceModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignToolboxColoredSurfaceModifier.swift; sourceTree = "<group>"; };
329329
07C54EC02DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignToolboxDisclosureGroup.swift; sourceTree = "<group>"; };
330330
07CEDD802C7DB921003E1885 /* generateDoc.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = generateDoc.sh; path = ../generateDoc.sh; sourceTree = "<group>"; };
331331
07CF426A2CA30728000BD03E /* TokensPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokensPage.swift; sourceTree = "<group>"; };
@@ -338,9 +338,9 @@
338338
07CF42812CA45DA9000BD03E /* BorderTokenElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BorderTokenElement.swift; sourceTree = "<group>"; };
339339
07CF42822CA45DA9000BD03E /* BorderTokenPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BorderTokenPage.swift; sourceTree = "<group>"; };
340340
07CF42882CA55BC8000BD03E /* ThemeSelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeSelection.swift; sourceTree = "<group>"; };
341-
07D3DBED2DA5084500D8A57F /* ColoredBackgroundConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredBackgroundConfiguration.swift; sourceTree = "<group>"; };
342-
07D3DBEE2DA5084500D8A57F /* ColoredBackgroundElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredBackgroundElement.swift; sourceTree = "<group>"; };
343-
07D3DBEF2DA5084500D8A57F /* ColoredBackgroundPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredBackgroundPage.swift; sourceTree = "<group>"; };
341+
07D3DBED2DA5084500D8A57F /* ColoredSurfaceConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredSurfaceConfiguration.swift; sourceTree = "<group>"; };
342+
07D3DBEE2DA5084500D8A57F /* ColoredSurfaceElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredSurfaceElement.swift; sourceTree = "<group>"; };
343+
07D3DBEF2DA5084500D8A57F /* ColoredSurfacePage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColoredSurfacePage.swift; sourceTree = "<group>"; };
344344
07D7E1962D035566006472EB /* ButtonConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonConfiguration.swift; sourceTree = "<group>"; };
345345
07F0AFD62CFDB3C300D334DD /* ComponentPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComponentPage.swift; sourceTree = "<group>"; };
346346
07F0AFDD2CFDD1FD00D334DD /* ComponentsPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComponentsPage.swift; sourceTree = "<group>"; };
@@ -506,7 +506,7 @@
506506
07AB45862D4D08080001D237 /* DesignToolboxChoicePicker.swift */,
507507
6DCC57E12CEB984D000F35F8 /* DesignToolboxCode.swift */,
508508
07F0AFE72CFE0FBD00D334DD /* DesignToolboxConfiguration.swift */,
509-
07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredBackgroundModifier.swift */,
509+
07B3CCB42D40F36C00DBB10A /* DesignToolboxColoredSurfaceModifier.swift */,
510510
07AB45892D50CB9B0001D237 /* DesignToolboxTextField.swift */,
511511
513442152D75B9E1000B5DE4 /* DesignToolboxBackgroundModifier.swift */,
512512
07C54EC02DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift */,
@@ -699,15 +699,15 @@
699699
path = ThemeSelection;
700700
sourceTree = "<group>";
701701
};
702-
07D3DBF02DA5084500D8A57F /* ColoredBackground */ = {
702+
07D3DBF02DA5084500D8A57F /* ColoredSurface */ = {
703703
isa = PBXGroup;
704704
children = (
705705
51B8D5A02DA7F5DF00A28BAC /* NamedColorMode.swift */,
706-
07D3DBED2DA5084500D8A57F /* ColoredBackgroundConfiguration.swift */,
707-
07D3DBEE2DA5084500D8A57F /* ColoredBackgroundElement.swift */,
708-
07D3DBEF2DA5084500D8A57F /* ColoredBackgroundPage.swift */,
706+
07D3DBED2DA5084500D8A57F /* ColoredSurfaceConfiguration.swift */,
707+
07D3DBEE2DA5084500D8A57F /* ColoredSurfaceElement.swift */,
708+
07D3DBEF2DA5084500D8A57F /* ColoredSurfacePage.swift */,
709709
);
710-
path = ColoredBackground;
710+
path = ColoredSurface;
711711
sourceTree = "<group>";
712712
};
713713
07F0AFE62CFE055300D334DD /* Utils */ = {
@@ -879,7 +879,7 @@
879879
children = (
880880
072141182D02F52A00B7B9C6 /* Button */,
881881
513442062D75B880000B5DE4 /* Checkbox */,
882-
07D3DBF02DA5084500D8A57F /* ColoredBackground */,
882+
07D3DBF02DA5084500D8A57F /* ColoredSurface */,
883883
07B3CCAD2D40E14C00DBB10A /* Link */,
884884
0745C1852D7A0351006B3A1F /* Radio */,
885885
07F0AFE62CFE055300D334DD /* Utils */,
@@ -1275,17 +1275,17 @@
12751275
6D17A22C2CCBF12B00C00512 /* NamedColor+Action.swift in Sources */,
12761276
6D17A22D2CCBF12B00C00512 /* NamedColor+Always.swift in Sources */,
12771277
07CAE7692CEE20B200D6C5D1 /* SpaceGapTokenIllustrations.swift in Sources */,
1278-
07D3DBF12DA5084500D8A57F /* ColoredBackgroundConfiguration.swift in Sources */,
1279-
07D3DBF22DA5084500D8A57F /* ColoredBackgroundPage.swift in Sources */,
1280-
07D3DBF32DA5084500D8A57F /* ColoredBackgroundElement.swift in Sources */,
1278+
07D3DBF12DA5084500D8A57F /* ColoredSurfaceConfiguration.swift in Sources */,
1279+
07D3DBF22DA5084500D8A57F /* ColoredSurfacePage.swift in Sources */,
1280+
07D3DBF32DA5084500D8A57F /* ColoredSurfaceElement.swift in Sources */,
12811281
51952A7F2D3FA17E0068B807 /* OUDSTokensColorUITests.swift in Sources */,
12821282
07CAE76A2CEE20B200D6C5D1 /* SpacePaddingTokenIllustrations.swift in Sources */,
12831283
07CAE76B2CEE20B200D6C5D1 /* SpaceBasicTokenIllustrations.swift in Sources */,
12841284
6D17A22E2CCBF12B00C00512 /* NamedColor+Background.swift in Sources */,
12851285
6D17A22F2CCBF12B00C00512 /* NamedColor+Border.swift in Sources */,
12861286
6D17A2302CCBF12B00C00512 /* NamedColor+Chart.swift in Sources */,
12871287
6D17A2312CCBF12B00C00512 /* NamedColor+Content.swift in Sources */,
1288-
07B3CCB52D40F37000DBB10A /* DesignToolboxColoredBackgroundModifier.swift in Sources */,
1288+
07B3CCB52D40F37000DBB10A /* DesignToolboxColoredSurfaceModifier.swift in Sources */,
12891289
6D17A2332CCBF12B00C00512 /* NamedColor+Decorative.swift in Sources */,
12901290
51952A862D3FA1DB0068B807 /* OUDSTokensSpaceUITests.swift in Sources */,
12911291
51952A832D3FA1AC0068B807 /* OUDSTokensSizeUITests.swift in Sources */,
@@ -1386,7 +1386,7 @@
13861386
075114DB2CB7D28D00B8B759 /* SizeTokenElement.swift in Sources */,
13871387
0765B4A02CC15BBC00E69359 /* NamedColor+Content.swift in Sources */,
13881388
0765B49A2CC15ACE00E69359 /* NamedColor+Border.swift in Sources */,
1389-
07B3CCB62D40F37000DBB10A /* DesignToolboxColoredBackgroundModifier.swift in Sources */,
1389+
07B3CCB62D40F37000DBB10A /* DesignToolboxColoredSurfaceModifier.swift in Sources */,
13901390
51952A742D3F9D850068B807 /* DesignToolboxTokenIllustrationBackground.swift in Sources */,
13911391
51087A7B2C46DF9F00160CCF /* Bundle+extension.swift in Sources */,
13921392
0765B4962CC159F600E69359 /* NamedColor+Action.swift in Sources */,
@@ -1410,9 +1410,9 @@
14101410
5134420F2D75B880000B5DE4 /* CheckboxPage.swift in Sources */,
14111411
513442102D75B880000B5DE4 /* CheckboxItemPage.swift in Sources */,
14121412
07C54EC12DA7ABC8005E47D7 /* DesignToolboxDisclosureGroup.swift in Sources */,
1413-
07D3DBF42DA5084500D8A57F /* ColoredBackgroundConfiguration.swift in Sources */,
1414-
07D3DBF52DA5084500D8A57F /* ColoredBackgroundPage.swift in Sources */,
1415-
07D3DBF62DA5084500D8A57F /* ColoredBackgroundElement.swift in Sources */,
1413+
07D3DBF42DA5084500D8A57F /* ColoredSurfaceConfiguration.swift in Sources */,
1414+
07D3DBF52DA5084500D8A57F /* ColoredSurfacePage.swift in Sources */,
1415+
07D3DBF62DA5084500D8A57F /* ColoredSurfaceElement.swift in Sources */,
14161416
513442112D75B880000B5DE4 /* CheckboxItemElement.swift in Sources */,
14171417
513442122D75B880000B5DE4 /* CheckboxConfiguration.swift in Sources */,
14181418
513442132D75B880000B5DE4 /* CheckboxElements.swift in Sources */,

‎DesignToolbox/DesignToolbox/Pages/Components/Button/ButtonConfiguration.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ struct ButtonConfiguration: View {
173173
.oudsForegroundStyle(theme.colors.colorContentDefault)
174174
.disabled(model.style != .`default`)
175175

176-
Toggle("app_components_common_onColoredBackground_label", isOn: $model.onColoredSurface)
176+
Toggle("app_components_common_onColoredSurface_label", isOn: $model.onColoredSurface)
177177
.typeHeadingMedium(theme)
178178
.oudsForegroundStyle(theme.colors.colorContentDefault)
179179

‎DesignToolbox/DesignToolbox/Pages/Components/Button/ButtonPage.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ private struct ButtonDemo: View {
103103
}
104104
.disabled(!model.enabled)
105105
.padding(.all, theme.spaces.spaceFixedMedium)
106-
.modifier(DesignToolboxColoredBackgroundModifier(coloredSurface: model.onColoredSurface))
106+
.modifier(DesignToolboxColoredSurfaceModifier(coloredSurface: model.onColoredSurface))
107107
}
108108
}

‎DesignToolbox/DesignToolbox/Pages/Components/ColoredBackground/ColoredBackgroundConfiguration.swift renamed to ‎DesignToolbox/DesignToolbox/Pages/Components/ColoredSurface/ColoredSurfaceConfiguration.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import OUDS
1515
import OUDSComponents
1616
import SwiftUI
1717

18-
// MARK: - Colored Background Configuration Model
18+
// MARK: - Colored Surface Configuration Model
1919

20-
/// The model shared between `ColoredBackgroundPageConfiguration` view and `ColoredBackgroundPageComponent` view.
21-
final class ColoredBackgroundConfigurationModel: ComponentConfiguration {
20+
/// The model shared between `ColoredSurfacePageConfiguration` view and `ColoredSurfacePageComponent` view.
21+
final class ColoredSurfaceConfigurationModel: ComponentConfiguration {
2222

2323
// MARK: Published properties
2424

@@ -51,16 +51,16 @@ final class ColoredBackgroundConfigurationModel: ComponentConfiguration {
5151
}
5252
}
5353

54-
// MARK: - Colored Background Configuration View
54+
// MARK: - Colored Surface Configuration View
5555

56-
struct ColoredBackgroundConfiguration: View {
56+
struct ColoredSurfaceConfiguration: View {
5757

58-
@StateObject var model: ColoredBackgroundConfigurationModel
58+
@StateObject var model: ColoredSurfaceConfigurationModel
5959
@State private var isExpanded: Bool = false
6060
@Environment(\.theme) private var theme
6161

6262
var body: some View {
63-
DesignToolboxDisclosureGroup(isExpanded: $isExpanded, accessibilityLabel: "app_components_coloredBackground_color_label_a11y") {
63+
DesignToolboxDisclosureGroup(isExpanded: $isExpanded, accessibilityLabel: "app_components_coloredSurface_color_label_a11y") {
6464
VStack(alignment: .leading) {
6565
ForEach(NamedColorMode.allCases, id: \.id) { color in
6666
Button {
@@ -72,7 +72,7 @@ struct ColoredBackgroundConfiguration: View {
7272
}
7373
} label: {
7474
VStack(alignment: .leading) {
75-
Text("app_components_coloredBackground_color_label")
75+
Text("app_components_coloredSurface_color_label")
7676
.typeHeadingMedium(theme)
7777
.oudsForegroundColor(theme.colors.colorContentDefault)
7878

‎DesignToolbox/DesignToolbox/Pages/Components/ColoredBackground/ColoredBackgroundElement.swift renamed to ‎DesignToolbox/DesignToolbox/Pages/Components/ColoredSurface/ColoredSurfaceElement.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313

1414
import SwiftUI
1515

16-
struct ColoredBackgroundElement: DesignToolboxElement {
16+
struct ColoredSurfaceElement: DesignToolboxElement {
1717
let name: String
1818
let image: Image
1919
let pageDescription: AnyView
2020

2121
init() {
22-
name = "app_components_coloredBackground_label"
22+
name = "app_components_coloredSurface_label"
2323
image = Image(decorative: "il_components_colored_background").renderingMode(.original)
2424
pageDescription = AnyView(DesignToolboxElementPage(
2525
name: name,
2626
image: nil,
27-
description: "app_components_coloredBackground_description_text",
28-
illustration: AnyView(ColoredBackgroundPage())
27+
description: "app_components_coloredSurface_description_text",
28+
illustration: AnyView(ColoredSurfacePage())
2929
)
3030
)
3131
}

‎DesignToolbox/DesignToolbox/Pages/Components/ColoredBackground/ColoredBackgroundPage.swift renamed to ‎DesignToolbox/DesignToolbox/Pages/Components/ColoredSurface/ColoredSurfacePage.swift

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import OUDS
1515
import OUDSComponents
1616
import SwiftUI
1717

18-
// MARK: Colored Background page
18+
// MARK: Colored Surface Page
1919

20-
struct ColoredBackgroundPage: View {
20+
struct ColoredSurfacePage: View {
2121

22-
private let configuration = ColoredBackgroundConfigurationModel()
22+
private let configuration = ColoredSurfaceConfigurationModel()
2323

2424
var body: some View {
2525
ComponentConfigurationView(
@@ -31,15 +31,15 @@ struct ColoredBackgroundPage: View {
3131

3232
@ViewBuilder
3333
private func componentView(with configuration: ComponentConfiguration) -> some View {
34-
if let model = configuration as? ColoredBackgroundConfigurationModel {
34+
if let model = configuration as? ColoredSurfaceConfigurationModel {
3535
ColoredSurfaceIllustration(model: model)
3636
}
3737
}
3838

3939
@ViewBuilder
4040
private func configurationView(with configuration: ComponentConfiguration) -> some View {
41-
if let model = configuration as? ColoredBackgroundConfigurationModel {
42-
ColoredBackgroundConfiguration(model: model)
41+
if let model = configuration as? ColoredSurfaceConfigurationModel {
42+
ColoredSurfaceConfiguration(model: model)
4343
}
4444
}
4545
}
@@ -48,7 +48,7 @@ struct ColoredBackgroundPage: View {
4848

4949
struct ColoredSurfaceIllustration: View {
5050

51-
@ObservedObject var model: ColoredBackgroundConfigurationModel
51+
@ObservedObject var model: ColoredSurfaceConfigurationModel
5252
@Environment(\.colorScheme) private var colorScheme
5353

5454
var body: some View {
@@ -65,7 +65,7 @@ struct ColoredSurfaceIllustration: View {
6565

6666
private struct ColoredSurfaceDemo: View {
6767

68-
@ObservedObject var model: ColoredBackgroundConfigurationModel
68+
@ObservedObject var model: ColoredSurfaceConfigurationModel
6969
@Environment(\.theme) private var theme
7070

7171
var body: some View {
@@ -88,6 +88,6 @@ private struct ColoredSurfaceDemo: View {
8888
}
8989
}
9090
.padding(.all, theme.spaces.spaceFixedMedium)
91-
.modifier(DesignToolboxColoredBackgroundModifier(coloredSurface: false))
91+
.modifier(DesignToolboxColoredSurfaceModifier(coloredSurface: false))
9292
}
9393
}

0 commit comments

Comments
 (0)