Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Icon Size] GBR, RBR & related icon size 20x20 #18242

Merged
merged 6 commits into from
May 2, 2023
Merged

[Icon Size] GBR, RBR & related icon size 20x20 #18242

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee4fbee
feat: make all dotindicator & related icon 20x20
Prince-Mendiratta Apr 28, 2023
0b993d6
feat: make pencil & pin icon adjacent
Prince-Mendiratta Apr 28, 2023
435f3ef
merge main
Prince-Mendiratta May 1, 2023
bf2d3a7
merge main
Prince-Mendiratta May 2, 2023
0e79c81
fix: use green color
Prince-Mendiratta May 2, 2023
7a65ac0
fix: use green color via themeColors
Prince-Mendiratta May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/DotIndicatorMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import styles from '../styles/styles';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import colors from '../styles/colors';
import variables from '../styles/variables';
import Text from './Text';

const propTypes = {
Expand Down Expand Up @@ -54,7 +53,7 @@ const DotIndicatorMessage = (props) => {
return (
<View style={[styles.dotIndicatorMessage, ...props.style]}>
<View style={styles.offlineFeedback.errorDot}>
<Icon src={Expensicons.DotIndicator} fill={props.type === 'error' ? colors.red : colors.green} height={variables.iconSizeSmall} width={variables.iconSizeSmall} />
<Icon src={Expensicons.DotIndicator} fill={props.type === 'error' ? colors.red : colors.green} />
</View>
<View style={styles.offlineFeedback.textContainer}>
{_.map(sortedMessages, (message, i) => (
Expand Down
9 changes: 3 additions & 6 deletions src/components/LHNOptionsList/OptionRowLHN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import Text from '../Text';
import SubscriptAvatar from '../SubscriptAvatar';
import CONST from '../../CONST';
import variables from '../../styles/variables';
import themeColors from '../../styles/themes/default';
import SidebarUtils from '../../libs/SidebarUtils';
import TextPill from '../TextPill';
Expand Down Expand Up @@ -206,8 +205,6 @@ const OptionRowLHN = (props) => {
<Icon
src={Expensicons.DotIndicator}
fill={colors.red}
height={variables.iconSizeSmall}
width={variables.iconSizeSmall}
/>
</View>
)}
Expand All @@ -217,21 +214,21 @@ const OptionRowLHN = (props) => {
style={[styles.flexRow, styles.alignItemsCenter]}
accessible={false}
>
{shouldShowGreenDotIndicator && <Icon src={Expensicons.DotIndicator} fill={themeColors.success} />}
{optionItem.hasDraftComment && (
<View
style={styles.ml2}
accessibilityLabel={props.translate('sidebarScreen.draftedMessage')}
>
<Icon src={Expensicons.Pencil} height={16} width={16} />
<Icon src={Expensicons.Pencil} />
</View>
)}
{shouldShowGreenDotIndicator && <Icon src={Expensicons.DotIndicator} fill={themeColors.success} />}
{optionItem.isPinned && (
<View
style={styles.ml2}
accessibilityLabel={props.translate('sidebarScreen.chatPinned')}
>
<Icon src={Expensicons.Pin} height={16} width={16} />
<Icon src={Expensicons.Pin} />
</View>
)}
</View>
Expand Down
3 changes: 0 additions & 3 deletions src/components/MenuItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import CONST from '../CONST';
import menuItemPropTypes from './menuItemPropTypes';
import SelectCircle from './SelectCircle';
import colors from '../styles/colors';
import variables from '../styles/variables';
import MultipleAvatars from './MultipleAvatars';
import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
Expand Down Expand Up @@ -208,8 +207,6 @@ const MenuItem = (props) => {
<Icon
src={Expensicons.DotIndicator}
fill={props.brickRoadIndicator === 'error' ? colors.red : colors.green}
height={variables.iconSizeSmall}
width={variables.iconSizeSmall}
/>
</View>
)}
Expand Down
5 changes: 0 additions & 5 deletions src/components/OptionRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import SubscriptAvatar from './SubscriptAvatar';
import OfflineWithFeedback from './OfflineWithFeedback';
import CONST from '../CONST';
import * as ReportUtils from '../libs/ReportUtils';
import variables from '../styles/variables';

const propTypes = {
/** Style for hovered state */
Expand Down Expand Up @@ -263,8 +262,6 @@ class OptionRow extends Component {
<Icon
src={Expensicons.DotIndicator}
fill={themeColors.danger}
height={variables.iconSizeSmall}
width={variables.iconSizeSmall}
/>
</View>
)}
Expand All @@ -279,8 +276,6 @@ class OptionRow extends Component {
<View>
<Icon
src={lodashGet(this.props.option, 'customIcon.src', '')}
height={16}
width={16}
fill={lodashGet(this.props.option, 'customIcon.color')}
/>
</View>
Expand Down
3 changes: 0 additions & 3 deletions src/pages/home/HeaderView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import CONST from '../../CONST';
import * as ReportUtils from '../../libs/ReportUtils';
import Text from '../../components/Text';
import Tooltip from '../../components/Tooltip';
import variables from '../../styles/variables';
import colors from '../../styles/colors';
import reportPropTypes from '../reportPropTypes';
import ONYXKEYS from '../../ONYXKEYS';
Expand Down Expand Up @@ -153,8 +152,6 @@ const HeaderView = (props) => {
<Icon
src={Expensicons.DotIndicator}
fill={colors.red}
height={variables.iconSizeSmall}
width={variables.iconSizeSmall}
/>
</View>
)}
Expand Down