Fixes #3564 Merge profile progress header xml

[bkaur-bkj]

Explanation

Fixes #3564
merged portrait and landscape files of tab layout, could not merge the mobile layout files as they had some constraints and other differences too.

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
  mobile landscape before
  

mobile landscape after changes

After changes tablet portrait

After changes tablet landscape

[bkaur-bkj]

@rt4914 PTAL, as discussed I made a PR merging the 2 tab layout files but it says some conflicts I tried viewing them but got no idea how to resolve them and not understood the issue.

[bkaur-bkj]

@rt4914, I resolved the conflicts but one test is failing

[rt4914]

@bkaur-bkj As mentioned in the issue description please add before and after screenshot of mobile-portrait, mobile-landscape, tablet-portrait and tablet-landscape for comparison and make sure that there is not difference between before and after UI.

[rt4914]

@rt4914, I resolved the conflicts but one test is failing

@bkaur-bkj The test which is failing is an optional one and also it mostly is failing on develop too so don't worry about it in this PR.

[bkaur-bkj]

@rt4914 I have added ss for mobile portrait and landscape but I tried for tablet it crashes, as I tried merging the landscape and portrait layout of tablet I removed tablet landscape layout and tried running at app on tab, it was fine with portrait but crashed in landscape so I changed the folder of the file and placed the file profile_progress_header in the layout/swa600dp/ folder. But it not crases for portrait layout too.
pls let me know what change should I do

[rt4914]

@rt4914 I have added ss for mobile portrait and landscape but I tried for tablet it crashes, as I tried merging the landscape and portrait layout of tablet I removed tablet landscape layout and tried running at app on tab, it was fine with portrait but crashed in landscape so I changed the folder of the file and placed the file profile_progress_header in the layout/swa600dp/ folder. But it not crases for portrait layout too. pls let me know what change should I do

@bkaur-bkj For tablet follow these steps:

1. Uninstall the app
2. Build -> Rebuild the project.
3. Now install the app.
   Basically whenever we remove any xml file for tablet we need to uninstall the previous version and install the fresh build.

[rt4914]

@bkaur-bkj Also please merge with latest develop as there are conflicts currently.

[bkaur-bkj]

@bkaur-bkj Also please merge with latest develop as there are conflicts currently.

Yes sir Done

[bkaur-bkj]

@rt4914 I have added ss for mobile portrait and landscape but I tried for tablet it crashes, as I tried merging the landscape and portrait layout of tablet I removed tablet landscape layout and tried running at app on tab, it was fine with portrait but crashed in landscape so I changed the folder of the file and placed the file profile_progress_header in the layout/swa600dp/ folder. But it not crases for portrait layout too. pls let me know what change should I do

@bkaur-bkj For tablet follow these steps:

1. Uninstall the app
2. Build -> Rebuild the project.
3. Now install the app.
   Basically whenever we remove any xml file for tablet we need to uninstall the previous version and install the fresh build.

yes done worked now

[rt4914]

@bkaur-bkj PTAL

[rt4914]

One comment left.
@bkaur-bkj PTAL

[bkaur-bkj]

@rt4914 PTAL

[rt4914]

LGTM, thanks.