From f6dd4e02d3fc8dadd2a932759e944c73c31d3300 Mon Sep 17 00:00:00 2001 From: Anton Yarmolenko <37253+rnr@users.noreply.github.com> Date: Fri, 13 Dec 2024 18:13:42 +0100 Subject: [PATCH] chore: added missed colors --- .../Colors/Tabbar/Contents.json | 6 +++ .../TabbarActiveColor.colorset}/Contents.json | 0 .../TabbarBGColor.colorset/Contents.json | 38 +++++++++++++++++++ .../Contents.json | 38 +++++++++++++++++++ Theme/Theme/SwiftGen/ThemeAssets.swift | 4 +- Theme/Theme/Theme.swift | 1 - 6 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 Theme/Theme/Assets.xcassets/Colors/Tabbar/Contents.json rename Theme/Theme/Assets.xcassets/Colors/{TabbarColor.colorset => Tabbar/TabbarActiveColor.colorset}/Contents.json (100%) create mode 100644 Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarBGColor.colorset/Contents.json create mode 100644 Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarInactiveColor.colorset/Contents.json diff --git a/Theme/Theme/Assets.xcassets/Colors/Tabbar/Contents.json b/Theme/Theme/Assets.xcassets/Colors/Tabbar/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/Tabbar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/Assets.xcassets/Colors/TabbarColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarActiveColor.colorset/Contents.json similarity index 100% rename from Theme/Theme/Assets.xcassets/Colors/TabbarColor.colorset/Contents.json rename to Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarActiveColor.colorset/Contents.json diff --git a/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarBGColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarBGColor.colorset/Contents.json new file mode 100644 index 000000000..7e4772ec9 --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarBGColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFA", + "green" : "0xF9", + "red" : "0xF8" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.275", + "green" : "0.200", + "red" : "0.153" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarInactiveColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarInactiveColor.colorset/Contents.json new file mode 100644 index 000000000..93691d3e8 --- /dev/null +++ b/Theme/Theme/Assets.xcassets/Colors/Tabbar/TabbarInactiveColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.733", + "green" : "0.647", + "red" : "0.592" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.624", + "green" : "0.533", + "red" : "0.475" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Theme/Theme/SwiftGen/ThemeAssets.swift b/Theme/Theme/SwiftGen/ThemeAssets.swift index 7d875a806..bee684564 100644 --- a/Theme/Theme/SwiftGen/ThemeAssets.swift +++ b/Theme/Theme/SwiftGen/ThemeAssets.swift @@ -71,7 +71,9 @@ public enum ThemeAssets { public static let disabledButton = ColorAsset(name: "disabledButton") public static let disabledButtonText = ColorAsset(name: "disabledButtonText") public static let success = ColorAsset(name: "Success") - public static let tabbarColor = ColorAsset(name: "TabbarColor") + public static let tabbarActiveColor = ColorAsset(name: "TabbarActiveColor") + public static let tabbarBGColor = ColorAsset(name: "TabbarBGColor") + public static let tabbarInactiveColor = ColorAsset(name: "TabbarInactiveColor") public static let textPrimary = ColorAsset(name: "TextPrimary") public static let textSecondary = ColorAsset(name: "TextSecondary") public static let textSecondaryLight = ColorAsset(name: "TextSecondaryLight") diff --git a/Theme/Theme/Theme.swift b/Theme/Theme/Theme.swift index 621c85769..884e918b8 100644 --- a/Theme/Theme/Theme.swift +++ b/Theme/Theme/Theme.swift @@ -61,7 +61,6 @@ public struct Theme: Sendable { nonisolated(unsafe) public private(set) static var secondaryButtonTextColor = ThemeAssets.secondaryButtonTextColor.swiftUIColor nonisolated(unsafe) public private(set) static var secondaryButtonBGColor = ThemeAssets.secondaryButtonBGColor.swiftUIColor nonisolated(unsafe) public private(set) static var success = ThemeAssets.success.swiftUIColor - nonisolated(unsafe) public private(set) static var tabbarColor = ThemeAssets.tabbarColor.swiftUIColor nonisolated(unsafe) public private(set) static var primaryButtonTextColor = ThemeAssets.primaryButtonTextColor.swiftUIColor nonisolated(unsafe) public private(set) static var toggleSwitchColor = ThemeAssets.toggleSwitchColor.swiftUIColor nonisolated(unsafe) public private(set) static var textInputTextColor = ThemeAssets.textInputTextColor.swiftUIColor