-
Notifications
You must be signed in to change notification settings - Fork 529
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 #4648: Fix topic lesson differentiation between locked, completed and in-progress lessons #4958
Fix #4648: Fix topic lesson differentiation between locked, completed and in-progress lessons #4958
Conversation
…fferentiating between locked, completed and in-progress lessons
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.
Thanks @kkmurerwa! This seems like a really sensible solution. Had a few follow-up suggestions--PTAL.
app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
Show resolved
Hide resolved
- Add a string for chapter locked state with no previous chapter title - Add a default state for chapter locked with no previous chapter title - Add a test for the new behaviour
Hey @BenHenning. I have addressed your comments and added screenshots of the failing and passing test. You should be able to do another review. PTAL. |
Hey @BenHenning. I have temporarily reassigned myself the issue. There are a few more changes I am working on to improve accessibility. |
Hey @BenHenning. Here are a few changes I have made with commit ID 8d497a2.
Here is a screenshot of the failing tests when I return a dummy string. Here is a screenshot of the passing tests when the original logic is reinstated. The tests on the CI failed for some reason but they all pass locallly. The failing test requires a rerun to pass. |
Apologies @kkmurerwa will need to look at this tomorrow. |
No problem at all Ben. |
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.
Thanks @kkmurerwa! PR LGTM, just had small nits--PTAL. Also, the branch will need to be brought up-to-date with the latest develop so that we can merge it.
app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
Show resolved
Hide resolved
Hey @BenHenning. The issues mentioned have been resolved. The PR should now be ready for a merge unless there are some other issues. |
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.
Thanks @kkmurerwa! Apologies for the delayed review. This LGTM!
Explanation
Fix #4648: When this PR is merged, it will fix the issue of locked, completed and in progress lessons not being differentiated by Talkback.
Essential Checklist
For UI-specific PRs only
If your PR includes UI-related changes, then: