From 83727e43e636d0151f47ce3f500fbf41a918dc0f Mon Sep 17 00:00:00 2001
From: Dinu Kumarasiri <sandarumk@gmail.com>
Date: Mon, 15 May 2017 11:16:40 +0200
Subject: [PATCH 1/2] Add upload date to the image description

---
 .../commons/media/MediaDetailFragment.java    | 16 +++++++++
 .../main/res/layout/fragment_media_detail.xml | 35 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 52 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 b32d83a31..a3b2d74e1 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
@@ -23,7 +23,9 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.License;
@@ -71,6 +73,7 @@ public class MediaDetailFragment extends Fragment {
     private TextView desc;
     private TextView license;
     private TextView coordinates;
+    private TextView uploadedDate;
     private LinearLayout categoryContainer;
     private ScrollView scrollView;
     private ArrayList<String> categoryNames;
@@ -125,6 +128,7 @@ public class MediaDetailFragment extends Fragment {
         desc = (TextView) view.findViewById(R.id.mediaDetailDesc);
         license = (TextView) view.findViewById(R.id.mediaDetailLicense);
         coordinates = (TextView) view.findViewById(R.id.mediaDetailCoordinates);
+        uploadedDate = (TextView) view.findViewById(R.id.mediaDetailuploadeddate);
         categoryContainer = (LinearLayout) view.findViewById(R.id.mediaDetailCategoryContainer);
 
         licenseList = new LicenseList(getActivity());
@@ -229,6 +233,7 @@ public class MediaDetailFragment extends Fragment {
                         desc.setText(prettyDescription(media));
                         license.setText(prettyLicense(media));
                         coordinates.setText(prettyCoordinates(media));
+                        uploadedDate.setText(prettyUploadedDate(media));
 
                         categoryNames.removeAll(categoryNames);
                         categoryNames.addAll(media.getCategories());
@@ -392,6 +397,17 @@ public class MediaDetailFragment extends Fragment {
         }
     }
 
+    private String prettyUploadedDate(Media media) {
+        Date date = media.getDateUploaded();
+        if(date.toString() == null || date.toString().isEmpty()) {
+            return "Uploaded date not available";
+        }
+        SimpleDateFormat formatter = new SimpleDateFormat("dd MMM yyyy");
+        String formattedDate = formatter.format(date);
+       // Timber.d("Media uploaded date is: s%", formattedDate);
+        return formattedDate;
+    }
+
     /**
      * Returns the coordinates nicely formatted.
      *
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index 279957270..121f777c4 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -217,6 +217,41 @@
                         android:id="@+id/mediaDetailCategoryContainer"
                         />
                 </LinearLayout>
+
+                <fr.free.nrw.commons.media.MediaDetailSpacer
+                    android:layout_width="match_parent"
+                    android:layout_height="8dp"
+                    />
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/subBackground"
+                    android:padding="16dp"
+                    >
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/media_detail_uploaded_date"
+                        android:textColor="@android:color/white"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:paddingBottom="6dp"
+                        />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/media_detail_uploaded_date"
+                        android:background="?attr/subBackground"
+                        android:id="@+id/mediaDetailuploadeddate"
+                        android:textColor="@android:color/white"
+                        android:layout_gravity="left|start"
+                        android:textSize="14sp"
+                        android:padding="12dp"
+                        />
+                </LinearLayout>
+
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bad2512de..410b8a9c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -165,6 +165,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="media_detail_media_title">Title of the media</string>
   <string name="media_detail_description">Description</string>
   <string name="media_detail_description_explanation">Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though.</string>
+  <string name="media_detail_uploaded_date">Uploaded date</string>>
   <string name="become_a_tester_title">Become a Beta Tester</string>
   <string name="become_a_tester_description">Opt-in to our beta channel on Google Play and get early access to new features and bug fixes</string>
   <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>

From a2a2589df38e439e438b4f16a20fb5f07e43c26a Mon Sep 17 00:00:00 2001
From: Dinu Kumarasiri <sandarumk@gmail.com>
Date: Mon, 15 May 2017 11:32:48 +0200
Subject: [PATCH 2/2] Fix codecy failures

---
 .../java/fr/free/nrw/commons/media/MediaDetailFragment.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 a3b2d74e1..6d46da801 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
@@ -399,12 +399,11 @@ public class MediaDetailFragment extends Fragment {
 
     private String prettyUploadedDate(Media media) {
         Date date = media.getDateUploaded();
-        if(date.toString() == null || date.toString().isEmpty()) {
+        if (date.toString() == null || date.toString().isEmpty()) {
             return "Uploaded date not available";
         }
         SimpleDateFormat formatter = new SimpleDateFormat("dd MMM yyyy");
         String formattedDate = formatter.format(date);
-       // Timber.d("Media uploaded date is: s%", formattedDate);
         return formattedDate;
     }