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

fix: Update Wallet and Generic Folder empty state to use lottie animations. #48040

Merged
merged 27 commits into from
Sep 20, 2024
Merged

fix: Update Wallet and Generic Folder empty state to use lottie animations. #48040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c49cd8f
fix: Update Wallet and Generic Folder empty state to use lottie anima…
Krishna2323 Aug 27, 2024
8708b2e
fix IOURequestStepCategory empty state.
Krishna2323 Aug 27, 2024
795eb09
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Aug 29, 2024
38a4e54
remove redundant code.
Krishna2323 Aug 29, 2024
6616c56
update GenericEmptyState.lottie file.
Krishna2323 Aug 29, 2024
168fb04
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Sep 1, 2024
c1aef41
styling fixes.
Krishna2323 Sep 1, 2024
4741b8c
minor fix.
Krishna2323 Sep 4, 2024
624fe06
Merge branch 'main' into krishna2323/issue/48013
Krishna2323 Sep 4, 2024
d37d786
revert changes in IOURequestStepCategory.
Krishna2323 Sep 9, 2024
a1a507f
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Sep 9, 2024
038c6e8
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Sep 10, 2024
71003f4
update empty state illustration categories page.
Krishna2323 Sep 10, 2024
d8aa227
fix stylings on native.
Krishna2323 Sep 10, 2024
229b8e3
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Sep 13, 2024
33dd33b
fix: empty folder animation size.
Krishna2323 Sep 13, 2024
5c13a44
fix alignments.
Krishna2323 Sep 13, 2024
36fb0b4
update lottie file.
Krishna2323 Sep 13, 2024
26bf428
Merge branch 'main' into krishna2323/issue/48013
Krishna2323 Sep 18, 2024
76e7cbb
align animation centre.
Krishna2323 Sep 18, 2024
b9f96d3
add minWidth for empty folder animation.
Krishna2323 Sep 18, 2024
46ca8c7
fix folder animation on other pages.
Krishna2323 Sep 18, 2024
975164b
fix animation width.
Krishna2323 Sep 19, 2024
857a8c5
Merge branch 'Expensify:main' into krishna2323/issue/48013
Krishna2323 Sep 19, 2024
7bf97fa
minor update.
Krishna2323 Sep 19, 2024
3dda855
fix animation width for native devices.
Krishna2323 Sep 19, 2024
115b2fc
minor changes & cleanup.
Krishna2323 Sep 19, 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
5 changes: 2 additions & 3 deletions src/pages/Search/EmptySearchView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ function EmptySearchView({type}: EmptySearchViewProps) {
subtitle: translate('search.searchResults.emptyResults.subtitle'),
buttonText: undefined,
buttonAction: undefined,
lottieWebViewStyles: {...styles.w100, minWidth: 300},
};
}
}, [type, StyleUtils, translate, theme, styles.w100]);
Expand All @@ -53,13 +52,13 @@ function EmptySearchView({type}: EmptySearchViewProps) {
SkeletonComponent={SearchRowSkeleton}
headerMediaType={CONST.EMPTY_STATE_MEDIA.ANIMATION}
headerMedia={content.headerMedia}
headerStyles={[content.headerStyles, styles.emptyStateCardIllustrationContainer, styles.alignItemsCenter, styles.mvAuto]}
headerStyles={[content.headerStyles, styles.emptyStateCardIllustrationContainer]}
title={content.title}
subtitle={content.subtitle}
buttonText={content.buttonText}
buttonAction={content.buttonAction}
headerContentStyles={[styles.h100, styles.w100]}
lottieWebViewStyles={{...content.lottieWebViewStyles, ...styles.mtAuto, ...styles.mbAuto, ...styles.alignItemsCenter, ...styles.dFlex}}
lottieWebViewStyles={styles.emptyStateFolderWebStyles}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
headerMedia={LottieAnimations.GenericEmptyState}
title={translate('workspace.categories.emptyCategories.title')}
subtitle={translate('workspace.categories.emptyCategories.subtitle')}
headerStyles={[styles.emptyStateCardIllustrationContainer, styles.alignItemsCenter, styles.mvAuto, styles.emptyFolderBG]}
headerStyles={[styles.emptyStateCardIllustrationContainer, styles.emptyFolderBG]}
lottieWebViewStyles={styles.emptyStateFolderWebStyles}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/tags/WorkspaceTagsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
headerMedia={LottieAnimations.GenericEmptyState}
title={translate('workspace.tags.emptyTags.title')}
subtitle={translate('workspace.tags.emptyTags.subtitle')}
headerStyles={[styles.emptyStateCardIllustrationContainer, styles.alignItemsCenter, styles.mvAuto, styles.emptyFolderBG]}
headerStyles={[styles.emptyStateCardIllustrationContainer, styles.emptyFolderBG]}
lottieWebViewStyles={styles.emptyStateFolderWebStyles}
/>
)}
Expand Down
5 changes: 4 additions & 1 deletion src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5075,6 +5075,8 @@ const styles = (theme: ThemeColors) =>

emptyStateCardIllustrationContainer: {
height: 220,
...flex.alignItemsCenter,
...flex.justifyContentCenter,
},

emptyStateCardIllustration: {
Expand Down Expand Up @@ -5168,10 +5170,11 @@ const styles = (theme: ThemeColors) =>

emptyStateFolderWebStyles: {
...sizing.w100,
minWidth: 300,
minWidth: 400,
Copy link
Contributor

@hungvu193 hungvu193 Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Krishna2323 Friendly reminder that you need to make sure you test this one on smaller device like iPhone8 or iPhoneSE

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, thanks for the reminder. I tested on the web by resizing, but I still need to test on all platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hungvu193, tested on all platforms. I think you start reviewing now.

Monosnap.screencast.2024-09-20.04-45-12.mp4

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks man! Appreciate it, I'll give it a final review today!

...spacing.mtAuto,
...spacing.mbAuto,
...flex.alignItemsCenter,
...flex.justifyContentCenter,
...display.dFlex,
},

Expand Down
Loading