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 #3818 : Expand and collapse story when launched from Recently Played #3872

Merged
merged 7 commits into from
Oct 5, 2021
Merged

Fix #3818 : Expand and collapse story when launched from Recently Played #3872

merged 7 commits into from
Oct 5, 2021

Conversation

darkmat13r
Copy link
Contributor

@darkmat13r darkmat13r commented Oct 2, 2021 •
edited

Explanation

Fixed the collapse and expand functionality when story played from Recently Played from home screen.

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

Before:

before.issue.mp4

After:

issue_collapse.mp4

Portrait Mode:

landscape.mp4

@darkmat13r
Merge remote-tracking branch 'upstream/develop' into fix-toggle-in-re…
2e02d8c 
…cently-played-story

# Conflicts:
#	app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt
@darkmat13r
Copy link
Contributor Author

@rt4914 PTAL

@oppiabot oppiabot bot assigned rt4914 Oct 2, 2021
rt4914
rt4914 suggested changes Oct 3, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

Thanks @darkmat13r . One nit change suggested.

app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned darkmat13r and unassigned rt4914 Oct 3, 2021
@rt4914 rt4914 assigned rt4914 and unassigned darkmat13r Oct 5, 2021
rt4914
rt4914 approved these changes Oct 5, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@rt4914 rt4914 merged commit 6952716 into oppia:develop Oct 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

Assignees

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@darkmat13r @rt4914