From 4b9b04290e2a3ce343f986f1253c12d95c387663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Fri, 30 Dec 2016 01:03:30 +0100 Subject: [PATCH] Rewrote Settings, added automated export, changed package. --- .idea/copyright/MIT.xml | 6 - .idea/copyright/profiles_settings.xml | 6 +- .idea/dictionaries/david.xml | 7 - .idea/gradle.xml | 5 +- .idea/libraries/appcompat_v7_23_1_0.xml | 15 - .idea/libraries/appcompat_v7_23_1_1.xml | 12 - .idea/libraries/design_23_1_1.xml | 12 - .idea/libraries/mp3agic_0_8_4_SNAPSHOT.xml | 9 - .idea/libraries/recyclerview_v7_23_1_1.xml | 12 - .../libraries/support_annotations_23_1_0.xml | 11 - .../libraries/support_annotations_23_1_1.xml | 11 - .idea/libraries/support_v4_23_1_0.xml | 16 - .idea/libraries/support_v4_23_1_1.xml | 13 - .idea/misc.xml | 17 +- .idea/vcs.xml | 2 +- README.md | 2 +- framework/build.gradle | 4 +- framework/framework.iml | 69 +++-- gradle/wrapper/gradle-wrapper.properties | 26 +- playmusicexporter/build.gradle | 14 +- playmusicexporter/playmusicexporter.iml | 78 +++-- .../playmusicexporter}/ApplicationTest.java | 2 +- .../src/main/AndroidManifest.xml | 44 +-- .../activities/SettingsActivity.java | 177 ----------- .../actionmode/ActionModeTitle.java | 12 +- .../AppCompatPreferenceActivity.java | 109 +++++++ .../MusicContainerListActivity.java | 15 +- .../activities/MusicTrackListActivity.java | 8 +- .../activities/SettingsActivity.java | 276 ++++++++++++++++++ .../adapter/MusicContainerListAdapter.java | 6 +- .../adapter/MusicTrackListAdapter.java | 10 +- .../fragments/MusicContainerListFragment.java | 16 +- .../fragments/MusicTrackListFragment.java | 34 +-- .../fragments/NavigationDrawerFragment.java | 8 +- .../items/SelectedTrack.java | 4 +- .../items/SelectedTrackList.java | 6 +- .../services/ExportAllJob.java | 60 ++++ .../services/ExportAllService.java | 103 +++++++ .../services/ExportService.java | 4 +- .../settings/PlayMusicExporterSettings.java | 45 ++- .../utils/ArtworkViewLoader.java | 4 +- .../utils/MusicPathBuilder.java | 2 +- .../main/res/drawable/ic_info_black_24dp.xml | 9 + .../drawable/ic_notifications_black_24dp.xml | 9 + .../main/res/drawable/ic_sync_black_24dp.xml | 9 + .../main/res/layout/activity_track_list.xml | 4 +- .../res/layout/activity_track_twopane.xml | 4 +- .../src/main/res/values-de/array.xml | 11 + .../src/main/res/values-de/strings.xml | 18 +- .../src/main/res/values/array.xml | 43 +++ .../src/main/res/values/strings.xml | 73 ++--- .../src/main/res/xml/pref_about.xml | 60 ++++ .../src/main/res/xml/pref_automation.xml | 23 ++ .../src/main/res/xml/pref_debug.xml | 6 + .../src/main/res/xml/pref_export.xml | 47 +++ .../src/main/res/xml/pref_headers.xml | 24 ++ .../src/main/res/xml/preferences.xml | 92 ------ playmusiclib/build.gradle | 2 +- playmusiclib/playmusiclib.iml | 58 ++-- 59 files changed, 1142 insertions(+), 642 deletions(-) delete mode 100644 .idea/copyright/MIT.xml delete mode 100644 .idea/dictionaries/david.xml delete mode 100644 .idea/libraries/appcompat_v7_23_1_0.xml delete mode 100644 .idea/libraries/appcompat_v7_23_1_1.xml delete mode 100644 .idea/libraries/design_23_1_1.xml delete mode 100644 .idea/libraries/mp3agic_0_8_4_SNAPSHOT.xml delete mode 100644 .idea/libraries/recyclerview_v7_23_1_1.xml delete mode 100644 .idea/libraries/support_annotations_23_1_0.xml delete mode 100644 .idea/libraries/support_annotations_23_1_1.xml delete mode 100644 .idea/libraries/support_v4_23_1_0.xml delete mode 100644 .idea/libraries/support_v4_23_1_1.xml rename playmusicexporter/src/androidTest/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/ApplicationTest.java (97%) delete mode 100644 playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/SettingsActivity.java rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/actionmode/ActionModeTitle.java (94%) create mode 100644 playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/AppCompatPreferenceActivity.java rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/activities/MusicContainerListActivity.java (96%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/activities/MusicTrackListActivity.java (96%) create mode 100644 playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/adapter/MusicContainerListAdapter.java (95%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/adapter/MusicTrackListAdapter.java (95%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/fragments/MusicContainerListFragment.java (95%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/fragments/MusicTrackListFragment.java (89%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/fragments/NavigationDrawerFragment.java (98%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/items/SelectedTrack.java (95%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/items/SelectedTrackList.java (94%) create mode 100644 playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportAllJob.java create mode 100644 playmusicexporter/src/main/java/re/jcg/playmusicexporter/services/ExportAllService.java rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/services/ExportService.java (98%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/settings/PlayMusicExporterSettings.java (58%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/utils/ArtworkViewLoader.java (98%) rename playmusicexporter/src/main/java/{de/arcus/playmusicexporter2 => re/jcg/playmusicexporter}/utils/MusicPathBuilder.java (99%) create mode 100644 playmusicexporter/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 playmusicexporter/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 playmusicexporter/src/main/res/drawable/ic_sync_black_24dp.xml create mode 100644 playmusicexporter/src/main/res/values-de/array.xml create mode 100644 playmusicexporter/src/main/res/values/array.xml create mode 100644 playmusicexporter/src/main/res/xml/pref_about.xml create mode 100644 playmusicexporter/src/main/res/xml/pref_automation.xml create mode 100644 playmusicexporter/src/main/res/xml/pref_debug.xml create mode 100644 playmusicexporter/src/main/res/xml/pref_export.xml create mode 100644 playmusicexporter/src/main/res/xml/pref_headers.xml delete mode 100644 playmusicexporter/src/main/res/xml/preferences.xml diff --git a/.idea/copyright/MIT.xml b/.idea/copyright/MIT.xml deleted file mode 100644 index b35760b..0000000 --- a/.idea/copyright/MIT.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index c1e2ebc..e7bedf3 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,7 +1,3 @@ - - - - - + \ No newline at end of file diff --git a/.idea/dictionaries/david.xml b/.idea/dictionaries/david.xml deleted file mode 100644 index 8409230..0000000 --- a/.idea/dictionaries/david.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - simpel - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index eb82d02..bdb59ca 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,9 @@ diff --git a/.idea/libraries/appcompat_v7_23_1_0.xml b/.idea/libraries/appcompat_v7_23_1_0.xml deleted file mode 100644 index be42335..0000000 --- a/.idea/libraries/appcompat_v7_23_1_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_1_1.xml b/.idea/libraries/appcompat_v7_23_1_1.xml deleted file mode 100644 index b6afcfb..0000000 --- a/.idea/libraries/appcompat_v7_23_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/design_23_1_1.xml b/.idea/libraries/design_23_1_1.xml deleted file mode 100644 index c55762c..0000000 --- a/.idea/libraries/design_23_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/mp3agic_0_8_4_SNAPSHOT.xml b/.idea/libraries/mp3agic_0_8_4_SNAPSHOT.xml deleted file mode 100644 index 234bc7b..0000000 --- a/.idea/libraries/mp3agic_0_8_4_SNAPSHOT.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_23_1_1.xml b/.idea/libraries/recyclerview_v7_23_1_1.xml deleted file mode 100644 index 6cfa065..0000000 --- a/.idea/libraries/recyclerview_v7_23_1_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_1_0.xml b/.idea/libraries/support_annotations_23_1_0.xml deleted file mode 100644 index 5d54766..0000000 --- a/.idea/libraries/support_annotations_23_1_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_1_1.xml b/.idea/libraries/support_annotations_23_1_1.xml deleted file mode 100644 index 1b84def..0000000 --- a/.idea/libraries/support_annotations_23_1_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_1_0.xml b/.idea/libraries/support_v4_23_1_0.xml deleted file mode 100644 index 5abb7c9..0000000 --- a/.idea/libraries/support_v4_23_1_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_1_1.xml b/.idea/libraries/support_v4_23_1_1.xml deleted file mode 100644 index 96947aa..0000000 --- a/.idea/libraries/support_v4_23_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4063951..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,5 +27,20 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index eae8100..2e122d7 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This project uses the [mp3agic library](https://github.com/mpatric/mp3agic) by [ ### Notice The project will be rewritten and the complete source will be a available soon. -The android package id is currently "de.arcus.playmusicexporter2". This will be replaced by the old id "de.arcus.playmusicexporter" when the new code is done. +The android package id is currently "re.jcg.playmusicexporter". This will be replaced by the old id "de.arcus.playmusicexporter" when the new code is done. You can get the old working version [here](https://www.david-schulte.de/en/play-music-exporter-updater/)! diff --git a/framework/build.gradle b/framework/build.gradle index 3fd9488..fa5dad6 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "25.0.1" + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 9 @@ -42,5 +42,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.0.1' + compile 'com.android.support:appcompat-v7:25.1.0' } diff --git a/framework/framework.iml b/framework/framework.iml index e889fd8..dad98d5 100644 --- a/framework/framework.iml +++ b/framework/framework.iml @@ -12,10 +12,7 @@ - + + + @@ -51,6 +50,15 @@ + + + + + + + + + @@ -58,6 +66,15 @@ + + + + + + + + + @@ -65,34 +82,46 @@ - + + + - - - - - + + + + + + + + + - - - + + - - - + + + - + - - - + + + + + + + + + + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dd57d81..aab9353 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,28 +1,6 @@ -# -# Copyright (c) 2015 David Schulte -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# - -#Wed Apr 10 15:27:10 PDT 2013 +#Fri Nov 25 23:05:46 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/playmusicexporter/build.gradle b/playmusicexporter/build.gradle index f14d44c..6f685fa 100644 --- a/playmusicexporter/build.gradle +++ b/playmusicexporter/build.gradle @@ -26,14 +26,15 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.1" + buildToolsVersion "25.0.2" defaultConfig { - applicationId "de.arcus.playmusicexporter2" - minSdkVersion 9 + applicationId "re.jcg.playmusicexporter" + minSdkVersion 21 targetSdkVersion 25 versionCode 102 versionName '2.4.2' + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -45,9 +46,10 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.0.1' - compile 'com.android.support:support-v4:25.0.1' - compile 'com.android.support:design:25.0.1' compile project(':framework') compile project(':playmusiclib') + compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:support-v4:25.1.0' + compile 'com.android.support:design:25.1.0' + compile 'com.android.support:support-vector-drawable:25.1.0' } diff --git a/playmusicexporter/playmusicexporter.iml b/playmusicexporter/playmusicexporter.iml index b4a112a..9833dc1 100644 --- a/playmusicexporter/playmusicexporter.iml +++ b/playmusicexporter/playmusicexporter.iml @@ -12,10 +12,7 @@