Skip to content

Commit

Permalink
refactor: rename of sizing semantic tokens (#122) (#123)
Browse files Browse the repository at this point in the history 
Closes #122

Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
  • Loading branch information
@pylapp
pylapp committed Sep 23, 2024
1 parent 58764e1 commit 2c182fe
Show file tree
Hide file tree
Showing 14 changed files with 603 additions and 590 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- [Library] Rename some sizing semantic tokens ([#122](https://github.com/Orange-OpenSource/ouds-ios/issues/122))
- [Library] Replace "adaptable" word by "scaled" in space semantic tokens, "fix" by "fixed" and remove "layout" ([#117](https://github.com/Orange-OpenSource/ouds-ios/issues/117))

### Removed

- [Library] Add more sizing semantic tokens ([#122](https://github.com/Orange-OpenSource/ouds-ios/issues/122))
- [Library] Remove raw tokens `elevationZIndex` ([#119](https://github.com/Orange-OpenSource/ouds-ios/issues/119))

## [0.2.0](https://github.com/Orange-OpenSource/ouds-ios/compare/0.1.0...0.2.0) - 2024-09-19
Expand Down
4 changes: 2 additions & 2 deletions ...e/OUDS/Sources/OUDSTheme/OUDSTheme+ComponentTokens/OUDSTheme+ButtonsComponentTokens.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ extension OUDSTheme: ButtonsComponentTokens {
@objc open var buttonBackgroundColorLight: ColorSemanticToken { colorBackgroundBrandPrimaryLight! }
@objc open var buttonBackgroundColorDark: ColorSemanticToken { colorBackgroundBrandPrimaryDark! }

@objc open var buttonWidth: SizingWidthHeightSemanticToken { DimensionRawTokens.dimension3000 }
@objc open var buttonHeight: SizingWidthHeightSemanticToken { DimensionRawTokens.dimension1000 }
@objc open var buttonWidth: SizingSemanticToken { DimensionRawTokens.dimension3000 }
@objc open var buttonHeight: SizingSemanticToken { DimensionRawTokens.dimension1000 }

@objc open var buttonTypography: TypographyCompositeSemanticToken { typeDisplayMedium }
}
138 changes: 72 additions & 66 deletions ...Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+SizingSemanticTokens.swift
View file

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions OUDS/Core/OUDS/Tests/OUDSTheme/MockTheme/MockTheme+ElevationSemanticTokens.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,50 +17,50 @@ import OUDSTokensSemantic

extension MockTheme {

static let mockThemeXRawToken: ElevationRawToken = 711
static let mockThemeYRawToken: ElevationRawToken = 713
static let mockThemeBlurRawToken: ElevationRawToken = 816
static let mockThemeElevationXRawToken: ElevationRawToken = 711
static let mockThemeElevationYRawToken: ElevationRawToken = 713
static let mockThemeElevationBlurRawToken: ElevationRawToken = 816
static let mockThemeElevationColorRawToken: ColorRawToken = ColorRawTokens.colorFunctionalMalachite500
static let mockThemeCompositeRawToken: ElevationCompositeRawToken = ElevationCompositeRawToken(x: 118,
static let mockThemeElevationCompositeRawToken: ElevationCompositeRawToken = ElevationCompositeRawToken(x: 118,
y: 712,
blur: 118,
color: ColorRawTokens.colorFunctionalDodgerBlue800)

// MARK: Semantic token - Elevation - X

override var elevationXNone: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXRaised: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXDrag: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXOverlayDefault: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXOverlayEmphasized: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXStickyDefault: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXStickyEmphasized: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXStickyNavigationScrolled: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXFocus: ElevationYSemanticToken { Self.mockThemeXRawToken }
override var elevationXNone: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXRaised: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXDrag: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXOverlayDefault: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXOverlayEmphasized: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXStickyDefault: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXStickyEmphasized: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXStickyNavigationScrolled: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }
override var elevationXFocus: ElevationYSemanticToken { Self.mockThemeElevationXRawToken }

// MARK: Semantic token - Elevation - Y

override var elevationYNone: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYRaised: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYDrag: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYOverlayDefault: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYOverlayEmphasized: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYStickyDefault: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYStickyEmphasized: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYStickyNavigationScrolled: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYFocus: ElevationYSemanticToken { Self.mockThemeYRawToken }
override var elevationYNone: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYRaised: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYDrag: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYOverlayDefault: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYOverlayEmphasized: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYStickyDefault: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYStickyEmphasized: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYStickyNavigationScrolled: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }
override var elevationYFocus: ElevationYSemanticToken { Self.mockThemeElevationYRawToken }

// MARK: Semantic token - Elevation - Blur

override var elevationBlurNone: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurRaised: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurDrag: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurOverlayDefault: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurOverlayEmphasized: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurStickyDefault: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurStickyEmphasized: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurStickyNavigationScrolled: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurFocus: ElevationBlurSemanticToken { Self.mockThemeBlurRawToken }
override var elevationBlurNone: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurRaised: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurDrag: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurOverlayDefault: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurOverlayEmphasized: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurStickyDefault: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurStickyEmphasized: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurStickyNavigationScrolled: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }
override var elevationBlurFocus: ElevationBlurSemanticToken { Self.mockThemeElevationBlurRawToken }

// MARK: Semantic token - Elevation - Color - None

Expand Down Expand Up @@ -109,27 +109,27 @@ extension MockTheme {

// MARK: Semantic token - Elevation - Box shadow

override var elevationRaisedLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationRaisedDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationRaisedLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationRaisedDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationDragLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationDragDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationDragLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationDragDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationOverlayDefaultLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationOverlayDefaultDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationOverlayDefaultLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationOverlayDefaultDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationOverlayEmphasizedLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationOverlayEmphasizedDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationOverlayEmphasizedLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationOverlayEmphasizedDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationStickyDefaultLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyDefaultDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyDefaultLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationStickyDefaultDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationStickyEmphasizedLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyEmphasizedDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyEmphasizedLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationStickyEmphasizedDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationStickyNavigationScrolledLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyNavigationScrolledDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationStickyNavigationScrolledLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationStickyNavigationScrolledDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }

override var elevationFocusLight: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationFocusDark: ElevationCompositeSemanticToken { Self.mockThemeCompositeRawToken }
override var elevationFocusLight: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
override var elevationFocusDark: ElevationCompositeSemanticToken { Self.mockThemeElevationCompositeRawToken }
}
Loading

0 comments on commit 2c182fe

Please sign in to comment.