diff options
44 files changed, 27 insertions, 23 deletions
diff --git a/src/assets/images/facebook-icon.png b/src/assets/images/facebook-icon.png Binary files differdeleted file mode 100644 index d1f053b6..00000000 --- a/src/assets/images/facebook-icon.png +++ /dev/null diff --git a/src/assets/images/facebook-icon@2x.png b/src/assets/images/facebook-icon@2x.png Binary files differdeleted file mode 100644 index 0a989e29..00000000 --- a/src/assets/images/facebook-icon@2x.png +++ /dev/null diff --git a/src/assets/images/facebook-icon@3x.png b/src/assets/images/facebook-icon@3x.png Binary files differdeleted file mode 100644 index 8b5521f1..00000000 --- a/src/assets/images/facebook-icon@3x.png +++ /dev/null diff --git a/src/assets/images/instagram-icon.png b/src/assets/images/instagram-icon.png Binary files differdeleted file mode 100644 index f54673a4..00000000 --- a/src/assets/images/instagram-icon.png +++ /dev/null diff --git a/src/assets/images/instagram-icon@2x.png b/src/assets/images/instagram-icon@2x.png Binary files differdeleted file mode 100644 index 0ed42793..00000000 --- a/src/assets/images/instagram-icon@2x.png +++ /dev/null diff --git a/src/assets/images/instagram-icon@3x.png b/src/assets/images/instagram-icon@3x.png Binary files differdeleted file mode 100644 index c498c11e..00000000 --- a/src/assets/images/instagram-icon@3x.png +++ /dev/null diff --git a/src/assets/images/linkedin-icon.png b/src/assets/images/linkedin-icon.png Binary files differdeleted file mode 100644 index e87ff0fd..00000000 --- a/src/assets/images/linkedin-icon.png +++ /dev/null diff --git a/src/assets/images/linkedin-icon@2x.png b/src/assets/images/linkedin-icon@2x.png Binary files differdeleted file mode 100644 index f6cc62d8..00000000 --- a/src/assets/images/linkedin-icon@2x.png +++ /dev/null diff --git a/src/assets/images/linkedin-icon@3x.png b/src/assets/images/linkedin-icon@3x.png Binary files differdeleted file mode 100644 index cc8db482..00000000 --- a/src/assets/images/linkedin-icon@3x.png +++ /dev/null diff --git a/src/assets/images/pinterest-icon.png b/src/assets/images/pinterest-icon.png Binary files differdeleted file mode 100644 index f0848db1..00000000 --- a/src/assets/images/pinterest-icon.png +++ /dev/null diff --git a/src/assets/images/pinterest-icon@2x.png b/src/assets/images/pinterest-icon@2x.png Binary files differdeleted file mode 100644 index 03dde113..00000000 --- a/src/assets/images/pinterest-icon@2x.png +++ /dev/null diff --git a/src/assets/images/snapchat-icon.png b/src/assets/images/snapchat-icon.png Binary files differdeleted file mode 100644 index 3fef7d5f..00000000 --- a/src/assets/images/snapchat-icon.png +++ /dev/null diff --git a/src/assets/images/snapchat-icon@2x.png b/src/assets/images/snapchat-icon@2x.png Binary files differdeleted file mode 100644 index ff202457..00000000 --- a/src/assets/images/snapchat-icon@2x.png +++ /dev/null diff --git a/src/assets/images/snapchat-icon@3x.png b/src/assets/images/snapchat-icon@3x.png Binary files differdeleted file mode 100644 index 6872961a..00000000 --- a/src/assets/images/snapchat-icon@3x.png +++ /dev/null diff --git a/src/assets/images/tiktok-icon.png b/src/assets/images/tiktok-icon.png Binary files differdeleted file mode 100644 index c7fa788d..00000000 --- a/src/assets/images/tiktok-icon.png +++ /dev/null diff --git a/src/assets/images/twitch-icon.png b/src/assets/images/twitch-icon.png Binary files differdeleted file mode 100644 index f29c1996..00000000 --- a/src/assets/images/twitch-icon.png +++ /dev/null diff --git a/src/assets/images/twitch-icon@2x.png b/src/assets/images/twitch-icon@2x.png Binary files differdeleted file mode 100644 index 1836b0ca..00000000 --- a/src/assets/images/twitch-icon@2x.png +++ /dev/null diff --git a/src/assets/images/twitch-icon@3x.png b/src/assets/images/twitch-icon@3x.png Binary files differdeleted file mode 100644 index 9ab3041f..00000000 --- a/src/assets/images/twitch-icon@3x.png +++ /dev/null diff --git a/src/assets/images/twitter-icon.png b/src/assets/images/twitter-icon.png Binary files differdeleted file mode 100644 index 96d90d28..00000000 --- a/src/assets/images/twitter-icon.png +++ /dev/null diff --git a/src/assets/images/twitter-icon@2x.png b/src/assets/images/twitter-icon@2x.png Binary files differdeleted file mode 100644 index 5d2ff293..00000000 --- a/src/assets/images/twitter-icon@2x.png +++ /dev/null diff --git a/src/assets/images/twitter-icon@3x.png b/src/assets/images/twitter-icon@3x.png Binary files differdeleted file mode 100644 index 6ab31839..00000000 --- a/src/assets/images/twitter-icon@3x.png +++ /dev/null diff --git a/src/assets/images/whatsapp-icon.png b/src/assets/images/whatsapp-icon.png Binary files differdeleted file mode 100644 index c42a20b6..00000000 --- a/src/assets/images/whatsapp-icon.png +++ /dev/null diff --git a/src/assets/images/whatsapp-icon@2x.png b/src/assets/images/whatsapp-icon@2x.png Binary files differdeleted file mode 100644 index b89d1e09..00000000 --- a/src/assets/images/whatsapp-icon@2x.png +++ /dev/null diff --git a/src/assets/images/whatsapp-icon@3x.png b/src/assets/images/whatsapp-icon@3x.png Binary files differdeleted file mode 100644 index 0ee2873b..00000000 --- a/src/assets/images/whatsapp-icon@3x.png +++ /dev/null diff --git a/src/assets/images/youtube-icon.png b/src/assets/images/youtube-icon.png Binary files differdeleted file mode 100644 index 2d78a143..00000000 --- a/src/assets/images/youtube-icon.png +++ /dev/null diff --git a/src/assets/images/youtube-icon@2x.png b/src/assets/images/youtube-icon@2x.png Binary files differdeleted file mode 100644 index 33b3ebec..00000000 --- a/src/assets/images/youtube-icon@2x.png +++ /dev/null diff --git a/src/assets/images/youtube-icon@3x.png b/src/assets/images/youtube-icon@3x.png Binary files differdeleted file mode 100644 index 612d4472..00000000 --- a/src/assets/images/youtube-icon@3x.png +++ /dev/null diff --git a/src/assets/socials/facebook-icon.png b/src/assets/socials/facebook-icon.png Binary files differnew file mode 100644 index 00000000..213149c8 --- /dev/null +++ b/src/assets/socials/facebook-icon.png diff --git a/src/assets/socials/instagram-icon.png b/src/assets/socials/instagram-icon.png Binary files differnew file mode 100644 index 00000000..0fc3eee0 --- /dev/null +++ b/src/assets/socials/instagram-icon.png diff --git a/src/assets/socials/linkedin-icon.png b/src/assets/socials/linkedin-icon.png Binary files differnew file mode 100644 index 00000000..ceff22b7 --- /dev/null +++ b/src/assets/socials/linkedin-icon.png diff --git a/src/assets/socials/logo.png b/src/assets/socials/logo.png Binary files differnew file mode 100644 index 00000000..f945bad9 --- /dev/null +++ b/src/assets/socials/logo.png diff --git a/src/assets/images/pinterest-icon@3x.png b/src/assets/socials/pinterest-icon.png Binary files differindex 3867eed8..3867eed8 100644 --- a/src/assets/images/pinterest-icon@3x.png +++ b/src/assets/socials/pinterest-icon.png diff --git a/src/assets/socials/snapchat-icon.png b/src/assets/socials/snapchat-icon.png Binary files differnew file mode 100644 index 00000000..20725ca6 --- /dev/null +++ b/src/assets/socials/snapchat-icon.png diff --git a/src/assets/socials/spotify-icon.png b/src/assets/socials/spotify-icon.png Binary files differnew file mode 100755 index 00000000..43a3283e --- /dev/null +++ b/src/assets/socials/spotify-icon.png diff --git a/src/assets/socials/tiktok-icon.png b/src/assets/socials/tiktok-icon.png Binary files differnew file mode 100644 index 00000000..08c78ce1 --- /dev/null +++ b/src/assets/socials/tiktok-icon.png diff --git a/src/assets/socials/twitch-icon.png b/src/assets/socials/twitch-icon.png Binary files differnew file mode 100644 index 00000000..a9db28e5 --- /dev/null +++ b/src/assets/socials/twitch-icon.png diff --git a/src/assets/socials/twitter-icon.png b/src/assets/socials/twitter-icon.png Binary files differnew file mode 100755 index 00000000..203a30cf --- /dev/null +++ b/src/assets/socials/twitter-icon.png diff --git a/src/assets/socials/whatsapp-icon.png b/src/assets/socials/whatsapp-icon.png Binary files differnew file mode 100644 index 00000000..863fe38b --- /dev/null +++ b/src/assets/socials/whatsapp-icon.png diff --git a/src/assets/socials/youtube-icon.png b/src/assets/socials/youtube-icon.png Binary files differnew file mode 100755 index 00000000..abb02271 --- /dev/null +++ b/src/assets/socials/youtube-icon.png diff --git a/src/components/common/SocialIcon.tsx b/src/components/common/SocialIcon.tsx index 84da1ca7..3c9deb6d 100644 --- a/src/components/common/SocialIcon.tsx +++ b/src/components/common/SocialIcon.tsx @@ -14,40 +14,37 @@ const SocialIcon: React.FC<SocialIconProps> = ({ }) => { switch (social) { case 'Instagram': - var icon = require('../../assets/images/instagram-icon.png'); + var icon = require('../../assets/socials/instagram-icon.png'); break; case 'Facebook': - var icon = require('../../assets/images/facebook-icon.png'); + var icon = require('../../assets/socials/facebook-icon.png'); break; case 'Twitter': - var icon = require('../../assets/images/twitter-icon.png'); - break; - case 'Tiktok': - var icon = require('../../assets/images/tiktok-icon.png'); + var icon = require('../../assets/socials/twitter-icon.png'); break; case 'Twitch': - var icon = require('../../assets/images/twitch-icon.png'); + var icon = require('../../assets/socials/twitch-icon.png'); break; case 'Pinterest': - var icon = require('../../assets/images/pinterest-icon.png'); + var icon = require('../../assets/socials/pinterest-icon.png'); break; case 'Whatsapp': - var icon = require('../../assets/images/whatsapp-icon.png'); + var icon = require('../../assets/socials/whatsapp-icon.png'); break; case 'Linkedin': - var icon = require('../../assets/images/linkedin-icon.png'); + var icon = require('../../assets/socials/linkedin-icon.png'); break; case 'Snapchat': - var icon = require('../../assets/images/snapchat-icon.png'); + var icon = require('../../assets/socials/snapchat-icon.png'); break; case 'Youtube': - var icon = require('../../assets/images/youtube-icon.png'); + var icon = require('../../assets/socials/youtube-icon.png'); break; case 'TikTok': - var icon = require('../../assets/images/tiktok-icon.png'); + var icon = require('../../assets/socials/tiktok-icon.png'); break; default: - var icon = require('../../assets/images/logo.png'); + var icon = require('../../assets/socials/logo.png'); break; } return <Image style={style} source={icon} />; diff --git a/src/components/onboarding/LinkSocialMedia.tsx b/src/components/onboarding/LinkSocialMedia.tsx index 5f95fac8..03ca3a29 100644 --- a/src/components/onboarding/LinkSocialMedia.tsx +++ b/src/components/onboarding/LinkSocialMedia.tsx @@ -22,7 +22,7 @@ import { LINK_TWITTER_ENDPOINT, LINK_TWITTER_OAUTH, } from '../../constants'; -import {SOCIAL_FONT_COLORS} from '../../constants/constants'; +import {SOCIAL_FONT_COLORS, TAGG_ICON_DIM} from '../../constants/constants'; import SocialIcon from '../common/SocialIcon'; interface SocialMediaLinkerProps extends TouchableOpacityProps { @@ -192,6 +192,8 @@ const styles = StyleSheet.create({ }, icon: { top: '15%', + width: TAGG_ICON_DIM, + height: TAGG_ICON_DIM, }, label: { fontWeight: '500', diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx index a9bc05a9..9418405d 100644 --- a/src/components/taggs/Tagg.tsx +++ b/src/components/taggs/Tagg.tsx @@ -5,7 +5,11 @@ import PurpleRingPlus from '../../assets/icons/purple_ring+.svg'; import PurpleRing from '../../assets/icons/purple_ring.svg'; import RingPlus from '../../assets/icons/ring+.svg'; import Ring from '../../assets/icons/ring.svg'; -import {INTEGRATED_SOCIAL_LIST, TAGG_ICON_DIM} from '../../constants'; +import { + INTEGRATED_SOCIAL_LIST, + TAGG_ICON_DIM, + TAGG_RING_DIM, +} from '../../constants'; import { getNonIntegratedURL, handlePressForAuthBrowser, @@ -85,15 +89,15 @@ const Tagg: React.FC<TaggProps> = ({ const pickTheRightRingHere = () => { if (youMayPass) { if (social === 'Tagg') { - return <Ring width={TAGG_ICON_DIM} height={TAGG_ICON_DIM} />; + return <Ring width={TAGG_RING_DIM} height={TAGG_RING_DIM} />; } else { - return <PurpleRing width={TAGG_ICON_DIM} height={TAGG_ICON_DIM} />; + return <PurpleRing width={TAGG_RING_DIM} height={TAGG_RING_DIM} />; } } else { if (social === 'Tagg') { - return <RingPlus width={TAGG_ICON_DIM} height={TAGG_ICON_DIM} />; + return <RingPlus width={TAGG_RING_DIM} height={TAGG_RING_DIM} />; } else { - return <PurpleRingPlus width={TAGG_ICON_DIM} height={TAGG_ICON_DIM} />; + return <PurpleRingPlus width={TAGG_RING_DIM} height={TAGG_RING_DIM} />; } } }; @@ -135,7 +139,7 @@ const styles = StyleSheet.create({ container: { justifyContent: 'center', alignItems: 'center', - marginHorizontal: 5, + marginHorizontal: 15, }, image: { width: TAGG_ICON_DIM, diff --git a/src/components/taggs/TaggsBar.tsx b/src/components/taggs/TaggsBar.tsx index 62f5f90e..61bcd90a 100644 --- a/src/components/taggs/TaggsBar.tsx +++ b/src/components/taggs/TaggsBar.tsx @@ -127,7 +127,7 @@ const styles = StyleSheet.create({ }, contentContainer: { alignItems: 'center', - paddingHorizontal: 15, + paddingHorizontal: 10, }, }); diff --git a/src/constants/constants.ts b/src/constants/constants.ts index be34f7f0..123d0617 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -12,7 +12,8 @@ export const COVER_HEIGHT = SCREEN_WIDTH * (7 / 5); export const AVATAR_DIM = 44; export const AVATAR_GRADIENT_DIM = 50; -export const TAGG_ICON_DIM = 72; +export const TAGG_ICON_DIM = 58; +export const TAGG_RING_DIM = 75; export const INTEGRATED_SOCIAL_LIST: string[] = [ 'Instagram', |
