Structured data (commons-app#3695)

* commons-app#3222 Merge master into Structured Data branch, fix conflicts (commons-app#3447)

* [WIP] Fixes commons-app#2942. Set 'depicts' automatically for images uploaded via 'Nearby'

* Feature/refractor uploads [WIP] (commons-app#2887)

* Fix duplicate param information (commons-app#2515)

* Bug fix issue commons-app#2476 (commons-app#2526)

* Added wikidataEntityID in all db versions, handled db.execSql via method runQuery

* Versioning and changelog for v2.10.2 (commons-app#2531)

* Update changelog.md

* Versioning for v2.10.2

* Update changelog.md

* Bugfix/issue 2580 (commons-app#2584)

* Corrected string placedholders in certain string files

* Corrected string placedholders in certain string files[Bug fix commons-app#2580]

* Bug Fix commons-app#2585 (commons-app#2647)

* Bug Fix commons-app#2585
* Added null checks on view in SearchImageFragment when updating views from external sources
* Disposed the disposables in SearchActivity and SearchImageFragment when no longer in active lifecycle

* use FragmentUtils to verify fragment active state

* Bug Fix issue commons-app#2648 (commons-app#2678)

* Bug Fix issue commons-app#2648
* Handled external storage permission before file download

* * Removed redudant check for permission in MediaDetailPagerFragment (Dexter already does that)
* Removed duplicate code in PermissionUtil$checkPermissionsAndPerformAction, used the existing function with conditional extra parameters

* string name typo correction

* BugFix issue commons-app#2652 (commons-app#2706)

* Addded null check on bookmark before operating on it

* BugFix issue commons-app#2711 (commons-app#2712)

* Added null checks in OkHttpJsonApiClient$searchImages MwQueryResponse

* BugFix commons-app#2718 (commons-app#2719)

* Handled null auth cookies

* Fix commons-app#2791: NPE when nominating for deletion and leaving screen (commons-app#2792)

* Bug Fix issue commons-app#2789 (commons-app#2790)

* Handled Illegal State Exception for non existent appropriate view parents in ViewUtils$showShortSnackbar

* BugFix commons-app#2720 (commons-app#2831)

BugFix deprecated licenes commons-app#2720

* ui fixes, wip, upload

* *Issue commons-app#2886, BugFix commons-app#2832[wip]
* updated UploadActivity code
* modified ui
* Updated UploadPresenterTest

* * updated interfaces names to follow names suffixed with Contract
* added test cases

* card view elevation

* view pager disabled swipe

* bug fix, duplicate image

* used existing non-swipable view pager

* Avoid image view resize with keyboard, added adjustPan and stateVisible as softinputMode for UploadActivity

* retain UploadBaseFragment instances on orientation changes

* * Added test cases for UploadMediaPresenter
* Injected io and main thread schedulers

* categories presenter test cased wip

* Added CategoriesPresenter test

* * Added the logic to show open map (with to be uploaded image's coordinates while uploading image)

* codacy suggested changes * added java docs

* Added travis_wait fot android-wait-for-emulator

* ranamed interface onResponseCallback to Callback

* * Added api to delete picture in UploadModel
* cleanUp in UploadModel. once upload has been initiated
* Removed unused methods from UploadModel and the corresponding test class

* * Added tests for UploadPresenter
* Travis suggested changes
* Addded copy previous title and description

* * Made the upload add descriptions visible when keyboard visible
* add description request focus only when user manually requests it

* Added JavaDocs, review suggested changes

* Fix dagger injection

* use DialogUtil to show info in descriptions

* use activity context for DialogUtil

* Minor changes

* refactored title

* ui for depicts

* bug fix

* basic architecture for depicts

* adde architecture components for depicts

* [WIP] ApacheHttpClientMediaWikiApi.wikidataEditEntity: JSON param creation uses object instead of string

* resolved dagger errors

* multilingual captions and next button error resolved

* fixed next button issues in depicts fragment

* captions and depicts

* resolved previous button click issues

* fixed bindview error and added multi-captions

* replaced description and caption with uploadmediadetail

* refactored few classes

* modified ui of depicts

* minor fixes

* Bug fix, reduced the add description edit text clickable bound (commons-app#2973)

* moved depicts before categories

* replaced previous filename with captions

* removed time from filename

* added depicts suggestions

* [WIP] Wikidata Sandbox (Q4115189) test

* changes layout of layout_upload_depicts

* changed layout of upload_depicts

* code stuck at IO_SCHEDULER

* labels and description for depicts activity

* Bugfix/uploads (commons-app#3000)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Fix memory leak (commons-app#3001)

* Bugfix/uploads (commons-app#3002)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Bugfix/uploads (commons-app#3011)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* bugfix/uploads (commons-app#3012)

* merged with master

* BugFix IllegalStateException
* setRetainState(true), not required with FragmentStatePagerAdapter
* Increase the ViewPager's Offscreen Limit, we want all the fragments to be active

* BugFix, clear selected categoris for previous upload session
* Clear Selected Categories
* Addded JavaDocs for CategoriesModel

* Code Formatting in app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

* Added class level JavaDoc UploadRemoteDataSource

* Added class level JavaDoc for UploadRepository

* Added JavaDocs for ThumbnailsAdapter

* Added JavaDocs for MediaLicensePresenter, CategoriesPresenter

* Removed null check on category query
* Show default catgeories based on image title and gps location when category text empty
* Allow search for empty category search

* Attached image scale listener to upload media image

* Bug fix, reduced the add description edit text clickable bound

* Added tooltip in Title in UploadMediaFragment

* BugFix recent categories

* Updated test methods

* Avoid memory leak, free the adpater in MediaLicenseFragment.onDestroyView

* BugFix Illegal State Exception in ViewpPagerAdapter

* Remove irrelevant comment

* merge conflict with strings (commons-app#3016)

* [WIP] Fixed duplicated subscriprion for 'addPropertyP180'

* added documentation

* fixed issue commons-app#3006

* resolved issue commons-app#3004

* fixed issue with categoryPresenterTest.kt

* send captions as labels

* fixed issue with the captions

* optimised imports

* added upload for captions

* minor changes

* resolved issue with uploading captions

* resolved issue with api call

* uploading captions to wikibase

* added some tests and documentation

* undo formatting changes

* uploaded captions as labels to wikibase

* minor changes

* resolved error with spinner adpater

* adding captions to local database

* Fixed issue commons-app#3035

* fixed issue commons-app#3033

* fixed issue commons-app#3005

* fixed issue commons-app#3005

* added search for depicts

* fixed issue with compile time

* fixe issue with project build

* fixed issue commons-app#3044

* merged uploading depicts into branch

* uploading depicts

* rebased branch

* fixed crash due to depicts

* modified depicts interface

* Resolve merge conflicts

* Fix issues with API calls

* Use wikidata token

* searching depictions from depicts activity

* added some documentation and other changes

* fixed crash on selecting depictions

* sending wikidataentity id to upload depictions

* added changes after review

* Fixed issue with next button diabling in media detail activity

* added tests for depictions

* added all the unit tests and fixed few more issues

* showing captions in media details

* show captions in media details

* added documentations and worked upon review comments

* parsing response for depictions

* displaying captions and depiction QID in media detail

* added documentation

* fetching labels from QIDs

* captions working perfectly

* added documentations and code cleaning

* minor changes

* minor changes

* Showing items in explore

* added search via depicts in explore

* Added setOffscreenPageLimit in ViewPager

* show captions in explore

* show captions in home

* showing depict images under items

* added documentation and code refactoring

* enabled pagination in depiction search

* added some tests and media deatils in depiction detail activity

* fixed bug with back button in media

* fixed issue commons-app#3100

* fixed issue commons-app#3098

* fixed issue commons-app#3099

* fixed issue commons-app#3104 and commons-app#3098

* showing captions in place of title in home and explore:media

* show captions in explore:depiction image list activity

* showing depictions in media details

* showing depictions in media details in production flavor

* fixed issue commons-app#3108 and commons-app#3107

* fix isse commons-app#3108

* fixed issue commons-app#3110 and commons-app#3112

* fixed issue commons-app#3113

* added documentations

* fixed issue commons-app#3076 and commons-app#3109

* added depiction search test

* fixed issue commons-app#3113

* fixed issue commons-app#3111

* fixed issue commons-app#3106

* Showing items in explore

* minor change

* fixed issue commons-app#3118 and some other changes

* added MVP in searchdepictionsfragment

* added mvp architecture

* added MVP architecture to DepictedImagesDetailsActivity

* added documentation and some minor changes

* added image to depicted item in search depictions

* * Use callbacks from renderer to fetch thumbnails

* adding fresco to load image in depictions

* adding thumbnail image for depictions in upload and explore

* pagination issues

* fixed issue --(showing previous depiction thumbnail in explore)

* Fixed the logic for pagination

* hide progress on success of last page

* adding sub-items and parent items to search in explore

* minor changes for review comments

* fixed issue commons-app#3119

* fixed issue commons-app#3130

* changes after review comments

* showing child classes for depictions

* Showing child items

* showing parent classes for depicted items

* adding localised search for parent and child items

* clicking on any child class or parent class should call the corresponding class items

* fixed issue of showing wrong thumbnail for P18 item

* fixed issue commons-app#3132

* added test for DepictedImagesPresenter.java

* added unit tests for depicted items parent and child classes

* removed unused imports and code formatting

* fixed issue in search test

* deleting unnecessary .attach_pid9313 file

* deleting unnecessary .attach_pid9655 file

* added SearchDepictionsPresenterTest

* changes after review comments

* updates for review comments

* added more documentations

* removed unused code and classes and addressed spacing changes

* changes after review

* fixed build issues in the app

* worked on some review comments

* fixed issue:wrong thumbnail appears on wikidata item

* minor change

* worked on some review changes

* worked on review comments

* minor change

* addressed remaining review comments

* replaced hardcoded jpgs with pageIds to fetch captions

* added documentation

* removed hardcoded extensions and worked on review comments

* review comments

* [WIP] Added Depicts values for flavors

* [WIP] Minor fix

* [WIP] Minor fixes

* [WIP] Fixed URL

* [WIP] Fixed URLs and tokens

* Fixed MediaClient: added check for null in continuation store

* Fixed Media::from, changed return from null to new Media()

* [WIP] Merged with master

* Fix commons-app#3254 Displays a proper message in explore section when no result for caption

* Updated Mockito to org.mockito:mockito-inline:2.13.0

* [WIP] Fixed tests after merging

* [WIP] Fixed some JUnit tests

* Fixed 'accessing from wrong thread' error

* commons-app#3222 Delete manifest declaration of activity as fragment - stop casting MainActivity to CatgoryImagesCallback - fix tests

* Remove unit test not associated with any class - make CategoryPresenterTest more idiomatic

* fix compilation errors

Co-authored-by: Vitaly V. Pinchuk <vetal.978@gmail.com>
Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>
Co-authored-by: vanshikaarora <vanshikaa937@gmail.com>
Co-authored-by: Vivek Maskara <maskaravivek@gmail.com>
Co-authored-by: Vanshika Arora <34261945+vanshikaarora@users.noreply.github.com>
Co-authored-by: Somanshu and Himanshu <somanshS14@gmail.com>

* commons-app#3482 Use Room in Structured Data branch - remove unused code (commons-app#3483)

* commons-app#3482 Use Room in Structured Data branch - remove unused code

* commons-app#3482 Use Room in Structured Data branch - fix unit test compilation

* commons-app#3482 Use Room in Structured Data branch - add kdoc

* commons-app#3490 Depiction Search in upload shows No Results before it gets results (commons-app#3491)

* commons-app#3482 Use Room in Structured Data branch - remove unused code

* commons-app#3482 Use Room in Structured Data branch - fix unit test compilation

* commons-app#3490 Depiction Search in upload shows No Results before it gets results - stop showing error on subscription

* commons-app#3490 Depiction Search in upload shows No Results before it gets results - update test cases

* make labels nullable too

* fix unit test compilation

* commons-app#3222 remove lingering reference to depiction content provider

* Fix Crash

* commons-app#3222 Merge master into Structured Data branch, fix conflicts - review fixes

* Fix method invocations

* commons-app#3529 Captions/depictions are not saved to Commons (commons-app#3574)

* commons-app#3529 Captions/depictions are not saved to Commons - make copy of list of depictionEntityIds - uncomment editBaseDepictsProperty - refactor upload related classes

* commons-app#3529 Captions/depictions are not saved to Commons - fix wrong ArrayList usage

* commons-app#3529 Captions/depictions are not saved to Commons - fix test

* commons-app#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs  (commons-app#3578)

* commons-app#3529 Captions/depictions are not saved to Commons - make copy of list of depictionEntityIds - uncomment editBaseDepictsProperty - refactor upload related classes

* commons-app#3529 Captions/depictions are not saved to Commons - fix wrong ArrayList usage

* commons-app#3529 Captions/depictions are not saved to Commons - fix test

* commons-app#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - replace title with the first MediaDetail

* commons-app#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - restore button disabling

* commons-app#3503 Remove Title/Caption From MediaUploadDetail and only use Caption/Description pairs - fix nearby place

* fix thumbnail issue 3526 (commons-app#3617)

* commons-app#3222 Merge master into Structured Data branch, fix conflicts - fix bad merge

* commons-app#3529 Captions/depictions are not saved to Commons (commons-app#3588)

* commons-app#3529 Captions/depictions are not saved to Commons - update flow to update appropriate data

* commons-app#3529 Captions/depictions are not saved to Commons - fix invoking of setlabel

* commons-app#3529 Captions/depictions are not saved to Commons - fix unit tests

* commons-app#3529 Captions/depictions are not saved to Commons - use constant for @nAmed

* commons-app#3529 Captions/depictions are not saved to Commons - remove captions interface

* commons-app#3529 Captions/depictions are not saved to Commons - delete unused Contribution fields - enforce Single Responsibility by using PageContentsCreator

* commons-app#3529 Captions/depictions are not saved to Commons - prefix id with M - remove language from url and only add from Field

* commons-app#3529 Captions/depictions are not saved to Commons - make edits of depictions and captions sequential

* commons-app#3529 Captions/depictions are not saved to Commons - remove unused model fields

* commons-app#3529 Captions/depictions are not saved to Commons - weaken type of categories - copy list on Contribution creation

* commons-app#3529 Captions/depictions are not saved to Commons - mark Media fields private - weaken types - remove partly implemented fields

* commons-app#3529 Captions/depictions are not saved to Commons - add semi colon

* commons-app#3529 Captions/depictions are not saved to Commons - fix test

* Fix issue 3526 Unlike "Items" tab, "child classes" tab does not display description nor image thumbnail (commons-app#3619)

* fix thumbnail issue 3526

* Fix Description issue 3526

* revert changes on this file, not finished with it yet

* Fix Description for Child and Parent classes - issue 3526

* Remove conflict text in file

* Remove retrofit.HEAD import

* Incorporated review comments

* Fix issue 3137 (commons-app#3637)

* Fix issue 3137

* Remove import Timber

* Remove unnecessary space

* commons-app#3222 Merge master into Structured Data branch, fix conflicts - revert logging

* Fix build

* commons-app#3661 No Depictions Selected Dialog has reversed buttons - fix button order

* Revert "commons-app#3661 No Depictions Selected Dialog has reversed buttons - fix button order"

This reverts commit d8f9809.

* commons-app#3222 Merge master into Structured Data branch, fix conflicts - remove unused methods/fields

* commons-app#3661 No Depictions Selected Dialog has reversed buttons - fix button order (commons-app#3662)

* commons-app#3653 Many Mnull requests - stop requesting captions for null ids (commons-app#3657)

* commons-app#3653 Many Mnull requests - stop requesting captions for null ids

* commons-app#3653 Many Mnull requests - move log line

* commons-app#3633 [structured-data branch] In depictions selection screen, suggest nearby items  (commons-app#3650)

* commons-app#3633 [structured-data branch] In depictions selection screen, suggest nearby items - for empty search terms show nearby items for depictions

* commons-app#3633 [structured-data branch] In depictions selection screen, suggest nearby items - use linear radii progression to search for places

* commons-app#3666 Crash when uploading on structured-data branch - revert cleanup of UploadController (commons-app#3670)

* commons-app#3222 Merge Structured Data branch into master - fix caption rendering in new UI

* commons-app#3222 Merge Structured Data branch into master - upgrade retrofit + okhttp

* commons-app#3664 Stop using JsonObject on StructuredData (commons-app#3672)

* commons-app#3664 Stop using JsonObject on StructuredData - remove usage in Media classes - remove from depicts client - create partial network models

* commons-app#3664 Stop using JsonObject on StructuredData - allow partial mapping of polymorphic models by returning null in typeadapter

* commons-app#3664 Stop using JsonObject on StructuredData - use models for editing depicts property

* commons-app#3664 Stop using JsonObject on StructuredData - use models for sparql parent query

* commons-app#3664 Stop using JsonObject on StructuredData - fix unit test compilation

* commons-app#3664 Stop using JsonObject on StructuredData - unify sparql responses

* commons-app#3664 Stop using JsonObject on StructuredData - minor cleanup of misnamed/unused/too broad visibility

* commons-app#3664 Stop using JsonObject on StructuredData - share variable names and logic for the Sarql queries

* commons-app#3664 Stop using JsonObject on StructuredData - add error logging

* commons-app#228 Overwrite happens - fix extension of filename (commons-app#3689)

* commons-app#3675 Rename buttons of the dialog box shown when no depiction is selected - remove "yes, submit" and "no, go back" (commons-app#3688)

* commons-app#3680 Tip appears even when not tapping the (i) icon - use TextInputLayout EndIcons (commons-app#3683)

* commons-app#3680 Tip appears even when not tapping the (i) icon - use TextInputLayout EndIcons

* commons-app#3680 Tip appears even when not tapping the (i) icon - reaorder endIcon mode call so tinting is applied

* structured data - fix compilation

Co-authored-by: Vitaly V. Pinchuk <vetal.978@gmail.com>
Co-authored-by: Ashish Kumar <ashishkumar468@gmail.com>
Co-authored-by: vanshikaarora <vanshikaa937@gmail.com>
Co-authored-by: Vivek Maskara <maskaravivek@gmail.com>
Co-authored-by: Vanshika Arora <34261945+vanshikaarora@users.noreply.github.com>
Co-authored-by: Somanshu and Himanshu <somanshS14@gmail.com>
Co-authored-by: vvijayalakshmi21 <34595292+vvijayalakshmi21@users.noreply.github.com>

Author: 7 people

app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java

@@ -1,11 +1,7 @@
 package fr.free.nrw.commons.upload;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -17,6 +13,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.google.android.material.textfield.TextInputLayout;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.utils.AbstractTextWatcher;
 import java.util.ArrayList;
@@ -93,9 +90,15 @@ public class ViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.description_item_edit_text)
         AppCompatEditText descItemEditText;
 
+        @BindView(R.id.description_item_edit_text_input_layout)
+        TextInputLayout descInputLayout;
+
         @BindView(R.id.caption_item_edit_text)
         AppCompatEditText captionItemEditText;
 
+        @BindView(R.id.caption_item_edit_text_input_layout)
+        TextInputLayout captionInputLayout;
+
         public ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
@@ -116,38 +119,19 @@ public void bind(int position) {
                 }));
 
             if (position == 0) {
-                captionItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, getInfoIcon(),
-                        null);
-                captionItemEditText.setOnTouchListener((v, event) -> {
-                    //2 is for drawable right
-                    if (event.getAction() == MotionEvent.ACTION_UP && (event.getRawX() >= (captionItemEditText.getRight() - captionItemEditText.getCompoundDrawables()[2].getBounds().width()))) {
-                        if (getAdapterPosition() == 0) {
-                            callback.showAlert(R.string.media_detail_caption,
-                                    R.string.caption_info);
-                        }
-                        return true;
-                    }
-                    return false;
-                });
-
-                descItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, getInfoIcon(),
-                        null);
-                descItemEditText.setOnTouchListener((v, event) -> {
-                    //2 is for drawable right
-                    float twelveDpInPixels = convertDpToPixel(12, descItemEditText.getContext());
-                    if (event.getAction() == MotionEvent.ACTION_UP && descItemEditText.getCompoundDrawables()[2].getBounds().contains((int)(descItemEditText.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){
-                        if (getAdapterPosition() == 0) {
-                            callback.showAlert(R.string.media_detail_description,
-                                    R.string.description_info);
-                        }
-                        return true;
-                    }
-                    return false;
-                });
+                captionInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
+                captionInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                captionInputLayout.setEndIconOnClickListener(v ->
+                    callback.showAlert(R.string.media_detail_caption, R.string.caption_info));
+
+                descInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
+                descInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                descInputLayout.setEndIconOnClickListener(v ->
+                    callback.showAlert(R.string.media_detail_description, R.string.description_info));
 
             } else {
-                captionItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-                descItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+                captionInputLayout.setEndIconDrawable(null);
+                descInputLayout.setEndIconDrawable(null);
             }
 
             captionItemEditText.addTextChangedListener(new AbstractTextWatcher(
@@ -218,15 +202,6 @@ public void onNothingSelected(AdapterView<?> adapterView) {
                 selectedLanguages.put(spinnerDescriptionLanguages, description.getLanguageCode());
             }
         }
-
-        /**
-         * Extracted out the method to get the icon drawable
-         */
-        private Drawable getInfoIcon() {
-            return descItemEditText.getContext()
-                    .getResources()
-                    .getDrawable(R.drawable.mapbox_info_icon_default);
-        }
     }
 
     public interface Callback {
@@ -238,13 +213,4 @@ public interface EventListener {
         void onPrimaryCaptionTextChange(boolean isNotEmpty);
     }
 
-    /**
-     * converts dp to pixel
-     * @param dp
-     * @param context
-     * @return
-     */
-    private float convertDpToPixel(float dp, Context context) {
-        return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
-    }
 }

app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

@@ -4,8 +4,10 @@
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.filepicker.MimeTypeMapWrapper;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.nearby.Place;
@@ -106,8 +108,8 @@ private UploadItem createAndAddUploadItem(final UploadableFile uploadableFile,
         Timber.d("File created date is %d", fileCreatedDate);
         final ImageCoordinates imageCoordinates = fileProcessor
                 .processFileCoordinates(similarImageInterface, uploadableFile.getFilePath());
-        final UploadItem uploadItem = new UploadItem(uploadableFile.getContentUri(),
-                Uri.parse(uploadableFile.getFilePath()),
+        final UploadItem uploadItem = new UploadItem(
+            Uri.parse(uploadableFile.getFilePath()),
                 uploadableFile.getMimeType(context), imageCoordinates, place, fileCreatedDate,
                 createdTimestampSource);
         if (place != null) {
@@ -204,7 +206,6 @@ public List<DepictedItem> getSelectedDepictions() {
     @SuppressWarnings("WeakerAccess")
     public static class UploadItem {
 
-        private final Uri originalContentUri;
         private final Uri mediaUri;
         private final String mimeType;
         private ImageCoordinates gpsCoords;
@@ -214,13 +215,12 @@ public static class UploadItem {
         private final String createdTimestampSource;
         private final BehaviorSubject<Integer> imageQuality;
         @SuppressLint("CheckResult")
-        UploadItem(final Uri originalContentUri,
-            final Uri mediaUri, final String mimeType,
+        UploadItem(final Uri mediaUri,
+            final String mimeType,
             final ImageCoordinates gpsCoords,
             final Place place,
             final long createdTimestamp,
             final String createdTimestampSource) {
-            this.originalContentUri = originalContentUri;
             this.createdTimestampSource = createdTimestampSource;
             uploadMediaDetails = new ArrayList<>(Arrays.asList(new UploadMediaDetail()));
             this.place = place;
@@ -267,10 +267,6 @@ public void setMediaDetails(final List<UploadMediaDetail> uploadMediaDetails) {
             this.uploadMediaDetails = uploadMediaDetails;
         }
 
-        public Uri getContentUri() {
-            return originalContentUri;
-        }
-
         @Override
         public boolean equals(@Nullable final Object obj) {
             if (!(obj instanceof UploadItem)) {
@@ -290,15 +286,13 @@ public int hashCode() {
          * Currently, the caption is used as a filename. If several languages have been entered, the first language is used.
          */
         public String getFileName() {
-            return uploadMediaDetails.get(0).getCaptionText();
+            return Utils.fixExtension(uploadMediaDetails.get(0).getCaptionText(),
+                MimeTypeMapWrapper.getExtensionFromMimeType(mimeType));
         }
 
         public void setGpsCoords(final ImageCoordinates gpsCoords) {
             this.gpsCoords = gpsCoords;
         }
 
-        public String getMimeType() {
-            return mimeType;
-        }
     }
 }

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

@@ -151,8 +151,8 @@ public void showNoCategorySelected() {
         DialogUtil.showAlertDialog(getActivity(),
                 getString(R.string.no_categories_selected),
                 getString(R.string.no_categories_selected_warning_desc),
-                getString(R.string.yes_submit),
-                getString(R.string.no_go_back),
+                getString(R.string.continue_message),
+                getString(R.string.cancel),
                 () -> goToNextScreen(),
                 null);
 

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java

@@ -104,8 +104,8 @@ public void noDepictionSelected() {
         DialogUtil.showAlertDialog(getActivity(),
             getString(R.string.no_depictions_selected),
             getString(R.string.no_depictions_selected_warning_desc),
-            getString(R.string.yes_submit),
-            getString(R.string.no_go_back),
+            getString(R.string.continue_message),
+            getString(R.string.cancel),
             this::goToNextScreen,
             null
         );

app/src/main/res/layout/row_item_description.xml

@@ -19,6 +19,7 @@
         android:orientation="vertical"
         android:layout_weight="8">
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/caption_item_edit_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
@@ -33,6 +34,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/description_item_edit_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
@@ -47,4 +49,4 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -460,13 +460,10 @@ Upload your first media by tapping on the add button.</string>
   <string name="desc_language_Pacific">Pacific</string>
 
   <string name="no_categories_selected">No Categories Selected</string>
-  <string name="no_categories_selected_warning_desc">Images without categories are rarely usable. Are you sure you want to submit without selecting categories?</string>
+  <string name="no_categories_selected_warning_desc">Images without categories are rarely usable. Are you sure you want to continue without selecting categories?</string>
 
   <string name="no_depictions_selected">No Depictions Selected</string>
-  <string name="no_depictions_selected_warning_desc">Depictions help when searching for images. Are you sure you want to submit without selecting depictions?</string>
-
-  <string name="yes_submit">Yes, Submit</string>
-  <string name="no_go_back">No, Go Back</string>
+  <string name="no_depictions_selected_warning_desc">Images with depictions are more easily found and more likely to be used. Are you sure you want to continue without selecting depictions?</string>
 
   <string name="upload_flow_all_images_in_set">(For all images in set)</string>
   <string name="search_this_area">Search this area</string>