Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Fix #339 profile screen UI #348

Merged
merged 2 commits into from
Dec 5, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/components/profile/ProfileScreenHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ const ProfileScreenHeader = ({ user, scrollAnimValue, showControls = false, conv
style={StyleSheet.absoluteFillObject}
/>

<View style={styles.headerUserInfosContainer}>
<View>
<View style={{ flexDirection: 'row', alignItems: 'center', flexWrap: 'wrap' }}>
celian-rib marked this conversation as resolved.
Show resolved Hide resolved
<Text style={{ ...Fonts.bold(25, Colors.white) }}>{user?.displayName}</Text>
<RankIcons user={user} />
</View>
<Text style={{ ...Fonts.regular(13, Colors.white) }}>@{user?.username}</Text>
</View>
{user?.pronouns !== Object.keys(PRONOUNS)[0] && (
<Text style={{ ...Fonts.regular(13, Colors.white) }}>{PRONOUNS[user?.pronouns]}</Text>
)}
</View>

<SafeAreaView style={Styles.safeAreaView}>
<Animated.View style={{ ...styles.headerControlsContainer, transform: [{ translateY: headerCancelTransform }] }}>
<TouchableOpacity onPress={() => navigation.goBack()} hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}>
Expand Down Expand Up @@ -155,18 +168,6 @@ const ProfileScreenHeader = ({ user, scrollAnimValue, showControls = false, conv
</Animated.View>
</SafeAreaView>

<View style={styles.headerUserInfosContainer}>
<View>
<View style={{ flexDirection: 'row', alignItems: 'center', flexWrap: 'wrap' }}>
<Text style={{ ...Fonts.bold(25, Colors.white) }}>{user?.displayName}</Text>
<RankIcons user={user} />
</View>
<Text style={{ ...Fonts.regular(13, Colors.white) }}>@{user?.username}</Text>
</View>
{user?.pronouns !== 'UNKOWN' && (
<Text style={{ ...Fonts.regular(13, Colors.white) }}>{PRONOUNS[user?.pronouns]}</Text>
)}
</View>
</Animated.View>
);
};
Expand Down