Skip to content

Commit bac8385

Browse files
committed
refactor: remove border tokens radius circle and radius pill (#58)
Closes #58 Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent 2552b0e commit bac8385

File tree

7 files changed

+4
-16
lines changed

7 files changed

+4
-16
lines changed

CHANGELOG.md

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

1111
### Changed
1212

13+
### Removed
14+
15+
- [Library] Remove token borderRadiusPill and borderRadiusCircle ([#58](https://github.com/Orange-OpenSource/ouds-ios/issues/58))
16+
1317
### Fixed
1418

1519
## [0.1.0](https://github.com/Orange-OpenSource/ouds-ios/compare/0.0.0...0.1.0) - 2024-08-08
@@ -51,7 +55,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5155
- [Library] Add raw tokens and semantic tokens for border ([#30](https://github.com/Orange-OpenSource/ouds-ios/issues/30))
5256
- [Library] Define Swift Package architecture of library and tokens (raw and semantic) ([#33](https://github.com/Orange-OpenSource/ouds-ios/issues/33))
5357
- [Library] Define Swift Package library for OUDS ([#46](https://github.com/Orange-OpenSource/ouds-ios/issues/46))
54-
5558
- [Showcase] Publication of comment on issues about new alpha build upload on TestFlight ([#56](https://github.com/Orange-OpenSource/ouds-ios/issues/56))
5659
- [Showcase] Distribute demo app development version ([#12](https://github.com/Orange-OpenSource/ouds-ios/issues/12))
5760
- [Showcase] Distribute demo app for feature validation ([#13](https://github.com/Orange-OpenSource/ouds-ios/issues/13))

OUDS/Core/Themes/Commons/Sources/OUDSTheme+SemanticTokens/OUDSTheme+BorderSemanticTokens.swift

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ extension OUDSTheme: BorderSemanticTokens {
3838
@objc open var borderRadiusShort: BorderRadiusSemanticToken { BorderRawTokens.borderRadius75 }
3939
@objc open var borderRadiusMedium: BorderRadiusSemanticToken { BorderRawTokens.borderRadius150 }
4040
@objc open var borderRadiusTall: BorderRadiusSemanticToken { BorderRawTokens.borderRadius300 }
41-
@objc open var borderRadiusPill: BorderRadiusSemanticToken { BorderRawTokens.borderRadius9999 }
42-
// TODO: How to deal with "border-radius-circle : 50%"?
4341

4442
// MARK: Semantic token - Border - Style
4543

OUDS/Core/Themes/Commons/Tests/MockTheme/MockTheme+BorderSemanticTokens.swift

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ extension MockTheme {
3838
override var borderRadiusShort: BorderRadiusSemanticToken { Self.mockThemeBorderRadiusRawToken }
3939
override var borderRadiusMedium: BorderRadiusSemanticToken { Self.mockThemeBorderRadiusRawToken }
4040
override var borderRadiusTall: BorderRadiusSemanticToken { Self.mockThemeBorderRadiusRawToken }
41-
override var borderRadiusPill: BorderRadiusSemanticToken { Self.mockThemeBorderRadiusRawToken }
4241

4342
// MARK: Semantic token - Border - Style
4443

OUDS/Core/Themes/Commons/Tests/TestThemeOverrideOfBorderSemanticTokens.swift

-5
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ final class TestThemeOverrideOfBorderSemanticTokens: XCTestCase {
9292
XCTAssertTrue(inheritedTheme.borderRadiusTall == MockTheme.mockThemeBorderRadiusRawToken)
9393
}
9494

95-
func testInheritedThemeCanOverrideSemanticTokenBorderRadiusPill() throws {
96-
XCTAssertNotEqual(inheritedTheme.borderRadiusPill, abstractTheme.borderRadiusPill)
97-
XCTAssertTrue(inheritedTheme.borderRadiusPill == MockTheme.mockThemeBorderRadiusRawToken)
98-
}
99-
10095
// MARK: - Semantic token - Border - Style
10196

10297
func testInheritedThemeCanOverrideSemanticTokenBorderStyleDefault() throws {

OUDS/Core/Tokens/RawTokens/Sources/BorderRawTokens.swift

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public enum BorderRawTokens {
6464
public static let borderRadius500: BorderRadiusRawToken = borderBase * 5
6565
public static let borderRadius600: BorderRadiusRawToken = borderBase * 6
6666
public static let borderRadius800: BorderRadiusRawToken = borderBase * 8
67-
public static let borderRadius9999: BorderRadiusRawToken = 2000
6867

6968
// MARK: Primitive token - Border - Style
7069

OUDS/Core/Tokens/RawTokens/Tests/BorderRawTokensTests.swift

-4
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ final class BorderRawTokensTests: XCTestCase {
9393
XCTAssertLessThan(BorderRawTokens.borderRadius600, BorderRawTokens.borderRadius800)
9494
}
9595

96-
func testBorderRadiusRawToken800LessThan9999() throws {
97-
XCTAssertLessThan(BorderRawTokens.borderRadius800, BorderRawTokens.borderRadius9999)
98-
}
99-
10096
// MARK: - Primitive token - Border - Style
10197

10298
/// Border styles raw tokens must be different

OUDS/Core/Tokens/SemanticTokens/Sources/BorderSemanticTokens.swift

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public protocol BorderSemanticTokens {
4646
var borderRadiusShort: BorderRadiusSemanticToken { get }
4747
var borderRadiusMedium: BorderRadiusSemanticToken { get }
4848
var borderRadiusTall: BorderRadiusSemanticToken { get }
49-
var borderRadiusPill: BorderRadiusSemanticToken { get }
50-
// TODO: How to deal with "border-radius-circle"?
5149

5250
// MARK: - Semantic token - Border - Style
5351

0 commit comments

Comments
 (0)