diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index e369315ac..a82928718 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -294,9 +294,9 @@ public class Media implements Parcelable { return String.format("[[%s|thumb|%s]]", filename, getMostRelevantCaption()); } - private String getMostRelevantCaption() { + public String getMostRelevantCaption() { final String languageAppropriateCaption = captions.get(Locale.getDefault().getLanguage()); - if(languageAppropriateCaption!=null){ + if (languageAppropriateCaption != null) { return languageAppropriateCaption; } for (String firstCaption : captions.values()) { diff --git a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java index 60b0209f8..e8aab51bc 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/GridViewAdapter.java @@ -88,19 +88,12 @@ public class GridViewAdapter extends ArrayAdapter { SimpleDraweeView imageView = convertView.findViewById(R.id.categoryImageView); TextView fileName = convertView.findViewById(R.id.categoryImageTitle); TextView author = convertView.findViewById(R.id.categoryImageAuthor); - fileName.setText(getTitle(item)); + fileName.setText(item.getMostRelevantCaption()); setAuthorView(item, author); imageView.setImageURI(item.getThumbUrl()); return convertView; } - private String getTitle(Media item) { - for (String caption : item.getCaptions().values()) { - return caption; - } - return item.getDisplayTitle(); - } - /** * @return the Media item at the given position */ diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java index 5d8aefa2f..9d6823603 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java @@ -61,7 +61,7 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder { public void init(final int position, final Contribution contribution) { this.contribution = contribution; this.position = position; - titleView.setText(getTitle(contribution)); + titleView.setText(contribution.getMostRelevantCaption()); final String imageSource = chooseImageSource(contribution.getThumbUrl(), contribution.getLocalUri()); if (!TextUtils.isEmpty(imageSource)) { @@ -111,14 +111,6 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder { } } - private String getTitle(Contribution contribution) { - for (String value : contribution.getCaptions().values()) { - return value; - } - return contribution.getDisplayTitle(); - } - - /** * Checks if a media exists on the corresponding Wikipedia article Currently the check is made for * the device's current language Wikipedia diff --git a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaAdapter.kt b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaAdapter.kt index 5fdd8d480..422e64438 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaAdapter.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/media/SearchMediaAdapter.kt @@ -35,7 +35,7 @@ class SearchImagesViewHolder(containerView: View, val onImageClicked: (Int) -> U override fun bind(item: Pair) { val media = item.first categoryImageView.setOnClickListener { onImageClicked(item.second) } - categoryImageTitle.text = media.displayTitle + categoryImageTitle.text = media.mostRelevantCaption categoryImageView.setImageURI(media.thumbUrl) if (media.creator?.isNotEmpty() == true) { categoryImageAuthor.visibility = View.VISIBLE