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 #4343: Fixes Explorations hints being numbered randomly #4630

Merged
merged 21 commits into from
Oct 10, 2022
Merged

Fix #4343: Fixes Explorations hints being numbered randomly #4630

merged 21 commits into from
Oct 10, 2022

Conversation

Ryggs
Copy link
Contributor

@Ryggs Ryggs commented Sep 28, 2022 •
edited by BenHenning

Explanation

Fixes #4343

This PR fixes the explorations hints being numbered randomly by using the hint list item index to correctly label the hint title. It does this by calculating the sum of the hint index and 1, and setting the hint title via data binding and the ViewModel.

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

DEMO

Before After
https://user-images.githubusercontent.com/31986629/192792002-da8bdaac-266d-42f5-b243-e7fb566e55cf.mp4 https://user-images.githubusercontent.com/31986629/192792098-cf0d1a79-cbbc-4a45-9330-8fe586c68be2.mp4

BenHenning
BenHenning reviewed Oct 1, 2022
View reviewed changes
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 @Ryggs. I think the approach is sound, we mainly just need tests to wrap this up (though I had a few other thoughts as well).

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/translation/AppLanguageResourceHandler.kt Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/translation/AppLanguageResourceHandler.kt Outdated Show resolved Hide resolved
.../main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt Outdated Show resolved Hide resolved
.../main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt Outdated Show resolved Hide resolved
.../main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt Outdated Show resolved Hide resolved
.../main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned Ryggs and unassigned BenHenning Oct 1, 2022
@Ryggs Ryggs assigned BenHenning and unassigned Ryggs Oct 3, 2022
@Ryggs Ryggs requested a review from BenHenning October 3, 2022 18:11
BenHenning
BenHenning requested changes Oct 4, 2022
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment •
edited

Choose a reason for hiding this comment

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

Thanks @Ryggs! Should this PR be moved to be fully in review, now? It seems like it's actually rather close to code completion.

Some PR-level comments:

  • Please add before & after screenshots in addition to your videos (these are a bit easier to quickly consume for readers of the PR).
  • Please fix the failing CI checks.
  • Please update the PR description to specifically call out the issue being fixed (see my merged PRs for a reference).
  • Please update the PR title to include correct formatting & spacing (see my merged PRs for a reference).

app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt Show resolved Hide resolved
app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt Outdated Show resolved Hide resolved
utility/src/test/java/org/oppia/android/util/locale/DisplayLocaleImplTest.kt Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned Ryggs and unassigned BenHenning Oct 4, 2022
@Ryggs Ryggs changed the title Fix#4343 : Explorations hints numbered randomly Fix #4343: Explorations hints numbered randomly Oct 4, 2022
@Ryggs
Copy link
Contributor Author

Ryggs commented Oct 4, 2022 •
edited

Thanks @Ryggs! Should this PR be moved to be fully in review, now? It seems like it's actually rather close to code completion.

Some PR-level comments:

  • Please add before & after screenshots in addition to your videos (these are a bit easier to quickly consume for readers of the PR).
  • Please fix the failing CI checks.
  • Please update the PR description to specifically call out the issue being fixed (see my merged PRs for a reference).
  • Please update the PR title to include correct formatting & spacing (see my merged PRs for a reference).

Sure, working on this ASAP
Some CI checks are passing, and others arent, as described in the comments above.

@Ryggs Ryggs changed the title Fix #4343: Explorations hints numbered randomly Fix #4343: Fixes Explorations hints being numbered randomly Oct 4, 2022
@Ryggs Ryggs marked this pull request as ready for review October 4, 2022 13:59
@Ryggs Ryggs removed their assignment Oct 5, 2022
BenHenning
BenHenning reviewed Oct 6, 2022
View reviewed changes
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 @Ryggs. Just had a few follow-ups--PTAL.

app/src/test/java/org/oppia/android/app/translation/AppLanguageResourceHandlerTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt Show resolved Hide resolved
@BenHenning BenHenning assigned Ryggs and unassigned BenHenning Oct 6, 2022
@Ryggs Ryggs assigned BenHenning and Ryggs and unassigned Ryggs and BenHenning Oct 6, 2022
@Ryggs Ryggs assigned Ryggs and unassigned BenHenning Oct 10, 2022
@Ryggs Ryggs assigned BenHenning and unassigned Ryggs Oct 10, 2022
BenHenning
BenHenning approved these changes Oct 10, 2022
View reviewed changes
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 @Ryggs! This LGTM.

@BenHenning BenHenning merged commit 18814f5 into oppia:develop Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenHenning BenHenning BenHenning approved these changes

Assignees

@BenHenning BenHenning

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

For few of the questions in explorations the hints provided are numbered randomly
3 participants
@Ryggs @BenHenning @ma-za-kpe