Merge branch 'master' into performance-test

.gitignore

@@ -1,44 +1,75 @@
-app/src/main/res/values/com_crashlytics_export_strings.xml
-app/src/main/assets/crashlytics-build.properties
-#app/crashlytics.properties
-
-# built application files
+### Android ###
+# Built application files
 *.apk
 *.ap_
 
-# files for the dex VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
 *.class
 
-# generated files
+# Generated files
 bin/
 gen/
-target/
-
-# external libraries
-#libs/
+out/
 
-# gradle files
+# Gradle files
 .gradle/
 build/
 
 # Local configuration file (sdk path, etc)
 local.properties
-.gitattributes
 
-# Eclipse project files
-.classpath
-.project
+# Proguard folder generated by Eclipse
+proguard/
 
-# Android Studio
-*.iml
-.idea
-ajcore.*.txt
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
 captures/
 
-# Mac
-.DS_Store
+# Intellij
+*.iml
+.idea/
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+### Android Patch ###
+gen-external-apklibs
+
+### fastlane ###
+# fastlane - A streamlined workflow tool for Cocoa deployment
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+# fastlane specific
+fastlane/report.xml
+
+# deliver temporary files
+fastlane/Preview.html
+
+# snapshot generated screenshots
+fastlane/screenshots/**/*.png
+fastlane/screenshots/screenshots.html
+
+# scan temporary files
+fastlane/test_output
+
+# Google Play files
+fastlane/metadata/
 
-app/release/
+Gemfile.lock

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

README.md

@@ -1,14 +1,35 @@
-# Phonograph
+# Phonograph ([Forked from kabouzeid](https://github.com/kabouzeid/Phonograph))
+
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://github.com/kabouzeid/Phonograph/blob/master/LICENSE.txt)
 
 **A material designed local music player for Android.**
 
-![Screenshots](./art/art.jpg?raw=true)
+## About this fork
+The purpose of this fork is to implement an easy to use and powerful way to manage your playlists. The goals are:
+- [x] See whether the selected song is already in a playlist
+- [x] See whether multiple songs are already in a playlist
+- [x] Do not add songs to playlist which would become duplicates
+- [ ] Material Design for the checkmark
+- [ ] Be able to remove a song which is already in a playlist
+- [ ] Option to remove duplicate songs from existing playlists
+- [ ] Sync playlists (with other devices, using textfiles in Google Drive)
+
+
+![image](https://user-images.githubusercontent.com/33571916/52509049-01e1c300-2bf7-11e9-979a-8cf872436ec2.png)
+
+In the playlist-menu checkmarks indicate whether a song / a number of songs are already in a list.
+The brackets around the checkmark show that only some of the songs are part of the playlist.
 
-<a href="https://play.google.com/store/apps/details?id=com.kabouzeid.gramophone">
-  <img height="50" alt="Get it on Google Play"
-      src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge.png" />
-</a>
+This fork is only different from kabouzeid/master in these commits: 
 
+[6bac337](https://github.com/Sogolumbo/Phonograph/commit/6bac3379636d97a68f50ebb1672654ef1aa310fb),
+[d91f11a](https://github.com/Sogolumbo/Phonograph/commit/d91f11ad068192806979da79a0d089835d574524),
+[e81f655](https://github.com/Sogolumbo/Phonograph/commit/e81f655c802bb2953d6e6d093cc3a1c774b897c4),
+[8254527](https://github.com/Sogolumbo/Phonograph/commit/8254527339ba7e8acd5cc522b34e3ee724ba9b5a),
+[4512b43](https://github.com/Sogolumbo/Phonograph/commit/4512b43529231a57636b7d62fcbade9fb81329b9).
 
+## Contributing
+I love any support, feedback or new ideas. So feel free to contribute in any possible way. I don't have any experience with android programming so I really need help D:
 
+### Getting the App for non-Programmers
+If you want the app but don't know how to build it feel free to send me a personal message. We will find a solution :)

app/build.gradle

@@ -1,23 +1,6 @@
-buildscript {
-    repositories {
-        maven { url 'https://maven.fabric.io/public' }
-        mavenCentral()
-    }
-
-    dependencies {
-        //noinspection GradleDynamicVersion
-        classpath 'io.fabric.tools:gradle:1.+'
-        classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-    }
-}
+import javax.annotation.Nullable
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
-apply plugin: 'com.jakewharton.hugo'
-
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
 
 static def gitBranch() {
     def branch = 'GitHub'
@@ -37,34 +20,52 @@ static def gitBranch() {
     branch
 }
 
-android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-    dataBinding {
-        enabled = true
+def getProperties(String fileName) {
+    final Properties properties = new Properties()
+    def file = file(fileName)
+    if (file.exists()) {
+        file.withInputStream { stream -> properties.load(stream) }
     }
+    return properties
+}
+
+static def getProperty(@Nullable Properties properties, String name) {
+    return properties.getProperty(name) ?: "$name missing"
+}
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
 
-        renderscriptTargetApi 27
+        renderscriptTargetApi 28
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'com.kabouzeid.gramophone'
-        versionCode 151
-        versionName '0.16.6'
+        versionCode 175
+        versionName '1.3.1'
+    }
+    signingConfigs {
+        release {
+            Properties properties = getProperties('/Users/karim/Documents/Phonograph/privatekeys/keystore.properties')
+            storeFile file(getProperty(properties, 'storeFile'))
+            keyAlias getProperty(properties, 'keyAlias')
+            storePassword getProperty(properties, 'storePassword')
+            keyPassword getProperty(properties, 'keyPassword')
+        }
     }
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
         debug {
             applicationIdSuffix '.debug'
             versionNameSuffix ' DEBUG (' + gitBranch() + ')'
-
-            ext.enableCrashlytics = false // Disable fabric build ID generation for debug builds
         }
     }
     packagingOptions {
@@ -80,56 +81,58 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-}
-
-ext {
-    supportLibVersion = '27.0.2'
+    // Required for IntroActivity
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:support-compat:$supportLibVersion"
-    implementation "com.android.support:support-core-utils:$supportLibVersion"
-    implementation "com.android.support:support-core-ui:$supportLibVersion"
-    implementation "com.android.support:support-media-compat:$supportLibVersion"
-    implementation "com.android.support:support-fragment:$supportLibVersion"
-    implementation "com.android.support:support-v13:$supportLibVersion"
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:gridlayout-v7:$supportLibVersion"
-    implementation "com.android.support:cardview-v7:$supportLibVersion"
-    implementation "com.android.support:palette-v7:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:support-annotations:$supportLibVersion"
-    implementation "com.android.support:percent:$supportLibVersion"
-    implementation "com.android.support:preference-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
-    implementation 'com.github.kabouzeid:app-theme-helper:1.3.7'
+    implementation 'androidx.core:core:1.0.2'
+    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
+    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
+    implementation 'androidx.media:media:1.0.1'
+    implementation 'androidx.fragment:fragment:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.2'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation 'com.github.kabouzeid:app-theme-helper:1.3.10'
     implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
     implementation 'com.github.kabouzeid:SeekArc:1.2-kmod'
-    implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3'
+    implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.3-kmod'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
     implementation 'com.afollestad:material-cab:0.1.12'
     implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.anjlab.android.iab.v3:library:1.0.44'
-    implementation 'de.psdev.licensesdialog:licensesdialog:1.8.3'
-    implementation 'com.github.bumptech.glide:glide:3.8.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
-    implementation 'com.heinrichreimersoftware:material-intro:1.6.2'
+    implementation 'com.heinrichreimersoftware:material-intro:1.6'
     implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
-    implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
-    implementation 'com.jakewharton:butterknife:8.8.1'
     implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') {
         transitive = true
     }
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.8.0'
-    implementation('com.crashlytics.sdk.android:answers:1.3.13@aar') {
-        transitive = true
-    }
-    testImplementation 'junit:junit:4.12'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+    implementation 'com.jakewharton:butterknife:10.1.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
+
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+
+    implementation 'com.anjlab.android.iab.v3:library:1.0.44'
+    implementation 'de.psdev.licensesdialog:licensesdialog:2.0.0'
+
+    implementation 'com.github.bumptech.glide:glide:3.8.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
+    implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
+
+    implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
 }

app/proguard-rules.pro

@@ -16,6 +16,9 @@
 #   public *;
 #}
 
+-dontwarn
+-ignorewarnings
+
 # RetroFit
 -dontwarn retrofit.**
 -keep class retrofit.** { *; }
@@ -41,6 +44,3 @@
 }
 
 -keep class !android.support.v7.internal.view.menu.**,** {*;}
-
--dontwarn
--ignorewarnings

app/src/debug/res/values/donottranslate.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Phonograph DEBUG</string>
+    <string name="app_name" translatable="false">Phonograph</string>
 </resources>