From 9d7019530a0874ce4b88334accf732defdeb3947 Mon Sep 17 00:00:00 2001
From: amazing-username <kundeng94@gmail.com>
Date: Sat, 16 Mar 2019 17:23:28 -0400
Subject: [PATCH] Continuing work on #32 and #33

---
 app/app.iml                                   |  36 +++---
 app/build.gradle                              |   1 +
 .../example/mear/activities/MainActivity.kt   |  15 ++-
 .../mear/activities/SongViewActivity.kt       | 119 +++++++++++++++---
 .../example/mear/adapters/RecyclerAdapter.kt  | 104 ++++++++-------
 .../com/example/mear/constants/Filenames.kt   |   5 +
 .../com/example/mear/management/MusicFiles.kt |   2 +
 .../example/mear/management/TrackManager.kt   |  16 ++-
 .../mear/playback/service/MusicService.kt     |  35 +++---
 .../com/example/mear/util/ConvertByteArray.kt |  19 +++
 .../com/example/mear/util/ExtractCover.kt     |  24 ++++
 app/src/main/java/extensions.kt               |  10 +-
 .../main/res/layout/activity_song_view.xml    |  36 +++---
 app/src/main/res/layout/content_song_view.xml |  40 +++++-
 .../main/res/layout/fragment_song_view.xml    |  40 ++++--
 app/src/main/res/values/colors.xml            |   2 +-
 16 files changed, 371 insertions(+), 133 deletions(-)
 create mode 100644 app/src/main/java/com/example/mear/constants/Filenames.kt
 create mode 100644 app/src/main/java/com/example/mear/util/ConvertByteArray.kt
 create mode 100644 app/src/main/java/com/example/mear/util/ExtractCover.kt

diff --git a/app/app.iml b/app/app.iml
index 7dff500..744ea53 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ealvalog-android-0.3.0.aar/6049363148a2a3ae4b2c516cb07803e4/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.20/aa17d6fd473ce53061a7b2b9d2ae96f547cae93d/kotlin-stdlib-jdk7-1.3.20.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/26d67245a807b0f8ded0b7a7f48b2608/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-0.10.8.aar/1bc534e6e73cec355c4f8280398b94af/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-0.10.8.aar/4be14d3e66cf17732fad2338eb045357/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-coroutines-0.10.8.aar/c2bcc68b37c7f12bc1c4be2ae762341e/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-commons-0.10.8.aar/3767a4a6e0c67373b2caacb87a78cc2b/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/appcompatV7-base-0.10.8.aar/79c7424f3d5b03daceae5e01dc8b4965/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/a8c85024244067a848b7c360a00e196c/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-support-v4-0.10.8.aar/18c9eb80ae265552398aa0fb8dfa6783/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-support-v4-commons-0.10.8.aar/03c6117d7fb869f6e4e8e72bdb31277b/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/supportV4-base-0.10.8.aar/087a99a70870025bf79d5add922b7243/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-v4-28.0.0.aar/fdc9983b273436bf5696eaee53d6cf49/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.3.aar/26d9c3d9d0d279a2cc29ed12c49956c9/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.2/7136882680aafa19f4d1323c71b547898b898ca5/ealvatag-0.4.2.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.3.0/84ac9309ccdf8667a2f2692aeffa5de76961dc12/ealvalog-core-0.3.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.3.0/cea6faf07e4bd965413d0c3139a5f3682c4d92a2/ealvalog-0.3.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.11.0/840897fcd7223a8143f1d9b6f69714e7be34fd50/okio-1.11.0.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/aa4db57966ef1bcb6b45ee186c0ecafe/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-sqlite-0.10.8.aar/a27bc91b0f6ba0deaaf07f2bc380fe20/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-sdk27-0.10.8.aar/5b5c87feead2909bf0bee50d3989ff72/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-sdk27-coroutines-0.10.8.aar/ae1dfb5f7455068c78881d8a4248924b/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-commons-0.10.8.aar/0b3288d87fea213387175c2e4b905364/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/anko-coroutines-0.10.8.aar/3dbadbc39aff28f9789b6f1266135a23/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/sqlite-base-0.10.8.aar/fa70a91fabd4e7944498dde4bbba43ac/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/platform-base-0.10.8.aar/e15de60bb74bb1a544dafdeb60cf0434/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/commons-base-0.10.8.aar/c5dae5cd20ea4139cd839e5b52a9eec4/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.20/eb2a232734e09fcd1b958a5c7520a93c6de38b32/kotlin-stdlib-1.3.20.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/ce4600674841de0de5d9f4fb996aa13f/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/8f93afd5cf1977aae90ab9745758f98f/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/7783fcf2dae4908a25580e65696d1df9/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/a3018d28d0637f4b358c8d83b9e6b138/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/731578a4ac8e0f02227c4e6e6016c670/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/775e06fb97847614b1656388f166faf6/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/3a346f80ec151c013e7934f48c2be472/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/2e7ad3960a8a04bfffdedceb178a2bfc/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/543594e082e88e9c5104c396da35168e/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/edce3fe6dce95ede06f259dd7f2c8316/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/99612f646b46aebe454150ec39d9710c/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/3115e9012cbe6e65b8a575582aa2ba56/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/ad477f2053dfbf28208e6f043bd17eed/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/678763c9ec2666d0d76aea69a59e5608/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/d562e40ccabc37282a254da25f117935/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/08abde4b24a788a28b3276a478da486a/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/80010472ad3d262e8ede0ad689661cb3/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/643308709b21c7637210c71bc533b46a/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/188b5c9aef43af6722b4488ee0c726f8/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/2f108bc909d8a283a1cb26e4226865f7/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/77fd8367b2d56ec378596da28ee913e7/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/aa0856d6af42cea0262669ffdc388ed1/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/47e1bcc01c88b1db88bec1cafc27ee71/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/f0448cfb9473d8ca0b38cd4a26e4dc0f/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/b787bb4316f94d2c37f1d9d3686e4fb3/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/ab1fffd1cb264975e8fcf4c8dfc0c5dc/jars/classes.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/45cf635dc9f91b71ddeb6b97bf0a27c3/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/phoenix/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/1848c3aa5ca1aef5c04e6a5c8cb3dee0/jars/classes.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/phoenix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.20/7d7934e26ce34da1a0a8d00e38038d7cf3375e89/kotlin-stdlib-common-1.3.20.jar:/home/phoenix/Android/Sdk/platforms/android-28/android.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-1/files-1.1/ealvalog-android-0.3.0.aar/e71d356db8d4cd29cc603b0106c5a296/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.20/aa17d6fd473ce53061a7b2b9d2ae96f547cae93d/kotlin-stdlib-jdk7-1.3.20.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/d5bce2b101f9787b5322143bf8a2acd6/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-0.10.8.aar/b6b66827b11c77e2322a39b8bec60289/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-0.10.8.aar/b25a39ef1433f8cb1af174f0a3b059cd/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-coroutines-0.10.8.aar/64bfd3e484c926a3e833b32e7e721bb6/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-appcompat-v7-commons-0.10.8.aar/b4aa444dd13044b026aa5cc86481f4b3/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/appcompatV7-base-0.10.8.aar/cec2c6299807d8a0552e884ca6a6a449/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/68e6fe8f24b93cb7e7d32c47cf45a12c/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-support-v4-0.10.8.aar/cc90c0801fa4f6488f2443d14ca80ba5/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-support-v4-commons-0.10.8.aar/7ef298630bda978481eaa78954eb2b71/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/supportV4-base-0.10.8.aar/9f081cb90ee15829a2291455e685f303/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-v4-28.0.0.aar/49ca024599d0d2b548420bbf325a1fc7/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.3.aar/66d09b8fa64251a83738c44f6f9cc7d6/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.2/7136882680aafa19f4d1323c71b547898b898ca5/ealvatag-0.4.2.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.3.0/84ac9309ccdf8667a2f2692aeffa5de76961dc12/ealvalog-core-0.3.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.3.0/cea6faf07e4bd965413d0c3139a5f3682c4d92a2/ealvalog-0.3.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/picasso-2.71828.aar/aa4550c163aa3dbc9340624246cab348/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/102d7be47241d781ef95f1581d414b0943053130/okio-1.14.0.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/c88e7c66c9ae063d825358d44d7eb072/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-sqlite-0.10.8.aar/af442fd53f02a1f0b7b4ed4627c5e0c0/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-sdk27-0.10.8.aar/4508fa87c778967bf262c53f82bc4e06/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-sdk27-coroutines-0.10.8.aar/bf5a2e4ec27d69eaaf39cb2ddd6f1022/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-commons-0.10.8.aar/3c9a2bf5a05ccd0f4858269a42d46f64/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/anko-coroutines-0.10.8.aar/bc67ac69a913972d40d0aa1db126703a/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/sqlite-base-0.10.8.aar/f1833c6851a04b40314b63d4ca33a502/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/platform-base-0.10.8.aar/91b4148d4c2622642060d65ef4c82b35/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/commons-base-0.10.8.aar/70102aaae73f20dd127a803f518a25bb/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.20/eb2a232734e09fcd1b958a5c7520a93c6de38b32/kotlin-stdlib-1.3.20.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/948de0282e59d895a165878951a40c0b/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/fd71452c576b1c35189f2bae34526903/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/84475edaa73f020a2c5e17d39725ed08/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/7a23180e95e206badcbc7a7934bc31bc/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/7c80d0ec766f91422b7a4aa339411d41/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/6cfdb282a40315811583743fc9565ee7/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-media-compat-28.0.0.aar/0cc3d7798a8ef2724c6bcd790355932b/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/e26d006a9d72dc8c4d6aa3862baf95ee/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/48aa0687e5e744b4fa7a4a2e1a67ed10/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/8a41c82991f7c049dded0eaaa666d444/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/2c1f9fb04e459fc9469384dbb07bd6e5/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/3b73277d1fb63723d1cf457839923cd8/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/03055f20f75d41a4b215334c6744313f/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/e864a3b99f2a5e57d2b172b425190b51/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/99d85e189bc466d77e7079e6d4711261/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/6333de23035df39b76904f1520be41b5/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/fd2d22e46784ee2743eecc86b3925b24/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/085ebcbb0c8eaeb8654388b1ff8a586b/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/83e20789b372669f1c4406fbfc6d4380/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/exifinterface-27.1.0.aar/0206f85d46d2dfb7e71664534486e96b/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/a09f37d27407d4962497fc1a26ffeb3c/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/98b1ab2b79270f524a9527c891b08b0d/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/6dcb57abda6eba61c0b76ca2991a0dbe/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/579ad0afab9211a8d74ac9c9895de2dc/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/f46ce28c8f7c2dee4d82c4a6da143a87/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/5f0079b76d5101fba39422e1c7b30231/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/90af5382cd5182f5db3b54f6bc656656/jars/classes.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/9df0fa257074deb9098d1dc8e3a12964/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/1677d55a34d2b6d5465693ef47759296/jars/classes.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.20/7d7934e26ce34da1a0a8d00e38038d7cf3375e89/kotlin-stdlib-common-1.3.20.jar:/home/brahmix/Android/Sdk/platforms/android-28/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -78,13 +78,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -92,6 +85,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -99,13 +99,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -113,6 +106,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
       <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
@@ -135,6 +135,7 @@
       <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/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -182,11 +183,12 @@
     <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.anko:appcompatV7-base:0.10.8@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.11.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.20@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.anko:anko-sdk27-coroutines:0.10.8@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:20.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:exifinterface:27.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.anko:anko-sqlite:0.10.8@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
@@ -219,6 +221,7 @@
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.71828@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.ealva:ealvalog:0.3.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
@@ -226,6 +229,7 @@
     <orderEntry type="library" name="Gradle: com.ealva:ealvalog-android:0.3.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.anko:anko-appcompat-v7-coroutines:0.10.8@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.anko:anko-sdk27:0.10.8@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 60132c3..09cee58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,4 +40,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.squareup.picasso:picasso:2.71828'
 }
diff --git a/app/src/main/java/com/example/mear/activities/MainActivity.kt b/app/src/main/java/com/example/mear/activities/MainActivity.kt
index 5056c82..5df32ff 100644
--- a/app/src/main/java/com/example/mear/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/MainActivity.kt
@@ -1,9 +1,7 @@
 package com.example.mear.activities
 
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.graphics.Color
-import android.media.MediaMetadataRetriever
 import android.os.Bundle
 import android.os.Handler
 
@@ -26,6 +24,8 @@ import com.example.mear.models.PlayControls
 import com.example.mear.R
 import com.example.mear.repositories.RepeatRepository
 import com.example.mear.repositories.ShuffleRepository
+import com.example.mear.util.ConvertByteArray
+import com.example.mear.util.ExtractCover
 
 
 class MainActivity : BaseServiceActivity() {
@@ -242,12 +242,19 @@ class MainActivity : BaseServiceActivity() {
                     (trackDuration % 60)
                 )
 
+                var coverExt = ExtractCover(currTrack.songPath)
+
+                if (coverExt.hasCover()) {
+                    trackCover = coverExt.retrieveCover()
+                }
+               /**
                 val mmr = MediaMetadataRetriever()
                 mmr.setDataSource(currTrack.songPath)
 
                 if (mmr.embeddedPicture != null) {
                     trackCover = mmr.embeddedPicture
                 }
+                */
 
                 resetControls()
 
@@ -256,8 +263,8 @@ class MainActivity : BaseServiceActivity() {
                 AlbumTitle.text = albumTitle
                 TrackDuration.text = dur
                 if (trackCover != null) {
-                    val songImage = BitmapFactory
-                        .decodeByteArray(trackCover, 0, trackCover.size)
+                    val convertToBmp =  ConvertByteArray(trackCover!!)
+                    var songImage = convertToBmp.convertToBmp()
                     TrackCover.imageBitmap = songImage
                 }
             }
diff --git a/app/src/main/java/com/example/mear/activities/SongViewActivity.kt b/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
index ecfacb2..44b3220 100644
--- a/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/SongViewActivity.kt
@@ -1,44 +1,131 @@
 package com.example.mear.activities
 
+import android.os.Build
 import android.os.Bundle
+import android.support.annotation.RequiresApi
 import android.support.v7.app.AppCompatActivity
-import android.widget.LinearLayout
-import android.widget.ListView
+import android.support.v7.widget.LinearLayoutManager
 
+import java.lang.Exception
 import kotlinx.android.synthetic.main.activity_song_view.*
 import kotlinx.android.synthetic.main.content_song_view.*
 
+import com.example.mear.adapters.RecyclerAdapter
+import com.example.mear.models.TrackItems
 import com.example.mear.R
 import com.example.mear.repositories.TrackRepository
+import com.example.mear.util.ExtractCover
 
 class SongViewActivity : AppCompatActivity() {
+    private var trackListItems = arrayListOf<TrackItems>()
+    private lateinit var adapter: RecyclerAdapter
+    private lateinit var linearLayoutManager: LinearLayoutManager
 
-    private lateinit var listView: ListView
 
+    @RequiresApi(Build.VERSION_CODES.N)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_song_view)
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        initializeAdapter()
+        try {
+            window.statusBarColor = resources.getColor(R.color.track_seek)
+            initializeAdapter()
+        }
+        catch (ex: Exception) {
+            var exMsg = ex.message
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        if (trackListItems.size == 0) {
+            val df = ""
+        }
+
     }
 
 
 
+    @RequiresApi(Build.VERSION_CODES.N)
     private fun initializeAdapter() {
-        listView = findViewById<ListView>(R.id.recipe_list_view)
-// 1
-        val recipeList = Recipe.getRecipesFromFile("recipes.json", this)
-// 2
-        val listItems = arrayOfNulls<String>(recipeList.size)
-// 3
-        for (i in 0 until recipeList.size) {
-            val recipe = recipeList[i]
-            listItems[i] = recipe.title
+        try {
+            linearLayoutManager = LinearLayoutManager(this)
+            trackList.layoutManager = linearLayoutManager
+
+            trackListItems = retrieveTrackItems()
+
+            adapter = RecyclerAdapter(trackListItems)
+            trackList.adapter = adapter
+            trackList.setHasFixedSize(true)
+            //trackList.setItemViewCacheSize(20);
+            //trackList.setDrawingCacheEnabled(true);
+            //trackList.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
         }
-// 4
-        val adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, listItems)
-        listView.adapter = adapter
+        catch (ex: Exception) {
+            val exMsg = ex.message
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    private fun retrieveTrackItems(): ArrayList<TrackItems> {
+        var trackItems: ArrayList<TrackItems>? = null
+        try {
+            trackItems = arrayListOf()
+
+            val tracks = TrackRepository(this).getAll()
+
+            var index = 0
+            val max = 200
+            var done = false
+            /**
+            tracks.parallelStream().map {track ->
+                val cover = ExtractCover(track.songPath)
+                var trackCover = ByteArray(0)
+                if (cover.hasCover() && !done) {
+                    if (index < max ) {
+                        trackCover = cover.retrieveCover()
+                    }
+                    else {
+                        done = true
+                    }
+                    index++
+                }
+                if (done) {
+                    //return trackItems
+                }
+
+                val trackItem = TrackItems(track.id, track.title, track.artist, trackCover!!)
+                trackItems.add(trackItem)
+
+            }
+            */
+            for (track in tracks) {
+                val cover = ExtractCover(track.songPath)
+                var trackCover = ByteArray(0)
+                if (cover.hasCover() && !done) {
+                    if (index < max ) {
+                        trackCover = cover.retrieveCover()
+                    }
+                    else {
+                        done = true
+                    }
+                    index++
+                }
+                if (done) {
+                    return trackItems
+                }
+
+                val trackItem = TrackItems(track.id, track.title, track.artist, trackCover!!)
+                trackItems.add(trackItem)
+            }
+            return trackItems
+        }
+        catch (ex: Exception) {
+            val exMsg = ex.message
+        }
+
+        return trackItems!!
     }
 }
diff --git a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
index b0a86d0..e183b98 100644
--- a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
+++ b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt
@@ -1,63 +1,81 @@
-package com.example.mear.com.example.mear.adapters
+package com.example.mear.adapters
 
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
+import android.content.Intent
 import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.RecyclerView.Adapter
-import android.view.LayoutInflater
-import android.widget.TextView
-import android.widget.ImageView
 import android.view.View
 import android.view.ViewGroup
-import android.widget.BaseAdapter
 
+import java.lang.Exception
+import kotlinx.android.synthetic.main.fragment_song_view.view.*
+
+import com.squareup.picasso.Picasso
+
+import com.example.mear.activities.SongViewActivity
+import com.example.mear.constants.Filenames
+import com.example.mear.inflate
 import com.example.mear.models.TrackItems
 import com.example.mear.R
 
-class RecyclerAdapter(private  val context: Context,
-                                                    private  val source: ArrayList<TrackItems>): BaseAdapter() {
+class RecyclerAdapter( private  val trackItemsSourceInit: ArrayList<TrackItems>) :
+                                                RecyclerView.Adapter<RecyclerAdapter.TrackItemsHolder>() {
 
-
-    private val inflater: LayoutInflater
-            = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-
-
-    override fun getCount(): Int {
-        return source.size
+    override fun getItemCount(): Int {
+        return trackItemsSourceInit!!.size
     }
 
-    //2
-    override fun getItem(position: Int): Any {
-        return source[position]
+    override fun onBindViewHolder(holder: TrackItemsHolder, position: Int) {
+        val itemPhoto = trackItemsSourceInit!![position]
+        holder.bindTrackItems(itemPhoto)
     }
 
-    //3
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
+    override fun onCreateViewHolder(parent: ViewGroup, position: Int): TrackItemsHolder {
+        val inflatedView = parent.inflate(R.layout.fragment_song_view, false)
+        return TrackItemsHolder(inflatedView)
     }
 
-    //4
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        // Get view for row item
-        val rowView = inflater.inflate(R.layout.fragment_song_view, parent, false)
 
-        val trackTitleTextView = rowView.findViewById(R.id.trackTitle) as TextView
-
-// Get subtitle element
-        val trackArtistTextView= rowView.findViewById(R.id.trackArtist) as TextView
-
-// Get detail element
-        val trackCoverImageView = rowView.findViewById(R.id.trackCover) as ImageView
-
-        val track = getItem(position) as TrackItems
-
-// 2
-        trackTitleTextView.text = track.trackTitle
-        trackArtistTextView.text = track.artistTitle
-        trackCoverImageView.setImageBitmap(BitmapFactory.decodeByteArray(track.trackCover, 0, track.trackCover.size))
+    class TrackItemsHolder(v: View) : RecyclerView.ViewHolder(v), View.OnClickListener {
+        private var view: View = v
+        private var trackItem: TrackItems? = null
+        private val imgWidth = 90
+        private val imgHeight = 90
 
 
-        return rowView
+        init {
+            v.setOnClickListener(this)
+        }
+
+        override fun onClick(v: View) {
+            try {
+                val context = itemView.context
+                val showPhotoIntent = Intent(context, SongViewActivity::class.java)
+                //showPhotoIntent.putExtra(PHOTO_KEY, trackItem)
+                context.startActivity(showPhotoIntent)
+            }
+            catch (ex: Exception) {
+                val exMsg = ex.message
+            }
+        }
+
+        fun bindTrackItems(trackItems: TrackItems) {
+            try {
+                var context = view.context
+                this.trackItem = trackItems
+                view.trackTitle.text = trackItem!!.trackTitle
+                view.trackArtist.text = trackItem!!.artistTitle
+                val id = trackItems.id
+
+                var trackCoverPath = "${context.filesDir}/${Filenames.TRACK_COVERS}"
+                trackCoverPath = "${trackCoverPath}${id}.bmp"
+                Picasso.get().load(trackCoverPath).into(view.trackCover)
+            }
+            catch (ex:Exception) {
+                val exMsg = ex.message
+            }
+        }
+
+        companion object {
+            private val PHOTO_KEY = "PHOTO"
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mear/constants/Filenames.kt b/app/src/main/java/com/example/mear/constants/Filenames.kt
new file mode 100644
index 0000000..6e44120
--- /dev/null
+++ b/app/src/main/java/com/example/mear/constants/Filenames.kt
@@ -0,0 +1,5 @@
+package com.example.mear.constants
+
+object Filenames {
+    const val TRACK_COVERS = "TrackCover_"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mear/management/MusicFiles.kt b/app/src/main/java/com/example/mear/management/MusicFiles.kt
index 10583fa..3e7fb63 100644
--- a/app/src/main/java/com/example/mear/management/MusicFiles.kt
+++ b/app/src/main/java/com/example/mear/management/MusicFiles.kt
@@ -56,9 +56,11 @@ class MusicFiles (private val demoPath:  File) {
                 println(it.absolutePath)
                 if (!ignoreThisDirectory(it.absolutePath)) {
                     if (it.isFile) {
+                        /**
                         if (it.endsWith(FileTypes.Mp3)) {
                             pathList.add(it.absolutePath)
                         }
+                        */
                         if (it.extension.toString().equals(FileTypes.Mp3)) {
                             pathList.add(it.absolutePath)
                         }
diff --git a/app/src/main/java/com/example/mear/management/TrackManager.kt b/app/src/main/java/com/example/mear/management/TrackManager.kt
index f74b4cb..7086f84 100644
--- a/app/src/main/java/com/example/mear/management/TrackManager.kt
+++ b/app/src/main/java/com/example/mear/management/TrackManager.kt
@@ -5,9 +5,11 @@ import android.media.MediaMetadataRetriever
 
 import java.lang.Exception
 
+import com.example.mear.constants.Filenames
 import com.example.mear.models.Track
 import com.example.mear.repositories.PlayCountRepository
 import com.example.mear.repositories.TrackRepository
+import com.example.mear.util.ConvertByteArray
 
 class TrackManager(var allSongPath: MutableList<String>) {
 
@@ -33,19 +35,31 @@ class TrackManager(var allSongPath: MutableList<String>) {
                 val track = Track(id, trackTitle, trackArtist, trackAlbum, trackLength,
                     ByteArray(0), musicPath)
                 dumpToDatabase(ctx, track)
+                saveTrackCoverToDisk(ctx, id, mmr.embeddedPicture)
                 id++
             }
-            TrackRepository(ctx).createSongCount((id -1))
         }
         catch (ex: Exception) {
             val exMsg = ex.message
         }
+        TrackRepository(ctx).createSongCount((id -1))
         return id.dec()
     }
     private fun dumpToDatabase(ctx: Context, track: Track) {
         TrackRepository(ctx).insertTrack(track)
         PlayCountRepository(ctx).insertPlayCount(track)
     }
+    private fun saveTrackCoverToDisk(context: Context, id: Int, trackCover: ByteArray) {
+        val filename = "${Filenames.TRACK_COVERS}$id.bmp"
+        val fileContents = trackCover
+        var img = ConvertByteArray(trackCover).convertToBmp()
+
+        context.openFileOutput(filename, Context.MODE_PRIVATE).use {
+            it.write(fileContents)
+        }
+
+
+    }
 
     var allTracks: MutableList<Track>? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index bf689c9..7117d23 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.media.MediaPlayer
 import android.os.Binder
 import android.os.IBinder
-import android.support.v4.media.VolumeProviderCompat
 import android.widget.Toast
 
 import java.lang.Exception
@@ -19,7 +18,6 @@ import com.example.mear.models.Track
 import com.example.mear.repositories.RepeatRepository
 import com.example.mear.repositories.ShuffleRepository
 import com.example.mear.repositories.TrackRepository
-import java.util.*
 
 
 class MusicService: Service() {
@@ -243,19 +241,24 @@ class MusicService: Service() {
 
 
     private fun initializeMediaPlayer() {
-        if (trackPlayer == null) {
-            trackPlayer = MediaPlayer()
-        }
-        if (trackRepositoryEmpty()!!) {
-            populateTrackRepository()
-        }
+        try {
+            if (trackPlayer == null) {
+                trackPlayer = MediaPlayer()
+            }
+            if (trackRepositoryEmpty()!!) {
+                populateTrackRepository()
+            }
 
-        currentSongIndex = Random.nextInt(0, TrackRepository(this).getSongCount())
-        val trackToPlay = TrackRepository(this).getTrack(currentSongIndex!!)
-        trackPlayer!!.setDataSource(trackToPlay.songPath)
-        trackPlayer!!.prepareAsync()
-        trackPlayer!!.setOnCompletionListener {
-            playNextTrack()
+            currentSongIndex = Random.nextInt(0, TrackRepository(this).getSongCount())
+            val trackToPlay = TrackRepository(this).getTrack(currentSongIndex!!)
+            trackPlayer!!.setDataSource(trackToPlay.songPath)
+            trackPlayer!!.prepareAsync()
+            trackPlayer!!.setOnCompletionListener {
+                playNextTrack()
+            }
+        }
+        catch (ex: Exception) {
+            val exMsg = ex.message
         }
     }
     private  fun populateTrackRepository() {
@@ -345,6 +348,9 @@ class MusicService: Service() {
     private fun trackRepositoryEmpty(): Boolean? {
         val trackCount = retrieveSongCount()
 
+        if (trackCount!! < 1) {
+            return true
+        }
         when (trackCount) {
             null -> {
                 return true
@@ -361,7 +367,6 @@ class MusicService: Service() {
 
         try {
             //var db  = DatabaseManager(this)
-            var trackDb = TrackRepository(this)
             val count = TrackRepository(this).getSongCount()
 
             return count
diff --git a/app/src/main/java/com/example/mear/util/ConvertByteArray.kt b/app/src/main/java/com/example/mear/util/ConvertByteArray.kt
new file mode 100644
index 0000000..7976e3a
--- /dev/null
+++ b/app/src/main/java/com/example/mear/util/ConvertByteArray.kt
@@ -0,0 +1,19 @@
+package com.example.mear.util
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+
+class ConvertByteArray(private val byteArray: ByteArray) {
+
+    fun convertToBmp(): Bitmap {
+        val songImage = BitmapFactory
+            .decodeByteArray(byteArray, 0, byteArray.size)
+
+        return songImage
+    }
+    fun convertToBmptScales(width: Int, height: Int): Bitmap {
+        val b = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
+
+        return Bitmap.createScaledBitmap(b, width, height, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mear/util/ExtractCover.kt b/app/src/main/java/com/example/mear/util/ExtractCover.kt
new file mode 100644
index 0000000..3311075
--- /dev/null
+++ b/app/src/main/java/com/example/mear/util/ExtractCover.kt
@@ -0,0 +1,24 @@
+package com.example.mear.util
+
+import android.media.MediaMetadataRetriever
+
+class ExtractCover(private val trackPath: String) {
+
+    fun retrieveCover(): ByteArray {
+        var trackData = MediaMetadataRetriever()
+        trackData.setDataSource(trackPath)
+
+        return trackData.embeddedPicture
+    }
+
+    fun hasCover(): Boolean {
+        var trackData = MediaMetadataRetriever()
+        trackData.setDataSource(trackPath)
+
+        if (trackData.embeddedPicture == null) {
+            return false
+        }
+
+        return true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/extensions.kt b/app/src/main/java/extensions.kt
index b62d332..7c66950 100644
--- a/app/src/main/java/extensions.kt
+++ b/app/src/main/java/extensions.kt
@@ -1,8 +1,16 @@
 package com.example.mear
 
 import android.content.Context
+import android.support.annotation.LayoutRes
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 
 import com.example.mear.management.DatabaseManager
 
 val Context.database:  DatabaseManager
-    get() = DatabaseManager.getInstance(applicationContext)
\ No newline at end of file
+    get() = DatabaseManager.getInstance(applicationContext)
+
+fun ViewGroup.inflate(@LayoutRes layoutRes: Int, attachToRoot: Boolean = false): View {
+    return LayoutInflater.from(context).inflate(layoutRes, this, attachToRoot)
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_song_view.xml b/app/src/main/res/layout/activity_song_view.xml
index a824ec0..24e7fb0 100644
--- a/app/src/main/res/layout/activity_song_view.xml
+++ b/app/src/main/res/layout/activity_song_view.xml
@@ -2,37 +2,37 @@
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:background="@color/color_background"
     tools:context=".activities.SongViewActivity">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/app_bar_height"
-        android:fitsSystemWindows="true"
+        android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/toolbar_layout"
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            app:contentScrim="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:toolbarId="@+id/toolbar">
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_background"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:layout_collapseMode="pin"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-        </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_song_view" />
+
+    <include
+        android:id="@+id/include2"
+        layout="@layout/content_song_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_song_view.xml b/app/src/main/res/layout/content_song_view.xml
index ab3fe36..2742852 100644
--- a/app/src/main/res/layout/content_song_view.xml
+++ b/app/src/main/res/layout/content_song_view.xml
@@ -1,17 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".activities.SongViewActivity"
-    tools:showIn="@layout/activity_song_view">
+    android:padding="8dp">
 
+    <Space
+        android:id="@+id/space2"
+        android:layout_width="12dp"
+        android:layout_height="55dp"
+        android:layout_marginStart="120dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/trackList"
+        marginTop="?android:attr/actionBarSize"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="0dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginBottom="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/space2"
+        tools:itemCount="4"
+        tools:listitem="@layout/recycler_view_item" />
+    <!--
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/trackList"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.044"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
+        -->
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_song_view.xml b/app/src/main/res/layout/fragment_song_view.xml
index f084216..6853aac 100644
--- a/app/src/main/res/layout/fragment_song_view.xml
+++ b/app/src/main/res/layout/fragment_song_view.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <android.support.v7.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+
+    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/cv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_marginTop="5dp"
-        card_view:cardCornerRadius="5dp">
+        android:layout_width="wrap_content"
+        android:layout_height="80dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
+        card_view:cardBackgroundColor="@color/colorPrimary"
+        card_view:cardCornerRadius="5dp"
+        card_view:layout_constraintBottom_toBottomOf="parent"
+        card_view:layout_constraintEnd_toEndOf="parent"
+        card_view:layout_constraintStart_toStartOf="parent"
+        card_view:layout_constraintTop_toTopOf="parent"
+        card_view:layout_constraintVertical_bias="1.0">
 
 
         <LinearLayout
@@ -22,8 +35,7 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="10dp"
-                android:background="#c0c0c0"/>
+                android:layout_marginTop="10dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -37,7 +49,7 @@
                     card_view:srcCompat="@mipmap/ic_launcher_round" />
 
                 <LinearLayout
-                    android:layout_width="290dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
                     android:orientation="vertical">
@@ -46,12 +58,14 @@
                         android:id="@+id/trackTitle"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:textColor="@color/track_details"
                         android:textSize="16sp" />
 
                     <TextView
                         android:id="@+id/trackArtist"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/track_details" />
 
 
                 </LinearLayout>
@@ -62,3 +76,5 @@
 
 
     </android.support.v7.widget.CardView>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 22417c9..281b6d5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,6 @@
     <color name="color_player_not_initialized">#585858</color>
 
     <!-- Play Controls -->
-    <color name="track_details">#ffffff</color>
+    <color name="track_details">#FFFFFF</color>
     <color name="track_seek">#333399</color>
 </resources>