verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

chore: remove titleText

This commit is contained in:
GleidsonDaniel 2024-03-13 11:23:21 -03:00
parent 8b4ead7c3f
commit 95ea8b2a5e
59 changed files with 92 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/containers/ActionSheet/ActionSheetContentWithInputAndSubmit/index.tsx
View File

@ -105,7 +105,7 @@ const ActionSheetContentWithInputAndSubmit = ({
{title}
</Text>
</View>
<Text style={[styles.subtitleText, { color: colors.titleText }]}>{description}</Text>
<Text style={[styles.subtitleText, { color: colors.fontTitlesLabels }]}>{description}</Text>
{customText}
</>
{showInput ? (

2
app/containers/Avatar/AvatarWithEdit.tsx
View File

@ -74,7 +74,7 @@ const AvatarWithEdit = ({
testID='avatar-edit-button'
style={styles.editAvatarButton}
styleText={styles.textButton}
color={colors.titleText}
color={colors.fontTitlesLabels}
hitSlop={BUTTON_HIT_SLOP}
/>
) : null}

2
app/containers/DirectoryItem/index.tsx
View File

@ -56,7 +56,7 @@ const DirectoryItem = ({
<View style={styles.directoryItemTextContainer}>
<View style={styles.directoryItemTextTitle}>
{type !== 'd' ? <RoomTypeIcon type={type} teamMain={teamMain} /> : null}
<Text style={[styles.directoryItemName, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.directoryItemName, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{title}
</Text>
</View>

6
app/containers/InAppNotification/NotifierComponent.tsx
View File

@ -119,17 +119,17 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }: INotifie
<>
<Avatar text={avatar} size={AVATAR_SIZE} type={type} rid={rid} style={styles.avatar} />
<View style={styles.inner}>
<Text style={[styles.roomName, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.roomName, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{title}
</Text>
<Text style={[styles.message, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.message, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{text}
</Text>
</View>
</>
</Touchable>
<Touchable onPress={hideNotification} hitSlop={BUTTON_HIT_SLOP} background={Touchable.SelectableBackgroundBorderless()}>
<CustomIcon name='close' size={20} color={themes[theme].titleText} style={styles.close} />
<CustomIcon name='close' size={20} color={themes[theme].fontTitlesLabels} style={styles.close} />
</Touchable>
</View>
);

2
app/containers/List/ListItem.tsx
View File

@ -97,7 +97,7 @@ const Content = React.memo(
{left ? <View style={styles.leftContainer}>{left()}</View> : null}
<View style={styles.textContainer}>
<View style={styles.textAlertContainer}>
<Text style={[styles.title, styleTitle, { color: color || themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.title, styleTitle, { color: color || themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{translateTitle && title ? I18n.t(title) : title}
</Text>
{alert ? (

4
app/containers/LoginServices/ButtonService.tsx
View File

@ -20,9 +20,9 @@ const ButtonService = ({ name, authType, onPress, backgroundColor, buttonText, i
>
<View style={styles.serviceButtonContainer}>
{authType === 'oauth' || authType === 'apple' ? (
<CustomIcon name={icon} size={24} color={colors.titleText} style={styles.serviceIcon} />
<CustomIcon name={icon} size={24} color={colors.fontTitlesLabels} style={styles.serviceIcon} />
) : null}
<Text style={[styles.serviceText, { color: colors.titleText }]}>{buttonText}</Text>
<Text style={[styles.serviceText, { color: colors.fontTitlesLabels }]}>{buttonText}</Text>
</View>
</Touch>
);

2
app/containers/RoomItem/Title.tsx
View File

@ -9,7 +9,7 @@ const Title = React.memo(({ name, hideUnreadStatus, alert }: ITitleProps) => {
const { colors } = useTheme();
return (
<Text
style={[styles.title, alert && !hideUnreadStatus && styles.alert, { color: colors.titleText }]}
style={[styles.title, alert && !hideUnreadStatus && styles.alert, { color: colors.fontTitlesLabels }]}
ellipsizeMode='tail'
numberOfLines={1}
>

2
app/containers/RoomTypeIcon/index.tsx
View File

@ -55,7 +55,7 @@ const RoomTypeIcon = React.memo(
icon = 'message';
}
return <CustomIcon name={icon} size={size} color={themes[theme].titleText} style={iconStyle} />;
return <CustomIcon name={icon} size={size} color={themes[theme].fontTitlesLabels} style={iconStyle} />;
}
);

2
app/containers/ServerItem/index.tsx
View File

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

2
app/containers/SupportedVersions/SupportedVersionsExpired.tsx
View File

@ -50,7 +50,7 @@ export const SupportedVersionsExpired = () => {
<View style={styles.iconContainer}>
<CustomIcon name='warning' size={36} color={colors.dangerColor} />
</View>
<Text style={[styles.title, { color: colors.titleText }]}>
<Text style={[styles.title, { color: colors.fontTitlesLabels }]}>
{I18n.t('Supported_versions_expired_title', { workspace_name: name })}
</Text>
<Text style={[styles.description, { color: colors.bodyText }]}>{I18n.t('Supported_versions_expired_description')}</Text>

2
app/containers/SupportedVersions/SupportedVersionsWarning.tsx
View File

@ -36,7 +36,7 @@ export const SupportedVersionsWarning = ({ navigation, route }: { navigation?: a
<CustomIcon name='warning' size={36} color={colors.dangerColor} />
</View>
{message.title ? (
<Text testID='sv-warn-title' style={[styles.title, { color: colors.titleText }]}>
<Text testID='sv-warn-title' style={[styles.title, { color: colors.fontTitlesLabels }]}>
{message.title}
</Text>
) : null}

4
app/containers/TextInput/FormTextInput.tsx
View File

@ -91,7 +91,7 @@ export const FormTextInput = ({
return (
<View style={[styles.inputContainer, containerStyle]}>
{label ? (
<Text style={[styles.label, { color: colors.titleText }, error?.error && { color: colors.dangerColor }]}>{label}</Text>
<Text style={[styles.label, { color: colors.fontTitlesLabels }, error?.error && { color: colors.dangerColor }]}>{label}</Text>
) : null}
<View style={styles.wrap}>
@ -103,7 +103,7 @@ export const FormTextInput = ({
{
backgroundColor: colors.backgroundColor,
borderColor: colors.separatorColor,
color: colors.titleText
color: colors.fontTitlesLabels
},
error?.error && {
color: colors.dangerColor,

2
app/containers/TextInput/TextInput.tsx
View File

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

2
app/containers/TwoFactor/index.tsx
View File

@ -102,7 +102,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
setData({});
};
const color = themes[theme].titleText;
const color = themes[theme].fontTitlesLabels;
return (
<Modal avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
<View style={styles.container} testID='two-factor'>

4
app/containers/UIKit/DatePicker.tsx
View File

@ -70,7 +70,7 @@ export const DatePicker = ({ element, language, action, context, loading, value,
background={Touchable.Ripple(themes[theme].bannerBackground)}
>
<View style={[styles.input, { borderColor: error ? themes[theme].dangerColor : themes[theme].separatorColor }]}>
<Text style={[styles.inputText, { color: error ? themes[theme].dangerColor : themes[theme].titleText }]}>
<Text style={[styles.inputText, { color: error ? themes[theme].dangerColor : themes[theme].fontTitlesLabels }]}>
{currentDate.toLocaleDateString(language)}
</Text>
{loading ? (
@ -94,7 +94,7 @@ export const DatePicker = ({ element, language, action, context, loading, value,
display={isAndroid ? 'default' : 'inline'}
value={currentDate}
onChange={onChange}
textColor={themes[theme].titleText}
textColor={themes[theme].fontTitlesLabels}
/>
) : null;

2
app/containers/UIKit/Input.tsx
View File

@ -35,7 +35,7 @@ const styles = StyleSheet.create({
export const Input = ({ element, parser, label, description, error, hint, theme }: IInput) => (
<View style={styles.container}>
{label ? (
<Text style={[styles.label, { color: error ? themes[theme].dangerColor : themes[theme].titleText }]}>{label}</Text>
<Text style={[styles.label, { color: error ? themes[theme].dangerColor : themes[theme].fontTitlesLabels }]}>{label}</Text>
) : null}
{description ? <Text style={[styles.description, { color: themes[theme].fontSecondaryInfo }]}>{description}</Text> : null}
{parser.renderInputs({ ...element }, BlockContext.FORM, parser)}

2
app/containers/UIKit/MultiSelect/Chips.tsx
View File

@ -35,7 +35,7 @@ const Chip = ({ item, onSelect, style }: IChip) => {
>
<>
{item.imageUrl ? <FastImage style={styles.chipImage} source={{ uri: item.imageUrl }} /> : null}
<Text numberOfLines={1} style={[styles.chipText, { color: colors.titleText }]}>
<Text numberOfLines={1} style={[styles.chipText, { color: colors.fontTitlesLabels }]}>
{textParser([item.text])}
</Text>
<CustomIcon name='close' size={16} color={colors.fontSecondaryInfo} />

2
app/containers/UIKit/MultiSelect/Items.tsx
View File

@ -36,7 +36,7 @@ const Item = ({ item, selected, onSelect }: IItem) => {
{item.imageUrl ? <FastImage style={styles.itemImage} source={{ uri: item.imageUrl }} /> : null}
</View>
<View style={styles.flex}>
<Text numberOfLines={1} style={{ color: colors.titleText }}>
<Text numberOfLines={1} style={{ color: colors.fontTitlesLabels }}>
{textParser([item.text])}
</Text>
</View>

2
app/containers/UIKit/MultiSelect/index.tsx
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.fontSecondaryInfo }]}>
<Text style={[styles.pickerText, { color: currentValue ? colors.fontTitlesLabels : colors.fontSecondaryInfo }]}>
{currentValue || placeholder.text}
</Text>
</Input>

2
app/containers/UIKit/Select.tsx
View File

@ -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].fontSecondaryInfo }
style: { ...styles.pickerText, color: selected ? themes[theme].fontTitlesLabels : themes[theme].fontSecondaryInfo }
}}
/>
);

4
app/containers/message/User.tsx
View File

@ -104,7 +104,7 @@ const User = React.memo(
if (messageHaveAuthorName(type as MessageTypesValues)) {
return (
<Text style={[styles.usernameInfoMessage, { color: colors.titleText }]} onPress={onUserPress}>
<Text style={[styles.usernameInfoMessage, { color: colors.fontTitlesLabels }]} onPress={onUserPress}>
{textContent}
</Text>
);
@ -113,7 +113,7 @@ const User = React.memo(
return (
<View style={styles.container}>
<TouchableOpacity testID={`username-header-${username}`} style={styles.titleContainer} onPress={onUserPress}>
<Text style={[styles.username, { color: colors.titleText }]} numberOfLines={1}>
<Text style={[styles.username, { color: colors.fontTitlesLabels }]} numberOfLines={1}>
{textContent}
</Text>
<Text style={[messageStyles.time, { color: colors.fontSecondaryInfo }]}>{time}</Text>

3
app/lib/constants/colors.ts
View File

@ -220,7 +220,6 @@ export const colors = {
chatComponentBackground: '#f3f4f5',
auxiliaryBackground: '#efeff4',
bannerBackground: '#f1f2f4',
titleText: '#0d0e12',
bodyText: '#2f343d',
backdropColor: '#000000',
dangerColor: '#f5455c',
@ -300,7 +299,6 @@ export const colors = {
chatComponentBackground: '#192132',
auxiliaryBackground: '#07101e',
bannerBackground: '#0e1f38',
titleText: '#f9f9f9',
bodyText: '#cbced1',
backdropColor: '#000000',
dangerColor: '#f5455c',
@ -380,7 +378,6 @@ export const colors = {
chatComponentBackground: '#16181a',
auxiliaryBackground: '#080808',
bannerBackground: '#1f2329',
titleText: '#f9f9f9',
bodyText: '#cbced1',
backdropColor: '#000000',
dangerColor: '#f5455c',

4
app/views/CannedResponseDetail.tsx
View File

@ -79,7 +79,7 @@ interface IItem {
const Item = ({ label, content, theme, testID }: IItem) =>
content ? (
<View style={styles.item} testID={testID}>
<Text accessibilityLabel={label} style={[styles.itemLabel, { color: themes[theme].titleText }]}>
<Text accessibilityLabel={label} style={[styles.itemLabel, { color: themes[theme].fontTitlesLabels }]}>
{label}
</Text>
<Markdown style={[styles.itemContent, { color: themes[theme].fontSecondaryInfo }]} msg={content} theme={theme} />
@ -120,7 +120,7 @@ const CannedResponseDetail = ({ navigation, route }: ICannedResponseDetailProps)
<Item label={I18n.t('Sharing')} content={cannedResponse?.scopeName} theme={theme} />
<View style={styles.item}>
<Text style={[styles.itemLabel, { color: themes[theme].titleText }]}>{I18n.t('Tags')}</Text>
<Text style={[styles.itemLabel, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Tags')}</Text>
<View style={styles.cannedTagContainer}>
{cannedResponse?.tags?.length > 0 ? (
cannedResponse.tags.map(t => (

4
app/views/CannedResponsesListView/CannedResponseItem.tsx
View File

@ -31,14 +31,14 @@ const CannedResponseItem = ({
<>
<View style={styles.cannedRow}>
<View style={styles.cannedWrapShortcutScope}>
<Text style={[styles.cannedShortcut, { color: themes[theme].titleText }]}>!{shortcut}</Text>
<Text style={[styles.cannedShortcut, { color: themes[theme].fontTitlesLabels }]}>!{shortcut}</Text>
<Text style={[styles.cannedScope, { color: themes[theme].auxiliaryTintColor }]}>{scope}</Text>
</View>
<Button
title={I18n.t('Use')}
fontSize={12}
color={themes[theme].titleText}
color={themes[theme].fontTitlesLabels}
style={[styles.cannedUseButton, { backgroundColor: themes[theme].chatComponentBackground }]}
onPress={onPressUse}
/>

2
app/views/ChangeAvatarView/AvatarSuggestion.tsx
View File

@ -40,7 +40,7 @@ const AvatarSuggestion = ({
return (
<View style={styles.containerImagesUploaded}>
<Text style={[styles.itemLabel, { color: colors.titleText }]}>{I18n.t('Images_uploaded')}</Text>
<Text style={[styles.itemLabel, { color: colors.fontTitlesLabels }]}>{I18n.t('Images_uploaded')}</Text>
<View style={styles.containerAvatarSuggestion}>
{username && resetAvatar ? (
<AvatarSuggestionItem text={`@${username}`} testID={`reset-avatar-suggestion`} onPress={resetAvatar} />

2
app/views/CloseLivechatView.tsx
View File

@ -92,7 +92,7 @@ const CloseLivechatView = ({ navigation, route }: IBaseScreen<ChatsStackParamLis
{requestTags ? (
<>
<Text style={[styles.subtitleText, { color: colors.titleText }]}>{I18n.t('Tags')}</Text>
<Text style={[styles.subtitleText, { color: colors.fontTitlesLabels }]}>{I18n.t('Tags')}</Text>
<MultiSelect
options={tagsList?.map(({ name }) => ({ text: { text: name }, value: name }))}
onChange={({ value }: { value: string[] }) => {

2
app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
View File

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

2
app/views/CreateDiscussionView/SelectChannel.tsx
View File

@ -56,7 +56,7 @@ const SelectChannel = ({
return (
<>
<Text style={[styles.label, { color: colors.titleText }]}>{I18n.t('Parent_channel_or_group')}</Text>
<Text style={[styles.label, { color: colors.fontTitlesLabels }]}>{I18n.t('Parent_channel_or_group')}</Text>
<MultiSelect
inputStyle={styles.inputStyle}
onChange={onChannelSelect}

2
app/views/CreateDiscussionView/SelectUsers.tsx
View File

@ -59,7 +59,7 @@ const SelectUsers = ({
return (
<>
<Text style={[styles.label, { color: colors.titleText }]}>{I18n.t('Invite_users')}</Text>
<Text style={[styles.label, { color: colors.fontTitlesLabels }]}>{I18n.t('Invite_users')}</Text>
<MultiSelect
inputStyle={styles.inputStyle}
onSearch={getUsers}

2
app/views/DiscussionsView/Item.tsx
View File

@ -72,7 +72,7 @@ const Item = ({ item, onPress }: IItem): React.ReactElement => {
<Avatar style={styles.avatar} text={item?.u?.username} size={36} borderRadius={4} />
<View style={styles.contentContainer}>
<View style={styles.titleContainer}>
<Text style={[styles.title, { color: colors.titleText }]} numberOfLines={1}>
<Text style={[styles.title, { color: colors.fontTitlesLabels }]} numberOfLines={1}>
{username}
</Text>
{messageTime ? <Text style={[styles.time, { color: colors.fontSecondaryInfo }]}>{messageTime}</Text> : null}

2
app/views/ForgotPasswordView.tsx
View File

@ -67,7 +67,7 @@ const ForgotPasswordView = (): React.ReactElement => {
return (
<FormContainer testID='forgot-password-view'>
<FormContainerInner>
<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, { color: colors.titleText }]}>
<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, { color: colors.fontTitlesLabels }]}>
{I18n.t('Forgot_password')}
</Text>
<ControlledFormTextInput

6
app/views/JitsiMeetView/JitsiAuthModal.tsx
View File

@ -49,13 +49,13 @@ const JitsiAuthModal = ({
return (
<Modal isVisible>
<View style={[styles.container, { backgroundColor: colors.backgroundColor }]}>
<Text style={[styles.title, { color: colors.titleText }]}>{i18n.t('Jitsi_may_require_authentication')}</Text>
<Text style={[styles.title, { color: colors.fontTitlesLabels }]}>{i18n.t('Jitsi_may_require_authentication')}</Text>
{isAdmin ? (
<Text style={[styles.regular, { color: colors.titleText }]}>
<Text style={[styles.regular, { color: colors.fontTitlesLabels }]}>
{i18n.t('Jitsi_authentication_before_making_calls_admin')}
</Text>
) : (
<Text style={[styles.regular, { color: colors.titleText }]}>{i18n.t('Jitsi_authentication_before_making_calls')}</Text>
<Text style={[styles.regular, { color: colors.fontTitlesLabels }]}>{i18n.t('Jitsi_authentication_before_making_calls')}</Text>
)}
{!isAdmin ? (
<Text style={[styles.min, { color: colors.fontSecondaryInfo }]}>

4
app/views/LivechatEditView.tsx
View File

@ -53,7 +53,7 @@ interface ILivechatEditViewProps {
}
const Title = ({ title, theme }: ITitle) =>
title ? <Text style={[styles.title, { color: themes[theme].titleText }]}>{title}</Text> : null;
title ? <Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>{title}</Text> : null;
const LivechatEditView = ({ user, navigation, route, theme }: ILivechatEditViewProps) => {
const [customFields, setCustomFields] = useState<ICustomFields>({});
@ -257,7 +257,7 @@ const LivechatEditView = ({ user, navigation, route, theme }: ILivechatEditViewP
editable={!!editLivechatRoomCustomFieldsPermission}
/>
<Text style={[styles.label, { color: themes[theme].titleText }]}>{I18n.t('Tags')}</Text>
<Text style={[styles.label, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Tags')}</Text>
<MultiSelect
options={tagOptions}
onChange={({ value }: { value: string[] }) => {

2
app/views/LoginView/UserForm.tsx
View File

@ -102,7 +102,7 @@ const UserForm = () => {
return (
<>
<Text style={[styles.title, sharedStyles.textBold, { color: colors.titleText }]}>{I18n.t('Login')}</Text>
<Text style={[styles.title, sharedStyles.textBold, { color: colors.fontTitlesLabels }]}>{I18n.t('Login')}</Text>
<ControlledFormTextInput
name='user'
control={control}

2
app/views/MessagesView/index.tsx
View File

@ -349,7 +349,7 @@ class MessagesView extends React.Component<IMessagesViewProps, IMessagesViewStat
const { theme } = this.props;
return (
<View style={[styles.listEmptyContainer, { backgroundColor: themes[theme].backgroundColor }]} testID={this.content.testID}>
<Text style={[styles.noDataFound, { color: themes[theme].titleText }]}>{this.content.noDataMsg}</Text>
<Text style={[styles.noDataFound, { color: themes[theme].fontTitlesLabels }]}>{this.content.noDataMsg}</Text>
</View>
);
};

2
app/views/NewServerView/index.tsx
View File

@ -350,7 +350,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
style={[
styles.title,
{
color: themes[theme].titleText,
color: themes[theme].fontTitlesLabels,
fontSize: moderateScale({ size: 22, width }),
marginBottom: verticalScale({ size: 8, height })
}

2
app/views/PickerView.tsx
View File

@ -105,7 +105,7 @@ const PickerView = (): React.ReactElement => {
ListHeaderComponent={<RenderSearch onChangeText={onChangeText} />}
ListFooterComponent={List.Separator}
ListEmptyComponent={() => (
<Text style={[styles.noResult, { color: colors.titleText }]}>{I18n.t('No_results_found')}</Text>
<Text style={[styles.noResult, { color: colors.fontTitlesLabels }]}>{I18n.t('No_results_found')}</Text>
)}
/>
</SafeAreaView>

2
app/views/ReadReceiptView/index.tsx
View File

@ -125,7 +125,7 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
<Avatar text={item.user.username} size={40} />
<View style={styles.infoContainer}>
<View style={styles.item}>
<Text style={[styles.name, { color: themes[theme].titleText }]}>{item?.user?.name}</Text>
<Text style={[styles.name, { color: themes[theme].fontTitlesLabels }]}>{item?.user?.name}</Text>
<Text style={[styles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text>
</View>
<Text

2
app/views/RegisterView.tsx
View File

@ -231,7 +231,7 @@ class RegisterView extends React.Component<IProps, any> {
<FormContainer testID='register-view'>
<FormContainerInner>
<LoginServices separator />
<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].titleText }]}>{I18n.t('Sign_Up')}</Text>
<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Sign_Up')}</Text>
<FormTextInput
label={I18n.t('Name')}
containerStyle={styles.inputContainer}

10
app/views/RoomActionsView/index.tsx
View File

@ -808,7 +808,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
</Avatar>
<View style={styles.roomTitleContainer}>
{room.t === 'd' ? (
<Text style={[styles.roomTitle, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.roomTitle, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{room.fname}
</Text>
) : (
@ -819,7 +819,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
status={room.visitor?.status}
sourceType={source}
/>
<Text style={[styles.roomTitle, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.roomTitle, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{getRoomTitle(room)}
</Text>
</View>
@ -1029,7 +1029,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
params: { rid }
})
}
left={() => <List.Icon name='chat-forward' color={themes[theme].titleText} />}
left={() => <List.Icon name='chat-forward' color={themes[theme].fontTitlesLabels} />}
showActionIndicator
/>
<List.Separator />
@ -1045,7 +1045,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
event: this.placeOnHoldLivechat
})
}
left={() => <List.Icon name='pause' color={themes[theme].titleText} />}
left={() => <List.Icon name='pause' color={themes[theme].fontTitlesLabels} />}
showActionIndicator
/>
<List.Separator />
@ -1061,7 +1061,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
event: this.returnLivechat
})
}
left={() => <List.Icon name='move-to-the-queue' color={themes[theme].titleText} />}
left={() => <List.Icon name='move-to-the-queue' color={themes[theme].fontTitlesLabels} />}
showActionIndicator
/>
<List.Separator />

8
app/views/RoomInfoEditView/SwitchContainer.tsx
View File

@ -38,10 +38,10 @@ const SwitchContainer: React.FC<ISwitchContainer> = React.memo(
<View key='switch-container' style={[styles.switchContainer, !!children && styles.switchMargin]}>
{leftLabelPrimary && (
<View style={[styles.switchLabelContainer, labelContainerStyle]}>
<Text style={[styles.switchLabelPrimary, { color: themes[theme].titleText }, leftLabelStyle]}>
<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
{leftLabelPrimary}
</Text>
<Text style={[styles.switchLabelSecondary, { color: themes[theme].titleText }, leftLabelStyle]}>
<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
{leftLabelSecondary}
</Text>
</View>
@ -56,10 +56,10 @@ const SwitchContainer: React.FC<ISwitchContainer> = React.memo(
/>
{rightLabelPrimary && (
<View style={[styles.switchLabelContainer, labelContainerStyle]}>
<Text style={[styles.switchLabelPrimary, { color: themes[theme].titleText }, leftLabelStyle]}>
<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
{rightLabelPrimary}
</Text>
<Text style={[styles.switchLabelSecondary, { color: themes[theme].titleText }, leftLabelStyle]}>
<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
{rightLabelSecondary}
</Text>
</View>

4
app/views/RoomInfoView/Direct.tsx
View File

@ -14,7 +14,7 @@ const Roles = ({ roles }: { roles?: string[] }) => {
if (roles?.length) {
return (
<View style={styles.item} testID='user-roles'>
<Text style={[styles.itemLabel, { color: colors.titleText }]}>{I18n.t('Roles')}</Text>
<Text style={[styles.itemLabel, { color: colors.fontTitlesLabels }]}>{I18n.t('Roles')}</Text>
<View style={styles.rolesContainer}>
{roles.map(role =>
role ? (
@ -23,7 +23,7 @@ const Roles = ({ roles }: { roles?: string[] }) => {
key={role}
testID={`user-role-${role.replace(/ /g, '-')}`}
>
<Text style={[styles.role, { color: colors.titleText }]}>{role}</Text>
<Text style={[styles.role, { color: colors.fontTitlesLabels }]}>{role}</Text>
</View>
) : null
)}

2
app/views/RoomInfoView/Item.tsx
View File

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

2
app/views/RoomInfoView/Livechat.tsx
View File

@ -22,7 +22,7 @@ const styles = StyleSheet.create({
const Title = ({ title }: { title: string }) => {
const { colors } = useTheme();
return <Text style={[styles.title, { color: colors.titleText }]}>{title}</Text>;
return <Text style={[styles.title, { color: colors.fontTitlesLabels }]}>{title}</Text>;
};
const Livechat = ({ room, roomUser }: { room: ISubscription; roomUser: ILivechatVisitorModified }): React.ReactElement => {

4
app/views/RoomInfoView/components/RoomInfoViewTitle.tsx
View File

@ -21,7 +21,7 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo
if (type === SubscriptionType.DIRECT) {
return (
<View style={styles.roomInfoViewTitleContainer}>
<Text testID='room-info-view-name' style={[styles.roomTitle, { color: colors.titleText }]}>
<Text testID='room-info-view-name' style={[styles.roomTitle, { color: colors.fontTitlesLabels }]}>
{name}
</Text>
{username && (
@ -51,7 +51,7 @@ const RoomInfoViewTitle = ({ room, name, username, statusText, type }: IRoomInfo
status={room?.visitor?.status}
sourceType={room?.source}
/>
<Text testID='room-info-view-name' style={[styles.roomTitle, { color: colors.titleText }]} key='room-info-name'>
<Text testID='room-info-view-name' style={[styles.roomTitle, { color: colors.fontTitlesLabels }]} key='room-info-name'>
{getRoomTitle(room)}
</Text>
</View>

2
app/views/RoomMembersView/index.tsx
View File

@ -401,7 +401,7 @@ const RoomMembersView = (): React.ReactElement => {
onEndReachedThreshold={0.1}
onEndReached={() => fetchMembers(state.allUsers)}
ListEmptyComponent={() =>
state.end ? <Text style={[styles.noResult, { color: colors.titleText }]}>{I18n.t('No_members_found')}</Text> : null
state.end ? <Text style={[styles.noResult, { color: colors.fontTitlesLabels }]}>{I18n.t('No_members_found')}</Text> : null
}
{...scrollPersistTaps}
/>

2
app/views/RoomView/JoinCode.tsx
View File

@ -86,7 +86,7 @@ const JoinCode = React.memo(
{ backgroundColor: themes[theme].backgroundColor }
]}
>
<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('Insert_Join_Code')}</Text>
<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Insert_Join_Code')}</Text>
<FormTextInput
value={code}
// TODO: find a way to type this ref

2
app/views/RoomView/LoadMore/index.tsx
View File

@ -62,7 +62,7 @@ const LoadMore = React.memo(
{loading ? (
<ActivityIndicator color={colors.fontSecondaryInfo} />
) : (
<Text style={[styles.text, { color: colors.titleText }]}>{I18n.t(text)}</Text>
<Text style={[styles.text, { color: colors.fontTitlesLabels }]}>{I18n.t(text)}</Text>
)}
</Touch>
);

8
app/views/RoomView/index.tsx
View File

@ -1367,7 +1367,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
if ('onHold' in room && room.onHold) {
return (
<View style={styles.joinRoomContainer} key='room-view-chat-on-hold' testID='room-view-chat-on-hold'>
<Text style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('Chat_is_on_hold')}</Text>
<Text style={[styles.previewMode, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Chat_is_on_hold')}</Text>
<Touch
onPress={this.resumeRoom}
style={[styles.joinRoomButton, { backgroundColor: themes[theme].actionTintColor }]}
@ -1383,7 +1383,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
if (!joined) {
return (
<View style={styles.joinRoomContainer} key='room-view-join' testID='room-view-join'>
<Text style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('You_are_in_preview_mode')}</Text>
<Text style={[styles.previewMode, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('You_are_in_preview_mode')}</Text>
<Touch
onPress={this.joinRoom}
style={[styles.joinRoomButton, { backgroundColor: themes[theme].actionTintColor }]}
@ -1399,14 +1399,14 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
if (readOnly) {
return (
<View style={styles.readOnly}>
<Text style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('This_room_is_read_only')}</Text>
<Text style={[styles.previewMode, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('This_room_is_read_only')}</Text>
</View>
);
}
if ('id' in room && isBlocked(room)) {
return (
<View style={styles.readOnly}>
<Text style={[styles.previewMode, { color: themes[theme].titleText }]}>{I18n.t('This_room_is_blocked')}</Text>
<Text style={[styles.previewMode, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('This_room_is_blocked')}</Text>
</View>
);
}

2
app/views/SearchMessagesView/index.tsx
View File

@ -274,7 +274,7 @@ class SearchMessagesView extends React.Component<ISearchMessagesViewProps, ISear
const { theme } = this.props;
return (
<View style={[styles.listEmptyContainer, { backgroundColor: themes[theme].backgroundColor }]}>
<Text style={[styles.noDataFound, { color: themes[theme].titleText }]}>{I18n.t('No_results_found')}</Text>
<Text style={[styles.noDataFound, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('No_results_found')}</Text>
</View>
);
};

4
app/views/SetUsernameView.tsx
View File

@ -86,10 +86,10 @@ const SetUsernameView = () => {
<StatusBar />
<ScrollView {...scrollPersistTaps} contentContainerStyle={sharedStyles.containerScrollView}>
<SafeAreaView testID='set-username-view'>
<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, styles.loginTitle, { color: colors.titleText }]}>
<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, styles.loginTitle, { color: colors.fontTitlesLabels }]}>
{I18n.t('Username')}
</Text>
<Text style={[sharedStyles.loginSubtitle, sharedStyles.textRegular, { color: colors.titleText }]}>
<Text style={[sharedStyles.loginSubtitle, sharedStyles.textRegular, { color: colors.fontTitlesLabels }]}>
{I18n.t('Set_username_subtitle')}
</Text>
<ControlledFormTextInput

6
app/views/ShareListView/index.tsx
View File

@ -343,7 +343,7 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
return (
<>
<View style={[styles.headerContainer, { backgroundColor: themes[theme].auxiliaryBackground }]}>
<Text style={[styles.headerText, { color: themes[theme].titleText }]}>{I18n.t(header)}</Text>
<Text style={[styles.headerText, { color: themes[theme].fontTitlesLabels }]}>{I18n.t(header)}</Text>
</View>
<List.Separator />
</>
@ -396,7 +396,7 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
const { theme } = this.props;
return (
<View style={[styles.container, styles.emptyContainer, { backgroundColor: themes[theme].auxiliaryBackground }]}>
<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('No_results_found')}</Text>
<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('No_results_found')}</Text>
</View>
);
};
@ -435,7 +435,7 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
style={{ backgroundColor: themes[theme].backgroundColor }}
contentContainerStyle={[styles.container, styles.centered, { backgroundColor: themes[theme].backgroundColor }]}
>
<Text style={[styles.permissionTitle, { color: themes[theme].titleText }]}>{I18n.t('Read_External_Permission')}</Text>
<Text style={[styles.permissionTitle, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Read_External_Permission')}</Text>
<Text style={[styles.permissionMessage, { color: themes[theme].bodyText }]}>
{I18n.t('Read_External_Permission_Message')}
</Text>

2
app/views/ShareView/Preview.tsx
View File

@ -52,7 +52,7 @@ const IconPreview = React.memo(({ iconName, title, description, theme, width, he
contentContainerStyle={[styles.fileContainer, { width, height }]}
>
<CustomIcon name={iconName} size={56} color={danger ? themes[theme].dangerColor : themes[theme].tintColor} />
<Text style={[styles.fileName, { color: themes[theme].titleText }]}>{title}</Text>
<Text style={[styles.fileName, { color: themes[theme].fontTitlesLabels }]}>{title}</Text>
{description ? <Text style={[styles.fileSize, { color: themes[theme].bodyText }]}>{description}</Text> : null}
</ScrollView>
));

2
app/views/ShareView/index.tsx
View File

@ -395,7 +395,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
if (readOnly || isBlocked(room)) {
return (
<View style={[styles.container, styles.centered, { backgroundColor: themes[theme].backgroundColor }]}>
<Text style={[styles.title, { color: themes[theme].titleText }]}>
<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]}>
{isBlocked(room) ? I18n.t('This_room_is_blocked') : I18n.t('This_room_is_read_only')}
</Text>
</View>

2
app/views/SidebarView/SidebarItem.tsx
View File

@ -27,7 +27,7 @@ const Item = React.memo(({ left, right, text, onPress, testID, current, theme, t
<View style={styles.itemHorizontal}>{left}</View>
<View style={styles.itemCenter}>
<Text
style={[styles.itemText, { color: textColor || themes[theme].titleText }]}
style={[styles.itemText, { color: textColor || themes[theme].fontTitlesLabels }]}
numberOfLines={1}
accessibilityLabel={text}
>

16
app/views/SidebarView/index.tsx
View File

@ -225,7 +225,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
<List.Separator />
<SidebarItem
text={I18n.t('Admin_Panel')}
left={<CustomIcon name='settings' size={20} color={themes[theme!].titleText} />}
left={<CustomIcon name='settings' size={20} color={themes[theme!].fontTitlesLabels} />}
onPress={() => this.sidebarNavigate(routeName)}
testID='sidebar-admin'
theme={theme!}
@ -241,7 +241,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
<>
<SidebarItem
text={I18n.t('Chats')}
left={<CustomIcon name='message' size={20} color={themes[theme!].titleText} />}
left={<CustomIcon name='message' size={20} color={themes[theme!].fontTitlesLabels} />}
onPress={() => this.sidebarNavigate('ChatsStackNavigator')}
testID='sidebar-chats'
theme={theme!}
@ -249,7 +249,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
/>
<SidebarItem
text={I18n.t('Profile')}
left={<CustomIcon name='user' size={20} color={themes[theme!].titleText} />}
left={<CustomIcon name='user' size={20} color={themes[theme!].fontTitlesLabels} />}
onPress={() => this.sidebarNavigate('ProfileStackNavigator')}
testID='sidebar-profile'
theme={theme!}
@ -257,7 +257,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
/>
<SidebarItem
text={I18n.t('Display')}
left={<CustomIcon name='sort' size={20} color={themes[theme!].titleText} />}
left={<CustomIcon name='sort' size={20} color={themes[theme!].fontTitlesLabels} />}
onPress={() => this.sidebarNavigate('DisplayPrefStackNavigator')}
testID='sidebar-display'
theme={theme!}
@ -265,7 +265,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
/>
<SidebarItem
text={I18n.t('Settings')}
left={<CustomIcon name='administration' size={20} color={themes[theme!].titleText} />}
left={<CustomIcon name='administration' size={20} color={themes[theme!].fontTitlesLabels} />}
onPress={() => this.sidebarNavigate('SettingsStackNavigator')}
testID='sidebar-settings'
theme={theme!}
@ -284,7 +284,7 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
status = 'disabled';
}
let right: React.ReactElement | undefined = <CustomIcon name='edit' size={20} color={themes[theme!].titleText} />;
let right: React.ReactElement | undefined = <CustomIcon name='edit' size={20} color={themes[theme!].fontTitlesLabels} />;
if (notificationPresenceCap) {
right = <View style={[styles.customStatusDisabled, { backgroundColor: STATUS_COLORS.disabled }]} />;
} else if (Presence_broadcast_disabled) {
@ -342,12 +342,12 @@ class Sidebar extends Component<ISidebarProps, ISidebarState> {
<Avatar text={user.username} style={styles.avatar} size={30} />
<View style={styles.headerTextContainer}>
<View style={styles.headerUsername}>
<Text numberOfLines={1} style={[styles.username, { color: themes[theme!].titleText }]}>
<Text numberOfLines={1} style={[styles.username, { color: themes[theme!].fontTitlesLabels }]}>
{useRealName ? user.name : user.username}
</Text>
</View>
<Text
style={[styles.currentServerText, { color: themes[theme!].titleText }]}
style={[styles.currentServerText, { color: themes[theme!].fontTitlesLabels }]}
numberOfLines={1}
accessibilityLabel={`Connected to ${baseUrl}`}
>

2
app/views/ThreadMessagesView/Item.tsx
View File

@ -83,7 +83,7 @@ const Item = ({ item, useRealName, user, badgeColor, onPress, toggleFollowThread
<Avatar style={styles.avatar} text={item?.u?.username} size={36} borderRadius={4} />
<View style={styles.contentContainer}>
<View style={styles.titleContainer}>
<Text style={[styles.title, { color: themes[theme].titleText }]} numberOfLines={1}>
<Text style={[styles.title, { color: themes[theme].fontTitlesLabels }]} numberOfLines={1}>
{username}
</Text>
<Text style={[styles.time, { color: themes[theme].fontSecondaryInfo }]}>{time}</Text>

4
app/views/WithoutServersView.tsx
View File

@ -39,8 +39,8 @@ const WithoutServerView = (): React.ReactElement => {
return (
<View style={[styles.container, { backgroundColor: colors.backgroundColor }]}>
<Text style={[styles.title, { color: colors.titleText }]}>{I18n.t('Without_Servers')}</Text>
<Text style={[styles.content, { color: colors.titleText }]}>
<Text style={[styles.title, { color: colors.fontTitlesLabels }]}>{I18n.t('Without_Servers')}</Text>
<Text style={[styles.content, { color: colors.fontTitlesLabels }]}>
{I18n.t('You_need_to_access_at_least_one_RocketChat_server_to_share_something')}
</Text>
</View>

2
app/views/WorkspaceView/index.tsx
View File

@ -77,7 +77,7 @@ const WorkspaceView = () => {
<FormContainerInner>
<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.serverName, { color: colors.fontTitlesLabels }]}>{Site_Name}</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}