Rename icons

app/build.gradle

@@ -137,8 +137,8 @@ dependencies {
         transitive = true
     }
 
+    def kotlin_coroutines_version = "1.3.8"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    def kotlin_coroutines_version = "1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
@@ -158,7 +158,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
 
     implementation 'com.google.android.play:core:1.7.3'
     implementation 'me.jorgecastillo:androidcolorx:0.2.0'

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

@@ -88,7 +88,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
             val isFavourite =
                 MusicUtil.isFavorite(this@DriveModeActivity, MusicPlayerRemote.currentSong)
             withContext(Dispatchers.Main) {
-                songFavourite.setImageResource(if (isFavourite) R.drawable.ic_favorite_white_24dp else R.drawable.ic_favorite_border_white_24dp)
+                songFavourite.setImageResource(if (isFavourite) R.drawable.ic_favorite else R.drawable.ic_favorite_border)
             }
         }
     }
@@ -161,9 +161,9 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
-            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 
@@ -183,18 +183,18 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     private fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -129,7 +129,7 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
     override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
         if (cab != null && cab!!.isActive) cab?.finish()
         cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes)
-            .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+            .setCloseDrawableRes(R.drawable.ic_close)
             .setBackgroundColor(
                 RetroColorUtil.shiftBackgroundColorForLightText(
                     ATHUtil.resolveColor(

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

@@ -192,20 +192,20 @@ class MainActivity : AbsSlidingMusicPanelActivity(),
         menu ?: return super.onCreateOptionsMenu(menu)
         if (isPlaylistPage()) {
             menu.add(0, R.id.action_new_playlist, 1, R.string.new_playlist_title)
-                .setIcon(R.drawable.ic_playlist_add_white_24dp)
+                .setIcon(R.drawable.ic_playlist_add)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
         }
         if (isHomePage()) {
             menu.add(0, R.id.action_mic, 1, getString(R.string.action_search))
-                .setIcon(R.drawable.ic_mic_white_24dp)
+                .setIcon(R.drawable.ic_mic)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
         }
         if (isFolderPage()) {
             menu.add(0, R.id.action_scan, 0, R.string.scan_media)
-                .setIcon(R.drawable.ic_scanner_white_24dp)
+                .setIcon(R.drawable.ic_scanner)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
             menu.add(0, R.id.action_go_to_start_directory, 1, R.string.action_go_to_start_directory)
-                .setIcon(R.drawable.ic_bookmark_music_white_24dp)
+                .setIcon(R.drawable.ic_bookmark_music)
                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
         }
         val fragment: Fragment? = getCurrentFragment()
@@ -223,10 +223,10 @@ class MainActivity : AbsSlidingMusicPanelActivity(),
             menu.removeItem(R.id.action_sort_order)
         }
         menu.add(0, R.id.action_settings, 6, getString(R.string.action_settings))
-            .setIcon(R.drawable.ic_settings_white_24dp)
+            .setIcon(R.drawable.ic_settings)
             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
         menu.add(0, R.id.action_search, 0, getString(R.string.action_search))
-            .setIcon(R.drawable.ic_search_white_24dp)
+            .setIcon(R.drawable.ic_search)
             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
             this,
@@ -772,7 +772,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(),
         }
         cab = MaterialCab(this, R.id.cab_stub)
             .setMenu(menuRes)
-            .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+            .setCloseDrawableRes(R.drawable.ic_close)
             .setBackgroundColor(
                 RetroColorUtil.shiftBackgroundColorForLightText(
                     ATHUtil.resolveColor(

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

@@ -141,7 +141,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
             cab!!.finish()
         }
         cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes)
-            .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+            .setCloseDrawableRes(R.drawable.ic_close)
             .setBackgroundColor(
                 RetroColorUtil.shiftBackgroundColorForLightText(
                     ATHUtil.resolveColor(

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

@@ -177,15 +177,15 @@ class SkuDetailsAdapter(
 
     private fun getIcon(position: Int): Int {
         return when (position) {
-            0 -> R.drawable.ic_cookie_white_24dp
+            0 -> R.drawable.ic_cookie
-            1 -> R.drawable.ic_take_away_white_24dp
+            1 -> R.drawable.ic_take_away
-            2 -> R.drawable.ic_take_away_coffe_white_24dp
+            2 -> R.drawable.ic_take_away_coffe
-            3 -> R.drawable.ic_beer_white_24dp
+            3 -> R.drawable.ic_beer
-            4 -> R.drawable.ic_fast_food_meal_white_24dp
+            4 -> R.drawable.ic_fast_food_meal
-            5 -> R.drawable.ic_popcorn_white_24dp
+            5 -> R.drawable.ic_popcorn
-            6 -> R.drawable.ic_card_giftcard_white_24dp
+            6 -> R.drawable.ic_card_giftcard
-            7 -> R.drawable.ic_food_croissant_white_24dp
+            7 -> R.drawable.ic_food_croissant
-            else -> R.drawable.ic_card_giftcard_white_24dp
+            else -> R.drawable.ic_card_giftcard
         }
     }
 

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

@@ -55,7 +55,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
         }
         cab = MaterialCab(this, R.id.cab_stub)
             .setMenu(menuRes)
-            .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+            .setCloseDrawableRes(R.drawable.ic_close)
             .setBackgroundColor(
                 RetroColorUtil.shiftBackgroundColorForLightText(
                     ATHUtil.resolveColor(

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

@@ -49,7 +49,7 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView,
         }
         cab = MaterialCab(this, R.id.cab_stub)
             .setMenu(menuRes)
-            .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+            .setCloseDrawableRes(R.drawable.ic_close)
             .setBackgroundColor(
                 RetroColorUtil.shiftBackgroundColorForLightText(
                     ATHUtil.resolveColor(

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

@@ -94,7 +94,7 @@ open class BugReportActivity : AbsThemeActivity() {
             sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
                 override fun onHidden(fab: FloatingActionButton?) {
                     super.onHidden(fab)
-                    sendFab.setImageResource(R.drawable.ic_send_white_24dp)
+                    sendFab.setImageResource(R.drawable.ic_send)
                     sendFab.show()
                 }
             })
@@ -110,7 +110,7 @@ open class BugReportActivity : AbsThemeActivity() {
             sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
                 override fun onHidden(fab: FloatingActionButton?) {
                     super.onHidden(fab)
-                    sendFab.setImageResource(R.drawable.ic_open_in_browser_white_24dp)
+                    sendFab.setImageResource(R.drawable.ic_open_in_browser)
                     sendFab.show()
                 }
             })

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

@@ -69,8 +69,8 @@ class ContributorAdapter(
             text.text = contributor.summary
             Glide.with(image.context)
                 .load(contributor.profileImage)
-                .error(R.drawable.ic_account_white_24dp)
+                .error(R.drawable.ic_account)
-                .placeholder(R.drawable.ic_account_white_24dp)
+                .placeholder(R.drawable.ic_account)
                 .dontAnimate()
                 .into(image)
         }

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

@@ -100,7 +100,7 @@ class SongFileAdapter(
         if (file.isDirectory) {
             holder.image?.let {
                 it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
-                it.setImageResource(R.drawable.ic_folder_white_24dp)
+                it.setImageResource(R.drawable.ic_folder)
             }
             holder.imageTextContainer?.setCardBackgroundColor(
                 ATHUtil.resolveColor(
@@ -110,7 +110,7 @@ class SongFileAdapter(
             )
         } else {
             val error = RetroUtil.getTintedVectorDrawable(
-                activity, R.drawable.ic_file_music_white_24dp, iconColor
+                activity, R.drawable.ic_file_music, iconColor
             )
             Glide.with(activity)
                 .load(AudioFileCover(file.path))

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

@@ -94,12 +94,12 @@ class PlaylistAdapter(
         return if (MusicUtil.isFavoritePlaylist(activity, playlist))
             TintHelper.createTintedDrawable(
                 activity,
-                R.drawable.ic_favorite_white_24dp,
+                R.drawable.ic_favorite,
                 ThemeStore.accentColor(activity)
             )
         else TintHelper.createTintedDrawable(
             activity,
-            R.drawable.ic_playlist_play_white_24dp,
+            R.drawable.ic_playlist_play,
             ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
         )
     }

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt

@@ -57,7 +57,7 @@ class AppWidgetBig : BaseAppWidget() {
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     MaterialValueHelper.getPrimaryTextColor(context, false)
                 )!!, 1f
             )
@@ -66,7 +66,7 @@ class AppWidgetBig : BaseAppWidget() {
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     MaterialValueHelper.getPrimaryTextColor(context, false)
                 )!!, 1f
             )
@@ -117,7 +117,7 @@ class AppWidgetBig : BaseAppWidget() {
         val primaryColor = MaterialValueHelper.getPrimaryTextColor(service, false)
         // Set correct drawable for pause state
         val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp
+            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
@@ -133,7 +133,7 @@ class AppWidgetBig : BaseAppWidget() {
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     service,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     primaryColor
                 )!!, 1f
             )
@@ -142,7 +142,7 @@ class AppWidgetBig : BaseAppWidget() {
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     service,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     primaryColor
                 )!!, 1f
             )

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt

@@ -55,7 +55,7 @@ class AppWidgetCard : BaseAppWidget() {
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     secondaryColor
                 )!!, 1f
             )
@@ -64,7 +64,7 @@ class AppWidgetCard : BaseAppWidget() {
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     secondaryColor
                 )!!, 1f
             )
@@ -103,7 +103,7 @@ class AppWidgetCard : BaseAppWidget() {
 
         // Set correct drawable for pause state
         val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp
+            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
@@ -119,7 +119,7 @@ class AppWidgetCard : BaseAppWidget() {
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     service,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     MaterialValueHelper.getSecondaryTextColor(service, true)
                 )!!, 1f
             )
@@ -128,7 +128,7 @@ class AppWidgetCard : BaseAppWidget() {
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     service,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     MaterialValueHelper.getSecondaryTextColor(service, true)
                 )!!, 1f
             )
@@ -189,14 +189,14 @@ class AppWidgetCard : BaseAppWidget() {
                         appWidgetView.setImageViewBitmap(
                             R.id.button_next, ImageUtil.createBitmap(
                                 ImageUtil.getTintedVectorDrawable(
-                                    service, R.drawable.ic_skip_next_white_24dp, color
+                                    service, R.drawable.ic_skip_next, color
                                 )
                             )
                         )
                         appWidgetView.setImageViewBitmap(
                             R.id.button_prev, ImageUtil.createBitmap(
                                 ImageUtil.getTintedVectorDrawable(
-                                    service, R.drawable.ic_skip_previous_white_24dp, color
+                                    service, R.drawable.ic_skip_previous, color
                                 )
                             )
                         )

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt

@@ -57,7 +57,7 @@ class AppWidgetClassic : BaseAppWidget() {
             createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     MaterialValueHelper.getSecondaryTextColor(context, true)
                 )!!, 1f
             )
@@ -67,7 +67,7 @@ class AppWidgetClassic : BaseAppWidget() {
             createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     MaterialValueHelper.getSecondaryTextColor(context, true)
                 )!!, 1f
             )
@@ -151,7 +151,7 @@ class AppWidgetClassic : BaseAppWidget() {
                     private fun update(bitmap: Bitmap?, color: Int) {
                         // Set correct drawable for pause state
                         val playPauseRes =
-                            if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_24dp
+                            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow
                         appWidgetView.setImageViewBitmap(
                             R.id.button_toggle_play_pause,
                             ImageUtil.createBitmap(
@@ -169,7 +169,7 @@ class AppWidgetClassic : BaseAppWidget() {
                             ImageUtil.createBitmap(
                                 ImageUtil.getTintedVectorDrawable(
                                     service,
-                                    R.drawable.ic_skip_next_white_24dp,
+                                    R.drawable.ic_skip_next,
                                     color
                                 )
                             )
@@ -179,7 +179,7 @@ class AppWidgetClassic : BaseAppWidget() {
                             ImageUtil.createBitmap(
                                 ImageUtil.getTintedVectorDrawable(
                                     service,
-                                    R.drawable.ic_skip_previous_white_24dp,
+                                    R.drawable.ic_skip_previous,
                                     color
                                 )
                             )

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt

@@ -54,7 +54,7 @@ class AppWidgetSmall : BaseAppWidget() {
             createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     MaterialValueHelper.getSecondaryTextColor(context, true)
                 )!!, 1f
             )
@@ -64,7 +64,7 @@ class AppWidgetSmall : BaseAppWidget() {
             createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     context,
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     MaterialValueHelper.getSecondaryTextColor(context, true)
                 )!!, 1f
             )
@@ -150,7 +150,7 @@ class AppWidgetSmall : BaseAppWidget() {
 
                     private fun update(bitmap: Bitmap?, color: Int) {
                         // Set correct drawable for pause state
-                        val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp
+                        val playPauseRes = if (isPlaying) R.drawable.ic_pause
                         else R.drawable.ic_play_arrow_white_32dp
                         appWidgetView.setImageViewBitmap(
                             R.id.button_toggle_play_pause, createBitmap(
@@ -164,14 +164,14 @@ class AppWidgetSmall : BaseAppWidget() {
                         appWidgetView.setImageViewBitmap(
                             R.id.button_next, createBitmap(
                                 RetroUtil.getTintedVectorDrawable(
-                                    service, R.drawable.ic_skip_next_white_24dp, color
+                                    service, R.drawable.ic_skip_next, color
                                 )!!, 1f
                             )
                         )
                         appWidgetView.setImageViewBitmap(
                             R.id.button_prev, createBitmap(
                                 RetroUtil.getTintedVectorDrawable(
-                                    service, R.drawable.ic_skip_previous_white_24dp, color
+                                    service, R.drawable.ic_skip_previous, color
                                 )!!, 1f
                             )
                         )

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt

@@ -37,7 +37,7 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
-                    context, R.drawable.ic_skip_next_white_24dp, ContextCompat.getColor(
+                    context, R.drawable.ic_skip_next, ContextCompat.getColor(
                         context, R.color.md_white_1000
                     )
                 )!!, 1f
@@ -46,7 +46,7 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
-                    context, R.drawable.ic_skip_previous_white_24dp, ContextCompat.getColor(
+                    context, R.drawable.ic_skip_previous, ContextCompat.getColor(
                         context, R.color.md_white_1000
                     )
                 )!!, 1f
@@ -119,7 +119,7 @@ class AppWidgetText : BaseAppWidget() {
         linkButtons(service, appWidgetView)
 
         // Set correct drawable for pause state
-        val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp
+        val playPauseRes = if (isPlaying) R.drawable.ic_pause
         else R.drawable.ic_play_arrow_white_32dp
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause, createBitmap(
@@ -134,7 +134,7 @@ class AppWidgetText : BaseAppWidget() {
             R.id.button_next, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     App.getContext(),
-                    R.drawable.ic_skip_next_white_24dp,
+                    R.drawable.ic_skip_next,
                     ContextCompat.getColor(
                         App.getContext(), R.color.md_white_1000
                     )
@@ -145,7 +145,7 @@ class AppWidgetText : BaseAppWidget() {
             R.id.button_prev, createBitmap(
                 RetroUtil.getTintedVectorDrawable(
                     App.getContext(),
-                    R.drawable.ic_skip_previous_white_24dp,
+                    R.drawable.ic_skip_previous,
                     ContextCompat.getColor(
                         App.getContext(), R.color.md_white_1000
                     )

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

@@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 
 fun Int.ripAlpha(): Int {
@@ -81,5 +82,5 @@ fun SeekBar.addAccentColor() {
 }
 
 fun Button.accentTextColor() {
-    setTextColor(ThemeStore.accentColor(context))
+    setTextColor(ThemeStore.accentColor(App.getContext()))
 }

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

@@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import code.name.monkey.retromusic.adapter.HomeAdapter
 import code.name.monkey.retromusic.fragments.ReloadType.*
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 import code.name.monkey.retromusic.model.*
@@ -58,9 +59,15 @@ class LibraryViewModel(application: Application) :
             _repository.suggestions(),
             _repository.favoritePlaylist()
         )
-        for (r in result) {
+        result.forEach {
-            if (r != null) {
+            if (it != null && it.arrayList.isNotEmpty()) {
-                list.add(r)
+                if (it.homeSection == HomeAdapter.SUGGESTIONS) {
+                    if (it.arrayList.size > 9) {
+                        list.add(it)
+                    }
+                } else {
+                    list.add(it)
+                }
             }
         }
         _homeSections.value = list

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

@@ -129,9 +129,9 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
 
     protected fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
-            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 

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

@@ -62,7 +62,7 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum
 
         volumeSeekBar.max = maxVolume
         volumeSeekBar.progress = currentVolume
-        volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp)
+        volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
     }
 
     override fun onDestroyView() {
@@ -74,7 +74,7 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum
         val audioManager = audioManager
         audioManager?.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0)
         setPauseWhenZeroVolume(i < 1)
-        volumeDown?.setImageResource(if (i == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp)
+        volumeDown?.setImageResource(if (i == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
     }
 
     override fun onStartTrackingTouch(seekBar: SeekBar) {

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

@@ -197,9 +197,9 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
 
             override fun onPostExecute(isFavorite: Boolean) {
                 val res = if (isFavorite)
-                    R.drawable.ic_favorite_white_24dp
+                    R.drawable.ic_favorite
                 else
-                    R.drawable.ic_favorite_border_white_24dp
+                    R.drawable.ic_favorite_border
 
                 val drawable =
                     RetroUtil.getTintedVectorDrawable(requireContext(), res, toolbarIconColor())

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

@@ -375,7 +375,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         }
         cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
                 .setMenu(menuRes)
-                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setCloseDrawableRes(R.drawable.ic_close)
                 .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(
                         ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
                 .start(callback);

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

@@ -157,7 +157,7 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -214,18 +214,18 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt

@@ -148,7 +148,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -197,18 +197,18 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt

@@ -155,7 +155,7 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -204,18 +204,18 @@ class CardPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -79,7 +79,7 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         when {
-            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause)
             else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
@@ -177,18 +177,18 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt

@@ -206,8 +206,8 @@ class CirclePlayerFragment : AbsPlayerFragment(), Callback, OnAudioVolumeChanged
 
     private fun updatePlayPauseDrawableState() {
         when {
-            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause)
-            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt

@@ -415,9 +415,9 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
-            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 
@@ -466,18 +466,18 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
     fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt

@@ -129,8 +129,8 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         when {
-            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause)
-            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 
@@ -177,18 +177,18 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -156,7 +156,7 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -205,18 +205,18 @@ class FitPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -149,7 +149,7 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -189,18 +189,18 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt

@@ -148,7 +148,7 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(),
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -257,18 +257,18 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(),
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }
@@ -309,9 +309,9 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(),
                 val activity = activity
                 if (activity != null) {
                     val res = if (isFavorite!!)
-                        R.drawable.ic_favorite_white_24dp
+                        R.drawable.ic_favorite
                     else
-                        R.drawable.ic_favorite_border_white_24dp
+                        R.drawable.ic_favorite_border
 
                     val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE)
                     songFavourite?.setImageDrawable(drawable)

app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt

@@ -355,18 +355,18 @@ class GradientPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelpe
     fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }
@@ -506,9 +506,9 @@ class GradientPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelpe
                 val activity = activity
                 if (activity != null) {
                     val res = if (isFavorite!!)
-                        R.drawable.ic_favorite_white_24dp
+                        R.drawable.ic_favorite
                     else
-                        R.drawable.ic_favorite_border_white_24dp
+                        R.drawable.ic_favorite_border
 
                     val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE)
                     songFavourite?.setImageDrawable(drawable)

app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt

@@ -156,7 +156,7 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -205,18 +205,18 @@ class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -190,18 +190,18 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_sharp_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_sharp)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_sharp_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_sharp)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_sharp_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_sharp)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -153,9 +153,9 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
-            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow)
         }
     }
 
@@ -202,18 +202,18 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

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

@@ -118,7 +118,7 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
@@ -203,18 +203,18 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt

@@ -204,18 +204,18 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }
@@ -265,7 +265,7 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }

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

@@ -134,18 +134,18 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }
@@ -243,7 +243,7 @@ class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() {
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            playPauseButton.setImageResource(R.drawable.ic_pause)
         } else {
             playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }

app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt

@@ -81,18 +81,18 @@ class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
     override fun updateRepeatState() {
         when (MusicPlayerRemote.repeatMode) {
             MusicService.REPEAT_MODE_NONE -> {
-                playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat)
                 playerRepeatButton.setColorFilter(
                     lastDisabledPlaybackControlsColor,
                     PorterDuff.Mode.SRC_IN
                 )
             }
             MusicService.REPEAT_MODE_ALL -> {
-                playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat)
                 playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
             MusicService.REPEAT_MODE_THIS -> {
-                playerRepeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat_one)
                 playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
             }
         }

app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt

@@ -36,9 +36,6 @@ abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(vi
         super.onLoadFailed(e, errorDrawable)
         val colors = MediaNotificationProcessor(App.getContext(), errorDrawable)
         onColorReady(colors)
-        /* MediaNotificationProcessor(App.getContext()).getPaletteAsync({
-            onColorReady(it)
-        }, errorDrawable)*/
     }
 
     override fun onResourceReady(

app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java

@@ -23,7 +23,7 @@ import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
 public class UserProfileGlideRequest {
     private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.NONE;
-    private static final int DEFAULT_ERROR_IMAGE = R.drawable.ic_account_white_24dp;
+    private static final int DEFAULT_ERROR_IMAGE = R.drawable.ic_account;
     private static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
 
     public static File getUserModel() {
@@ -47,7 +47,7 @@ public class UserProfileGlideRequest {
         private Builder(RequestManager requestManager, File profile) {
             this.requestManager = requestManager;
             this.profile = profile;
-            error = TintHelper.createTintedDrawable(App.Companion.getContext(), R.drawable.ic_account_white_24dp, ThemeStore.Companion.accentColor(App.Companion.getContext()));
+            error = TintHelper.createTintedDrawable(App.Companion.getContext(), R.drawable.ic_account, ThemeStore.Companion.accentColor(App.Companion.getContext()));
         }
 
         public static Builder from(@NonNull RequestManager requestManager, File profile) {

app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java

@@ -181,7 +181,7 @@ public class LrcView extends View {
         mTimelineColor = ta.getColor(R.styleable.LrcView_lrcTimelineColor, getResources().getColor(R.color.lrc_timeline_color));
         float timelineHeight = ta.getDimension(R.styleable.LrcView_lrcTimelineHeight, getResources().getDimension(R.dimen.lrc_timeline_height));
         mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable);
-        mPlayDrawable = (mPlayDrawable == null) ? getResources().getDrawable(R.drawable.ic_play_arrow_white_24dp) : mPlayDrawable;
+        mPlayDrawable = (mPlayDrawable == null) ? getResources().getDrawable(R.drawable.ic_play_arrow) : mPlayDrawable;
         mTimeTextColor = ta.getColor(R.styleable.LrcView_lrcTimeTextColor, getResources().getColor(R.color.lrc_time_text_color));
         float timeTextSize = ta.getDimension(R.styleable.LrcView_lrcTimeTextSize, getResources().getDimension(R.dimen.lrc_time_text_size));
         mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER);

app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java

@@ -62,11 +62,11 @@ public class CategoryInfo implements Parcelable {
         Home(R.id.action_home, R.string.home, R.drawable.asld_home),
         Songs(R.id.action_song, R.string.songs, R.drawable.asld_music_note),
         Albums(R.id.action_album, R.string.albums, R.drawable.asld_album),
-        Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist_white_24dp),
+        Artists(R.id.action_artist, R.string.artists, R.drawable.ic_artist),
-        Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play_white_24dp),
+        Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play),
-        Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar_white_24dp),
+        Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar),
-        Queue(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music_white_24dp),
+        Queue(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music),
-        Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder_white_24dp);
+        Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder);
 
         public final int icon;
 

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java

@@ -36,7 +36,7 @@ public abstract class AbsSmartPlaylist extends AbsCustomPlaylist {
 
     public AbsSmartPlaylist() {
         super();
-        this.iconRes = R.drawable.ic_queue_music_white_24dp;
+        this.iconRes = R.drawable.ic_queue_music;
     }
 
     protected AbsSmartPlaylist(Parcel in) {

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java

@@ -44,7 +44,7 @@ public class HistoryPlaylist extends AbsSmartPlaylist {
     };
 
     public HistoryPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp);
+        super(context.getString(R.string.history), R.drawable.ic_history);
     }
 
     protected HistoryPlaylist(Parcel in) {

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java

@@ -41,7 +41,7 @@ public class LastAddedPlaylist extends AbsSmartPlaylist {
     };
 
     public LastAddedPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.last_added), R.drawable.ic_library_add_white_24dp);
+        super(context.getString(R.string.last_added), R.drawable.ic_library_add);
     }
 
     protected LastAddedPlaylist(Parcel in) {

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java

@@ -44,7 +44,7 @@ public class MyTopTracksPlaylist extends AbsSmartPlaylist {
     };
 
     public MyTopTracksPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp);
+        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up);
     }
 
     protected MyTopTracksPlaylist(Parcel in) {

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java

@@ -29,7 +29,7 @@ public class NotRecentlyPlayedPlaylist extends AbsSmartPlaylist {
     };
 
     public NotRecentlyPlayedPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.not_recently_played), R.drawable.ic_watch_later_white_24dp);
+        super(context.getString(R.string.not_recently_played), R.drawable.ic_watch_later);
     }
 
     protected NotRecentlyPlayedPlaylist(Parcel in) {

app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java

@@ -40,7 +40,7 @@ public class ShuffleAllPlaylist extends AbsSmartPlaylist {
     };
 
     public ShuffleAllPlaylist(@NonNull Context context) {
-        super(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle_white_24dp);
+        super(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle);
     }
 
     protected ShuffleAllPlaylist(Parcel in) {

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

@@ -50,7 +50,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
             return Home(
                 songs,
                 HomeAdapter.SUGGESTIONS,
-                R.drawable.ic_audiotrack_white_24dp
+                R.drawable.ic_audiotrack
             )
         }
         return null
@@ -75,7 +75,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
         return if (artists.isNotEmpty()) Home(
             artists,
             HomeAdapter.RECENT_ARTISTS,
-            R.drawable.ic_artist_white_24dp
+            R.drawable.ic_artist
         ) else null
     }
 
@@ -84,7 +84,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
         return if (albums.isNotEmpty()) Home(
             albums,
             HomeAdapter.RECENT_ALBUMS,
-            R.drawable.ic_album_white_24dp
+            R.drawable.ic_album
         ) else null
     }
 
@@ -93,7 +93,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
         return if (albums.isNotEmpty()) Home(
             albums,
             HomeAdapter.TOP_ALBUMS,
-            R.drawable.ic_album_white_24dp
+            R.drawable.ic_album
         ) else null
     }
 
@@ -103,7 +103,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
         return if (artists.isNotEmpty()) Home(
             artists,
             HomeAdapter.TOP_ARTISTS,
-            R.drawable.ic_artist_white_24dp
+            R.drawable.ic_artist
         ) else null
 
     }
@@ -113,7 +113,7 @@ class RepositoryImpl constructor(private val context: Context) : Repository {
         return if (playlists.isNotEmpty()) Home(
             playlists,
             HomeAdapter.FAVOURITES,
-            R.drawable.ic_favorite_white_24dp
+            R.drawable.ic_favorite
         ) else null
     }
 

app/src/main/java/code/name/monkey/retromusic/service/MusicService.java

@@ -1312,11 +1312,11 @@ public class MusicService extends Service implements
     }
 
     private void setCustomAction(PlaybackStateCompat.Builder stateBuilder) {
-        int repeatIcon = R.drawable.ic_repeat_white_24dp;  // REPEAT_MODE_NONE
+        int repeatIcon = R.drawable.ic_repeat;  // REPEAT_MODE_NONE
         if (getRepeatMode() == REPEAT_MODE_THIS) {
-            repeatIcon = R.drawable.ic_repeat_one_white_24dp;
+            repeatIcon = R.drawable.ic_repeat_one;
         } else if (getRepeatMode() == REPEAT_MODE_ALL) {
-            repeatIcon = R.drawable.ic_repeat_white_circle_24dp;
+            repeatIcon = R.drawable.ic_repeat_white_circledp;
         }
         stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder(
                 CYCLE_REPEAT, getString(R.string.action_cycle_repeat), repeatIcon)
@@ -1329,7 +1329,7 @@ public class MusicService extends Service implements
                 .build());
 
         final int favoriteIcon = MusicUtil.isFavorite(getApplicationContext(), getCurrentSong())
-                ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp;
+                ? R.drawable.ic_favorite : R.drawable.ic_favorite_border;
         stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder(
                 TOGGLE_FAVORITE, getString(R.string.action_toggle_favorite), favoriteIcon)
                 .build());

app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt

@@ -52,7 +52,7 @@ class PlayingNotificationImpl : PlayingNotification() {
         val playButtonResId =
             if (isPlaying) R.drawable.ic_pause_white_48dp else R.drawable.ic_play_arrow_white_48dp
         val favoriteResId =
-            if (isFavorite) R.drawable.ic_favorite_white_24dp else R.drawable.ic_favorite_border_white_24dp
+            if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
 
         val action = Intent(service, MainActivity::class.java)
         action.putExtra(MainActivity.EXPAND_PANEL, true)

app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt

@@ -167,7 +167,7 @@ class PlayingNotificationOreo : PlayingNotification() {
                         val close = createBitmap(
                             RetroUtil.getTintedVectorDrawable(
                                 service,
-                                R.drawable.ic_close_white_24dp,
+                                R.drawable.ic_close,
                                 primary
                             )!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER
                         )

app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java

@@ -52,8 +52,8 @@ public class NetworkImageView extends CircularImageView {
     public void setImageUrl(@NonNull Context context, @NonNull String imageUrl) {
         Glide.with(context)
                 .load(imageUrl)
-                .error(R.drawable.ic_account_white_24dp)
+                .error(R.drawable.ic_account)
-                .placeholder(R.drawable.ic_account_white_24dp)
+                .placeholder(R.drawable.ic_account)
                 .into(this);
     }
 

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

@@ -3,11 +3,11 @@
     tools:ignore="NewApi">
     <item
         android:id="@+id/state_on"
-        android:drawable="@drawable/ic_album_white_24dp"
+        android:drawable="@drawable/ic_album"
         android:state_checked="true" />
     <item
         android:id="@+id/state_off"
-        android:drawable="@drawable/ic_album_white_24dp" />
+        android:drawable="@drawable/ic_album" />
     <transition
         android:drawable="@drawable/avd_album"
         android:fromId="@id/state_off"

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

@@ -3,11 +3,11 @@
     tools:ignore="NewApi">
     <item
         android:id="@+id/state_on"
-        android:drawable="@drawable/ic_home_white_24dp"
+        android:drawable="@drawable/ic_home"
         android:state_checked="true" />
     <item
         android:id="@+id/state_off"
-        android:drawable="@drawable/ic_home_white_24dp" />
+        android:drawable="@drawable/ic_home" />
     <transition
         android:drawable="@drawable/avd_home"
         android:fromId="@id/state_off"

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

@@ -3,11 +3,11 @@
     tools:ignore="NewApi">
     <item
         android:id="@+id/state_on"
-        android:drawable="@drawable/ic_audiotrack_white_24dp"
+        android:drawable="@drawable/ic_audiotrack"
         android:state_checked="true" />
     <item
         android:id="@+id/state_off"
-        android:drawable="@drawable/ic_audiotrack_white_24dp" />
+        android:drawable="@drawable/ic_audiotrack" />
     <transition
         android:drawable="@drawable/avd_music_note"
         android:fromId="@id/state_off"

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm-0.22-13h-0.06c-0.4 0-0.72 0.32 -0.72 0.72 v4.72c0 0.35 0.18 0.68 0.49 0.86l4.15 2.49c0.34 0.2 0.78 0.1 0.98-0.24 0.21 -0.34 0.1 -0.79-0.25-0.99l-3.87-2.3V7.72c0-0.4-0.32-0.72-0.72-0.72z" />
-</vector>

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

@@ -1,10 +0,0 @@
-<!-- drawable/ic_account_group_white_24dp.xmlwhite_24dp.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
-</vector>

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

@@ -1,4 +1,3 @@
-<!-- drawable/ic_bookmark_music_white_24dp.xmlwhite_24dp.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"

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

@@ -1,4 +1,3 @@
-<!-- drawable/ic_file_edit_white_24dp.xmlwhite_24dp.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"