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.

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

Fix #4602, #4449: Modify the design of the chapter list in lessons tab #4621

Merged
merged 1 commit into from
Sep 24, 2022

Conversation

JishnuGoyal
Copy link
Contributor

@JishnuGoyal JishnuGoyal commented Sep 24, 2022

Explanation

Fixes #4602
Fixes #4449

In response to the revert commit in #4603, this PR aims to remove an extra resource entry whose collision with #4535 resulted in a breakdown. This PR should also close #4449.

The original PR (which should be referred to for any context on this issue) aims to change the look of the recycler view adapter items on the topic lessons tab.
Now there are different looking item view holders for completed, in-progress, locked and not-started chapter which results in a clear CTA for the users, and they are more likely to click on the correct option. Link to the UI mock: https://xd.adobe.com/view/3dca36c2-5115-419c-b25e-0f10526b077c-6899/screen/558af437-bec4-4719-8d30-291da10bbc9d/specs/

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

@JishnuGoyal
Copy link
Contributor Author

PTAL @BenHenning

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @JishnuGoyal. Everything LGTM.

@BenHenning
Copy link
Sponsor Member

FYI @rt4914 as far as I can tell this is the same as Jishnu's earlier PR that you approved, minus the duplicate color_defs entry (since that caused a breakage). Going ahead and force merging this, but please let me know if you have any concerns (feel free to do a post-merge review if you think it's necessary).

@BenHenning BenHenning merged commit dc23e47 into oppia:develop Sep 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Develop branch is broken Modify the design of the chapter list in lessons tab
2 participants