diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d57b415 --- /dev/null +++ b/.gitignore @@ -0,0 +1,109 @@ +# Created by .ignore support plugin (hsz.mobi) +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +### Linux template +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* +### Android template +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +*.iml + +# Keystore files +*.jks diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java index fb8b428..692e112 100644 --- a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/actionmode/ActionModeTitle.java @@ -29,8 +29,9 @@ import android.view.MenuInflater; import android.view.MenuItem; import de.arcus.playmusicexporter2.R; -import de.arcus.playmusicexporter2.activities.MusicTrackListActivity; import de.arcus.playmusicexporter2.activities.MusicContainerListActivity; +import de.arcus.playmusicexporter2.activities.MusicTrackListActivity; +import de.arcus.playmusicexporter2.fragments.MusicTrackListFragment; import de.arcus.playmusicexporter2.items.SelectedTrackList; /** @@ -88,6 +89,11 @@ public class ActionModeTitle implements ActionMode.Callback { MusicTrackListActivity trackDetailActivity = (MusicTrackListActivity)mSelectionList.getActivity(); trackDetailActivity.selectAll(); + } else if (mSelectionList.getActivity() instanceof MusicContainerListActivity) { + MusicContainerListActivity trackDetailContainerActivity = (MusicContainerListActivity)mSelectionList.getActivity(); + MusicTrackListFragment trackDetailFragment = (MusicTrackListFragment) trackDetailContainerActivity.getSupportFragmentManager() + .findFragmentById(R.id.track_detail_container); + trackDetailFragment.selectAll(); } return true; @@ -97,6 +103,11 @@ public class ActionModeTitle implements ActionMode.Callback { MusicTrackListActivity trackDetailActivity = (MusicTrackListActivity)mSelectionList.getActivity(); trackDetailActivity.deselectAll(); + } else if (mSelectionList.getActivity() instanceof MusicContainerListActivity) { + MusicContainerListActivity trackDetailContainerActivity = (MusicContainerListActivity)mSelectionList.getActivity(); + MusicTrackListFragment trackDetailFragment = (MusicTrackListFragment) trackDetailContainerActivity.getSupportFragmentManager() + .findFragmentById(R.id.track_detail_container); + trackDetailFragment.deselectAll(); } return true; diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/MusicContainerListActivity.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/MusicContainerListActivity.java index edc9717..192ee42 100644 --- a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/MusicContainerListActivity.java +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/MusicContainerListActivity.java @@ -279,7 +279,7 @@ public class MusicContainerListActivity extends AppCompatActivity musicTrackListFragment.setMusicTrackList(dataSourcePlaylist.getAll()); break; case Rated: - // Load all reated albums to the list + // Load all created albums to the list AlbumDataSource dataSourceRatedAlbum = new AlbumDataSource(mPlayMusicManager); dataSourceRatedAlbum.setOfflineOnly(true); dataSourceRatedAlbum.setRatedOnly(true); diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/utils/MusicPathBuilder.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/utils/MusicPathBuilder.java index d142f6b..36ab202 100644 --- a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/utils/MusicPathBuilder.java +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/utils/MusicPathBuilder.java @@ -182,6 +182,7 @@ public class MusicPathBuilder { { // Forbidden chars filename = filename.replace('\\', '-'); + filename = filename.replace('/', '-'); filename = filename.replace(':', '-'); filename = filename.replace('*', '-'); filename = filename.replace('?', '-'); diff --git a/playmusiclib/libs/mp3agic-0.8.4-SNAPSHOT.jar b/playmusiclib/libs/mp3agic-0.8.4.jar similarity index 62% rename from playmusiclib/libs/mp3agic-0.8.4-SNAPSHOT.jar rename to playmusiclib/libs/mp3agic-0.8.4.jar index 904b347..2ef31c9 100644 Binary files a/playmusiclib/libs/mp3agic-0.8.4-SNAPSHOT.jar and b/playmusiclib/libs/mp3agic-0.8.4.jar differ