chore: remove auxiliaryText color

This commit is contained in:
GleidsonDaniel 2024-03-13 11:20:04 -03:00
parent b5cef460f5
commit 8b4ead7c3f
85 changed files with 200 additions and 205 deletions

View File

@ -2,12 +2,12 @@
exports[`Storyshots Button Custom Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"purple\\",\\"padding\\":10,\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"yellow\\",\\"fontSize\\":18},[{\\"textAlign\\":\\"left\\"}]]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Disabled Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Disabled Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#156FF5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Disabled Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
exports[`Storyshots Button Disabled Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#156FF5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
exports[`Storyshots Button Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
exports[`Storyshots Button Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#156FF5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`;
exports[`Storyshots Button Primary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Primary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#156FF5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Secondary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;
exports[`Storyshots Button Secondary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#E4E7EA\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\",\\"fontSize\\":16},null]},\\"children\\":[\\"Press me!\\"]}]}"`;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Storyshots SearchBox Basic 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"testID\\":\\"searchbox\\",\\"style\\":{\\"backgroundColor\\":\\"#ffffff\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"marginBottom\\":10},{\\"margin\\":16,\\"marginBottom\\":16}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"position\\":\\"relative\\",\\"justifyContent\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"TextInput\\",\\"props\\":{\\"style\\":[{\\"color\\":\\"#0d0e12\\"},[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"height\\":48,\\"fontSize\\":16,\\"paddingHorizontal\\":16,\\"paddingVertical\\":10,\\"borderWidth\\":1,\\"borderRadius\\":4},null,{\\"paddingRight\\":45},{\\"backgroundColor\\":\\"#ffffff\\",\\"borderColor\\":\\"#cbcbcc\\",\\"color\\":\\"#0d0e12\\"},null,null],{\\"textAlign\\":\\"auto\\"}],\\"placeholderTextColor\\":\\"#9ca2a8\\",\\"keyboardAppearance\\":\\"light\\",\\"autoCorrect\\":false,\\"autoCapitalize\\":\\"none\\",\\"underlineColorAndroid\\":\\"transparent\\",\\"accessibilityLabel\\":\\"Search\\",\\"placeholder\\":\\"Search\\",\\"value\\":\\"\\",\\"blurOnSubmit\\":true,\\"returnKeyType\\":\\"search\\"},\\"children\\":null},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":20,\\"color\\":\\"#2f343d\\"},[{\\"lineHeight\\":20},[{\\"position\\":\\"absolute\\"},{\\"right\\":12}]],{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;
exports[`Storyshots SearchBox Basic 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"testID\\":\\"searchbox\\",\\"style\\":{\\"backgroundColor\\":\\"#ffffff\\"}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"marginBottom\\":10},{\\"margin\\":16,\\"marginBottom\\":16}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"position\\":\\"relative\\",\\"justifyContent\\":\\"center\\"}},\\"children\\":[{\\"type\\":\\"TextInput\\",\\"props\\":{\\"style\\":[{\\"color\\":\\"#0d0e12\\"},[{\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\",\\"height\\":48,\\"fontSize\\":16,\\"paddingHorizontal\\":16,\\"paddingVertical\\":10,\\"borderWidth\\":1,\\"borderRadius\\":4},null,{\\"paddingRight\\":45},{\\"backgroundColor\\":\\"#ffffff\\",\\"borderColor\\":\\"#cbcbcc\\",\\"color\\":\\"#0d0e12\\"},null,null],{\\"textAlign\\":\\"auto\\"}],\\"placeholderTextColor\\":\\"#6C727A\\",\\"keyboardAppearance\\":\\"light\\",\\"autoCorrect\\":false,\\"autoCapitalize\\":\\"none\\",\\"underlineColorAndroid\\":\\"transparent\\",\\"accessibilityLabel\\":\\"Search\\",\\"placeholder\\":\\"Search\\",\\"value\\":\\"\\",\\"blurOnSubmit\\":true,\\"returnKeyType\\":\\"search\\"},\\"children\\":null},{\\"type\\":\\"Text\\",\\"props\\":{\\"selectable\\":false,\\"allowFontScaling\\":false,\\"style\\":[{\\"fontSize\\":20,\\"color\\":\\"#2f343d\\"},[{\\"lineHeight\\":20},[{\\"position\\":\\"absolute\\"},{\\"right\\":12}]],{\\"fontFamily\\":\\"custom\\",\\"fontWeight\\":\\"normal\\",\\"fontStyle\\":\\"normal\\"},{}]},\\"children\\":[\\"\\"]}]}]}]}"`;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Storyshots SwitchItem Switch 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"minHeight\\":54,\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"space-between\\",\\"flexDirection\\":\\"row\\",\\"maxHeight\\":80,\\"marginBottom\\":12},{\\"backgroundColor\\":\\"#ffffff\\"}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"marginRight\\":8}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"[missing \\\\\\"en.Onboarding_title\\\\\\" translation]\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id-hint\\",\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#9ca2a8\\"}]},\\"children\\":[\\"Only authorized users can write new messages\\"]}]},{\\"type\\":\\"RCTSwitch\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id\\",\\"disabled\\":false,\\"onTintColor\\":\\"#2de0a5\\",\\"style\\":{\\"height\\":31,\\"width\\":51},\\"tintColor\\":\\"#f5455c\\",\\"value\\":false,\\"accessibilityRole\\":\\"switch\\"},\\"children\\":null}]}]}"`;
exports[`Storyshots SwitchItem Switch 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"alignItems\\":\\"flex-start\\",\\"padding\\":16}},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":[{\\"minHeight\\":54,\\"alignItems\\":\\"center\\",\\"justifyContent\\":\\"space-between\\",\\"flexDirection\\":\\"row\\",\\"maxHeight\\":80,\\"marginBottom\\":12},{\\"backgroundColor\\":\\"#ffffff\\"}]},\\"children\\":[{\\"type\\":\\"View\\",\\"props\\":{\\"style\\":{\\"flex\\":1,\\"marginRight\\":8}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#0d0e12\\"}]},\\"children\\":[\\"[missing \\\\\\"en.Onboarding_title\\\\\\" translation]\\"]},{\\"type\\":\\"Text\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id-hint\\",\\"style\\":[{\\"fontSize\\":14,\\"textAlign\\":\\"left\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"400\\"},{\\"color\\":\\"#6C727A\\"}]},\\"children\\":[\\"Only authorized users can write new messages\\"]}]},{\\"type\\":\\"RCTSwitch\\",\\"props\\":{\\"testID\\":\\"create-channel-switch-id\\",\\"disabled\\":false,\\"onTintColor\\":\\"#2de0a5\\",\\"style\\":{\\"height\\":31,\\"width\\":51},\\"tintColor\\":\\"#f5455c\\",\\"value\\":false,\\"accessibilityRole\\":\\"switch\\"},\\"children\\":null}]}]}"`;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ export const Handle = React.memo(() => {
const { theme } = useTheme();
return (
<View style={styles.handle} testID='action-sheet-handle'>
<View style={[styles.handleIndicator, { backgroundColor: themes[theme].auxiliaryText }]} />
<View style={[styles.handleIndicator, { backgroundColor: themes[theme].fontSecondaryInfo }]} />
</View>
);
});

View File

@ -27,7 +27,7 @@ const styles = StyleSheet.create({
const RCActivityIndicator = ({ absolute, ...props }: IActivityIndicator): React.ReactElement => {
const { theme } = useTheme();
return (
<ActivityIndicator style={[styles.indicator, absolute && styles.absolute]} color={themes[theme].auxiliaryText} {...props} />
<ActivityIndicator style={[styles.indicator, absolute && styles.absolute]} color={themes[theme].fontSecondaryInfo} {...props} />
);
};

View File

@ -23,7 +23,7 @@ const styles = StyleSheet.create({
const AppVersion = React.memo(({ theme }: { theme: TSupportedThemes }) => (
<View style={styles.container}>
<Text style={[styles.text, { color: themes[theme].auxiliaryText }]}>
<Text style={[styles.text, { color: themes[theme].fontSecondaryInfo }]}>
{I18n.t('Version_no', { version: '' })}
<Text style={styles.bold}>{getReadableVersion}</Text>
</Text>

View File

@ -61,7 +61,7 @@ const Button = ({
disabled={disabled || loading}
style={[
styles.container,
backgroundColor ? { backgroundColor } : { backgroundColor: isPrimary ? colors.actionTintColor : colors.backgroundColor },
backgroundColor ? { backgroundColor } : { backgroundColor: isPrimary ? colors.buttonBackgroundPrimaryDefault : colors.buttonBackgroundSecondaryDefault },
disabled && styles.disabled,
style
]}

View File

@ -33,7 +33,7 @@ const DirectoryItemLabel = React.memo(({ text, theme }: IDirectoryItemLabel) =>
if (!text) {
return null;
}
return <Text style={[styles.directoryItemLabel, { color: themes[theme].auxiliaryText }]}>{text}</Text>;
return <Text style={[styles.directoryItemLabel, { color: themes[theme].fontSecondaryInfo }]}>{text}</Text>;
});
const DirectoryItem = ({
@ -63,7 +63,7 @@ const DirectoryItem = ({
{description ? (
<MarkdownPreview
msg={description}
style={[styles.directoryItemUsername, { color: themes[theme].auxiliaryText }]}
style={[styles.directoryItemUsername, { color: themes[theme].fontSecondaryInfo }]}
numberOfLines={1}
/>
) : null}

View File

@ -26,7 +26,7 @@ const ListIcon = React.memo(({ name, color, style, testID, size }: IListIcon) =>
return (
<View style={[styles.icon, style]}>
<CustomIcon name={name} color={color ?? themes[theme].auxiliaryText} size={size ?? ICON_SIZE} testID={testID} />
<CustomIcon name={name} color={color ?? themes[theme].fontSecondaryInfo} size={size ?? ICON_SIZE} testID={testID} />
</View>
);
});

View File

@ -105,7 +105,7 @@ const Content = React.memo(
) : null}
</View>
{subtitle ? (
<Text style={[styles.subtitle, { color: themes[theme].auxiliaryText }]} numberOfLines={1}>
<Text style={[styles.subtitle, { color: themes[theme].fontSecondaryInfo }]} numberOfLines={1}>
{translateSubtitle ? I18n.t(subtitle) : subtitle}
</Text>
) : null}

View File

@ -30,7 +30,7 @@ interface IOrSeparator {
const OrSeparator = React.memo(({ theme }: IOrSeparator) => {
const line = { backgroundColor: themes[theme].borderColor };
const text = { color: themes[theme].auxiliaryText };
const text = { color: themes[theme].fontSecondaryInfo };
return (
<View style={styles.container}>
<View style={[styles.line, line]} />

View File

@ -55,7 +55,7 @@ const AllReactionsListItem = ({ item, getCustomEmoji }: IAllReactionsListItemPro
<Text style={[styles.allListNPeopleReacted, { color: colors.bodyText }]}>
{count === 1 ? I18n.t('1_person_reacted') : I18n.t('N_people_reacted', { n: count })}
</Text>
<Text style={[styles.allListWhoReacted, { color: colors.auxiliaryText }]}>{displayNames}</Text>
<Text style={[styles.allListWhoReacted, { color: colors.fontSecondaryInfo }]}>{displayNames}</Text>
</View>
</View>
);

View File

@ -23,7 +23,7 @@ const UsersList = ({ tabLabel }: { tabLabel: IReaction }): React.ReactElement =>
contentContainerStyle={styles.listContainer}
ListHeaderComponent={
<View style={styles.emojiNameContainer}>
<Text style={[styles.emojiName, { color: colors.auxiliaryText }]} testID='usersListEmojiName'>
<Text style={[styles.emojiName, { color: colors.fontSecondaryInfo }]} testID='usersListEmojiName'>
{emoji}
</Text>
</View>

View File

@ -88,7 +88,7 @@ const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoom
usersText = usersTyping.join(', ');
}
return (
<Text style={[styles.subtitle, { fontSize, color: colors.auxiliaryText }]} numberOfLines={1}>
<Text style={[styles.subtitle, { fontSize, color: colors.fontSecondaryInfo }]} numberOfLines={1}>
<Text style={styles.typingUsers}>{usersText} </Text>
{usersTyping.length > 1 ? I18n.t('are_typing') : I18n.t('is_typing')}...
</Text>
@ -102,7 +102,7 @@ const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoom
// subtitle
if (subtitle) {
return <MarkdownPreview msg={subtitle} style={[styles.subtitle, { fontSize, color: colors.auxiliaryText }]} />;
return <MarkdownPreview msg={subtitle} style={[styles.subtitle, { fontSize, color: colors.fontSecondaryInfo }]} />;
}
return null;
@ -163,7 +163,7 @@ const Header = React.memo(
status={status}
teamMain={teamMain}
/>
<Text style={[styles.subtitle, { color: colors.auxiliaryText }]} numberOfLines={1}>
<Text style={[styles.subtitle, { color: colors.fontSecondaryInfo }]} numberOfLines={1}>
{parentTitle}
</Text>
</View>

View File

@ -75,7 +75,7 @@ const LastMessage = React.memo(({ lastMessage, type, showLastMessage, username,
username,
useRealName
})}
style={[styles.markdownText, { color: alert ? colors.bodyText : colors.auxiliaryText }, alignSelf]}
style={[styles.markdownText, { color: alert ? colors.bodyText : colors.fontSecondaryInfo }, alignSelf]}
numberOfLines={2}
/>
);

View File

@ -17,7 +17,7 @@ const UpdatedAt = React.memo(({ date, hideUnreadStatus, alert }: IUpdatedAtProps
style={[
styles.date,
{
color: colors.auxiliaryText
color: colors.fontSecondaryInfo
},
alert &&
!hideUnreadStatus && [

View File

@ -55,7 +55,7 @@ const ServerItem = React.memo(({ item, onPress, onLongPress, hasCheck }: IServer
<Text numberOfLines={1} style={[styles.serverName, { color: themes[theme].titleText }]}>
{item.name || item.id}
</Text>
<Text numberOfLines={1} style={[styles.serverUrl, { color: themes[theme].auxiliaryText }]}>
<Text numberOfLines={1} style={[styles.serverUrl, { color: themes[theme].fontSecondaryInfo }]}>
{item.id}
</Text>
</View>

View File

@ -129,7 +129,7 @@ export const FormTextInput = ({
name={iconLeft}
testID={testID ? `${testID}-icon-left` : undefined}
size={20}
color={colors.auxiliaryText}
color={colors.fontSecondaryInfo}
style={[styles.iconContainer, styles.iconLeft]}
/>
) : null}
@ -156,7 +156,7 @@ export const FormTextInput = ({
name={showPassword ? 'unread-on-top' : 'unread-on-top-disabled'}
testID={testID ? `${testID}-icon-password` : undefined}
size={20}
color={colors.auxiliaryText}
color={colors.fontSecondaryInfo}
/>
</Touchable>
) : null}

View File

@ -21,7 +21,7 @@ export const TextInput = React.forwardRef<RNTextInput, IThemedTextInput>(({ styl
<RNTextInput
ref={ref}
style={[{ color: themes[theme].titleText }, style, styles.input]}
placeholderTextColor={themes[theme].auxiliaryText}
placeholderTextColor={themes[theme].fontSecondaryInfo}
keyboardAppearance={theme === 'light' ? 'light' : 'dark'}
{...props}
/>

View File

@ -68,10 +68,10 @@ const ThreadDetails = ({ item, user, badgeColor, toggleFollowThread, style }: IT
<View style={[styles.container, style]}>
<View style={styles.detailsContainer}>
<View style={styles.detailContainer}>
<CustomIcon name='threads' size={24} color={themes[theme].auxiliaryText} />
<CustomIcon name='threads' size={24} color={themes[theme].fontSecondaryInfo} />
<Text
testID={`thread-count-${count}`}
style={[styles.detailText, { color: themes[theme].auxiliaryText }]}
style={[styles.detailText, { color: themes[theme].fontSecondaryInfo }]}
numberOfLines={1}
>
{count}
@ -79,8 +79,8 @@ const ThreadDetails = ({ item, user, badgeColor, toggleFollowThread, style }: IT
</View>
<View style={styles.detailContainer}>
<CustomIcon name='user' size={24} color={themes[theme].auxiliaryText} />
<Text style={[styles.detailText, { color: themes[theme].auxiliaryText }]} numberOfLines={1}>
<CustomIcon name='user' size={24} color={themes[theme].fontSecondaryInfo} />
<Text style={[styles.detailText, { color: themes[theme].fontSecondaryInfo }]} numberOfLines={1}>
{replies}
</Text>
</View>

View File

@ -79,7 +79,7 @@ export const DatePicker = ({ element, language, action, context, loading, value,
<CustomIcon
name='calendar'
size={20}
color={error ? themes[theme].dangerColor : themes[theme].auxiliaryText}
color={error ? themes[theme].dangerColor : themes[theme].fontSecondaryInfo}
style={styles.icon}
/>
)}

View File

@ -37,9 +37,9 @@ export const Input = ({ element, parser, label, description, error, hint, theme
{label ? (
<Text style={[styles.label, { color: error ? themes[theme].dangerColor : themes[theme].titleText }]}>{label}</Text>
) : null}
{description ? <Text style={[styles.description, { color: themes[theme].auxiliaryText }]}>{description}</Text> : null}
{description ? <Text style={[styles.description, { color: themes[theme].fontSecondaryInfo }]}>{description}</Text> : null}
{parser.renderInputs({ ...element }, BlockContext.FORM, parser)}
{error ? <Text style={[styles.error, { color: themes[theme].dangerColor }]}>{error}</Text> : null}
{hint ? <Text style={[styles.hint, { color: themes[theme].auxiliaryText }]}>{hint}</Text> : null}
{hint ? <Text style={[styles.hint, { color: themes[theme].fontSecondaryInfo }]}>{hint}</Text> : null}
</View>
);

View File

@ -38,7 +38,7 @@ const Chip = ({ item, onSelect, style }: IChip) => {
<Text numberOfLines={1} style={[styles.chipText, { color: colors.titleText }]}>
{textParser([item.text])}
</Text>
<CustomIcon name='close' size={16} color={colors.auxiliaryText} />
<CustomIcon name='close' size={16} color={colors.fontSecondaryInfo} />
</>
</Touchable>
);

View File

@ -27,11 +27,11 @@ const Input = ({ children, onPress, loading, inputStyle, placeholder, disabled,
disabled={disabled}
>
<View style={[styles.input, styles.inputBorder, { borderColor: colors.separatorColor }, innerInputStyle]}>
{placeholder ? <Text style={[styles.pickerText, { color: colors.auxiliaryText }]}>{placeholder}</Text> : children}
{placeholder ? <Text style={[styles.pickerText, { color: colors.fontSecondaryInfo }]}>{placeholder}</Text> : children}
{loading ? (
<ActivityIndicator style={styles.icon} />
) : (
<CustomIcon name='chevron-down' size={22} color={colors.auxiliaryText} style={styles.icon} />
<CustomIcon name='chevron-down' size={22} color={colors.fontSecondaryInfo} style={styles.icon} />
)}
</View>
</Touchable>

View File

@ -119,7 +119,7 @@ export const MultiSelect = React.memo(
<Button title={`${selected.length} selecteds`} onPress={onShow} loading={loading} />
) : (
<Input onPress={onShow} loading={loading} disabled={disabled} inputStyle={inputStyle} innerInputStyle={innerInputStyle}>
<Text style={[styles.pickerText, { color: currentValue ? colors.titleText : colors.auxiliaryText }]}>
<Text style={[styles.pickerText, { color: currentValue ? colors.titleText : colors.fontSecondaryInfo }]}>
{currentValue || placeholder.text}
</Text>
</Input>
@ -131,7 +131,7 @@ export const MultiSelect = React.memo(
{selected.length ? (
<Chips items={selected} onSelect={(item: any) => (disabled ? {} : onSelect(item))} />
) : (
<Text style={[styles.pickerText, { color: colors.auxiliaryText }]}>{placeholder.text}</Text>
<Text style={[styles.pickerText, { color: colors.fontSecondaryInfo }]}>{placeholder.text}</Text>
)}
</Input>
);

View File

@ -67,7 +67,7 @@ export const Select = ({ options = [], placeholder, onChange, loading, disabled,
loading ? (
<ActivityIndicator style={styles.loading} />
) : (
<CustomIcon size={22} name='chevron-down' style={isAndroid && styles.icon} color={themes[theme].auxiliaryText} />
<CustomIcon size={22} name='chevron-down' style={isAndroid && styles.icon} color={themes[theme].fontSecondaryInfo} />
);
return (
@ -89,7 +89,7 @@ export const Select = ({ options = [], placeholder, onChange, loading, disabled,
textInputProps={{
// style property was Omitted in lib, but can be used normally
// @ts-ignore
style: { ...styles.pickerText, color: selected ? themes[theme].titleText : themes[theme].auxiliaryText }
style: { ...styles.pickerText, color: selected ? themes[theme].titleText : themes[theme].fontSecondaryInfo }
}}
/>
);

View File

@ -62,7 +62,7 @@ class MessageParser extends UiKitParserMessage<React.ReactElement> {
const isContext = context === BlockContext.CONTEXT;
if (isContext) {
return (
<MarkdownPreview msg={element.text} style={[isContext && { color: themes[theme].auxiliaryText }]} numberOfLines={0} />
<MarkdownPreview msg={element.text} style={[isContext && { color: themes[theme].fontSecondaryInfo }]} numberOfLines={0} />
);
}
return <Text style={[styles.text, { color: themes[theme].bodyText }]}>{element.text}</Text>;
@ -74,10 +74,10 @@ class MessageParser extends UiKitParserMessage<React.ReactElement> {
const isContext = context === BlockContext.CONTEXT;
if (isContext) {
return (
<MarkdownPreview msg={element.text} style={[isContext && { color: themes[theme].auxiliaryText }]} numberOfLines={0} />
<MarkdownPreview msg={element.text} style={[isContext && { color: themes[theme].fontSecondaryInfo }]} numberOfLines={0} />
);
}
return <Markdown msg={element.text} theme={theme} style={[isContext && { color: themes[theme].auxiliaryText }]} />;
return <Markdown msg={element.text} theme={theme} style={[isContext && { color: themes[theme].fontSecondaryInfo }]} />;
}
button(element: IButton, context: BlockContext) {

View File

@ -40,7 +40,7 @@ const UGCRules = ({ styleContainer }: { styleContainer?: ViewStyle }) => {
};
return (
<View style={[styles.bottomContainer, styleContainer]}>
<Text style={[styles.bottomContainerText, { color: colors.auxiliaryText }]}>
<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>
{`${I18n.t('Onboarding_agree_terms')}\n`}
<Text
style={[styles.bottomContainerTextBold, { color: colors.actionTintColor }]}

View File

@ -128,9 +128,9 @@ export const Links = () => (
<Markdown msg='<https://rocket.chat|Formatted Link>: `<url|description>`' theme={theme} />
<Markdown msg='[Markdown link](https://rocket.chat) and the text with default style' theme={theme} />
<Markdown
msg='[Markdown link](https://rocket.chat) and the text with a color specific as auxiliaryText'
msg='[Markdown link](https://rocket.chat) and the text with a color specific as fontSecondaryInfo'
theme={theme}
style={[{ color: themes[theme].auxiliaryText }]}
style={[{ color: themes[theme].fontSecondaryInfo }]}
/>
</View>
);

View File

@ -59,7 +59,7 @@ const Table = React.memo(({ children, numColumns, theme }: ITable) => {
>
{renderRows(false)}
</ScrollView>
<Text style={[styles.textInfo, { color: themes[theme].auxiliaryText }]}>{I18n.t('Full_table')}</Text>
<Text style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Full_table')}</Text>
</TouchableOpacity>
);
});

View File

@ -15,7 +15,7 @@ const Edited = memo(({ isEdited, testID }: { isEdited: boolean; testID?: string
return (
<View testID={testID} style={styles.rightIcons}>
<CustomIcon name='edit' size={16} color={themes[theme].auxiliaryText} />
<CustomIcon name='edit' size={16} color={themes[theme].fontSecondaryInfo} />
</View>
);
});

View File

@ -18,7 +18,7 @@ const Encrypted = React.memo(({ type }: { type: string }) => {
return (
<Touchable onPress={onEncryptedPress} style={styles.rightIcons} hitSlop={BUTTON_HIT_SLOP}>
<CustomIcon name='encrypted' size={16} color={themes[theme].auxiliaryText} />
<CustomIcon name='encrypted' size={16} color={themes[theme].fontSecondaryInfo} />
</Touchable>
);
});

View File

@ -14,7 +14,7 @@ const Translated = memo(({ isTranslated }: { isTranslated: boolean }) => {
return (
<View style={styles.rightIcons}>
<CustomIcon name='language' size={16} color={colors.auxiliaryText} />
<CustomIcon name='language' size={16} color={colors.fontSecondaryInfo} />
</View>
);
});

View File

@ -23,7 +23,7 @@ const Content = React.memo(
const infoMessage = getInfoMessage({ ...props });
const renderMessageContent = (
<Text style={[styles.textInfo, { color: themes[theme].auxiliaryText }]} accessibilityLabel={infoMessage}>
<Text style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]} accessibilityLabel={infoMessage}>
{infoMessage}
</Text>
);
@ -43,7 +43,7 @@ const Content = React.memo(
if (props.isEncrypted) {
content = (
<Text style={[styles.textInfo, { color: themes[theme].auxiliaryText }]} accessibilityLabel={I18n.t('Encrypted_message')}>
<Text style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]} accessibilityLabel={I18n.t('Encrypted_message')}>
{I18n.t('Encrypted_message')}
</Text>
);
@ -70,7 +70,7 @@ const Content = React.memo(
}
if (props.isIgnored) {
content = <Text style={[styles.textInfo, { color: themes[theme].auxiliaryText }]}>{I18n.t('Message_Ignored')}</Text>;
content = <Text style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Message_Ignored')}</Text>;
}
return <View style={props.isTemp && styles.temp}>{content}</View>;

View File

@ -24,7 +24,7 @@ const Discussion = React.memo(
const { onDiscussionPress } = useContext(MessageContext);
return (
<>
<Text style={[styles.startedDiscussion, { color: themes[theme].auxiliaryText }]}>{I18n.t('Started_discussion')}</Text>
<Text style={[styles.startedDiscussion, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Started_discussion')}</Text>
<Text style={[styles.text, { color: themes[theme].bodyText }]}>{msg}</Text>
<View style={styles.buttonContainer}>
<Touchable
@ -38,7 +38,7 @@ const Discussion = React.memo(
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{buttonText}</Text>
</>
</Touchable>
<Text style={[styles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text>
<Text style={[styles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text>
</View>
</>
);

View File

@ -37,7 +37,7 @@ const RepliedThread = memo(({ tmid, tmsg, isHeader, fetchThreadName, id, isEncry
<CustomIcon name='threads' size={20} style={styles.repliedThreadIcon} color={themes[theme].tintColor} />
<MarkdownPreview msg={msg} style={[styles.repliedThreadName, { color: themes[theme].tintColor }]} />
<View style={styles.repliedThreadDisclosure}>
<CustomIcon name='chevron-right' color={themes[theme].auxiliaryText} size={20} />
<CustomIcon name='chevron-right' color={themes[theme].fontSecondaryInfo} size={20} />
</View>
</View>
);

View File

@ -105,7 +105,7 @@ const Title = React.memo(
{attachment.author_name}
</Text>
) : null}
{time ? <Text style={[messageStyles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text> : null}
{time ? <Text style={[messageStyles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text> : null}
{attachment.title ? <Text style={[styles.title, { color: themes[theme].bodyText }]}>{attachment.title}</Text> : null}
</View>
);

View File

@ -71,7 +71,7 @@ const UrlContent = React.memo(
</Text>
) : null}
{description ? (
<Text style={[styles.description, { color: colors.auxiliaryText }]} numberOfLines={2}>
<Text style={[styles.description, { color: colors.fontSecondaryInfo }]} numberOfLines={2}>
{description}
</Text>
) : null}

View File

@ -83,7 +83,7 @@ const User = React.memo(
if (isHeader) {
const username = (useRealName && author?.name) || author?.username;
const aliasUsername = alias ? <Text style={[styles.alias, { color: colors.auxiliaryText }]}> @{username}</Text> : null;
const aliasUsername = alias ? <Text style={[styles.alias, { color: colors.fontSecondaryInfo }]}> @{username}</Text> : null;
const time = moment(ts).format(timeFormat);
const itsMe = author?._id === user.id;
@ -116,7 +116,7 @@ const User = React.memo(
<Text style={[styles.username, { color: colors.titleText }]} numberOfLines={1}>
{textContent}
</Text>
<Text style={[messageStyles.time, { color: colors.auxiliaryText }]}>{time}</Text>
<Text style={[messageStyles.time, { color: colors.fontSecondaryInfo }]}>{time}</Text>
</TouchableOpacity>
<RightIcons
type={type}

View File

@ -68,7 +68,7 @@ const CancelIndicator = () => {
const { colors } = useTheme();
return (
<View style={styles.cancelContainer}>
<Text style={[styles.text, { color: colors.auxiliaryText }]}>{I18n.t('Cancel')}</Text>
<Text style={[styles.text, { color: colors.fontSecondaryInfo }]}>{I18n.t('Cancel')}</Text>
</View>
);
};

View File

@ -227,7 +227,6 @@ export const colors = {
successColor: '#2de0a5',
borderColor: '#e1e5e8',
controlText: '#54585e',
auxiliaryText: '#9ca2a8',
infoText: '#6d6d72',
tintColor: '#1d74f5',
tintActive: '#549df9',
@ -308,7 +307,6 @@ export const colors = {
successColor: '#2de0a5',
borderColor: '#0f213d',
controlText: '#dadde6',
auxiliaryText: '#9297a2',
infoText: '#6D6D72',
tintColor: '#1d74f5',
tintActive: '#549df9',
@ -389,7 +387,6 @@ export const colors = {
successColor: '#2de0a5',
borderColor: '#1f2329',
controlText: '#dadde6',
auxiliaryText: '#b2b8c6',
infoText: '#6d6d72',
tintColor: '#1e9bfe',
tintActive: '#76b7fc',

View File

@ -29,7 +29,7 @@ const AuthLoadingView = React.memo((): React.ReactElement => {
<StatusBar />
{text ? (
<>
<ActivityIndicator color={colors.auxiliaryText} size='large' />
<ActivityIndicator color={colors.fontSecondaryInfo} size='large' />
<Text style={[styles.text, { color: colors.bodyText }]}>{`${text}\n${I18n.t('Please_wait')}`}</Text>
</>
) : null}

View File

@ -82,7 +82,7 @@ const Item = ({ label, content, theme, testID }: IItem) =>
<Text accessibilityLabel={label} style={[styles.itemLabel, { color: themes[theme].titleText }]}>
{label}
</Text>
<Markdown style={[styles.itemContent, { color: themes[theme].auxiliaryText }]} msg={content} theme={theme} />
<Markdown style={[styles.itemContent, { color: themes[theme].fontSecondaryInfo }]} msg={content} theme={theme} />
</View>
) : null;

View File

@ -36,8 +36,8 @@ const DropdownItem = React.memo(({ onPress, iconName, text }: IDropdownItem) =>
return (
<Touch onPress={onPress} style={{ backgroundColor: themes[theme].backgroundColor }}>
<View style={styles.container}>
<Text style={[styles.text, { color: themes[theme].auxiliaryText }]}>{text}</Text>
{iconName ? <CustomIcon name={iconName} size={22} color={themes[theme].auxiliaryText} /> : null}
<Text style={[styles.text, { color: themes[theme].fontSecondaryInfo }]}>{text}</Text>
{iconName ? <CustomIcon name={iconName} size={22} color={themes[theme].fontSecondaryInfo} /> : null}
</View>
</Touch>
);

View File

@ -43,7 +43,7 @@ export const SwitchItem = ({ id, value, label, hint, onValueChange, disabled = f
<View style={[styles.switchContainer, { backgroundColor: colors.backgroundColor }]}>
<View style={styles.switchTextContainer}>
<Text style={[styles.label, { color: colors.titleText }]}>{I18n.t(label)}</Text>
<Text testID={`create-channel-${id}-hint`} style={[styles.hint, { color: colors.auxiliaryText }]}>
<Text testID={`create-channel-${id}-hint`} style={[styles.hint, { color: colors.fontSecondaryInfo }]}>
{I18n.t(hint)}
</Text>
</View>

View File

@ -167,7 +167,7 @@ const CreateChannelView = () => {
{users.length > 0 ? (
<>
<View style={styles.invitedHeader}>
<Text style={[styles.invitedCount, { color: colors.auxiliaryText }]}>
<Text style={[styles.invitedCount, { color: colors.fontSecondaryInfo }]}>
{I18n.t('N_Selected_members', { n: users.length })}
</Text>
</View>

View File

@ -152,7 +152,7 @@ class CreateChannelView extends React.Component<ICreateChannelViewProps, ICreate
<StatusBar />
<SafeAreaView testID='create-discussion-view' style={styles.container}>
<ScrollView {...scrollPersistTaps}>
<Text style={[styles.description, { color: themes[theme].auxiliaryText }]}>{I18n.t('Discussion_Desc')}</Text>
<Text style={[styles.description, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Discussion_Desc')}</Text>
<SelectChannel
server={server}
userId={user.id}

View File

@ -100,7 +100,7 @@ export default class DirectoryOptions extends PureComponent<IDirectoryOptionsPro
{ borderColor: themes[theme].separatorColor }
]}
>
<Text style={[styles.dropdownToggleText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Search_by')}</Text>
<Text style={[styles.dropdownToggleText, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Search_by')}</Text>
<CustomIcon
style={[styles.dropdownItemIcon, styles.inverted]}
size={22}

View File

@ -45,15 +45,15 @@ const DiscussionDetails = ({ item, date }: IDiscussionDetails): React.ReactEleme
<View style={[styles.container]}>
<View style={styles.detailsContainer}>
<View style={styles.detailContainer}>
<CustomIcon name={'discussions'} size={24} color={colors.auxiliaryText} />
<Text style={[styles.detailText, { color: colors.auxiliaryText }]} numberOfLines={1}>
<CustomIcon name={'discussions'} size={24} color={colors.fontSecondaryInfo} />
<Text style={[styles.detailText, { color: colors.fontSecondaryInfo }]} numberOfLines={1}>
{count}
</Text>
</View>
<View style={styles.detailContainer}>
<CustomIcon name={'clock'} size={24} color={colors.auxiliaryText} />
<Text style={[styles.detailText, { color: colors.auxiliaryText }]} numberOfLines={1}>
<CustomIcon name={'clock'} size={24} color={colors.fontSecondaryInfo} />
<Text style={[styles.detailText, { color: colors.fontSecondaryInfo }]} numberOfLines={1}>
{date}
</Text>
</View>

View File

@ -75,7 +75,7 @@ const Item = ({ item, onPress }: IItem): React.ReactElement => {
<Text style={[styles.title, { color: colors.titleText }]} numberOfLines={1}>
{username}
</Text>
{messageTime ? <Text style={[styles.time, { color: colors.auxiliaryText }]}>{messageTime}</Text> : null}
{messageTime ? <Text style={[styles.time, { color: colors.fontSecondaryInfo }]}>{messageTime}</Text> : null}
</View>
<View style={styles.messageContainer}>
{username ? <MarkdownPreview msg={makeThreadName(item)} numberOfLines={2} style={[styles.markdown]} /> : null}

View File

@ -95,7 +95,7 @@ const DisplayPrefsView = (): React.ReactElement => {
);
const renderRadio = (value: boolean) => (
<RadioButton selected={!!value} color={value ? colors.actionTintColor : colors.auxiliaryText} size={ICON_SIZE} />
<RadioButton selected={!!value} color={value ? colors.actionTintColor : colors.fontSecondaryInfo} size={ICON_SIZE} />
);
return (

View File

@ -58,7 +58,7 @@ const JitsiAuthModal = ({
<Text style={[styles.regular, { color: colors.titleText }]}>{i18n.t('Jitsi_authentication_before_making_calls')}</Text>
)}
{!isAdmin ? (
<Text style={[styles.min, { color: colors.auxiliaryText }]}>
<Text style={[styles.min, { color: colors.fontSecondaryInfo }]}>
{i18n.t('Jitsi_authentication_before_making_calls_ask_admin')}
</Text>
) : null}

View File

@ -131,7 +131,6 @@ const UserForm = () => {
/>
<Button
title={I18n.t('Login')}
type='primary'
onPress={handleSubmit(submit)}
testID='login-view-submit'
loading={isFetching}
@ -144,13 +143,13 @@ const UserForm = () => {
type='secondary'
onPress={forgotPassword}
testID='login-view-forgot-password'
color={colors.auxiliaryText}
color={colors.fontSecondaryInfo}
fontSize={14}
/>
) : null}
{showRegistrationButton ? (
<View style={styles.bottomContainer}>
<Text style={[styles.bottomContainerText, { color: colors.auxiliaryText }]}>{I18n.t('Dont_Have_An_Account')}</Text>
<Text style={[styles.bottomContainerText, { color: colors.fontSecondaryInfo }]}>{I18n.t('Dont_Have_An_Account')}</Text>
<Text
style={[styles.bottomContainerTextBold, { color: colors.actionTintColor }]}
onPress={register}
@ -160,7 +159,7 @@ const UserForm = () => {
</Text>
</View>
) : (
<Text style={[styles.registerDisabled, { color: colors.auxiliaryText }]}>
<Text style={[styles.registerDisabled, { color: colors.fontSecondaryInfo }]}>
{Accounts_RegistrationForm_LinkReplacementText}
</Text>
)}

View File

@ -41,12 +41,12 @@ const Item = ({ item, theme, onPress, onDelete }: IItem): JSX.Element => (
<Text numberOfLines={1} style={[styles.server, { color: themes[theme].bodyText }]}>
{item.url}
</Text>
<Text numberOfLines={1} style={{ color: themes[theme].auxiliaryText }}>
<Text numberOfLines={1} style={{ color: themes[theme].fontSecondaryInfo }}>
{item.username}
</Text>
</View>
<BorderlessButton onPress={() => onDelete(item)} testID={`server-history-delete-${item.url}`}>
<CustomIcon name='delete' size={24} color={themes[theme].auxiliaryText} />
<CustomIcon name='delete' size={24} color={themes[theme].fontSecondaryInfo} />
</BorderlessButton>
</Touch>
);

View File

@ -306,7 +306,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
<Text
style={[
styles.chooseCertificateTitle,
{ color: themes[theme].auxiliaryText, fontSize: moderateScale({ size: 13, width }) }
{ color: themes[theme].fontSecondaryInfo, fontSize: moderateScale({ size: 13, width }) }
]}
>
{certificate ? I18n.t('Your_certificate') : I18n.t('Do_you_have_a_certificate')}
@ -316,7 +316,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
testID='new-server-choose-certificate'
>
<Text
style={[styles.chooseCertificate, { color: themes[theme].tintColor, fontSize: moderateScale({ size: 13, width }) }]}
style={[styles.chooseCertificate, { color: themes[theme].fontInfo, fontSize: moderateScale({ size: 13, width }) }]}
>
{certificate ?? I18n.t('Apply_Your_Certificate')}
</Text>
@ -395,7 +395,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
style={[
styles.description,
{
color: themes[theme].auxiliaryText,
color: themes[theme].fontSecondaryInfo,
fontSize: moderateScale({ size: 14, width }),
marginBottom: verticalScale({ size: 16, height })
}
@ -406,7 +406,6 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
<Button
title={I18n.t('Join_our_open_workspace')}
type='secondary'
backgroundColor={themes[theme].chatComponentBackground}
onPress={this.connectOpen}
disabled={connecting}
loading={connectingOpen && connecting}

View File

@ -126,13 +126,13 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
<View style={styles.infoContainer}>
<View style={styles.item}>
<Text style={[styles.name, { color: themes[theme].titleText }]}>{item?.user?.name}</Text>
<Text style={[styles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text>
<Text style={[styles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text>
</View>
<Text
style={[
styles.username,
{
color: themes[theme].auxiliaryText
color: themes[theme].fontSecondaryInfo
}
]}
>{`@${item.user.username}`}</Text>
@ -161,7 +161,7 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
borderColor: themes[theme].separatorColor
}
]}
refreshControl={<RefreshControl refreshing={loading} onRefresh={this.load} tintColor={themes[theme].auxiliaryText} />}
refreshControl={<RefreshControl refreshing={loading} onRefresh={this.load} tintColor={themes[theme].fontSecondaryInfo} />}
keyExtractor={item => item._id}
/>
</SafeAreaView>

View File

@ -310,7 +310,7 @@ class RegisterView extends React.Component<IProps, any> {
{showLoginButton ? (
<View style={styles.bottomContainer}>
<Text style={[styles.bottomContainerText, { color: themes[theme].auxiliaryText }]}>
<Text style={[styles.bottomContainerText, { color: themes[theme].fontSecondaryInfo }]}>
{I18n.t('Do_you_have_an_account')}
</Text>
<Text style={[styles.bottomContainerTextBold, { color: themes[theme].actionTintColor }]} onPress={this.login}>

View File

@ -826,12 +826,12 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
)}
<MarkdownPreview
msg={t === 'd' ? `@${name}` : topic}
style={[styles.roomDescription, { color: themes[theme].auxiliaryText }]}
style={[styles.roomDescription, { color: themes[theme].fontSecondaryInfo }]}
/>
{room.t === 'd' && (
<MarkdownPreview
msg={member.statusText}
style={[styles.roomDescription, { color: themes[theme].auxiliaryText }]}
style={[styles.roomDescription, { color: themes[theme].fontSecondaryInfo }]}
/>
)}
</View>

View File

@ -702,7 +702,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
style={[
styles.buttonContainer_inverted,
styles.buttonInverted,
{ flex: 1, borderColor: themes[theme].auxiliaryText },
{ flex: 1, borderColor: themes[theme].fontSecondaryInfo },
!this.formIsChanged() && styles.buttonContainerDisabled
]}
onPress={this.reset}

View File

@ -21,7 +21,7 @@ const Item = ({ label, content, testID }: IItem): React.ReactElement | null => {
<Text accessibilityLabel={label} style={[styles.itemLabel, { color: colors.titleText }]}>
{label}
</Text>
<Markdown style={[styles.itemContent, { color: colors.auxiliaryText }]} msg={content} />
<Markdown style={[styles.itemContent, { color: colors.fontSecondaryInfo }]} msg={content} />
</View>
);
};

View File

@ -27,7 +27,7 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo
{username && (
<Text
testID='room-info-view-username'
style={[styles.roomUsername, { color: colors.auxiliaryText }]}
style={[styles.roomUsername, { color: colors.fontSecondaryInfo }]}
>{`@${username}`}</Text>
)}
{!!statusText && (
@ -35,7 +35,7 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo
<CollapsibleText
linesToTruncate={2}
msg={statusText}
style={[styles.roomUsername, { color: colors.auxiliaryText }]}
style={[styles.roomUsername, { color: colors.fontSecondaryInfo }]}
/>
</View>
)}

View File

@ -33,7 +33,7 @@ const Banner = React.memo(
>
<MarkdownPreview msg={text} style={[styles.bannerText]} />
<BorderlessButton onPress={closeBanner}>
<CustomIcon color={themes[theme].auxiliaryText} name='close' size={20} />
<CustomIcon color={themes[theme].fontSecondaryInfo} name='close' size={20} />
</BorderlessButton>
</BorderlessButton>
<Modal
@ -45,7 +45,7 @@ const Banner = React.memo(
animationOut='fadeOut'
>
<View style={[styles.modalView, { backgroundColor: themes[theme].bannerBackground }]}>
<Text style={[styles.bannerModalTitle, { color: themes[theme].auxiliaryText }]}>{title}</Text>
<Text style={[styles.bannerModalTitle, { color: themes[theme].fontSecondaryInfo }]}>{title}</Text>
<ScrollView style={styles.modalScrollView}>
<Markdown msg={text} theme={theme} />
</ScrollView>

View File

@ -60,7 +60,7 @@ const LoadMore = React.memo(
return (
<Touch onPress={handleLoad} style={styles.button} enabled={!loading}>
{loading ? (
<ActivityIndicator color={colors.auxiliaryText} />
<ActivityIndicator color={colors.fontSecondaryInfo} />
) : (
<Text style={[styles.text, { color: colors.titleText }]}>{I18n.t(text)}</Text>
)}

View File

@ -49,7 +49,7 @@ const DateSeparator = ({ ts, unread }: { ts: Date | string | null; unread: boole
return (
<View style={styles.container}>
<View style={[styles.line, { backgroundColor: themes[theme].borderColor }]} />
<Text style={[styles.text, { color: themes[theme].auxiliaryText }, styles.marginHorizontal]}>{date}</Text>
<Text style={[styles.text, { color: themes[theme].fontSecondaryInfo }, styles.marginHorizontal]}>{date}</Text>
<View style={[styles.line, { backgroundColor: themes[theme].borderColor }]} />
</View>
);

View File

@ -172,14 +172,14 @@ class UploadProgress extends Component<IUploadProgressProps, IUploadProgressStat
if (!item.error) {
return [
<View key='row' style={styles.row}>
<CustomIcon name='attach' size={20} color={themes[theme!].auxiliaryText} />
<CustomIcon name='attach' size={20} color={themes[theme!].fontSecondaryInfo} />
<Text
style={[styles.descriptionContainer, styles.descriptionText, { color: themes[theme!].auxiliaryText }]}
style={[styles.descriptionContainer, styles.descriptionText, { color: themes[theme!].fontSecondaryInfo }]}
numberOfLines={1}
>
{I18n.t('Uploading')} {item.name}
</Text>
<CustomIcon name='close' size={20} color={themes[theme!].auxiliaryText} onPress={() => this.handleCancelUpload(item)} />
<CustomIcon name='close' size={20} color={themes[theme!].fontSecondaryInfo} onPress={() => this.handleCancelUpload(item)} />
</View>,
<View
key='progress'
@ -191,14 +191,14 @@ class UploadProgress extends Component<IUploadProgressProps, IUploadProgressStat
<View style={styles.row}>
<CustomIcon name='warning' size={20} color={themes[theme!].dangerColor} />
<View style={styles.descriptionContainer}>
<Text style={[styles.descriptionText, { color: themes[theme!].auxiliaryText }]} numberOfLines={1}>
<Text style={[styles.descriptionText, { color: themes[theme!].fontSecondaryInfo }]} numberOfLines={1}>
{I18n.t('Error_uploading')} {item.name}
</Text>
<TouchableOpacity onPress={() => this.tryAgain(item)}>
<Text style={[styles.tryAgainButtonText, { color: themes[theme!].tintColor }]}>{I18n.t('Try_again')}</Text>
</TouchableOpacity>
</View>
<CustomIcon name='close' size={20} color={themes[theme!].auxiliaryText} onPress={() => this.deleteUpload(item)} />
<CustomIcon name='close' size={20} color={themes[theme!].fontSecondaryInfo} onPress={() => this.deleteUpload(item)} />
</View>
);
};

View File

@ -90,7 +90,7 @@ const Header = React.memo(
{subtitle ? (
<Text
testID='rooms-list-header-server-subtitle'
style={[styles.subtitle, { color: colors.auxiliaryText }]}
style={[styles.subtitle, { color: colors.fontSecondaryInfo }]}
numberOfLines={1}
>
{subtitle}

View File

@ -213,7 +213,7 @@ class ServerDropdown extends Component<IServerDropdownProps, IServerDropdownStat
testID='rooms-list-header-server-dropdown'
>
<View style={[styles.dropdownContainerHeader, styles.serverHeader, { borderColor: themes[theme].separatorColor }]}>
<Text style={[styles.serverHeaderText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Server')}</Text>
<Text style={[styles.serverHeaderText, { color: themes[theme].fontSecondaryInfo }]}>{I18n.t('Server')}</Text>
<TouchableOpacity onPress={this.addServer} testID='rooms-list-header-server-add'>
<Text style={[styles.serverHeaderAdd, { color: themes[theme].tintColor }]}>{I18n.t('Add_Server')}</Text>
</TouchableOpacity>

View File

@ -974,7 +974,7 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
keyboardShouldPersistTaps='always'
initialNumToRender={INITIAL_NUM_TO_RENDER}
refreshControl={
<RefreshControl refreshing={refreshing} onRefresh={this.onRefresh} tintColor={themes[theme].auxiliaryText} />
<RefreshControl refreshing={refreshing} onRefresh={this.onRefresh} tintColor={themes[theme].fontSecondaryInfo} />
}
windowSize={9}
onEndReached={this.onEndReached}

View File

@ -70,7 +70,7 @@ const SearchBox = ({ hasCancel, onCancelPress, inputRef, ...props }: ISearchBox)
]}
>
<View style={[styles.searchBox, { backgroundColor: themes[theme].searchboxBackground }]}>
<CustomIcon name='search' size={14} color={themes[theme].auxiliaryText} />
<CustomIcon name='search' size={14} color={themes[theme].fontSecondaryInfo} />
<TextInput
ref={inputRef}
autoCapitalize='none'

View File

@ -32,8 +32,8 @@ const DropdownItem = React.memo(({ onPress, iconName, text }: IDropdownItem) =>
return (
<Touch onPress={onPress} style={{ backgroundColor: colors.backgroundColor }}>
<View style={styles.container}>
<Text style={[styles.text, { color: colors.auxiliaryText }]}>{text}</Text>
{iconName ? <CustomIcon name={iconName} size={22} color={colors.auxiliaryText} /> : null}
<Text style={[styles.text, { color: colors.fontSecondaryInfo }]}>{text}</Text>
{iconName ? <CustomIcon name={iconName} size={22} color={colors.fontSecondaryInfo} /> : null}
</View>
</Touch>
);

View File

@ -86,7 +86,7 @@ const Item = ({ item, useRealName, user, badgeColor, onPress, toggleFollowThread
<Text style={[styles.title, { color: themes[theme].titleText }]} numberOfLines={1}>
{username}
</Text>
<Text style={[styles.time, { color: themes[theme].auxiliaryText }]}>{time}</Text>
<Text style={[styles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text>
</View>
<View style={styles.messageContainer}>
<MarkdownPreview msg={makeThreadName(item)} numberOfLines={2} style={[styles.markdown]} />

View File

@ -17,7 +17,7 @@ const RegisterDisabledComponent = () => {
return null;
}
return <Text style={[styles.registrationText, { color: colors.auxiliaryText }]}>{registrationText}</Text>;
return <Text style={[styles.registrationText, { color: colors.fontSecondaryInfo }]}>{registrationText}</Text>;
};
export default RegisterDisabledComponent;

View File

@ -78,7 +78,7 @@ const WorkspaceView = () => {
<View style={styles.alignItemsCenter}>
<ServerAvatar url={server} image={Assets_favicon_512?.url ?? Assets_favicon_512?.defaultUrl} />
<Text style={[styles.serverName, { color: colors.titleText }]}>{Site_Name}</Text>
<Text style={[styles.serverUrl, { color: colors.auxiliaryText }]}>{Site_Url}</Text>
<Text style={[styles.serverUrl, { color: colors.fontSecondaryInfo }]}>{Site_Url}</Text>
</View>
{showLoginButton ? <Button title={I18n.t('Login')} type='primary' onPress={login} testID='workspace-view-login' /> : null}
{showRegistrationButton ? (