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

Merge pull request #777 from akaita/media_detail

Browse source 
Fix issues in Media Detail screen
This commit is contained in:
Josephine Lim 2017-07-20 01:20:10 +10:00 • committed by GitHub
commit 19a3fa3adc
6 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -76,7 +77,7 @@
android:layout_height="wrap_content"
android:text="@string/media_detail_media_title"
android:id="@+id/mediaDetailTitle"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:textColor="@android:color/white"
android:background="?attr/subBackground"
android:textSize="14sp"
@ -112,7 +113,7 @@
android:background="?attr/subBackground"
android:id="@+id/mediaDetailDesc"
android:textColor="@android:color/white"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:textSize="14sp"
android:padding="12dp"
/>
@ -130,26 +131,28 @@
android:background="?attr/subBackground"
android:padding="16dp"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/media_detail_license"
android:textColor="@android:color/white"
android:text="License"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
/>
<TextView
android:id="@+id/mediaDetailLicense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="License link"
android:id="@+id/mediaDetailLicense"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:background="?attr/subBackground"
android:text="@string/media_detail_license"
android:textColor="@android:color/white"
android:textSize="14sp"
android:padding="12dp"
/>
tools:text="License link" />
</LinearLayout>
<LinearLayout
@ -163,7 +166,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Coordinates"
android:text="@string/media_detail_coordinates"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
@ -171,13 +174,14 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="License link"
android:text="@string/media_detail_coordinates"
android:id="@+id/mediaDetailCoordinates"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:background="?attr/subBackground"
android:textColor="@android:color/white"
android:textSize="14sp"
android:padding="12dp"
tools:text="Coordinates link"
/>
</LinearLayout>
@ -199,7 +203,7 @@
android:layout_height="wrap_content"
android:text="@string/detail_panel_cats_label"
android:textSize="16sp"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:textColor="@android:color/white"
android:paddingBottom="6dp"
/>
@ -239,7 +243,7 @@
android:background="?attr/subBackground"
android:id="@+id/mediaDetailuploadeddate"
android:textColor="@android:color/white"
android:layout_gravity="left|start"
android:layout_gravity="start"
android:textSize="14sp"
android:padding="12dp"
/>

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

@ -153,7 +153,10 @@ 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="media_detail_uploaded_date">Uploaded date</string>
<string name="media_detail_license">License</string>
<string name="media_detail_coordinates">Coordinates</string>
<string name="media_detail_coordinates_empty">None provided</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>