diff options
author | Ivan Chen <ivan@tagg.id> | 2021-06-02 13:32:00 -0400 |
---|---|---|
committer | Ivan Chen <ivan@tagg.id> | 2021-06-02 13:32:00 -0400 |
commit | 21bd2597b72c8ba8246b98e72fe45ba373046a7f (patch) | |
tree | 9939d4befc011f18cc642c4edb7b173cb89c4d86 | |
parent | bcd54389acb9db9b3948a9f1f105b7cffdbe2acf (diff) |
Update icon assets
-rw-r--r-- | src/assets/icons/plus-icon-thin.svg | 1 | ||||
-rw-r--r-- | src/assets/icons/plus-icon-white.svg (renamed from src/assets/icons/plus_icon-02.svg) | 0 | ||||
-rw-r--r-- | src/assets/icons/plus-icon.svg (renamed from src/assets/icons/plus_icon-01.svg) | 0 | ||||
-rw-r--r-- | src/assets/images/plus-icon-thin.png | bin | 2169 -> 0 bytes | |||
-rw-r--r-- | src/components/moments/Moment.tsx | 4 | ||||
-rw-r--r-- | src/components/profile/ProfileBadges.tsx | 13 | ||||
-rw-r--r-- | src/screens/profile/CategorySelection.tsx | 2 |
7 files changed, 8 insertions, 12 deletions
diff --git a/src/assets/icons/plus-icon-thin.svg b/src/assets/icons/plus-icon-thin.svg new file mode 100644 index 00000000..1a582474 --- /dev/null +++ b/src/assets/icons/plus-icon-thin.svg @@ -0,0 +1 @@ +<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216 216"><defs><style>.cls-1{fill:none;stroke-miterlimit:10;stroke-width:7.33px;}}</style></defs><circle class="cls-1" cx="108.05" cy="108.21" r="103.73" stroke="currentColor"/><rect class="cls-2" x="99.56" y="48.48" width="16.99" height="119.46" rx="7.75" fill="currentColor"/><rect class="cls-2" x="99.56" y="48.48" width="16.99" height="119.46" rx="7.75" transform="translate(-0.16 216.26) rotate(-90)" fill="currentColor"/></svg>
\ No newline at end of file diff --git a/src/assets/icons/plus_icon-02.svg b/src/assets/icons/plus-icon-white.svg index 25527911..25527911 100644 --- a/src/assets/icons/plus_icon-02.svg +++ b/src/assets/icons/plus-icon-white.svg diff --git a/src/assets/icons/plus_icon-01.svg b/src/assets/icons/plus-icon.svg index 7a3b21d2..7a3b21d2 100644 --- a/src/assets/icons/plus_icon-01.svg +++ b/src/assets/icons/plus-icon.svg diff --git a/src/assets/images/plus-icon-thin.png b/src/assets/images/plus-icon-thin.png Binary files differdeleted file mode 100644 index 6f0a305e..00000000 --- a/src/assets/images/plus-icon-thin.png +++ /dev/null diff --git a/src/components/moments/Moment.tsx b/src/components/moments/Moment.tsx index 0ceb8542..cde5b2e0 100644 --- a/src/components/moments/Moment.tsx +++ b/src/components/moments/Moment.tsx @@ -7,8 +7,8 @@ import ImagePicker from 'react-native-image-crop-picker'; import LinearGradient from 'react-native-linear-gradient'; import DeleteIcon from '../../assets/icons/delete-logo.svg'; import DownIcon from '../../assets/icons/down_icon.svg'; -import PlusIcon from '../../assets/icons/plus_icon-01.svg'; -import BigPlusIcon from '../../assets/icons/plus_icon-02.svg'; +import PlusIcon from '../../assets/icons/plus-icon.svg'; +import BigPlusIcon from '../../assets/icons/plus-icon-white.svg'; import UpIcon from '../../assets/icons/up_icon.svg'; import {TAGG_LIGHT_BLUE} from '../../constants'; import {ERROR_UPLOAD} from '../../constants/strings'; diff --git a/src/components/profile/ProfileBadges.tsx b/src/components/profile/ProfileBadges.tsx index 5ce776c2..aef52903 100644 --- a/src/components/profile/ProfileBadges.tsx +++ b/src/components/profile/ProfileBadges.tsx @@ -9,6 +9,7 @@ import {RootState} from '../../store/rootReducer'; import {ScreenType, UniversityBadgeDisplayType} from '../../types'; import {badgesToDisplayBadges, normalize} from '../../utils'; import BadgeDetailView from '../common/BadgeDetailView'; +import PlusIconImage from '../../assets/icons/plus-icon-thin.svg'; interface ProfileBadgesProps { userXId: string | undefined; @@ -33,20 +34,13 @@ const ProfileBadges: React.FC<ProfileBadgesProps> = ({userXId, screenType}) => { const PlusIcon: FC = () => ( <TouchableOpacity onPress={() => navigation.navigate('BadgeSelection', {editing: true})}> - <Image - source={require('../../assets/images/plus-icon-thin.png')} - style={styles.plus} - /> + <PlusIconImage style={styles.plus} /> </TouchableOpacity> ); const CloseIcon: FC = () => ( <TouchableOpacity onPress={() => setIsEditBadgeModalVisible(true)}> - {/* TODO: needs to be grey :shrug: */} - <Image - source={require('../../assets/images/plus-icon-thin.png')} - style={styles.close} - /> + <PlusIconImage style={styles.close} /> </TouchableOpacity> ); @@ -141,6 +135,7 @@ const styles = StyleSheet.create({ plus: { width: normalize(31), height: normalize(31), + color: 'black', }, close: { width: normalize(31), diff --git a/src/screens/profile/CategorySelection.tsx b/src/screens/profile/CategorySelection.tsx index c02eef0d..ea443fce 100644 --- a/src/screens/profile/CategorySelection.tsx +++ b/src/screens/profile/CategorySelection.tsx @@ -11,7 +11,7 @@ import { } from 'react-native'; import {ScrollView} from 'react-native-gesture-handler'; import {useDispatch, useSelector} from 'react-redux'; -import PlusIcon from '../../assets/icons/plus_icon-01.svg'; +import PlusIcon from '../../assets/icons/plus-icon.svg'; import {Background, MomentCategory} from '../../components'; import {MOMENT_CATEGORIES, TAGG_LIGHT_BLUE_2} from '../../constants'; import {ERROR_SOMETHING_WENT_WRONG} from '../../constants/strings'; |