From dc5ecac596e718d9debeda1fbecdbe7311155011 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:05:43 +0300 Subject: [PATCH 01/18] Remove legacy colors. --- kit/themes/src/ColorsLegacy.ts | 144 --------------------------------- kit/themes/src/index.ts | 1 - 2 files changed, 145 deletions(-) delete mode 100644 kit/themes/src/ColorsLegacy.ts diff --git a/kit/themes/src/ColorsLegacy.ts b/kit/themes/src/ColorsLegacy.ts deleted file mode 100644 index bc9388410..000000000 --- a/kit/themes/src/ColorsLegacy.ts +++ /dev/null @@ -1,144 +0,0 @@ -import { ColorVariants, DarkTheme, LightTheme, Theme } from './Colors'; - -const StaticThemeLegacy = { - [ColorVariants.StaticTextPrimaryDark]: '#20262A', - [ColorVariants.StaticTextPrimaryLight]: '#FDFDFD', - [ColorVariants.StaticTextOverlayDark]: 'rgba(32, 38, 42, 0.6)', - [ColorVariants.StaticTextOverlayLight]: 'rgba(253, 253, 253, 0.6)', - [ColorVariants.StaticBackgroundBlack]: '#131719', - [ColorVariants.StaticBackgroundWhite]: '#FFFFFF', - [ColorVariants.StaticIconPrimaryDark]: '#20262A', - [ColorVariants.StaticIconPrimaryLight]: '#FDFDFD', - [ColorVariants.StaticHoverOverlay]: 'rgba(32, 38, 42, 0.2)', - [ColorVariants.StaticPressOverlay]: 'rgba(32, 38, 42, 0.4)', - [ColorVariants.StaticBlack]: '#000000', - [ColorVariants.StaticBackgroundAccent]: 'rgba(0, 131, 224, 0.12)', - [ColorVariants.StaticBackgroundNegative]: 'rgba(231, 23, 23, 0.12)', - [ColorVariants.StaticBackgroundPositive]: 'rgba(54, 192, 92, 0.12)', - [ColorVariants.StaticBackgroundOverlay]: 'rgba(4, 4, 4, 0.4)', -}; - -export const LightThemeLegacy: Theme = { - ...LightTheme, - ...StaticThemeLegacy, - [ColorVariants.TextPrimary]: '#20262A', - [ColorVariants.TextSecondary]: '#707376', - [ColorVariants.TextTertiary]: '#B6B8BA', - [ColorVariants.TextPrimaryInverted]: '#FAFAFA', - [ColorVariants.TextNeutral]: '#E2E3E4', - [ColorVariants.TextAccent]: '#0073C4', - [ColorVariants.TextNegative]: '#CA1414', - [ColorVariants.TextPositive]: '#2FA851', - [ColorVariants.TextWarning]: '#B08229', - [ColorVariants.TextOverlay]: 'rgba(32, 38, 42, 0.6)', - [ColorVariants.TextOverlayInverted]: 'rgba(250, 250, 250, 0.4)', - - [ColorVariants.BackgroundPrimary]: '#FAFAFA', - [ColorVariants.BackgroundSecondary]: '#F4F4F5', - [ColorVariants.BackgroundTertiary]: '#EBECEC', - [ColorVariants.BackgroundNeutral]: '#E2E3E4', - [ColorVariants.BackgroundAccent]: '#0083E0', - [ColorVariants.BackgroundNegative]: '#E71717', - [ColorVariants.BackgroundPositive]: '#36C05C', - [ColorVariants.BackgroundWarning]: '#FFC043', - [ColorVariants.BackgroundPrimaryInverted]: '#20262A', - [ColorVariants.BackgroundTertiaryInverted]: '#B6B8BA', - [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.4)', - [ColorVariants.BackgroundOverlayInverted]: 'rgba(255, 255, 255, 0.4)', - [ColorVariants.BackgroundBW]: '#FFFFFF', - - [ColorVariants.LinePrimary]: '#F4F4F5', - [ColorVariants.LineSecondary]: '#EBECEC', - [ColorVariants.LineTertiary]: '#E2E3E4', - [ColorVariants.LineNeutral]: '#20262A', - [ColorVariants.LineAccent]: '#0083E0', - [ColorVariants.LineNegative]: '#CA1414', - [ColorVariants.LinePositive]: '#2FA851', - [ColorVariants.LineOverlayDark]: 'rgba(255,255,255,.08)', - [ColorVariants.LineOverlayLight]: 'rgba(0,0,0,.04)', - - [ColorVariants.GraphAccent]: '#0073C4', - [ColorVariants.GraphPrimary]: '#20262A', - [ColorVariants.GraphSecondary]: '#707376', - [ColorVariants.GraphTertiary]: '#B6B8BA', - [ColorVariants.GraphPrimaryInverted]: '#FAFAFA', - [ColorVariants.GraphNeutral]: '#E2E3E4', - [ColorVariants.GraphNegative]: '#CA1414', - - [ColorVariants.SpecialAccentLight]: '#339CE6', - [ColorVariants.SpecialAccentDark]: '#0069B3', - - [ColorVariants.IconAccent]: '#0073C4', - // [ColorVariants.IconPrimary]: '#20262A', - [ColorVariants.IconSecondary]: '#707376', - // [ColorVariants.IconTertiary]: '#B6B8BA', - // [ColorVariants.IconPrimary]Inverted: '#FDFDFD', - [ColorVariants.IconNeutral]: '#E2E3E4', - // [ColorVariants.IconNegative]: '#CA1414', - [ColorVariants.Transparent]: 'rgba(0,0,0,0)', - [ColorVariants.KeyboardStyle]: 'light', - - [ColorVariants.Shadow]: 'rgb(32, 38, 42)', - [ColorVariants.ShadowOpaque]: 'rgba(32, 38, 42, 0.08)', -}; - -export const DarkThemeLegacy: Theme = { - ...DarkTheme, - ...StaticThemeLegacy, - [ColorVariants.TextPrimary]: '#FAFAFA', - [ColorVariants.TextSecondary]: '#ADB0B1', - [ColorVariants.TextTertiary]: '#676B6E', - [ColorVariants.TextPrimaryInverted]: '#20262A', - [ColorVariants.TextNeutral]: '#3B4043', - [ColorVariants.TextAccent]: '#0083E0', - [ColorVariants.TextNegative]: '#E71717', - [ColorVariants.TextPositive]: '#36C05C', - [ColorVariants.TextWarning]: '#FFC043', - [ColorVariants.TextOverlay]: 'rgba(250, 250, 250, 0.4)', - [ColorVariants.TextOverlayInverted]: 'rgba(32, 38, 42, 0.6)', - - [ColorVariants.BackgroundPrimary]: '#20262A', - [ColorVariants.BackgroundSecondary]: '#292F32', - [ColorVariants.BackgroundTertiary]: '#32373B', - [ColorVariants.BackgroundNeutral]: '#3B4043', - [ColorVariants.BackgroundAccent]: '#0073C4', - [ColorVariants.BackgroundNegative]: '#CA1414', - [ColorVariants.BackgroundPositive]: '#2FA851', - [ColorVariants.BackgroundWarning]: '#B08229', - [ColorVariants.BackgroundPrimaryInverted]: '#FAFAFA', - [ColorVariants.BackgroundTertiaryInverted]: '#676B6E', - [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.6)', - [ColorVariants.BackgroundOverlayInverted]: 'rgba(255, 255, 255, 0.2)', - [ColorVariants.BackgroundBW]: '#1C2125', - - [ColorVariants.LinePrimary]: '#292F32', - [ColorVariants.LineSecondary]: '#32373B', - [ColorVariants.LineTertiary]: '#32373B', - [ColorVariants.LineNeutral]: '#FAFAFA', - [ColorVariants.LineAccent]: '#0073C4', - [ColorVariants.LineNegative]: '#CA1414', - [ColorVariants.LinePositive]: '#36C05C', - [ColorVariants.LineOverlayDark]: 'rgba(0,0,0,.08)', - [ColorVariants.LineOverlayLight]: 'rgba(255,255,255,.08)', - - [ColorVariants.GraphAccent]: '#0083E0', - [ColorVariants.GraphPrimary]: '#FAFAFA', - [ColorVariants.GraphSecondary]: '#ADB0B1', - [ColorVariants.GraphTertiary]: '#676B6E', - [ColorVariants.GraphPrimaryInverted]: '#20262A', - [ColorVariants.GraphNeutral]: '#3B4043', - [ColorVariants.GraphNegative]: '#E71717', - - [ColorVariants.SpecialAccentLight]: '#338FD0', - [ColorVariants.SpecialAccentDark]: '#005C9D', - - [ColorVariants.IconAccent]: '#0073C4', - [ColorVariants.IconSecondary]: '#ADB0B1', - [ColorVariants.IconNeutral]: '#3B4043', - - [ColorVariants.Transparent]: 'rgba(0,0,0,0)', - [ColorVariants.KeyboardStyle]: 'dark', - - [ColorVariants.Shadow]: 'rgb(19, 23, 25)', - [ColorVariants.ShadowOpaque]: 'rgba(19, 23, 25, 0.4)', -}; diff --git a/kit/themes/src/index.ts b/kit/themes/src/index.ts index f6820b036..176c88cee 100644 --- a/kit/themes/src/index.ts +++ b/kit/themes/src/index.ts @@ -14,7 +14,6 @@ import * as useShadow from './useShadow'; export * from './AnimateableText'; export * from './Colors'; -export * from './ColorsLegacy'; export * from './Typography'; export * from './UIBackgroundView'; export * from './UILabel'; From b0f30b9a3af5d3453bf075a391dd70076804bdc3 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:07:39 +0300 Subject: [PATCH 02/18] Replace color TextPrimaryInverted with TextInverted. --- Example/src/screens/LargeHeader.tsx | 2 +- Example/src/screens/Lists.tsx | 7 ++----- casts/banner/src/UIBanner.tsx | 2 +- .../src/QRCodeScanner/QRCodeScanner.native.tsx | 2 +- .../src/QRCodeScanner/QRCodeScanner.web.tsx | 4 ++-- kit/controls/src/Button/useButtonChildren.tsx | 2 +- kit/media/src/UILightbox/Footer.tsx | 5 +---- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Example/src/screens/LargeHeader.tsx b/Example/src/screens/LargeHeader.tsx index 9cd76ba60..10cc73327 100644 --- a/Example/src/screens/LargeHeader.tsx +++ b/Example/src/screens/LargeHeader.tsx @@ -83,7 +83,7 @@ const renderBelowContent = () => { marginVertical: 8, }} > - + A thing happened and it takes three whole lines to explain that it happened. This isn’t likely in English but maybe in German. A thing happened and it takes three whole lines to explain that it happened. This isn’t likely in English but maybe in diff --git a/Example/src/screens/Lists.tsx b/Example/src/screens/Lists.tsx index 2c1a70bfa..1f1859191 100644 --- a/Example/src/screens/Lists.tsx +++ b/Example/src/screens/Lists.tsx @@ -71,10 +71,7 @@ const Footer = React.memo(() => { justifyContent: 'center', }} > - + Loading... @@ -112,7 +109,7 @@ function MasonryList() { > {item.index} diff --git a/casts/banner/src/UIBanner.tsx b/casts/banner/src/UIBanner.tsx index 7d3e27602..7494448d3 100644 --- a/casts/banner/src/UIBanner.tsx +++ b/casts/banner/src/UIBanner.tsx @@ -37,7 +37,7 @@ export function UIBanner(props: Props) { > {text} diff --git a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx index c67dca043..95a5b7d40 100644 --- a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx +++ b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx @@ -18,7 +18,7 @@ export function QRCodeScanner(props: React.ComponentProps {uiLocalized.QRCodeScanner.ErrorPermissions} diff --git a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx index bff9fa3b2..daf3b7bdc 100644 --- a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx +++ b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx @@ -57,7 +57,7 @@ export function QRCodeScanner(props: QRCodeScannerProps) { {uiLocalized.QRCodeScanner.ErrorPermissions} @@ -70,7 +70,7 @@ export function QRCodeScanner(props: QRCodeScannerProps) { {uiLocalized.QRCodeScanner.ErrorUnexpected} diff --git a/kit/controls/src/Button/useButtonChildren.tsx b/kit/controls/src/Button/useButtonChildren.tsx index 38d816c0c..16ada6ad2 100644 --- a/kit/controls/src/Button/useButtonChildren.tsx +++ b/kit/controls/src/Button/useButtonChildren.tsx @@ -110,7 +110,7 @@ export function ButtonIcon({ export function ButtonTitle({ children, - titleColor = UILabelColors.TextPrimaryInverted, + titleColor = UILabelColors.TextInverted, titleRole = UILabelRoles.Action, titleAnimStyle, numberOfLines = 1, diff --git a/kit/media/src/UILightbox/Footer.tsx b/kit/media/src/UILightbox/Footer.tsx index de2c0db75..3528762cc 100644 --- a/kit/media/src/UILightbox/Footer.tsx +++ b/kit/media/src/UILightbox/Footer.tsx @@ -45,10 +45,7 @@ export const Footer = ({ prompt, visibilityState }: FooterProps) => { return ( - + {prompt} From f4a7ec795996ac66acd0493789609200bf88e3bf Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:10:29 +0300 Subject: [PATCH 03/18] Replace color TextNeutral with TextSecondary. --- casts/bars/src/UIHeaderItems.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/casts/bars/src/UIHeaderItems.tsx b/casts/bars/src/UIHeaderItems.tsx index f33af7d17..e7af9f664 100644 --- a/casts/bars/src/UIHeaderItems.tsx +++ b/casts/bars/src/UIHeaderItems.tsx @@ -55,7 +55,7 @@ function UIHeaderActionItem({ disabled, label, accessibilityLabel }: HeaderItem) return ( {label} From 8eb41173f5916656c0d961a72c1b522fb6574218 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:16:03 +0300 Subject: [PATCH 04/18] Replace color TextOverlay with TextSecondary. --- kit/controls/src/UIBoxButton/constants.ts | 18 +++++++++--------- kit/controls/src/UILinkButton/constants.ts | 12 ++++++------ kit/controls/src/UIMsgButton/constants.ts | 12 ++++++------ kit/controls/src/UIWideBoxButton/constants.ts | 8 ++++---- .../content/UIWideBoxButtonNulled.tsx | 2 +- .../content/UIWideBoxButtonSecondary.tsx | 2 +- stories/chats/src/BubblePlainText.tsx | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/kit/controls/src/UIBoxButton/constants.ts b/kit/controls/src/UIBoxButton/constants.ts index 45a98b12d..1537ff16e 100644 --- a/kit/controls/src/UIBoxButton/constants.ts +++ b/kit/controls/src/UIBoxButton/constants.ts @@ -93,7 +93,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPrimary, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPrimary, }, }, @@ -103,7 +103,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextNegative, }, }, @@ -113,7 +113,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPositive, }, }, @@ -125,7 +125,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextAccent, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextAccent, }, }, @@ -135,7 +135,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextNegative, }, }, @@ -145,7 +145,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPositive, }, }, @@ -157,7 +157,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPrimary, pressedColor: ColorVariants.TextAccent, hoveredColor: ColorVariants.TextAccent, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPrimary, }, }, @@ -167,7 +167,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.TextAccent, hoveredColor: ColorVariants.TextAccent, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextNegative, }, }, @@ -177,7 +177,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.TextAccent, hoveredColor: ColorVariants.TextAccent, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPositive, }, }, diff --git a/kit/controls/src/UILinkButton/constants.ts b/kit/controls/src/UILinkButton/constants.ts index f1c25fd6d..477fd6ecf 100644 --- a/kit/controls/src/UILinkButton/constants.ts +++ b/kit/controls/src/UILinkButton/constants.ts @@ -33,7 +33,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextAccent, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextAccent, }, }, @@ -42,7 +42,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextNegative, }, }, @@ -51,7 +51,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPositive, }, }, @@ -62,7 +62,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPrimary, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPrimary, }, }, @@ -71,7 +71,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextNegative, }, }, @@ -80,7 +80,7 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, loadingColor: ColorVariants.TextPositive, }, }, diff --git a/kit/controls/src/UIMsgButton/constants.ts b/kit/controls/src/UIMsgButton/constants.ts index 3c1513407..b646b0223 100644 --- a/kit/controls/src/UIMsgButton/constants.ts +++ b/kit/controls/src/UIMsgButton/constants.ts @@ -94,8 +94,8 @@ export const ContentColors: Record< initialColor: ColorVariants.TextAccent, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, - loadingColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, + loadingColor: ColorVariants.TextSecondary, }, border: { initialColor: ColorVariants.LineAccent, @@ -111,8 +111,8 @@ export const ContentColors: Record< initialColor: ColorVariants.TextNegative, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, - loadingColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, + loadingColor: ColorVariants.TextSecondary, }, border: { initialColor: ColorVariants.LineNegative, @@ -128,8 +128,8 @@ export const ContentColors: Record< initialColor: ColorVariants.TextPositive, pressedColor: ColorVariants.TextPrimary, hoveredColor: ColorVariants.TextPrimary, - disabledColor: ColorVariants.TextOverlay, - loadingColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, + loadingColor: ColorVariants.TextSecondary, }, border: { initialColor: ColorVariants.LinePositive, diff --git a/kit/controls/src/UIWideBoxButton/constants.ts b/kit/controls/src/UIWideBoxButton/constants.ts index 379c8649b..ba443a59a 100644 --- a/kit/controls/src/UIWideBoxButton/constants.ts +++ b/kit/controls/src/UIWideBoxButton/constants.ts @@ -29,14 +29,14 @@ export const contentColors: Record< initialColor: ColorVariants.BackgroundAccent, pressedColor: ColorVariants.SpecialAccentDark, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, - loadingColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, + loadingColor: ColorVariants.TextSecondary, }, nulled: { initialColor: ColorVariants.TextPrimary, pressedColor: ColorVariants.TextAccent, hoveredColor: ColorVariants.SpecialAccentLight, - disabledColor: ColorVariants.TextOverlay, - loadingColor: ColorVariants.TextOverlay, + disabledColor: ColorVariants.TextSecondary, + loadingColor: ColorVariants.TextSecondary, }, }; diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx index f66a6c43e..487353574 100644 --- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx +++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx @@ -25,7 +25,7 @@ function RightContent({ }); if (loading) { - return ; + return ; } if (icon) { return ( diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx index cb9649678..bdbda494f 100644 --- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx +++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx @@ -23,7 +23,7 @@ function RightContent({ }); if (loading) { - return ; + return ; } if (icon) { return ( diff --git a/stories/chats/src/BubblePlainText.tsx b/stories/chats/src/BubblePlainText.tsx index 8b9fe5467..35f289215 100644 --- a/stories/chats/src/BubblePlainText.tsx +++ b/stories/chats/src/BubblePlainText.tsx @@ -71,7 +71,7 @@ const getTimeFontColor = (message: PlainTextMessage) => { } if (message.status === MessageStatus.Received) { - return UILabelColors.TextOverlay; + return UILabelColors.TextSecondary; } return UILabelColors.StaticTextOverlayLight; From 70375d181fb0cdd2cb250d8d34735718ee189c61 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:24:40 +0300 Subject: [PATCH 05/18] Replace color TextOverlayInverted with TextTertiary. --- kit/controls/src/UIBoxButton/constants.ts | 4 ++-- kit/controls/src/UIMsgButton/constants.ts | 2 +- kit/controls/src/UIPillButton/constants.ts | 6 +++--- kit/controls/src/UIWideBoxButton/constants.ts | 4 ++-- .../src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx | 7 +------ 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/kit/controls/src/UIBoxButton/constants.ts b/kit/controls/src/UIBoxButton/constants.ts index 1537ff16e..2c0016f48 100644 --- a/kit/controls/src/UIBoxButton/constants.ts +++ b/kit/controls/src/UIBoxButton/constants.ts @@ -24,14 +24,14 @@ const PrimaryContent: PressableColors = { initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.StaticTextPrimaryLight, }; const SecondaryBackground: PressableColors = { initialColor: ColorVariants.BackgroundSecondary, pressedColor: ColorVariants.BackgroundTertiary, hoveredColor: ColorVariants.BackgroundTertiary, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.BackgroundTertiary, }; const TransparentBackground: PressableColors = { diff --git a/kit/controls/src/UIMsgButton/constants.ts b/kit/controls/src/UIMsgButton/constants.ts index b646b0223..97f75b037 100644 --- a/kit/controls/src/UIMsgButton/constants.ts +++ b/kit/controls/src/UIMsgButton/constants.ts @@ -29,7 +29,7 @@ const PrimaryContent: PressableColors = { initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.StaticTextPrimaryLight, }; const TransparentColors: PressableColors = { diff --git a/kit/controls/src/UIPillButton/constants.ts b/kit/controls/src/UIPillButton/constants.ts index 90e6d84ca..2558dc32f 100644 --- a/kit/controls/src/UIPillButton/constants.ts +++ b/kit/controls/src/UIPillButton/constants.ts @@ -36,7 +36,7 @@ export const ContentColors: Record< initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.StaticTextPrimaryLight, }, }, @@ -52,7 +52,7 @@ export const ContentColors: Record< initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.StaticTextPrimaryLight, }, }, @@ -68,7 +68,7 @@ export const ContentColors: Record< initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, loadingColor: ColorVariants.StaticTextPrimaryLight, }, }, diff --git a/kit/controls/src/UIWideBoxButton/constants.ts b/kit/controls/src/UIWideBoxButton/constants.ts index ba443a59a..62c448d42 100644 --- a/kit/controls/src/UIWideBoxButton/constants.ts +++ b/kit/controls/src/UIWideBoxButton/constants.ts @@ -22,8 +22,8 @@ export const contentColors: Record< initialColor: ColorVariants.StaticTextPrimaryLight, pressedColor: ColorVariants.StaticTextPrimaryLight, hoveredColor: ColorVariants.StaticTextPrimaryLight, - disabledColor: ColorVariants.TextOverlayInverted, - loadingColor: ColorVariants.TextOverlayInverted, + disabledColor: ColorVariants.TextTertiary, + loadingColor: ColorVariants.TextTertiary, }, secondary: { initialColor: ColorVariants.BackgroundAccent, diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx index 98a803992..ac317b2df 100644 --- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx +++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx @@ -23,12 +23,7 @@ function RightContent({ }); if (loading) { - return ( - - ); + return ; } if (icon) { return ( From ad631cf8d15edcde5718e66dedbecea3e923cd21 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:44:53 +0300 Subject: [PATCH 06/18] Replace color BackgroundPrimaryInverted with BackgroundInverted. --- .../src/MaterialTextView/MaterialTextViewChildren.tsx | 2 +- kit/media/src/UIQRCodeView/QRCodeCircle.tsx | 7 ++----- kit/media/src/UIQRCodeView/QRCodeSquare.tsx | 5 +---- kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx | 2 +- kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx b/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx index 0c2d31e2a..223b74b8f 100644 --- a/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx +++ b/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx @@ -75,7 +75,7 @@ export const MaterialTextViewClearButton = React.memo(function MaterialTextViewC diff --git a/kit/media/src/UIQRCodeView/QRCodeCircle.tsx b/kit/media/src/UIQRCodeView/QRCodeCircle.tsx index 31cd9ad70..eb672657e 100644 --- a/kit/media/src/UIQRCodeView/QRCodeCircle.tsx +++ b/kit/media/src/UIQRCodeView/QRCodeCircle.tsx @@ -152,16 +152,13 @@ export const QRCodeCircle: React.FC = ({ value, logo, size }: QRCod - + {logoRender} diff --git a/kit/media/src/UIQRCodeView/QRCodeSquare.tsx b/kit/media/src/UIQRCodeView/QRCodeSquare.tsx index 8d357415a..470817cea 100644 --- a/kit/media/src/UIQRCodeView/QRCodeSquare.tsx +++ b/kit/media/src/UIQRCodeView/QRCodeSquare.tsx @@ -50,10 +50,7 @@ export const QRCodeSquare = ({ value, logo, size }: QRCodeProps) => { - + {logoRender} diff --git a/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx b/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx index 5111ec974..d8667374a 100644 --- a/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx +++ b/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx @@ -23,7 +23,7 @@ export const useLogoRender = ( ); } diff --git a/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx b/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx index 053a32a37..c806f3679 100644 --- a/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx +++ b/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx @@ -89,7 +89,7 @@ function LineCountdown({ const useStyles = makeStyles((theme: Theme) => ({ countdownLine: { flex: 1, - backgroundColor: theme[UIBackgroundViewColors.BackgroundPrimaryInverted], + backgroundColor: theme[UIBackgroundViewColors.BackgroundInverted], }, })); From 3c971e91a4aa056873681bd26277cc32adfe3e30 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 12:52:17 +0300 Subject: [PATCH 07/18] Replace color BackgroundTertiaryInverted with BackgroundTertiary. --- .../src/UIDateTimePicker/Calendar/DateControls.tsx | 2 +- casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx | 4 +--- kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx | 2 +- kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx b/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx index 337b0ef2b..a9a11d831 100644 --- a/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx +++ b/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx @@ -84,7 +84,7 @@ const useStyles = makeStyles((theme: Theme) => ({ separator: { height: 12, width: 1, - backgroundColor: theme[ColorVariants.BackgroundTertiaryInverted], + backgroundColor: theme[ColorVariants.BackgroundTertiary], marginHorizontal: UILayoutConstant.normalContentOffset, }, arrows: { diff --git a/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx b/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx index 4c424aae6..d6eb2118b 100644 --- a/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx +++ b/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx @@ -30,9 +30,7 @@ function MainAnimatedIconInner({ const smallCircleRadius = (cx + 1) / 2; const smallCircleRadiusWithStroke = smallCircleRadius - STROKE_SIZE / 2; const { colorParts: bgColorParts } = useColorParts(ColorVariants.BackgroundAccent); - const { colorParts: borderColorParts } = useColorParts( - ColorVariants.BackgroundTertiaryInverted, - ); + const { colorParts: borderColorParts } = useColorParts(ColorVariants.BackgroundTertiary); const circle2Props = useAnimatedProps(() => { return { r: interpolate( diff --git a/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx b/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx index b812b962b..7af161e42 100644 --- a/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx +++ b/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx @@ -128,7 +128,7 @@ export const useImageStyle = ( switcherState.value, [SwitcherState.Active, SwitcherState.Hovered, SwitcherState.Pressed], [ - theme[ColorVariants.BackgroundTertiaryInverted] as string, + theme[ColorVariants.BackgroundTertiary] as string, theme[ColorVariants.LineNeutral] as string, theme[ColorVariants.LineNeutral] as string, ], diff --git a/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx b/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx index 1d954cdde..cfc5a05b3 100644 --- a/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx +++ b/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx @@ -100,7 +100,7 @@ export const useImageStyle = ( animatedValue.value, [IconSwitcherState.NotActive, IconSwitcherState.Active], [ - theme[ColorVariants.BackgroundTertiaryInverted] as string, + theme[ColorVariants.BackgroundTertiary] as string, theme[ColorVariants.BackgroundAccent] as string, ], ), From 4a46cd0aa5e1beb67e7074b262493258dae1d91d Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:48:10 +0300 Subject: [PATCH 08/18] Replace color LinePrimary with BackgroundPrimary. --- casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx | 2 +- kit/controls/src/UILoadMoreButton.tsx | 2 +- stories/browser/src/ActionButton.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx b/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx index 018502c5d..9ee6f149a 100644 --- a/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx +++ b/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx @@ -307,7 +307,7 @@ export const UIPagerViewContainer: React.FC = ({ const renderTabBar: TabBarComponent = useTabBar( pages, theme.TextPrimary, - theme.LinePrimary, + theme.BackgroundPrimary, type, ); diff --git a/kit/controls/src/UILoadMoreButton.tsx b/kit/controls/src/UILoadMoreButton.tsx index 87d04806f..99a84ce8f 100644 --- a/kit/controls/src/UILoadMoreButton.tsx +++ b/kit/controls/src/UILoadMoreButton.tsx @@ -54,7 +54,7 @@ export const UILoadMoreButton: React.FunctionComponent = ({ )} {isLoadingMore && ( diff --git a/stories/browser/src/ActionButton.tsx b/stories/browser/src/ActionButton.tsx index 6cb5afb78..db947b718 100644 --- a/stories/browser/src/ActionButton.tsx +++ b/stories/browser/src/ActionButton.tsx @@ -34,7 +34,7 @@ export function ActionButton({ inputHasValue, hasError, onPress, clear }: Action From 887e6506c311c35e7c952c936dd1948afb1c74fd Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:50:11 +0300 Subject: [PATCH 09/18] Replace color LineSecondary with BackgroundSecondary. --- stories/chats/src/UIChatInput/ChatInputContainer.tsx | 2 +- stories/chats/src/UICommonChatList.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stories/chats/src/UIChatInput/ChatInputContainer.tsx b/stories/chats/src/UIChatInput/ChatInputContainer.tsx index 821400a3d..5eaa54be2 100644 --- a/stories/chats/src/UIChatInput/ChatInputContainer.tsx +++ b/stories/chats/src/UIChatInput/ChatInputContainer.tsx @@ -87,7 +87,7 @@ export function ChatInputContainer({ style={[ styles.border, { - backgroundColor: theme[ColorVariants.LineSecondary], + backgroundColor: theme[ColorVariants.BackgroundSecondary], opacity: borderOpacity, }, ]} diff --git a/stories/chats/src/UICommonChatList.tsx b/stories/chats/src/UICommonChatList.tsx index 49dd7a6e0..03649ea4b 100644 --- a/stories/chats/src/UICommonChatList.tsx +++ b/stories/chats/src/UICommonChatList.tsx @@ -272,7 +272,7 @@ function useLinesAnimation(hasScrollOverflow: React.RefObject) { const lineStyle = React.useMemo( () => [ styles.border, - UIStyle.color.getBackgroundColorStyle(theme[ColorVariants.LineSecondary]), + UIStyle.color.getBackgroundColorStyle(theme[ColorVariants.BackgroundSecondary]), { opacity: topOpacity.current, }, From 2d76a2d3c19b845c1da4f8f244e671ebbb605093 Mon Sep 17 00:00:00 2001 From: Anatolii <36547799+SAnatoliiS@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:51:34 +0300 Subject: [PATCH 10/18] Replace color LineTertiary with BackgroundTertiary. --- .../src/UICountryPicker/CountryPicker.tsx | 2 +- .../src/UICountryPicker/CountryPickerRow.tsx | 2 +- .../src/UIDateTimePicker/DateTimePicker.tsx | 5 ++++- kit/controls/src/UIMsgButton/constants.ts | 12 ++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx b/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx index 976d5265e..1b89f147e 100644 --- a/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx +++ b/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx @@ -232,7 +232,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, headerContainer: { backgroundColor: theme[ColorVariants.BackgroundPrimary] as string, - borderBottomColor: theme[ColorVariants.LineTertiary] as string, + borderBottomColor: theme[ColorVariants.BackgroundTertiary] as string, borderBottomWidth: 1, borderTopLeftRadius: 12, borderTopRightRadius: 12, diff --git a/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx b/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx index dc1bc0df9..7f187e0a1 100644 --- a/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx +++ b/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx @@ -47,7 +47,7 @@ const useStyles = makeStyles((theme: Theme) => ({ rowContainerInner: { paddingVertical: UILayoutConstant.contentOffset, flexDirection: 'row', - borderBottomColor: theme[ColorVariants.LineTertiary] as string, + borderBottomColor: theme[ColorVariants.BackgroundTertiary] as string, borderBottomWidth: 1, }, rowContainer: { diff --git a/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx b/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx index 46f3e42c7..3474baf28 100644 --- a/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx +++ b/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx @@ -79,7 +79,10 @@ function Content() { return ( <> - +