From 7e321603487dda63009744b2e9e83d4160d33030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Megi=CC=81as?= Date: Mon, 22 Jul 2024 17:59:15 +0200 Subject: [PATCH] re-generate tokens --- .../Colors/BlauColorPalette.swift | 11 + .../Colors/ColorToolkit+Color.swift | 52 ++--- .../Colors/ColorToolkit+UIColor.swift | 188 +++--------------- .../MisticaCommon/Colors/MisticaColor.swift | 4 + .../MisticaCommon/Colors/MisticaColors.swift | 15 +- .../Colors/MovistarColorPalette.swift | 39 ++-- .../MisticaCommon/Colors/O2ColorPalette.swift | 39 ++-- .../Colors/O2NewColorPalette.swift | 61 +++--- .../Colors/TelefonicaColorPalette.swift | 23 ++- .../MisticaCommon/Colors/TuColorPalette.swift | 23 ++- .../Colors/VivoColorPalette.swift | 39 ++-- .../Colors/VivoNewColorPalette.swift | 39 ++-- .../Fonts/MisticaFontSizes.swift | 2 +- 13 files changed, 246 insertions(+), 289 deletions(-) diff --git a/Sources/MisticaCommon/Colors/BlauColorPalette.swift b/Sources/MisticaCommon/Colors/BlauColorPalette.swift index 37056419..74578c1c 100644 --- a/Sources/MisticaCommon/Colors/BlauColorPalette.swift +++ b/Sources/MisticaCommon/Colors/BlauColorPalette.swift @@ -268,6 +268,17 @@ struct BlauColors: MisticaColors { let tagBackgroundWarning = BlauColors.palette.blauYellow10 | BlauColors.palette.darkModeGrey6 let tagBackgroundError = BlauColors.palette.blauRed10 | BlauColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + BlauColors.palette.grey6.withAlphaComponent(0), + BlauColors.palette.grey6.withAlphaComponent(0.4), + BlauColors.palette.grey6.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct BlauColorPalette { diff --git a/Sources/MisticaCommon/Colors/ColorToolkit+Color.swift b/Sources/MisticaCommon/Colors/ColorToolkit+Color.swift index 661c505c..b8518211 100644 --- a/Sources/MisticaCommon/Colors/ColorToolkit+Color.swift +++ b/Sources/MisticaCommon/Colors/ColorToolkit+Color.swift @@ -9,16 +9,16 @@ import SwiftUI public extension Color { - static var background: Color { - MisticaConfig.currentColors.background.color + static var backgroundBrandSecondary: Color { + MisticaConfig.currentColors.backgroundBrandSecondary.color } - static var backgroundAlternative: Color { - MisticaConfig.currentColors.backgroundAlternative.color + static var appBarBackground: Color { + MisticaConfig.currentColors.appBarBackground.color } - static var backgroundBrandSecondary: Color { - MisticaConfig.currentColors.backgroundBrandSecondary.color + static var background: Color { + MisticaConfig.currentColors.background.color } static var backgroundContainer: Color { @@ -65,20 +65,20 @@ public extension Color { MisticaConfig.currentColors.backgroundSkeletonInverse.color } - static var backgroundBrandTop: Color { - MisticaConfig.currentColors.backgroundBrandTop.color + static var navigationBarBackground: Color { + MisticaConfig.currentColors.navigationBarBackground.color } - static var backgroundBrandBottom: Color { - MisticaConfig.currentColors.backgroundBrandBottom.color + static var backgroundAlternative: Color { + MisticaConfig.currentColors.backgroundAlternative.color } - static var appBarBackground: Color { - MisticaConfig.currentColors.appBarBackground.color + static var backgroundBrandTop: Color { + MisticaConfig.currentColors.backgroundBrandTop.color } - static var navigationBarBackground: Color { - MisticaConfig.currentColors.navigationBarBackground.color + static var backgroundBrandBottom: Color { + MisticaConfig.currentColors.backgroundBrandBottom.color } static var skeletonWave: Color { @@ -169,6 +169,10 @@ public extension Color { MisticaConfig.currentColors.buttonSecondaryBorderSelected.color } + static var buttonSecondaryBorderInverse: Color { + MisticaConfig.currentColors.buttonSecondaryBorderInverse.color + } + static var buttonSecondaryBackgroundHover: Color { MisticaConfig.currentColors.buttonSecondaryBackgroundHover.color } @@ -177,10 +181,6 @@ public extension Color { MisticaConfig.currentColors.buttonSecondaryBackgroundSelected.color } - static var buttonSecondaryBorderInverse: Color { - MisticaConfig.currentColors.buttonSecondaryBorderInverse.color - } - static var buttonSecondaryBorderInverseSelected: Color { MisticaConfig.currentColors.buttonSecondaryBorderInverseSelected.color } @@ -361,14 +361,6 @@ public extension Color { MisticaConfig.currentColors.textSecondaryInverse.color } - static var success: Color { - MisticaConfig.currentColors.success.color - } - - static var warning: Color { - MisticaConfig.currentColors.warning.color - } - static var error: Color { MisticaConfig.currentColors.error.color } @@ -381,6 +373,14 @@ public extension Color { MisticaConfig.currentColors.textErrorInverse.color } + static var success: Color { + MisticaConfig.currentColors.success.color + } + + static var warning: Color { + MisticaConfig.currentColors.warning.color + } + static var promo: Color { MisticaConfig.currentColors.promo.color } diff --git a/Sources/MisticaCommon/Colors/ColorToolkit+UIColor.swift b/Sources/MisticaCommon/Colors/ColorToolkit+UIColor.swift index 33bcbe75..9c75a5f2 100644 --- a/Sources/MisticaCommon/Colors/ColorToolkit+UIColor.swift +++ b/Sources/MisticaCommon/Colors/ColorToolkit+UIColor.swift @@ -9,647 +9,511 @@ import UIKit public extension UIColor { - @objc(backgroundColor) - static var background: UIColor { - MisticaConfig.currentColors.background + static var backgroundBrandSecondary: UIColor { + MisticaConfig.currentColors.backgroundBrandSecondary } - @objc(backgroundAlternativeColor) - static var backgroundAlternative: UIColor { - MisticaConfig.currentColors.backgroundAlternative + static var appBarBackground: UIColor { + MisticaConfig.currentColors.appBarBackground } - @objc(backgroundBrandSecondaryColor) - static var backgroundBrandSecondary: UIColor { - MisticaConfig.currentColors.backgroundBrandSecondary + static var background: UIColor { + MisticaConfig.currentColors.background } - @objc(backgroundContainerColor) static var backgroundContainer: UIColor { MisticaConfig.currentColors.backgroundContainer } - @objc(backgroundContainerErrorColor) static var backgroundContainerError: UIColor { MisticaConfig.currentColors.backgroundContainerError } - @objc(backgroundContainerHoverColor) static var backgroundContainerHover: UIColor { MisticaConfig.currentColors.backgroundContainerHover } - @objc(backgroundContainerPressedColor) static var backgroundContainerPressed: UIColor { MisticaConfig.currentColors.backgroundContainerPressed } - @objc(backgroundContainerBrandHoverColor) static var backgroundContainerBrandHover: UIColor { MisticaConfig.currentColors.backgroundContainerBrandHover } - @objc(backgroundContainerBrandPressedColor) static var backgroundContainerBrandPressed: UIColor { MisticaConfig.currentColors.backgroundContainerBrandPressed } - @objc(backgroundContainerBrandOverInverseColor) static var backgroundContainerBrandOverInverse: UIColor { MisticaConfig.currentColors.backgroundContainerBrandOverInverse } - @objc(backgroundContainerAlternativeColor) static var backgroundContainerAlternative: UIColor { MisticaConfig.currentColors.backgroundContainerAlternative } - @objc(backgroundOverlayColor) static var backgroundOverlay: UIColor { MisticaConfig.currentColors.backgroundOverlay } - @objc(backgroundSkeletonColor) static var backgroundSkeleton: UIColor { MisticaConfig.currentColors.backgroundSkeleton } - @objc(backgroundSkeletonInverseColor) static var backgroundSkeletonInverse: UIColor { MisticaConfig.currentColors.backgroundSkeletonInverse } - @objc(backgroundBrandTopColor) - static var backgroundBrandTop: UIColor { - MisticaConfig.currentColors.backgroundBrandTop + static var navigationBarBackground: UIColor { + MisticaConfig.currentColors.navigationBarBackground } - @objc(backgroundBrandBottomColor) - static var backgroundBrandBottom: UIColor { - MisticaConfig.currentColors.backgroundBrandBottom + static var backgroundAlternative: UIColor { + MisticaConfig.currentColors.backgroundAlternative } - @objc(appBarBackgroundColor) - static var appBarBackground: UIColor { - MisticaConfig.currentColors.appBarBackground + static var backgroundBrandTop: UIColor { + MisticaConfig.currentColors.backgroundBrandTop } - @objc(navigationBarBackgroundColor) - static var navigationBarBackground: UIColor { - MisticaConfig.currentColors.navigationBarBackground + static var backgroundBrandBottom: UIColor { + MisticaConfig.currentColors.backgroundBrandBottom } - @objc(skeletonWaveColor) static var skeletonWave: UIColor { MisticaConfig.currentColors.skeletonWave } - @objc(borderLowColor) static var borderLow: UIColor { MisticaConfig.currentColors.borderLow } - @objc(borderColor) static var border: UIColor { MisticaConfig.currentColors.border } - @objc(borderHighColor) static var borderHigh: UIColor { MisticaConfig.currentColors.borderHigh } - @objc(borderSelectedColor) static var borderSelected: UIColor { MisticaConfig.currentColors.borderSelected } - @objc(coverBackgroundHoverColor) static var coverBackgroundHover: UIColor { MisticaConfig.currentColors.coverBackgroundHover } - @objc(coverBackgroundPressedColor) static var coverBackgroundPressed: UIColor { MisticaConfig.currentColors.coverBackgroundPressed } - @objc(buttonDangerBackgroundColor) static var buttonDangerBackground: UIColor { MisticaConfig.currentColors.buttonDangerBackground } - @objc(buttonDangerBackgroundSelectedColor) static var buttonDangerBackgroundSelected: UIColor { MisticaConfig.currentColors.buttonDangerBackgroundSelected } - @objc(buttonDangerBackgroundHoverColor) static var buttonDangerBackgroundHover: UIColor { MisticaConfig.currentColors.buttonDangerBackgroundHover } - @objc(buttonLinkDangerBackgroundSelectedColor) static var buttonLinkDangerBackgroundSelected: UIColor { MisticaConfig.currentColors.buttonLinkDangerBackgroundSelected } - @objc(buttonLinkDangerBackgroundInverseColor) static var buttonLinkDangerBackgroundInverse: UIColor { MisticaConfig.currentColors.buttonLinkDangerBackgroundInverse } - @objc(buttonLinkDangerBackgroundInverseSelectedColor) static var buttonLinkDangerBackgroundInverseSelected: UIColor { MisticaConfig.currentColors.buttonLinkDangerBackgroundInverseSelected } - @objc(buttonLinkBackgroundSelectedColor) static var buttonLinkBackgroundSelected: UIColor { MisticaConfig.currentColors.buttonLinkBackgroundSelected } - @objc(buttonLinkBackgroundInverseSelectedColor) static var buttonLinkBackgroundInverseSelected: UIColor { MisticaConfig.currentColors.buttonLinkBackgroundInverseSelected } - @objc(buttonPrimaryBackgroundColor) static var buttonPrimaryBackground: UIColor { MisticaConfig.currentColors.buttonPrimaryBackground } - @objc(buttonPrimaryBackgroundInverseColor) static var buttonPrimaryBackgroundInverse: UIColor { MisticaConfig.currentColors.buttonPrimaryBackgroundInverse } - @objc(buttonPrimaryBackgroundSelectedColor) static var buttonPrimaryBackgroundSelected: UIColor { MisticaConfig.currentColors.buttonPrimaryBackgroundSelected } - @objc(buttonPrimaryBackgroundHoverColor) static var buttonPrimaryBackgroundHover: UIColor { MisticaConfig.currentColors.buttonPrimaryBackgroundHover } - @objc(buttonPrimaryBackgroundInverseSelectedColor) static var buttonPrimaryBackgroundInverseSelected: UIColor { MisticaConfig.currentColors.buttonPrimaryBackgroundInverseSelected } - @objc(buttonSecondaryBorderColor) static var buttonSecondaryBorder: UIColor { MisticaConfig.currentColors.buttonSecondaryBorder } - @objc(buttonSecondaryBorderSelectedColor) static var buttonSecondaryBorderSelected: UIColor { MisticaConfig.currentColors.buttonSecondaryBorderSelected } - @objc(buttonSecondaryBackgroundHoverColor) + static var buttonSecondaryBorderInverse: UIColor { + MisticaConfig.currentColors.buttonSecondaryBorderInverse + } + static var buttonSecondaryBackgroundHover: UIColor { MisticaConfig.currentColors.buttonSecondaryBackgroundHover } - @objc(buttonSecondaryBackgroundSelectedColor) static var buttonSecondaryBackgroundSelected: UIColor { MisticaConfig.currentColors.buttonSecondaryBackgroundSelected } - @objc(buttonSecondaryBorderInverseColor) - static var buttonSecondaryBorderInverse: UIColor { - MisticaConfig.currentColors.buttonSecondaryBorderInverse - } - - @objc(buttonSecondaryBorderInverseSelectedColor) static var buttonSecondaryBorderInverseSelected: UIColor { MisticaConfig.currentColors.buttonSecondaryBorderInverseSelected } - @objc(buttonSecondaryBackgroundInverseHoverColor) static var buttonSecondaryBackgroundInverseHover: UIColor { MisticaConfig.currentColors.buttonSecondaryBackgroundInverseHover } - @objc(buttonSecondaryBackgroundInverseSelectedColor) static var buttonSecondaryBackgroundInverseSelected: UIColor { MisticaConfig.currentColors.buttonSecondaryBackgroundInverseSelected } - @objc(textButtonPrimaryColor) static var textButtonPrimary: UIColor { MisticaConfig.currentColors.textButtonPrimary } - @objc(textButtonPrimaryInverseColor) static var textButtonPrimaryInverse: UIColor { MisticaConfig.currentColors.textButtonPrimaryInverse } - @objc(textButtonPrimaryInverseSelectedColor) static var textButtonPrimaryInverseSelected: UIColor { MisticaConfig.currentColors.textButtonPrimaryInverseSelected } - @objc(textButtonSecondaryColor) static var textButtonSecondary: UIColor { MisticaConfig.currentColors.textButtonSecondary } - @objc(textButtonSecondarySelectedColor) static var textButtonSecondarySelected: UIColor { MisticaConfig.currentColors.textButtonSecondarySelected } - @objc(textButtonSecondaryInverseColor) static var textButtonSecondaryInverse: UIColor { MisticaConfig.currentColors.textButtonSecondaryInverse } - @objc(textButtonSecondaryInverseSelectedColor) static var textButtonSecondaryInverseSelected: UIColor { MisticaConfig.currentColors.textButtonSecondaryInverseSelected } - @objc(textLinkColor) static var textLink: UIColor { MisticaConfig.currentColors.textLink } - @objc(textLinkInverseColor) static var textLinkInverse: UIColor { MisticaConfig.currentColors.textLinkInverse } - @objc(textLinkDangerColor) static var textLinkDanger: UIColor { MisticaConfig.currentColors.textLinkDanger } - @objc(textLinkSnackbarColor) static var textLinkSnackbar: UIColor { MisticaConfig.currentColors.textLinkSnackbar } - @objc(textActivatedColor) static var textActivated: UIColor { MisticaConfig.currentColors.textActivated } - @objc(textBrandColor) static var textBrand: UIColor { MisticaConfig.currentColors.textBrand } - @objc(controlColor) static var control: UIColor { MisticaConfig.currentColors.control } - @objc(controlActivatedColor) static var controlActivated: UIColor { MisticaConfig.currentColors.controlActivated } - @objc(controlInverseColor) static var controlInverse: UIColor { MisticaConfig.currentColors.controlInverse } - @objc(controlActivatedInverseColor) static var controlActivatedInverse: UIColor { MisticaConfig.currentColors.controlActivatedInverse } - @objc(controlErrorColor) static var controlError: UIColor { MisticaConfig.currentColors.controlError } - @objc(barTrackColor) static var barTrack: UIColor { MisticaConfig.currentColors.barTrack } - @objc(loadingBarColor) static var loadingBar: UIColor { MisticaConfig.currentColors.loadingBar } - @objc(loadingBarBackgroundColor) static var loadingBarBackground: UIColor { MisticaConfig.currentColors.loadingBarBackground } - @objc(toggleAndroidInactiveColor) static var toggleAndroidInactive: UIColor { MisticaConfig.currentColors.toggleAndroidInactive } - @objc(toggleAndroidBackgroundActiveColor) static var toggleAndroidBackgroundActive: UIColor { MisticaConfig.currentColors.toggleAndroidBackgroundActive } - @objc(iosControlKnobColor) static var iosControlKnob: UIColor { MisticaConfig.currentColors.iosControlKnob } - @objc(dividerColor) static var divider: UIColor { MisticaConfig.currentColors.divider } - @objc(dividerInverseColor) static var dividerInverse: UIColor { MisticaConfig.currentColors.dividerInverse } - @objc(navigationBarDividerColor) static var navigationBarDivider: UIColor { MisticaConfig.currentColors.navigationBarDivider } - @objc(badgeColor) static var badge: UIColor { MisticaConfig.currentColors.badge } - @objc(feedbackErrorBackgroundColor) static var feedbackErrorBackground: UIColor { MisticaConfig.currentColors.feedbackErrorBackground } - @objc(feedbackInfoBackgroundColor) static var feedbackInfoBackground: UIColor { MisticaConfig.currentColors.feedbackInfoBackground } - @objc(brandColor) static var brand: UIColor { MisticaConfig.currentColors.brand } - @objc(brandHighColor) static var brandHigh: UIColor { MisticaConfig.currentColors.brandHigh } - @objc(inverseColor) static var inverse: UIColor { MisticaConfig.currentColors.inverse } - @objc(neutralHighColor) static var neutralHigh: UIColor { MisticaConfig.currentColors.neutralHigh } - @objc(neutralMediumColor) static var neutralMedium: UIColor { MisticaConfig.currentColors.neutralMedium } - @objc(neutralMediumInverseColor) static var neutralMediumInverse: UIColor { MisticaConfig.currentColors.neutralMediumInverse } - @objc(neutralLowColor) static var neutralLow: UIColor { MisticaConfig.currentColors.neutralLow } - @objc(neutralLowAlternativeColor) static var neutralLowAlternative: UIColor { MisticaConfig.currentColors.neutralLowAlternative } - @objc(textPrimaryColor) static var textPrimary: UIColor { MisticaConfig.currentColors.textPrimary } - @objc(textPrimaryInverseColor) static var textPrimaryInverse: UIColor { MisticaConfig.currentColors.textPrimaryInverse } - @objc(textSecondaryColor) static var textSecondary: UIColor { MisticaConfig.currentColors.textSecondary } - @objc(textSecondaryInverseColor) static var textSecondaryInverse: UIColor { MisticaConfig.currentColors.textSecondaryInverse } - @objc(successColor) - static var success: UIColor { - MisticaConfig.currentColors.success - } - - @objc(warningColor) - static var warning: UIColor { - MisticaConfig.currentColors.warning - } - - @objc(errorColor) static var error: UIColor { MisticaConfig.currentColors.error } - @objc(textErrorColor) static var textError: UIColor { MisticaConfig.currentColors.textError } - @objc(textErrorInverseColor) static var textErrorInverse: UIColor { MisticaConfig.currentColors.textErrorInverse } - @objc(promoColor) + static var success: UIColor { + MisticaConfig.currentColors.success + } + + static var warning: UIColor { + MisticaConfig.currentColors.warning + } + static var promo: UIColor { MisticaConfig.currentColors.promo } - @objc(highlightColor) static var highlight: UIColor { MisticaConfig.currentColors.highlight } - @objc(successLowColor) static var successLow: UIColor { MisticaConfig.currentColors.successLow } - @objc(warningLowColor) static var warningLow: UIColor { MisticaConfig.currentColors.warningLow } - @objc(errorLowColor) static var errorLow: UIColor { MisticaConfig.currentColors.errorLow } - @objc(promoLowColor) static var promoLow: UIColor { MisticaConfig.currentColors.promoLow } - @objc(brandLowColor) static var brandLow: UIColor { MisticaConfig.currentColors.brandLow } - @objc(successHighColor) static var successHigh: UIColor { MisticaConfig.currentColors.successHigh } - @objc(warningHighColor) static var warningHigh: UIColor { MisticaConfig.currentColors.warningHigh } - @objc(errorHighColor) static var errorHigh: UIColor { MisticaConfig.currentColors.errorHigh } - @objc(promoHighColor) static var promoHigh: UIColor { MisticaConfig.currentColors.promoHigh } - @objc(successHighInverseColor) static var successHighInverse: UIColor { MisticaConfig.currentColors.successHighInverse } - @objc(warningHighInverseColor) static var warningHighInverse: UIColor { MisticaConfig.currentColors.warningHighInverse } - @objc(errorHighInverseColor) static var errorHighInverse: UIColor { MisticaConfig.currentColors.errorHighInverse } - @objc(promoHighInverseColor) static var promoHighInverse: UIColor { MisticaConfig.currentColors.promoHighInverse } - @objc(textNavigationBarPrimaryColor) static var textNavigationBarPrimary: UIColor { MisticaConfig.currentColors.textNavigationBarPrimary } - @objc(textNavigationBarSecondaryColor) static var textNavigationBarSecondary: UIColor { MisticaConfig.currentColors.textNavigationBarSecondary } - @objc(textNavigationSearchBarHintColor) static var textNavigationSearchBarHint: UIColor { MisticaConfig.currentColors.textNavigationSearchBarHint } - @objc(textNavigationSearchBarTextColor) static var textNavigationSearchBarText: UIColor { MisticaConfig.currentColors.textNavigationSearchBarText } - @objc(textAppBarColor) static var textAppBar: UIColor { MisticaConfig.currentColors.textAppBar } - @objc(textAppBarSelectedColor) static var textAppBarSelected: UIColor { MisticaConfig.currentColors.textAppBarSelected } - @objc(customTabsBackgroundColor) static var customTabsBackground: UIColor { MisticaConfig.currentColors.customTabsBackground } - @objc(tagTextPromoColor) static var tagTextPromo: UIColor { MisticaConfig.currentColors.tagTextPromo } - @objc(tagTextActiveColor) static var tagTextActive: UIColor { MisticaConfig.currentColors.tagTextActive } - @objc(tagTextInactiveColor) static var tagTextInactive: UIColor { MisticaConfig.currentColors.tagTextInactive } - @objc(tagTextSuccessColor) static var tagTextSuccess: UIColor { MisticaConfig.currentColors.tagTextSuccess } - @objc(tagTextWarningColor) static var tagTextWarning: UIColor { MisticaConfig.currentColors.tagTextWarning } - @objc(tagTextErrorColor) static var tagTextError: UIColor { MisticaConfig.currentColors.tagTextError } - @objc(tagBackgroundPromoColor) static var tagBackgroundPromo: UIColor { MisticaConfig.currentColors.tagBackgroundPromo } - @objc(tagBackgroundActiveColor) static var tagBackgroundActive: UIColor { MisticaConfig.currentColors.tagBackgroundActive } - @objc(tagBackgroundInactiveColor) static var tagBackgroundInactive: UIColor { MisticaConfig.currentColors.tagBackgroundInactive } - @objc(tagBackgroundSuccessColor) static var tagBackgroundSuccess: UIColor { MisticaConfig.currentColors.tagBackgroundSuccess } - @objc(tagBackgroundWarningColor) static var tagBackgroundWarning: UIColor { MisticaConfig.currentColors.tagBackgroundWarning } - @objc(tagBackgroundErrorColor) static var tagBackgroundError: UIColor { MisticaConfig.currentColors.tagBackgroundError } } - -public extension BrandStyle { - var preferredStatusBarStyle: UIStatusBarStyle { - switch self { - case .movistar, .vivo, .o2, .o2New, .blau, .custom, .vivoNew, .tu, .telefonica: - return .lightContent - } - } -} diff --git a/Sources/MisticaCommon/Colors/MisticaColor.swift b/Sources/MisticaCommon/Colors/MisticaColor.swift index 50ec3eeb..a528231c 100644 --- a/Sources/MisticaCommon/Colors/MisticaColor.swift +++ b/Sources/MisticaCommon/Colors/MisticaColor.swift @@ -21,4 +21,8 @@ public extension MisticaColor { static var backgroundContainerBrand: MisticaColor { MisticaConfig.currentColors.backgroundContainerBrand } + + static var cardContentOverlay: MisticaColor { + MisticaConfig.currentColors.cardContentOverlay + } } diff --git a/Sources/MisticaCommon/Colors/MisticaColors.swift b/Sources/MisticaCommon/Colors/MisticaColors.swift index f26c1b4b..0619575e 100644 --- a/Sources/MisticaCommon/Colors/MisticaColors.swift +++ b/Sources/MisticaCommon/Colors/MisticaColors.swift @@ -9,10 +9,10 @@ import UIKit public protocol MisticaColors { - var background: UIColor { get } - var backgroundAlternative: UIColor { get } var backgroundBrand: MisticaColor { get } var backgroundBrandSecondary: UIColor { get } + var appBarBackground: UIColor { get } + var background: UIColor { get } var backgroundContainer: UIColor { get } var backgroundContainerError: UIColor { get } var backgroundContainerHover: UIColor { get } @@ -25,10 +25,10 @@ public protocol MisticaColors { var backgroundOverlay: UIColor { get } var backgroundSkeleton: UIColor { get } var backgroundSkeletonInverse: UIColor { get } + var navigationBarBackground: UIColor { get } + var backgroundAlternative: UIColor { get } var backgroundBrandTop: UIColor { get } var backgroundBrandBottom: UIColor { get } - var appBarBackground: UIColor { get } - var navigationBarBackground: UIColor { get } var skeletonWave: UIColor { get } var borderLow: UIColor { get } var border: UIColor { get } @@ -51,9 +51,9 @@ public protocol MisticaColors { var buttonPrimaryBackgroundInverseSelected: UIColor { get } var buttonSecondaryBorder: UIColor { get } var buttonSecondaryBorderSelected: UIColor { get } + var buttonSecondaryBorderInverse: UIColor { get } var buttonSecondaryBackgroundHover: UIColor { get } var buttonSecondaryBackgroundSelected: UIColor { get } - var buttonSecondaryBorderInverse: UIColor { get } var buttonSecondaryBorderInverseSelected: UIColor { get } var buttonSecondaryBackgroundInverseHover: UIColor { get } var buttonSecondaryBackgroundInverseSelected: UIColor { get } @@ -99,11 +99,11 @@ public protocol MisticaColors { var textPrimaryInverse: UIColor { get } var textSecondary: UIColor { get } var textSecondaryInverse: UIColor { get } - var success: UIColor { get } - var warning: UIColor { get } var error: UIColor { get } var textError: UIColor { get } var textErrorInverse: UIColor { get } + var success: UIColor { get } + var warning: UIColor { get } var promo: UIColor { get } var highlight: UIColor { get } var successLow: UIColor { get } @@ -138,4 +138,5 @@ public protocol MisticaColors { var tagBackgroundSuccess: UIColor { get } var tagBackgroundWarning: UIColor { get } var tagBackgroundError: UIColor { get } + var cardContentOverlay: MisticaColor { get } } diff --git a/Sources/MisticaCommon/Colors/MovistarColorPalette.swift b/Sources/MisticaCommon/Colors/MovistarColorPalette.swift index 6d244f27..eef02544 100644 --- a/Sources/MisticaCommon/Colors/MovistarColorPalette.swift +++ b/Sources/MisticaCommon/Colors/MovistarColorPalette.swift @@ -11,14 +11,14 @@ import UIKit struct MovistarColors: MisticaColors { static let palette = MovistarColorPalette() - let background = MovistarColors.palette.white | MovistarColors.palette.darkModeBlack - - let backgroundAlternative = MovistarColors.palette.grey1 | MovistarColors.palette.darkModeBlack - let backgroundBrand = MisticaColor.solid(MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack) let backgroundBrandSecondary = MovistarColors.palette.movistarBlueDark | MovistarColors.palette.darkModeBlack + let appBarBackground = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey + + let background = MovistarColors.palette.white | MovistarColors.palette.darkModeBlack + let backgroundContainer = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey let backgroundContainerError = MovistarColors.palette.pepper10 | MovistarColors.palette.darkModeGrey @@ -43,13 +43,13 @@ struct MovistarColors: MisticaColors { let backgroundSkeletonInverse = MovistarColors.palette.movistarBlue55 | MovistarColors.palette.darkModeGrey6 - let backgroundBrandTop = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack + let navigationBarBackground = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack - let backgroundBrandBottom = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack + let backgroundAlternative = MovistarColors.palette.grey1 | MovistarColors.palette.darkModeBlack - let appBarBackground = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey + let backgroundBrandTop = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack - let navigationBarBackground = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack + let backgroundBrandBottom = MovistarColors.palette.movistarBlue | MovistarColors.palette.darkModeBlack let skeletonWave = MovistarColors.palette.grey2 | MovistarColors.palette.darkModeGrey6 @@ -95,12 +95,12 @@ struct MovistarColors: MisticaColors { let buttonSecondaryBorderSelected = MovistarColors.palette.movistarBlueHC65 | MovistarColors.palette.white + let buttonSecondaryBorderInverse = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey2 + let buttonSecondaryBackgroundHover = MovistarColors.palette.movistarBlue10 | MovistarColors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = MovistarColors.palette.movistarBlue15 | MovistarColors.palette.white.withAlphaComponent(0.25) - let buttonSecondaryBorderInverse = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey2 - let buttonSecondaryBorderInverseSelected = MovistarColors.palette.white | MovistarColors.palette.darkModeGrey2 let buttonSecondaryBackgroundInverseHover = MovistarColors.palette.white.withAlphaComponent(0.2) | MovistarColors.palette.white.withAlphaComponent(0.15) @@ -191,16 +191,16 @@ struct MovistarColors: MisticaColors { let textSecondaryInverse = MovistarColors.palette.movistarBlue10 | MovistarColors.palette.darkModeGrey4 - let success = MovistarColors.palette.movistarGreen55 | MovistarColors.palette.movistarGreen - - let warning = MovistarColors.palette.egg55 | MovistarColors.palette.egg - let error = MovistarColors.palette.pepper55 | MovistarColors.palette.pepper45 let textError = MovistarColors.palette.pepper55 | MovistarColors.palette.pepper45 let textErrorInverse = MovistarColors.palette.white | MovistarColors.palette.pepper45 + let success = MovistarColors.palette.movistarGreen55 | MovistarColors.palette.movistarGreen + + let warning = MovistarColors.palette.egg55 | MovistarColors.palette.egg + let promo = MovistarColors.palette.purple | MovistarColors.palette.purple40 let highlight = MovistarColors.palette.pink55 | MovistarColors.palette.pink45 @@ -268,6 +268,17 @@ struct MovistarColors: MisticaColors { let tagBackgroundWarning = MovistarColors.palette.egg10 | MovistarColors.palette.darkModeGrey7 let tagBackgroundError = MovistarColors.palette.pepper10 | MovistarColors.palette.darkModeGrey7 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + MovistarColors.palette.black.withAlphaComponent(0), + MovistarColors.palette.black.withAlphaComponent(0.4), + MovistarColors.palette.black.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct MovistarColorPalette { diff --git a/Sources/MisticaCommon/Colors/O2ColorPalette.swift b/Sources/MisticaCommon/Colors/O2ColorPalette.swift index fb9f21b9..8e6fcabb 100644 --- a/Sources/MisticaCommon/Colors/O2ColorPalette.swift +++ b/Sources/MisticaCommon/Colors/O2ColorPalette.swift @@ -11,14 +11,14 @@ import UIKit struct O2Colors: MisticaColors { static let palette = O2ColorPalette() - let background = O2Colors.palette.white | O2Colors.palette.darkModeBlack - - let backgroundAlternative = O2Colors.palette.grey1 | O2Colors.palette.darkModeBlack - let backgroundBrand = MisticaColor.solid(O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack) let backgroundBrandSecondary = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack + let appBarBackground = O2Colors.palette.white | O2Colors.palette.darkModeGrey + + let background = O2Colors.palette.white | O2Colors.palette.darkModeBlack + let backgroundContainer = O2Colors.palette.white | O2Colors.palette.darkModeGrey let backgroundContainerError = O2Colors.palette.pepper10 | O2Colors.palette.darkModeGrey @@ -43,13 +43,13 @@ struct O2Colors: MisticaColors { let backgroundSkeletonInverse = O2Colors.palette.o2BluePrimary70 | O2Colors.palette.darkModeGrey6 - let backgroundBrandTop = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack + let navigationBarBackground = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack - let backgroundBrandBottom = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack + let backgroundAlternative = O2Colors.palette.grey1 | O2Colors.palette.darkModeBlack - let appBarBackground = O2Colors.palette.white | O2Colors.palette.darkModeGrey + let backgroundBrandTop = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack - let navigationBarBackground = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack + let backgroundBrandBottom = O2Colors.palette.o2BluePrimary | O2Colors.palette.darkModeBlack let skeletonWave = O2Colors.palette.grey2 | O2Colors.palette.grey5 @@ -95,12 +95,12 @@ struct O2Colors: MisticaColors { let buttonSecondaryBorderSelected = O2Colors.palette.o2BluePrimary70 | O2Colors.palette.white + let buttonSecondaryBorderInverse = O2Colors.palette.white + let buttonSecondaryBackgroundHover = O2Colors.palette.o2BluePrimary10 | O2Colors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = O2Colors.palette.o2BluePrimary10 | O2Colors.palette.white.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = O2Colors.palette.white - let buttonSecondaryBorderInverseSelected = O2Colors.palette.o2BluePrimary30 | O2Colors.palette.white let buttonSecondaryBackgroundInverseHover = O2Colors.palette.white.withAlphaComponent(0.15) @@ -191,16 +191,16 @@ struct O2Colors: MisticaColors { let textSecondaryInverse = O2Colors.palette.o2BluePrimary15 | O2Colors.palette.grey4 - let success = O2Colors.palette.o2Green - - let warning = O2Colors.palette.o2Orange - let error = O2Colors.palette.pepper let textError = O2Colors.palette.pepper let textErrorInverse = O2Colors.palette.white | O2Colors.palette.pepper + let success = O2Colors.palette.o2Green + + let warning = O2Colors.palette.o2Orange + let promo = O2Colors.palette.o2Purple let highlight = O2Colors.palette.o2Pink @@ -268,6 +268,17 @@ struct O2Colors: MisticaColors { let tagBackgroundWarning = O2Colors.palette.o2Orange10 | O2Colors.palette.darkModeGrey6 let tagBackgroundError = O2Colors.palette.pepper10 | O2Colors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + O2Colors.palette.black.withAlphaComponent(0), + O2Colors.palette.black.withAlphaComponent(0.4), + O2Colors.palette.black.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct O2ColorPalette { diff --git a/Sources/MisticaCommon/Colors/O2NewColorPalette.swift b/Sources/MisticaCommon/Colors/O2NewColorPalette.swift index ecadc51e..d5045566 100644 --- a/Sources/MisticaCommon/Colors/O2NewColorPalette.swift +++ b/Sources/MisticaCommon/Colors/O2NewColorPalette.swift @@ -11,8 +11,6 @@ import UIKit struct O2NewColors: MisticaColors { static let palette = O2NewColorPalette() - let background = O2NewColors.palette.white | O2NewColors.palette.darkModeBlack - let backgroundBrand = MisticaColor.gradient(MisticaGradient( colors: [ @@ -24,20 +22,11 @@ struct O2NewColors: MisticaColors { angle: 180 )) - let backgroundContainerBrand = MisticaColor.gradient(MisticaGradient( - colors: - [ - O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeGrey, - O2NewColors.palette.beyondBlue | O2NewColors.palette.darkModeGrey, - O2NewColors.palette.beyondBlue45 | O2NewColors.palette.darkModeGrey - ], - stops: [0, 0.64, 1], - angle: 180 - )) + let backgroundBrandSecondary = O2NewColors.palette.beyondBlue | O2NewColors.palette.darkModeBlack - let backgroundAlternative = O2NewColors.palette.grey20 | O2NewColors.palette.darkModeBlack + let appBarBackground = O2NewColors.palette.white | O2NewColors.palette.darkModeGrey - let backgroundBrandSecondary = O2NewColors.palette.beyondBlue | O2NewColors.palette.darkModeBlack + let background = O2NewColors.palette.white | O2NewColors.palette.darkModeBlack let backgroundContainer = O2NewColors.palette.white | O2NewColors.palette.darkModeGrey @@ -47,6 +36,17 @@ struct O2NewColors: MisticaColors { let backgroundContainerPressed = O2NewColors.palette.darkModeBlack.withAlphaComponent(0.05) | O2NewColors.palette.white.withAlphaComponent(0.05) + let backgroundContainerBrand = MisticaColor.gradient(MisticaGradient( + colors: + [ + O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeGrey, + O2NewColors.palette.beyondBlue | O2NewColors.palette.darkModeGrey, + O2NewColors.palette.beyondBlue45 | O2NewColors.palette.darkModeGrey + ], + stops: [0, 0.64, 1], + angle: 180 + )) + let backgroundContainerBrandHover = O2NewColors.palette.darkModeBlack.withAlphaComponent(0.2) | O2NewColors.palette.white.withAlphaComponent(0.03) let backgroundContainerBrandPressed = O2NewColors.palette.darkModeBlack.withAlphaComponent(0.4) | O2NewColors.palette.white.withAlphaComponent(0.05) @@ -61,13 +61,13 @@ struct O2NewColors: MisticaColors { let backgroundSkeletonInverse = O2NewColors.palette.beyondBlue70 | O2NewColors.palette.darkModeGrey6 - let backgroundBrandTop = O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeBlack + let navigationBarBackground = O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeBlack - let backgroundBrandBottom = O2NewColors.palette.beyondBlue45 | O2NewColors.palette.darkModeBlack + let backgroundAlternative = O2NewColors.palette.grey20 | O2NewColors.palette.darkModeBlack - let appBarBackground = O2NewColors.palette.white | O2NewColors.palette.darkModeGrey + let backgroundBrandTop = O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeBlack - let navigationBarBackground = O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeBlack + let backgroundBrandBottom = O2NewColors.palette.beyondBlue45 | O2NewColors.palette.darkModeBlack let skeletonWave = O2NewColors.palette.grey30 | O2NewColors.palette.grey80 @@ -113,12 +113,12 @@ struct O2NewColors: MisticaColors { let buttonSecondaryBorderSelected = O2NewColors.palette.beyondBlue70 | O2NewColors.palette.white + let buttonSecondaryBorderInverse = O2NewColors.palette.white + let buttonSecondaryBackgroundHover = O2NewColors.palette.beyondBlue10 | O2NewColors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = O2NewColors.palette.beyondBlue10 | O2NewColors.palette.white.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = O2NewColors.palette.white - let buttonSecondaryBorderInverseSelected = O2NewColors.palette.beyondBlue30 | O2NewColors.palette.white let buttonSecondaryBackgroundInverseHover = O2NewColors.palette.white.withAlphaComponent(0.15) @@ -177,7 +177,7 @@ struct O2NewColors: MisticaColors { let dividerInverse = O2NewColors.palette.white.withAlphaComponent(0.2) | O2NewColors.palette.white.withAlphaComponent(0.1) - let navigationBarDivider = O2NewColors.palette.beyondBlue | O2NewColors.palette.darkModeBlack + let navigationBarDivider = O2NewColors.palette.darkBlue | O2NewColors.palette.darkModeBlack let badge = O2NewColors.palette.o2Red65 @@ -209,16 +209,16 @@ struct O2NewColors: MisticaColors { let textSecondaryInverse = O2NewColors.palette.beyondBlue10 | O2NewColors.palette.grey45 - let success = O2NewColors.palette.o2Green - - let warning = O2NewColors.palette.o2Orange - let error = O2NewColors.palette.o2Red65 | O2NewColors.palette.o2Red45 let textError = O2NewColors.palette.o2Red65 | O2NewColors.palette.o2Red45 let textErrorInverse = O2NewColors.palette.white | O2NewColors.palette.o2Red45 + let success = O2NewColors.palette.o2Green + + let warning = O2NewColors.palette.o2Orange + let promo = O2NewColors.palette.o2Pink let highlight = O2NewColors.palette.o2Pink80 | O2NewColors.palette.o2Pink @@ -286,6 +286,17 @@ struct O2NewColors: MisticaColors { let tagBackgroundWarning = O2NewColors.palette.o2Orange10 | O2NewColors.palette.darkModeGrey6 let tagBackgroundError = O2NewColors.palette.o2Red10 | O2NewColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + O2NewColors.palette.beyondBlue.withAlphaComponent(0) | O2NewColors.palette.black.withAlphaComponent(0), + O2NewColors.palette.beyondBlue.withAlphaComponent(0.4) | O2NewColors.palette.black.withAlphaComponent(0.4), + O2NewColors.palette.beyondBlue.withAlphaComponent(1) | O2NewColors.palette.black.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct O2NewColorPalette { diff --git a/Sources/MisticaCommon/Colors/TelefonicaColorPalette.swift b/Sources/MisticaCommon/Colors/TelefonicaColorPalette.swift index 4d2d81cb..68fd2633 100644 --- a/Sources/MisticaCommon/Colors/TelefonicaColorPalette.swift +++ b/Sources/MisticaCommon/Colors/TelefonicaColorPalette.swift @@ -11,6 +11,10 @@ import UIKit struct TelefonicaColors: MisticaColors { static let palette = TelefonicaColorPalette() + let backgroundBrand = MisticaColor.solid(TelefonicaColors.palette.telefonicaBlue | TelefonicaColors.palette.darkModeBlack) + + let backgroundBrandSecondary = TelefonicaColors.palette.telefonicaBlue | TelefonicaColors.palette.darkModeBlack + let appBarBackground = TelefonicaColors.palette.white | TelefonicaColors.palette.darkModeGrey let background = TelefonicaColors.palette.white | TelefonicaColors.palette.darkModeBlack @@ -33,10 +37,6 @@ struct TelefonicaColors: MisticaColors { let backgroundContainerAlternative = TelefonicaColors.palette.grey1 | TelefonicaColors.palette.darkModeGrey - let backgroundBrand = MisticaColor.solid(TelefonicaColors.palette.telefonicaBlue | TelefonicaColors.palette.darkModeBlack) - - let backgroundBrandSecondary = TelefonicaColors.palette.telefonicaBlue | TelefonicaColors.palette.darkModeBlack - let backgroundOverlay = TelefonicaColors.palette.grey6.withAlphaComponent(0.8) | TelefonicaColors.palette.darkModeGrey.withAlphaComponent(0.8) let backgroundSkeleton = TelefonicaColors.palette.grey2 | TelefonicaColors.palette.grey6 @@ -95,12 +95,12 @@ struct TelefonicaColors: MisticaColors { let buttonSecondaryBorderSelected = TelefonicaColors.palette.telefonicaBlue70 | TelefonicaColors.palette.white + let buttonSecondaryBorderInverse = TelefonicaColors.palette.white + let buttonSecondaryBackgroundHover = TelefonicaColors.palette.telefonicaBlue10 | TelefonicaColors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = TelefonicaColors.palette.telefonicaBlue10 | TelefonicaColors.palette.white.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = TelefonicaColors.palette.white - let buttonSecondaryBorderInverseSelected = TelefonicaColors.palette.white let buttonSecondaryBackgroundInverseHover = TelefonicaColors.palette.white.withAlphaComponent(0.1) | TelefonicaColors.palette.white.withAlphaComponent(0.15) @@ -268,6 +268,17 @@ struct TelefonicaColors: MisticaColors { let tagBackgroundWarning = TelefonicaColors.palette.ambar10 | TelefonicaColors.palette.darkModeGrey6 let tagBackgroundError = TelefonicaColors.palette.coral10 | TelefonicaColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + TelefonicaColors.palette.black.withAlphaComponent(0), + TelefonicaColors.palette.black.withAlphaComponent(0.4), + TelefonicaColors.palette.black.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct TelefonicaColorPalette { diff --git a/Sources/MisticaCommon/Colors/TuColorPalette.swift b/Sources/MisticaCommon/Colors/TuColorPalette.swift index 714fb35b..798e38f7 100644 --- a/Sources/MisticaCommon/Colors/TuColorPalette.swift +++ b/Sources/MisticaCommon/Colors/TuColorPalette.swift @@ -11,6 +11,10 @@ import UIKit struct TuColors: MisticaColors { static let palette = TuColorPalette() + let backgroundBrand = MisticaColor.solid(TuColors.palette.primary | TuColors.palette.darkModeBlack) + + let backgroundBrandSecondary = TuColors.palette.blue | TuColors.palette.darkModeBlack + let appBarBackground = TuColors.palette.white | TuColors.palette.darkModeGrey let background = TuColors.palette.white | TuColors.palette.darkModeBlack @@ -33,10 +37,6 @@ struct TuColors: MisticaColors { let backgroundContainerAlternative = TuColors.palette.grey1 | TuColors.palette.darkModeGrey - let backgroundBrand = MisticaColor.solid(TuColors.palette.primary | TuColors.palette.darkModeBlack) - - let backgroundBrandSecondary = TuColors.palette.blue | TuColors.palette.darkModeBlack - let backgroundOverlay = TuColors.palette.primary.withAlphaComponent(0.8) | TuColors.palette.darkModeGrey.withAlphaComponent(0.8) let backgroundSkeleton = TuColors.palette.grey2 | TuColors.palette.darkModeGrey6 @@ -95,12 +95,12 @@ struct TuColors: MisticaColors { let buttonSecondaryBorderSelected = TuColors.palette.blue70 | TuColors.palette.grey2 + let buttonSecondaryBorderInverse = TuColors.palette.white | TuColors.palette.grey2 + let buttonSecondaryBackgroundHover = TuColors.palette.blue10 | TuColors.palette.grey2.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = TuColors.palette.blue10 | TuColors.palette.grey2.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = TuColors.palette.white | TuColors.palette.grey2 - let buttonSecondaryBorderInverseSelected = TuColors.palette.white | TuColors.palette.grey2 let buttonSecondaryBackgroundInverseHover = TuColors.palette.white.withAlphaComponent(0.1) | TuColors.palette.grey2.withAlphaComponent(0.15) @@ -268,6 +268,17 @@ struct TuColors: MisticaColors { let tagBackgroundWarning = TuColors.palette.orange20 | TuColors.palette.darkModeGrey6 let tagBackgroundError = TuColors.palette.red10 | TuColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + TuColors.palette.black.withAlphaComponent(0), + TuColors.palette.black.withAlphaComponent(0.4), + TuColors.palette.black.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct TuColorPalette { diff --git a/Sources/MisticaCommon/Colors/VivoColorPalette.swift b/Sources/MisticaCommon/Colors/VivoColorPalette.swift index 76ed0ebd..343f2072 100644 --- a/Sources/MisticaCommon/Colors/VivoColorPalette.swift +++ b/Sources/MisticaCommon/Colors/VivoColorPalette.swift @@ -11,14 +11,14 @@ import UIKit struct VivoColors: MisticaColors { static let palette = VivoColorPalette() - let background = VivoColors.palette.white | VivoColors.palette.darkModeBlack - - let backgroundAlternative = VivoColors.palette.grey1 | VivoColors.palette.darkModeBlack - let backgroundBrand = MisticaColor.solid(VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack) let backgroundBrandSecondary = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack + let appBarBackground = VivoColors.palette.white | VivoColors.palette.darkModeGrey + + let background = VivoColors.palette.white | VivoColors.palette.darkModeBlack + let backgroundContainer = VivoColors.palette.white | VivoColors.palette.darkModeGrey let backgroundContainerError = VivoColors.palette.pepperLight10 | VivoColors.palette.darkModeGrey @@ -43,13 +43,13 @@ struct VivoColors: MisticaColors { let backgroundSkeletonInverse = VivoColors.palette.vivoPurpleDark | VivoColors.palette.darkModeGrey6 - let backgroundBrandTop = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack + let navigationBarBackground = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack - let backgroundBrandBottom = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack + let backgroundAlternative = VivoColors.palette.grey1 | VivoColors.palette.darkModeBlack - let appBarBackground = VivoColors.palette.white | VivoColors.palette.darkModeGrey + let backgroundBrandTop = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack - let navigationBarBackground = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack + let backgroundBrandBottom = VivoColors.palette.vivoPurple | VivoColors.palette.darkModeBlack let skeletonWave = VivoColors.palette.grey2 | VivoColors.palette.grey5 @@ -95,12 +95,12 @@ struct VivoColors: MisticaColors { let buttonSecondaryBorderSelected = VivoColors.palette.vivoPurpleDark | VivoColors.palette.white + let buttonSecondaryBorderInverse = VivoColors.palette.white + let buttonSecondaryBackgroundHover = VivoColors.palette.vivoPurpleLight10 | VivoColors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = VivoColors.palette.vivoPurpleLight10 | VivoColors.palette.white.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = VivoColors.palette.white - let buttonSecondaryBorderInverseSelected = VivoColors.palette.white let buttonSecondaryBackgroundInverseHover = VivoColors.palette.white.withAlphaComponent(0.15) @@ -191,16 +191,16 @@ struct VivoColors: MisticaColors { let textSecondaryInverse = VivoColors.palette.vivoPurpleLight20 | VivoColors.palette.grey4 - let success = VivoColors.palette.vivoGreen - - let warning = VivoColors.palette.orange - let error = VivoColors.palette.pepper let textError = VivoColors.palette.pepper let textErrorInverse = VivoColors.palette.white | VivoColors.palette.pepper + let success = VivoColors.palette.vivoGreen + + let warning = VivoColors.palette.orange + let promo = VivoColors.palette.vivoPurple | VivoColors.palette.vivoPurpleLight80 let highlight = VivoColors.palette.pink @@ -268,6 +268,17 @@ struct VivoColors: MisticaColors { let tagBackgroundWarning = VivoColors.palette.orangeLight10 | VivoColors.palette.darkModeGrey6 let tagBackgroundError = VivoColors.palette.pepperLight10 | VivoColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + VivoColors.palette.grey6.withAlphaComponent(0), + VivoColors.palette.grey6.withAlphaComponent(0.4), + VivoColors.palette.grey6.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct VivoColorPalette { diff --git a/Sources/MisticaCommon/Colors/VivoNewColorPalette.swift b/Sources/MisticaCommon/Colors/VivoNewColorPalette.swift index eb0e62b2..3bc56051 100644 --- a/Sources/MisticaCommon/Colors/VivoNewColorPalette.swift +++ b/Sources/MisticaCommon/Colors/VivoNewColorPalette.swift @@ -11,14 +11,14 @@ import UIKit struct VivoNewColors: MisticaColors { static let palette = VivoNewColorPalette() - let background = VivoNewColors.palette.white | VivoNewColors.palette.darkModeBlack - - let backgroundAlternative = VivoNewColors.palette.grey1 | VivoNewColors.palette.darkModeBlack - let backgroundBrand = MisticaColor.solid(VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack) let backgroundBrandSecondary = VivoNewColors.palette.vivoPurpleLight80 | VivoNewColors.palette.darkModeBlack + let appBarBackground = VivoNewColors.palette.white | VivoNewColors.palette.darkModeGrey + + let background = VivoNewColors.palette.white | VivoNewColors.palette.darkModeBlack + let backgroundContainer = VivoNewColors.palette.white | VivoNewColors.palette.darkModeGrey let backgroundContainerError = VivoNewColors.palette.pepperLight10 | VivoNewColors.palette.darkModeGrey @@ -43,13 +43,13 @@ struct VivoNewColors: MisticaColors { let backgroundSkeletonInverse = VivoNewColors.palette.vivoPurpleDark | VivoNewColors.palette.darkModeGrey6 - let backgroundBrandTop = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack + let navigationBarBackground = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack - let backgroundBrandBottom = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack + let backgroundAlternative = VivoNewColors.palette.grey1 | VivoNewColors.palette.darkModeBlack - let appBarBackground = VivoNewColors.palette.white | VivoNewColors.palette.darkModeGrey + let backgroundBrandTop = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack - let navigationBarBackground = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack + let backgroundBrandBottom = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.darkModeBlack let skeletonWave = VivoNewColors.palette.grey2 | VivoNewColors.palette.grey5 @@ -95,12 +95,12 @@ struct VivoNewColors: MisticaColors { let buttonSecondaryBorderSelected = VivoNewColors.palette.vivoPurpleDark | VivoNewColors.palette.white + let buttonSecondaryBorderInverse = VivoNewColors.palette.white + let buttonSecondaryBackgroundHover = VivoNewColors.palette.vivoPurpleLight10 | VivoNewColors.palette.white.withAlphaComponent(0.15) let buttonSecondaryBackgroundSelected = VivoNewColors.palette.vivoPurpleLight10 | VivoNewColors.palette.white.withAlphaComponent(0.15) - let buttonSecondaryBorderInverse = VivoNewColors.palette.white - let buttonSecondaryBorderInverseSelected = VivoNewColors.palette.white let buttonSecondaryBackgroundInverseHover = VivoNewColors.palette.white.withAlphaComponent(0.15) @@ -191,16 +191,16 @@ struct VivoNewColors: MisticaColors { let textSecondaryInverse = VivoNewColors.palette.vivoPurpleLight20 | VivoNewColors.palette.grey4 - let success = VivoNewColors.palette.vivoGreen - - let warning = VivoNewColors.palette.orange - let error = VivoNewColors.palette.pepper let textError = VivoNewColors.palette.pepper let textErrorInverse = VivoNewColors.palette.white | VivoNewColors.palette.pepper + let success = VivoNewColors.palette.vivoGreen + + let warning = VivoNewColors.palette.orange + let promo = VivoNewColors.palette.vivoPurple | VivoNewColors.palette.vivoPurpleLight80 let highlight = VivoNewColors.palette.pink @@ -268,6 +268,17 @@ struct VivoNewColors: MisticaColors { let tagBackgroundWarning = VivoNewColors.palette.orangeLight10 | VivoNewColors.palette.darkModeGrey6 let tagBackgroundError = VivoNewColors.palette.pepperLight10 | VivoNewColors.palette.darkModeGrey6 + + let cardContentOverlay = MisticaColor.gradient(MisticaGradient( + colors: + [ + VivoNewColors.palette.grey6.withAlphaComponent(0), + VivoNewColors.palette.grey6.withAlphaComponent(0.4), + VivoNewColors.palette.grey6.withAlphaComponent(0.7) + ], + stops: [0, 0.3, 1], + angle: 180 + )) } public struct VivoNewColorPalette { diff --git a/Sources/MisticaCommon/Fonts/MisticaFontSizes.swift b/Sources/MisticaCommon/Fonts/MisticaFontSizes.swift index 071ec95e..02615970 100644 --- a/Sources/MisticaCommon/Fonts/MisticaFontSizes.swift +++ b/Sources/MisticaCommon/Fonts/MisticaFontSizes.swift @@ -6,7 +6,7 @@ // Copyright © Telefonica. All rights reserved. // -import UIKit +import Foundation public protocol MisticaFontSizes { var tabsLabel: CGFloat { get }