From 38661e00281363b0f4ad32f0b29d739e1ca09164 Mon Sep 17 00:00:00 2001
From: Ashm Walia <40498934+ashmgarv@users.noreply.github.com>
Date: Wed, 30 Dec 2020 11:36:44 -0800
Subject: [TMA - 457]Change followers to friends (#149)

* One commit to replace followers with friends

* Move block unblock to drawer and some cosmetic changes

* Options to edit own profile when viewing

* Changes for University Class

* Small fix

* Made ProfileOnboarding a scroll view and other small changes

* Small fix

* Small fix thanks to ivan and tanmay

* Add ?
---
 src/screens/profile/FollowersListScreen.tsx | 83 -----------------------------
 src/screens/profile/FriendsListScreen.tsx   | 71 ++++++++++++++++++++++++
 src/screens/profile/index.ts                |  2 +-
 3 files changed, 72 insertions(+), 84 deletions(-)
 delete mode 100644 src/screens/profile/FollowersListScreen.tsx
 create mode 100644 src/screens/profile/FriendsListScreen.tsx

(limited to 'src/screens/profile')

diff --git a/src/screens/profile/FollowersListScreen.tsx b/src/screens/profile/FollowersListScreen.tsx
deleted file mode 100644
index 874dd01b..00000000
--- a/src/screens/profile/FollowersListScreen.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import {RouteProp} from '@react-navigation/native';
-import {TabsGradient, Followers, CenteredView} from '../../components';
-import {ScrollView} from 'react-native-gesture-handler';
-import {SCREEN_HEIGHT} from '../../utils';
-import {StyleSheet, View} from 'react-native';
-import {ProfileStackParams} from '../../routes';
-import {ProfilePreviewType} from '../../types';
-import {EMPTY_PROFILE_PREVIEW_LIST} from '../../store/initialStates';
-import {useSelector} from 'react-redux';
-import {RootState} from '../../store/rootReducer';
-
-type FollowersListScreenRouteProp = RouteProp<
-  ProfileStackParams,
-  'FollowersListScreen'
->;
-interface FollowersListScreenProps {
-  route: FollowersListScreenRouteProp;
-}
-
-const FollowersListScreen: React.FC<FollowersListScreenProps> = ({route}) => {
-  const {isFollowers, userXId, screenType} = route.params;
-
-  const {followers, following} = userXId
-    ? useSelector((state: RootState) => state.userX[screenType][userXId])
-    : useSelector((state: RootState) => state.follow);
-
-  const [list, setList] = useState<ProfilePreviewType[]>(
-    EMPTY_PROFILE_PREVIEW_LIST,
-  );
-
-  useEffect(() => {
-    setList(isFollowers ? followers : following);
-  }, [followers, following, setList]);
-
-  return (
-    <CenteredView>
-      <View style={styles.modalView}>
-        <ScrollView
-          keyboardShouldPersistTaps={'always'}
-          stickyHeaderIndices={[4]}
-          contentContainerStyle={styles.contentContainer}
-          showsVerticalScrollIndicator={false}>
-          <Followers
-            result={list}
-            sectionTitle={isFollowers ? 'Followers' : 'Following'}
-            screenType={screenType}
-          />
-        </ScrollView>
-        <TabsGradient />
-      </View>
-    </CenteredView>
-  );
-};
-
-const styles = StyleSheet.create({
-  contentContainer: {
-    paddingBottom: SCREEN_HEIGHT / 15,
-    paddingHorizontal: 15,
-    marginTop: '5%',
-  },
-  modalView: {
-    width: '85%',
-    height: '70%',
-    backgroundColor: '#fff',
-    shadowColor: '#000',
-    shadowOpacity: 30,
-    shadowOffset: {width: 0, height: 2},
-    shadowRadius: 5,
-    borderRadius: 8,
-    paddingBottom: 15,
-    paddingHorizontal: 20,
-    justifyContent: 'space-between',
-  },
-  modalScrollViewContent: {
-    justifyContent: 'center',
-  },
-  modalScrollView: {
-    marginBottom: 10,
-  },
-});
-
-export default FollowersListScreen;
diff --git a/src/screens/profile/FriendsListScreen.tsx b/src/screens/profile/FriendsListScreen.tsx
new file mode 100644
index 00000000..f7192d10
--- /dev/null
+++ b/src/screens/profile/FriendsListScreen.tsx
@@ -0,0 +1,71 @@
+import React, {useState} from 'react';
+import {RouteProp} from '@react-navigation/native';
+import {TabsGradient, Friends, CenteredView} from '../../components';
+import {ScrollView} from 'react-native-gesture-handler';
+import {SCREEN_HEIGHT} from '../../utils';
+import {StyleSheet, View} from 'react-native';
+import {ProfileStackParams} from '../../routes';
+import {ProfilePreviewType} from '../../types';
+import {EMPTY_PROFILE_PREVIEW_LIST} from '../../store/initialStates';
+import {useSelector} from 'react-redux';
+import {RootState} from '../../store/rootReducer';
+
+type FriendsListScreenRouteProp = RouteProp<
+  ProfileStackParams,
+  'FriendsListScreen'
+>;
+interface FriendsListScreenProps {
+  route: FriendsListScreenRouteProp;
+}
+
+const FriendsListScreen: React.FC<FriendsListScreenProps> = ({route}) => {
+  const {userXId, screenType} = route.params;
+
+  const {friends} = userXId
+    ? useSelector((state: RootState) => state.userX[screenType][userXId])
+    : useSelector((state: RootState) => state.friends);
+
+  return (
+    <CenteredView>
+      <View style={styles.modalView}>
+        <ScrollView
+          keyboardShouldPersistTaps={'always'}
+          stickyHeaderIndices={[4]}
+          contentContainerStyle={styles.contentContainer}
+          showsVerticalScrollIndicator={false}>
+          <Friends result={friends} screenType={screenType} />
+        </ScrollView>
+        <TabsGradient />
+      </View>
+    </CenteredView>
+  );
+};
+
+const styles = StyleSheet.create({
+  contentContainer: {
+    paddingBottom: SCREEN_HEIGHT / 15,
+    paddingHorizontal: 15,
+    marginTop: '5%',
+  },
+  modalView: {
+    width: '85%',
+    height: '70%',
+    backgroundColor: '#fff',
+    shadowColor: '#000',
+    shadowOpacity: 30,
+    shadowOffset: {width: 0, height: 2},
+    shadowRadius: 5,
+    borderRadius: 8,
+    paddingBottom: 15,
+    paddingHorizontal: 20,
+    justifyContent: 'space-between',
+  },
+  modalScrollViewContent: {
+    justifyContent: 'center',
+  },
+  modalScrollView: {
+    marginBottom: 10,
+  },
+});
+
+export default FriendsListScreen;
diff --git a/src/screens/profile/index.ts b/src/screens/profile/index.ts
index 3bfe5d30..b6a13144 100644
--- a/src/screens/profile/index.ts
+++ b/src/screens/profile/index.ts
@@ -3,5 +3,5 @@ export {default as SocialMediaTaggs} from './SocialMediaTaggs';
 export {default as CaptionScreen} from './CaptionScreen';
 export {default as IndividualMoment} from './IndividualMoment';
 export {default as MomentCommentsScreen} from './MomentCommentsScreen';
-export {default as FollowersListScreen} from './FollowersListScreen';
+export {default as FriendsListScreen} from './FriendsListScreen';
 export {default as EditProfile} from './EditProfile';
-- 
cgit v1.2.3-70-g09d2