Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated placement of the user status icon #34795

Merged
merged 10 commits into from
Jan 29, 2024
Merged

Updated placement of the user status icon #34795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6634709
feat: updated placement of the user icon
jayeshmangwani Jan 19, 2024
21e4f6a
Merge branch 'main' into update_placement_user_status_icon
jayeshmangwani Jan 22, 2024
0f6db51
Merge branch 'main' of https://github.com/Expensify/App into update_p…
jayeshmangwani Jan 22, 2024
cb0548e
feat: changed user status stylings
jayeshmangwani Jan 23, 2024
1e17e74
Merge branch 'main' into update_placement_user_status_icon
jayeshmangwani Jan 24, 2024
ff5d520
feat: update user icon size to 20px and parent background to 40px
jayeshmangwani Jan 26, 2024
578480c
Merge branch 'main' into update_placement_user_status_icon
jayeshmangwani Jan 29, 2024
bc2b100
removed platform specific status emoji text style
jayeshmangwani Jan 29, 2024
8e0ee5e
feat: updated status emoji text font size
jayeshmangwani Jan 29, 2024
f8b09d6
removed parent View for emojiStatus
jayeshmangwani Jan 29, 2024
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
18 changes: 8 additions & 10 deletions src/pages/home/sidebar/AvatarWithOptionalStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,22 @@ function AvatarWithOptionalStatus({emojiStatus, isCreateMenuOpen}) {

return (
<View style={styles.sidebarStatusAvatarContainer}>
<PressableAvatarWithIndicator isCreateMenuOpen={isCreateMenuOpen} />
<PressableWithoutFeedback
accessibilityLabel={translate('sidebarScreen.buttonMySettings')}
role={CONST.ROLE.BUTTON}
onPress={showStatusPage}
style={styles.flex1}
style={[styles.sidebarStatusAvatar]}
>
<Tooltip text={translate('statusPage.status')}>
<View style={styles.sidebarStatusAvatar}>
<Text
style={styles.emojiStatusLHN}
numberOfLines={1}
>
{emojiStatus}
</Text>
</View>
<Text
style={styles.emojiStatusLHN}
numberOfLines={1}
>
{emojiStatus}
</Text>
</Tooltip>
</PressableWithoutFeedback>
<PressableAvatarWithIndicator isCreateMenuOpen={isCreateMenuOpen} />
</View>
);
}
Expand Down
26 changes: 15 additions & 11 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3916,26 +3916,30 @@ const styles = (theme: ThemeColors) =>
},

emojiStatusLHN: {
fontSize: 22,
fontSize: 9,
},

sidebarStatusAvatarContainer: {
height: 44,
width: 84,
height: 40,
width: 40,
backgroundColor: theme.componentBG,
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
borderRadius: 42,
paddingHorizontal: 2,
marginVertical: -2,
marginRight: -2,
justifyContent: 'center',
borderRadius: 20,
},
sidebarStatusAvatar: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: theme.border,
height: 20,
width: 20,
borderRadius: 10,
position: 'absolute',
right: -4,
bottom: -4,
borderColor: theme.highlightBG,
borderWidth: 2,
},

moneyRequestViewImage: {
...spacing.mh5,
...spacing.mv3,
Expand Down
Loading