Skip to content

[#1292] Apply renaming from Orange Business Tools to Orange Compact #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pylapp merged 2 commits into from
Feb 5, 2026
+987 −999
Merged

[#1292] Apply renaming from Orange Business Tools to Orange Compact #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4007bd3
refactor: change name of old `Orange Business Tools` theme for `Orang…
pylapp Feb 5, 2026
edebcaf
chore: update deps
pylapp Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/cliff.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ header = """
🧬 Core Sosh version:
🧬 Core Wireframe version:
🧬 Orange brand version:
🧬 Orange Business Tools brand version:
🧬 Orange Compact brand version:
🧬 Sosh brand version:
🧬 Wireframe brand version:
```
Expand Down Expand Up @@ -98,4 +98,4 @@ ignore_tags = ""
topo_order = false

# Sorts the commits inside sections by oldest/newest order
sort_commits = "newest"
sort_commits = "newest"
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ 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/1.1.0...develop)

### Changed

- Rename of *Orange Business Tools* theme to *Orange Compact* (Orange-OpenSource/ouds-ios#1292)


## [1.1.0](https://github.com/Orange-OpenSource/ouds-ios-design-system-toolbox/compare/1.0.0...1.1.0) - 2026-01-27

### Added
Expand Down
2 changes: 1 addition & 1 deletion DesignToolbox/DesignToolbox (Light)/DesignToolbox_Light_App.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import SwiftUI
OrangeTheme(),
SoshTheme(),
WireframeTheme(),
OrangeBusinessToolsTheme(),
OrangeCompactTheme(),
]

var body: some Scene {
Expand Down
152 changes: 76 additions & 76 deletions DesignToolbox/DesignToolbox.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions DesignToolbox/DesignToolbox/Pages/About/AboutPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ struct AboutPage: View {
VersionItem(title: "app_about_details_themeSoshBrandVersion",
version: OUDSVersions.themeSoshBrandVersion)

VersionItem(title: "app_about_details_themeOrangeBusinessToolsBrandVersion",
version: OUDSVersions.themeOrangeBusinessToolsBrandVersion)
VersionItem(title: "app_about_details_themeOrangeCompactBrandVersion",
version: OUDSVersions.themeOrangeCompactBrandVersion)

VersionItem(title: "app_about_details_themeWireframeBrandVersion",
version: OUDSVersions.themeWireframeBrandVersion)
Expand Down
22 changes: 11 additions & 11 deletions DesignToolbox/DesignToolbox/Pages/Navigation Bar/ThemeSelection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ extension OUDSTheme: @retroactive Identifiable, @retroactive Hashable {
if self is OrangeTheme {
constructedId = "Orange"
}
if self is OrangeBusinessToolsTheme {
constructedId = "Orange Business Tools"
if self is OrangeCompactTheme {
constructedId = "Orange Compact"
}
if self is SoshTheme {
constructedId = "Sosh"
Expand Down Expand Up @@ -84,7 +84,7 @@ extension OUDSTheme: @retroactive Identifiable, @retroactive Hashable {
@MainActor final class ThemeProvider: ObservableObject {

let orangeThemes: [OUDSTheme]
let orangeBusinessToolsThemes: [OUDSTheme]
let orangeCompactThemes: [OUDSTheme]
let otherThemes: [OUDSTheme]

let allThemes: [OUDSTheme]
Expand All @@ -111,9 +111,9 @@ extension OUDSTheme: @retroactive Identifiable, @retroactive Hashable {
let orangeBusinessOrangeTheme = OrangeTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.OrangeBusiness)
let maxItOrangeTheme = OrangeTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.MaxIt)

let orangeFranceOrangeBusinessToolsTheme = OrangeBusinessToolsTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.OrangeFrance)
let orangeBusinessOrangeBusinessToolsTheme = OrangeBusinessToolsTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.OrangeBusiness)
let maxItOrangeBusinessToolsTheme = OrangeBusinessToolsTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.MaxIt)
let orangeFranceOrangeCompactTheme = OrangeCompactTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.OrangeFrance)
let orangeBusinessOrangeCompactTheme = OrangeCompactTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.OrangeBusiness)
let maxItOrangeCompactTheme = OrangeCompactTheme(fontFamily: Self.localizedHelveticaFont(), tuning: Tuning.MaxIt)

let soshTheme = SoshTheme()
let wireframeTheme = WireframeTheme()
Expand All @@ -123,9 +123,9 @@ extension OUDSTheme: @retroactive Identifiable, @retroactive Hashable {
// Fill arrays for menus

orangeThemes = [orangeFranceOrangeTheme, orangeBusinessOrangeTheme, maxItOrangeTheme]
orangeBusinessToolsThemes = [orangeFranceOrangeBusinessToolsTheme, orangeBusinessOrangeBusinessToolsTheme, maxItOrangeBusinessToolsTheme]
orangeCompactThemes = [orangeFranceOrangeCompactTheme, orangeBusinessOrangeCompactTheme, maxItOrangeCompactTheme]
otherThemes = [soshTheme, wireframeTheme]
allThemes = orangeThemes + orangeBusinessToolsThemes + otherThemes
allThemes = orangeThemes + orangeCompactThemes + otherThemes

if let theme = allThemes.first(where: { $0.id == ThemeProvider.currentTheme }) {
currentTheme = theme
Expand Down Expand Up @@ -190,10 +190,10 @@ struct ThemeSelectionButton: View {
.pickerStyle(.inline)
}

// Orange Business Tools theme and tunings
Menu("Orange Business Tools") {
// Orange Compact theme and tunings
Menu("Orange Compact") {
Picker(selection: $themeProvider.currentTheme, label: EmptyView()) {
ForEach(themeProvider.orangeBusinessToolsThemes, id: \.id) { theme in
ForEach(themeProvider.orangeCompactThemes, id: \.id) { theme in
Text(theme.description).tag(theme)
}
}
Expand Down
13 changes: 7 additions & 6 deletions DesignToolbox/DesignToolbox/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,26 +434,26 @@
}
}
},
"app_about_details_themeOrangeBusinessToolsBrandVersion" : {
"comment" : "About screen - Tokens library version (Orange Business Tools)",
"app_about_details_themeOrangeCompactBrandVersion" : {
"comment" : "About screen - Tokens library version (Orange Compact)",
"extractionState" : "manual",
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "إصدار مكتبة الرموز المميزة للعلامة التجارية Orange Business Tools:"
"value" : "إصدار مكتبة الرموز المميزة للعلامة التجارية Orange Compact :"
}
},
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Orange Business Tools brand tokens library version:"
"value" : "Orange Compact brand tokens library version:"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Version des tokens brand Orange Business Tools :"
"value" : "Version des tokens brand Orange Compact :"
}
}
}
Expand Down Expand Up @@ -5439,7 +5439,8 @@
"Orange" : {
"shouldTranslate" : false
},
"Orange Business Tools" : {
"Orange Compact" : {
"extractionState" : "manual",
"shouldTranslate" : false
}
},
Expand Down
4 changes: 2 additions & 2 deletions DesignToolbox/DesignToolbox/Utils/Image+extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extension Image {

/// Returns a decorative `Image` with the given named loaded form the suitable workspace depending to the theme name
static func decorativeImage(named: String, prefixedBy themeName: String) -> Image {
if themeName.contains("Orange") { // "Orange" and "Orange Business Tools" themes
if themeName.contains("Orange") { // "Orange" and "Orange cCompact" themes
Image(decorative: "Orange/\(named)")
} else {
Image(decorative: "\(themeName)/\(named)")
Expand All @@ -34,7 +34,7 @@ extension Image {
/// Returns a decorative default `Image` view with a prefix in the name, upposed to be theme assets folder.
/// Supposed ot have in the Design System Toolbox, in assets folder, folders with assets "providing namespaces".
static func defaultImage(prefixedBy themeName: String) -> Image {
if themeName.contains("Orange") { // "Orange" and "Orange Business Tools" themes
if themeName.contains("Orange") { // "Orange" and "Orange Compact" themes
Image(decorative: "Orange/tips-and-tricks")
} else {
Image(decorative: "\(themeName)/tips-and-tricks")
Expand Down
4 changes: 2 additions & 2 deletions DesignToolbox/DesignToolboxSnapshotsTests/OUDSTheme+Name.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ extension OUDSTheme {
if self is OrangeTheme {
return "Orange"
}
if self is OrangeBusinessToolsTheme {
return "Orange Business Tools"
if self is OrangeCompactTheme {
return "Orange Compact"
}
if self is SoshTheme {
return "Sosh"
Expand Down
73 changes: 0 additions & 73 deletions ...BusinessToolsTheme/Components/Actions/OrangeBusinessToolsTheme+ButtonSnapshotsTests.swift
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions ...inessToolsTheme/Components/Controls/OrangeBusinessToolsTheme+CheckboxSnapshotsTests.swift
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...BusinessToolsTheme/Components/Controls/OrangeBusinessToolsTheme+ChipsSnapshotsTests.swift
View file
Open in desktop

This file was deleted.

Loading
Loading