diff --git a/ElementX/Sources/Letro/Extensions/CompoundExtensions.swift b/ElementX/Sources/Letro/Extensions/CompoundExtensions.swift index 60f433d82..e70db352a 100644 --- a/ElementX/Sources/Letro/Extensions/CompoundExtensions.swift +++ b/ElementX/Sources/Letro/Extensions/CompoundExtensions.swift @@ -20,28 +20,26 @@ enum CompoundExtensions { extension CompoundColors { @MainActor func applyLetroOverrides() { - override(\.gradientSubtleStop1, with: CompoundCoreColorTokens.alphaOrange500) - override(\.gradientSubtleStop2, with: CompoundCoreColorTokens.alphaOrange400) - override(\.gradientSubtleStop3, with: CompoundCoreColorTokens.alphaOrange300) - override(\.gradientSubtleStop4, with: CompoundCoreColorTokens.alphaOrange200) - override(\.gradientSubtleStop5, with: CompoundCoreColorTokens.alphaOrange100) - override(\.gradientSubtleStop6, with: CompoundCoreColorTokens.transparent) - override(\.iconAccentTertiary, with: CompoundCoreColorTokens.orange800) - override(\.bgAccentRest, with: CompoundCoreColorTokens.orange900) + override(\.gradientSubtleStop1, with: .letroGradient1.opacity(0.33)) + override(\.gradientSubtleStop2, with: .letroGradient2.opacity(0.22)) + override(\.gradientSubtleStop3, with: .letroGradient3.opacity(0.11)) + override(\.gradientSubtleStop4, with: .letroGradient4.opacity(0.07)) + override(\.gradientSubtleStop5, with: .letroGradient5.opacity(0.04)) + override(\.iconAccentTertiary, with: .letroPrimary) + override(\.bgAccentRest, with: .letroPrimary) } } extension CompoundUIColors { @MainActor func applyLetroOverrides() { - override(\.gradientSubtleStop1, with: CompoundCoreUIColorTokens.alphaOrange500) - override(\.gradientSubtleStop2, with: CompoundCoreUIColorTokens.alphaOrange400) - override(\.gradientSubtleStop3, with: CompoundCoreUIColorTokens.alphaOrange300) - override(\.gradientSubtleStop4, with: CompoundCoreUIColorTokens.alphaOrange200) - override(\.gradientSubtleStop5, with: CompoundCoreUIColorTokens.alphaOrange100) - override(\.gradientSubtleStop6, with: CompoundCoreUIColorTokens.transparent) - override(\.iconAccentTertiary, with: CompoundCoreUIColorTokens.orange800) - override(\.bgAccentRest, with: CompoundCoreUIColorTokens.orange900) + override(\.gradientSubtleStop1, with: .letroGradient1.withAlphaComponent(0.33)) + override(\.gradientSubtleStop2, with: .letroGradient2.withAlphaComponent(0.22)) + override(\.gradientSubtleStop3, with: .letroGradient3.withAlphaComponent(0.11)) + override(\.gradientSubtleStop4, with: .letroGradient4.withAlphaComponent(0.07)) + override(\.gradientSubtleStop5, with: .letroGradient5.withAlphaComponent(0.04)) + override(\.iconAccentTertiary, with: .letroPrimary) + override(\.bgAccentRest, with: .letroPrimary) } } diff --git a/ElementX/Sources/Letro/Extensions/SwiftUIExtensions.swift b/ElementX/Sources/Letro/Extensions/SwiftUIExtensions.swift index 462545d75..8d9c6534d 100644 --- a/ElementX/Sources/Letro/Extensions/SwiftUIExtensions.swift +++ b/ElementX/Sources/Letro/Extensions/SwiftUIExtensions.swift @@ -9,8 +9,15 @@ import SwiftUI import UIKit public extension Color { - static let letroPrimary = Color(hex: 0xC20000) + static let letroPrimary = Color(hex: 0xF32D1B) + static let letroSecondary = Color(hex: 0xF9BC15) static let letroGray = Color(hex: 0xB1B3B9) + static let letroGradient1 = Color(hex: 0xCB2000) + static let letroGradient2 = Color(hex: 0xD33900) + static let letroGradient3 = Color(hex: 0xDD5A00) + static let letroGradient4 = Color(hex: 0xE98200) + static let letroGradient5 = Color(hex: 0xF7B000) + init(hex: UInt32) { self.init(.sRGB, red: Double((hex >> 16) & 0xFF) / 255.0, green: Double((hex >> 8) & 0xFF) / 255.0, blue: Double(hex & 0xFF) / 255.0, opacity: 1) @@ -18,8 +25,14 @@ public extension Color { } public extension UIColor { - static let letroPrimary = UIColor(hex: 0xC20000) + static let letroPrimary = UIColor(hex: 0xF32D1B) + static let letroSecondary = UIColor(hex: 0xF9BC15) static let letroGray = UIColor(hex: 0xB1B3B9) + static let letroGradient1 = UIColor(hex: 0xCB2000) + static let letroGradient2 = UIColor(hex: 0xD33900) + static let letroGradient3 = UIColor(hex: 0xDD5A00) + static let letroGradient4 = UIColor(hex: 0xE98200) + static let letroGradient5 = UIColor(hex: 0xF7B000) convenience init(hex: UInt32) { self.init(red: CGFloat((hex >> 16) & 0xFF) / 255.0, green: CGFloat((hex >> 8) & 0xFF) / 255.0, blue: CGFloat(hex & 0xFF) / 255.0, alpha: 1)