From 916141287f2f3575978f058c4e536b389ceb7dee Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 7 Jul 2016 18:31:32 +1200 Subject: [PATCH] Displays desc, categories and license, but desc and cats are wrong --- .../nrw/commons/media/MediaDetailFragment.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 5acfea4ff..9e63d1b30 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -262,6 +262,21 @@ public class MediaDetailFragment extends Fragment { if(bitmap.hasAlpha()) { image.setBackgroundResource(android.R.color.white); } + + // Fill some fields + desc.setText(prettyDescription(media)); + license.setText(prettyLicense(media)); + + categoryNames.removeAll(categoryNames); + categoryNames.addAll(media.getCategories()); + + categoriesLoaded = true; + categoriesPresent = (categoryNames.size() > 0); + if (!categoriesPresent) { + // Stick in a filler element. + categoryNames.add(getString(R.string.detail_panel_cats_none)); + } + rebuildCatList(); } public void onLoadingCancelled(String s, View view) {