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

Merge pull request #581 from sandarumk/add_upload_date_to_image_detail

Browse source 
Add upload date to the image description
This commit is contained in:
Josephine Lim 2017-05-15 12:04:54 +02:00 • committed by GitHub
commit e28db0ec06
3 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -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,16 @@ 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);
return formattedDate;
}
/**
* Returns the coordinates nicely formatted.
*

35
app/src/main/res/layout/fragment_media_detail.xml
View file

@ -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>

1
app/src/main/res/values/strings.xml
View file

@ -167,6 +167,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>