Skip to content

Issue/13268 activity type empty view#13707

Merged
zwarm merged 7 commits intodevelopfrom
issue/13268-activity-type-empty-view
Jan 6, 2021
Merged

Issue/13268 activity type empty view#13707
zwarm merged 7 commits intodevelopfrom
issue/13268-activity-type-empty-view

Conversation

@malinajirka
Copy link
Copy Markdown
Contributor

@malinajirka malinajirka commented Jan 5, 2021 •
edited
Loading

Parent issue #13268

  • Introduces "NoActivities" error state on Activity Log Type filter screen
  • Updates message on Activity Log empty screen so it's more generic
  • Replaces "rewind" with "restore" in user facing strings

To test:

  1. Enable "ActivityLogFiltersFeatureConfig"
  2. Turn on airplane mode
  3. Open Activity Log
  4. Click on "Activity Type" filter
  5. Notice "No connection", "Please check your internet connection and retry."
  6. Turn off airplane mode
  7. Click on "Retry" and notice content is shown
  8. Go back to activity log
  9. Select a date range for which there are no activities (eg. 1-2 October 2020)
  10. Notice "No matching events found", "Try adjusting your date range or activity type filters."
  11. Click on "Activity Type" filter
  12. Notice "No activities available", "No activities recorded in the selected date range."

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@malinajirka malinajirka added this to the 16.5 milestone Jan 5, 2021
@malinajirka malinajirka requested a review from zwarm January 5, 2021 11:45
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 5, 2021 •
edited
Loading

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

malinajirka
malinajirka commented Jan 5, 2021
View reviewed changes
.../main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterFragment.kt
uiHelpers.setTextOrHide(actionable_empty_view.subtitle, uiState.errorSubtitle)
uiHelpers.setTextOrHide(actionable_empty_view.button, uiState.errorButtonText)
actionable_empty_view.button.setOnClickListener { uiState.retryAction.action.invoke() }
actionable_empty_view.image.setImageResource(uiState.image)
Copy link
Copy Markdown
Contributor Author

@malinajirka malinajirka Jan 5, 2021

Choose a reason for hiding this comment

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

I didn't use ImageManager here since it was resizing the image to fullscreen and I didn't want to spent time on it. Any tips are welcome.

Copy link
Copy Markdown
Contributor

@zwarm zwarm Jan 5, 2021

Choose a reason for hiding this comment

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

I will be facing a similar issue with using image manager, but haven't given it any thought yet - probably next week.

@malinajirka malinajirka force-pushed the issue/13268-activity-type-empty-view branch from 6fe09cf to a325c5a Compare January 5, 2021 11:48
@malinajirka malinajirka mentioned this pull request Jan 5, 2021
Closed
31 tasks
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 5, 2021 •
edited
Loading

You can test the changes on this Pull Request by downloading the APK here.

zwarm
zwarm approved these changes Jan 5, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@zwarm zwarm left a comment

Choose a reason for hiding this comment

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

All looks good - error pages are shown as expected.
I left one tiny nit-pick, so go ahead and merge after your read it.
👍

@malinajirka
Add @DrawableRes annotation
931c81b
@malinajirka
Merge branch 'develop' into issue/13268-activity-type-empty-view
8de8fac 
# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModel.kt
@malinajirka
Copy link
Copy Markdown
Contributor Author

malinajirka commented Jan 6, 2021 •
edited
Loading

Thanks for the review @zwarm! I've fixed the merge conflict and replied to your comment. Let me know which solution you prefer.

@malinajirka malinajirka requested a review from zwarm January 6, 2021 09:39
@zwarm zwarm merged commit 9c77c1e into develop Jan 6, 2021
@zwarm zwarm deleted the issue/13268-activity-type-empty-view branch January 6, 2021 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zwarm zwarm Awaiting requested review from zwarm

Assignees

@zwarm zwarm

@malinajirka malinajirka

Labels

Activity Log

Projects

None yet

Milestone

16.5

Development

Successfully merging this pull request may close these issues.

2 participants

@malinajirka @zwarm