Fix # 3581 Merge topic_lessons_story_summary.xml #4234

shankarpriyank · 2022-03-07T12:56:27Z

Explanation

Merged 2 files of topic_summary.xml
Fixes Merge topic_lessons_story_summary.xml into single xml file #3581

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

shankarpriyank · 2022-03-07T13:41:38Z

PTAL @bkaur-bkj

shankarpriyank · 2022-03-08T09:15:12Z

PTAL @rt4914

bkaur-bkj · 2022-03-09T06:29:06Z

app/src/main/res/values-sw600dp-port/dimens.xml

+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
+
+  <!--TopicLessonsSummary-->


@shankarpriyank write this as  do this for all dimen files

bkaur-bkj · 2022-03-09T06:32:43Z

app/src/main/res/values-sw600dp-land/dimens.xml

+  <!-- OptionAudioLanguage -->
+  <dimen name="option_audio_language_padding_start">16dp</dimen>
+  <dimen name="option_audio_language_padding_end">16dp</dimen>
+


@shankarpriyank also this part is maybe copied by you by mistake as you are not using this OptionAudiolanguage dimens anywhere in your files

Sorry, I guess this happened while resolving the merge conflicts, I will make fix it

Actually this looks a bit weird , my pr which was merged #4220 , I added the dimens for the OptionAudioLanguage in both the dimen files for the tablet , but right now in the develop branch I can't see them , they were deleted in the last commit through this pr #4226 , I skimmed through it once I feel maybe these values may have been deleted by mistake in that commit

@shankarpriyank I actually don't think that there would have been such a big mistake in any other PR else it would not have been merged. I think you should just update your code to develop and keep only the changes required for this PR. PTAL @rt4914

okay, @bkaur-bkj its updated now

shankarpriyank · 2022-03-09T08:11:39Z

PTAL @bkaur-bkj

oppiabot · 2022-03-09T08:14:42Z

Unassigning @shankarpriyank since a re-review was requested. @shankarpriyank, please make sure you have addressed all review comments. Thanks!

shankarpriyank · 2022-03-17T04:36:02Z

Hi @bhaktideshmukh I have resolved the issues as requested by Rajat, but I am having a hard time resolving the merge conflict as it says

And even when I pushed commits in the branch it did not ask me to resolve the conflicts

bhaktideshmukh · 2022-03-17T12:37:22Z

Hi @bhaktideshmukh I have resolved the issues as requested by Rajat, but I am having a hard time resolving the merge conflict as it says And even when I pushed commits in the branch it did not ask me to resolve the conflicts

Please refer to my reply in another of your PR which had similar conflicts.

rt4914

LGTM. Just need to resolve merge conflicts and it should be ready to merge.

oppiabot · 2022-03-24T14:11:32Z

Assigning @bkaur-bkj for code owner reviews. Thanks!

bhaktideshmukh · 2022-03-28T09:45:58Z

@shankarpriyank
Follow this documentation:-- link to solve the merge conflicts for this branch.
Thanks.

shankarpriyank · 2022-03-29T18:34:04Z

PTAL @bkaur-bkj

shankarpriyank · 2022-03-29T18:34:27Z

LGTM. Just need to resolve merge conflicts and it should be ready to merge.

@rt4914 Done

oppiabot · 2022-03-29T18:37:08Z

Unassigning @shankarpriyank since a re-review was requested. @shankarpriyank, please make sure you have addressed all review comments. Thanks!

shankarpriyank · 2022-03-29T18:53:16Z

PTAL @bhaktideshmukh

bhaktideshmukh · 2022-03-30T01:25:26Z

PTAL @bhaktideshmukh

LGTM
Thanks for the contribution @shankarpriyank.

shankarpriyank · 2022-03-31T10:17:11Z

PTAL @rt4914

oppiabot · 2022-04-07T11:24:07Z

Hi @shankarpriyank, 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!

rt4914

LGTM. Just merge with latest develop and it should be ready to merge.

shankarpriyank · 2022-04-13T08:53:18Z

LGTM. Just merge with latest develop and it should be ready to merge.

@rt4914 Done

oppiabot · 2022-04-20T08:54:20Z

Hi @shankarpriyank, 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 · 2022-05-04T05:01:07Z

Hi @shankarpriyank, 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!

Optimised the layout files

07dc666

shankarpriyank requested a review from rt4914 as a code owner March 7, 2022 12:56

shankarpriyank changed the title ~~Optimised the layout files~~ Fix # 3581 Merged two files of topic_lessons_story_summary.xml Mar 8, 2022

shankarpriyank changed the title ~~Fix # 3581 Merged two files of topic_lessons_story_summary.xml~~ Fix # 3581 Merge topic_lessons_story_summary.xml Mar 8, 2022

Merge branch 'develop' into fix_topic_summary

609c09a

oppiabot bot assigned rt4914 Mar 8, 2022

bkaur-bkj suggested changes Mar 9, 2022

View reviewed changes

bkaur-bkj assigned shankarpriyank and unassigned rt4914 Mar 9, 2022

bkaur-bkj suggested changes Mar 9, 2022

View reviewed changes

Added space

15754e5

shankarpriyank requested a review from bkaur-bkj March 9, 2022 08:11

oppiabot bot unassigned shankarpriyank Mar 9, 2022

shankarpriyank and others added 2 commits March 10, 2022 12:32

Merge branch 'oppia:develop' into fix_topic_summary

92ab29a

Remmoved Extra dimens

806030b

rt4914 self-assigned this Mar 18, 2022

rt4914 approved these changes Mar 24, 2022

View reviewed changes

rt4914 assigned shankarpriyank and bhaktideshmukh and unassigned rt4914 Mar 24, 2022

oppiabot bot assigned bkaur-bkj Mar 24, 2022

bhaktideshmukh removed their assignment Mar 28, 2022

Merge branch 'develop' into fix_topic_summary

d970586

oppiabot bot unassigned shankarpriyank Mar 29, 2022

oppiabot bot assigned bhaktideshmukh Mar 29, 2022

bhaktideshmukh removed their assignment Mar 30, 2022

oppiabot bot assigned rt4914 Mar 31, 2022

shankarpriyank requested a review from rt4914 March 31, 2022 10:49

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 7, 2022

rt4914 approved these changes Apr 12, 2022

View reviewed changes

oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 12, 2022

rt4914 assigned shankarpriyank and unassigned rt4914 Apr 12, 2022

Merge branch 'develop' into fix_topic_summary

ae93ab1

shankarpriyank requested a review from rt4914 April 13, 2022 08:52

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 20, 2022

rt4914 assigned rt4914 and unassigned bkaur-bkj and shankarpriyank Apr 27, 2022

oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Apr 27, 2022

oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 4, 2022

rt4914 merged commit bde9242 into oppia:develop May 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix # 3581 Merge topic_lessons_story_summary.xml #4234

Fix # 3581 Merge topic_lessons_story_summary.xml #4234

shankarpriyank commented Mar 7, 2022 •

edited

shankarpriyank commented Mar 7, 2022

shankarpriyank commented Mar 8, 2022

bkaur-bkj Mar 9, 2022

shankarpriyank Mar 9, 2022

bkaur-bkj Mar 9, 2022

shankarpriyank Mar 9, 2022

shankarpriyank Mar 9, 2022

bkaur-bkj Mar 10, 2022

shankarpriyank Mar 10, 2022 •

edited

shankarpriyank commented Mar 9, 2022

oppiabot bot commented Mar 9, 2022

shankarpriyank commented Mar 17, 2022

bhaktideshmukh commented Mar 17, 2022

rt4914 left a comment

oppiabot bot commented Mar 24, 2022

bhaktideshmukh commented Mar 28, 2022

shankarpriyank commented Mar 29, 2022

shankarpriyank commented Mar 29, 2022

oppiabot bot commented Mar 29, 2022

shankarpriyank commented Mar 29, 2022

bhaktideshmukh commented Mar 30, 2022

shankarpriyank commented Mar 31, 2022

oppiabot bot commented Apr 7, 2022

rt4914 left a comment

shankarpriyank commented Apr 13, 2022

oppiabot bot commented Apr 20, 2022

oppiabot bot commented May 4, 2022

Fix # 3581 Merge topic_lessons_story_summary.xml #4234

Fix # 3581 Merge topic_lessons_story_summary.xml #4234

Conversation

shankarpriyank commented Mar 7, 2022 • edited

Explanation

Essential Checklist

For UI-specific PRs only

shankarpriyank commented Mar 7, 2022

shankarpriyank commented Mar 8, 2022

bkaur-bkj Mar 9, 2022

Choose a reason for hiding this comment

shankarpriyank Mar 9, 2022

Choose a reason for hiding this comment

bkaur-bkj Mar 9, 2022

Choose a reason for hiding this comment

shankarpriyank Mar 9, 2022

Choose a reason for hiding this comment

shankarpriyank Mar 9, 2022

Choose a reason for hiding this comment

bkaur-bkj Mar 10, 2022

Choose a reason for hiding this comment

shankarpriyank Mar 10, 2022 • edited

Choose a reason for hiding this comment

shankarpriyank commented Mar 9, 2022

oppiabot bot commented Mar 9, 2022

shankarpriyank commented Mar 17, 2022

bhaktideshmukh commented Mar 17, 2022

rt4914 left a comment

Choose a reason for hiding this comment

oppiabot bot commented Mar 24, 2022

bhaktideshmukh commented Mar 28, 2022

shankarpriyank commented Mar 29, 2022

shankarpriyank commented Mar 29, 2022

oppiabot bot commented Mar 29, 2022

shankarpriyank commented Mar 29, 2022

bhaktideshmukh commented Mar 30, 2022

shankarpriyank commented Mar 31, 2022

oppiabot bot commented Apr 7, 2022

rt4914 left a comment

Choose a reason for hiding this comment

shankarpriyank commented Apr 13, 2022

oppiabot bot commented Apr 20, 2022

oppiabot bot commented May 4, 2022

shankarpriyank commented Mar 7, 2022 •

edited

shankarpriyank Mar 10, 2022 •

edited