forked from Expensify/App
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[Wave9] Progress Bar UI #64
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b17b286
Implement progress bar
mateuuszzzzz 672fce0
Merge branch 'main' into wave9/header-progress-bar
mateuuszzzzz 870ff9e
Merge branch 'main' into wave9/header-progress-bar
MaciejSWM 26db364
Render progressBar with precedence of header
MaciejSWM b24ccd3
Story for progressBar
MaciejSWM 5b5557b
Merge branch 'wave9/header-progress-bar' of https://github.com/softwa…
MaciejSWM bd95912
Missing semicolons
MaciejSWM 870e974
Drop shouldShowProgressBar
MaciejSWM 27c54b6
Merge branch 'wave9/onboarding-flow' into wave9/header-progress-bar
MaciejSWM 9960324
Fix double header rendered
MaciejSWM 2c10017
Wrap around useMemo
MaciejSWM File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,6 +58,7 @@ function HeaderWithBackButton({ | |
shouldOverlay = false, | ||
singleExecution = (func) => func, | ||
shouldNavigateToTopMostReport = false, | ||
progressBarPercentage, | ||
}: HeaderWithBackButtonProps) { | ||
const theme = useTheme(); | ||
const styles = useThemeStyles(); | ||
|
@@ -70,6 +71,33 @@ function HeaderWithBackButton({ | |
// If the icon is present, the header bar should be taller and use different font. | ||
const isCentralPaneSettings = !!icon; | ||
|
||
let middleContent = null; | ||
if (progressBarPercentage) { | ||
middleContent = ( | ||
<View> | ||
<View style={styles.progressBarWrapper}> | ||
<View style={[{width: `${progressBarPercentage}%`}, styles.progressBar]} /> | ||
</View> | ||
</View> | ||
); | ||
} else if (shouldShowAvatarWithDisplay) { | ||
middleContent = ( | ||
<AvatarWithDisplayName | ||
report={report} | ||
policy={policy} | ||
shouldEnableDetailPageNavigation={shouldEnableDetailPageNavigation} | ||
/> | ||
); | ||
} else { | ||
middleContent = ( | ||
<Header | ||
title={title} | ||
subtitle={stepCounter ? translate('stepCounter', stepCounter) : subtitle} | ||
textStyles={titleColor ? [StyleUtils.getTextColorStyle(titleColor)] : []} | ||
/> | ||
); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would consider wrapping it in |
||
|
||
return ( | ||
<View | ||
// Hover on some part of close icons will not work on Electron if dragArea is true | ||
|
@@ -118,19 +146,7 @@ function HeaderWithBackButton({ | |
additionalStyles={[styles.mr2]} | ||
/> | ||
)} | ||
{shouldShowAvatarWithDisplay ? ( | ||
<AvatarWithDisplayName | ||
report={report} | ||
policy={policy} | ||
shouldEnableDetailPageNavigation={shouldEnableDetailPageNavigation} | ||
/> | ||
) : ( | ||
<Header | ||
title={title} | ||
subtitle={stepCounter ? translate('stepCounter', stepCounter) : subtitle} | ||
textStyles={[titleColor ? StyleUtils.getTextColorStyle(titleColor) : {}, isCentralPaneSettings && styles.textHeadlineH1]} | ||
/> | ||
)} | ||
{middleContent} | ||
<View style={[styles.reportOptions, styles.flexRow, styles.pr5, styles.alignItemsCenter]}> | ||
{children} | ||
{shouldShowDownloadButton && ( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.