toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-14960 Use the correct icon set for channel types (#2699)

Browse source
This commit is contained in:
Elias Nahum 2019-04-08 13:50:38 -04:00 committed by Miguel Alatzar
parent caac14907e
commit 0377249592
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/components/channel_icon.js
View file

@ -8,10 +8,11 @@ import {
Text,
View,
} from 'react-native';
import Icon from 'react-native-vector-icons/FontAwesome5';
import {General} from 'mattermost-redux/constants';
import Icon from 'app/components/vector_icon';
import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
export default class ChannelIcon extends React.PureComponent {
@ -85,6 +86,7 @@ export default class ChannelIcon extends React.PureComponent {
<Icon
name='archive'
style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
type='fontawesome'
/>
);
} else if (isBot) {
@ -92,6 +94,7 @@ export default class ChannelIcon extends React.PureComponent {
<Icon
name='robot'
style={[style.icon, unreadIcon, activeIcon, {fontSize: size}, style.iconBot]}
type='fontawesome5'
/>
);
} else if (hasDraft) {
@ -99,6 +102,7 @@ export default class ChannelIcon extends React.PureComponent {
<Icon
name='pencil'
style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
type='fontawesome'
/>
);
} else if (type === General.OPEN_CHANNEL) {
@ -106,6 +110,7 @@ export default class ChannelIcon extends React.PureComponent {
<Icon
name='globe'
style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
type='fontawesome'
/>
);
} else if (type === General.PRIVATE_CHANNEL) {
@ -113,6 +118,7 @@ export default class ChannelIcon extends React.PureComponent {
<Icon
name='lock'
style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
type='fontawesome'
/>
);
} else if (type === General.GM_CHANNEL) {

9
app/components/vector_icon.js
View file

@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
import React, {PureComponent} from 'react';
import {Text} from 'react-native';
import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
import FontAwesome5Icon from 'react-native-vector-icons/FontAwesome5';
import FoundationIcon from 'react-native-vector-icons/Foundation';
import IonIcon from 'react-native-vector-icons/Ionicons';
import MaterialIcon from 'react-native-vector-icons/MaterialIcons';
@ -33,6 +34,14 @@ export default class VectorIcon extends PureComponent {
size={size}
/>
);
case 'fontawesome5':
return (
<FontAwesome5Icon
name={name}
style={style}
size={size}
/>
);
case 'foundation':
return (
<FoundationIcon