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 #4605

Closed

Conversation

JishnuGoyal
Copy link
Contributor

@JishnuGoyal JishnuGoyal commented Sep 22, 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 the original PR 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
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. I needed to re-run one workflow due to a timeout, so waiting to see if that passes.

Otherwise, the PR LGTM for code, but for the description and title can you please:

  • Make sure to use the original title, but update it to include both issues being fixed
  • Make sure to use the original description, but include a new part where you mention the regression & what was specifically changed compared to the original PR (which should be linked) to make it clear what was fixed?

@BenHenning BenHenning assigned JishnuGoyal and unassigned BenHenning Sep 22, 2022
@JishnuGoyal JishnuGoyal changed the title Fix #4602: Develop branch is broken Fix #4602, #4449: Modify the design of the chapter list in lessons tab Sep 22, 2022
@JishnuGoyal
Copy link
Contributor Author

Thanks, @BenHenning. PTAL and let me know if further context should be added.

@oppiabot oppiabot bot assigned BenHenning and unassigned JishnuGoyal Sep 22, 2022
@oppiabot
Copy link

oppiabot bot commented Sep 22, 2022

Unassigning @JishnuGoyal since a re-review was requested. @JishnuGoyal, please make sure you have addressed all review comments. Thanks!

@BenHenning BenHenning assigned JishnuGoyal and unassigned BenHenning Sep 22, 2022
@JishnuGoyal
Copy link
Contributor Author

@BenHenning could this be merged? PTAL, thanks!

@BenHenning
Copy link
Member

As mentioned over chat, please update the PR to properly include the changes and assign back @JishnuGoyal.

@BenHenning BenHenning assigned JishnuGoyal and unassigned BenHenning Sep 24, 2022
@JishnuGoyal
Copy link
Contributor Author

I'm closing this PR since this has undergone a lot of changes and reversion attempts, and is only going to be difficult to review.
Opening #4621.

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