Skip to content
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/Orange-OpenSource/ouds-ios-design-system-toolbox/compare/0.17.0...develop)

### Added

- [Library] Tag component (Orange-OpenSource/ouds-ios#408)

### Changed

- [Library] Chip version 1.3.0 (tokens library v1.5.0) (Orange-OpenSource/ouds-ios#906)
Expand Down
52 changes: 52 additions & 0 deletions DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@
078C4C372E01558B00598F75 /* ControlItemConfigurationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078C4C362E01558B00598F75 /* ControlItemConfigurationViews.swift */; };
078C4C382E01558B00598F75 /* ControlItemConfigurationViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 078C4C362E01558B00598F75 /* ControlItemConfigurationViews.swift */; };
0794FCDB2D9155D900A9373A /* UIUserInterfaceStyle+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0794FCDA2D9155D900A9373A /* UIUserInterfaceStyle+extension.swift */; };
079B4A132E49BFA20039FC26 /* TagUITestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A122E49BFA20039FC26 /* TagUITestCase.swift */; };
079B4A142E49C3BC0039FC26 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 5122E0272D65D18E00CD2857 /* Localizable.xcstrings */; };
079B4A162E49C6EB0039FC26 /* SoshTheme+TagUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A152E49C6EB0039FC26 /* SoshTheme+TagUITests.swift */; };
079B4A182E49C7790039FC26 /* OrangeTheme+TagUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A172E49C7790039FC26 /* OrangeTheme+TagUITests.swift */; };
079B4A1A2E49C78F0039FC26 /* OrangeBusinessToolsTheme+TagUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A192E49C78F0039FC26 /* OrangeBusinessToolsTheme+TagUITests.swift */; };
079B4A202E49C8390039FC26 /* OrangeInverseTheme+TagUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A1F2E49C8390039FC26 /* OrangeInverseTheme+TagUITests.swift */; };
079B4A222E49C8740039FC26 /* WireframeTheme+TagUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 079B4A212E49C8740039FC26 /* WireframeTheme+TagUITests.swift */; };
07AB45872D4D08080001D237 /* DesignToolboxChoicePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07AB45862D4D08080001D237 /* DesignToolboxChoicePicker.swift */; };
07AB45882D4D08080001D237 /* DesignToolboxChoicePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07AB45862D4D08080001D237 /* DesignToolboxChoicePicker.swift */; };
07AB458A2D50CB9B0001D237 /* DesignToolboxTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07AB45892D50CB9B0001D237 /* DesignToolboxTextField.swift */; };
Expand Down Expand Up @@ -160,6 +167,12 @@
07F75A3F2CC653CD0004F1AD /* NameSpace+ColumnGap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F75A3E2CC653CD0004F1AD /* NameSpace+ColumnGap.swift */; };
07F75A412CC653EB0004F1AD /* NameSpace+RowGap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F75A402CC653EB0004F1AD /* NameSpace+RowGap.swift */; };
07F75A432CC654050004F1AD /* NameSpace+PaddingStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F75A422CC654050004F1AD /* NameSpace+PaddingStack.swift */; };
07FB2A302E454D7900361ECA /* TagPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2F2E454D7900361ECA /* TagPage.swift */; };
07FB2A312E454D7900361ECA /* TagElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2E2E454D7900361ECA /* TagElement.swift */; };
07FB2A322E454D7900361ECA /* TagConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2D2E454D7900361ECA /* TagConfigurationView.swift */; };
07FB2A332E454D7900361ECA /* TagPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2F2E454D7900361ECA /* TagPage.swift */; };
07FB2A342E454D7900361ECA /* TagElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2E2E454D7900361ECA /* TagElement.swift */; };
07FB2A352E454D7900361ECA /* TagConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07FB2A2D2E454D7900361ECA /* TagConfigurationView.swift */; };
51087A7B2C46DF9F00160CCF /* Bundle+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51087A7A2C46DF9F00160CCF /* Bundle+extension.swift */; };
510A9CD02C5679A300430620 /* OUDSComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 510A9CCF2C5679A300430620 /* OUDSComponents */; };
510AF27A2D64DA72002A2731 /* XCTestCase+Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074008222C942810006B8729 /* XCTestCase+Snapshot.swift */; };
Expand Down Expand Up @@ -522,6 +535,12 @@
0786A9E12E0AAB6600976098 /* OUDSCheckboxIndicatorState+extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OUDSCheckboxIndicatorState+extension.swift"; sourceTree = "<group>"; };
078C4C362E01558B00598F75 /* ControlItemConfigurationViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlItemConfigurationViews.swift; sourceTree = "<group>"; };
0794FCDA2D9155D900A9373A /* UIUserInterfaceStyle+extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIUserInterfaceStyle+extension.swift"; sourceTree = "<group>"; };
079B4A122E49BFA20039FC26 /* TagUITestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagUITestCase.swift; sourceTree = "<group>"; };
079B4A152E49C6EB0039FC26 /* SoshTheme+TagUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SoshTheme+TagUITests.swift"; sourceTree = "<group>"; };
079B4A172E49C7790039FC26 /* OrangeTheme+TagUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrangeTheme+TagUITests.swift"; sourceTree = "<group>"; };
079B4A192E49C78F0039FC26 /* OrangeBusinessToolsTheme+TagUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrangeBusinessToolsTheme+TagUITests.swift"; sourceTree = "<group>"; };
079B4A1F2E49C8390039FC26 /* OrangeInverseTheme+TagUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrangeInverseTheme+TagUITests.swift"; sourceTree = "<group>"; };
079B4A212E49C8740039FC26 /* WireframeTheme+TagUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WireframeTheme+TagUITests.swift"; sourceTree = "<group>"; };
07AB45862D4D08080001D237 /* DesignToolboxChoicePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignToolboxChoicePicker.swift; sourceTree = "<group>"; };
07AB45892D50CB9B0001D237 /* DesignToolboxTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignToolboxTextField.swift; sourceTree = "<group>"; };
07B3CCAE2D40E34700DBB10A /* LinkConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkConfiguration.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -564,6 +583,9 @@
07F75A3E2CC653CD0004F1AD /* NameSpace+ColumnGap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NameSpace+ColumnGap.swift"; sourceTree = "<group>"; };
07F75A402CC653EB0004F1AD /* NameSpace+RowGap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NameSpace+RowGap.swift"; sourceTree = "<group>"; };
07F75A422CC654050004F1AD /* NameSpace+PaddingStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NameSpace+PaddingStack.swift"; sourceTree = "<group>"; };
07FB2A2D2E454D7900361ECA /* TagConfigurationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagConfigurationView.swift; sourceTree = "<group>"; };
07FB2A2E2E454D7900361ECA /* TagElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagElement.swift; sourceTree = "<group>"; };
07FB2A2F2E454D7900361ECA /* TagPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPage.swift; sourceTree = "<group>"; };
07FDCD912C296A500009AA13 /* Design System Toolbox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Design System Toolbox.app"; sourceTree = BUILT_PRODUCTS_DIR; };
07FDCDA52C296B4B0009AA13 /* .gitattributes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .gitattributes; path = ../.gitattributes; sourceTree = "<group>"; };
07FDCDA72C296B7A0009AA13 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1167,6 +1189,16 @@
path = NamedSpace;
sourceTree = "<group>";
};
07FB2A2C2E454D4E00361ECA /* Tag */ = {
isa = PBXGroup;
children = (
07FB2A2D2E454D7900361ECA /* TagConfigurationView.swift */,
07FB2A2E2E454D7900361ECA /* TagElement.swift */,
07FB2A2F2E454D7900361ECA /* TagPage.swift */,
);
path = Tag;
sourceTree = "<group>";
};
07FDCD882C296A500009AA13 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1269,6 +1301,7 @@
518EC0A62E1FF2C000FC77E4 /* LinkUITestsTestCase.swift */,
518EC0A72E1FF2C000FC77E4 /* RadioButtonUITestsTestCase.swift */,
518EC0AF2E1FF2E800FC77E4 /* SwitchUITestsTestCase.swift */,
079B4A122E49BFA20039FC26 /* TagUITestCase.swift */,
);
path = "Test Cases";
sourceTree = "<group>";
Expand Down Expand Up @@ -1434,6 +1467,7 @@
51A217462E325E6C00562BE0 /* OrangeInverseTheme+LinkUITests.swift */,
51A217472E325E6C00562BE0 /* OrangeInverseTheme+RadioButtonUITests.swift */,
51A217482E325E6C00562BE0 /* OrangeInverseTheme+SwitchUITests.swift */,
079B4A1F2E49C8390039FC26 /* OrangeInverseTheme+TagUITests.swift */,
);
path = OrangeInverseTheme;
sourceTree = "<group>";
Expand All @@ -1449,6 +1483,7 @@
51A217592E325ED500562BE0 /* OrangeBusinessToolsTheme+LinkUITests.swift */,
51A2175A2E325ED500562BE0 /* OrangeBusinessToolsTheme+RadioButtonUITests.swift */,
51A2175B2E325ED500562BE0 /* OrangeBusinessToolsTheme+SwitchUITests.swift */,
079B4A192E49C78F0039FC26 /* OrangeBusinessToolsTheme+TagUITests.swift */,
);
path = OrangeBusinessToolsTheme;
sourceTree = "<group>";
Expand All @@ -1464,6 +1499,7 @@
51A2176A2E325F7F00562BE0 /* WireframeTheme+LinkUITests.swift */,
51A2176B2E325F7F00562BE0 /* WireframeTheme+RadioButtonUITests.swift */,
51A2176C2E325F7F00562BE0 /* WireframeTheme+SwitchUITests.swift */,
079B4A212E49C8740039FC26 /* WireframeTheme+TagUITests.swift */,
);
path = WireframeTheme;
sourceTree = "<group>";
Expand Down Expand Up @@ -1521,6 +1557,7 @@
518EC0722E1FF23800FC77E4 /* OrangeTheme+LinkUITests.swift */,
518EC0732E1FF23800FC77E4 /* OrangeTheme+RadioButtonUITests.swift */,
518EC0742E1FF23800FC77E4 /* OrangeTheme+SwitchUITests.swift */,
079B4A172E49C7790039FC26 /* OrangeTheme+TagUITests.swift */,
);
path = OrangeTheme;
sourceTree = "<group>";
Expand All @@ -1536,6 +1573,7 @@
518EC0982E1FF28300FC77E4 /* SoshTheme+LinkUITests.swift */,
518EC0992E1FF28300FC77E4 /* SoshTheme+RadioButtonUITests.swift */,
518EC09A2E1FF28300FC77E4 /* SoshTheme+SwitchUITests.swift */,
079B4A152E49C6EB0039FC26 /* SoshTheme+TagUITests.swift */,
);
path = SoshTheme;
sourceTree = "<group>";
Expand All @@ -1562,6 +1600,7 @@
07B3CCAD2D40E14C00DBB10A /* Link */,
0745C1852D7A0351006B3A1F /* Radio */,
07CC9AEB2DB0F7DD001BC929 /* Switch */,
07FB2A2C2E454D4E00361ECA /* Tag */,
07F0AFE62CFE055300D334DD /* Utils */,
07F0AFDD2CFDD1FD00D334DD /* ComponentsPage.swift */,
);
Expand Down Expand Up @@ -1944,6 +1983,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
079B4A142E49C3BC0039FC26 /* Localizable.xcstrings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2072,9 +2112,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
079B4A222E49C8740039FC26 /* WireframeTheme+TagUITests.swift in Sources */,
51FD65222E0D8DB20084B982 /* A11YIdentifiers.swift in Sources */,
518EC0752E1FF23800FC77E4 /* OrangeTheme+ButtonUITests.swift in Sources */,
518EC0762E1FF23800FC77E4 /* OrangeTheme+RadioButtonUITests.swift in Sources */,
079B4A202E49C8390039FC26 /* OrangeInverseTheme+TagUITests.swift in Sources */,
518EC09B2E1FF28300FC77E4 /* SoshTheme+DividerUITests.swift in Sources */,
51A217502E325E6C00562BE0 /* OrangeInverseTheme+BadgeUITests.swift in Sources */,
518EC09C2E1FF28300FC77E4 /* SoshTheme+LinkUITests.swift in Sources */,
Expand Down Expand Up @@ -2130,6 +2172,7 @@
51952AA12D3FA32E0068B807 /* ElevationTokenElement.swift in Sources */,
51952AA22D3FA32E0068B807 /* GridTokenElement.swift in Sources */,
0794FCDB2D9155D900A9373A /* UIUserInterfaceStyle+extension.swift in Sources */,
079B4A1A2E49C78F0039FC26 /* OrangeBusinessToolsTheme+TagUITests.swift in Sources */,
51952AA32D3FA32E0068B807 /* GrisTokenPage.swift in Sources */,
515EE9A42E2133F200A60E96 /* SoshTheme+ChipsUITests.swift in Sources */,
51952AA42D3FA32E0068B807 /* TokensPage.swift in Sources */,
Expand All @@ -2141,6 +2184,7 @@
6D43136D2CEF400D004E6886 /* DesignToolboxCode.swift in Sources */,
07CC9ADE2DB0F66E001BC929 /* RadioItemElement.swift in Sources */,
51B8D5A22DA7F5DF00A28BAC /* NamedColorMode.swift in Sources */,
079B4A182E49C7790039FC26 /* OrangeTheme+TagUITests.swift in Sources */,
6DED17F12CD2641800584BC9 /* OpacityTokenElement.swift in Sources */,
07EB47032E1801D000B94EC2 /* BadgePage.swift in Sources */,
07EB47042E1801D000B94EC2 /* BadgeElement.swift in Sources */,
Expand Down Expand Up @@ -2235,12 +2279,16 @@
0786A9E72E0AAB6600976098 /* OUDSCheckboxIndicatorState+extension.swift in Sources */,
51417C252E1BF661000266C8 /* TokensBorderUITestsTestCase.swift in Sources */,
07B3CCB52D40F37000DBB10A /* DesignToolboxColoredSurfaceModifier.swift in Sources */,
07FB2A332E454D7900361ECA /* TagPage.swift in Sources */,
07FB2A342E454D7900361ECA /* TagElement.swift in Sources */,
07FB2A352E454D7900361ECA /* TagConfigurationView.swift in Sources */,
6D17A2332CCBF12B00C00512 /* NamedColor+Decorative.swift in Sources */,
51952A862D3FA1DB0068B807 /* OrangeTheme+TokensSpaceUITests.swift in Sources */,
515EE9852E21329B00A60E96 /* ChipLayout.swift in Sources */,
515EE9862E21329B00A60E96 /* FilterChipConfigurationView.swift in Sources */,
515EE9872E21329B00A60E96 /* FilterChipElement.swift in Sources */,
515EE9882E21329B00A60E96 /* FilterChipPage.swift in Sources */,
079B4A162E49C6EB0039FC26 /* SoshTheme+TagUITests.swift in Sources */,
515EE9892E21329B00A60E96 /* ChipPickerConfigurationView.swift in Sources */,
515EE98A2E21329B00A60E96 /* ChipPickerElement.swift in Sources */,
515EE98B2E21329B00A60E96 /* ChipPickerPage.swift in Sources */,
Expand Down Expand Up @@ -2270,6 +2318,7 @@
51ABCD282E183226006CD6C0 /* SoshTheme+TokensFontUITests.swift in Sources */,
5180FE712DBBC2FA0062E489 /* CheckboxPickerPage.swift in Sources */,
5180FE722DBBC2FA0062E489 /* CheckboxPickerConfiguration.swift in Sources */,
079B4A132E49BFA20039FC26 /* TagUITestCase.swift in Sources */,
51ABCD2C2E183226006CD6C0 /* SoshTheme+TokensElevationUITests.swift in Sources */,
5180FE732DBBC2FA0062E489 /* CheckboxPickerElement.swift in Sources */,
51A217512E325E6C00562BE0 /* OrangeInverseTheme+ChipsUITests.swift in Sources */,
Expand Down Expand Up @@ -2317,6 +2366,9 @@
515EE9912E21329B00A60E96 /* FilterChipConfigurationView.swift in Sources */,
515EE9922E21329B00A60E96 /* FilterChipElement.swift in Sources */,
515EE9932E21329B00A60E96 /* FilterChipPage.swift in Sources */,
07FB2A302E454D7900361ECA /* TagPage.swift in Sources */,
07FB2A312E454D7900361ECA /* TagElement.swift in Sources */,
07FB2A322E454D7900361ECA /* TagConfigurationView.swift in Sources */,
515EE9942E21329B00A60E96 /* ChipPickerConfigurationView.swift in Sources */,
515EE9952E21329B00A60E96 /* ChipPickerElement.swift in Sources */,
515EE9962E21329B00A60E96 /* ChipPickerPage.swift in Sources */,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ struct BadgeConfigurationView: View {
}
}

DesignToolboxChoicePicker(title: "app_components_badge_size_label",
DesignToolboxChoicePicker(title: "app_components_common_size_label",
selection: $configurationModel.size,
style: .segmented)
{
Expand All @@ -117,7 +117,7 @@ struct BadgeConfigurationView: View {
}
}

DesignToolboxChoicePicker(title: "app_components_badge_status_label",
DesignToolboxChoicePicker(title: "app_components_common_status_label",
selection: $configurationModel.status,
style: .segmented)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ struct ButtonConfigurationView: View {
OUDSSwitchItem("app_components_button_rounded_label", isOn: $configurationModel.rounded)
}

DesignToolboxChoicePicker(title: "app_components_button_hierarchy_label",
DesignToolboxChoicePicker(title: "app_components_common_hierarchy_label",
selection: $configurationModel.hierarchy,
style: .segmented)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct ComponentsPage: View {
LinkElement(),
RadioElements(),
SwitchElements(),
TagElement(),
]

var body: some View {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ struct LinkConfiguration: View {
OUDSSwitchItem("app_components_common_onColoredSurface_label", isOn: $configurationModel.onColoredSurface)
}

DesignToolboxChoicePicker(title: "app_components_link_size_label",
DesignToolboxChoicePicker(title: "app_components_common_size_label",
selection: $configurationModel.size,
style: .segmented)
{
Expand Down
Loading