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

Fixes #3569 Merged promoted_story_list.xml files #4083

Merged
merged 3 commits into from
Jan 17, 2022

Conversation

mukulasija
Copy link
Contributor

@mukulasija mukulasija commented Jan 7, 2022

Fixes #3569 Merged 4 promoted_story_list.xml files into single xml file

mpo

mpn

mlo

mln

ppo

ppn

plo

pln

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

@mukulasija mukulasija changed the title Merged promoted_story_list.xml files Fixes #3569 Merged promoted_story_list.xml files Jan 7, 2022
@mukulasija
Copy link
Contributor Author

@rishidyno PTAL

@rishidyno
Copy link
Contributor

LGTM @mukulasija.

@rishidyno rishidyno assigned rt4914 and unassigned rishidyno Jan 7, 2022
@rt4914
Copy link
Contributor

rt4914 commented Jan 7, 2022

LGTM @mukulasija.

Thanks @rishidyno for reviewing this.

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.

@mukulasija Thanks. PTAL at comments.

@rt4914 rt4914 assigned mukulasija and unassigned rt4914 Jan 7, 2022
@oppiabot
Copy link

oppiabot bot commented Jan 15, 2022

Hi @mukulasija, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 15, 2022
@Arjupta
Copy link
Contributor

Arjupta commented Jan 15, 2022

@mukulasija always remeber to ask for a review if you have replied with a question to any comments so that the reviewer can answer them.

@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 15, 2022
@Arjupta Arjupta assigned rt4914 and unassigned mukulasija Jan 15, 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 ed89131 into oppia:develop Jan 17, 2022
bhaktideshmukh pushed a commit to bhaktideshmukh/oppia-android that referenced this pull request Jan 25, 2022
* merged promoted-story-list files into single xml file

* added style attribute to text views as suggested
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 promoted_story_list.xml into single xml file
4 participants