Skip to content

Commit

Permalink
fix(ui): update text color
Browse files Browse the repository at this point in the history
  • Loading branch information
@pwltr
pwltr committed May 23, 2024
1 parent 7d94f98 commit 58fc3ed
Show file tree
Hide file tree
Showing 147 changed files with 319 additions and 396 deletions.
2 changes: 1 addition & 1 deletion src/assets/dotted-arrow.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/icons/wallet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,6 @@ export const mapPinLineIcon = (color = 'white'): string =>

export const arrowLNfunds = (color = 'white'): string =>
`<svg width="45" height="20" viewBox="0 0 45 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M44.7397 10.2167C44.9468 9.70474 44.6996 9.12181 44.1876 8.91473L35.8443 5.54013C35.3323 5.33305 34.7493 5.58022 34.5423 6.09222C34.3352 6.60421 34.5824 7.18713 35.0943 7.39421L42.5107 10.3939L39.511 17.8102C39.304 18.3222 39.5511 18.9051 40.0631 19.1122C40.5751 19.3193 41.158 19.0721 41.3651 18.5601L44.7397 10.2167ZM0.464961 2.11909C0.774995 2.52592 1.09014 2.92026 1.41011 3.30242L2.9436 2.01852C2.6434 1.65997 2.34733 1.28953 2.0557 0.906837L0.464961 2.11909ZM3.44368 5.50954C4.1775 6.2323 4.93052 6.9004 5.6995 7.51719L6.95087 5.95704C6.23476 5.38266 5.5325 4.75969 4.84712 4.08464L3.44368 5.50954ZM8.14772 9.27937C9.00828 9.8328 9.88271 10.3302 10.7668 10.7761L11.6674 8.99029C10.844 8.57505 10.0301 8.11207 9.22953 7.5972L8.14772 9.27937ZM13.5246 11.9943C14.4741 12.3578 15.4291 12.6686 16.3847 12.9324L16.9168 11.0045C16.0203 10.757 15.1265 10.466 14.2395 10.1265L13.5246 11.9943ZM19.3112 13.599C20.3079 13.7801 21.2998 13.9156 22.2815 14.0116L22.4761 12.0211C21.5459 11.9301 20.6085 11.802 19.6689 11.6312L19.3112 13.599ZM25.265 14.1889C26.2777 14.2116 27.2731 14.197 28.2446 14.1522L28.1525 12.1544C27.2237 12.1971 26.274 12.211 25.3098 12.1894L25.265 14.1889ZM31.2162 13.9203C32.2389 13.8084 33.2239 13.6682 34.1624 13.5097L33.8293 11.5376C32.9264 11.6902 31.98 11.8248 30.9987 11.9321L31.2162 13.9203ZM37.0737 12.9341C38.1332 12.6941 39.101 12.4415 39.9583 12.1969L39.4096 10.2737C38.5847 10.509 37.6526 10.7523 36.6319 10.9835L37.0737 12.9341ZM42.7945 11.2962C43.2405 11.1386 43.5885 11.0069 43.827 10.9137C43.9463 10.8672 44.0383 10.8302 44.1014 10.8045C44.133 10.7916 44.1574 10.7815 44.1744 10.7745C44.1829 10.7709 44.1895 10.7681 44.1943 10.7661C44.1967 10.7651 44.1986 10.7643 44.2001 10.7637C44.2008 10.7634 44.2014 10.7631 44.2019 10.7629C44.2022 10.7628 44.2024 10.7627 44.2026 10.7626C44.2027 10.7626 44.2028 10.7626 44.2029 10.7625C44.2029 10.7625 44.2029 10.7625 44.203 10.7625C44.203 10.7624 44.2031 10.7624 43.8127 9.84177C43.4223 8.92112 43.4223 8.9211 43.4224 8.92108C43.4224 8.92108 43.4224 8.92106 43.4225 8.92105C43.4225 8.92103 43.4226 8.92101 43.4226 8.92099C43.4227 8.92096 43.4227 8.92095 43.4227 8.92094C43.4228 8.92093 43.4227 8.92097 43.4225 8.92105C43.422 8.92123 43.4212 8.9216 43.4198 8.92216C43.4171 8.92329 43.4126 8.92519 43.4063 8.92783C43.3936 8.93312 43.3735 8.94139 43.3464 8.95245C43.2921 8.97457 43.2094 9.00785 43.0996 9.05072C42.88 9.13647 42.5524 9.26053 42.1282 9.41042L42.7945 11.2962Z" fill="${color}" fill-opacity="0.5"/>
<path d="M44.7397 10.2167C44.9468 9.70474 44.6996 9.12181 44.1876 8.91473L35.8443 5.54013C35.3323 5.33305 34.7493 5.58022 34.5423 6.09222C34.3352 6.60421 34.5824 7.18713 35.0943 7.39421L42.5107 10.3939L39.511 17.8102C39.304 18.3222 39.5511 18.9051 40.0631 19.1122C40.5751 19.3193 41.158 19.0721 41.3651 18.5601L44.7397 10.2167ZM0.464961 2.11909C0.774995 2.52592 1.09014 2.92026 1.41011 3.30242L2.9436 2.01852C2.6434 1.65997 2.34733 1.28953 2.0557 0.906837L0.464961 2.11909ZM3.44368 5.50954C4.1775 6.2323 4.93052 6.9004 5.6995 7.51719L6.95087 5.95704C6.23476 5.38266 5.5325 4.75969 4.84712 4.08464L3.44368 5.50954ZM8.14772 9.27937C9.00828 9.8328 9.88271 10.3302 10.7668 10.7761L11.6674 8.99029C10.844 8.57505 10.0301 8.11207 9.22953 7.5972L8.14772 9.27937ZM13.5246 11.9943C14.4741 12.3578 15.4291 12.6686 16.3847 12.9324L16.9168 11.0045C16.0203 10.757 15.1265 10.466 14.2395 10.1265L13.5246 11.9943ZM19.3112 13.599C20.3079 13.7801 21.2998 13.9156 22.2815 14.0116L22.4761 12.0211C21.5459 11.9301 20.6085 11.802 19.6689 11.6312L19.3112 13.599ZM25.265 14.1889C26.2777 14.2116 27.2731 14.197 28.2446 14.1522L28.1525 12.1544C27.2237 12.1971 26.274 12.211 25.3098 12.1894L25.265 14.1889ZM31.2162 13.9203C32.2389 13.8084 33.2239 13.6682 34.1624 13.5097L33.8293 11.5376C32.9264 11.6902 31.98 11.8248 30.9987 11.9321L31.2162 13.9203ZM37.0737 12.9341C38.1332 12.6941 39.101 12.4415 39.9583 12.1969L39.4096 10.2737C38.5847 10.509 37.6526 10.7523 36.6319 10.9835L37.0737 12.9341ZM42.7945 11.2962C43.2405 11.1386 43.5885 11.0069 43.827 10.9137C43.9463 10.8672 44.0383 10.8302 44.1014 10.8045C44.133 10.7916 44.1574 10.7815 44.1744 10.7745C44.1829 10.7709 44.1895 10.7681 44.1943 10.7661C44.1967 10.7651 44.1986 10.7643 44.2001 10.7637C44.2008 10.7634 44.2014 10.7631 44.2019 10.7629C44.2022 10.7628 44.2024 10.7627 44.2026 10.7626C44.2027 10.7626 44.2028 10.7626 44.2029 10.7625C44.2029 10.7625 44.2029 10.7625 44.203 10.7625C44.203 10.7624 44.2031 10.7624 43.8127 9.84177C43.4223 8.92112 43.4223 8.9211 43.4224 8.92108C43.4224 8.92108 43.4224 8.92106 43.4225 8.92105C43.4225 8.92103 43.4226 8.92101 43.4226 8.92099C43.4227 8.92096 43.4227 8.92095 43.4227 8.92094C43.4228 8.92093 43.4227 8.92097 43.4225 8.92105C43.422 8.92123 43.4212 8.9216 43.4198 8.92216C43.4171 8.92329 43.4126 8.92519 43.4063 8.92783C43.3936 8.93312 43.3735 8.94139 43.3464 8.95245C43.2921 8.97457 43.2094 9.00785 43.0996 9.05072C42.88 9.13647 42.5524 9.26053 42.1282 9.41042L42.7945 11.2962Z" fill="${color}"/>
</svg>
`;
2 changes: 1 addition & 1 deletion src/components/ActivityHeader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ActivityHeader = ({
return (
<View style={style}>
<View style={styles.label}>
<Caption13Up color="white50">{label}</Caption13Up>
<Caption13Up color="secondary">{label}</Caption13Up>
</View>

<DetectSwipe
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdjustValue.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const AdjustValue = ({
<View style={styles.text}>
<BodyMSB style={styles.title}>{value}</BodyMSB>
{description && (
<BodySSB style={styles.description} color="white50">
<BodySSB style={styles.description} color="secondary">
{description}
</BodySSB>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Amount.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const Amount = ({
const { fiatSymbol } = useCurrency();
return (
<View style={[styles.row, style]}>
<Display style={styles.symbol} color="white50">
<Display style={styles.symbol} color="secondary">
{unit === EUnit.BTC ? '₿' : fiatSymbol}
</Display>
<Display color={value ? 'text' : 'white50'}>{value}</Display>
<Display color={value ? 'primary' : 'secondary'}>{value}</Display>
</View>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/AmountToggle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const AmountToggle = ({
style={styles.secondary}
sats={amount}
size="caption13Up"
color="white50"
color="secondary"
decimalLength={decimalLength}
unitType="secondary"
symbol={true}
Expand Down
6 changes: 3 additions & 3 deletions src/components/BalanceHeader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ const BalanceHeader = (): ReactElement => {
t={t}
i18nKey="balance_total_pending"
components={{
text: <Caption13Up color="white50" />,
text: <Caption13Up color="secondary" />,
pending: (
<Money
color="white50"
color="secondary"
size="caption13Up"
sats={pendingPaymentsBalance}
enableHide={true}
Expand All @@ -45,7 +45,7 @@ const BalanceHeader = (): ReactElement => {
}}
/>
) : (
<Caption13Up color="white50">{t('balance_total')}</Caption13Up>
<Caption13Up color="secondary">{t('balance_total')}</Caption13Up>
)}
</View>

Expand Down
6 changes: 3 additions & 3 deletions src/components/BlocksWidget.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const BlocksWidget = ({
{data.map((field) => (
<View key={field.name} style={styles.row}>
<View style={styles.columnLeft}>
<BodySSB color="white50" numberOfLines={1}>
<BodySSB color="secondary" numberOfLines={1}>
{field.name}
</BodySSB>
</View>
Expand All @@ -128,12 +128,12 @@ const BlocksWidget = ({
{widget.extras?.showSource && config?.source && (
<View style={styles.source}>
<View style={styles.columnLeft}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{t('widget_source')}
</CaptionB>
</View>
<View style={styles.columnRight}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{config.source.name}
</CaptionB>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/components/CheckButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const CheckButton = memo(
<View style={styles.leftColumn}>
<View>
<BodyM color="white">{label}</BodyM>
{description && <Caption color="white50">{description}</Caption>}
{description && <Caption color="secondary">{description}</Caption>}
</View>
</View>
<View style={styles.rightColumn}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactSmall.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const ContactSmall = ({
style={styles.delete}
color="transparent"
onPress={onDelete}>
<XIcon color="white50" width={16} />
<XIcon color="secondary" width={16} />
</TouchableOpacity>
)}
</TouchableOpacity>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ContactsList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const ContactItem = ({
style={size !== 'small' ? cstyles.name : undefined}>
{name}
</BodyMSB>
<SlashtagURL url={contact.url} color="white50" size="small" />
<SlashtagURL url={contact.url} color="secondary" size="small" />
</View>
</View>
</TouchableOpacity>
Expand Down Expand Up @@ -137,7 +137,7 @@ const ContactsList = ({
<ThemedView
color={sectionBackgroundColor}
style={!isFirst && styles.sectionSpacing}>
<Caption13Up color="white50">{title}</Caption13Up>
<Caption13Up color="secondary">{title}</Caption13Up>
</ThemedView>
);
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/FeedWidget.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const FeedWidget = ({
return (
<View key={field.name} style={styles.row}>
<View style={styles.columnLeft}>
<BodySSB color="white50" numberOfLines={1}>
<BodySSB color="secondary" numberOfLines={1}>
{field.name}
</BodySSB>
</View>
Expand All @@ -56,12 +56,12 @@ const FeedWidget = ({
{widget.extras?.showSource && config?.source && (
<View style={styles.source}>
<View style={styles.columnLeft}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{t('widget_source')}
</CaptionB>
</View>
<View style={styles.columnRight}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{config.source.name}
</CaptionB>
</View>
Expand Down
4 changes: 2 additions & 2 deletions src/components/HeadlinesWidget.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ const HeadlinesWidget = ({
}
}}>
<View style={styles.columnLeft}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{t('widget_source')}
</CaptionB>
</View>
<View style={styles.columnRight}>
<CaptionB color="white50" numberOfLines={1}>
<CaptionB color="secondary" numberOfLines={1}>
{article?.publisher.title}
</CaptionB>
</View>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ImageText.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const ImageText = ({
{icon}
<View style={styles.titleContainer}>
<BodyMSB>{title}</BodyMSB>
<BodySSB color="white50">{description}</BodySSB>
<BodySSB color="secondary">{description}</BodySSB>
</View>
</View>

Expand All @@ -47,7 +47,7 @@ const ImageText = ({
style={styles.value}
sats={value}
size="bodySSB"
color="white50"
color="secondary"
symbol={true}
unitType="secondary"
enableHide={true}
Expand Down
2 changes: 1 addition & 1 deletion src/components/InfoScreen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const InfoScreen = ({
/>
<View style={styles.content} testID={testID}>
<Display>{title}</Display>
<BodyM style={styles.description} color="white50">
<BodyM style={styles.description} color="secondary">
{description}
</BodyM>

Expand Down
2 changes: 1 addition & 1 deletion src/components/IntroScreen.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const IntroScreen = ({
components={{ accent: <Display color={accentColor} /> }}
/>
</Display>
<BodyM style={styles.description} color="white50">
<BodyM style={styles.description} color="secondary">
{description}
</BodyM>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/components/LabeledInput.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const LabeledInput = ({
return (
<View style={style}>
<View style={styles.header}>
<Caption13Up style={styles.label} color="white50">
<Caption13Up style={styles.label} color="secondary">
{label}
</Caption13Up>
{error && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/LightningChannel.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const LightningChannel = ({

let spendingColor: keyof IThemeColors = 'purple50';
let spendingAvailableColor: keyof IThemeColors = 'purple';
let receivingColor: keyof IThemeColors = 'white50';
let receivingColor: keyof IThemeColors = 'white64';
let receivingAvailableColor: keyof IThemeColors = 'white';

if (status === 'closed') {
Expand Down
2 changes: 1 addition & 1 deletion src/components/LightningSyncing.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const LightningSyncing = ({
<GradientView style={styles.root}>
<BottomSheetNavigationHeader title={title} />
<View style={styles.content}>
<BodyM color="white50">{t('wait_text_top')}</BodyM>
<BodyM color="secondary">{t('wait_text_top')}</BodyM>

<View style={styles.imageContainer}>
<View style={styles.animation}>
Expand Down
16 changes: 8 additions & 8 deletions src/components/List.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const _SectionHeader = memo(

return (
<View style={[styles.sectionHeader, style]}>
<Caption13Up color="white50">{title.toUpperCase()}</Caption13Up>
<Caption13Up color="secondary">{title.toUpperCase()}</Caption13Up>
</View>
);
},
Expand All @@ -57,7 +57,7 @@ const _SectionFooter = memo(

return (
<View style={[styles.sectionFooter, style]}>
<BodyS color="white50">{description}</BodyS>
<BodyS color="secondary">{description}</BodyS>
</View>
);
},
Expand Down Expand Up @@ -214,13 +214,13 @@ const _Item = memo((item: ItemData): ReactElement => {
<BodyM color="white">{title}</BodyM>
{description && (
<View>
<Caption color="white50">{description}</Caption>
<Caption color="secondary">{description}</Caption>
</View>
)}
</View>
</View>
<View style={styles.rightColumn}>
<BodyM color="white50">{value}</BodyM>
<BodyM color="secondary">{value}</BodyM>
</View>
</TouchableOpacity>
);
Expand Down Expand Up @@ -279,7 +279,7 @@ const _Item = memo((item: ItemData): ReactElement => {
{subtitle ? (
<View>
<BodyMSB color="white">{title}</BodyMSB>
{subtitle && <BodySSB color="white50">{subtitle}</BodySSB>}
{subtitle && <BodySSB color="secondary">{subtitle}</BodySSB>}
</View>
) : (
<View>
Expand All @@ -290,7 +290,7 @@ const _Item = memo((item: ItemData): ReactElement => {
<View style={styles.rightColumn}>
{useCheckmark ? (
loading && value ? (
<ActivityIndicator color={'white'} />
<ActivityIndicator color="white" />
) : (
value && <Checkmark color="brand" width={32} height={32} />
)
Expand All @@ -299,14 +299,14 @@ const _Item = memo((item: ItemData): ReactElement => {
<BodyM style={styles.valueText} testID="Value">
{value}
</BodyM>
<ChevronRight color="white50" width={24} height={24} />
<ChevronRight color="secondary" width={24} height={24} />
</>
)}
</View>
</View>

{description && (
<BodyS style={styles.description} color="white50">
<BodyS style={styles.description} color="secondary">
{description}
</BodyS>
)}
Expand Down
78 changes: 0 additions & 78 deletions src/components/LogBox.tsx
View file

This file was deleted.

Loading

0 comments on commit 58fc3ed

Please sign in to comment.