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

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>