From 0da12b19dcfda6cb5591af36218e1da4bfe19f5d Mon Sep 17 00:00:00 2001 From: Ludovic PINEL Date: Tue, 12 Nov 2024 15:28:19 +0100 Subject: [PATCH] review: list asset in NOTICE.txt --- CHANGELOG.md | 3 +-- NOTICE.txt | 3 +++ .../OUDSTheme+GridSemanticTokens.swift | 1 + .../OUDS/Sources/OUDSUserInterfaceSizeClass.swift | 8 +++++--- .../Contents.json | 0 .../il_tokens_grid_column_margin.png | Bin .../il_tokens_grid_max_width.imageset/Contents.json | 0 .../il_tokens_grid_max_width.png | Bin .../il_tokens_grid_min_width.imageset/Contents.json | 0 .../il_tokens_grid_min_width.png | Bin 10 files changed, 10 insertions(+), 5 deletions(-) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_column_margin.imageset/Contents.json (100%) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png (100%) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_max_width.imageset/Contents.json (100%) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png (100%) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_min_width.imageset/Contents.json (100%) rename Showcase/Showcase/Resources/Assets.xcassets/{Tokens => Illustrations}/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a736e350fb..351fdf40eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- [Tool] GitHub Action to run SwiftLint for *main* and *develop* branches - [DemoApp] Add Grid tokens screen in demo app ([#151](https://github.com/Orange-OpenSource/ouds-ios/issues/151)) - +- [Tool] GitHub Action to run SwiftLint for *main* and *develop* branches ## [0.5.0](https://github.com/Orange-OpenSource/ouds-ios/compare/0.4.1...0.5.0) - 2024-10-31 diff --git a/NOTICE.txt b/NOTICE.txt index 5227bde499..17c9871b6c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -70,6 +70,9 @@ Any use or displaying shall constitute an infringement under intellectual proper ./Showcase/Showcase/Resources/Assets.xcassets/ic_component_atom.imageset/ic_component_atom.svg ./Showcase/Showcase/Resources/Assets.xcassets/ic_info.imageset/ic_info.svg ./Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_empty_screen.imageset/il_empty_screen.svg +./Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png +./Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png +./Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png ./Showcase/Showcase/Resources/Assets.xcassets/Tokens/ic_border.imageset/ic_border.svg ./Showcase/Showcase/Resources/Assets.xcassets/Tokens/ic_dimension.imageset/ic_dimension.svg ./Showcase/Showcase/Resources/Assets.xcassets/Tokens/ic_filter_effects.imageset/ic_filter_effects.svg diff --git a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+GridSemanticTokens.swift b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+GridSemanticTokens.swift index 9272ce9768..9f39837dd1 100644 --- a/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+GridSemanticTokens.swift +++ b/OUDS/Core/OUDS/Sources/OUDSTheme/OUDSTheme+SemanticTokens/OUDSTheme+GridSemanticTokens.swift @@ -14,6 +14,7 @@ import Foundation import OUDSTokensRaw import OUDSTokensSemantic + // ଘ( ･ω･)_/ﾟ･:*:･｡☆ // [File to generate with the tokenator] // WARNING: Not synchronized anymore with the Figjam / Figma by developers team diff --git a/OUDS/Core/OUDS/Sources/OUDSUserInterfaceSizeClass.swift b/OUDS/Core/OUDS/Sources/OUDSUserInterfaceSizeClass.swift index 38f80c17f5..529895377e 100644 --- a/OUDS/Core/OUDS/Sources/OUDSUserInterfaceSizeClass.swift +++ b/OUDS/Core/OUDS/Sources/OUDSUserInterfaceSizeClass.swift @@ -15,6 +15,7 @@ import SwiftUICore import UIKit // MARK: - Environment values + // swiftlint:disable type_name private struct HorizontalUserInterfaceSizeClassContractEnvironmentKey: EnvironmentKey { @@ -49,7 +50,8 @@ extension EnvironmentValues { } public enum OUDSUserInterfaceSizeClass: String, Sendable { - case extraCompact - case compact - case regular + case extraCompact = "Extra Compact" + case compact = "Compact" + case regular = "Regular" } +// swiftlint:enable type_name diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_column_margin.imageset/Contents.json b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_column_margin.imageset/Contents.json similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_column_margin.imageset/Contents.json rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_column_margin.imageset/Contents.json diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_column_margin.imageset/il_tokens_grid_column_margin.png diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_max_width.imageset/Contents.json b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_max_width.imageset/Contents.json similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_max_width.imageset/Contents.json rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_max_width.imageset/Contents.json diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_max_width.imageset/il_tokens_grid_max_width.png diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_min_width.imageset/Contents.json b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_min_width.imageset/Contents.json similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_min_width.imageset/Contents.json rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_min_width.imageset/Contents.json diff --git a/Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png b/Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png similarity index 100% rename from Showcase/Showcase/Resources/Assets.xcassets/Tokens/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png rename to Showcase/Showcase/Resources/Assets.xcassets/Illustrations/il_tokens_grid_min_width.imageset/il_tokens_grid_min_width.png