diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-02-20 13:07:36 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-02-20 13:07:36 -0500 |
| commit | 6cd1998f69a3d81c3572cb8daa403e1e747f9350 (patch) | |
| tree | 0df761a8218af318818b576a9271e1e215e22666 /src/screens | |
| parent | efbf46164a918114574c4974de9d88b8014cc770 (diff) | |
| parent | 366f95e874c4d301880b743be150442fe20099a3 (diff) | |
Merge branch 'master' into profile-preview
# Conflicts:
# src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/suggestedPeople/SuggestedPeopleScreen.tsx | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx index 175e0df7..40691eba 100644 --- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx +++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx @@ -163,13 +163,14 @@ const SuggestedPeopleScreen: React.FC = () => { <View style={styles.mainContainer}> <Text style={styles.title}>{firstItem && 'Suggested People'}</Text> <View style={styles.body}> - <View style={styles.addUserContainer}> - <View style={styles.nameInfoContainer}> - <Text style={styles.firstName}>{data.user.first_name}</Text> - <Text style={styles.username}>{'@' + data.user.username}</Text> - </View> - {/* TODO: Finish me ?! */} - {/* <TouchableOpacity + <View style={styles.marginManager}> + <View style={styles.addUserContainer}> + <View style={styles.nameInfoContainer}> + <Text style={styles.firstName}>{data.user.first_name}</Text> + <Text style={styles.username}>@{data.user.username}</Text> + </View> + {/* TODO: Finish me ?! */} + {/* <TouchableOpacity activeOpacity={0.5} // TODO: Call function to Add Friend onPress={() => console.log('Call add friend function')}> @@ -177,14 +178,18 @@ const SuggestedPeopleScreen: React.FC = () => { <Text style={styles.addButtonTitle}>{'Add Friend'}</Text> </View> </TouchableOpacity> */} + </View> </View> - {/* <TaggsBar + <TaggsBar y={y} userXId={data.user.id} profileBodyHeight={0} - screenType={ScreenType.SuggestedPeople} - /> */} - <MutualFriends user={data.user} friends={data.mutual_friends} /> + screenType={screenType} + whiteRing={true} + /> + <View style={styles.marginManager}> + <MutualFriends user={data.user} friends={data.mutual_friends} /> + </View> </View> </View> </> @@ -215,7 +220,7 @@ const SuggestedPeopleScreen: React.FC = () => { const styles = StyleSheet.create({ mainContainer: { flexDirection: 'column', - width: SCREEN_WIDTH * 0.9, + width: SCREEN_WIDTH, height: SCREEN_HEIGHT, paddingVertical: '15%', paddingBottom: '20%', |