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 #3544: Merge ongoing_story_card.xml into single xml file #4145

Merged
merged 2 commits into from
Feb 2, 2022
Merged

Fix #3544: Merge ongoing_story_card.xml into single xml file #4145

merged 2 commits into from
Feb 2, 2022

Conversation

xpandeyed
Copy link
Contributor

@xpandeyed xpandeyed commented Jan 31, 2022

Explanation

Fix #3544: Merge ongoing_story_card.xml into single xml file

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 After
Screenshot_2022-01-31-22-55-44-269_org oppia android Screenshot_2022-01-31-23-28-01-712_org oppia android
Screenshot_2022-01-31-22-57-55-290_org oppia android Screenshot_2022-01-31-23-28-33-263_org oppia android
1 2
11 12

@rishidyno
Copy link
Contributor

@xpandeyed Please add the SS in a Tabular form. Thanks!

@xpandeyed
Copy link
Contributor Author

@rt4914 Please approve the workflows. Thanks!

@rt4914 rt4914 self-assigned this Feb 1, 2022
@rt4914 rt4914 assigned rishidyno and unassigned rt4914 Feb 2, 2022
@rt4914
Copy link
Contributor

rt4914 commented Feb 2, 2022

Will review it once @rishidyno has approved it.

@rishidyno
Copy link
Contributor

LGTM.

@rishidyno rishidyno assigned rt4914 and unassigned rishidyno Feb 2, 2022
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 0f03c49 into oppia:develop Feb 2, 2022
@xpandeyed xpandeyed deleted the merging-ongoing-story-card branch February 2, 2022 12:09
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.

Merge ongoing_story_card.xml into single xml file
3 participants