playmusicexporter/playmusicexporter
1
0
Fork 0
mirror of https://github.com/playmusicexporter/playmusicexporter synced 2024-05-15 19:46:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'release/v0.9.2' into develop

Browse source
This commit is contained in:
Jan Christian Grünhage 2017-01-19 00:04:44 +01:00
parent e3dac5c1d3 b3901dc04b
commit db5b8b1d6c
Signed by: jcgruenhage
GPG key ID: 321A67D9EE8BC3E1
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
framework/framework.iml
View file

@ -63,13 +63,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@ -77,6 +70,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

4
playmusicexporter/build.gradle
View file

@ -33,8 +33,8 @@ android {
minSdkVersion 21
targetSdkVersion 25
// TODO Change Version with releases
versionCode 103
versionName '0.9.1'
versionCode 104
versionName '0.9.2'
vectorDrawables.useSupportLibrary = true
jackOptions {

6
playmusicexporter/src/main/res/values-de/strings.xml
View file

@ -61,8 +61,8 @@
<string name="toast_error_track_not_offline">Sie können nur offline Titel exportieren. Versuchen Sie das Album in Play Music offline herunterzuladen.</string>
<string name="settings_build_date">Kompilationsdatum</string>
<string name="settings_category_develop">Entwicklung</string>
<string name="dialog_storage_access_denied_title">Daten-Zugriff verweigert</string>
<string name="dialog_storage_access_denied">Der PlayMusicExpoerter benötigt Schreibrechte auf der SD-Karte. Dies ist Teil des Marshmallow-Fix.\n\nBitte starten Sie die App neu und erlauben Sie die Berechtigung.</string>
<string name="dialog_storage_access_denied_title">Speicher-Zugriff verweigert</string>
<string name="dialog_storage_access_denied">Der Play Music Exporter benötigt Schreibzugriff auf den externen Speicher, ohne diesen kann die App nicht genutzt werden.</string>
<string name="text_okay">OK</string>
<string name="pref_header_about">Über</string>
<string name="pref_header_automation">Automatisierung</string>
@ -98,4 +98,6 @@
<string name="settings_category_groups_export">Export Speichereinstellungen für Playlists</string>
<string name="settings_export_path_alba">Export Pfad für Alben</string>
<string name="settings_export_path_groups">Export Pfad für Playlists</string>
<string name="dialog_superuser_access_denied_title">Administrator-Zugriff verweigert</string>
<string name="dialog_superuser_access_denied">Der Play Music Exporter benötigt Administrator Rechte, ohne diese Rechte kann die App nicht genutzt werden.</string>
</resources>

4
playmusicexporter/src/main/res/values/strings.xml
View file

@ -50,10 +50,10 @@
<string name="notification_export_finished_single_summery">%1$s was exported successfully!</string>
<string name="dialog_storage_access_denied_title">Storage access denied</string>
<string name="dialog_storage_access_denied">The PlayMusicExporter does not work without write access to the external storage. You can not use this app without granting it write access.</string>
<string name="dialog_storage_access_denied">The Play Music Exporter does not work without write access to the external storage. You can not use this app without granting it write access.</string>
<string name="dialog_superuser_access_denied_title">Superuser access denied</string>
<string name="dialog_superuser_access_denied">The PlayMusicExporter does not work without superuser access. You can not use this app without granting it superuser access.</string>
<string name="dialog_superuser_access_denied">The Play Music Exporter does not work without superuser access. You can not use this app without granting it superuser access.</string>
<string name="toast_error_track_not_offline">You can only export offline tracks. Try to download the album offline in Play Music.</string>

4
playmusicexporter/src/main/res/xml/pref_about.xml
View file

@ -50,11 +50,11 @@
<!-- TODO change Version number and build date with releases -->
<!-- Version number-->
<Preference
android:summary="0.9.1"
android:summary="0.9.2"
android:title="@string/settings_version_number" />
<!-- Build date-->
<Preference
android:summary="31.12.2016"
android:summary="19.01.2017"
android:title="@string/settings_build_date" />
</PreferenceCategory>