From 21bd2597b72c8ba8246b98e72fe45ba373046a7f Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Wed, 2 Jun 2021 13:32:00 -0400
Subject: Update icon assets

---
 src/assets/icons/plus-icon-thin.svg       |   1 +
 src/assets/icons/plus-icon-white.svg      |   1 +
 src/assets/icons/plus-icon.svg            |   1 +
 src/assets/icons/plus_icon-01.svg         |   1 -
 src/assets/icons/plus_icon-02.svg         |   1 -
 src/assets/images/plus-icon-thin.png      | Bin 2169 -> 0 bytes
 src/components/moments/Moment.tsx         |   4 ++--
 src/components/profile/ProfileBadges.tsx  |  13 ++++---------
 src/screens/profile/CategorySelection.tsx |   2 +-
 9 files changed, 10 insertions(+), 14 deletions(-)
 create mode 100644 src/assets/icons/plus-icon-thin.svg
 create mode 100644 src/assets/icons/plus-icon-white.svg
 create mode 100644 src/assets/icons/plus-icon.svg
 delete mode 100644 src/assets/icons/plus_icon-01.svg
 delete mode 100644 src/assets/icons/plus_icon-02.svg
 delete mode 100644 src/assets/images/plus-icon-thin.png

(limited to 'src')

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-white.svg b/src/assets/icons/plus-icon-white.svg
new file mode 100644
index 00000000..25527911
--- /dev/null
+++ b/src/assets/icons/plus-icon-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><defs><style>.cls-1{fill:#fff;}</style></defs><rect class="cls-1" x="25.73" width="8.54" height="60" rx="3.89"/><rect class="cls-1" x="25.73" width="8.54" height="60" rx="3.89" transform="translate(0 60) rotate(-90)"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/plus-icon.svg b/src/assets/icons/plus-icon.svg
new file mode 100644
index 00000000..7a3b21d2
--- /dev/null
+++ b/src/assets/icons/plus-icon.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 216 216"><defs><style>.cls-1{fill:none;stroke-miterlimit:10;stroke-width:11px;}</style></defs><circle stroke="currentColor" class="cls-1" cx="108" cy="108" r="84.9" /><rect class="cls-2" x="101.05" y="59.11" width="13.91" height="97.78" rx="6.34" fill="currentColor"/><rect class="cls-2" x="101.05" y="59.11" width="13.91" height="97.78" rx="6.34" transform="translate(0 216) rotate(-90)" fill="currentColor" /></svg>
\ No newline at end of file
diff --git a/src/assets/icons/plus_icon-01.svg b/src/assets/icons/plus_icon-01.svg
deleted file mode 100644
index 7a3b21d2..00000000
--- a/src/assets/icons/plus_icon-01.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 216 216"><defs><style>.cls-1{fill:none;stroke-miterlimit:10;stroke-width:11px;}</style></defs><circle stroke="currentColor" class="cls-1" cx="108" cy="108" r="84.9" /><rect class="cls-2" x="101.05" y="59.11" width="13.91" height="97.78" rx="6.34" fill="currentColor"/><rect class="cls-2" x="101.05" y="59.11" width="13.91" height="97.78" rx="6.34" transform="translate(0 216) 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-02.svg
deleted file mode 100644
index 25527911..00000000
--- a/src/assets/icons/plus_icon-02.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60"><defs><style>.cls-1{fill:#fff;}</style></defs><rect class="cls-1" x="25.73" width="8.54" height="60" rx="3.89"/><rect class="cls-1" x="25.73" width="8.54" height="60" rx="3.89" transform="translate(0 60) rotate(-90)"/></svg>
\ No newline at end of file
diff --git a/src/assets/images/plus-icon-thin.png b/src/assets/images/plus-icon-thin.png
deleted file mode 100644
index 6f0a305e..00000000
Binary files a/src/assets/images/plus-icon-thin.png and /dev/null differ
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';
-- 
cgit v1.2.3-70-g09d2