resolved issue #2542 with position of map icon

[vanshikaarora]

Removed MapIcon from right card and added it to the bottom card

Fixes #2598 Put map component in bottom sheet of upload activity

Changes made

• Modified upload_bottom_card.xml
• Removed toggle functions for right card layout
• Accordingly modified UploadActivity.java, UploadPresenter.java, UploadView.java

[codecov-io]

Codecov Report

Merging #2601 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #2601      +/-   ##
=========================================
- Coverage     2.7%   2.69%   -0.01%     
=========================================
  Files         258     258              
  Lines       12283   12311      +28     
  Branches     1113    1116       +3     
=========================================
  Hits          332     332              
- Misses      11925   11953      +28     
  Partials       26      26

Impacted Files	Coverage Δ
...va/fr/free/nrw/commons/upload/UploadPresenter.java	11.17% <ø> (+0.24%)	⬆️
...ava/fr/free/nrw/commons/upload/UploadActivity.java	0% <0%> (ø)	⬆️
...mmons/contributions/ContributionsListFragment.java	0% <0%> (ø)	⬆️
...mons/explore/recentsearches/RecentSearchesDao.java	0% <0%> (ø)	⬆️
...ava/fr/free/nrw/commons/nearby/NearbyFragment.java	0% <0%> (ø)	⬆️
...w/commons/contributions/ContributionsFragment.java	0% <0%> (ø)	⬆️
...explore/recentsearches/RecentSearchesFragment.java	0% <0%> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 44c18ac...1a7d138. Read the comment docs.

[vanshikaarora]

@maskaravivek @nicolas-raoul @ujjwalagrawal17 The PR is complete and up for review. Can you please review :)

[domdomegg]

Please can you remove the commented code - if we do need it later we can always go back into version control.

[maskaravivek]

@vanshikaarora Can you attach a screenshot?

[maskaravivek]

@vanshikaarora Can you resolve the merge conflicts?

[vanshikaarora]

Sure @maskaravivek :) I just made the changes and the PR is ready for review :)

[vanshikaarora]

@vanshikaarora Can you resolve the merge conflicts?

@maskaravivek I have resolved the merge conflicts Kindly review :)

[vanshikaarora]

@vanshikaarora Can you attach a screenshot?

@maskaravivek here is a screenshot for the current position of map icon

[vanshikaarora]

Thanks for approving the PR @maskaravivek :)