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

Merge branch 'master' into set_upload_limit

Browse source
This commit is contained in:
Dinu Kumarasiri 2017-05-15 09:53:39 +02:00 • committed by GitHub
commit 78ac412b17
40 changed files with 860 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/ic_list_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 116 B

BIN
app/src/main/res/drawable-hdpi/ic_map_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 310 B

BIN
app/src/main/res/drawable-mdpi/ic_list_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 86 B

BIN
app/src/main/res/drawable-mdpi/ic_map_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 222 B

BIN
app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 95 B

BIN
app/src/main/res/drawable-xhdpi/ic_map_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 363 B

BIN
app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 B

BIN
app/src/main/res/drawable-xxhdpi/ic_map_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 513 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 100 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_map_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 667 B

115
app/src/main/res/layout/dialog_nearby_info.xml Normal file
View file

@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:behavior_peekHeight="@dimen/bottom_peak_height">
<LinearLayout
android:orientation="vertical"
android:id="@+id/emptyLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="1" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@android:color/white">
<LinearLayout
android:id="@+id/dialogInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:minHeight="@dimen/bottom_peak_height"
android:orientation="vertical">
<LinearLayout
android:id="@+id/link_preview_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:minHeight="64dp">
<TextView
android:id="@+id/link_preview_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="serif"
android:lineSpacingMultiplier="0.9"
android:maxLines="3"
android:paddingBottom="4dp"
android:textColor="@android:color/black"
android:textSize="20sp"
tools:text="Lorem ipsum" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@android:color/black" />
<TextView
android:id="@+id/link_preview_extract"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.3"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp"
android:textIsSelectable="true"
android:textSize="16sp"
android:textColor="@android:color/black"
tools:text="Lorem ipsum" />
<View
android:id="@+id/link_preview_bottom_padding"
android:layout_width="match_parent"
android:layout_height="70dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/dialogButtonsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/dialogInfoLayout"
android:layout_gravity="bottom">
<TextView
android:id="@+id/link_preview_directions_button"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:text="GET DIRECTIONS"
android:textColor="@android:color/black" />
<TextView
android:id="@+id/link_preview_go_button"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:text="READ ARTICLE"
android:textColor="@android:color/black" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

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

@ -159,6 +159,35 @@
/>
</LinearLayout>
<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:textColor="@android:color/white"
android:text="Coordinates"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="License link"
android:id="@+id/mediaDetailCoordinates"
android:layout_gravity="left|start"
android:background="?attr/subBackground"
android:textColor="@android:color/white"
android:textSize="14sp"
android:padding="12dp"
/>
</LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="match_parent"
android:layout_height="8dp"

10
app/src/main/res/values/arrays.xml
View file

@ -8,10 +8,10 @@
<item>@string/license_name_cc_by_sa_four</item>
</array>
<array name="pref_defaultLicense_values">
<item>@string/license_name_cc0</item>
<item>@string/license_name_cc_by_3_0</item>
<item>@string/license_name_cc_by_4_0</item>
<item>@string/license_name_cc_by_sa_3_0</item>
<item>@string/license_name_cc_by_sa_4_0</item>
<item>@string/license_pref_cc0</item>
<item>@string/license_pref_cc_by_3_0</item>
<item>@string/license_pref_cc_by_4_0</item>
<item>@string/license_pref_cc_by_sa_3_0</item>
<item>@string/license_pref_cc_by_sa_4_0</item>
</array>
</resources>

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

@ -2,4 +2,5 @@
<dimen name="icon_size">120dp</dimen>
<dimen name="tiny_margin">4dp</dimen>
<dimen name="small_margin">8dp</dimen>
<dimen name="bottom_peak_height">240dp</dimen>
</resources>

8
app/src/main/res/values/keys.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="license_pref_cc0" translatable="false">CC0</string>
<string name="license_pref_cc_by_3_0" translatable="false">CC BY 3.0</string>
<string name="license_pref_cc_by_sa_3_0" translatable="false">CC BY-SA 3.0</string>
<string name="license_pref_cc_by_4_0" translatable="false">CC BY 4.0</string>
<string name="license_pref_cc_by_sa_4_0" translatable="false">CC BY-SA 4.0</string>
</resources>

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

@ -170,6 +170,8 @@ Tap this message (or hit back) to skip this step.</string>
<string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
<string name="use_wikidata">Use Wikidata</string>
<string name="use_wikidata_summary">(Warning: disabling this may cause large mobile data consumption)</string>
<string name="map_theme_light">mapbox://styles/mapbox/traffic-day-v2</string>
<string name="map_theme_dark">mapbox://styles/mapbox/traffic-night-v2</string>
<string name="mapbox_commons_app_token">pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg</string>
<string name="number_of_uploads">My Recent Upload Limit</string>
<string name="maximum_limit">Maximum Limit</string>

6
app/src/main/res/values/styles.xml
View file

@ -45,4 +45,10 @@
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="borderless_dialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:background">@android:color/transparent</item>
</style>
</resources>

2
app/src/main/res/xml/preferences.xml
View file

@ -8,7 +8,7 @@
android:title="@string/preference_license"
android:entries="@array/pref_defaultLicense_entries"
android:entryValues="@array/pref_defaultLicense_values"
android:defaultValue="@string/license_name_cc_by_sa_4_0"
android:defaultValue="@string/license_pref_cc_by_sa_4_0"
/>
<CheckBoxPreference