From 8e6ab40d93e758f06e2ce44622b7f77554e8bec3 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanth@stacklighting.com>
Date: Wed, 28 Nov 2018 13:18:19 +0530
Subject: [PATCH] Kotlin

---
 app/app.iml                                   |  35 +++-
 app/build.gradle                              |   9 +-
 .../retromusic/helper/MusicPlayerRemote.java  |   4 +-
 .../retromusic/helper/SearchQueryHelper.java  |  18 +-
 .../retromusic/loaders/AlbumLoader.java       |   6 +-
 .../retromusic/loaders/ArtistLoader.java      |   8 +-
 .../retromusic/loaders/ArtistSongLoader.java  |   4 +-
 .../retromusic/loaders/GenreLoader.java       |  12 +-
 .../loaders/LastAddedSongsLoader.java         |   4 +-
 .../retromusic/loaders/SearchLoader.java      |   2 +-
 .../monkey/retromusic/loaders/SongLoader.java | 196 ------------------
 .../monkey/retromusic/loaders/SongLoader.kt   | 182 ++++++++++++++++
 .../TopAndRecentlyPlayedTracksLoader.java     |   6 +-
 .../smartplaylist/ShuffleAllPlaylist.java     |   2 +-
 .../providers/MusicPlaybackQueueStore.java    |   2 +-
 .../retromusic/providers/RepositoryImpl.java  |   6 +-
 .../service/WearBrowserService.java           |   4 +-
 .../service/daydream/RetroMusicAlbums.java    |   2 +-
 .../tageditor/SongTagEditorActivity.java      |   2 +-
 .../mainactivity/LibraryFragment.java         |   2 +-
 .../mainactivity/home/BannerHomeFragment.java |   2 +-
 .../name/monkey/retromusic/util/FileUtil.java |   9 +-
 .../monkey/retromusic/util/MusicUtil.java     |   2 +-
 23 files changed, 266 insertions(+), 253 deletions(-)
 delete mode 100644 app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt

diff --git a/app/app.iml b/app/app.iml
index caf1673d..2566dab7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -21,6 +21,28 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+        <compilerSettings />
+        <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/normalDebug" />
+          <option name="classpath" value="$MODULE_DIR$/libs/juniversalchardet-1.0.3.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/multidex-2.0.0.aar/54f1c3d62fe7611370986b2fd6299433/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-commons-0.9.6.0.aar/58a879902cb0ac3ddc64df096149fe46/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-core-0.9.6.0.aar/1f8e3dd9fae0498d8a2b20a6d7253988/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-material-cab-0.1.12.aar/9c42900bb5605e1bdfe3ab0e235a79a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-advrecyclerview-0.11.0.aar/f479cf015a5bf1cf2be9f67b5f61e8a6/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-calligraphy-2.3.0.aar/97deeacfdbab0e40497706f8c4a5c18d/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-library-1.4.2.aar/a4c8df9d4c82b43088c39cf40ed85a3c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0.aar/49f613beb456c712b7c885b1e47921a5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/preference-1.0.0.aar/09d14c4319f2ea0e6a7d9ea2ed2acdcf/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/material-1.0.0.aar/b08b25f9ffa1263b349fc2c360eb949d/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-framework-16.1.0.aar/de6271c30562ce2e3a3e48ecfd2b0722/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-16.1.0.aar/82acf659c838cfa552e493d26757efde/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/mediarouter-1.0.0.aar/0f51d48e9e4a54a3d40e01fedf0b0d83/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/appcompat-1.0.2.aar/51d975e57330a62a61a7c5076b372a3b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0.aar/e3a1adcdd49604eb0fd828568cf2ded3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-slidableactivity-2.0.6.aar/a296e722a28ba7b3c313bafb3d396cae/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-AndroidSlidingUpPanel-3.5.0.aar/d5f6c370b752c1da7940fe381e0d2da0/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/play-services-flags-16.0.1.aar/0426aa6426aa65925cc21145ee604c9b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-base-16.0.1.aar/ff7f663d472273a39c1f9e5035cee493/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-tasks-16.0.1.aar/46ca5d484097e6056e5795d32e7feb54/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-play-services-basement-16.0.1.aar/fe118068c68b1dbfc07127d159b0f281/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-v4-1.0.0.aar/75081ac6e68e74d349599c47284282e4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/fragment-1.0.0.aar/7dcca52b9f3c89547d2bc6c32882acdd/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-android-observablescrollview-1.6.0.aar/d0ba6da9008baf37d374ebe8c69e4e64/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-RecyclerView-FastScroll-1.0.16-kmod.aar/5f7e50484337cfe35fd96d28604ed7a1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/recyclerview-1.0.0.aar/15506489faaa569025f8c230946d5fa1/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0.aar/02a12bcc3f4967bc138de83cfc908fc8/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cardview-1.0.0.aar/cb28f2f7a3c0f50c6e51bdf131dc03c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/palette-1.0.0.aar/9bad23e1c7243a9d9b9a0a86d8463e68/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/library-1.0.44.jar/0c5862b2e50c6075e293189842dff0a7/jetified-library-1.0.44.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-butterknife-9.0.0-rc1.aar/ae3c4db45068be4e01890de4e85c3b8e/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jetified-butterknife-runtime-9.0.0-rc1.aar/d49d8ca00f4b3626fa7985e377532497/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/butterknife-annotations-9.0.0-rc1.jar/b3e636bd0cf6b22ea4158690314ff500/jetified-butterknife-annotations-9.0.0-rc1.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-animated-1.0.0.aar/d2cc00d4e003850bcb9d487c642652fc/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-ui-1.0.0.aar/a66d507f5de3c821483f581e7d3199f3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/legacy-support-core-utils-1.0.0.aar/ae12074f4c498838c65e76ad7e16e009/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/loader-1.0.0.aar/923d1c35d98a3273df2353a83b534208/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-viewmodel-2.0.0.aar/22b27fac1b329c3aa4673eda8df6c0c2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/vectordrawable-1.0.1.aar/d7f9664759736ab0457f64ed5d87a956/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/transition-1.0.0.aar/01d8c17fada51bd5683b1d6167b181c3/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/media-1.0.0.aar/83f90da8444def515596c40156312d8e/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/viewpager-1.0.0.aar/67dae85255cd99793582455500556ec2/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-1.0.0.aar/53c7c09af9948c6d5b0cf3d70c9fba00/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/drawerlayout-1.0.0.aar/ce19088f604150a58fb7267bc83e141f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-1.0.0.aar/b559f66d4e01d3dff3b5758cd084a29f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/customview-1.0.0.aar/17216852b8fa1c3e3fa02e641d706687/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-1.0.0.aar/2be931c5e9c38fa8f871ff0d0c1ef884/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-1.0.0.aar/6c5f0debea713bf36171fc09b0d10a9c/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-1.0.1.aar/0959e6cf61d61a7b41db6bd7c348f863/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/versionedparcelable-1.0.0.aar/77fd0ba8b75fef07154e5eaa40b7ebc1/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.0.0/42858b26cafdaa69b6149f45dfc2894007bc2c7a/collection-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/cursoradapter-1.0.0.aar/2e49d1cf66b9c2eeda70f202e41b9d5f/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/interpolator-1.0.0.aar/dde6490b82695a658a3e1758937d9976/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/documentfile-1.0.0.aar/889c649e165283ed472be8f347c79530/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-1.0.0.aar/fa6de59ab75fa0a66834c058f2d4e8db/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/print-1.0.0.aar/0fa0822a973d977ef87877e3017cfea5/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-runtime-2.0.0.aar/fa7af9cffcfa2723241f4b9cea7c7933/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-2.0.0.aar/a3b583314fba43e3fc7a8312379d4ab4/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/lifecycle-livedata-core-2.0.0.aar/5984d52892998721d92129423a836b5b/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/core-runtime-2.0.0.aar/3dbd159f925e7bb0466df2189ddc2b19/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.0.0/bb21b9a11761451b51624ac428d1f1bb5deeac38/core-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.0.0/e070ffae07452331bc5684734fce6831d531785c/lifecycle-common-2.0.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.0.0/45599f2cd5965ac05a1488fa2a5c0cdd7c499ead/annotation-1.0.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/converter-gson-2.4.0.jar/b224dd188a155a643291a79f7d5eae4a/jetified-converter-gson-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/adapter-rxjava2-2.4.0.jar/bdb8d5d82520264eff85259d835a662b/jetified-adapter-rxjava2-2.4.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/retrofit-2.4.0.jar/b7964051f8a1f9467255d8ee1ff1f4b1/jetified-retrofit-2.4.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/okhttp3-integration/1.5.0/1e5d1f5fb6f867397009e73ea79b108ef6a51fc0/okhttp3-integration-1.5.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/glide-3.8.0.jar/6c50118f57d86f3b2683cfe1f00dbecb/jetified-glide-3.8.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/rxandroid-2.0.2.aar/2ab2ae418dc7e378941bd6044d4b363d/jars/classes.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.17/ebbf1af30cbae72ce658926fb7faf554225479f0/rxjava-2.1.17.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/logging-interceptor-3.11.0.jar/5f5f54118b67f2953bc3e7733351657d/jetified-logging-interceptor-3.11.0.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okhttp-3.11.0.jar/0d8aa7ebc5f9ff01684263e20ba912cf/jetified-okhttp-3.11.0.jar:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/appthemehelper/build/intermediates/intermediate-jars/debug/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/jaudiotagger-2.2.3.aar/0e6777357fb7de3b096a11b5685b5e10/jars/classes.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/nanohttpd-2.3.1.jar/b29bf458cf770f2f6f2508001475f750/jetified-nanohttpd-2.3.1.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.10/4d147bf43060dc43d61b096e24da1e67dfe0c032/kotlin-stdlib-jdk7-1.3.10.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/gson-2.8.2.jar/2c4e77fe308afafda36de643efaa86bb/jetified-gson-2.8.2.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar:/Users/hemanths/.gradle/caches/transforms-1/files-1.1/okio-1.14.0.jar/54837c7f01a42bfbb80c15456764fff5/jetified-okio-1.14.0.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.10/b178c1501609c6e4ee8be635513cb023a466457d/kotlin-stdlib-1.3.10.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.10/1b19d99229dcedad7caf50534dce38fe82845269/kotlin-stdlib-common-1.3.10.jar:/Users/hemanths/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/Users/hemanths/Library/Android/sdk/platforms/android-28/android.jar" />
+          <option name="noStdlib" value="true" />
+          <option name="noReflect" value="true" />
+          <option name="moduleName" value="app_normalDebug" />
+          <option name="addCompilerBuiltIns" value="true" />
+          <option name="loadBuiltInsFromDependencies" value="true" />
+          <option name="languageVersion" value="1.3" />
+          <option name="apiVersion" value="1.3" />
+          <option name="pluginOptions">
+            <array />
+          </option>
+          <option name="pluginClasspaths">
+            <array />
+          </option>
+        </compilerArguments>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/build/intermediates/javac/normalDebug/compileNormalDebugJavaWithJavac/classes" />
@@ -130,11 +152,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -146,26 +166,23 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/linked_res_for_bundle" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/module_bundle" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shrunk_linked_res_for_bundle" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
@@ -173,6 +190,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:okhttp3-integration:1.5.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.10@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-16.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
@@ -188,6 +206,7 @@
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:9.0.0-rc1@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-16.0.1" level="project" />
@@ -195,6 +214,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.github.ksoichiro:android-observablescrollview-1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-16.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.11.0@jar" level="project" />
@@ -231,6 +251,7 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons-0.9.6.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-preference-v14-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.10@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v13-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-framework-16.1.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index c65db325..6141b996 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
@@ -52,7 +53,9 @@ android {
             versionName defaultConfig.versionName + "_" + getDate()
             dimension "default"
         }
-
+        sans {
+            dimension "default"
+        }
     }
 
     packagingOptions {
@@ -146,5 +149,9 @@ dependencies {
     implementation 'com.github.hannesa2:AndroidSlidingUpPanel:3.5.0'
     implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 }
+repositories {
+    mavenCentral()
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
index a1350042..a26f6b76 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
@@ -409,7 +409,7 @@ public class MusicPlayerRemote {
                                 MediaStore.Audio.AudioColumns._ID + "=?",
                                 new String[]{songId}
                         ));*/
-                        songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                        songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
                                 musicService,
                                 MediaStore.Audio.AudioColumns._ID + "=?",
                                 new String[]{songId}))
@@ -431,7 +431,7 @@ public class MusicPlayerRemote {
                     songFile = new File(uri.getPath());
                 }
                 if (songFile != null) {
-                    songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                    songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
                             musicService,
                             MediaStore.Audio.AudioColumns.DATA + "=?",
                             new String[]{songFile.getAbsolutePath()}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
index 7aaa91ae..acef195a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.java
@@ -36,51 +36,51 @@ public class SearchQueryHelper {
 
         ArrayList<Song> songs = new ArrayList<>();
         if (artistName != null && albumName != null && titleName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION + AND + ALBUM_SELECTION + AND + TITLE_SELECTION, new String[]{artistName.toLowerCase(), albumName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ARTIST_SELECTION + AND + ALBUM_SELECTION + AND + TITLE_SELECTION, new String[]{artistName.toLowerCase(), albumName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
         if (artistName != null && titleName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION + AND + TITLE_SELECTION, new String[]{artistName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ARTIST_SELECTION + AND + TITLE_SELECTION, new String[]{artistName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
         if (albumName != null && titleName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION + AND + TITLE_SELECTION, new String[]{albumName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ALBUM_SELECTION + AND + TITLE_SELECTION, new String[]{albumName.toLowerCase(), titleName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
         if (artistName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION, new String[]{artistName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ARTIST_SELECTION, new String[]{artistName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
         if (albumName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION, new String[]{albumName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ALBUM_SELECTION, new String[]{albumName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
         if (titleName != null) {
-            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, TITLE_SELECTION, new String[]{titleName.toLowerCase()})).blockingFirst();
+            songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, TITLE_SELECTION, new String[]{titleName.toLowerCase()})).blockingFirst();
         }
         if (!songs.isEmpty()) {
             return songs;
         }
-        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
+        songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ARTIST_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
 
         if (!songs.isEmpty()) {
             return songs;
         }
-        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
+        songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, ALBUM_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
         if (!songs.isEmpty()) {
             return songs;
         }
-        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, TITLE_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
+        songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, TITLE_SELECTION, new String[]{query.toLowerCase()})).blockingFirst();
         if (!songs.isEmpty()) {
             return songs;
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
index 20052668..0edf4ebc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 public class AlbumLoader {
 
   public static Observable<ArrayList<Album>> getAllAlbums(@NonNull Context context) {
-    Observable<ArrayList<Song>> songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+    Observable<ArrayList<Song>> songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
         context,
         null,
         null,
@@ -30,7 +30,7 @@ public class AlbumLoader {
   @NonNull
   public static Observable<ArrayList<Album>> getAlbums(@NonNull final Context context,
       String query) {
-    Observable<ArrayList<Song>> songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+    Observable<ArrayList<Song>> songs = SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
         context,
         AudioColumns.ALBUM + " LIKE ?",
         new String[]{"%" + query + "%"},
@@ -42,7 +42,7 @@ public class AlbumLoader {
   @NonNull
   public static Observable<Album> getAlbum(@NonNull final Context context, int albumId) {
     return Observable.create(e -> {
-      Observable<ArrayList<Song>> songs = SongLoader.getSongs(SongLoader
+      Observable<ArrayList<Song>> songs = SongLoader.Companion.getSongs(SongLoader.Companion
           .makeSongCursor(context, AudioColumns.ALBUM_ID + "=?",
               new String[]{String.valueOf(albumId)}, getSongLoaderSortOrder(context)));
       songs.subscribe(songs1 -> {
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
index 94e08244..88e8fa57 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.java
@@ -22,7 +22,7 @@ public class ArtistLoader {
 
     @NonNull
     public static Observable<Artist> getArtist(@NonNull final Context context, int artistId) {
-        return Observable.create(e -> SongLoader.getSongs(SongLoader.makeSongCursor(
+        return Observable.create(e -> SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
                 context,
                 AudioColumns.ARTIST_ID + "=?",
                 new String[]{String.valueOf(artistId)},
@@ -36,8 +36,8 @@ public class ArtistLoader {
 
     @NonNull
     public static Observable<ArrayList<Artist>> getAllArtists(@NonNull final Context context) {
-        return Observable.create(e -> SongLoader
-                .getSongs(SongLoader.makeSongCursor(
+        return Observable.create(e -> SongLoader.Companion
+                .getSongs(SongLoader.Companion.makeSongCursor(
                         context,
                         null,
                         null,
@@ -51,7 +51,7 @@ public class ArtistLoader {
 
     @NonNull
     public static Observable<ArrayList<Artist>> getArtists(@NonNull final Context context, String query) {
-        return Observable.create(e -> SongLoader.getSongs(SongLoader.makeSongCursor(
+        return Observable.create(e -> SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(
                 context,
                 AudioColumns.ARTIST + " LIKE ?",
                 new String[]{"%" + query + "%"},
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
index 1f1064bf..99be9459 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistSongLoader.java
@@ -17,12 +17,12 @@ public class ArtistSongLoader extends SongLoader {
 
     @NonNull
     public static Observable<ArrayList<Song>> getArtistSongList(@NonNull final Context context, final int artistId) {
-        return getSongs(makeArtistSongCursor(context, artistId));
+        return Companion.getSongs(makeArtistSongCursor(context, artistId));
     }
 
     public static Cursor makeArtistSongCursor(@NonNull final Context context, final int artistId) {
         try {
-            return makeSongCursor(
+            return Companion.makeSongCursor(
                     context,
                     MediaStore.Audio.AudioColumns.ARTIST_ID + "=?",
                     new String[]{
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
index 49e0e4f7..34f9b059 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.java
@@ -5,11 +5,11 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.Genres;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.model.Genre;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.PreferenceUtil;
@@ -30,7 +30,7 @@ public class GenreLoader {
             return getSongsWithNoGenre(context);
         }
 
-        return SongLoader.getSongs(makeGenreSongCursor(context, genreId));
+        return SongLoader.Companion.getSongs(makeGenreSongCursor(context, genreId));
     }
 
     @NonNull
@@ -46,11 +46,11 @@ public class GenreLoader {
     private static Observable<ArrayList<Song>> getSongsWithNoGenre(@NonNull final Context context) {
         String selection = BaseColumns._ID + " NOT IN " +
                 "(SELECT " + Genres.Members.AUDIO_ID + " FROM audio_genres_map)";
-        return SongLoader.getSongs(SongLoader.makeSongCursor(context, selection, null));
+        return SongLoader.Companion.getSongs(SongLoader.Companion.makeSongCursor(context, selection, null));
     }
 
     private static boolean hasSongsWithNoGenre(@NonNull final Context context) {
-        final Cursor allSongsCursor = SongLoader.makeSongCursor(context, null, null);
+        final Cursor allSongsCursor = SongLoader.Companion.makeSongCursor(context, null, null);
         final Cursor allSongsWithGenreCursor = makeAllSongsWithGenreCursor(context);
 
         if (allSongsCursor == null || allSongsWithGenreCursor == null) {
@@ -79,7 +79,7 @@ public class GenreLoader {
         try {
             return context.getContentResolver().query(
                     Genres.Members.getContentUri("external", genreId),
-                    SongLoader.BASE_PROJECTION, SongLoader.BASE_SELECTION, null, PreferenceUtil.getInstance().getSongSortOrder());
+                    SongLoader.Companion.getBASE_PROJECTION(), SongLoader.BASE_SELECTION, null, PreferenceUtil.getInstance().getSongSortOrder());
         } catch (SecurityException e) {
             return null;
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.java
index 7a7d37c5..2de6083d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.java
@@ -21,13 +21,13 @@ public class LastAddedSongsLoader {
 
     @NonNull
     public static Observable<ArrayList<Song>> getLastAddedSongs(@NonNull Context context) {
-        return SongLoader.getSongs(makeLastAddedCursor(context));
+        return SongLoader.Companion.getSongs(makeLastAddedCursor(context));
     }
 
     public static Cursor makeLastAddedCursor(@NonNull final Context context) {
         long cutoff = PreferenceUtil.getInstance().getLastAddedCutoff();
 
-        return SongLoader.makeSongCursor(
+        return SongLoader.Companion.makeSongCursor(
                 context,
                 MediaStore.Audio.Media.DATE_ADDED + ">?",
                 new String[]{String.valueOf(cutoff)},
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
index 46880686..7117e7db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.java
@@ -14,7 +14,7 @@ public class SearchLoader {
         ArrayList<Object> results = new ArrayList<>();
         return Observable.create(e -> {
             if (!TextUtils.isEmpty(query)) {
-                SongLoader.getSongs(context, query)
+                SongLoader.Companion.getSongs(context, query)
                         .subscribe(songs -> {
                             if (!songs.isEmpty()) {
                                 results.add(context.getResources().getString(R.string.songs));
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
deleted file mode 100644
index ec9804de..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package code.name.monkey.retromusic.loaders;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.BaseColumns;
-import android.provider.MediaStore;
-import android.provider.MediaStore.Audio.AudioColumns;
-
-import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import code.name.monkey.retromusic.helper.ShuffleHelper;
-import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.providers.BlacklistStore;
-import code.name.monkey.retromusic.util.PreferenceUtil;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Function;
-
-/**
- * Created by hemanths on 10/08/17.
- */
-
-public class SongLoader {
-
-    protected static final String BASE_SELECTION =
-            AudioColumns.IS_MUSIC + "=1" + " AND " + AudioColumns.TITLE + " != ''";
-    protected static final String[] BASE_PROJECTION = new String[]{
-            BaseColumns._ID,// 0
-            AudioColumns.TITLE,// 1
-            AudioColumns.TRACK,// 2
-            AudioColumns.YEAR,// 3
-            AudioColumns.DURATION,// 4
-            AudioColumns.DATA,// 5
-            AudioColumns.DATE_MODIFIED,// 6
-            AudioColumns.ALBUM_ID,// 7
-            AudioColumns.ALBUM,// 8
-            AudioColumns.ARTIST_ID,// 9
-            AudioColumns.ARTIST,// 10
-    };
-
-    @NonNull
-    public static Observable<ArrayList<Song>> getAllSongs(@NonNull Context context) {
-        Cursor cursor = makeSongCursor(context, null, null);
-        return getSongs(cursor);
-    }
-
-    @NonNull
-    public static Observable<ArrayList<Song>> getSongs(@NonNull final Context context,
-                                                       final String query) {
-        Cursor cursor = makeSongCursor(context, AudioColumns.TITLE + " LIKE ?",
-                new String[]{"%" + query + "%"});
-        return getSongs(cursor);
-    }
-
-    @NonNull
-    public static Observable<ArrayList<Song>> getSongs(@Nullable final Cursor cursor) {
-        return Observable.create(e -> {
-            ArrayList<Song> songs = new ArrayList<>();
-            if (cursor != null && cursor.moveToFirst()) {
-                do {
-                    songs.add(getSongFromCursorImpl(cursor));
-                } while (cursor.moveToNext());
-            }
-
-            if (cursor != null) {
-                cursor.close();
-            }
-            e.onNext(songs);
-            e.onComplete();
-        });
-    }
-
-    @NonNull
-    private static Song getSongFromCursorImpl(@NonNull Cursor cursor) {
-        final int id = cursor.getInt(0);
-        final String title = cursor.getString(1);
-        final int trackNumber = cursor.getInt(2);
-        final int year = cursor.getInt(3);
-        final long duration = cursor.getLong(4);
-        final String data = cursor.getString(5);
-        final long dateModified = cursor.getLong(6);
-        final int albumId = cursor.getInt(7);
-        final String albumName = cursor.getString(8);
-        final int artistId = cursor.getInt(9);
-        final String artistName = cursor.getString(10);
-
-        return new Song(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName,
-                artistId, artistName);
-    }
-
-    @Nullable
-    public static Cursor makeSongCursor(@NonNull final Context context,
-                                        @Nullable final String selection, final String[] selectionValues) {
-        return makeSongCursor(context, selection, selectionValues,
-                PreferenceUtil.getInstance().getSongSortOrder());
-    }
-
-    @Nullable
-    public static Cursor makeSongCursor(@NonNull final Context context, @Nullable String selection,
-                                        String[] selectionValues, final String sortOrder) {
-        if (selection != null && !selection.trim().equals("")) {
-            selection = BASE_SELECTION + " AND " + selection;
-        } else {
-            selection = BASE_SELECTION;
-        }
-
-        // Blacklist
-        ArrayList<String> paths = BlacklistStore.getInstance(context).getPaths();
-        if (!paths.isEmpty()) {
-            selection = generateBlacklistSelection(selection, paths.size());
-            selectionValues = addBlacklistSelectionValues(selectionValues, paths);
-        }
-
-        try {
-            return context.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                    BASE_PROJECTION, selection, selectionValues, sortOrder);
-        } catch (SecurityException e) {
-            return null;
-        }
-    }
-
-    private static String generateBlacklistSelection(String selection, int pathCount) {
-        StringBuilder newSelection = new StringBuilder(
-                selection != null && !selection.trim().equals("") ? selection + " AND " : "");
-        newSelection.append(AudioColumns.DATA + " NOT LIKE ?");
-        for (int i = 0; i < pathCount - 1; i++) {
-            newSelection.append(" AND " + AudioColumns.DATA + " NOT LIKE ?");
-        }
-        return newSelection.toString();
-    }
-
-    private static String[] addBlacklistSelectionValues(String[] selectionValues,
-                                                        ArrayList<String> paths) {
-        if (selectionValues == null) {
-            selectionValues = new String[0];
-        }
-        String[] newSelectionValues = new String[selectionValues.length + paths.size()];
-        System.arraycopy(selectionValues, 0, newSelectionValues, 0, selectionValues.length);
-        for (int i = selectionValues.length; i < newSelectionValues.length; i++) {
-            newSelectionValues[i] = paths.get(i - selectionValues.length) + "%";
-        }
-        return newSelectionValues;
-    }
-
-    @NonNull
-    public static Observable<Song> getSong(@Nullable Cursor cursor) {
-        return Observable.create(e -> {
-            Song song;
-            if (cursor != null && cursor.moveToFirst()) {
-                song = getSongFromCursorImpl(cursor);
-            } else {
-                song = Song.EMPTY_SONG;
-            }
-            if (cursor != null) {
-                cursor.close();
-            }
-            e.onNext(song);
-            e.onComplete();
-        });
-    }
-
-    @NonNull
-    public static Observable<Song> getSong(@NonNull final Context context, final int queryId) {
-        Cursor cursor = makeSongCursor(context, AudioColumns._ID + "=?",
-                new String[]{String.valueOf(queryId)});
-        return getSong(cursor);
-    }
-
-    public static Observable<ArrayList<Song>> suggestSongs(@NonNull Context context) {
-        return SongLoader.getAllSongs(context)
-                .flatMap((Function<ArrayList<Song>, ObservableSource<ArrayList<Song>>>) songs -> {
-                    ArrayList<Song> list = new ArrayList<>();
-                    ShuffleHelper.makeShuffleList(songs, -1);
-                    if (songs.size() > 9) {
-                        list.addAll(songs.subList(0, 9));
-                    }
-                    return Observable.just(list);
-                });
-                /*.subscribe(songs -> {
-                    ArrayList<Song> list = new ArrayList<>();
-                    if (songs.isEmpty()) {
-                        return;
-                    }
-                    ShuffleHelper.makeShuffleList(songs, -1);
-                    if (songs.size() > 10) {
-                        list.addAll(songs.subList(0, 10));
-                    } else {
-                        list.addAll(songs);
-                    }
-                   return;
-                });*/
-    }
-
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt
new file mode 100644
index 00000000..4691189a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt
@@ -0,0 +1,182 @@
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.BaseColumns
+import android.provider.MediaStore
+import android.provider.MediaStore.Audio.AudioColumns
+import code.name.monkey.retromusic.helper.ShuffleHelper
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.providers.BlacklistStore
+import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.Observable
+import java.util.*
+
+/**
+ * Created by hemanths on 10/08/17.
+ */
+
+open class SongLoader {
+    companion object {
+
+        const val BASE_SELECTION = AudioColumns.IS_MUSIC + "=1" + " AND " + AudioColumns.TITLE + " != ''"
+        val BASE_PROJECTION = arrayOf(BaseColumns._ID, // 0
+                AudioColumns.TITLE, // 1
+                AudioColumns.TRACK, // 2
+                AudioColumns.YEAR, // 3
+                AudioColumns.DURATION, // 4
+                AudioColumns.DATA, // 5
+                AudioColumns.DATE_MODIFIED, // 6
+                AudioColumns.ALBUM_ID, // 7
+                AudioColumns.ALBUM, // 8
+                AudioColumns.ARTIST_ID, // 9
+                AudioColumns.ARTIST)// 10
+
+        fun getAllSongs(context: Context): Observable<ArrayList<Song>> {
+            val cursor = makeSongCursor(context, null, null)
+            return getSongs(cursor)
+        }
+
+        fun getSongs(context: Context, query: String): Observable<ArrayList<Song>> {
+            val cursor = makeSongCursor(context, AudioColumns.TITLE + " LIKE ?", arrayOf("%$query%"))
+            return getSongs(cursor)
+        }
+
+        fun getSongs(cursor: Cursor?): Observable<ArrayList<Song>> {
+            return Observable.create { e ->
+                val songs = ArrayList<Song>()
+                if (cursor != null && cursor.moveToFirst()) {
+                    do {
+                        songs.add(getSongFromCursorImpl(cursor))
+                    } while (cursor.moveToNext())
+                }
+
+                cursor?.close()
+                e.onNext(songs)
+                e.onComplete()
+            }
+        }
+
+        private fun getSongFromCursorImpl(cursor: Cursor): Song {
+            val id = cursor.getInt(0)
+            val title = cursor.getString(1)
+            val trackNumber = cursor.getInt(2)
+            val year = cursor.getInt(3)
+            val duration = cursor.getLong(4)
+            val data = cursor.getString(5)
+            val dateModified = cursor.getLong(6)
+            val albumId = cursor.getInt(7)
+            val albumName = cursor.getString(8)
+            val artistId = cursor.getInt(9)
+            val artistName = cursor.getString(10)
+
+            return Song(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName,
+                    artistId, artistName)
+        }
+
+        @JvmOverloads
+        fun makeSongCursor(context: Context, selection: String?, selectionValues: Array<String>?, sortOrder: String = PreferenceUtil.getInstance().songSortOrder): Cursor? {
+            var selectionFinal = selection
+            var selectionValuesFinal = selectionValues
+            selectionFinal = if (selection != null && selection.trim { it <= ' ' } != "") {
+                "$BASE_SELECTION AND $selectionFinal"
+            } else {
+                BASE_SELECTION
+            }
+
+            // Blacklist
+            val paths = BlacklistStore.getInstance(context).paths
+            if (!paths.isEmpty()) {
+                selectionFinal = generateBlacklistSelection(selectionFinal, paths.size)
+                selectionValuesFinal = addBlacklistSelectionValues(selectionValuesFinal, paths)
+            }
+
+            try {
+                return context.contentResolver.query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                        BASE_PROJECTION, selectionFinal, selectionValuesFinal, sortOrder)
+            } catch (e: SecurityException) {
+                return null
+            }
+
+        }
+
+        private fun generateBlacklistSelection(selection: String?, pathCount: Int): String {
+            val newSelection = StringBuilder(
+                    if (selection != null && selection.trim { it <= ' ' } != "") "$selection AND " else "")
+            newSelection.append(AudioColumns.DATA + " NOT LIKE ?")
+            for (i in 0 until pathCount - 1) {
+                newSelection.append(" AND " + AudioColumns.DATA + " NOT LIKE ?")
+            }
+            return newSelection.toString()
+        }
+
+        private fun addBlacklistSelectionValues(selectionValues: Array<String>?,
+                                                paths: ArrayList<String>): Array<String>? {
+            var selectionValuesFinal = selectionValues
+            if (selectionValuesFinal == null) {
+                selectionValuesFinal = emptyArray()
+            }
+            val newSelectionValues = Array(selectionValuesFinal.size + paths.size) {
+                "n = $it"
+            }
+            System.arraycopy(selectionValuesFinal, 0, newSelectionValues, 0, selectionValuesFinal.size)
+            for (i in selectionValuesFinal.size until newSelectionValues.size) {
+                newSelectionValues[i] = paths[i - selectionValuesFinal.size] + "%"
+            }
+            return newSelectionValues
+        }
+
+        fun getSong(cursor: Cursor?): Observable<Song> {
+            return Observable.create { e ->
+                val song: Song
+                if (cursor != null && cursor.moveToFirst()) {
+                    song = getSongFromCursorImpl(cursor)
+                } else {
+                    song = Song.EMPTY_SONG
+                }
+                cursor?.close()
+                e.onNext(song)
+                e.onComplete()
+            }
+        }
+
+        fun getSong(context: Context, queryId: Int): Observable<Song> {
+            val cursor = makeSongCursor(context, AudioColumns._ID + "=?",
+                    arrayOf(queryId.toString()))
+            return getSong(cursor)
+        }
+
+        fun suggestSongs(context: Context): Observable<ArrayList<Song>> {
+            return SongLoader.getAllSongs(context)
+                    .flatMap {
+                        val list = ArrayList<Song>()
+                        ShuffleHelper.makeShuffleList(it, -1)
+                        if (it.size > 9) {
+                            list.addAll(it.subList(0, 9))
+                        }
+                        return@flatMap Observable.just(list)
+                    }
+            /*.flatMap({ songs ->
+                val list = ArrayList<Song>()
+                ShuffleHelper.makeShuffleList(songs, -1)
+                if (songs.size > 9) {
+                    list.addAll(songs.subList(0, 9))
+                }
+                Observable.just(list)
+            } as Function<ArrayList<Song>, ObservableSource<ArrayList<Song>>>)*/
+            /*.subscribe(songs -> {
+                    ArrayList<Song> list = new ArrayList<>();
+                    if (songs.isEmpty()) {
+                        return;
+                    }
+                    ShuffleHelper.makeShuffleList(songs, -1);
+                    if (songs.size() > 10) {
+                        list.addAll(songs.subList(0, 10));
+                    } else {
+                        list.addAll(songs);
+                    }
+                   return;
+                });*/
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
index f9ef75f9..43244b14 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.java
@@ -23,12 +23,12 @@ public class TopAndRecentlyPlayedTracksLoader {
 
   @NonNull
   public static Observable<ArrayList<Song>> getRecentlyPlayedTracks(@NonNull Context context) {
-    return SongLoader.getSongs(makeRecentTracksCursorAndClearUpDatabase(context));
+    return SongLoader.Companion.getSongs(makeRecentTracksCursorAndClearUpDatabase(context));
   }
 
   @NonNull
   public static Observable<ArrayList<Song>> getTopTracks(@NonNull Context context) {
-    return SongLoader.getSongs(makeTopTracksCursorAndClearUpDatabase(context));
+    return SongLoader.Companion.getSongs(makeTopTracksCursorAndClearUpDatabase(context));
   }
 
   @Nullable
@@ -122,7 +122,7 @@ public class TopAndRecentlyPlayedTracksLoader {
       selection.append(")");
 
       // get a list of songs with the data given the selection statement
-      Cursor songCursor = SongLoader.makeSongCursor(context, selection.toString(), null);
+      Cursor songCursor = SongLoader.Companion.makeSongCursor(context, selection.toString(), null);
       if (songCursor != null) {
         // now return the wrapped TopTracksCursor to handle sorting given order
         return new SortedLongCursor(songCursor, order, BaseColumns._ID);
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
index b3763234..ca4bcbbf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
@@ -37,7 +37,7 @@ public class ShuffleAllPlaylist extends AbsSmartPlaylist {
     @NonNull
     @Override
     public Observable<ArrayList<Song>> getSongs(@NonNull Context context) {
-        return SongLoader.getAllSongs(context);
+        return SongLoader.Companion.getAllSongs(context);
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
index 8e00ccad..dc9b61bd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
@@ -198,6 +198,6 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
     private Observable<ArrayList<Song>> getQueue(@NonNull final String tableName) {
         Cursor cursor = getReadableDatabase().query(tableName, null,
                 null, null, null, null, null);
-        return SongLoader.getSongs(cursor);
+        return SongLoader.Companion.getSongs(cursor);
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java
index 5caffbc7..42299eec 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.java
@@ -48,17 +48,17 @@ public class RepositoryImpl implements Repository {
 
     @Override
     public Observable<ArrayList<Song>> getAllSongs() {
-        return SongLoader.getAllSongs(context);
+        return SongLoader.Companion.getAllSongs(context);
     }
 
     @Override
     public Observable<ArrayList<Song>> getSuggestionSongs() {
-        return SongLoader.suggestSongs(context);
+        return SongLoader.Companion.suggestSongs(context);
     }
 
     @Override
     public Observable<Song> getSong(int id) {
-        return SongLoader.getSong(context, id);
+        return SongLoader.Companion.getSong(context, id);
     }
 
     @Override
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
index 519f65e7..27072584 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
@@ -238,7 +238,7 @@ public class WearBrowserService extends MediaBrowserService {
                             }
                             break;
                         case TYPE_SONG:
-                            List<Song> songList = SongLoader.getAllSongs(mContext).blockingFirst();
+                            List<Song> songList = SongLoader.Companion.getAllSongs(mContext).blockingFirst();
                             for (Song song : songList) {
                                 fillMediaItems(mediaItems,
                                         String.valueOf(song.id),
@@ -326,7 +326,7 @@ public class WearBrowserService extends MediaBrowserService {
             long songId = Long.parseLong(mediaId);
             setSessionActive();
             ArrayList<Song> songs = new ArrayList<>();
-            songs.add(SongLoader.getSong(mContext, Integer.parseInt(mediaId)).blockingFirst());
+            songs.add(SongLoader.Companion.getSong(mContext, Integer.parseInt(mediaId)).blockingFirst());
             MusicPlayerRemote.openQueue(songs, 0, true);
         }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java b/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
index 543ec6ac..134cd7e2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/daydream/RetroMusicAlbums.java
@@ -92,7 +92,7 @@ public class RetroMusicAlbums extends DreamService {
                 .observeOn(AndroidSchedulers.mainThread())
                 .flatMap((Function<ArrayList<Song>, ObservableSource<ArrayList<Song>>>) songs -> Observable.create(e -> {
                     if (songs.isEmpty()) {
-                        e.onNext(SongLoader.getAllSongs(RetroMusicAlbums.this).blockingFirst());
+                        e.onNext(SongLoader.Companion.getAllSongs(RetroMusicAlbums.this).blockingFirst());
                     } else {
                         e.onNext(songs);
                     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
index f7271f85..89204692 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
@@ -147,7 +147,7 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
     @Override
     protected List<String> getSongPaths() {
         ArrayList<String> paths = new ArrayList<>(1);
-        paths.add(SongLoader.getSong(this, getId()).blockingFirst().data);
+        paths.add(SongLoader.Companion.getSong(this, getId()).blockingFirst().data);
         return paths;
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
index 8603e6bb..efdd1d01 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
@@ -363,7 +363,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 CreatePlaylistDialog.create().show(getChildFragmentManager(), "CREATE_PLAYLIST");
                 return true;
             case R.id.action_shuffle_all:
-                MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(getContext())
+                MusicPlayerRemote.openAndShuffleQueue(SongLoader.Companion.getAllSongs(getContext())
                         .blockingFirst(), true);
                 return true;
             case R.id.action_equalizer:
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
index 128866e5..5bb83674 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
@@ -341,7 +341,7 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
         if (activity != null) {
             switch (view.getId()) {
                 case R.id.action_shuffle:
-                    MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
+                    MusicPlayerRemote.openAndShuffleQueue(SongLoader.Companion.getAllSongs(activity).blockingFirst(), true);
                     break;
                 case R.id.last_added:
                     NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity));
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
index a4e7db1f..103df288 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
@@ -4,8 +4,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
 import android.provider.MediaStore;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.webkit.MimeTypeMap;
 
 import java.io.BufferedReader;
@@ -22,6 +20,8 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.loaders.SortedCursor;
 import code.name.monkey.retromusic.model.Song;
@@ -47,7 +47,7 @@ public final class FileUtil {
     @NonNull
     public static Observable<ArrayList<Song>> matchFilesWithMediaStore(@NonNull Context context,
                                                                        @Nullable List<File> files) {
-        return SongLoader.getSongs(makeSongCursor(context, files));
+        return SongLoader.Companion.getSongs(makeSongCursor(context, files));
     }
 
     public static String safeGetCanonicalPath(File file) {
@@ -75,8 +75,7 @@ public final class FileUtil {
             }
         }
 
-        Cursor songCursor = SongLoader
-                .makeSongCursor(context, selection, selection == null ? null : paths);
+        Cursor songCursor = SongLoader.Companion.makeSongCursor(context, selection, selection == null ? null : paths);
 
         return songCursor == null ? null
                 : new SortedCursor(songCursor, paths, MediaStore.Audio.AudioColumns.DATA);
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
index cebb8c6a..1c082beb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
@@ -224,7 +224,7 @@ public class MusicUtil {
                 cursor.moveToFirst();
                 while (!cursor.isAfterLast()) {
                     final int id = cursor.getInt(0);
-                    Song song = SongLoader.getSong(activity, id).blockingFirst();
+                    Song song = SongLoader.Companion.getSong(activity, id).blockingFirst();
                     MusicPlayerRemote.removeFromQueue(song);
                     cursor.moveToNext();
                 }