trans to RxJava2

README.md

@@ -1,44 +1 @@
-# A Stylish Music Player
-
-[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/ryanhoo/StylishMusicPlayer#license)
-[![platform](https://img.shields.io/badge/platform-Android-yellow.svg)](https://www.android.com)
-[![API](https://img.shields.io/badge/API-16%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=16)
-[![gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/stylist-music-player/bug-report)
-[![PRs Welcome](https://img.shields.io/badge/prs-welcome-brightgreen.svg)](http://makeapullrequest.com)
-
-![Artboard](materials/Artboard.png)
-
-## TODO
-
-- Lyric Support
-- Settings
-
-## Acknowledgements
-
-Thanks to these projects and libraries:
-
-**Libraries**
-
-- [RxJava](https://github.com/ReactiveX/RxJava)
-- [RxAndroid](https://github.com/ReactiveX/RxAndroid)
-- [Retrofit](https://github.com/square/retrofit)
-- [Butter Knife](https://github.com/JakeWharton/butterknife)
-- [Calligraphy](https://github.com/chrisjenx/Calligraphy)
-- [LiteOrm](https://github.com/litesuits/android-lite-orm)
-
-**Design**
-
-- [Material icons](https://design.google.com/icons/)
-
-
-## License
-
-> The MIT License (MIT)
-
-> Copyright (c) 2016 Ryan Hoo
-
-> 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.
+fork from stylish music player

app/build.gradle

@@ -1,16 +1,15 @@
 import java.text.SimpleDateFormat
 
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId 'io.github.ryanhoo.music'
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion 22
+        targetSdkVersion 26
         versionCode getVersionCode("$BUILD")
         versionName "$VERSION"
         vectorDrawables.useSupportLibrary = true
@@ -24,18 +23,18 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:design:24.2.0'
-    compile 'com.android.support:recyclerview-v7:24.2.0'
-
-    compile 'io.reactivex:rxjava:1.1.9'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.jakewharton:butterknife:8.4.0'
-    apt 'com.jakewharton:butterknife-compiler:8.4.0'
-
-    compile 'uk.co.chrisjenx:calligraphy:2.2.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+    implementation 'uk.co.chrisjenx:calligraphy:2.2.0'
 }
 
 def getVersionCode(build) {

app/src/main/java/io/github/ryanhoo/music/RxBus.java

@@ -1,9 +1,14 @@
 package io.github.ryanhoo.music;
 
 import android.util.Log;
-import rx.Observable;
-import rx.Subscriber;
-import rx.subjects.PublishSubject;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.observers.DisposableObserver;
+import io.reactivex.subjects.PublishSubject;
 
 /**
  * Created with Android Studio.
@@ -59,16 +64,21 @@ public Observable<Object> toObservable() {
      * A simple logger for RxBus which can also prevent
      * potential crash(OnErrorNotImplementedException) caused by error in the workflow.
      */
-    public static Subscriber<Object> defaultSubscriber() {
-        return new Subscriber<Object>() {
+    public static DisposableObserver<Object> defaultSubscriber() {
+        return new DisposableObserver<Object>() {
             @Override
-            public void onCompleted() {
+            public void onError(Throwable e) {
+                Log.e(TAG, "What is this? Please solve this as soon as possible!", e);
+            }
+
+            @Override
+            public void onComplete() {
                 Log.d(TAG, "Duty off!!!");
             }
 
             @Override
-            public void onError(Throwable e) {
-                Log.e(TAG, "What is this? Please solve this as soon as possible!", e);
+            protected void onStart() {
+                super.onStart();
             }
 
             @Override

app/src/main/java/io/github/ryanhoo/music/data/source/AppContract.java

@@ -1,11 +1,11 @@
 package io.github.ryanhoo.music.data.source;
 
+import java.util.List;
+
 import io.github.ryanhoo.music.data.model.Folder;
 import io.github.ryanhoo.music.data.model.PlayList;
 import io.github.ryanhoo.music.data.model.Song;
-import rx.Observable;
-
-import java.util.List;
+import io.reactivex.Observable;
 
 /**
  * Created with Android Studio.