Merge pull request #578 from h4h13/dark-theme

Dark theme

app/build.gradle

@@ -13,8 +13,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 391
+        versionCode 392
-        versionName '3.4.700'
+        versionName '3.4.800'
 
         multiDexEnabled true
 

app/src/main/AndroidManifest.xml

@@ -23,14 +23,14 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.RetroMusic.Light"
+        android:theme="@style/Theme.RetroMusic.FollowSystem"
         android:usesCleartextTraffic="false"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning"
         tools:targetApi="m">
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name"
+            android:theme="@style/SplashTheme"
-            android:theme="@style/SplashTheme">
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />

app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt

@@ -4,10 +4,12 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
-import android.view.*
+import android.view.MenuItem
+import android.view.View
 import androidx.core.app.ShareCompat
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.DefaultItemAnimator
-import code.name.monkey.appthemehelper.util.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK
 import code.name.monkey.retromusic.Constants.APP_TELEGRAM_LINK
 import code.name.monkey.retromusic.Constants.APP_TWITTER_LINK
@@ -20,9 +22,12 @@ import code.name.monkey.retromusic.Constants.TRANSLATE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.adapter.ContributorAdapter
+import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.model.Contributor
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.NavigationUtil
-import com.afollestad.materialdialogs.*
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import com.google.gson.Gson
@@ -56,17 +61,18 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_about)
         setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
         setLightNavigationBar(true)
 
+
         loadContributors()
         setSupportActionBar(toolbar)
         toolbar.apply {
-			setTitleTextColor(ATHUtil.resolveColor(this@AboutActivity, R.attr.colorOnPrimary))
+            setBackgroundColor(surfaceColor(context))
-			setBackgroundColor(ATHUtil.resolveColor(this@AboutActivity, R.attr.colorPrimary))
             setNavigationOnClickListener { onBackPressed() }
             ToolbarContentTintHelper.colorBackButton(toolbar)
         }

app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt

@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.activities
 
 import android.app.ActivityOptions
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -15,7 +14,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
@@ -26,6 +24,7 @@ import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
@@ -45,6 +44,7 @@ import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.activity_album.*
 import kotlinx.android.synthetic.main.activity_album_content.*
+import kotlinx.android.synthetic.main.status_bar.*
 import java.util.*
 import javax.inject.Inject
 import android.util.Pair as UtilPair
@@ -58,7 +58,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
         cab = MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
                 .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
-                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface)))
                 .start(callback)
         return cab as MaterialCab
     }
@@ -81,11 +81,10 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         toggleBottomNavigationView(true)
-        setStatusbarColor(Color.TRANSPARENT)
+        setStatusbarColorAuto()
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
-        setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
 
         ActivityCompat.postponeEnterTransition(this)
 
@@ -189,19 +188,23 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
     }
 
     private fun setColors(color: Int) {
-        val themeColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
+        val themeColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color.ripAlpha()
         else ThemeStore.accentColor(this)
 
         songTitle.setTextColor(themeColor)
         moreTitle.setTextColor(themeColor)
 
-        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
+        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
-        else ATHUtil.resolveColor(this, R.attr.cardBackgroundColor)
+            color.ripAlpha()
+        else
+            ATHUtil.resolveColor(this, R.attr.colorSurface)
 
         MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
         MaterialUtil.setTint(button = playAction, color = buttonColor)
 
-        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+        val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
+        status_bar.setBackgroundColor(toolbarColor)
+        toolbar.setBackgroundColor(toolbarColor)
         setSupportActionBar(toolbar)
         supportActionBar?.title = null
     }
@@ -244,7 +247,8 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
             R.id.action_tag_editor -> {
                 val intent = Intent(this, AlbumTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id)
-                startActivityForResult(intent, TAG_EDITOR_REQUEST)
+                val options = ActivityOptions.makeSceneTransitionAnimation(this, image, getString(R.string.transition_album_art))
+                startActivityForResult(intent, TAG_EDITOR_REQUEST, options.toBundle())
                 return true
             }
             /*Sort*/

app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt

@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.activities
 
 import android.app.Activity
 import android.content.Intent
-import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.text.Html
@@ -17,7 +16,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
@@ -26,6 +24,7 @@ import code.name.monkey.retromusic.adapter.album.AlbumAdapter
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.glide.ArtistGlideRequest
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -39,6 +38,7 @@ import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.activity_artist_content.*
 import kotlinx.android.synthetic.main.activity_artist_details.*
+import kotlinx.android.synthetic.main.status_bar.*
 import java.util.*
 import javax.inject.Inject
 import kotlin.collections.ArrayList
@@ -51,7 +51,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
         cab = MaterialCab(this, R.id.cab_stub)
                 .setMenu(menuRes)
                 .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
-                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface)))
                 .start(callback)
         return cab as MaterialCab
     }
@@ -74,11 +74,10 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         toggleBottomNavigationView(true)
-        setStatusbarColor(Color.TRANSPARENT)
+        setStatusbarColorAuto()
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
-        setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
 
         ActivityCompat.postponeEnterTransition(this)
 
@@ -226,21 +225,26 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
     }
 
     private fun setColors(color: Int) {
-
+        val textColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
-        val textColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
+            color.ripAlpha()
-        else ThemeStore.accentColor(this)
+        else
+            ThemeStore.accentColor(this)
 
         albumTitle.setTextColor(textColor)
         songTitle.setTextColor(textColor)
         biographyTitle.setTextColor(textColor)
 
-        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
+        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
-        else ATHUtil.resolveColor(this, R.attr.cardBackgroundColor)
+            color.ripAlpha()
+        else
+            ATHUtil.resolveColor(this, R.attr.colorSurface)
 
         MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
         MaterialUtil.setTint(button = playAction, color = buttonColor)
 
-        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+        val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
+        status_bar.setBackgroundColor(toolbarColor)
+        toolbar.setBackgroundColor(toolbarColor)
         setSupportActionBar(toolbar)
         supportActionBar?.title = null
     }
@@ -271,21 +275,12 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
             R.id.action_set_artist_image -> {
                 val intent = Intent(Intent.ACTION_GET_CONTENT)
                 intent.type = "image/*"
-                startActivityForResult(
+                startActivityForResult(Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE)
-                        Intent.createChooser(
-                                intent, getString(R.string.pick_from_local_storage)
-                        ), REQUEST_CODE_SELECT_IMAGE
-                )
                 return true
             }
             R.id.action_reset_artist_image -> {
-                Toast.makeText(
+                Toast.makeText(this@ArtistDetailActivity, resources.getString(R.string.updating), Toast.LENGTH_SHORT).show()
-                        this@ArtistDetailActivity,
+                CustomArtistImageUtil.getInstance(this@ArtistDetailActivity).resetCustomArtistImage(artist)
-                        resources.getString(R.string.updating),
-                        Toast.LENGTH_SHORT
-                ).show()
-                CustomArtistImageUtil.getInstance(this@ArtistDetailActivity)
-                        .resetCustomArtistImage(artist)
                 forceDownload = true
                 return true
             }

app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt

@@ -1,19 +1,25 @@
 package code.name.monkey.retromusic.activities
 
-import android.graphics.Color
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
-import androidx.recyclerview.widget.*
+import android.view.MenuItem
-import code.name.monkey.appthemehelper.util.*
+import android.view.View
-import code.name.monkey.retromusic.*
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
 import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.mvp.presenter.*
+import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsView
+import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialcab.MaterialCab
 import kotlinx.android.synthetic.main.activity_playlist_detail.*
@@ -33,19 +39,22 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
     private lateinit var songAdapter: ShuffleButtonSongAdapter
     private var cab: MaterialCab? = null
 
+    private fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
     private fun checkIsEmpty() {
+        emptyEmoji.text = getEmojiByUnicode(0x1F631)
         empty?.visibility = if (songAdapter.itemCount == 0) View.VISIBLE else View.GONE
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-
+        setStatusbarColorAuto()
-		setStatusbarColor(Color.TRANSPARENT)
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
-		setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
         toggleBottomNavigationView(true)
 
         if (intent.extras != null) {
@@ -63,8 +72,6 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
     }
 
     private fun setUpToolBar() {
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		appBarLayout.setBackgroundColor(primaryColor)
         applyToolbar(toolbar)
         title = genre.name
     }

app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java

@@ -57,15 +57,16 @@ public class LicenseActivity extends AbsBaseActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setDrawUnderStatusBar();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_license);
         setStatusbarColorAuto();
-        setNavigationBarColorPrimary();
+        setNavigationbarColorAuto();
         setLightNavigationBar(true);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ToolbarContentTintHelper.colorBackButton(toolbar);
-        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorPrimary));
+        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorSurface));
         WebView webView = findViewById(R.id.license);
         try {
             StringBuilder buf = new StringBuilder();
@@ -78,7 +79,7 @@ public class LicenseActivity extends AbsBaseActivity {
 
             // Inject color values for WebView body background and links
             final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
-            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.colorPrimary, Color.parseColor(isDark ? "#424242" : "#ffffff")));
+            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, android.R.attr.windowBackground, Color.parseColor(isDark ? "#424242" : "#ffffff")));
             final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
             final String changeLog = buf.toString()
                     .replace("{style-placeholder}",

app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt

@@ -34,7 +34,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
 		hideStatusBar()
 		setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+		setNavigationbarColorAuto()
 		setTaskDescriptionColorAuto()
 		setLightNavigationBar(true)
 

app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt

@@ -2,28 +2,44 @@ package code.name.monkey.retromusic.activities
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.os.*
+import android.os.AsyncTask
-import android.text.*
+import android.os.Build
+import android.os.Bundle
+import android.text.InputType
+import android.text.TextUtils
 import android.view.*
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.*
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.viewpager.widget.ViewPager
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.*
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.activities.tageditor.WriteTagsAsyncTask
+import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.helper.*
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.lyrics.*
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.lyrics.LrcHelper
+import code.name.monkey.retromusic.lyrics.LrcView
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.LyricUtil
-import com.afollestad.materialdialogs.*
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
-import com.afollestad.materialdialogs.input.*
+import com.afollestad.materialdialogs.input.getInputLayout
+import com.afollestad.materialdialogs.input.input
 import kotlinx.android.synthetic.main.activity_lyrics.*
 import kotlinx.android.synthetic.main.fragment_lyrics.*
 import kotlinx.android.synthetic.main.fragment_synced.*
@@ -71,34 +87,14 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_lyrics)
-
         setStatusbarColorAuto()
         setTaskDescriptionColorAuto()
-		setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
-
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		appBarLayout.setBackgroundColor(primaryColor)
-		toolbar.apply {
-			setBackgroundColor(primaryColor)
-			navigationIcon = TintHelper.createTintedDrawable(
-					ContextCompat.getDrawable(
-							this@LyricsActivity, R.drawable.ic_keyboard_backspace_black_24dp
-					), ThemeStore.textColorSecondary(this@LyricsActivity)
-			)
-			setSupportActionBar(toolbar)
-		}
-
 
+        applyToolbar(toolbar)
         fab.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-		ColorStateList.valueOf(
+        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this))))
-				MaterialValueHelper.getPrimaryTextColor(
+                .apply {
-						this, ColorUtil.isColorLight(
-						ThemeStore.accentColor(
-								this
-						)
-				)
-				)
-		).apply {
                     fab.setTextColor(this)
                     fab.iconTint = this
                 }

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt

@@ -12,11 +12,15 @@ import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
 import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment
 import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment
-import code.name.monkey.retromusic.helper.*
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SearchQueryHelper
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
-import code.name.monkey.retromusic.loaders.*
+import code.name.monkey.retromusic.loaders.AlbumLoader
+import code.name.monkey.retromusic.loaders.ArtistLoader
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.AppRater
+import code.name.monkey.retromusic.util.PreferenceUtil
 import io.reactivex.disposables.CompositeDisposable
 import java.util.*
 
@@ -49,9 +53,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
     ) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-
         getBottomNavigationView().selectedItemId = PreferenceUtil.getInstance(this).lastPage
-
         getBottomNavigationView().setOnNavigationItemSelectedListener {
             PreferenceUtil.getInstance(this).lastPage = it.itemId
             selectedFragment(it.itemId)
@@ -65,7 +67,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
         }
 
         checkShowChangelog()
-		AppRater.appLaunched(this);
+        AppRater.appLaunched(this)
     }
 
     private fun checkShowChangelog() {
@@ -108,7 +110,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
     }
 
     private fun setCurrentFragment(fragment: Fragment, tag: String) {
-		println("setCurrentFragment -> $tag -> ${supportFragmentManager.findFragmentById(R.id.fragment_container)?.tag}")
         if (tag != supportFragmentManager.findFragmentById(R.id.fragment_container)?.tag) {
             supportFragmentManager.beginTransaction()
                     .replace(R.id.fragment_container, fragment, tag).commit()
@@ -124,7 +125,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
         if (intent == null) {
             return
         }
-
         val uri = intent.data
         val mimeType = intent.type
         var handled = false

app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt

@@ -3,15 +3,17 @@ package code.name.monkey.retromusic.activities
 import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
@@ -27,20 +29,15 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
 
     private fun getUpNextAndQueueTime(): String {
         val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
-
+        return MusicUtil.buildInfoString(resources.getString(R.string.up_next), MusicUtil.getReadableDurationString(duration))
-		return MusicUtil.buildInfoString(
-				resources.getString(R.string.up_next), MusicUtil.getReadableDurationString(duration)
-		)
     }
 
-	override fun onCreate(
+    override fun onCreate(savedInstanceState: Bundle?) {
-			savedInstanceState: Bundle?
+        setDrawUnderStatusBar()
-	) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_playing_queue)
-
         setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
 
@@ -168,8 +165,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
         playerQueueSubHeader.setTextColor(ThemeStore.accentColor(this))
 
         applyToolbar(toolbar)
-		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
-
         clearQueue.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
         ColorStateList.valueOf(
                 MaterialValueHelper.getPrimaryTextColor(

app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt

@@ -1,20 +1,29 @@
 package code.name.monkey.retromusic.activities
 
-import android.graphics.Color
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
-import androidx.recyclerview.widget.*
+import android.view.MenuItem
-import code.name.monkey.appthemehelper.util.*
+import android.view.View
-import code.name.monkey.retromusic.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.adapter.song.*
+import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
-import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.loaders.PlaylistLoader
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
-import code.name.monkey.retromusic.mvp.presenter.*
+import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsView
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialcab.MaterialCab
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
@@ -37,18 +46,15 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
     override fun onCreate(savedInstanceState: Bundle?) {
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-		App.musicComponent.inject(this)
+        setStatusbarColorAuto()
-
-		playlistSongsPresenter.attachView(this)
-
-		setStatusbarColor(Color.TRANSPARENT)
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
-		setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, R.attr.colorPrimary)))
-
         toggleBottomNavigationView(true)
 
+        App.musicComponent.inject(this)
+        playlistSongsPresenter.attachView(this)
+
         if (intent.extras != null) {
             playlist = intent.extras!!.getParcelable(EXTRA_PLAYLIST)!!
         } else {
@@ -78,24 +84,11 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
                     false,
                     this,
                     object : OrderablePlaylistSongAdapter.OnMoveItemListener {
-				                                       override fun onMoveItem(
+                        override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-						                                       fromPosition: Int,
+                            if (PlaylistsUtil.moveItem(this@PlaylistDetailActivity, playlist.id, fromPosition, toPosition)) {
-						                                       toPosition: Int
+                                val song = adapter.dataSet.removeAt(fromPosition)
-				                                       ) {
-					                                       if (PlaylistsUtil.moveItem(
-									                                       this@PlaylistDetailActivity,
-									                                       playlist.id,
-									                                       fromPosition,
-									                                       toPosition
-							                                       )) {
-						                                       val song = adapter.dataSet.removeAt(
-								                                       fromPosition
-						                                       )
                                 adapter.dataSet.add(toPosition, song)
-						                                       adapter.notifyItemMoved(
+                                adapter.notifyItemMoved(fromPosition, toPosition)
-								                                       fromPosition,
-								                                       toPosition
-						                                       )
                             }
                         }
                     })
@@ -120,7 +113,8 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
     }
 
     private fun setUpToolBar() {
-		applyToolbar(toolbar)
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
         title = playlist.name
     }
 
@@ -196,10 +190,15 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
 
     private fun checkIsEmpty() {
         checkForPadding()
+        emptyEmoji.text = getEmojiByUnicode(0x1F631)
         empty.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE
         emptyText.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE
     }
 
+    private fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
     public override fun onPause() {
         if (recyclerViewDragDropManager != null) {
             recyclerViewDragDropManager!!.cancelDrag()

app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt

@@ -1,16 +1,19 @@
 package code.name.monkey.retromusic.activities
 
 import android.content.Intent
-import android.os.*
+import android.os.AsyncTask
+import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import com.anjlab.android.iab.v3.*
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_pro_version.*
 import java.lang.ref.WeakReference
 
@@ -23,16 +26,11 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_pro_version)
 		setDrawUnderStatusBar()
-
 		setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+		setNavigationbarColorAuto()
 		setTaskDescriptionColorAuto()
 		setLightNavigationBar(true)
 
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		toolbar.setBackgroundColor(primaryColor)
-		appBarLayout.setBackgroundColor(primaryColor)
-
 		applyToolbar(toolbar)
 
 		restoreButton.isEnabled = false

app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt

@@ -27,7 +27,6 @@ import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.SearchAdapter
 import code.name.monkey.retromusic.mvp.presenter.SearchPresenter
 import code.name.monkey.retromusic.mvp.presenter.SearchView
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import com.google.android.material.textfield.TextInputEditText
 import kotlinx.android.synthetic.main.activity_search.*
@@ -46,14 +45,14 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_search)
-        App.musicComponent.inject(this)
-        searchPresenter.attachView(this)
-
         setStatusbarColorAuto()
-        setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
 
+        App.musicComponent.inject(this)
+        searchPresenter.attachView(this)
+
         setupRecyclerView()
         setUpToolBar()
         setupSearchView()
@@ -65,7 +64,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
         back.setOnClickListener { onBackPressed() }
         voiceSearch.setOnClickListener { startMicSearch() }
         clearText.setOnClickListener { searchView.clearText() }
-        searchContainer.setCardBackgroundColor(RetroColorUtil.toolbarColor(this))
+        searchContainer.backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(this, R.attr.colorSurface))
 
         keyboardPopup.setOnClickListener {
             val inputManager = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager
@@ -80,7 +79,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
             keyboardPopup.iconTint = this
         }
         if (savedInstanceState != null) {
-            query = savedInstanceState.getString(QUERY);
+            query = savedInstanceState.getString(QUERY)
         }
 
     }
@@ -125,7 +124,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch
 
     private fun setUpToolBar() {
         title = null
-        appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
     }
 
     private fun search(query: String) {

app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt

@@ -5,7 +5,8 @@ import android.view.MenuItem
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionManager
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.fragments.settings.MainSettingsFragment
@@ -16,31 +17,28 @@ class SettingsActivity : AbsBaseActivity() {
     private val fragmentManager = supportFragmentManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         setStatusbarColorAuto()
-        setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
         setLightNavigationBar(true)
 
         setupToolbar()
 
         if (savedInstanceState == null) {
-            fragmentManager.beginTransaction().replace(R.id.contentFrame, MainSettingsFragment())
+            fragmentManager.beginTransaction().replace(R.id.contentFrame, MainSettingsFragment()).commit()
-                    .commit()
         }
     }
 
     private fun setupToolbar() {
-        setSupportActionBar(toolbar)
         setTitle(R.string.action_settings)
         toolbar.apply {
-            setTitleTextColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorOnPrimary))
+            setBackgroundColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorSurface))
-            setBackgroundColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorPrimary))
             setNavigationOnClickListener { onBackPressed() }
             ToolbarContentTintHelper.colorBackButton(toolbar)
         }
-        appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorPrimary))
+        setSupportActionBar(toolbar)
-
     }
 
     fun setupFragment(fragment: Fragment, @StringRes titleName: Int) {

app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt

@@ -2,20 +2,30 @@ package code.name.monkey.retromusic.activities
 
 import android.content.Intent
 import android.graphics.Paint
-import android.os.*
+import android.os.AsyncTask
+import android.os.Bundle
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
-import android.widget.*
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.*
+import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import com.anjlab.android.iab.v3.*
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.SkuDetails
+import com.anjlab.android.iab.v3.TransactionDetails
 import kotlinx.android.synthetic.main.activity_donation.*
 import java.lang.ref.WeakReference
 import java.util.*
@@ -49,7 +59,7 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH
 		setContentView(R.layout.activity_donation)
 
 		setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+		setNavigationbarColorAuto()
 		setTaskDescriptionColorAuto()
 		setLightNavigationBar(true)
 
@@ -61,8 +71,6 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH
 	}
 
 	private fun setupToolbar() {
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		appBarLayout.setBackgroundColor(primaryColor)
 		applyToolbar(toolbar)
 	}
 

app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt

@@ -1,7 +1,10 @@
 package code.name.monkey.retromusic.activities
 
 import android.app.Activity
-import android.content.*
+import android.content.ContentUris
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
 import android.net.Uri
@@ -13,23 +16,29 @@ import android.text.TextUtils
 import android.view.MenuItem
 import android.widget.Toast
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.*
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Constants.USER_BANNER
 import code.name.monkey.retromusic.Constants.USER_PROFILE
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.Compressor
 import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap
-import com.afollestad.materialdialogs.*
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_user_info.*
-import java.io.*
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 
 class UserInfoActivity : AbsBaseActivity() {
 
@@ -39,11 +48,11 @@ class UserInfoActivity : AbsBaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_user_info)
         setStatusbarColorAuto()
-		setNavigationBarColorPrimary()
+        setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
 
-		setupToolbar()
+        applyToolbar(toolbar)
 
         MaterialUtil.setTint(nameContainer, false)
         name.setText(PreferenceUtil.getInstance(this).userName)
@@ -56,13 +65,9 @@ class UserInfoActivity : AbsBaseActivity() {
         }
         userImage.setOnClickListener {
             MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
                 title(text = getString(R.string.set_photo))
-				listItems(
+                listItems(items = listOf(getString(R.string.new_profile_photo), getString(R.string.remove_profile_photo))) { _, position, _ ->
-						items = listOf(
-								getString(R.string.new_profile_photo),
-								getString(R.string.remove_profile_photo)
-						)
-				) { _, position, _ ->
                     when (position) {
                         0 -> pickNewPhoto()
                         1 -> PreferenceUtil.getInstance(this@UserInfoActivity).saveProfileImage("")
@@ -71,7 +76,17 @@ class UserInfoActivity : AbsBaseActivity() {
             }
         }
         bannerSelect.setOnClickListener {
-			showBannerOptions()
+            MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
+                title(R.string.select_banner_photo)
+                listItems(items = listOf(getString(R.string.new_banner_photo), getString(R.string.remove_banner_photo)))
+                { _, position, _ ->
+                    when (position) {
+                        0 -> selectBannerImage()
+                        1 -> PreferenceUtil.getInstance(this@UserInfoActivity).setBannerImagePath("")
+                    }
+                }
+            }
         }
         next.setOnClickListener {
             val nameString = name.text.toString().trim { it <= ' ' }
@@ -79,28 +94,13 @@ class UserInfoActivity : AbsBaseActivity() {
                 Toast.makeText(this, "Umm name is empty", Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
-			/*val bioString = bio.text.toString().trim() { it <= ' ' }
-			if (TextUtils.isEmpty(bioString)) {
-				Toast.makeText(this, "Umm bio is empty", Toast.LENGTH_SHORT).show()
-				return@setOnClickListener
-
-			}*/
             PreferenceUtil.getInstance(this).userName = nameString
-			//PreferenceUtil.getInstance().userBio = bioString
             setResult(Activity.RESULT_OK)
             finish()
         }
         next.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
-		ColorStateList.valueOf(
+        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this))))
-				MaterialValueHelper.getPrimaryTextColor(
+                .apply {
-						this,
-						ColorUtil.isColorLight(
-								ThemeStore.accentColor(
-										this
-								)
-						)
-				)
-		).apply {
                     next.setTextColor(this)
                     next.iconTint = this
                 }
@@ -113,32 +113,7 @@ class UserInfoActivity : AbsBaseActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-	private fun setupToolbar() {
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		applyToolbar(toolbar)
-		appBarLayout.setBackgroundColor(primaryColor)
-	}
-
-	private fun showBannerOptions() {
-		MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
-			title(R.string.select_banner_photo)
-			listItems(
-					items = listOf(
-							getString(R.string.new_banner_photo),
-							getString(R.string.remove_banner_photo)
-					)
-			) { _, position, _ ->
-				when (position) {
-					0 -> selectBannerImage()
-					1 -> PreferenceUtil.getInstance(this@UserInfoActivity).setBannerImagePath("")
-				}
-			}
-		}
-	}
-
     private fun selectBannerImage() {
-
-		if (TextUtils.isEmpty(PreferenceUtil.getInstance(this).bannerImage)) {
         val pickImageIntent = Intent(Intent.ACTION_PICK, Media.EXTERNAL_CONTENT_URI)
         pickImageIntent.type = "image/*"
         //pickImageIntent.putExtra("crop", "true")
@@ -152,10 +127,6 @@ class UserInfoActivity : AbsBaseActivity() {
                 Intent.createChooser(pickImageIntent, "Select Picture"),
                 PICK_BANNER_REQUEST
         )
-		} else {
-			PreferenceUtil.getInstance(this).setBannerImagePath("")
-			bannerImage.setImageResource(android.R.color.transparent)
-		}
     }
 
     private fun pickNewPhoto() {

app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java

@@ -49,20 +49,18 @@ public class WhatsNewActivity extends AbsBaseActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setDrawUnderStatusBar();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_whats_new);
-
         setStatusbarColorAuto();
-        setNavigationBarColorPrimary();
+        setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
 
         webView = findViewById(R.id.webView);
         toolbar = findViewById(R.id.toolbar);
         appBarLayout = findViewById(R.id.appBarLayout);
 
-        int primaryColor = INSTANCE.resolveColor(this, R.attr.colorPrimary);
+        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorSurface));
-        toolbar.setBackgroundColor(primaryColor);
-        appBarLayout.setBackgroundColor(primaryColor);
         //setSupportActionBar(toolbar);
 
         toolbar.setNavigationOnClickListener(v -> onBackPressed());
@@ -79,11 +77,10 @@ public class WhatsNewActivity extends AbsBaseActivity {
 
             // Inject color values for WebView body background and links
             final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
-            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.colorPrimary, Color.parseColor(isDark ? "#424242" : "#ffffff")));
+            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this,  R.attr.colorSurface, Color.parseColor(isDark ? "#424242" : "#ffffff")));
             final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
             final String changeLog = buf.toString()
-                    .replace("{style-placeholder}",
+                    .replace("{style-placeholder}", String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
-                            String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
                     .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this)))
                     .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))));
 

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt

@@ -1,16 +1,20 @@
 package code.name.monkey.retromusic.activities.base
 
 import android.animation.ValueAnimator
-import android.annotation.SuppressLint
+import android.graphics.Color
-import android.graphics.*
 import android.os.Bundle
-import android.view.*
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.fragments.*
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
@@ -28,7 +32,9 @@ import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
 import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
 import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.model.CategoryInfo
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.views.BottomNavigationBarTinted
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.card.MaterialCardView
@@ -87,7 +93,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 
         bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel)
 
-		val themeColor = ATHUtil.resolveColor(this, R.attr.colorPrimary, Color.GRAY)
+        val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
         dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
     }
 
@@ -106,13 +112,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
     override fun onDestroy() {
         super.onDestroy()
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallbackList)
-		if (navigationBarColorAnimator != null) navigationBarColorAnimator!!.cancel() // just in case
+        if (navigationBarColorAnimator != null) navigationBarColorAnimator?.cancel() // just in case
     }
 
     protected fun wrapSlidingMusicPanel(@LayoutRes resId: Int): View {
-		@SuppressLint("InflateParams") val slidingMusicPanelLayout = layoutInflater.inflate(
+        val slidingMusicPanelLayout = layoutInflater.inflate(R.layout.sliding_music_panel_layout, null)
-				R.layout.sliding_music_panel_layout, null
-		)
         val contentContainer = slidingMusicPanelLayout.findViewById<ViewGroup>(R.id.mainContentFrame)
         layoutInflater.inflate(resId, contentContainer)
         return slidingMusicPanelLayout
@@ -135,7 +139,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
         miniPlayerFragment?.view?.visibility = if (alpha == 0f) View.GONE else View.VISIBLE
 
         bottomNavigationView.translationY = progress * 500
-		bottomNavigationView.alpha = alpha
+        //bottomNavigationView.alpha = alpha
     }
 
     open fun onPanelCollapsed() {
@@ -288,13 +292,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
                 super.setLightNavigationBar(isColorLight)
                 super.setLightStatusbar(isColorLight)
             } else {
-				super.setLightStatusbar(
+                super.setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, android.R.attr.windowBackground)))
-						ColorUtil.isColorLight(
-								ATHUtil.resolveColor(
-										this, R.attr.colorPrimary
-								)
-						)
-				)
                 super.setLightNavigationBar(true)
             }
         }
@@ -331,18 +329,20 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
 
     private fun updateTabs() {
         bottomNavigationView.menu.clear()
-		val currentTabs = PreferenceUtil.getInstance(this).libraryCategoryInfos
+        val currentTabs: List<CategoryInfo> = PreferenceUtil.getInstance(this).libraryCategoryInfos
         for (tab in currentTabs) {
             if (tab.visible) {
                 val menu = tab.category
-				bottomNavigationView.menu.add(
+                bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes).setIcon(menu.icon)
-						0, menu.id, 0, menu.stringRes
-				).setIcon(menu.icon)
             }
         }
+        print("Tabs -> ${currentTabs.size}")
+        if (currentTabs.size <= 1) {
+            toggleBottomNavigationView(true)
+        }
     }
 
-	override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+    /*override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
         if (ev?.action == MotionEvent.ACTION_DOWN) {
             if (panelState == BottomSheetBehavior.STATE_EXPANDED) {
                 val outRect = Rect()
@@ -353,5 +353,5 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlay
             }
         }
         return super.dispatchTouchEvent(ev)
-	}
+    }*/
 }

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt

@@ -2,15 +2,24 @@ package code.name.monkey.retromusic.activities.base
 
 import android.graphics.Color
 import android.graphics.drawable.Drawable
-import android.os.*
+import android.os.Bundle
-import android.view.*
+import android.os.Handler
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowManager
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.*
+import code.name.monkey.appthemehelper.ATH
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.ThemeManager
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
@@ -20,8 +29,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         setTheme(ThemeManager.getThemeResValue(this))
         hideStatusBar()
         super.onCreate(savedInstanceState)
-
-		changeBackgroundShape()
         setImmersiveFullscreen()
         registerSystemUiVisibility()
         toggleScreenOn()
@@ -58,15 +65,10 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     }
 
     private fun changeBackgroundShape() {
-		var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners) ContextCompat.getDrawable(
+        var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners)
-				this,
+            ContextCompat.getDrawable(this, R.drawable.round_window)
-				R.drawable.round_window
-		)
         else ContextCompat.getDrawable(this, R.drawable.square_window)
-		background = TintHelper.createTintedDrawable(
+        background = TintHelper.createTintedDrawable(background, ATHUtil.resolveColor(this, android.R.attr.windowBackground))
-				background,
-				ATHUtil.resolveColor(this, R.attr.colorPrimary)
-		)
         window.setBackgroundDrawable(background)
     }
 
@@ -89,11 +91,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         if (statusBar != null) {
             when {
                 VersionUtils.hasMarshmallow() -> window.statusBarColor = color
-				VersionUtils.hasLollipop()    -> statusBar.setBackgroundColor(
+                VersionUtils.hasLollipop() -> statusBar.setBackgroundColor(ColorUtil.darkenColor(color))
-						ColorUtil.darkenColor(
-								color
-						)
-				)
                 else -> statusBar.setBackgroundColor(color)
             }
         } else {
@@ -102,12 +100,13 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
                 else -> window.statusBarColor = ColorUtil.darkenColor(color)
             }
         }
-		setLightStatusbarAuto(color)
+        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
     }
 
     fun setStatusbarColorAuto() {
         // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
-		setStatusbarColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+        //setStatusbarColor(ATHUtil.resolveColor(this, android.R.attr.windowBackground))
+        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
     }
 
     open fun setTaskDescriptionColor(@ColorInt color: Int) {
@@ -115,7 +114,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     }
 
     fun setTaskDescriptionColorAuto() {
-		setTaskDescriptionColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+        setTaskDescriptionColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
     }
 
     open fun setNavigationbarColor(color: Int) {
@@ -126,12 +125,8 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
-	open fun setNavigationBarColorPrimary() {
-		ATH.setNavigationbarColor(this, ATHUtil.resolveColor(this, R.attr.colorPrimary))
-	}
-
     fun setNavigationbarColorAuto() {
-		setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSecondary))
+        setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
     }
 
     open fun setLightStatusbar(enabled: Boolean) {

app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt

@@ -1,21 +1,32 @@
 package code.name.monkey.retromusic.activities.bugreport
 
-import android.app.*
+import android.app.Activity
-import android.content.*
+import android.app.Dialog
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
 import android.view.inputmethod.EditorInfo
 import android.widget.Toast
-import androidx.annotation.*
+import androidx.annotation.StringDef
+import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.activities.bugreport.model.*
+import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
-import code.name.monkey.retromusic.activities.bugreport.model.github.*
+import code.name.monkey.retromusic.activities.bugreport.model.Report
+import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget
 import code.name.monkey.retromusic.misc.DialogAsyncTask
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.callbacks.onCancel
@@ -25,7 +36,8 @@ import kotlinx.android.synthetic.main.activity_bug_report.*
 import kotlinx.android.synthetic.main.bug_report_card_device_info.*
 import kotlinx.android.synthetic.main.bug_report_card_report.*
 import org.eclipse.egit.github.core.Issue
-import org.eclipse.egit.github.core.client.*
+import org.eclipse.egit.github.core.client.GitHubClient
+import org.eclipse.egit.github.core.client.RequestException
 import org.eclipse.egit.github.core.service.IssueService
 import java.io.IOException
 
@@ -50,9 +62,9 @@ open class BugReportActivity : AbsThemeActivity() {
 	private var deviceInfo: DeviceInfo? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
+		setDrawUnderStatusBar()
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_bug_report)
-
 		setStatusbarColorAuto()
 		setNavigationbarColorAuto()
 		setTaskDescriptionColorAuto()
@@ -67,7 +79,7 @@ open class BugReportActivity : AbsThemeActivity() {
 
 	private fun initViews() {
 		val accentColor = ThemeStore.accentColor(this)
-		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorPrimary)
+		val primaryColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
 		toolbar.setBackgroundColor(primaryColor)
 		setSupportActionBar(toolbar)
 		ToolbarContentTintHelper.colorBackButton(toolbar)

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt

@@ -2,20 +2,28 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
-import android.text.*
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.glide.palette.*
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.loaders.AlbumLoader
 import code.name.monkey.retromusic.rest.LastFMRestClient
 import code.name.monkey.retromusic.rest.model.LastFmAlbum
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.ImageUtil
+import code.name.monkey.retromusic.util.LastFMUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
 import com.bumptech.glide.Glide
@@ -43,16 +51,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 				) {
 					getColor(resource?.palette, Color.TRANSPARENT)
 					albumArtBitmap = resource?.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
-					setImageBitmap(
+					setImageBitmap(albumArtBitmap, getColor(resource?.palette, ATHUtil.resolveColor(this@AlbumTagEditorActivity, R.attr.defaultFooterColor)))
-							albumArtBitmap,
-							getColor(
-									resource?.palette,
-									ATHUtil.resolveColor(
-											this@AlbumTagEditorActivity,
-											R.attr.defaultFooterColor
-									)
-							)
-					)
 					deleteAlbumArt = false
 					dataChanged()
 					setResult(Activity.RESULT_OK)
@@ -72,8 +71,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 	private val disposable = CompositeDisposable()
 
 	private fun setupToolbar() {
-		toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
+		applyToolbar(toolbar)
-		setSupportActionBar(toolbar)
 		supportActionBar?.setDisplayShowHomeEnabled(true)
 	}
 

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt

@@ -2,12 +2,12 @@ package code.name.monkey.retromusic.activities.tageditor
 
 import android.net.Uri
 import android.os.Bundle
-import android.text.*
+import android.text.Editable
-import androidx.core.content.ContextCompat
+import android.text.TextWatcher
-import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.MaterialUtil
-import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.appHandleColor
+import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.loaders.SongLoader
 import kotlinx.android.synthetic.main.activity_song_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
@@ -18,33 +18,13 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
     override val contentViewLayout: Int
         get() = R.layout.activity_song_tag_editor
 
-	private fun setupToolbar() {
-		appBarLayout.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorPrimary))
-		toolbar.apply {
-			setBackgroundColor(
-					ATHUtil.resolveColor(
-							this@SongTagEditorActivity,
-							R.attr.colorPrimary
-					)
-			)
-			navigationIcon = TintHelper.createTintedDrawable(
-					ContextCompat.getDrawable(
-							context,
-							R.drawable.ic_keyboard_backspace_black_24dp
-					), ThemeStore.textColorPrimary(context)
-			)
-			setNavigationOnClickListener { onBackPressed() }
-			setSupportActionBar(toolbar)
-		}
-		title = null
-	}
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setNoImageMode()
         setUpViews()
-		setupToolbar()
+        applyToolbar(toolbar)
         setStatusbarColorAuto()
     }
 

app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt

@@ -1,7 +1,9 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.Activity
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
@@ -29,18 +31,8 @@ class GenreAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val genre = dataSet[position]
-		if (holder.title != null) {
+        holder.title?.text = genre.name
-			holder.title!!.text = genre.name
+        holder.text?.text = String.format(Locale.getDefault(), "%d %s", genre.songCount, if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song))
-		}
-		if (holder.text != null) {
-			holder.text!!.text = String.format(
-					Locale.getDefault(),
-					"%d %s",
-					genre.songCount,
-					if (genre.songCount > 1) activity.getString(R.string.songs)
-					else activity.getString(R.string.song)
-			)
-		}
     }
 
     override fun getItemCount(): Int {

app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt

@@ -1,20 +1,25 @@
 package code.name.monkey.retromusic.adapter
 
 import android.util.DisplayMetrics
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Home
+import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.textview.MaterialTextView
 
 class HomeAdapter(
         private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics
@@ -33,11 +38,7 @@ class HomeAdapter(
             RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout)
             PLAYLISTS -> PlaylistViewHolder(layout)
             else -> {
-				AlbumViewHolder(
+                AlbumViewHolder(LayoutInflater.from(activity).inflate(R.layout.metal_section_recycler_view, parent, false))
-						LayoutInflater.from(activity).inflate(
-								R.layout.metal_section_recycler_view, parent, false
-						)
-				)
             }
         }
     }
@@ -47,44 +48,23 @@ class HomeAdapter(
         when (getItemViewType(position)) {
             RECENT_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-				viewHolder.bindView(
+                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.recent_albums)
-						list[position].arrayList.toAlbums(),
-						R.string.recent_albums,
-						R.string.recent_added_albums
-				)
             }
             TOP_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-				viewHolder.bindView(
+                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.top_albums)
-						list[position].arrayList.toAlbums(),
-						R.string.top_albums,
-						R.string.most_played_albums
-				)
             }
             RECENT_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-				viewHolder.bindView(
+                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.recent_artists)
-						list[position].arrayList.toArtists(),
-						R.string.recent_artists,
-						R.string.recent_added_artists
-				)
             }
             TOP_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-
+                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.top_artists)
-				viewHolder.bindView(
-						list[position].arrayList.toArtists(),
-						R.string.top_artists,
-						R.string.most_played_artists
-				)
             }
             PLAYLISTS -> {
                 val viewHolder = holder as PlaylistViewHolder
-				viewHolder.bindView(
+                viewHolder.bindView(list[position].arrayList.toPlaylist(), R.string.favorites)
-						list[position].arrayList.toPlaylist(),
-						R.string.favorites,
-						R.string.favorites_songs
-				)
             }
         }
     }
@@ -113,23 +93,19 @@ class HomeAdapter(
     }
 
     private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
-		fun bindView(list: ArrayList<Album>, titleRes: Int, subtitleRes: Int) {
+        fun bindView(list: ArrayList<Album>, titleRes: Int) {
             if (list.isNotEmpty()) {
                 recyclerView.apply {
                     show()
                     adapter = AlbumFullWidthAdapter(activity, list, displayMetrics)
                 }
-				titleContainer.show()
                 title.text = activity.getString(titleRes)
-				text.text = activity.getString(subtitleRes)
             }
         }
-
-
     }
 
     inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
-		fun bindView(list: ArrayList<Artist>, titleRes: Int, subtitleRes: Int) {
+        fun bindView(list: ArrayList<Artist>, titleRes: Int) {
             if (list.isNotEmpty()) {
                 recyclerView.apply {
                     show()
@@ -145,15 +121,13 @@ class HomeAdapter(
                     )
                     adapter = artistAdapter
                 }
-				titleContainer.show()
                 title.text = activity.getString(titleRes)
-				text.text = activity.getString(subtitleRes)
             }
         }
     }
 
     private inner class PlaylistViewHolder(view: View) : AbsHomeViewItem(view) {
-		fun bindView(arrayList: ArrayList<Playlist>, titleRes: Int, subtitleRes: Int) {
+        fun bindView(arrayList: ArrayList<Playlist>, titleRes: Int) {
             if (arrayList.isNotEmpty()) {
                 val songs = PlaylistSongsLoader.getPlaylistSongList(activity, arrayList[0])
                 if (songs.isNotEmpty()) {
@@ -168,9 +142,7 @@ class HomeAdapter(
                         adapter = songAdapter
 
                     }
-					titleContainer.show()
                     title.text = activity.getString(titleRes)
-					text.text = activity.getString(subtitleRes)
                 }
             }
         }
@@ -178,9 +150,7 @@ class HomeAdapter(
 
     open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
-		val titleContainer: View = itemView.findViewById(R.id.titleContainer)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
-		val text: MaterialTextView = itemView.findViewById(R.id.text)
     }
 }
 

app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt

@@ -1,18 +1,27 @@
 package code.name.monkey.retromusic.adapter
 
 import android.app.ActivityOptions
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.*
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
+import java.util.*
+import kotlin.collections.ArrayList
 import android.util.Pair as UtilPair
 
 class SearchAdapter(
@@ -27,20 +36,14 @@ class SearchAdapter(
     override fun getItemViewType(position: Int): Int {
         if (dataSet!![position] is Album) return ALBUM
         if (dataSet!![position] is Artist) return ARTIST
+        if (dataSet!![position] is Genre) return GENRE
         return if (dataSet!![position] is Song) SONG else HEADER
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-		return if (viewType == HEADER) ViewHolder(
+        return if (viewType == HEADER) ViewHolder(LayoutInflater.from(activity).inflate(R.layout.sub_header, parent, false), viewType)
-				LayoutInflater.from(activity).inflate(
+        else
-						R.layout.sub_header,
+            ViewHolder(LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType)
-						parent,
-						false
-				), viewType
-		) else ViewHolder(
-				LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false),
-				viewType
-		)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -64,6 +67,11 @@ class SearchAdapter(
                 holder.title?.text = song.title
                 holder.text?.text = song.albumName
             }
+            GENRE -> {
+                val genre = dataSet?.get(position) as Genre
+                holder.title?.text = genre.name
+                holder.text?.text = String.format(Locale.getDefault(), "%d %s", genre.songCount, if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song))
+            }
             else -> {
                 holder.title?.text = dataSet?.get(position).toString()
                 holder.title?.setTextColor(ThemeStore.accentColor(activity))
@@ -103,25 +111,16 @@ class SearchAdapter(
             val item = dataSet!![adapterPosition]
             when (itemViewType) {
                 ALBUM -> {
-					val options = ActivityOptions.makeSceneTransitionAnimation(
+                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_album_art)))
-							activity,
-							UtilPair.create(
-									image,
-									activity.getString(R.string.transition_album_art)
-							)
-					)
                     NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options)
                 }
                 ARTIST -> {
-					val options = ActivityOptions.makeSceneTransitionAnimation(
+                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_artist_image)))
-							activity,
-							UtilPair.create(
-									image,
-									activity.getString(R.string.transition_artist_image)
-							)
-					)
                     NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options)
                 }
+                GENRE -> {
+                    NavigationUtil.goToGenre(activity, item as Genre)
+                }
                 SONG -> {
                     val playList = ArrayList<Song>()
                     playList.add(item as Song)
@@ -136,5 +135,6 @@ class SearchAdapter(
         private const val ALBUM = 1
         private const val ARTIST = 2
         private const val SONG = 3
+        private const val GENRE = 4
     }
 }

app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt

@@ -1,11 +1,15 @@
 package code.name.monkey.retromusic.adapter
 
 import android.graphics.PorterDuff
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.*
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.util.RetroUtil
@@ -16,7 +20,8 @@ import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import java.io.File
 import java.text.DecimalFormat
 import java.util.*
-import kotlin.math.*
+import kotlin.math.log10
+import kotlin.math.pow
 
 class SongFileAdapter(
         private val activity: AppCompatActivity,
@@ -75,17 +80,13 @@ class SongFileAdapter(
     }
 
     private fun loadFileImage(file: File, holder: ViewHolder) {
-		val iconColor = ATHUtil.resolveColor(activity, R.attr.iconColor)
+        val iconColor = ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
         if (file.isDirectory) {
             holder.image?.let {
                 it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
                 it.setImageResource(R.drawable.ic_folder_white_24dp)
             }
-			holder.imageTextContainer?.setCardBackgroundColor(
+            holder.imageTextContainer?.setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
-					ATHUtil.resolveColor(
-							activity, R.attr.colorPrimary
-					)
-			)
 
         } else {
             val error = RetroUtil.getTintedVectorDrawable(
@@ -131,7 +132,7 @@ class SongFileAdapter(
 
         init {
             if (menu != null && callbacks != null) {
-				menu!!.setOnClickListener { v ->
+                menu?.setOnClickListener { v ->
                     val position = adapterPosition
                     if (isPositionInRange(position)) {
                         callbacks.onFileMenuClicked(dataSet!![position], v)

app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java

@@ -93,7 +93,7 @@ public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements Vie
         playSongs = itemView.findViewById(R.id.playSongs);
 
         if (imageContainerCard != null) {
-            imageContainerCard.setCardBackgroundColor(ATHUtil.INSTANCE.resolveColor(itemView.getContext(), R.attr.colorPrimary));
+            imageContainerCard.setCardBackgroundColor(ATHUtil.INSTANCE.resolveColor(itemView.getContext(), R.attr.colorSurface));
         }
         itemView.setOnClickListener(this);
         itemView.setOnLongClickListener(this);

app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt

@@ -1,20 +1,31 @@
 package code.name.monkey.retromusic.adapter.playlist
 
 import android.graphics.drawable.Drawable
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.*
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.dialogs.*
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.helper.menu.*
+import code.name.monkey.retromusic.dialogs.ClearSmartPlaylistDialog
+import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
+import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
+import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.*
+import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*
 
 class PlaylistAdapter(
@@ -69,26 +80,9 @@ class PlaylistAdapter(
     }
 
     private fun getIconRes(playlist: Playlist): Drawable {
-		if (playlist is AbsSmartPlaylist) {
+        return if (MusicUtil.isFavoritePlaylist(activity, playlist))
-			return TintHelper.createTintedDrawable(
+            TintHelper.createTintedDrawable(activity, R.drawable.ic_favorite_white_24dp, ThemeStore.accentColor(activity))!!
-					activity,
+        else TintHelper.createTintedDrawable(activity, R.drawable.ic_playlist_play_white_24dp, ATHUtil.resolveColor(activity, R.attr.colorControlNormal))!!
-					playlist.iconRes,
-					ATHUtil.resolveColor(activity, R.attr.iconColor)
-			)!!
-		}
-		return if (MusicUtil.isFavoritePlaylist(
-						activity,
-						playlist
-				)) TintHelper.createTintedDrawable(
-				activity,
-				R.drawable.ic_favorite_white_24dp,
-				ThemeStore.accentColor(activity)
-		)!!
-		else TintHelper.createTintedDrawable(
-				activity,
-				R.drawable.ic_playlist_play_white_24dp,
-				ATHUtil.resolveColor(activity, R.attr.iconColor)
-		)!!
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -195,7 +189,7 @@ class PlaylistAdapter(
 
             imageTextContainer?.apply {
                 cardElevation = 0f
-				setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorPrimary))
+                setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
             }
         }
 

app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt

@@ -1,15 +1,14 @@
 package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
-import android.content.res.ColorStateList
+import android.view.MenuItem
-import android.view.*
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.NavigationUtil
 import com.google.android.material.button.MaterialButton
 import java.util.*
 
@@ -30,34 +29,18 @@ open class PlaylistSongAdapter(
     }
 
     override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
-
         if (holder.itemViewType == OFFSET_ITEM) {
-
-			val buttonColor = RetroColorUtil.toolbarColor(activity)
-			val textColor = MaterialValueHelper.getPrimaryTextColor(
-					activity, ColorUtil.isColorLight(
-					buttonColor
-			)
-			)
             val viewHolder = holder as ViewHolder
-
             viewHolder.playAction?.let {
-				it.backgroundTintList = ColorStateList.valueOf(buttonColor)
-				it.setTextColor(textColor)
-				it.iconTint = ColorStateList.valueOf(textColor)
                 it.setOnClickListener {
                     MusicPlayerRemote.openQueue(dataSet, 0, true)
                 }
             }
             viewHolder.shuffleAction?.let {
-				it.backgroundTintList = ColorStateList.valueOf(buttonColor)
-				it.setTextColor(textColor)
-				it.iconTint = ColorStateList.valueOf(textColor)
                 it.setOnClickListener {
                     MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
                 }
             }
-
         } else {
             super.onBindViewHolder(holder, position - 1)
         }

app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt

@@ -2,17 +2,25 @@ package code.name.monkey.retromusic.adapter.song
 
 import android.app.ActivityOptions
 import android.graphics.drawable.Drawable
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.*
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.glide.*
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.helper.*
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.menu.*
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SortOrder
+import code.name.monkey.retromusic.helper.menu.SongMenuHelper
+import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
@@ -79,20 +87,8 @@ open class SongAdapter(
 	private fun setColors(color: Int, holder: ViewHolder) {
 		if (holder.paletteColorContainer != null) {
 			holder.paletteColorContainer?.setBackgroundColor(color)
-			holder.title?.setTextColor(
+			//holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
-					MaterialValueHelper.getPrimaryTextColor(
+			//holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
-							activity, ColorUtil.isColorLight(
-							color
-					)
-					)
-			)
-			holder.text?.setTextColor(
-					MaterialValueHelper.getSecondaryTextColor(
-							activity, ColorUtil.isColorLight(
-							color
-					)
-					)
-			)
 		}
 	}
 

app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt

@@ -81,7 +81,7 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         dialog?.window?.let {
-            (requireActivity() as MainActivity).setNavigationBarColorPrimary()
+            (requireActivity() as MainActivity).setNavigationbarColorAuto()
             (requireActivity() as MainActivity).setLightNavigationBar(true)
         }
 

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityEx.kt

@@ -14,6 +14,7 @@
 
 package code.name.monkey.retromusic.extensions
 
+import android.content.res.ColorStateList
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ATHUtil
@@ -25,8 +26,7 @@ fun AppCompatActivity.applyToolbar(toolbar: Toolbar) {
         setNavigationOnClickListener { onBackPressed() }
         setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
         ToolbarContentTintHelper.colorBackButton(toolbar)
-        setBackgroundColor(ATHUtil.resolveColor(this@applyToolbar, R.attr.colorPrimary))
+        backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(this@applyToolbar, R.attr.colorSurface))
-
     }
     setSupportActionBar(toolbar)
 }

app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt

@@ -14,8 +14,16 @@
 
 package code.name.monkey.retromusic.extensions
 
+import android.content.Context
+import android.graphics.Color
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.R
 
 fun Int.ripAlpha(): Int {
     return ColorUtil.stripAlpha(this)
 }
+
+fun Any.surfaceColor(context: Context): Int {
+    return ATHUtil.resolveColor(context, R.attr.colorSurface, Color.WHITE)
+}

app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt

@@ -49,18 +49,16 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
         setUpMiniPlayer()
 
         if (RetroUtil.isTablet()) {
-            actionNext.visibility = View.VISIBLE
+            actionNext?.visibility = View.VISIBLE
-            actionPrevious.visibility = View.VISIBLE
+            actionPrevious?.visibility = View.VISIBLE
             actionPlayingQueue.visibility = View.VISIBLE
         } else {
-            actionNext.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
             actionPlayingQueue.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.GONE else View.VISIBLE
-            actionPrevious.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
         }
 
         actionPlayingQueue.setOnClickListener(this)
-        actionNext.setOnClickListener(this)
+        actionNext?.setOnClickListener(this)
-        actionPrevious.setOnClickListener(this)
+        actionPrevious?.setOnClickListener(this)
 
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt

@@ -1,18 +1,22 @@
 package code.name.monkey.retromusic.fragments
 
 import android.content.Context
-import android.graphics.*
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.media.AudioManager
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.SeekBar
 import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.volume.*
+import code.name.monkey.retromusic.util.ViewUtil
+import code.name.monkey.retromusic.volume.AudioVolumeObserver
+import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
 import kotlinx.android.synthetic.main.fragment_volume.*
 
 class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolumeChangedListener, View.OnClickListener {
@@ -33,10 +37,6 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum
 		setTintable(ThemeStore.accentColor(requireContext()))
 		volumeDown.setOnClickListener(this)
 		volumeUp.setOnClickListener(this)
-
-		val iconColor = ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
-		volumeDown.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
-		volumeUp.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
 	}
 
 	override fun onResume() {

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt

@@ -1,12 +1,16 @@
 package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
-import androidx.annotation.*
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.*
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.ViewUtil
 import com.google.android.material.appbar.AppBarLayout
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.*
@@ -19,10 +23,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
     override fun onCreateView(
             inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
-		val view = inflater.inflate(
+        return inflater.inflate(R.layout.fragment_main_activity_recycler_view, container, false)
-				R.layout.fragment_main_activity_recycler_view, container, false
-		);
-		return view
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -35,9 +36,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
 
     private fun setUpRecyclerView() {
         if (recyclerView is FastScrollRecyclerView) {
-			ViewUtil.setUpFastScrollRecyclerViewColor(
+            ViewUtil.setUpFastScrollRecyclerViewColor(requireActivity(), recyclerView as FastScrollRecyclerView)
-					requireActivity(), recyclerView as FastScrollRecyclerView
-			)
         }
         recyclerView.layoutManager = layoutManager
         recyclerView.adapter = adapter
@@ -93,8 +92,7 @@ abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>,
                 container.paddingLeft,
                 container.paddingTop,
                 container.paddingRight,
-				libraryFragment.totalAppBarScrollingRange + i
+                libraryFragment.totalAppBarScrollingRange + i)
-		)
     }
 
     override fun onQueueChanged() {

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt

@@ -1,6 +1,5 @@
 package code.name.monkey.retromusic.fragments.base
 
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import code.name.monkey.appthemehelper.util.ATHUtil
@@ -26,10 +25,10 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
         mainActivity.setBottomBarVisibility(View.VISIBLE)
     }
 
-    private fun setStatusbarColor(view: View, color: Int) {
+    private fun setStatusBarColor(view: View, color: Int) {
         val statusBar = view.findViewById<View>(R.id.status_bar)
         if (statusBar != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (VersionUtils.hasMarshmallow()) {
                 statusBar.setBackgroundColor(color)
                 mainActivity.setLightStatusbarAuto(color)
             } else {
@@ -38,13 +37,13 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
         }
     }
 
-    fun setStatusbarColorAuto(view: View) {
+    fun setStatusBarColorAuto(view: View) {
-        val colorPrimary = ATHUtil.resolveColor(requireContext(), R.attr.colorPrimary)
+        val colorPrimary = ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)
         // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
         if (VersionUtils.hasMarshmallow()) {
-            setStatusbarColor(view, colorPrimary)
+            setStatusBarColor(view, colorPrimary)
         } else {
-            setStatusbarColor(view, ColorUtil.darkenColor(colorPrimary))
+            setStatusBarColor(view, ColorUtil.darkenColor(colorPrimary))
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java

@@ -2,6 +2,7 @@ package code.name.monkey.retromusic.fragments.mainactivity;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -108,7 +109,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setStatusbarColorAuto(view);
+        setStatusBarColorAuto(view);
         setupToolbar();
         inflateFragment();
     }
@@ -140,7 +141,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
-        toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity()));
+        toolbar.setBackgroundTintList(ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)));
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
         toolbar.setOnClickListener(v -> {
             ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar));
@@ -149,7 +150,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         getMainActivity().setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
         ToolbarContentTintHelper.colorBackButton(toolbar);
-        toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
+        //toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
     }
 
     private Fragment getCurrentFragment() {
@@ -187,7 +188,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 .setMenu(menuRes)
                 .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
                 .setBackgroundColor(
-                        RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorPrimary)))
+                        RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
                 .start(callback);
         return cab;
     }

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt

@@ -131,4 +131,4 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
             return fragment
         }
     }
-}// Required empty public constructor
+}

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java

@@ -221,7 +221,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        setStatusbarColorAuto(view);
+        setStatusBarColorAuto(view);
         setUpAppbarColor();
         setUpBreadCrumbs();
         setUpRecyclerView();
@@ -229,9 +229,8 @@ public class FoldersFragment extends AbsMainActivityFragment implements
     }
 
     private void setUpAppbarColor() {
-        int primaryColor = ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorPrimary);
+        int primaryColor = ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface);
         getMainActivity().setSupportActionBar(toolbar);
-        appBarLayout.setBackgroundColor(primaryColor);
         toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity()));
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
         toolbar.setNavigationOnClickListener(v -> {
@@ -307,7 +306,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
                 .setMenu(menuRes)
                 .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
-                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorPrimary)))
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
                 .start(callback);
         return cab;
     }

app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt

@@ -1,12 +1,14 @@
 package code.name.monkey.retromusic.fragments.mainactivity.home
 
 import android.app.ActivityOptions
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.*
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.App
@@ -72,15 +74,13 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
+        setStatusBarColorAuto(view)
         toolbar = view.findViewById(R.id.toolbar)
 
         bannerImage?.setOnClickListener {
             val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image))
             NavigationUtil.goToUserInfo(requireActivity(), options)
         }
-        if (!PreferenceUtil.getInstance(requireContext()).isHomeBanner)
-            setStatusbarColorAuto(view)
 
         lastAdded.setOnClickListener {
             NavigationUtil.goToPlaylistNew(requireActivity(), LastAddedPlaylist(requireActivity()))
@@ -100,11 +100,11 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
         setupToolbar()
 
-        userImage.setOnClickListener {
+        userImage?.setOnClickListener {
             val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image))
             NavigationUtil.goToUserInfo(requireActivity(), options)
         }
-        titleWelcome.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName)
+        titleWelcome?.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName)
 
         App.musicComponent.inject(this)
         homeAdapter = HomeAdapter(mainActivity, displayMetrics)
@@ -127,7 +127,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
 
     private fun setupToolbar() {
         toolbar.apply {
-            setBackgroundColor(toolbarColor())
+            backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
             setNavigationIcon(R.drawable.ic_menu_white_24dp)
             setOnClickListener {
                 val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar))

app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt

@@ -143,9 +143,9 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call
         playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
             setNavigationOnClickListener { requireActivity().onBackPressed() }
-            ToolbarContentTintHelper.colorizeToolbar(this, primaryColor, activity)
+            ToolbarContentTintHelper.colorizeToolbar(this, primaryColor, requireActivity())
             setTitleTextColor(primaryColor)
-            setSubtitleTextColor(ThemeStore.textColorSecondary(context!!))
+            setSubtitleTextColor(ThemeStore.textColorSecondary(requireContext()))
             setOnMenuItemClickListener(this@AdaptiveFragment)
         }
     }
@@ -183,8 +183,8 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call
     override fun onColorChanged(color: Int) {
         playbackControlsFragment.setDark(color)
         lastColor = color
-        callbacks!!.onPaletteColorChanged()
+        callbacks?.onPaletteColorChanged()
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
     }
 
     override fun onShow() {
@@ -201,7 +201,7 @@ class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Call
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(context, R.attr.iconColor)
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override val paletteColor: Int

app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt

@@ -14,17 +14,17 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.*
 import kotlinx.android.synthetic.main.media_button.*
-import kotlinx.android.synthetic.main.player_time.*
+
 
 class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
@@ -33,7 +33,6 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
     private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)

app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt

@@ -8,10 +8,10 @@ import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Song
 import kotlinx.android.synthetic.main.fragment_fit.*
 
 
@@ -40,15 +40,15 @@ class FitFragment : AbsPlayerFragment()  {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(context, R.attr.iconColor)
+        return ATHUtil.resolveColor(context, R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: Int) {
         playbackControlsFragment.setDark(color)
         lastColor = color
-        callbacks!!.onPaletteColorChanged()
+        callbacks?.onPaletteColorChanged()
 
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
 
     }
 
@@ -84,11 +84,11 @@ class FitFragment : AbsPlayerFragment()  {
     }
 
     private fun setUpPlayerToolbar() {
-        playerToolbar!!.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { activity!!.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@FitFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt

@@ -41,10 +41,9 @@ class FlatPlayerFragment : AbsPlayerFragment() {
 
     private fun setUpPlayerToolbar() {
         playerToolbar.inflateMenu(R.menu.menu_player)
-        playerToolbar.setNavigationOnClickListener { _ -> activity!!.onBackPressed() }
+        playerToolbar.setNavigationOnClickListener { _ -> requireActivity().onBackPressed() }
         playerToolbar.setOnMenuItemClickListener(this)
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context,
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
-                R.attr.iconColor), activity)
     }
 
     private fun colorize(i: Int) {
@@ -90,24 +89,21 @@ class FlatPlayerFragment : AbsPlayerFragment() {
     override fun toolbarIconColor(): Int {
         val isLight = ColorUtil.isColorLight(paletteColor)
         return if (PreferenceUtil.getInstance(requireContext()).adaptiveColor)
-            MaterialValueHelper.getPrimaryTextColor(context, isLight)
+            MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight)
         else
-            ATHUtil.resolveColor(context, R.attr.iconColor)
+            ATHUtil.resolveColor(context, R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: Int) {
         lastColor = color
         flatPlaybackControlsFragment.setDark(color)
-        callbacks!!.onPaletteColorChanged()
+        callbacks?.onPaletteColorChanged()
-
         val isLight = ColorUtil.isColorLight(color)
-
-        //TransitionManager.beginDelayedTransition(mToolbar);
         val iconColor = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor)
-            MaterialValueHelper.getPrimaryTextColor(context!!, isLight)
+            MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight)
         else
-            ATHUtil.resolveColor(context!!, R.attr.iconColor)
+            ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, activity)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, requireActivity())
         if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
             colorize(color)
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt

@@ -44,7 +44,7 @@ class MaterialFragment : AbsPlayerFragment() {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: Int) {
@@ -52,7 +52,7 @@ class MaterialFragment : AbsPlayerFragment() {
         lastColor = color
         callbacks?.onPaletteColorChanged()
 
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.iconColor), requireActivity())
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
     }
 
     override fun toggleFavorite(song: Song) {
@@ -89,7 +89,7 @@ class MaterialFragment : AbsPlayerFragment() {
             inflateMenu(R.menu.menu_player)
             setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@MaterialFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt

@@ -3,7 +3,6 @@ package code.name.monkey.retromusic.fragments.player.normal
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.graphics.drawable.GradientDrawable
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -34,15 +33,19 @@ class PlayerFragment : AbsPlayerFragment()  {
 
     private fun colorize(i: Int) {
         if (valueAnimator != null) {
-            valueAnimator!!.cancel()
+            valueAnimator?.cancel()
         }
 
-        valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), android.R.color.transparent, i)
+        valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), ATHUtil.resolveColor(requireContext(), R.attr.colorSurface), i)
-        valueAnimator!!.addUpdateListener { animation ->
+        valueAnimator?.addUpdateListener { animation ->
-            val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(animation.animatedValue as Int, android.R.color.transparent), 0)
+            if (isAdded) {
+                val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM,
+                        intArrayOf(animation.animatedValue as Int,
+                                ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)), 0)
                 colorGradientBackground?.background = drawable
             }
-        valueAnimator!!.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong()).start()
+        }
+        valueAnimator?.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong())?.start()
     }
 
     override fun onShow() {
@@ -59,25 +62,21 @@ class PlayerFragment : AbsPlayerFragment()  {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(context, R.attr.iconColor)
+        return ATHUtil.resolveColor(context, R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: Int) {
         playbackControlsFragment.setDark(color)
         lastColor = color
-        callbacks!!.onPaletteColorChanged()
+        callbacks?.onPaletteColorChanged()
 
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.colorControlNormal), activity)
 
         if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
             colorize(color)
         }
     }
 
-    private fun getCutOff(): Int {
-        return if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) 20 else 0
-    }
-
     override fun toggleFavorite(song: Song) {
         super.toggleFavorite(song)
         if (song.id == MusicPlayerRemote.currentSong.id) {

app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt

@@ -60,9 +60,9 @@ class PeakPlayerFragment : AbsPlayerFragment() {
     private fun setUpPlayerToolbar() {
         playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { activity!!.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@PeakPlayerFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
         }
     }
 
@@ -83,7 +83,7 @@ class PeakPlayerFragment : AbsPlayerFragment() {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override val paletteColor: Int

app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt

@@ -60,14 +60,14 @@ class SimplePlayerFragment : AbsPlayerFragment() {
     }
 
     override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override fun onColorChanged(color: Int) {
         lastColor = color
         callbacks?.onPaletteColorChanged()
         simplePlaybackControlsFragment.setDark(color)
-        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.iconColor), requireActivity())
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
 
     }
 
@@ -87,7 +87,7 @@ class SimplePlayerFragment : AbsPlayerFragment() {
             inflateMenu(R.menu.menu_player)
             setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@SimplePlayerFragment)
-            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
         }
     }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt

@@ -40,7 +40,7 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
         NavigationUtil.goToProVersion(requireActivity())
     }
 
-    internal fun setSummary(preference: Preference, value: Any) {
+    internal fun setSummary(preference: Preference, value: Any?) {
         val stringValue = value.toString()
         if (preference is ListPreference) {
             val index = preference.findIndexOfValue(stringValue)
@@ -52,16 +52,18 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
 
     abstract fun invalidateSettings()
 
-    protected fun setSummary(preference: Preference) {
+    protected fun setSummary(preference: Preference?) {
-        setSummary(preference, PreferenceManager
+        preference?.let {
-                .getDefaultSharedPreferences(preference.context)
+            setSummary(it, PreferenceManager
-                .getString(preference.key, "")!!)
+                    .getDefaultSharedPreferences(it.context)
+                    .getString(it.key, ""))
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setDivider(ColorDrawable(Color.TRANSPARENT))
-        listView.setBackgroundColor(ATHUtil.resolveColor(requireContext(), R.attr.colorPrimary))
+        listView.setBackgroundColor(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
         listView.overScrollMode = View.OVER_SCROLL_NEVER
         listView.setPadding(0, 0, 0, 0)
         listView.setPaddingRelative(0, 0, 0, 0)

app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt

@@ -37,7 +37,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
             R.id.generalSettings -> inflateFragment(ThemeSettingsFragment(), R.string.general_settings_title)
             R.id.audioSettings -> inflateFragment(AudioSettings(), R.string.pref_header_audio)
             R.id.nowPlayingSettings -> inflateFragment(NowPlayingSettingsFragment(), R.string.now_playing)
-            R.id.personalizeSettings -> inflateFragment(PersonaizeSettingsFragment(), R.string.personalize)
+            R.id.personalizeSettings -> inflateFragment(PersonalizeSettingsFragment(), R.string.personalize)
             R.id.imageSettings -> inflateFragment(ImageSettingFragment(), R.string.pref_header_images)
             R.id.notificationSettings -> inflateFragment(NotificationSettingsFragment(), R.string.notification)
             R.id.otherSettings -> inflateFragment(OtherSettingsFragment(), R.string.others)

app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt

@@ -30,8 +30,6 @@ class OtherSettingsFragment : AbsSettingsFragment() {
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.pref_blacklist)
-        addPreferencesFromResource(R.xml.pref_playlists)
         addPreferencesFromResource(R.xml.pref_advanced)
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt

@@ -19,23 +19,14 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 
 
-class PersonaizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+class PersonalizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     override fun invalidateSettings() {
-        val cornerWindow: TwoStatePreference = findPreference("corner_window")!!
+
-        cornerWindow.setOnPreferenceChangeListener { _, newValue ->
-            if (newValue as Boolean && !App.isProVersion()) {
-                showProToastAndNavigate(activity!!.getString(R.string.pref_title_round_corners))
-                return@setOnPreferenceChangeListener false
-            }
-            requireActivity().recreate()
-            return@setOnPreferenceChangeListener true
-        }
         val toggleFullScreen: TwoStatePreference = findPreference("toggle_full_screen")!!
         toggleFullScreen.setOnPreferenceChangeListener { _, _ ->
             requireActivity().recreate()
@@ -45,8 +36,6 @@ class PersonaizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSh
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_ui)
-        addPreferencesFromResource(R.xml.pref_window)
-        addPreferencesFromResource(R.xml.pref_lockscreen)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.kt

@@ -19,34 +19,21 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.BaseColumns
 import android.provider.MediaStore.Audio.Genres
-import code.name.monkey.retromusic.Constants.baseProjection
 import code.name.monkey.retromusic.Constants.BASE_SELECTION
+import code.name.monkey.retromusic.Constants.baseProjection
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
-import io.reactivex.Observable
 import java.util.*
 
 
 object GenreLoader {
 
-    fun getAllGenresFlowable(context: Context): Observable<ArrayList<Genre>> {
-        return getGenresFromCursorFlowable(context, makeGenreCursor(context))
-    }
 
     fun getAllGenres(context: Context): ArrayList<Genre> {
         return getGenresFromCursor(context, makeGenreCursor(context))
     }
 
-    fun getSongsFlowable(context: Context, genreId: Int): Observable<ArrayList<Song>> {
-        // The genres table only stores songs that have a genre specified,
-        // so we need to get songs without a genre a different way.
-        return if (genreId == -1) {
-            getSongsWithNoGenreFlowable(context)
-        } else SongLoader.getSongsFlowable(makeGenreSongCursor(context, genreId))
-
-    }
-
     fun getSongs(context: Context, genreId: Int): ArrayList<Song> {
         // The genres table only stores songs that have a genre specified,
         // so we need to get songs without a genre a different way.
@@ -64,12 +51,6 @@ object GenreLoader {
 
     }
 
-    private fun getSongsWithNoGenreFlowable(context: Context): Observable<ArrayList<Song>> {
-        val selection = BaseColumns._ID + " NOT IN " +
-                "(SELECT " + Genres.Members.AUDIO_ID + " FROM audio_genres_map)"
-        return SongLoader.getSongsFlowable(SongLoader.makeSongCursor(context, selection, null))
-    }
-
     private fun getSongsWithNoGenre(context: Context): ArrayList<Song> {
         val selection = BaseColumns._ID + " NOT IN " +
                 "(SELECT " + Genres.Members.AUDIO_ID + " FROM audio_genres_map)"
@@ -112,34 +93,6 @@ object GenreLoader {
 
     }
 
-    private fun getGenresFromCursorFlowable(context: Context, cursor: Cursor?): Observable<ArrayList<Genre>> {
-        return Observable.create { e ->
-            val genres = ArrayList<Genre>()
-            if (cursor != null) {
-                if (cursor.moveToFirst()) {
-                    do {
-                        val genre = getGenreFromCursor(context, cursor)
-                        if (genre.songCount > 0) {
-                            genres.add(genre)
-                        } else {
-                            // try to remove the empty genre from the media store
-                            try {
-                                context.contentResolver.delete(Genres.EXTERNAL_CONTENT_URI, Genres._ID + " == " + genre.id, null)
-                            } catch (ex: Exception) {
-                                ex.printStackTrace()
-                                // nothing we can do then
-                            }
-
-                        }
-                    } while (cursor.moveToNext())
-                }
-                cursor.close()
-            }
-            e.onNext(genres)
-            e.onComplete()
-        }
-    }
-
     private fun getGenresFromCursor(context: Context, cursor: Cursor?): ArrayList<Genre> {
         val genres = arrayListOf<Genre>()
         if (cursor != null) {

app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.kt

@@ -16,31 +16,40 @@ package code.name.monkey.retromusic.loaders
 
 import android.content.Context
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.Genre
+import java.util.*
 
 
 object SearchLoader {
     fun searchAll(context: Context, query: String?): MutableList<Any> {
         val results = mutableListOf<Any>()
-        query?.let {
+        query?.let { searchString ->
-            val songs = SongLoader.getSongs(context, it)
+            val songs = SongLoader.getSongs(context, searchString)
             if (songs.isNotEmpty()) {
                 results.add(context.resources.getString(R.string.songs))
                 results.addAll(songs)
             }
 
-            val artists = ArtistLoader.getArtists(context, it)
+            val artists = ArtistLoader.getArtists(context, searchString)
             if (artists.isNotEmpty()) {
                 results.add(context.resources.getString(R.string.artists))
                 results.addAll(artists)
             }
 
-            val albums = AlbumLoader.getAlbums(context, it)
+            val albums = AlbumLoader.getAlbums(context, searchString)
             if (albums.isNotEmpty()) {
                 results.add(context.resources.getString(R.string.albums))
                 results.addAll(albums)
             }
+            val genres: List<Genre> = GenreLoader.getAllGenres(context).filter { genre -> genre.name.toLowerCase(Locale.getDefault()).contains(searchString.toLowerCase(Locale.getDefault())) }
+             genres.forEach {
+                 println(it.name)
+             }
+            if (genres.isNotEmpty()) {
+                results.add(context.resources.getString(R.string.genres))
+                results.addAll(genres)
+            }
         }
         return results
-
     }
 }

app/src/main/java/code/name/monkey/retromusic/model/Home.kt

@@ -20,7 +20,6 @@ import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.HomeSection
 
 class Home(val priority: Int,
            @StringRes val title: Int,
-           @StringRes val subTitle: Int,
            val arrayList: ArrayList<*>,
            @HomeSection
            val homeSection: Int,

app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt

@@ -53,9 +53,7 @@ interface SearchPresenter : Presenter<SearchView> {
         override fun search(query: String?) {
             launch {
                 when (val result = repository.search(query)) {
-                    is Success -> withContext(Dispatchers.Main) {
+                    is Success -> withContext(Dispatchers.Main) { view?.showData(result.data) }
-                        view?.showData(result.data)
-                    }
                     is Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
                 }
             }

app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt

@@ -144,7 +144,6 @@ class RepositoryImpl(private val context: Context) : Repository {
             } else {
                 Success(Home(0,
                         R.string.recent_artists,
-                        R.string.recent_added_artists,
                         artists,
                         HomeAdapter.RECENT_ARTISTS,
                         R.drawable.ic_artist_white_24dp))
@@ -162,7 +161,6 @@ class RepositoryImpl(private val context: Context) : Repository {
             } else {
                 Success(Home(1,
                         R.string.recent_albums,
-                        R.string.recent_added_albums,
                         albums,
                         HomeAdapter.RECENT_ALBUMS,
                         R.drawable.ic_album_white_24dp
@@ -181,7 +179,6 @@ class RepositoryImpl(private val context: Context) : Repository {
             } else {
                 Success(Home(3,
                         R.string.top_albums,
-                        R.string.most_played_albums,
                         albums,
                         HomeAdapter.TOP_ALBUMS,
                         R.drawable.ic_album_white_24dp
@@ -201,7 +198,6 @@ class RepositoryImpl(private val context: Context) : Repository {
             } else {
                 Success(Home(2,
                         R.string.top_artists,
-                        R.string.most_played_artists,
                         artists,
                         HomeAdapter.TOP_ARTISTS,
                         R.drawable.ic_artist_white_24dp
@@ -220,7 +216,6 @@ class RepositoryImpl(private val context: Context) : Repository {
             } else {
                 Success(Home(4,
                         R.string.favorites,
-                        R.string.favorites_songs,
                         playlists,
                         HomeAdapter.PLAYLISTS,
                         R.drawable.ic_favorite_white_24dp
@@ -252,12 +247,6 @@ class RepositoryImpl(private val context: Context) : Repository {
         }
     }
 
-    override fun getSongFlowable(id: Int): Observable<Song> {
-        return SongLoader.getSongFlowable(context, id)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-    }
-
     override fun getAlbumFlowable(albumId: Int): Observable<Album> {
         return AlbumLoader.getAlbumFlowable(context, albumId)
                 .subscribeOn(Schedulers.io())
@@ -276,70 +265,12 @@ class RepositoryImpl(private val context: Context) : Repository {
                 .observeOn(AndroidSchedulers.mainThread())
     }
 
-    override fun getGenreFlowable(genreId: Int): Observable<ArrayList<Song>> {
-        return GenreLoader.getSongsFlowable(context, genreId)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-    }
-
-
     override val favoritePlaylistFlowable: Observable<ArrayList<Playlist>>
         get() = PlaylistLoader.getFavoritePlaylistFlowable(context)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
 
 
-    override val allSongsFlowable: Observable<ArrayList<Song>>
-        get() = SongLoader.getAllSongsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val suggestionSongsFlowable: Observable<ArrayList<Song>>
-        get() = SongLoader.suggestSongs(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val allAlbumsFlowable: Observable<ArrayList<Album>>
-        get() = AlbumLoader.getAllAlbumsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val recentAlbumsFlowable: Observable<ArrayList<Album>>
-        get() = LastAddedSongsLoader.getLastAddedAlbumsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val topAlbumsFlowable: Observable<ArrayList<Album>>
-        get() = TopAndRecentlyPlayedTracksLoader.getTopAlbumsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val allArtistsFlowable: Observable<ArrayList<Artist>>
-        get() = ArtistLoader.getAllArtistsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val recentArtistsFlowable: Observable<ArrayList<Artist>>
-        get() = LastAddedSongsLoader.getLastAddedArtistsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val topArtistsFlowable: Observable<ArrayList<Artist>>
-        get() = TopAndRecentlyPlayedTracksLoader.getTopArtistsFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-    override val allPlaylistsFlowable: Observable<ArrayList<Playlist>>
-        get() = PlaylistLoader.getAllPlaylistsFlowoable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
-
-    override val allGenresFlowable: Observable<ArrayList<Genre>>
-        get() = GenreLoader.getAllGenresFlowable(context)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-
     override fun getSong(id: Int): Song {
         return SongLoader.getSong(context, id)
     }
@@ -352,11 +283,10 @@ class RepositoryImpl(private val context: Context) : Repository {
         return ArtistLoader.getArtist(context, artistId.toInt())
     }
 
-
 }
 
 suspend fun <T : Any> safeApiCall(call: suspend () -> Result<T>, errorMessage: String): Result<T> = try {
     call.invoke()
 } catch (e: Exception) {
-    Result.Error(IOException(errorMessage, e))
+    Error(IOException(errorMessage, e))
 }

app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt

@@ -55,28 +55,6 @@ interface Repository {
 
     suspend fun artistById(artistId: Int): Result<Artist>
 
-    val allSongsFlowable: Observable<ArrayList<Song>>
-
-    val suggestionSongsFlowable: Observable<ArrayList<Song>>
-
-    val allAlbumsFlowable: Observable<ArrayList<Album>>
-
-    val recentAlbumsFlowable: Observable<ArrayList<Album>>
-
-    val topAlbumsFlowable: Observable<ArrayList<Album>>
-
-    val allArtistsFlowable: Observable<ArrayList<Artist>>
-
-    val recentArtistsFlowable: Observable<ArrayList<Artist>>
-
-    val topArtistsFlowable: Observable<ArrayList<Artist>>
-
-    val allPlaylistsFlowable: Observable<ArrayList<Playlist>>
-
-    val allGenresFlowable: Observable<ArrayList<Genre>>
-
-    fun getSongFlowable(id: Int): Observable<Song>
-
     fun getSong(id: Int): Song
 
     fun getAlbumFlowable(albumId: Int): Observable<Album>
@@ -89,10 +67,6 @@ interface Repository {
 
     fun getPlaylistSongsFlowable(playlist: Playlist): Observable<ArrayList<Song>>
 
-    fun getGenreFlowable(genreId: Int): Observable<ArrayList<Song>>
-
-
     val favoritePlaylistFlowable: Observable<ArrayList<Playlist>>
 
-
 }

app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java

@@ -38,12 +38,13 @@ public class RetroColorUtil {
         float[] hsv = new float[3];
         Color.colorToHSV(color, hsv);
 
-        hsv[1] = ( hsv[1] / 1 * ratio ) + ( 0.2f * (1.0f - ratio) );
+        hsv[1] = (hsv[1] / 1 * ratio) + (0.2f * (1.0f - ratio));
 
         return Color.HSVToColor(hsv);
     }
+
     public static int toolbarColor(@NonNull Context context) {
-        return ATHUtil.INSTANCE.resolveColor(context, R.attr.colorSurface);
+        return ATHUtil.INSTANCE.resolveColor(context, R.attr.colorButtonNormal);
     }
 
     @Nullable

app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt

@@ -15,13 +15,10 @@ object ThemeManager {
     @StyleRes
     fun getThemeResValue(context: Context): Int = when (PreferenceUtil.getInstance(context).generalThemeValue) {
         "light" -> R.style.Theme_RetroMusic_Light
-        "auto" -> if (isSystemDarkModeEnabled(context)) R.style.Theme_RetroMusic else R.style.Theme_RetroMusic_Light
+        "dark" -> R.style.Theme_RetroMusic_Base
+        "auto" -> R.style.Theme_RetroMusic_FollowSystem
         "black" -> R.style.Theme_RetroMusic_Black
-        else -> R.style.Theme_RetroMusic
+        else -> R.style.Theme_RetroMusic_FollowSystem
-        /**
-         * To add a toggle for amoled theme just add an if statement such as
-         * if(PreferenceUtil.getInstance(context).useAmoled) blablabla
-         */
     }
 
     private fun isSystemDarkModeEnabled(context: Context): Boolean {

app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt

@@ -14,19 +14,26 @@
 
 package code.name.monkey.retromusic.util
 
-import android.animation.*
+import android.animation.Animator
+import android.animation.ArgbEvaluator
+import android.animation.ObjectAnimator
 import android.content.Context
-import android.content.res.*
+import android.content.res.ColorStateList
-import android.graphics.*
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.view.View
 import android.view.animation.PathInterpolator
-import android.widget.*
+import android.widget.ProgressBar
+import android.widget.SeekBar
 import androidx.annotation.ColorInt
 import androidx.core.view.ViewCompat
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.*
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 
@@ -56,14 +63,8 @@ object ViewUtil {
         progress.setColorFilter(newColor, PorterDuff.Mode.SRC_IN)
 
         val background = ld.findDrawableByLayerId(android.R.id.background)
-		val primaryColor = ATHUtil.resolveColor(progressSlider.context, R.attr.colorPrimary)
+        val primaryColor = ATHUtil.resolveColor(progressSlider.context, android.R.attr.windowBackground)
-		background.setColorFilter(
+        background.setColorFilter(MaterialValueHelper.getPrimaryDisabledTextColor(progressSlider.context, ColorUtil.isColorLight(primaryColor)), PorterDuff.Mode.SRC_IN)
-				MaterialValueHelper.getPrimaryDisabledTextColor(
-						progressSlider.context, ColorUtil.isColorLight(
-						primaryColor
-				)
-				), PorterDuff.Mode.SRC_IN
-		)
 
         val secondaryProgress = ld.findDrawableByLayerId(android.R.id.secondaryProgress)
         secondaryProgress?.setColorFilter(
@@ -106,23 +107,10 @@ object ViewUtil {
             accentColor: Int = ThemeStore.accentColor(context)
     ) {
         recyclerView.setPopupBgColor(accentColor)
-		recyclerView.setPopupTextColor(
+        recyclerView.setPopupTextColor(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(accentColor)))
-				MaterialValueHelper.getPrimaryTextColor(
-						context, ColorUtil.isColorLight(
-						accentColor
-				)
-				)
-		)
         recyclerView.setThumbColor(accentColor)
         recyclerView.setTrackColor(Color.TRANSPARENT)
-		recyclerView.setTrackColor(
+        recyclerView.setTrackColor(ColorUtil.withAlpha(ATHUtil.resolveColor(context, R.attr.colorControlNormal), 0.12f))
-				ColorUtil.withAlpha(
-						ATHUtil.resolveColor(
-								context, R.attr.colorControlNormal
-						), 0.12f
-				)
-		)
-
     }
 
     fun convertDpToPixel(dp: Float, resources: Resources): Float {

app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt

@@ -16,6 +16,7 @@ package code.name.monkey.retromusic.views
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.RippleDrawable
 import android.util.AttributeSet
 import androidx.core.content.ContextCompat
@@ -38,12 +39,14 @@ class BottomNavigationBarTinted @JvmOverloads constructor(
         labelVisibilityMode = PreferenceUtil.getInstance(context).tabTitleMode
         selectedItemId = PreferenceUtil.getInstance(context).lastPage
 
-        val iconColor = ATHUtil.resolveColor(context, R.attr.iconColor)
+        val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
         val accentColor = ThemeStore.accentColor(context)
         NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
         NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
-        itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), null)
+        itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background_mask))
         setOnApplyWindowInsetsListener(null)
+        //itemRippleColor = ColorStateList.valueOf(accentColor)
+        background = ColorDrawable(ATHUtil.resolveColor(context, R.attr.colorSurface))
     }
 }
 

app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt

@@ -53,7 +53,7 @@ class ColorIconsImageView : AppCompatImageView {
         if (ATHUtil.isWindowBackgroundDark(context) && PreferenceUtil.getInstance(context).desaturatedColor()) {
             val desaturatedColor = RetroColorUtil.desaturateColor(color, 0.4f)
             backgroundTintList = ColorStateList.valueOf(desaturatedColor)
-            imageTintList = ColorStateList.valueOf(ATHUtil.resolveColor(context, R.attr.colorPrimary))
+            imageTintList = ColorStateList.valueOf(ATHUtil.resolveColor(context,  R.attr.colorSurface))
         } else {
             backgroundTintList = ColorStateList.valueOf(ColorUtil.adjustAlpha(color, 0.22f))
             imageTintList = ColorStateList.valueOf(ColorUtil.withAlpha(color, 0.75f))

app/src/main/res/drawable-v21/rect_selector.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/rect_selector_strong.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ate_control_normal_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/round_selector.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable-v21/round_selector_dark.xml

@@ -1,5 +1,5 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_dark">
+    android:color="?attr/colorOnSecondary">
 
     <item
         android:id="@android:id/mask"

app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/md_black_1000" />
-    <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-</shape>

app/src/main/res/drawable/bg_circular_top_corners.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-    <solid android:color="?attr/cardBackgroundColor" />
-
-</shape>

app/src/main/res/drawable/bottom_navigation_item_background.xml

@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="8dp" />
+    <solid android:color="?colorSurface" />
-    <solid android:color="?colorPrimary" />
 </shape>
+
+
+    <!--<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/colorBottomTabSelected">
+
+        <item android:id="@android:id/mask">
+            <shape android:shape="rectangle">
+                <solid android:color="@color/colorBottomTabSelected"/>
+            </shape>
+        </item>
+
+        <item>
+            <shape android:shape="rectangle">
+                <solid android:color="@color/colorBottomTabUnselected"/>
+            </shape>
+        </item>
+
+    </ripple>-->

app/src/main/res/drawable/bottom_navigation_item_background_mask.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/colorSurface" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/bottom_navigation_item_background_ripple.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="#000000" />
-            <corners android:radius="15dp" />
-        </shape>
-    </item>
-    <item android:drawable="@drawable/bottom_navigation_item_background" />
-</ripple>

app/src/main/res/drawable/circle_progress.xml

@@ -19,7 +19,7 @@
             android:thickness="3dp"
             android:type="sweep"
             android:useLevel="false">
-            <solid android:color="?colorOnSecondary" />
+            <solid android:color="?android:attr/textColorSecondary" />
         </shape>
     </item>
     <item android:id="@android:id/progress">
@@ -28,7 +28,7 @@
             android:thickness="3dp"
             android:type="sweep"
             android:useLevel="true">
-            <solid android:color="?colorAccent" />
+            <solid android:color="?attr/colorAccent" />
 
         </shape>
     </item>

app/src/main/res/drawable/option_menu_background.xml

@@ -27,7 +27,7 @@
             <item>
                 <shape android:shape="rectangle">
                     <corners android:radius="8dp" />
-                    <solid android:color="?colorPrimary" />
+                    <solid android:color="?attr/colorControlHighlight" />
                 </shape>
             </item>
         </ripple>

app/src/main/res/drawable/round_selected.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/ripple_material_light"/>
+    <solid android:color="@color/ripple_material_light" />
 </shape>

app/src/main/res/layout-land/activity_album.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 

app/src/main/res/layout-land/activity_album_tag_editor.xml

@@ -2,6 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/gradient_background"
+    android:background="?attr/colorSurface"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

app/src/main/res/layout-land/activity_artist_details.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 

app/src/main/res/layout-land/fragment_banner_home.xml

@@ -17,60 +17,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:elevation="0dp"
-            app:elevation="0dp">
-
-            <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                app:contentScrim="@android:color/transparent"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                app:statusBarScrim="@color/md_black_1000"
-                app:titleEnabled="false">
-
-                <FrameLayout
-                    android:id="@+id/imageContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="182dp"
-                    app:layout_collapseMode="pin">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/bannerImage"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        app:layout_collapseMode="parallax"
-                        tools:background="@color/md_red_400"
-                        tools:ignore="ContentDescription"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="24dp"
-                        android:layout_gravity="bottom"
-                        android:background="@drawable/shadow_up_full_theme"
-                        android:backgroundTint="?colorPrimary" />
-                </FrameLayout>
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_collapseMode="pin"
-                    app:layout_scrollFlags="scroll|enterAlways">
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -78,26 +27,62 @@
         <include layout="@layout/status_bar" />
     </FrameLayout>
 
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+        app:behavior_overlapTop="72dp"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="228dp"
+                app:cardCornerRadius="24dp"
+                app:cardUseCompatPadding="true">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/toolbarContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/toolbar_margin_horizontal"
-                        android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                        android:layout_marginTop="8dp"
                         android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
-                        android:layout_marginBottom="@dimen/toolbar_margin_vertical"
                         app:cardBackgroundColor="@android:color/transparent"
                         app:cardCornerRadius="8dp"
-                        app:cardElevation="6dp"
                         app:cardUseCompatPadding="true"
-                        app:layout_collapseMode="pin"
+                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_scrollFlags="scroll|enterAlways">
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_scrollFlags="scroll|enterAlways"
+                        app:shapeAppearance="@style/ToolbarCornerCardView">
 
                         <com.google.android.material.appbar.MaterialToolbar
                             android:id="@+id/toolbar"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/toolbar_height"
-                            android:background="?colorSurface"
+                            android:background="?attr/colorSurface"
                             app:contentInsetStart="0dp"
                             app:contentInsetStartWithNavigation="0dp"
                             app:popupTheme="?toolbarPopupTheme"
@@ -106,29 +91,54 @@
                             app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
                             tools:ignore="UnusedAttribute" />
                     </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
-            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-        </com.google.android.material.appbar.AppBarLayout>
+                    <View
-
-        <androidx.core.widget.NestedScrollView
                         android:layout_width="match_parent"
-            android:layout_height="match_parent"
+                        android:layout_height="52dp"
-            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:background="@drawable/shadow_up"
-            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent" />
-            android:elevation="@dimen/card_elevation"
-            app:behavior_overlapTop="72dp"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-            <com.google.android.material.card.MaterialCardView
+                    <code.name.monkey.retromusic.views.CircularImageView
-                android:layout_width="match_parent"
+                        android:id="@+id/userImage"
-                android:layout_height="match_parent"
+                        android:layout_width="42dp"
-                app:cardBackgroundColor="?colorPrimary"
+                        android:layout_height="42dp"
-                app:cardElevation="8dp"
+                        android:layout_marginStart="16dp"
-                app:shapeAppearanceOverlay="@style/TopCornerCardView">
+                        android:layout_marginBottom="8dp"
+                        app:civ_border="false"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        tools:srcCompat="@tools:sample/avatars" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:ellipsize="end"
+                        android:text="@string/welcome"
+                        android:textColor="@color/md_white_1000"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toTopOf="@+id/userImage" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/titleWelcome"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:padding="0dp"
+                        android:textAppearance="@style/TextViewHeadline5"
+                        android:textColor="@color/md_white_1000"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toBottomOf="@+id/text"
+                        tools:text="@string/app_name" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <include layout="@layout/home_content" />
-            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>

app/src/main/res/layout-land/fragment_card_player.xml

@@ -8,6 +8,11 @@
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"

app/src/main/res/layout-land/fragment_flat_player.xml

@@ -8,6 +8,11 @@
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"

app/src/main/res/layout-land/fragment_home.xml

@@ -17,6 +17,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
     <FrameLayout
@@ -36,8 +37,9 @@
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?colorPrimary"
+            android:background="@android:color/transparent"
-            app:liftOnScroll="true">
+            android:elevation="0dp"
+            app:elevation="0dp">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -75,7 +77,56 @@
             android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
             app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-            <include layout="@layout/home_content" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>

app/src/main/res/layout-land/fragment_material.xml

@@ -7,6 +7,11 @@
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout

app/src/main/res/layout-land/fragment_plain_player.xml

@@ -7,6 +7,11 @@
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
 

app/src/main/res/layout-land/fragment_player.xml

@@ -7,6 +7,11 @@
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"

app/src/main/res/layout-land/fragment_simple_player.xml

@@ -8,6 +8,13 @@
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <View
         android:id="@+id/gradient_background"
         android:layout_width="match_parent"

app/src/main/res/layout-land/pager_item.xml

@@ -11,7 +11,7 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="156dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView

app/src/main/res/layout-xlarge-land/activity_album.xml

@@ -60,7 +60,7 @@
         android:layout_gravity="fill_vertical"
         android:layout_marginStart="128dp"
         android:layout_marginEnd="128dp"
-        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:background="?attr/colorSurface"
         android:fillViewport="true"
         android:overScrollMode="never"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

app/src/main/res/layout-xlarge-land/activity_artist_details.xml

@@ -35,9 +35,9 @@
                 app:layout_collapseMode="parallax" />
 
             <FrameLayout
-                app:layout_collapseMode="pin"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/toolbar"
@@ -67,6 +67,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
             app:cardElevation="8dp"
             app:shapeAppearanceOverlay="@style/TopCornerCardView">
 
@@ -75,7 +76,6 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app/src/main/res/layout-xlarge-land/fragment_banner_home.xml

@@ -18,6 +18,7 @@
     android:id="@+id/main_fragment_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -27,6 +28,9 @@
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
             app:liftOnScroll="true">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout

app/src/main/res/layout-xlarge-land/fragment_home.xml

@@ -17,6 +17,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_fragment_content"
     android:layout_width="match_parent"
+    android:background="?attr/colorSurface"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
@@ -37,8 +38,9 @@
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?colorPrimary"
+            android:background="@android:color/transparent"
-            app:liftOnScroll="true">
+            android:elevation="0dp"
+            app:elevation="0dp">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -75,8 +77,56 @@
             android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
             app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-            <include layout="@layout/home_content" />
+            <androidx.constraintlayout.widget.ConstraintLayout
-        </androidx.core.widget.NestedScrollView>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>

app/src/main/res/layout-xlarge-land/fragment_player.xml

@@ -7,6 +7,11 @@
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"

app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml

@@ -135,7 +135,7 @@
             android:paddingRight="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?colorOnSecondary"
+            android:textColor="?android:attr/textColorSecondary"
             tools:ignore="RtlHardcoded,RtlSymmetry"
             tools:text="00:22" />
 
@@ -149,7 +149,7 @@
             android:paddingLeft="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?colorOnSecondary"
+            android:textColor="?android:attr/textColorSecondary"
             tools:ignore="RtlHardcoded,RtlSymmetry"
             tools:text="00:22" />
     </RelativeLayout>

app/src/main/res/layout-xlarge-land/pager_item.xml

@@ -11,7 +11,7 @@
         android:id="@+id/imageContainer"
         android:layout_width="match_parent"
         android:layout_height="256dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView

app/src/main/res/layout-xlarge/activity_album.xml

@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.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/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:transitionName="@string/transition_album_art">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -60,6 +60,7 @@
         android:layout_gravity="fill_vertical"
         android:layout_marginStart="96dp"
         android:layout_marginEnd="96dp"
+        android:background="?attr/colorSurface"
         android:fillViewport="true"
         android:overScrollMode="never"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

app/src/main/res/layout-xlarge/activity_artist_details.xml

@@ -68,6 +68,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
             app:cardElevation="8dp"
             app:shapeAppearanceOverlay="@style/TopCornerCardView">
 

app/src/main/res/layout-xlarge/activity_user_info.xml

@@ -9,6 +9,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
         android:elevation="0dp"
         app:elevation="0dp">
 
@@ -64,8 +65,8 @@
                         android:layout_gravity="center"
                         android:background="?roundSelector"
                         android:padding="16dp"
-                        app:tint="@color/md_white_1000"
+                        app:srcCompat="@drawable/ic_add_photo_white_24dp"
-                        app:srcCompat="@drawable/ic_add_photo_white_24dp" />
+                        app:tint="@color/md_white_1000" />
 
                     <FrameLayout
                         android:layout_width="wrap_content"