From 13239b4b87f171a8d0c394af758968aa1e60f4ea Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Tue, 9 Mar 2021 08:37:57 -0800 Subject: unused imports, source coreections --- .../suggestedPeople/SuggestedPeopleScreen.tsx | 28 ++++------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'src/screens') diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx index 911474cd..61adc171 100644 --- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx +++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx @@ -1,43 +1,23 @@ import {useFocusEffect, useNavigation} from '@react-navigation/native'; -import React, { - memo, - Fragment, - useCallback, - useEffect, - useState, - useMemo, - useRef, -} from 'react'; +import React, {useCallback, useEffect, useState, useRef} from 'react'; import { FlatList, - ListRenderItemInfo, RefreshControl, StatusBar, StyleSheet, - Text, - View, ViewToken, } from 'react-native'; -import {Image} from 'react-native-animatable'; -import {TouchableOpacity} from 'react-native-gesture-handler'; + import Animated from 'react-native-reanimated'; import {useDispatch, useSelector, useStore} from 'react-redux'; -import { - TabsGradient, - TaggsBar, - TaggLoadingIndicator, - Background, -} from '../../components'; -import {MutualFriends} from '../../components/suggestedPeople'; +import {TabsGradient, TaggLoadingIndicator, Background} from '../../components'; import {SP_PAGE_SIZE} from '../../constants'; import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen'; import {getSuggestedPeople} from '../../services/SuggestedPeopleService'; import {cancelFriendRequest, resetScreenType} from '../../store/actions'; import {RootState} from '../../store/rootReducer'; -import RequestedButton from '../../assets/ionicons/requested-button.svg'; import { FriendshipStatusType, - FriendshipType, ProfilePreviewType, ScreenType, SuggestedPeopleDataType, @@ -234,7 +214,7 @@ const SuggestedPeopleScreen: React.FC = () => { renderItem={(item) => { return ( Date: Tue, 9 Mar 2021 10:22:23 -0800 Subject: exported file, refactored SPBody --- src/components/suggestedPeople/index.ts | 1 + src/screens/suggestedPeople/SPBody.tsx | 68 +++++++-------------------------- 2 files changed, 15 insertions(+), 54 deletions(-) (limited to 'src/screens') diff --git a/src/components/suggestedPeople/index.ts b/src/components/suggestedPeople/index.ts index 219ee2fe..515f6fb4 100644 --- a/src/components/suggestedPeople/index.ts +++ b/src/components/suggestedPeople/index.ts @@ -1 +1,2 @@ export {default as MutualFriends} from './MutualFriends'; +export {default as BadgesDropdown} from './BadgesDropdown'; diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 8c6a3238..3c3636db 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -3,12 +3,9 @@ import React, {Fragment, useEffect, useMemo, useState} from 'react'; import {StyleSheet, Text, View} from 'react-native'; import {Image} from 'react-native-animatable'; import {TouchableOpacity} from 'react-native-gesture-handler'; -import LinearGradient from 'react-native-linear-gradient'; -import Animated from 'react-native-reanimated'; import RequestedButton from '../../assets/ionicons/requested-button.svg'; import {TaggsBar} from '../../components'; -import UniversityIcon from '../../components/profile/UniversityIcon'; -import {MutualFriends} from '../../components/suggestedPeople'; +import {BadgesDropdown, MutualFriends} from '../../components/suggestedPeople'; import {DATA} from '../../screens/badge/BadgeSelection'; import { ProfilePreviewType, @@ -17,10 +14,11 @@ import { UniversityBadge, } from '../../types'; import {isIPhoneX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; +import Animated from 'react-native-reanimated'; interface SPBodyProps { item: SuggestedPeopleDataType; - index: number; + itemIndex: number; onAddFriend: (user: ProfilePreviewType) => Promise; onCancelRequest: (user: ProfilePreviewType) => void; loggedInUserId: string; @@ -35,14 +33,20 @@ const SPBody: React.FC = ({ friendship, badges, }, - index, + itemIndex, onAddFriend, onCancelRequest, loggedInUserId, }) => { - const firstItem = index === 0; + const firstItem = itemIndex === 0; const screenType = ScreenType.SuggestedPeople; - const [localBadges, setLocalBadges] = useState([]); + const [localBadges, setLocalBadges] = useState< + { + badge: UniversityBadge; + img: string; + }[] + >([]); + const navigation = useNavigation(); let array = []; useEffect(() => { const findBadgeIcons = (badge: UniversityBadge) => { @@ -111,7 +115,6 @@ const SPBody: React.FC = ({ ), [suggested_people_url], ); - const navigation = useNavigation(); return ( @@ -119,46 +122,7 @@ const SPBody: React.FC = ({ {firstItem && 'Suggested People'} - - { - console.log('badges: ', badges); - }}> - - - {localBadges && - localBadges.map(({badge, img}) => ( - { - navigation.navigate('MutualBadgeHolders', { - badge_id: badge.id, - badge_title: badge.name, - }); - }}> - - - - - ))} - + {} @@ -209,10 +173,6 @@ const styles = StyleSheet.create({ flexDirection: 'column', justifyContent: 'space-between', }, - universityIconContainer: { - width: normalize(31), - height: normalize(38), - }, marginManager: {marginHorizontal: '5%'}, image: { position: 'absolute', @@ -311,7 +271,6 @@ const styles = StyleSheet.create({ letterSpacing: normalize(1), }, body: {}, - button: { justifyContent: 'center', alignItems: 'center', @@ -365,6 +324,7 @@ const styles = StyleSheet.create({ height: 30, borderRadius: 15, }, + animatedBadgeView: {position: 'absolute'}, }); export default SPBody; -- cgit v1.2.3-70-g09d2 From 743f0b19f95c4398a5026d7cf80d38617eecfcc7 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Tue, 9 Mar 2021 10:33:07 -0800 Subject: Cleaned spbody --- src/screens/suggestedPeople/SPBody.tsx | 55 ++-------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) (limited to 'src/screens') diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 3c3636db..b7943cbc 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -66,7 +66,7 @@ const SPBody: React.FC = ({ : console.log('NO BADGES FOUND'); }, []); - const displayButton = () => { + const displayFriendButton = () => { switch (friendship.status) { case 'friends': return ; @@ -138,7 +138,7 @@ const SPBody: React.FC = ({ {user.first_name} @{user.username} - {user.id !== loggedInUserId && displayButton()} + {user.id !== loggedInUserId && displayFriendButton()} Date: Tue, 9 Mar 2021 10:55:25 -0800 Subject: refactproes, fixed bug --- src/components/suggestedPeople/BadgesDropdown.tsx | 2 +- src/screens/suggestedPeople/SPBody.tsx | 34 +++++++++++++---------- src/types/types.ts | 2 +- 3 files changed, 22 insertions(+), 16 deletions(-) (limited to 'src/screens') diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 264292d7..3fcb7cbc 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -88,7 +88,7 @@ const BadgesDropdown: React.FC = ({localBadges}) => { styles.animatedBadgeView, { top: top[index], - zIndex: -1 * parseInt(badge.id, 10), + zIndex: -1 * badge.id, }, ]}> = ({ : console.log('NO BADGES FOUND'); }, []); - const displayFriendButton = () => { + const FriendButton = () => { switch (friendship.status) { case 'friends': return ; @@ -116,29 +116,35 @@ const SPBody: React.FC = ({ [suggested_people_url], ); + const NamePlate = () => { + return ( + { + navigation.push('Profile', { + userXId: user.id, + screenType, + }); + }} + style={styles.nameInfoContainer}> + {user.first_name} + @{user.username} + + ); + }; + return ( {backgroundImage} {firstItem && 'Suggested People'} - {} + - { - navigation.push('Profile', { - userXId: user.id, - screenType, - }); - }} - style={styles.nameInfoContainer}> - {user.first_name} - @{user.username} - - {user.id !== loggedInUserId && displayFriendButton()} + + {user.id !== loggedInUserId && } Date: Tue, 9 Mar 2021 11:18:08 -0800 Subject: quick fix --- src/components/suggestedPeople/BadgesDropdown.tsx | 9 +++++---- src/screens/suggestedPeople/SPBody.tsx | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/screens') diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 3fcb7cbc..007ea3f5 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -12,9 +12,10 @@ interface BadgesDropdownProps { badge: UniversityBadge; img: string; }[]; + badges: UniversityBadge[]; } -const BadgesDropdown: React.FC = ({localBadges}) => { +const BadgesDropdown: React.FC = ({localBadges, badges}) => { // Used to toggle between dropdown being displayed and not const [displayBadges, setDisplayBadges] = useState(false); @@ -27,7 +28,7 @@ const BadgesDropdown: React.FC = ({localBadges}) => { // Initialize position of badges to 0 const defineBadgePositions = () => { let localTop: Animated.Value[] = []; - localBadges.forEach(() => { + badges.forEach(() => { localTop.push(new Animated.Value(0)); }); setTop(localTop); @@ -37,7 +38,7 @@ const BadgesDropdown: React.FC = ({localBadges}) => { // Displays badges dropdown by updating top [state] for every badge const animate = () => { - for (let i = 0; i < localBadges.length; i++) { + for (let i = 0; i < badges?.length; i++) { if (top) { Animated.timing(top[i], { toValue: i * 40 + 50, @@ -50,7 +51,7 @@ const BadgesDropdown: React.FC = ({localBadges}) => { // Draws back displayed badges by setting top [state] to 0 for every badge const animateBack = () => { - for (let i = 0; i < localBadges.length; i++) { + for (let i = 0; i < badges?.length; i++) { if (top) { Animated.timing(top[i], { toValue: 0, diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 89eaaa25..6572dc55 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -138,7 +138,9 @@ const SPBody: React.FC = ({ {firstItem && 'Suggested People'} - + {localBadges && ( + + )} -- cgit v1.2.3-70-g09d2