From b9d85042ef111cfd653a48cd91995f65c6bfba32 Mon Sep 17 00:00:00 2001
From: mashazyu <mariya.z@gmail.com>
Date: Tue, 24 Mar 2020 13:27:59 +0100
Subject: [PATCH] AppIcon props update
---
components/common/app-icon.js | 15 +++++----------
components/header/side-menu.js | 6 +++---
components/settings/menu-item.js | 2 +-
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/components/common/app-icon.js b/components/common/app-icon.js
index 03bdb5ef..b0b3c351 100644
--- a/components/common/app-icon.js
+++ b/components/common/app-icon.js
@@ -3,30 +3,25 @@ import PropTypes from 'prop-types'
import { StyleSheet } from 'react-native'
import Icon from 'react-native-vector-icons/Entypo'
-import { Colors, Sizes } from '../../styles/redesign'
+import { Sizes } from '../../styles/redesign'
-const AppIcon = ({ isCTA, name }) => {
- const style = isCTA ? styles.iconCTA : styles.icon
+const AppIcon = ({ color, name }) => {
+ const style = [styles.icon, { color }]
return <Icon name={name} style={style}/>
}
AppIcon.propTypes = {
- isCTA: PropTypes.bool,
+ color: PropTypes.string,
name: PropTypes.string.isRequired
}
AppIcon.defaultProps = {
- isCTA: true
+ isCTA: 'black'
}
const styles = StyleSheet.create({
icon: {
- color: 'black',
- fontSize: Sizes.subtitle
- },
- iconCTA: {
- color: Colors.orange,
fontSize: Sizes.subtitle
}
})
diff --git a/components/header/side-menu.js b/components/header/side-menu.js
index 3591eeeb..39107cdb 100644
--- a/components/header/side-menu.js
+++ b/components/header/side-menu.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types'
import AppIcon from '../common/app-icon'
import MenuItem from './menu-item'
-import { Sizes } from '../../styles/redesign'
+import { Colors, Sizes } from '../../styles/redesign'
import settingsLabels from '../../i18n/en/settings'
const { menuItems } = settingsLabels
@@ -21,7 +21,7 @@ const SideMenu = ({ shouldShowMenu, toggleMenu }) => {
<React.Fragment>
{!shouldShowMenu &&
<TouchableOpacity onPress={toggleMenu}>
- <AppIcon name={'dots-three-vertical'} isCTA/>
+ <AppIcon name={'dots-three-vertical'} color={Colors.orange}/>
</TouchableOpacity>
}
{shouldShowMenu &&
@@ -34,7 +34,7 @@ const SideMenu = ({ shouldShowMenu, toggleMenu }) => {
<View style={styles.blackBackground}></View>
<View style={styles.menu}>
<TouchableOpacity onPress={toggleMenu} style={styles.iconContainer}>
- <AppIcon name={'cross'} isCTA={false}/>
+ <AppIcon name={'cross'} color={'black'}/>
</TouchableOpacity>
{settingsMenuItems.map(item =>
<MenuItem
diff --git a/components/settings/menu-item.js b/components/settings/menu-item.js
index b9336a19..1bef2228 100644
--- a/components/settings/menu-item.js
+++ b/components/settings/menu-item.js
@@ -23,7 +23,7 @@ const MenuItem = ({ item, last, navigate }) => {
<AppText style={styles.title}>{item.name}</AppText>
{item.text.length > 0 && <AppText>{item.text}</AppText>}
</View>
- <AppIcon name={'chevron-right'} isCTA/>
+ <AppIcon name={'chevron-right'} color={Colors.orange}/>
</TouchableOpacity>
</Segment>
)
--
GitLab