Fix invalid rendering mode on image illustration for component page

Orange-OpenSource · Jan 20, 2025 · 395f2a9 · 395f2a9
1 parent 0c86d8f
commit 395f2a9
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 199 deletions.
diff --git a/OUDS/Core/Components/Sources/Buttons/OUDSButton.swift b/OUDS/Core/Components/Sources/Buttons/OUDSButton.swift
@@ -53,7 +53,9 @@ import SwiftUI
 /// If button is placed on colored surface using `OUDSColoredSurface`, the default colors (content, background and border) are automatically adjusted to switch to monochrom.
 ///
 /// **Remark: Today it is not allowed to place a Negative button on a colored surface.**
-/// 
+///
+/// **Design documentation:** https://unified-design-system.orange.com/472794e18/p/48a788-button
+///
 /// - Since: 0.10.0
 public struct OUDSButton: View {
 

diff --git a/Showcase/Showcase/Pages/Components/Button/ButtonElement.swift b/Showcase/Showcase/Pages/Components/Button/ButtonElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct ButtonElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_components_button_label"
-        imageName = "il_component_button"
+        image = Image(decorative: "il_component_button").renderingMode(.original)
         pageDescription = AnyView(ShowcaseElementPage(
                 name: name,
-                imageName: nil,
+                image: nil,
                 description: "app_components_button_description_text",
                 illustration: AnyView(ButtonPage())
             )

diff --git a/Showcase/Showcase/Pages/Components/Utils/Button/ButtonElement.swift b/Showcase/Showcase/Pages/Components/Utils/Button/ButtonElement.swift
diff --git a/Showcase/Showcase/Pages/Components/Utils/Button/ButtonPage.swift b/Showcase/Showcase/Pages/Components/Utils/Button/ButtonPage.swift
diff --git a/Showcase/Showcase/Pages/Tokens/Border/BorderTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Border/BorderTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct BorderTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_border_label"
-        imageName = "ic_border"
+        image = Image(decorative: "ic_border").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_border").renderingMode(.template),
             description: "app_tokens_border_description_text",
             illustration: AnyView(BorderTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Color/ColorTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Color/ColorTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct ColorTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_color_label"
-        imageName = "ic_palette"
+        image = Image(decorative: "ic_palette").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_palette").renderingMode(.template),
             description: "app_tokens_color_description_text",
             illustration: AnyView(ColorTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Dimension/DimensionTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Dimension/DimensionTokenElement.swift
@@ -16,7 +16,7 @@ import SwiftUI
 struct DimensionTokenElement: ShowcaseElement {
 
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
@@ -26,10 +26,10 @@ struct DimensionTokenElement: ShowcaseElement {
         ]
 
         name = "app_tokens_dimension_label"
-        imageName = "ic_dimension"
+        image = Image(decorative: "ic_dimension").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_dimension").renderingMode(.template),
             description: "app_tokens_dimension_description_text",
             illustration: AnyView(ShowcaseVariantElement(elements: variants))))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Dimension/Size/SizeTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct SizeTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_dimension_size_label"
-        imageName = "ic_dimension"
+        image = Image(decorative: "ic_dimension").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_dimension").renderingMode(.template),
             description: "app_tokens_dimension_size_description_text",
             illustration: AnyView(SizeTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Dimension/Space/SpaceTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct SpaceTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_dimension_space_label"
-        imageName = "ic_dimension"
+        image = Image(decorative: "ic_dimension").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_dimension").renderingMode(.template),
             description: "app_tokens_dimension_space_description_text",
             illustration: AnyView(SpaceTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Elevation/ElevationTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct ElevationTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_elevation_label"
-        imageName = "ic_layers"
+        image = Image(decorative: "ic_layers").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_layers").renderingMode(.template),
             description: "app_tokens_elevation_description_text",
             illustration: AnyView(ElevationTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Font/FontTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Font/FontTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct FontTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_typography_label"
-        imageName = "ic_typography"
+        image = Image(decorative: "ic_typography").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_typography").renderingMode(.template),
             description: "app_tokens_typography_description_text",
             illustration: AnyView(FontTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Grid/GridTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Grid/GridTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct GridTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_grid_label"
-        imageName = "ic_grid"
+        image = Image(decorative: "ic_grid").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_grid").renderingMode(.template),
             description: "app_tokens_grid_description_text",
             illustration: AnyView(GridTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenElement.swift b/Showcase/Showcase/Pages/Tokens/Opacity/OpacityTokenElement.swift
@@ -15,15 +15,15 @@ import SwiftUI
 
 struct OpacityTokenElement: ShowcaseElement {
     let name: String
-    let imageName: String
+    let image: Image
     let pageDescription: AnyView
 
     init() {
         name = "app_tokens_opacity_label"
-        imageName = "ic_filter_effects"
+        image = Image(decorative: "ic_filter_effects").renderingMode(.template)
         pageDescription = AnyView(ShowcaseElementPage(
             name: name,
-            imageName: imageName,
+            image: Image(decorative: "ic_filter_effects").renderingMode(.template),
             description: "app_tokens_opacity_description_text",
             illustration: AnyView(OpacityTokenPage())))
     }

diff --git a/Showcase/Showcase/Pages/Utils/Cards/CardIllustration.swift b/Showcase/Showcase/Pages/Utils/Cards/CardIllustration.swift
@@ -29,7 +29,6 @@ struct CardIllustration: View {
             Spacer()
             icon
                 .resizable()
-                .renderingMode(.template)
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 88, height: 88, alignment: .center)
                 .clipped()

diff --git a/Showcase/Showcase/Pages/Utils/Elements/ShowcaseElement.swift b/Showcase/Showcase/Pages/Utils/Elements/ShowcaseElement.swift
@@ -16,7 +16,7 @@ import SwiftUI
 @MainActor
 protocol ShowcaseElement {
     var name: String { get }
-    var imageName: String { get }
+    var image: Image { get }
     var pageDescription: AnyView { get }
 }