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] Update icon names (#2318)

This commit is contained in:
Diego Mello 2020-07-27 16:53:33 -03:00 committed by GitHub
parent 3cc4b51258
commit 74ecab858f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/assets/fonts/custom.ttf
View File

Binary file not shown.

8
app/containers/HeaderButton.js
View File

@ -28,7 +28,7 @@ export const CustomHeaderButtons = React.memo(props => (
export const DrawerButton = React.memo(({ navigation, testID, ...otherProps }) => (
<CustomHeaderButtons left>
<Item title='drawer' iconName='menu_hamburguer' onPress={navigation.toggleDrawer} testID={testID} {...otherProps} />
<Item title='drawer' iconName='hamburguer' onPress={navigation.toggleDrawer} testID={testID} {...otherProps} />
</CustomHeaderButtons>
));
@ -36,7 +36,7 @@ export const CloseModalButton = React.memo(({
navigation, testID, onPress = () => navigation.pop(), ...props
}) => (
<CustomHeaderButtons left>
<Item title='close' iconName='Cross' onPress={onPress} testID={testID} {...props} />
<Item title='close' iconName='close' onPress={onPress} testID={testID} {...props} />
</CustomHeaderButtons>
));
@ -44,14 +44,14 @@ export const CancelModalButton = React.memo(({ onPress, testID }) => (
<CustomHeaderButtons left>
{isIOS
? <Item title={I18n.t('Cancel')} onPress={onPress} testID={testID} />
: <Item title='close' iconName='Cross' onPress={onPress} testID={testID} />
: <Item title='close' iconName='close' onPress={onPress} testID={testID} />
}
</CustomHeaderButtons>
));
export const MoreButton = React.memo(({ onPress, testID }) => (
<CustomHeaderButtons>
<Item title='more' iconName='menu' onPress={onPress} testID={testID} />
<Item title='more' iconName='kebab' onPress={onPress} testID={testID} />
</CustomHeaderButtons>
));

2
app/containers/InAppNotification/NotifierComponent.js
View File

@ -127,7 +127,7 @@ const NotifierComponent = React.memo(({
hitSlop={BUTTON_HIT_SLOP}
background={Touchable.SelectableBackgroundBorderless()}
>
<CustomIcon name='Cross' style={[styles.close, { color: themes[theme].titleText }]} size={20} />
<CustomIcon name='close' style={[styles.close, { color: themes[theme].titleText }]} size={20} />
</Touchable>
</View>
);

2
app/containers/MessageActions/Header.js
View File

@ -78,7 +78,7 @@ const HeaderFooter = React.memo(({ onReaction, theme }) => (
style={[styles.headerItem, { backgroundColor: themes[theme].auxiliaryBackground }]}
theme={theme}
>
<CustomIcon name='add-reaction' size={24} color={themes[theme].bodyText} />
<CustomIcon name='reaction-add' size={24} color={themes[theme].bodyText} />
</Button>
));
HeaderFooter.propTypes = {

2
app/containers/MessageBox/CommandsPreview/Item.js
View File

@ -32,7 +32,7 @@ const Item = ({ item, theme }) => {
{ loading ? <ActivityIndicator theme={theme} /> : null }
</FastImage>
)
: <CustomIcon name='clip' size={36} color={themes[theme].actionTintColor} />
: <CustomIcon name='attach' size={36} color={themes[theme].actionTintColor} />
}
</TouchableOpacity>
);

4
app/containers/MessageBox/RecordAudio.js
View File

@ -182,7 +182,7 @@ export default class RecordAudio extends React.PureComponent {
accessibilityLabel={I18n.t('Send_audio_message')}
accessibilityTraits='button'
>
<CustomIcon name='mic' size={23} color={themes[theme].tintColor} />
<CustomIcon name='microphone' size={23} color={themes[theme].tintColor} />
</BorderlessButton>
);
}
@ -199,7 +199,7 @@ export default class RecordAudio extends React.PureComponent {
<CustomIcon
size={22}
color={themes[theme].dangerColor}
name='Cross'
name='close'
/>
</BorderlessButton>
<Text

2
app/containers/MessageBox/ReplyPreview.js
View File

@ -72,7 +72,7 @@ const ReplyPreview = React.memo(({
theme={theme}
/>
</View>
<CustomIcon name='Cross' color={themes[theme].auxiliaryText} size={20} style={styles.close} onPress={close} />
<CustomIcon name='close' color={themes[theme].auxiliaryText} size={20} style={styles.close} onPress={close} />
</View>
);
}, (prevProps, nextProps) => prevProps.replying === nextProps.replying && prevProps.theme === nextProps.theme && isEqual(prevProps.message, nextProps.message));

2
app/containers/MessageBox/buttons/ActionsButton.js
View File

@ -8,7 +8,7 @@ const ActionsButton = React.memo(({ theme, onPress }) => (
onPress={onPress}
testID='messagebox-actions'
accessibilityLabel='Message_actions'
icon='plus'
icon='add'
theme={theme}
/>
));

2
app/containers/MessageBox/buttons/CancelEditingButton.js
View File

@ -8,7 +8,7 @@ const CancelEditingButton = React.memo(({ theme, onPress }) => (
onPress={onPress}
testID='messagebox-cancel-editing'
accessibilityLabel='Cancel_editing'
icon='Cross'
icon='close'
theme={theme}
/>
));

2
app/containers/MessageBox/buttons/SendButton.js
View File

@ -8,7 +8,7 @@ const SendButton = React.memo(({ theme, onPress }) => (
onPress={onPress}
testID='messagebox-send-message'
accessibilityLabel='Send_message'
icon='send-active'
icon='send-filled'
theme={theme}
/>
));

6
app/containers/MessageBox/index.js
View File

@ -134,7 +134,7 @@ class MessageBox extends Component {
},
{
title: I18n.t('Take_a_video'),
icon: 'video-1',
icon: 'camera',
onPress: this.takeVideo
},
{
@ -144,12 +144,12 @@ class MessageBox extends Component {
},
{
title: I18n.t('Choose_file'),
icon: 'folder',
icon: 'file',
onPress: this.chooseFile
},
{
title: I18n.t('Create_Discussion'),
icon: 'chat',
icon: 'discussions',
onPress: this.createDiscussion
}
];

2
app/containers/Passcode/Base/LockIcon.js
View File

@ -10,7 +10,7 @@ import { CustomIcon } from '../../../lib/Icons';
const LockIcon = React.memo(({ theme }) => (
<Row style={styles.row}>
<View style={styles.iconView}>
<CustomIcon name='lock' size={40} color={themes[theme].passcodeLockIcon} />
<CustomIcon name='auth' size={40} color={themes[theme].passcodeLockIcon} />
</View>
</Row>
));

2
app/containers/ReactionsModal.js
View File

@ -104,7 +104,7 @@ const ModalContent = React.memo(({
<View style={styles.titleContainer}>
<CustomIcon
style={[styles.closeButton, { color: themes[props.theme].buttonText }]}
name='Cross'
name='close'
size={20}
/>
<Text style={[styles.title, { color: themes[props.theme].buttonText }]}>{I18n.t('Reactions')}</Text>

10
app/containers/RoomTypeIcon.js
View File

@ -20,19 +20,19 @@ const RoomTypeIcon = React.memo(({
const color = themes[theme].auxiliaryText;
let icon = 'lock';
let icon = 'channel-private';
if (type === 'discussion') {
icon = 'chat';
icon = 'discussions';
} else if (type === 'c') {
icon = 'hash';
icon = 'channel-public';
} else if (type === 'd') {
if (isGroupChat) {
icon = 'team';
} else {
icon = 'at';
icon = 'mention';
}
} else if (type === 'l') {
icon = 'livechat';
icon = 'omnichannel';
}
return (

2
app/containers/SearchBox.js
View File

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

2
app/containers/TextInput.js
View File

@ -111,7 +111,7 @@ export default class RCTextInput extends React.PureComponent {
return (
<BorderlessButton onPress={this.tooglePassword} style={[styles.iconContainer, styles.iconRight]}>
<CustomIcon
name={showPassword ? 'eye' : 'eye-off'}
name={showPassword ? 'unread-on-top' : 'unread-on-top-disabled'}
testID={testID ? `${ testID }-icon-right` : null}
style={{ color: themes[theme].auxiliaryText }}
size={20}

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

@ -24,7 +24,7 @@ const Chip = ({
<>
{item.imageUrl ? <FastImage style={styles.chipImage} source={{ uri: item.imageUrl }} /> : null}
<Text numberOfLines={1} style={[styles.chipText, { color: themes[theme].titleText }]}>{textParser([item.text])}</Text>
<CustomIcon name='Cross' size={16} color={themes[theme].auxiliaryText} />
<CustomIcon name='close' size={16} color={themes[theme].auxiliaryText} />
</>
</Touchable>
);

2
app/containers/UIKit/Overflow.js
View File

@ -82,7 +82,7 @@ export const Overflow = ({
hitSlop={BUTTON_HIT_SLOP}
style={styles.menu}
>
{!loading ? <CustomIcon size={18} name='menu' color={themes[theme].bodyText} /> : <ActivityIndicator style={styles.loading} theme={theme} />}
{!loading ? <CustomIcon size={18} name='kebab' color={themes[theme].bodyText} /> : <ActivityIndicator style={styles.loading} theme={theme} />}
</Touchable>
<Popover
isVisible={show}

2
app/containers/message/Audio.js
View File

@ -79,7 +79,7 @@ const Button = React.memo(({
{
loading
? <ActivityIndicator style={[styles.playPauseButton, styles.audioLoading]} theme={theme} />
: <CustomIcon name={paused ? 'play' : 'pause'} size={36} color={themes[theme].tintColor} />
: <CustomIcon name={paused ? 'play-filled' : 'pause-filled'} size={36} color={themes[theme].tintColor} />
}
</Touchable>
));

2
app/containers/message/Broadcast.js
View File

@ -26,7 +26,7 @@ const Broadcast = React.memo(({
testID='message-broadcast-reply'
>
<>
<CustomIcon name='back' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<CustomIcon name='arrow-back' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{I18n.t('Reply')}</Text>
</>
</Touchable>

2
app/containers/message/CallButton.js
View File

@ -22,7 +22,7 @@ const CallButton = React.memo(({
hitSlop={BUTTON_HIT_SLOP}
>
<>
<CustomIcon name='video-1' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<CustomIcon name='camera' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{I18n.t('Click_to_join')}</Text>
</>
</Touchable>

2
app/containers/message/Discussion.js
View File

@ -29,7 +29,7 @@ const Discussion = React.memo(({
hitSlop={BUTTON_HIT_SLOP}
>
<>
<CustomIcon name='chat' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<CustomIcon name='discussions' size={20} style={styles.buttonIcon} color={themes[theme].buttonText} />
<Text style={[styles.buttonText, { color: themes[theme].buttonText }]}>{buttonText}</Text>
</>
</Touchable>

2
app/containers/message/Reactions.js
View File

@ -23,7 +23,7 @@ const AddReaction = React.memo(({ theme }) => {
hitSlop={BUTTON_HIT_SLOP}
>
<View style={[styles.reactionContainer, { borderColor: themes[theme].borderColor }]}>
<CustomIcon name='add-reaction' size={21} color={themes[theme].tintColor} />
<CustomIcon name='reaction-add' size={21} color={themes[theme].tintColor} />
</View>
</Touchable>
);

2
app/containers/message/Video.js
View File

@ -49,7 +49,7 @@ const Video = React.memo(({
background={Touchable.Ripple(themes[theme].bannerBackground)}
>
<CustomIcon
name='play'
name='play-filled'
size={54}
color={themes[theme].buttonText}
/>

2
app/lib/selection.json
View File

File diff suppressed because one or more lines are too long

2
app/presentation/RoomItem/Actions.js
View File

@ -107,7 +107,7 @@ export const RightActions = React.memo(({
>
<RectButton style={[styles.actionButton, { backgroundColor: themes[theme].hideBackground }]} onPress={onHidePress}>
<>
<CustomIcon size={20} name='eye-off' color={themes[theme].buttonText} />
<CustomIcon size={20} name='unread-on-top-disabled' color={themes[theme].buttonText} />
<Text style={[styles.actionText, { color: themes[theme].buttonText }]}>{I18n.t('Hide')}</Text>
</>
</RectButton>

2
app/views/ChangePasscodeView.js
View File

@ -83,7 +83,7 @@ const ChangePasscodeView = React.memo(({ theme }) => {
{!data?.force
? (
<Touchable onPress={onCancel} style={styles.close}>
<CustomIcon name='Cross' color={themes[theme].passcodePrimary} size={30} />
<CustomIcon name='close' color={themes[theme].passcodePrimary} size={30} />
</Touchable>
)
: null}

2
app/views/DirectoryView/Options.js
View File

@ -61,7 +61,7 @@ export default class DirectoryOptions extends PureComponent {
let icon = 'user';
if (itemType === 'channels') {
text = 'Channels';
icon = 'hash';
icon = 'channel-public';
}
return (

2
app/views/DirectoryView/index.js
View File

@ -166,7 +166,7 @@ class DirectoryView extends React.Component {
theme={theme}
>
<View style={[sharedStyles.separatorVertical, styles.toggleDropdownContainer, { borderColor: themes[theme].separatorColor }]}>
<CustomIcon style={[styles.toggleDropdownIcon, { color: themes[theme].tintColor }]} size={20} name={type === 'users' ? 'user' : 'hash'} />
<CustomIcon style={[styles.toggleDropdownIcon, { color: themes[theme].tintColor }]} size={20} name={type === 'users' ? 'user' : 'channel-public'} />
<Text style={[styles.toggleDropdownText, { color: themes[theme].tintColor }]}>{type === 'users' ? I18n.t('Users') : I18n.t('Channels')}</Text>
<CustomIcon name='chevron-down' size={20} style={[styles.toggleDropdownArrow, { color: themes[theme].auxiliaryTintColor }]} />
</View>

2
app/views/LivechatEditView.js
View File

@ -218,7 +218,7 @@ const LivechatEditView = ({
<TextInput
inputRef={(e) => { inputs.tags = e; }}
label={I18n.t('Tags')}
iconRight='plus'
iconRight='add'
onIconRightPress={() => {
const lastText = inputs.tags._lastNativeText || '';
if (lastText.length) {

4
app/views/NewMessageView.js
View File

@ -186,7 +186,7 @@ class NewMessageView extends React.Component {
{this.renderButton({
onPress: this.createChannel,
title: I18n.t('Create_Channel'),
icon: 'hash',
icon: 'channel-public',
testID: 'new-message-view-create-channel',
first: true
})}
@ -199,7 +199,7 @@ class NewMessageView extends React.Component {
{this.renderButton({
onPress: this.createDiscussion,
title: I18n.t('Create_Discussion'),
icon: 'chat',
icon: 'discussions',
testID: 'new-message-view-create-discussion'
})}
</View>

22
app/views/RoomActionsView/index.js
View File

@ -229,7 +229,7 @@ class RoomActionsView extends React.Component {
const isGroupChat = RocketChat.isGroupChat(room);
const notificationsAction = {
icon: 'bell',
icon: 'notification',
name: I18n.t('Notifications'),
route: 'NotificationPrefView',
params: { rid, room },
@ -238,13 +238,13 @@ class RoomActionsView extends React.Component {
const jitsiActions = jitsiEnabled ? [
{
icon: 'mic',
icon: 'phone',
name: I18n.t('Voice_call'),
event: () => RocketChat.callJitsi(rid, true),
testID: 'room-actions-voice'
},
{
icon: 'video-1',
icon: 'camera', // TODO: change me
name: I18n.t('Video_call'),
event: () => RocketChat.callJitsi(rid),
testID: 'room-actions-video'
@ -270,14 +270,14 @@ class RoomActionsView extends React.Component {
}, {
data: [
{
icon: 'clip',
icon: 'attach',
name: I18n.t('Files'),
route: 'MessagesView',
params: { rid, t, name: 'Files' },
testID: 'room-actions-files'
},
{
icon: 'at',
icon: 'mention',
name: I18n.t('Mentions'),
route: 'MessagesView',
params: { rid, t, name: 'Mentions' },
@ -291,7 +291,7 @@ class RoomActionsView extends React.Component {
testID: 'room-actions-starred'
},
{
icon: 'magnifier',
icon: 'search',
name: I18n.t('Search'),
route: 'SearchMessagesView',
params: { rid },
@ -365,7 +365,7 @@ class RoomActionsView extends React.Component {
if (canAddUser) {
actions.push({
icon: 'plus',
icon: 'add',
name: I18n.t('Add_users'),
route: 'SelectedUsersView',
params: {
@ -378,7 +378,7 @@ class RoomActionsView extends React.Component {
}
if (canInviteUser) {
actions.push({
icon: 'add-user',
icon: 'user-add',
name: I18n.t('Invite_users'),
route: 'InviteUsersView',
params: {
@ -394,7 +394,7 @@ class RoomActionsView extends React.Component {
sections.push({
data: [
{
icon: 'exit',
icon: 'logout',
name: I18n.t('Leave_channel'),
type: 'danger',
event: this.leaveChannel,
@ -408,14 +408,14 @@ class RoomActionsView extends React.Component {
sections[2].data = [];
sections[2].data.push({
icon: 'cancel',
icon: 'close',
name: I18n.t('Close'),
event: this.closeLivechat
});
if (canForwardGuest) {
sections[2].data.push({
icon: 'transfer',
icon: 'user-forward',
name: I18n.t('Forward'),
route: 'ForwardLivechatView',
params: { rid }

2
app/views/RoomView/Banner.js
View File

@ -35,7 +35,7 @@ const Banner = React.memo(({
<BorderlessButton onPress={closeBanner}>
<CustomIcon
color={themes[theme].auxiliaryText}
name='Cross'
name='close'
size={20}
/>
</BorderlessButton>

8
app/views/RoomView/Header/Icon.js
View File

@ -36,17 +36,17 @@ const Icon = React.memo(({
let icon;
if (type === 'discussion') {
icon = 'chat';
icon = 'discussions';
} else if (type === 'thread') {
icon = 'threads';
} else if (type === 'c') {
icon = 'hash';
icon = 'channel-public';
} else if (type === 'l') {
icon = 'livechat';
icon = 'omnichannel';
} else if (type === 'd') {
icon = 'team';
} else {
icon = 'lock';
icon = 'channel-private';
}
return (
<CustomIcon

4
app/views/RoomView/Header/RightButtons.js
View File

@ -98,7 +98,7 @@ class RightButtonsContainer extends React.PureComponent {
<CustomHeaderButtons>
<Item
title='bell'
iconName={isFollowingThread ? 'bell' : 'bell-off'}
iconName={isFollowingThread ? 'notification' : 'notification-disabled'}
onPress={this.toggleFollowThread}
testID={isFollowingThread ? 'room-view-header-unfollow' : 'room-view-header-follow'}
/>
@ -117,7 +117,7 @@ class RightButtonsContainer extends React.PureComponent {
) : null}
<Item
title='search'
iconName='magnifier'
iconName='search'
onPress={this.goSearchView}
testID='room-view-search'
/>

6
app/views/RoomView/UploadProgress.js
View File

@ -172,11 +172,11 @@ class UploadProgress extends Component {
return (
[
<View key='row' style={styles.row}>
<CustomIcon name='clip' size={20} color={themes[theme].auxiliaryText} />
<CustomIcon name='attach' size={20} color={themes[theme].auxiliaryText} />
<Text style={[styles.descriptionContainer, styles.descriptionText, { color: themes[theme].auxiliaryText }]} numberOfLines={1}>
{I18n.t('Uploading')} {item.name}
</Text>
<CustomIcon name='Cross' size={20} color={themes[theme].auxiliaryText} onPress={() => this.cancelUpload(item)} />
<CustomIcon name='close' size={20} color={themes[theme].auxiliaryText} onPress={() => this.cancelUpload(item)} />
</View>,
<View key='progress' style={[styles.progress, { width: (width * item.progress) / 100, backgroundColor: themes[theme].tintColor }]} />
]
@ -191,7 +191,7 @@ class UploadProgress extends Component {
<Text style={[styles.tryAgainButtonText, { color: themes[theme].tintColor }]}>{I18n.t('Try_again')}</Text>
</TouchableOpacity>
</View>
<CustomIcon name='Cross' size={20} color={themes[theme].auxiliaryText} onPress={() => this.deleteUpload(item)} />
<CustomIcon name='close' size={20} color={themes[theme].auxiliaryText} onPress={() => this.deleteUpload(item)} />
</View>
);
}

2
app/views/RoomsListView/SortDropdown/index.js
View File

@ -190,7 +190,7 @@ class Sort extends PureComponent {
</SortItemButton>
<SortItemButton onPress={this.toggleUnread} theme={theme}>
<SortItemContent
icon='eye-off'
icon='unread-on-top-disabled'
label='Unread_on_top'
checked={showUnread}
theme={theme}

6
app/views/RoomsListView/index.js
View File

@ -334,7 +334,7 @@ class RoomsListView extends React.Component {
<CustomHeaderButtons left>
<Item
title='cancel'
iconName='Cross'
iconName='close'
onPress={this.cancelSearch}
/>
</CustomHeaderButtons>
@ -356,7 +356,7 @@ class RoomsListView extends React.Component {
<CustomHeaderButtons>
<Item
title='new'
iconName='new-chat'
iconName='create'
onPress={isMasterDetail
? () => navigation.navigate('ModalStackNavigator', { screen: 'NewMessageView' })
: () => navigation.navigate('NewMessageStackNavigator')}
@ -364,7 +364,7 @@ class RoomsListView extends React.Component {
/>
<Item
title='search'
iconName='magnifier'
iconName='search'
onPress={this.initSearching}
testID='rooms-list-view-search'
/>

2
app/views/ShareListView/index.js
View File

@ -154,7 +154,7 @@ class ShareListView extends React.Component {
headerLeft: () => (searching
? (
<CustomHeaderButtons left>
<Item title='cancel' iconName='Cross' onPress={this.cancelSearch} />
<Item title='cancel' iconName='close' onPress={this.cancelSearch} />
</CustomHeaderButtons>
)
: (

10
app/views/ShareView/Header.js
View File

@ -45,21 +45,21 @@ const Header = React.memo(({ room, thread, theme }) => {
}
let icon;
if (type === 'discussion') {
icon = 'chat';
icon = 'discussions';
} else if (type === 'thread') {
icon = 'threads';
} else if (type === 'c') {
icon = 'hash';
icon = 'channel-public';
} else if (type === 'l') {
icon = 'livechat';
icon = 'omnichannel';
} else if (type === 'd') {
if (RocketChat.isGroupChat(room)) {
icon = 'team';
} else {
icon = 'at';
icon = 'mention';
}
} else {
icon = 'lock';
icon = 'channel-private';
}
const textColor = themes[theme].previewTintColor;

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

@ -96,7 +96,7 @@ const Preview = React.memo(({
}
return (
<IconPreview
iconName={type?.match(/image/) ? 'Camera' : 'clip'}
iconName={type?.match(/image/) ? 'image' : 'attach'}
title={item?.filename}
description={prettyBytes(item?.size ?? 0)}
theme={theme}

6
app/views/ShareView/Thumbs.js
View File

@ -80,7 +80,7 @@ const ThumbContent = React.memo(({ item, theme, isShareExtension }) => {
return (
<View style={[styles.thumb, { borderColor: themes[theme].borderColor }]}>
<CustomIcon
name='Camera'
name='image'
size={30}
color={themes[theme].tintColor}
/>
@ -95,7 +95,7 @@ const ThumbContent = React.memo(({ item, theme, isShareExtension }) => {
<>
<Image source={{ uri }} style={styles.thumb} />
<CustomIcon
name='video-1'
name='camera-filled'
size={20}
color={themes[theme].buttonText}
style={styles.videoThumbIcon}
@ -127,7 +127,7 @@ const Thumb = ({
>
<View style={[styles.removeView, { borderColor: themes[theme].auxiliaryBackground }]}>
<CustomIcon
name='Cross'
name='close'
color={themes[theme].backgroundColor}
size={14}
/>

4
app/views/SidebarView/index.js
View File

@ -164,7 +164,7 @@ class Sidebar extends Component {
<Separator theme={theme} />
<SidebarItem
text={I18n.t('Admin_Panel')}
left={<CustomIcon name='shield' size={20} color={themes[theme].titleText} />}
left={<CustomIcon name='settings' size={20} color={themes[theme].titleText} />}
onPress={() => Navigation.navigate(routeName)}
testID='sidebar-settings'
current={this.currentItemKey === routeName}
@ -193,7 +193,7 @@ class Sidebar extends Component {
/>
<SidebarItem
text={I18n.t('Settings')}
left={<CustomIcon name='cog' size={20} color={themes[theme].titleText} />}
left={<CustomIcon name='administration' size={20} color={themes[theme].titleText} />}
onPress={() => this.sidebarNavigate('SettingsStackNavigator')}
testID='sidebar-settings'
current={this.currentItemKey === 'SettingsStackNavigator'}

16
ios/RocketChatRN.xcodeproj/project.pbxproj
View File

@ -12,8 +12,6 @@
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1E0DBC59247D75C40086559B /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1E0DBC58247D75C40086559B /* custom.ttf */; };
1E0DBC5A247D75C40086559B /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1E0DBC58247D75C40086559B /* custom.ttf */; };
1E1EA80A2326CD2200E22452 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E1EA8092326CD2200E22452 /* AVFoundation.framework */; };
1E1EA80C2326CD2800E22452 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E1EA80B2326CD2800E22452 /* AudioToolbox.framework */; };
1E1EA80E2326CD2F00E22452 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E1EA80D2326CD2F00E22452 /* CoreGraphics.framework */; };
@ -34,6 +32,8 @@
50046CB6BDA69B9232CF66D9 /* libPods-RocketChatRN.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C235DC7B31A4D1578EDEF219 /* libPods-RocketChatRN.a */; };
7A006F14229C83B600803143 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A006F13229C83B600803143 /* GoogleService-Info.plist */; };
7A0D62D2242AB187006D5C06 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */; };
7A63763324C6104F00557D60 /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7A63763224C6104F00557D60 /* custom.ttf */; };
7A63763424C6104F00557D60 /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7A63763224C6104F00557D60 /* custom.ttf */; };
7AAA749E23043B1E00F1ADE9 /* Watermelon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */; };
7AC99C1C2339361F0000A0CB /* Watermelon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */; };
7ACD4897222860DE00442C55 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ACD4853222860DE00442C55 /* JavaScriptCore.framework */; };
@ -82,7 +82,6 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RocketChatRN/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RocketChatRN/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RocketChatRN/main.m; sourceTree = "<group>"; };
1E0DBC58247D75C40086559B /* custom.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = custom.ttf; sourceTree = "<group>"; };
1E1EA8092326CD2200E22452 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
1E1EA80B2326CD2800E22452 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
1E1EA80D2326CD2F00E22452 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@ -104,6 +103,7 @@
66D6B1D0567051BE541450C9 /* Pods-RocketChatRN.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RocketChatRN.release.xcconfig"; path = "Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig"; sourceTree = "<group>"; };
7A006F13229C83B600803143 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
7A0D62D1242AB187006D5C06 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
7A63763224C6104F00557D60 /* custom.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = custom.ttf; sourceTree = "<group>"; };
7AAA749C23043B1D00F1ADE9 /* RocketChatRN-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RocketChatRN-Bridging-Header.h"; sourceTree = "<group>"; };
7AAA749D23043B1E00F1ADE9 /* Watermelon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Watermelon.swift; sourceTree = "<group>"; };
7ACD4853222860DE00442C55 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@ -235,7 +235,7 @@
AF5E16F0398347E6A80C8CBE /* Resources */ = {
isa = PBXGroup;
children = (
1E0DBC58247D75C40086559B /* custom.ttf */,
7A63763224C6104F00557D60 /* custom.ttf */,
);
name = Resources;
sourceTree = "<group>";
@ -404,7 +404,7 @@
buildActionMask = 2147483647;
files = (
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
1E0DBC59247D75C40086559B /* custom.ttf in Resources */,
7A63763324C6104F00557D60 /* custom.ttf in Resources */,
7A006F14229C83B600803143 /* GoogleService-Info.plist in Resources */,
7A0D62D2242AB187006D5C06 /* LaunchScreen.storyboard in Resources */,
);
@ -415,7 +415,7 @@
buildActionMask = 2147483647;
files = (
1EDDE57A22DFAD8E0078F69D /* Images.xcassets in Resources */,
1E0DBC5A247D75C40086559B /* custom.ttf in Resources */,
7A63763424C6104F00557D60 /* custom.ttf in Resources */,
1EC6ACB722CB9FC300A41C61 /* MainInterface.storyboard in Resources */,
1ED59D4C22CBA77D00C54289 /* GoogleService-Info.plist in Resources */,
);
@ -889,7 +889,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
);
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@ -955,7 +955,7 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/rn-extensions-share/ios/**",
"$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**",
"$PODS_CONFIGURATION_BUILD_DIR/Firebase",
$PODS_CONFIGURATION_BUILD_DIR/Firebase,
);
INFOPLIST_FILE = ShareRocketChatRN/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;

BIN
ios/custom.ttf
View File

Binary file not shown.