Skip to content

Commit 9fe03b1

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 8331d0d commit 9fe03b1

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
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- [Library] Update value of opacity raw token "opacity800" from 0.88 to 0.80 ([#87](https://github.com/Orange-OpenSource/ouds-ios/issues/87))
1717
- [Library] Add missing unit tests for opacity raw tokens
1818

19+
### Removed
20+
21+
- [Library] Remove token borderRadiusPill and borderRadiusCircle ([#58](https://github.com/Orange-OpenSource/ouds-ios/issues/58))
22+
1923
### Fixed
2024

2125
- [Library] Fix some typos in documentation ([#89](https://github.com/Orange-OpenSource/ouds-ios/issues/89))
@@ -59,7 +63,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5963
- [Library] Add raw tokens and semantic tokens for border ([#30](https://github.com/Orange-OpenSource/ouds-ios/issues/30))
6064
- [Library] Define Swift Package architecture of library and tokens (raw and semantic) ([#33](https://github.com/Orange-OpenSource/ouds-ios/issues/33))
6165
- [Library] Define Swift Package library for OUDS ([#46](https://github.com/Orange-OpenSource/ouds-ios/issues/46))
62-
6366
- [Showcase] Publication of comment on issues about new alpha build upload on TestFlight ([#56](https://github.com/Orange-OpenSource/ouds-ios/issues/56))
6467
- [Showcase] Distribute demo app development version ([#12](https://github.com/Orange-OpenSource/ouds-ios/issues/12))
6568
- [Showcase] Distribute demo app for feature validation ([#13](https://github.com/Orange-OpenSource/ouds-ios/issues/13))

OUDS/Core/OUDS/Sources/OUDSTheme/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/OUDS/Tests/OUDSTheme/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/OUDS/Tests/OUDSTheme/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
@@ -65,7 +65,6 @@ public enum BorderRawTokens {
6565
public static let borderRadius500: BorderRadiusRawToken = borderBase * 5
6666
public static let borderRadius600: BorderRadiusRawToken = borderBase * 6
6767
public static let borderRadius800: BorderRadiusRawToken = borderBase * 8
68-
public static let borderRadius9999: BorderRadiusRawToken = 2000
6968

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

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
@@ -47,8 +47,6 @@ public protocol BorderSemanticTokens {
4747
var borderRadiusShort: BorderRadiusSemanticToken { get }
4848
var borderRadiusMedium: BorderRadiusSemanticToken { get }
4949
var borderRadiusTall: BorderRadiusSemanticToken { get }
50-
var borderRadiusPill: BorderRadiusSemanticToken { get }
51-
// TODO: How to deal with "border-radius-circle"?
5250

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

0 commit comments

Comments
 (0)