From 704c6c6bada682ec7e9008a775f4719fd1d0bd00 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Thu, 21 Jan 2021 15:00:39 -0500
Subject: fixed isIPhoneX and adjusted spacing

---
 src/screens/search/SearchScreen.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/screens/search/SearchScreen.tsx')

diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index 9f98b4d7..5072e13a 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -2,6 +2,7 @@ import AsyncStorage from '@react-native-community/async-storage';
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback, useEffect, useState} from 'react';
 import {
+  Dimensions,
   Keyboard,
   RefreshControl,
   ScrollView,
@@ -24,7 +25,12 @@ import {SEARCH_ENDPOINT, TAGG_TEXT_LIGHT_BLUE} from '../../constants';
 import {loadRecentlySearched, resetScreenType} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {ProfilePreviewType, ScreenType, UserType} from '../../types';
-import {SCREEN_HEIGHT, SCREEN_WIDTH, StatusBarHeight} from '../../utils';
+import {
+  isIPhoneX,
+  SCREEN_HEIGHT,
+  SCREEN_WIDTH,
+  StatusBarHeight,
+} from '../../utils';
 const NO_USER: UserType = {
   userId: '',
   username: '',
-- 
cgit v1.2.3-70-g09d2


From ad321571af78b5ea58a8e3e35820d5c3cf1c607b Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Thu, 21 Jan 2021 17:13:21 -0500
Subject: linting and normalizing tagg icons

---
 src/components/profile/ProfilePreview.tsx    | 33 ++++++++++++++--------------
 src/components/search/Explore.tsx            |  4 ++--
 src/components/search/ExploreSection.tsx     |  3 ++-
 src/components/search/ExploreSectionUser.tsx |  6 ++---
 src/components/taggs/Tagg.tsx                |  3 ++-
 src/constants/constants.ts                   |  4 ++--
 src/screens/search/SearchScreen.tsx          |  7 +-----
 7 files changed, 28 insertions(+), 32 deletions(-)

(limited to 'src/screens/search/SearchScreen.tsx')

diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx
index b2c0a24d..389ca367 100644
--- a/src/components/profile/ProfilePreview.tsx
+++ b/src/components/profile/ProfilePreview.tsx
@@ -1,27 +1,26 @@
-import React, {useEffect, useState, useContext} from 'react';
-import {ProfilePreviewType, ScreenType} from '../../types';
+import AsyncStorage from '@react-native-community/async-storage';
+import {useNavigation} from '@react-navigation/native';
+import React, {useEffect, useState} from 'react';
 import {
-  View,
-  Text,
+  Alert,
   Image,
   StyleSheet,
-  ViewProps,
+  Text,
   TouchableOpacity,
-  Alert,
+  View,
+  ViewProps,
 } from 'react-native';
-import {useNavigation} from '@react-navigation/native';
-import RNFetchBlob from 'rn-fetch-blob';
-import AsyncStorage from '@react-native-community/async-storage';
-import {PROFILE_PHOTO_THUMBNAIL_ENDPOINT} from '../../constants';
-import {UserType, PreviewType} from '../../types';
-import {isUserBlocked, loadAvatar} from '../../services';
-import {useSelector, useDispatch, useStore} from 'react-redux';
+import {useDispatch, useSelector, useStore} from 'react-redux';
+import {ERROR_UNABLE_TO_VIEW_PROFILE} from '../../constants/strings';
+import {loadAvatar} from '../../services';
 import {RootState} from '../../store/rootreducer';
-import {logout} from '../../store/actions';
+import {
+  PreviewType,
+  ProfilePreviewType,
+  ScreenType,
+  UserType,
+} from '../../types';
 import {checkIfUserIsBlocked, fetchUserX, userXInStore} from '../../utils';
-import {SearchResultsBackground} from '../search';
-import NavigationBar from 'src/routes/tabs';
-import {ERROR_UNABLE_TO_VIEW_PROFILE} from '../../constants/strings';
 
 const NO_USER: UserType = {
   userId: '',
diff --git a/src/components/search/Explore.tsx b/src/components/search/Explore.tsx
index c07c66b8..4a71249b 100644
--- a/src/components/search/Explore.tsx
+++ b/src/components/search/Explore.tsx
@@ -4,6 +4,7 @@ import {useSelector} from 'react-redux';
 import {EXPLORE_SECTION_TITLES} from '../../constants';
 import {RootState} from '../../store/rootReducer';
 import {ExploreSectionType} from '../../types';
+import {normalize} from '../../utils';
 import ExploreSection from './ExploreSection';
 
 const Explore: React.FC = () => {
@@ -21,11 +22,10 @@ const Explore: React.FC = () => {
 const styles = StyleSheet.create({
   container: {
     zIndex: 0,
-    // margin: '5%',
   },
   header: {
     fontWeight: '700',
-    fontSize: 22,
+    fontSize: normalize(22),
     color: '#fff',
     marginBottom: '2%',
     margin: '5%',
diff --git a/src/components/search/ExploreSection.tsx b/src/components/search/ExploreSection.tsx
index 8e8b4988..17079e77 100644
--- a/src/components/search/ExploreSection.tsx
+++ b/src/components/search/ExploreSection.tsx
@@ -1,6 +1,7 @@
 import React, {Fragment} from 'react';
 import {ScrollView, StyleSheet, Text, View} from 'react-native';
 import {ProfilePreviewType} from '../../types';
+import {normalize} from '../../utils';
 import ExploreSectionUser from './ExploreSectionUser';
 
 /**
@@ -34,7 +35,7 @@ const styles = StyleSheet.create({
   },
   header: {
     fontWeight: '600',
-    fontSize: 20,
+    fontSize: normalize(18),
     color: '#fff',
     marginLeft: '5%',
     marginBottom: '5%',
diff --git a/src/components/search/ExploreSectionUser.tsx b/src/components/search/ExploreSectionUser.tsx
index 0bf68a20..68e077e3 100644
--- a/src/components/search/ExploreSectionUser.tsx
+++ b/src/components/search/ExploreSectionUser.tsx
@@ -12,7 +12,7 @@ import {useDispatch, useSelector, useStore} from 'react-redux';
 import {loadAvatar} from '../../services';
 import {RootState} from '../../store/rootReducer';
 import {ProfilePreviewType, ScreenType} from '../../types';
-import {fetchUserX, userXInStore} from '../../utils';
+import {fetchUserX, normalize, userXInStore} from '../../utils';
 
 /**
  * Search Screen for user recommendations and a search
@@ -110,13 +110,13 @@ const styles = StyleSheet.create({
   name: {
     fontWeight: '600',
     flexWrap: 'wrap',
-    fontSize: 16,
+    fontSize: normalize(16),
     color: '#fff',
     textAlign: 'center',
   },
   username: {
     fontWeight: '400',
-    fontSize: 14,
+    fontSize: normalize(14),
     color: '#fff',
   },
 });
diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx
index 82ac07df..5fa8b395 100644
--- a/src/components/taggs/Tagg.tsx
+++ b/src/components/taggs/Tagg.tsx
@@ -22,6 +22,7 @@ import {
   ERROR_UNABLE_TO_FIND_PROFILE,
   SUCCESS_LINK,
 } from '../../constants/strings';
+import {normalize} from '../../utils';
 
 interface TaggProps {
   social: string;
@@ -165,7 +166,7 @@ const styles = StyleSheet.create({
     justifyContent: 'space-between',
     alignItems: 'center',
     marginHorizontal: 15,
-    height: 90,
+    height: normalize(90),
   },
   iconTap: {
     justifyContent: 'center',
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
index 557eef3a..9abfc702 100644
--- a/src/constants/constants.ts
+++ b/src/constants/constants.ts
@@ -1,6 +1,6 @@
 import {ReactText} from 'react';
 import {BackgroundGradientType, ExploreSectionType} from './../types/';
-import {SCREEN_WIDTH, SCREEN_HEIGHT, isIPhoneX} from '../utils';
+import {SCREEN_WIDTH, SCREEN_HEIGHT, isIPhoneX, normalize} from '../utils';
 
 export const CHIN_HEIGHT = 34;
 
@@ -19,7 +19,7 @@ export const AVATAR_DIM = 44;
 export const AVATAR_GRADIENT_DIM = 50;
 
 export const TAGG_ICON_DIM = 58;
-export const TAGG_RING_DIM = 65;
+export const TAGG_RING_DIM = normalize(60);
 
 export const INTEGRATED_SOCIAL_LIST: string[] = [
   'Instagram',
diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index 5072e13a..f1bdbea2 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -25,12 +25,7 @@ import {SEARCH_ENDPOINT, TAGG_TEXT_LIGHT_BLUE} from '../../constants';
 import {loadRecentlySearched, resetScreenType} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {ProfilePreviewType, ScreenType, UserType} from '../../types';
-import {
-  isIPhoneX,
-  SCREEN_HEIGHT,
-  SCREEN_WIDTH,
-  StatusBarHeight,
-} from '../../utils';
+import {SCREEN_HEIGHT, SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 const NO_USER: UserType = {
   userId: '',
   username: '',
-- 
cgit v1.2.3-70-g09d2

