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.

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

fix: use material community icon for hard coded names #1630

Merged
merged 1 commit into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions src/components/CheckboxAndroid.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Animated, View, StyleSheet } from 'react-native';
import { Animated, View, StyleSheet, I18nManager } from 'react-native';
import color from 'color';
import Icon from './Icon';
import MaterialCommunityIcon from './MaterialCommunityIcon';
import TouchableRipple from './TouchableRipple';
import { withTheme } from '../core/theming';
import { Theme, $RemoveChildren } from '../types';
Expand Down Expand Up @@ -138,11 +138,12 @@ class CheckboxAndroid extends React.Component<Props, State> {
style={styles.container}
>
<Animated.View style={{ transform: [{ scale: this.state.scaleAnim }] }}>
<Icon
<MaterialCommunityIcon
allowFontScaling={false}
source={icon}
name={icon}
size={24}
color={checkboxColor}
direction={I18nManager.isRTL ? 'rtl' : 'ltr'}
/>
<View style={[StyleSheet.absoluteFill, styles.fillContainer]}>
<Animated.View
Expand Down
9 changes: 5 additions & 4 deletions src/components/CheckboxIOS.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { StyleSheet, View } from 'react-native';
import { StyleSheet, View, I18nManager } from 'react-native';
import color from 'color';
import Icon from './Icon';
import MaterialCommunityIcon from './MaterialCommunityIcon';
import TouchableRipple from './TouchableRipple';
import { withTheme } from '../core/theming';
import { Theme, $RemoveChildren } from '../types';
Expand Down Expand Up @@ -87,11 +87,12 @@ class CheckboxIOS extends React.Component<Props> {
style={styles.container}
>
<View style={{ opacity: indeterminate || checked ? 1 : 0 }}>
<Icon
<MaterialCommunityIcon
allowFontScaling={false}
source={icon}
name={icon}
size={24}
color={checkedColor}
direction={I18nManager.isRTL ? 'rtl' : 'ltr'}
/>
</View>
</TouchableRipple>
Expand Down
10 changes: 8 additions & 2 deletions src/components/DataTable/DataTableTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import {
TouchableWithoutFeedback,
View,
ViewStyle,
I18nManager,
} from 'react-native';
import color from 'color';
import Icon from '../Icon';
import MaterialCommunityIcon from '../MaterialCommunityIcon';
import Text from '../Typography/Text';
import { withTheme } from '../../core/theming';
import { Theme } from '../../types';
Expand Down Expand Up @@ -94,7 +95,12 @@ class DataTableTitle extends React.Component<Props, State> {

const icon = sortDirection ? (
<Animated.View style={[styles.icon, { transform: [{ rotate: spin }] }]}>
<Icon source="arrow-down" size={16} color={theme.colors.text} />
<MaterialCommunityIcon
name="arrow-down"
size={16}
color={theme.colors.text}
direction={I18nManager.isRTL ? 'rtl' : 'ltr'}
/>
</Animated.View>
) : null;

Expand Down
8 changes: 5 additions & 3 deletions src/components/List/ListAccordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import {
StyleSheet,
StyleProp,
TextStyle,
I18nManager,
} from 'react-native';
import TouchableRipple from '../TouchableRipple';
import Icon from '../Icon';
import MaterialCommunityIcon from '../MaterialCommunityIcon';
import Text from '../Typography/Text';
import { withTheme } from '../../core/theming';
import { Theme } from '../../types';
Expand Down Expand Up @@ -251,10 +252,11 @@ class ListAccordion extends React.Component<Props, State> {
description ? styles.multiline : undefined,
]}
>
<Icon
source={expanded ? 'chevron-up' : 'chevron-down'}
<MaterialCommunityIcon
name={expanded ? 'chevron-up' : 'chevron-down'}
color={titleColor}
size={24}
direction={I18nManager.isRTL ? 'rtl' : 'ltr'}
/>
</View>
</View>
Expand Down
10 changes: 9 additions & 1 deletion src/components/MaterialCommunityIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export type IconProps = {
color: string;
size: number;
direction: 'rtl' | 'ltr';
allowFontScaling?: boolean;
};

let MaterialCommunityIcons: any;
Expand Down Expand Up @@ -75,8 +76,15 @@ export const accessibilityProps =
importantForAccessibility: 'no-hide-descendants' as 'no-hide-descendants',
};

const defaultIcon = ({ name, color, size, direction }: IconProps) => (
const defaultIcon = ({
name,
color,
size,
direction,
allowFontScaling,
}: IconProps) => (
<MaterialCommunityIcons
allowFontScaling={allowFontScaling}
name={name}
color={color}
size={size}
Expand Down
9 changes: 5 additions & 4 deletions src/components/RadioButton/RadioButtonIOS.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as React from 'react';
import { StyleSheet, View } from 'react-native';
import { StyleSheet, View, I18nManager } from 'react-native';
import color from 'color';
import { RadioButtonContext, RadioButtonContextType } from './RadioButtonGroup';
import { handlePress, isChecked } from './utils';
import Icon from '../Icon';
import MaterialCommunityIcon from '../MaterialCommunityIcon';
import TouchableRipple from '../TouchableRipple';
import { withTheme } from '../../core/theming';
import { Theme, $RemoveChildren } from '../../types';
Expand Down Expand Up @@ -110,11 +110,12 @@ class RadioButtonIOS extends React.Component<Props> {
style={styles.container}
>
<View style={{ opacity: checked ? 1 : 0 }}>
<Icon
<MaterialCommunityIcon
allowFontScaling={false}
source="check"
name="check"
size={24}
color={checkedColor}
direction={I18nManager.isRTL ? 'rtl' : 'ltr'}
/>
</View>
</TouchableRipple>
Expand Down