mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Sean Mac Gillicuddy 2020-04-07 13:40:16 +01:00
parent 5d2c786392
commit a9797a706a
1 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/fr/free/nrw/commons/Media.java
View file

@ -60,7 +60,7 @@ public class Media implements Parcelable {
* Depicts is a feature part of Structured data. Multiple Depictions can be added for an image just like categories.
* However unlike categories depictions is multi-lingual
*/
public List<Map<String, String>> depictionList;
public ArrayList<Map<String, String>> depictionList;
/**
* The above hashmap is fetched from API and to diplay in Explore
* However this list of depictions is for storing and retrieving depictions from local storage or cache
@ -625,27 +625,7 @@ public class Media implements Parcelable {
public int describeContents() {
return 0;
}
/**
* Depicts is a feature part of Structured data. Multiple Depictions can be added for an image just like categories.
* However unlike categories depictions is multi-lingual
*/
public ArrayList<Map<String, String>> depictionList;
/**
* The above hashmap is fetched from API and to diplay in Explore
* However this list of depictions is for storing and retrieving depictions from local storage or cache
*/
public ArrayList<String> depictions;
public boolean requestedDeletion;
public HashMap<String, String> descriptions; // multilingual descriptions as loaded
/**
* This hasmap stores the list of multilingual captions, where
* key of the HashMap is the language and value is the caption in the corresponding language
* Ex: key = "en", value: "<caption in short in English>"
* key = "de" , value: "<caption in german>"
*/
public Map<String, String> captions;
public HashMap<String, String> tags = new HashMap<>();
@Nullable public LatLng coordinates;
/**
* Creates a way to transfer information between two or more
* activities.