Skip to content

Commit ad3ed96

Browse files
boosted-botpylapp
andcommitted
refactor: integration of tokens library (Core OUDS v1.7 / Core Brands v1.2 / System v2.0.1) (#1031) (#1039)
Embeds the tokens libraries: - Core OUDS v1.7.0 - Core brands v1.2.0 - System brands v2.0.1 Closes #1031 Acked-by: Ludovic Pinel <[email protected]> Co-authored-by: boosted-bot <[email protected]> Co-authored-by: Pierre-Yves Lapersonne <[email protected]> Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent fc3c082 commit ad3ed96

File tree

190 files changed

+1862
-2125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+1862
-2125
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717

1818
### Changed
1919

20+
- `Wireframe color raw` tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
21+
- `Sosh color raw` tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
22+
- `Font` semantic tokens for `Sosh` theme (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
23+
- `Elevation` semantic tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
24+
- `Color semantic` tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
25+
- `Color raw` tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
26+
- Orange brand color raw tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
27+
- `Control item` component tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
28+
- `Chip` component tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
29+
- `Button mono` component tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
2030
- Apply `Shantell Sans` font family for `Wireframe` theme instead of `Chalkboard SE` (Orange-OpenSource/ouds-ios#990)
2131
- Icon for components catalog documentation (Orange-OpenSource/ouds-ios#1019)
2232
- `Color` raw tokens (tokens library v1.6.0) (Orange-OpenSource/ouds-ios#991)
@@ -36,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3646
### Removed
3747

3848
- `Orange Inverse` theme (Orange-OpenSource/ouds-ios#1038)
49+
- All color decorative tokens (tokens library v1.7.0) (Orange-OpenSource/ouds-ios#1031)
3950

4051
## [0.19.0](https://github.com/Orange-OpenSource/ouds-ios/compare/0.18.0...0.19.0) - 2025-09-24
4152

OUDS/Core/Components/Sources/Actions/Button/Internal/ButtonStyle+BorderModifier.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ struct ButtonBorderModifier: ViewModifier {
104104
private var strongColor: MultipleColorSemanticTokens {
105105
switch state {
106106
case .enabled:
107-
theme.button.buttonMonoColorBorderStrongEnabled
107+
theme.button.buttonMonoColorBorderDefaultEnabled
108108
case .hover:
109-
theme.button.buttonMonoColorBorderStrongHover
109+
theme.button.buttonMonoColorBorderDefaultHover
110110
case .pressed:
111-
theme.button.buttonMonoColorBorderStrongPressed
111+
theme.button.buttonMonoColorBorderDefaultPressed
112112
case .loading:
113-
theme.button.buttonMonoColorBorderStrongLoading
113+
theme.button.buttonMonoColorBorderDefaultLoading
114114
case .disabled:
115-
theme.button.buttonMonoColorBorderStrongDisabled
115+
theme.button.buttonMonoColorBorderDefaultDisabled
116116
}
117117
}
118118
}

OUDS/Core/Components/Sources/Indicators/Badge/OUDSBadge.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public struct OUDSBadge: View {
251251
private var backgroundColor: MultipleColorSemanticTokens {
252252
switch status {
253253
case .neutral:
254-
theme.colors.colorSurfaceStatusNeutralEmphasized
254+
theme.colors.colorSurfaceInverseHigh
255255
case .accent:
256256
theme.colors.colorSurfaceStatusAccentEmphasized
257257
case .positive:
@@ -270,7 +270,7 @@ public struct OUDSBadge: View {
270270
private var contentColor: MultipleColorSemanticTokens {
271271
switch status {
272272
case .neutral:
273-
theme.colors.colorContentOnStatusNeutralEmphasized
273+
theme.colors.colorContentInverse
274274
case .accent:
275275
theme.colors.colorContentOnStatusAccentEmphasized
276276
case .positive:

OUDS/Core/Components/Sources/Indicators/Tag/Internal/TagLabelStyle+BackgroundModifier.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct TagBackgroundModifier: ViewModifier {
4343
private var emphasizedBackground: MultipleColorSemanticTokens {
4444
switch status {
4545
case .neutral:
46-
theme.colors.colorSurfaceStatusNeutralEmphasized
46+
theme.colors.colorSurfaceInverseHigh
4747
case .accent:
4848
theme.colors.colorSurfaceStatusAccentEmphasized
4949
case .positive:
@@ -62,7 +62,7 @@ struct TagBackgroundModifier: ViewModifier {
6262
private var mutedBackground: MultipleColorSemanticTokens {
6363
switch status {
6464
case .neutral:
65-
theme.colors.colorSurfaceStatusNeutralMuted
65+
theme.colors.colorSurfaceSecondary
6666
case .accent:
6767
theme.colors.colorSurfaceStatusAccentMuted
6868
case .positive:

OUDS/Core/Components/Sources/Indicators/Tag/Internal/TagLabelStyle+TagIcon.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct TagLoader: View {
8585
private var colorEmphasized: MultipleColorSemanticTokens {
8686
switch status {
8787
case .neutral:
88-
theme.colors.colorContentOnStatusNeutralEmphasized
88+
theme.colors.colorContentInverse
8989
case .accent:
9090
theme.colors.colorContentOnStatusAccentEmphasized
9191
case .positive:
@@ -104,7 +104,7 @@ struct TagLoader: View {
104104
private var colorMuted: MultipleColorSemanticTokens {
105105
switch status {
106106
case .neutral:
107-
theme.colors.colorContentOnStatusNeutralMuted
107+
theme.colors.colorContentDefault
108108
case .accent:
109109
theme.colors.colorContentOnStatusAccentMuted
110110
case .positive:
@@ -167,7 +167,7 @@ struct TagAsset: View {
167167
private var emphasizedColor: MultipleColorSemanticTokens {
168168
switch status {
169169
case .neutral:
170-
theme.colors.colorContentOnStatusNeutralEmphasized
170+
theme.colors.colorContentInverse
171171
case .accent:
172172
theme.colors.colorContentOnStatusAccentEmphasized
173173
case .positive:
@@ -186,7 +186,7 @@ struct TagAsset: View {
186186
private var mutedColor: MultipleColorSemanticTokens {
187187
switch status {
188188
case .neutral:
189-
theme.colors.colorContentOnStatusNeutralMuted
189+
theme.colors.colorContentDefault
190190
case .accent:
191191
theme.colors.colorContentStatusAccent
192192
case .positive:

OUDS/Core/Components/Sources/Indicators/Tag/Internal/TagLabelStyle+TagLabel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct TagLabel: View {
5454
private var colorEmphasized: MultipleColorSemanticTokens {
5555
switch status {
5656
case .neutral:
57-
theme.colors.colorContentOnStatusNeutralEmphasized
57+
theme.colors.colorContentInverse
5858
case .accent:
5959
theme.colors.colorContentOnStatusAccentEmphasized
6060
case .positive:
@@ -73,7 +73,7 @@ struct TagLabel: View {
7373
private var colorMuted: MultipleColorSemanticTokens {
7474
switch status {
7575
case .neutral:
76-
theme.colors.colorContentOnStatusNeutralMuted
76+
theme.colors.colorContentDefault
7777
case .accent:
7878
theme.colors.colorContentOnStatusAccentMuted
7979
case .positive:

OUDS/Core/Components/Sources/_/Internal/ControlItem/ControlItemContent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct ControlItemContent: View {
4949
indicatorContainer()
5050
}
5151
}
52-
.padding(.all, theme.controlItem.controlItemSpaceInset)
52+
.padding(.all, theme.controlItem.controlItemSpacePaddingBlock)
5353
.modifier(ControlItemBackgroundModifier(interactionState: interactionState))
5454
.modifier(ControlItemBordersModifier(interactionState: interactionState, layoutData: layoutData, isOn: isOn))
5555
.clipShape(RoundedRectangle(cornerRadius: theme.controlItem.controlItemBorderRadius))

OUDS/Core/OUDS/Sources/OUDSTheme/TokensProviders.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public protocol AllColorModeSemanticTokensProvider: TokensProvider, ColorModeSem
4141
public protocol AllColorChartSemanticTokensProvider: TokensProvider, ColorChartSemanticTokens, ColorChartMultipleSemanticTokens {}
4242

4343
/// Something which provides all semantic tokens of elevation
44-
public protocol AllElevationSemanticTokensProvider: TokensProvider, ElevationSemanticTokens, ElevationCompositeSemanticTokens {}
44+
public protocol AllElevationSemanticTokensProvider: TokensProvider, ElevationSemanticTokens, ElevationMultipleSemanticTokens, ElevationCompositeSemanticTokens {}
4545

4646
/// Something which provides all semantic tokens of font
4747
public protocol AllFontSemanticTokensProvider: TokensProvider, FontSemanticTokens, FontCompositeSemanticTokens, FontMultipleSemanticTokens {}

OUDS/Core/OUDS/Sources/TokenatorConstants.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ public enum OUDSVersions {
1919
// MARK: - Themes versions
2020

2121
/// Version of the Core tokens library
22-
public static let themeCoreVersion = "1.6.0"
22+
public static let themeCoreVersion = "1.7.0"
2323

2424
/// Version of the Orange core tokens library
25-
public static let themeOrangeCoreVersion = "1.1.0"
25+
public static let themeOrangeCoreVersion = "1.2.0"
2626
/// Version of the Orange brand tokens library
27-
public static let themeOrangeBrandVersion = "1.6.0"
27+
public static let themeOrangeBrandVersion = "2.0.1"
2828

2929
/// Version of the Sosh core tokens library
30-
public static let themeSoshCoreVersion = "1.1.0"
30+
public static let themeSoshCoreVersion = "1.2.0"
3131
/// Version of the Sosh brand tokens library
32-
public static let themeSoshBrandVersion = "1.6.0"
32+
public static let themeSoshBrandVersion = "2.0.1"
3333

3434
/// Version of the Orange Business Tools brand tokens library
35-
public static let themeOrangeBusinessToolsBrandVersion = "1.6.0"
35+
public static let themeOrangeBusinessToolsBrandVersion = "2.0.1"
3636

3737
/// Version of the Wireframe core tokens library
38-
public static let themeWireframeCoreVersion = "1.1.0"
38+
public static let themeWireframeCoreVersion = "1.2.0"
3939
/// Version of the Wireframe brand tokens library
40-
public static let themeWireframeBrandVersion = "1.6.0"
40+
public static let themeWireframeBrandVersion = "2.0.1"
4141

4242
// MARK: - Components versions - Actions
4343

@@ -47,12 +47,12 @@ public enum OUDSVersions {
4747
// MARK: - Components versions - Navigation
4848

4949
/// Version of the Figma specifications for the component link
50-
public static let componentLinkVersion = "2.1.0"
50+
public static let componentLinkVersion = "2.0.0"
5151

5252
// MARK: - Components versions - Control
5353

5454
/// Version of the Figma specifications for the component checkbox
55-
public static let componentCheckboxVersion = "2.0.0"
55+
public static let componentCheckboxVersion = "2.2.0"
5656
/// Version of the Figma specifications for the component chip
5757
public static let componentChipVersion = "1.3.0"
5858
/// Version of the Figma specifications for the component radio button

OUDS/Core/OUDS/Sources/_OUDS.docc/_OUDS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Apple OS Swift Package of *Orange Unified Design System*, the new design sys
1616

1717
<!-- NOTE: Do not forget to update tokens version -->
1818
```
19-
🧬 Core version: 1.6.0
19+
🧬 Core version: 1.7.0
2020
```
2121

2222
Orange is providing a full design system to build Orange mobile aplications. The objective of *Orange Unified Design System* (OUDS) is to propose a set of guidelines about how to apply the Orange brand on mobile applications. *Orange Unified Design System* also provides series of components and modules that show in details how to use this in the Orange apps.

0 commit comments

Comments
 (0)