diff --git a/app/build.gradle b/app/build.gradle index c199db20..a4ed083d 100644 --- a/app/build.gradle +++ b/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' diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt index 3602d86f..4d6cef1f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt index 019646ac..d410f45d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index dda06624..c58330ab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index 099817f0..ee92f74d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 7cea20fa..56cbe177 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/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 - 1 -> R.drawable.ic_take_away_white_24dp - 2 -> R.drawable.ic_take_away_coffe_white_24dp - 3 -> R.drawable.ic_beer_white_24dp - 4 -> R.drawable.ic_fast_food_meal_white_24dp - 5 -> R.drawable.ic_popcorn_white_24dp - 6 -> R.drawable.ic_card_giftcard_white_24dp - 7 -> R.drawable.ic_food_croissant_white_24dp - else -> R.drawable.ic_card_giftcard_white_24dp + 0 -> R.drawable.ic_cookie + 1 -> R.drawable.ic_take_away + 2 -> R.drawable.ic_take_away_coffe + 3 -> R.drawable.ic_beer + 4 -> R.drawable.ic_fast_food_meal + 5 -> R.drawable.ic_popcorn + 6 -> R.drawable.ic_card_giftcard + 7 -> R.drawable.ic_food_croissant + else -> R.drawable.ic_card_giftcard } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt index bd668c01..2f3c819e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/albums/AlbumDetailsActivity.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt index 7cf4e79b..a4422ffa 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/artists/ArtistDetailActivity.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index 9e1bd13c..418ded1d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/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() } }) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt index dcd0f7bd..ca7d604a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt +++ b/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) - .placeholder(R.drawable.ic_account_white_24dp) + .error(R.drawable.ic_account) + .placeholder(R.drawable.ic_account) .dontAnimate() .into(image) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index daaba32d..2f6e7f38 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt +++ b/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)) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index f5bf2b7e..ab6cb02f 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/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) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index 4a55376f..0a3b3c2c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/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 ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt index 1d2d2377..e4702eb5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt +++ b/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 ) ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt index a8581501..0cbff1cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt +++ b/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 ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt index 0eae1a4e..70c1026d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt +++ b/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 ) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt index c47136e6..777606ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt +++ b/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 ) diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt index cf43e7d5..d89a2ca6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt +++ b/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())) } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt index 1e85bfe3..256c91ae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt +++ b/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) { - if (r != null) { - list.add(r) + result.forEach { + if (it != null && it.arrayList.isNotEmpty()) { + if (it.homeSection == HomeAdapter.SUGGESTIONS) { + if (it.arrayList.size > 9) { + list.add(it) + } + } else { + list.add(it) + } } } _homeSections.value = list diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index 34253648..abfd4ba0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index 0e1228f4..a6783bc0 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index cba672fc..9c055f93 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/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()) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java index 7895f70d..a430edd1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/FoldersFragment.java +++ b/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); diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt index 87f83975..ded0daf8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index 1093e005..d15a6d61 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt index 80db27d7..3a433ce0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index 16d0e873..c52dc3c5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt index 4056c4ab..451076c6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt +++ b/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) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause) + else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index 9285f020..bdfedfde 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index ec5290a6..f8ccbdb8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/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) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause) + 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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt index 76ab358f..e7a5cb9b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt index 2ab3ee45..3c689e55 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index 9bf28392..882a4d02 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/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) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index 208bbafc..edcf4dab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/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) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt index e43703c7..f3f4d9e9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt index dd8f20d0..485b1e1d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index 3f1ce6fa..8173aa17 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt index ef7d29e1..c4df2472 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt index 34d2d397..3b81446d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt +++ b/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) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt index c58eaf57..06b9c515 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt +++ b/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) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt index 388b3129..b8158dea 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt +++ b/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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt index fb9ad3c9..c6f74097 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt +++ b/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( diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java index 9742a1bd..29e9b1a7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java index 319512c1..707ad20a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java +++ b/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); diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java index 867bc409..80bdfc9e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java +++ b/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), - Playlists(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play_white_24dp), - Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar_white_24dp), - Queue(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music_white_24dp), - Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder_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), + 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), + Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder); public final int icon; diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java index 0e7338cc..b99c9abf 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java index 5e5cf7b1..cbcf95c7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java index 08371a00..7ff02060 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java index 5bff552a..c9f176d8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java index 3164907d..b5804aa3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotRecentlyPlayedPlaylist.java +++ b/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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java index 8c26b7af..68e968f1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java @@ -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) { diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt index 87d1dc6b..99b094c4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt +++ b/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 } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index 0f17e55a..cb676b21 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/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()); diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt index cd468038..1156418a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt +++ b/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) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt index 31872e22..14243faa 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt +++ b/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 ) diff --git a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java index 11f2f05d..378550bd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java +++ b/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) - .placeholder(R.drawable.ic_account_white_24dp) + .error(R.drawable.ic_account) + .placeholder(R.drawable.ic_account) .into(this); } diff --git a/app/src/main/res/drawable/asld_album.xml b/app/src/main/res/drawable/asld_album.xml index 0b8fd84e..5102b289 100644 --- a/app/src/main/res/drawable/asld_album.xml +++ b/app/src/main/res/drawable/asld_album.xml @@ -3,11 +3,11 @@ tools:ignore="NewApi"> + android:drawable="@drawable/ic_album" /> + android:drawable="@drawable/ic_home" /> + android:drawable="@drawable/ic_audiotrack" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_account_white_24dp.xml b/app/src/main/res/drawable/ic_account.xml similarity index 100% rename from app/src/main/res/drawable/ic_account_white_24dp.xml rename to app/src/main/res/drawable/ic_account.xml diff --git a/app/src/main/res/drawable/ic_account_group_white_24dp.xml b/app/src/main/res/drawable/ic_account_group_white_24dp.xml deleted file mode 100644 index 970a3aa9..00000000 --- a/app/src/main/res/drawable/ic_account_group_white_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_photo_white_24dp.xml b/app/src/main/res/drawable/ic_add_photo.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_photo_white_24dp.xml rename to app/src/main/res/drawable/ic_add_photo.xml diff --git a/app/src/main/res/drawable/ic_album_white_24dp.xml b/app/src/main/res/drawable/ic_album.xml similarity index 100% rename from app/src/main/res/drawable/ic_album_white_24dp.xml rename to app/src/main/res/drawable/ic_album.xml diff --git a/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml rename to app/src/main/res/drawable/ic_arrow_forward.xml diff --git a/app/src/main/res/drawable/ic_artist_white_24dp.xml b/app/src/main/res/drawable/ic_artist.xml similarity index 100% rename from app/src/main/res/drawable/ic_artist_white_24dp.xml rename to app/src/main/res/drawable/ic_artist.xml diff --git a/app/src/main/res/drawable/ic_artist_selected_white_24dp.xml b/app/src/main/res/drawable/ic_artist_selected.xml similarity index 100% rename from app/src/main/res/drawable/ic_artist_selected_white_24dp.xml rename to app/src/main/res/drawable/ic_artist_selected.xml diff --git a/app/src/main/res/drawable/ic_audiotrack_white_24dp.xml b/app/src/main/res/drawable/ic_audiotrack.xml similarity index 100% rename from app/src/main/res/drawable/ic_audiotrack_white_24dp.xml rename to app/src/main/res/drawable/ic_audiotrack.xml diff --git a/app/src/main/res/drawable/ic_beer_white_24dp.xml b/app/src/main/res/drawable/ic_beer.xml similarity index 100% rename from app/src/main/res/drawable/ic_beer_white_24dp.xml rename to app/src/main/res/drawable/ic_beer.xml diff --git a/app/src/main/res/drawable/ic_blur_on_white_24dp.xml b/app/src/main/res/drawable/ic_blur_on.xml similarity index 100% rename from app/src/main/res/drawable/ic_blur_on_white_24dp.xml rename to app/src/main/res/drawable/ic_blur_on.xml diff --git a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_music.xml similarity index 84% rename from app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml rename to app/src/main/res/drawable/ic_bookmark_music.xml index bcde9ac7..0674f00c 100644 --- a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_music.xml @@ -1,4 +1,3 @@ - + + diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable/ic_home.xml similarity index 100% rename from app/src/main/res/drawable/ic_home_white_24dp.xml rename to app/src/main/res/drawable/ic_home.xml diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image.xml similarity index 100% rename from app/src/main/res/drawable/ic_image_white_24dp.xml rename to app/src/main/res/drawable/ic_image.xml diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline.xml similarity index 100% rename from app/src/main/res/drawable/ic_info_outline_white_24dp.xml rename to app/src/main/res/drawable/ic_info_outline.xml diff --git a/app/src/main/res/drawable/ic_instagram_white_24dp.xml b/app/src/main/res/drawable/ic_instagram.xml similarity index 100% rename from app/src/main/res/drawable/ic_instagram_white_24dp.xml rename to app/src/main/res/drawable/ic_instagram.xml diff --git a/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml b/app/src/main/res/drawable/ic_invert_colors.xml similarity index 100% rename from app/src/main/res/drawable/ic_invert_colors_white_24dp.xml rename to app/src/main/res/drawable/ic_invert_colors.xml diff --git a/app/src/main/res/drawable/ic_keyboard_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_white_24dp.xml rename to app/src/main/res/drawable/ic_keyboard.xml diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_down_black.xml diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml similarity index 51% rename from app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_right.xml index 37733107..b283c52d 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml similarity index 51% rename from app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_up.xml index 712d88e3..a1d8ff1a 100755 --- a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_backspace_black.xml similarity index 100% rename from app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_backspace_black.xml diff --git a/app/src/main/res/drawable/ic_language_white_24dp.xml b/app/src/main/res/drawable/ic_language.xml similarity index 100% rename from app/src/main/res/drawable/ic_language_white_24dp.xml rename to app/src/main/res/drawable/ic_language.xml diff --git a/app/src/main/res/drawable/ic_library_add_white_24dp.xml b/app/src/main/res/drawable/ic_library_add.xml similarity index 100% rename from app/src/main/res/drawable/ic_library_add_white_24dp.xml rename to app/src/main/res/drawable/ic_library_add.xml diff --git a/app/src/main/res/drawable/ic_library_music_white_24dp.xml b/app/src/main/res/drawable/ic_library_music.xml similarity index 100% rename from app/src/main/res/drawable/ic_library_music_white_24dp.xml rename to app/src/main/res/drawable/ic_library_music.xml diff --git a/app/src/main/res/drawable/ic_license_white_24dp.xml b/app/src/main/res/drawable/ic_license.xml similarity index 100% rename from app/src/main/res/drawable/ic_license_white_24dp.xml rename to app/src/main/res/drawable/ic_license.xml diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu.xml similarity index 100% rename from app/src/main/res/drawable/ic_menu_white_24dp.xml rename to app/src/main/res/drawable/ic_menu.xml diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable/ic_mic.xml similarity index 100% rename from app/src/main/res/drawable/ic_mic_white_24dp.xml rename to app/src/main/res/drawable/ic_mic.xml diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert.xml similarity index 100% rename from app/src/main/res/drawable/ic_more_vert_white_24dp.xml rename to app/src/main/res/drawable/ic_more_vert.xml diff --git a/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml b/app/src/main/res/drawable/ic_music_note_off.xml similarity index 100% rename from app/src/main/res/drawable/ic_music_note_off_white_24dp.xml rename to app/src/main/res/drawable/ic_music_note_off.xml diff --git a/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml b/app/src/main/res/drawable/ic_notifications_active.xml similarity index 100% rename from app/src/main/res/drawable/ic_notifications_active_white_24dp.xml rename to app/src/main/res/drawable/ic_notifications_active.xml diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser.xml similarity index 100% rename from app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml rename to app/src/main/res/drawable/ic_open_in_browser.xml diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause.xml similarity index 100% rename from app/src/main/res/drawable/ic_pause_white_24dp.xml rename to app/src/main/res/drawable/ic_pause.xml diff --git a/app/src/main/res/drawable/ic_pinterest_white_24dp.xml b/app/src/main/res/drawable/ic_pinterest.xml similarity index 100% rename from app/src/main/res/drawable/ic_pinterest_white_24dp.xml rename to app/src/main/res/drawable/ic_pinterest.xml diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_arrow_white_24dp.xml rename to app/src/main/res/drawable/ic_play_arrow.xml diff --git a/app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml b/app/src/main/res/drawable/ic_play_circle_filled.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml rename to app/src/main/res/drawable/ic_play_circle_filled.xml diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_add.xml similarity index 100% rename from app/src/main/res/drawable/ic_playlist_add_white_24dp.xml rename to app/src/main/res/drawable/ic_playlist_add.xml diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play.xml similarity index 100% rename from app/src/main/res/drawable/ic_playlist_play_white_24dp.xml rename to app/src/main/res/drawable/ic_playlist_play.xml diff --git a/app/src/main/res/drawable/ic_popcorn_white_24dp.xml b/app/src/main/res/drawable/ic_popcorn.xml similarity index 100% rename from app/src/main/res/drawable/ic_popcorn_white_24dp.xml rename to app/src/main/res/drawable/ic_popcorn.xml diff --git a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml b/app/src/main/res/drawable/ic_queue_music.xml similarity index 100% rename from app/src/main/res/drawable/ic_queue_music_white_24dp.xml rename to app/src/main/res/drawable/ic_queue_music.xml diff --git a/app/src/main/res/drawable/ic_redo_white_24dp.xml b/app/src/main/res/drawable/ic_redo.xml similarity index 100% rename from app/src/main/res/drawable/ic_redo_white_24dp.xml rename to app/src/main/res/drawable/ic_redo.xml diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat.xml diff --git a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_one_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_one.xml diff --git a/app/src/main/res/drawable/ic_repeat_one_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_one_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_one_sharp.xml diff --git a/app/src/main/res/drawable/ic_repeat_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_repeat_sharp.xml diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save.xml similarity index 100% rename from app/src/main/res/drawable/ic_save_white_24dp.xml rename to app/src/main/res/drawable/ic_save.xml diff --git a/app/src/main/res/drawable/ic_scanner_white_24dp.xml b/app/src/main/res/drawable/ic_scanner.xml similarity index 100% rename from app/src/main/res/drawable/ic_scanner_white_24dp.xml rename to app/src/main/res/drawable/ic_scanner.xml diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable/ic_search.xml similarity index 100% rename from app/src/main/res/drawable/ic_search_white_24dp.xml rename to app/src/main/res/drawable/ic_search.xml diff --git a/app/src/main/res/drawable/ic_select_all_white_24dp.xml b/app/src/main/res/drawable/ic_select_all.xml similarity index 100% rename from app/src/main/res/drawable/ic_select_all_white_24dp.xml rename to app/src/main/res/drawable/ic_select_all.xml diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send.xml similarity index 100% rename from app/src/main/res/drawable/ic_send_white_24dp.xml rename to app/src/main/res/drawable/ic_send.xml diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_white_24dp.xml rename to app/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml b/app/src/main/res/drawable/ic_settings_brigntness.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml rename to app/src/main/res/drawable/ic_settings_brigntness.xml diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_white_24dp.xml rename to app/src/main/res/drawable/ic_share.xml diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle.xml similarity index 100% rename from app/src/main/res/drawable/ic_shuffle_white_24dp.xml rename to app/src/main/res/drawable/ic_shuffle.xml diff --git a/app/src/main/res/drawable/ic_shuffle_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_shuffle_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_shuffle_sharp.xml diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_next_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_next.xml diff --git a/app/src/main/res/drawable/ic_skip_next_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_next_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_next_sharp.xml diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_previous_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_previous.xml diff --git a/app/src/main/res/drawable/ic_skip_previous_sharp_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_sharp.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_previous_sharp_white_24dp.xml rename to app/src/main/res/drawable/ic_skip_previous_sharp.xml diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable/ic_sort.xml similarity index 100% rename from app/src/main/res/drawable/ic_sort_white_24dp.xml rename to app/src/main/res/drawable/ic_sort.xml diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star.xml similarity index 100% rename from app/src/main/res/drawable/ic_star_white_24dp.xml rename to app/src/main/res/drawable/ic_star.xml diff --git a/app/src/main/res/drawable/ic_take_away_white_24dp.xml b/app/src/main/res/drawable/ic_take_away.xml similarity index 100% rename from app/src/main/res/drawable/ic_take_away_white_24dp.xml rename to app/src/main/res/drawable/ic_take_away.xml diff --git a/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_coffe.xml similarity index 100% rename from app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml rename to app/src/main/res/drawable/ic_take_away_coffe.xml diff --git a/app/src/main/res/drawable/ic_testing_white_24dp.xml b/app/src/main/res/drawable/ic_testing.xml similarity index 100% rename from app/src/main/res/drawable/ic_testing_white_24dp.xml rename to app/src/main/res/drawable/ic_testing.xml diff --git a/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml b/app/src/main/res/drawable/ic_theme_palette.xml similarity index 100% rename from app/src/main/res/drawable/ic_theme_palette_white_24dp.xml rename to app/src/main/res/drawable/ic_theme_palette.xml diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_trending_up_white_24dp.xml rename to app/src/main/res/drawable/ic_trending_up.xml diff --git a/app/src/main/res/drawable/ic_twitter_white_24dp.xml b/app/src/main/res/drawable/ic_twitter.xml similarity index 100% rename from app/src/main/res/drawable/ic_twitter_white_24dp.xml rename to app/src/main/res/drawable/ic_twitter.xml diff --git a/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml b/app/src/main/res/drawable/ic_view_carousel.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_carousel_black_24dp.xml rename to app/src/main/res/drawable/ic_view_carousel.xml diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_down_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_down.xml diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable/ic_volume_off.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_off_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_off.xml diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_up_white_24dp.xml rename to app/src/main/res/drawable/ic_volume_up.xml diff --git a/app/src/main/res/drawable/ic_watch_later_white_24dp.xml b/app/src/main/res/drawable/ic_watch_later.xml similarity index 100% rename from app/src/main/res/drawable/ic_watch_later_white_24dp.xml rename to app/src/main/res/drawable/ic_watch_later.xml diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index 47d9002f..3376fb29 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -30,7 +30,7 @@ + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index df5bbd0d..c697c814 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -30,7 +30,7 @@ + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> + app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/ic_favorite_border" /> + app:srcCompat="@drawable/ic_skip_next" /> + app:srcCompat="@drawable/ic_skip_previous" /> @@ -135,7 +135,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" /> + app:srcCompat="@drawable/ic_shuffle" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml index 640bad4b..b9caaa7b 100644 --- a/app/src/main/res/layout-land/fragment_card_blur_player.xml +++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml @@ -45,11 +45,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml index 601bf5d1..3c750a92 100644 --- a/app/src/main/res/layout-land/fragment_circle_player.xml +++ b/app/src/main/res/layout-land/fragment_circle_player.xml @@ -47,11 +47,11 @@ diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml index 5e5276bd..2adee850 100644 --- a/app/src/main/res/layout-land/fragment_color_player.xml +++ b/app/src/main/res/layout-land/fragment_color_player.xml @@ -70,8 +70,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml index 2067ef20..d59f06a2 100644 --- a/app/src/main/res/layout-land/fragment_flat_player.xml +++ b/app/src/main/res/layout-land/fragment_flat_player.xml @@ -64,8 +64,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index 9f27d9fc..cdb5a459 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -106,8 +106,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index cdd43d54..327629b8 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -63,8 +63,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout-xlarge-land/fragment_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml index 7c76d87c..a2185426 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml @@ -70,10 +70,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_height="48dp" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index e970c7d7..a0b8d1d2 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -28,7 +28,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_access_time_white_24dp" /> + app:srcCompat="@drawable/ic_history" /> + app:srcCompat="@drawable/ic_library_add" /> + app:srcCompat="@drawable/ic_trending_up" /> + app:srcCompat="@drawable/ic_shuffle" /> diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index 71302b6b..56bff8c3 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -33,7 +33,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" android:background="?attr/colorSurface" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_backspace_black" /> @@ -155,7 +155,7 @@ android:paddingBottom="12dp" android:text="@string/save" app:cornerRadius="25dp" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" tools:backgroundTint="@color/md_red_400" /> diff --git a/app/src/main/res/layout/activity_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml index 23ed6b5d..9cb0f9ef 100644 --- a/app/src/main/res/layout/activity_artist_content.xml +++ b/app/src/main/res/layout/activity_artist_content.xml @@ -14,7 +14,7 @@ android:layout_marginEnd="4dp" android:text="@string/action_play_all" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_play_arrow_white_24dp" + app:icon="@drawable/ic_play_arrow" app:layout_constraintEnd_toStartOf="@+id/shuffleAction" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -28,7 +28,7 @@ android:layout_marginEnd="16dp" android:text="@string/shuffle" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_shuffle_white_24dp" + app:icon="@drawable/ic_shuffle" app:layout_constraintBottom_toBottomOf="@+id/playAction" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index b65a3bfe..a222a336 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -32,7 +32,7 @@ @@ -69,6 +69,6 @@ style="@style/Fab" android:layout_gravity="bottom|end" android:layout_margin="16dp" - app:srcCompat="@drawable/ic_send_white_24dp" /> + app:srcCompat="@drawable/ic_send" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index fcb83a9b..8e345500 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -17,7 +17,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/support_development" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml index 846233b1..f90eac43 100644 --- a/app/src/main/res/layout/activity_drive_mode.xml +++ b/app/src/main/res/layout/activity_drive_mode.xml @@ -61,7 +61,7 @@ android:padding="8dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/status_bar" - app:srcCompat="@drawable/ic_close_white_24dp" /> + app:srcCompat="@drawable/ic_close" /> + app:srcCompat="@drawable/ic_favorite_border" /> + app:srcCompat="@drawable/ic_skip_next" /> + app:srcCompat="@drawable/ic_skip_previous" /> + app:srcCompat="@drawable/ic_repeat" /> + app:srcCompat="@drawable/ic_shuffle" /> diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml index 92398c24..d95ba442 100644 --- a/app/src/main/res/layout/activity_lyrics.xml +++ b/app/src/main/res/layout/activity_lyrics.xml @@ -15,11 +15,11 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:contentInsetLeft="0dp" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="0dp" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:subtitleTextAppearance="@style/TextViewCaption" app:titleMargin="0dp" app:titleMarginStart="0dp" diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml index 38db7846..cbc1378d 100755 --- a/app/src/main/res/layout/activity_playing_queue.xml +++ b/app/src/main/res/layout/activity_playing_queue.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/queue" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:ignore="UnusedAttribute" /> @@ -66,7 +66,7 @@ android:layout_margin="16dp" android:text="@string/clear_playing_queue" android:textAppearance="@style/TextViewHeadline6" - app:icon="@drawable/ic_clear_all_black_24dp" /> + app:icon="@drawable/ic_clear_all" /> diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 67e46f53..af405033 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -35,7 +35,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:background="?roundSelector" android:padding="12dp" - app:srcCompat="@drawable/ic_mic_white_24dp" + app:srcCompat="@drawable/ic_mic" app:tint="?attr/colorControlNormal" tools:visibility="visible" /> @@ -86,7 +86,7 @@ android:background="?roundSelector" android:padding="12dp" android:visibility="gone" - app:srcCompat="@drawable/ic_close_white_24dp" + app:srcCompat="@drawable/ic_close" app:tint="?attr/colorControlNormal" tools:visibility="visible" /> @@ -123,6 +123,6 @@ android:layout_margin="16dp" android:text="@string/keyboard" android:textAppearance="@style/TextViewHeadline6" - app:icon="@drawable/ic_keyboard_white_24dp" /> + app:icon="@drawable/ic_keyboard" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 0225787f..ec83f3e5 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -39,7 +39,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:title="@string/action_settings" /> diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml index e0c241de..fe53bb31 100644 --- a/app/src/main/res/layout/activity_share_instagram.xml +++ b/app/src/main/res/layout/activity_share_instagram.xml @@ -145,7 +145,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/social_stories" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index baed30b1..1d62e322 100755 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -16,7 +16,7 @@ @@ -240,7 +240,7 @@ android:paddingBottom="12dp" android:text="@string/save" app:cornerRadius="25dp" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" /> @@ -63,7 +63,7 @@ android:layout_gravity="end" android:background="?roundSelector" android:padding="16dp" - app:srcCompat="@drawable/ic_add_photo_white_24dp" /> + app:srcCompat="@drawable/ic_add_photo" /> @@ -97,7 +97,7 @@ android:layout_margin="16dp" android:gravity="center" android:padding="12dp" - android:src="@drawable/ic_add_photo_white_24dp" + android:src="@drawable/ic_add_photo" app:tint="?attr/colorControlNormal" /> @@ -138,6 +138,6 @@ android:layout_margin="16dp" android:gravity="center" android:text="@string/save" - app:icon="@drawable/ic_save_white_24dp" + app:icon="@drawable/ic_save" app:iconGravity="textStart" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml index 9686dbd7..6420b1c1 100644 --- a/app/src/main/res/layout/activity_whats_new.xml +++ b/app/src/main/res/layout/activity_whats_new.xml @@ -32,7 +32,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" - app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:title="@string/whats_new" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" /> diff --git a/app/src/main/res/layout/app_widget_big.xml b/app/src/main/res/layout/app_widget_big.xml index 75ba63e6..173d8133 100755 --- a/app/src/main/res/layout/app_widget_big.xml +++ b/app/src/main/res/layout/app_widget_big.xml @@ -30,7 +30,7 @@ android:background="@drawable/widget_selector_dark" android:padding="22dp" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_primary_text_dark" /> diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml index 142524de..4fe732f8 100755 --- a/app/src/main/res/layout/app_widget_card.xml +++ b/app/src/main/res/layout/app_widget_card.xml @@ -70,7 +70,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector_light" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_light" /> diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml index d4a3efd6..b903a548 100755 --- a/app/src/main/res/layout/app_widget_classic.xml +++ b/app/src/main/res/layout/app_widget_classic.xml @@ -36,7 +36,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@drawable/widget_selector" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_dark" /> diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml index b9b7b5ce..2b54a027 100755 --- a/app/src/main/res/layout/app_widget_small.xml +++ b/app/src/main/res/layout/app_widget_small.xml @@ -31,7 +31,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector_light" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_light" /> diff --git a/app/src/main/res/layout/app_widget_text.xml b/app/src/main/res/layout/app_widget_text.xml index f62a0eb6..d02bb776 100644 --- a/app/src/main/res/layout/app_widget_text.xml +++ b/app/src/main/res/layout/app_widget_text.xml @@ -64,7 +64,7 @@ android:layout_weight="1" android:background="@drawable/widget_selector" tools:ignore="ContentDescription" - tools:src="@drawable/ic_skip_previous_white_24dp" + tools:src="@drawable/ic_skip_previous" tools:tint="@color/ate_secondary_text_dark" /> diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml index 30aa25a3..345a4ed7 100644 --- a/app/src/main/res/layout/bread_crumb.xml +++ b/app/src/main/res/layout/bread_crumb.xml @@ -26,7 +26,7 @@ android:layout_height="24dp" android:scaleType="fitXY" android:visibility="gone" - app:srcCompat="@drawable/ic_keyboard_arrow_right_white_24dp" + app:srcCompat="@drawable/ic_keyboard_arrow_right" tools:tint="?android:attr/colorControlNormal" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml index 2900a941..fb7b89e4 100644 --- a/app/src/main/res/layout/card_other.xml +++ b/app/src/main/res/layout/card_other.xml @@ -38,7 +38,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb4" - app:listItemIcon="@drawable/ic_file_edit_white_24dp" + app:listItemIcon="@drawable/ic_file_edit" app:listItemSummary="@string/changelog_summary" app:listItemTitle="@string/changelog" /> @@ -51,7 +51,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/changelog" - app:listItemIcon="@drawable/ic_license_white_24dp" + app:listItemIcon="@drawable/ic_license" app:listItemSummary="@string/pref_summary_open_source_licences" app:listItemTitle="@string/pref_title_open_source_licences" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/openSource" - app:listItemIcon="@drawable/ic_info_outline_white_24dp" + app:listItemIcon="@drawable/ic_info_outline" app:listItemSummary="@string/pref_summary_open_source_licences" app:listItemTitle="@string/version" /> diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml index b297a3a1..15a0de81 100644 --- a/app/src/main/res/layout/card_retro_info.xml +++ b/app/src/main/res/layout/card_retro_info.xml @@ -37,7 +37,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb2" - app:listItemIcon="@drawable/ic_github_circle_white_24dp" + app:listItemIcon="@drawable/ic_github_circle" app:listItemSummary="@string/git_hub_summary" app:listItemTitle="@string/git_hub" /> @@ -50,7 +50,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appGithub" - app:listItemIcon="@drawable/ic_flag_white_24dp" + app:listItemIcon="@drawable/ic_flag" app:listItemSummary="@string/translate_community" app:listItemTitle="@string/translate" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appTranslation" - app:listItemIcon="@drawable/ic_star_white_24dp" + app:listItemIcon="@drawable/ic_star" app:listItemSummary="@string/rate_on_google_play_summary" app:listItemTitle="@string/rate_app" /> @@ -77,7 +77,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appRate" - app:listItemIcon="@drawable/ic_card_giftcard_white_24dp" + app:listItemIcon="@drawable/ic_card_giftcard" app:listItemSummary="@string/donate_summary" app:listItemTitle="@string/donate" /> @@ -91,7 +91,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/donateLink" - app:listItemIcon="@drawable/ic_bug_report_white_24dp" + app:listItemIcon="@drawable/ic_bug_report" app:listItemSummary="@string/bug_report_summary" app:listItemTitle="@string/report_bug" /> @@ -105,7 +105,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/bugReportLink" - app:listItemIcon="@drawable/ic_share_white_24dp" + app:listItemIcon="@drawable/ic_share" app:listItemSummary="@string/share_summary" app:listItemTitle="@string/action_share" /> @@ -118,7 +118,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/appShare" - app:listItemIcon="@drawable/ic_help_white_24dp" + app:listItemIcon="@drawable/ic_help" app:listItemSummary="@string/help_summary" app:listItemTitle="@string/faq" /> diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index 8e678226..1b6a6c97 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -37,7 +37,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/sb3" - app:listItemIcon="@drawable/ic_pinterest_white_24dp" + app:listItemIcon="@drawable/ic_pinterest" app:listItemSummary="@string/pinterest_page_summary" app:listItemTitle="@string/pinterest_page" /> @@ -50,7 +50,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/pinterestLink" - app:listItemIcon="@drawable/ic_instagram_white_24dp" + app:listItemIcon="@drawable/ic_instagram" app:listItemSummary="@string/instagram_page_summary" app:listItemTitle="@string/instagram_page" /> @@ -64,7 +64,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/instagramLink" - app:listItemIcon="@drawable/ic_twitter_white_24dp" + app:listItemIcon="@drawable/ic_twitter" app:listItemSummary="@string/twitter_page_summary" app:listItemTitle="@string/twitter_page" /> diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml index 6d3fb00b..09d45e16 100644 --- a/app/src/main/res/layout/fragment_adaptive_player.xml +++ b/app/src/main/res/layout/fragment_adaptive_player.xml @@ -33,11 +33,11 @@ @@ -75,7 +75,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -120,7 +120,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index 96a470d3..23b8b3e8 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -68,11 +68,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 1f779142..a273cffc 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -153,7 +153,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -168,7 +168,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -196,7 +196,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -211,7 +211,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml index a7861d17..3f09f24c 100644 --- a/app/src/main/res/layout/fragment_card_blur_player.xml +++ b/app/src/main/res/layout/fragment_card_blur_player.xml @@ -49,11 +49,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index dd9d9a57..6b617b92 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -78,7 +78,7 @@ android:layout_gravity="center_vertical" android:padding="16dp" android:scaleType="centerCrop" - app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" + app:srcCompat="@drawable/ic_play_circle_filled" app:tint="?colorAccent" /> @@ -89,7 +89,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/progressContainer" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -134,7 +134,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index 88fbeae0..9cf13491 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -50,8 +50,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index 0d3c596f..8bb06719 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -57,11 +57,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml index 7acc1ac7..244a753c 100644 --- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml @@ -126,7 +126,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -141,7 +141,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -169,7 +169,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml index 9134e5f8..b9b42ea0 100644 --- a/app/src/main/res/layout/fragment_fit.xml +++ b/app/src/main/res/layout/fragment_fit.xml @@ -54,8 +54,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index 5d702b37..68a179c2 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -140,7 +140,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -155,7 +155,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -199,7 +199,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index 390b788b..64294137 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -36,11 +36,11 @@ + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> + tools:src="@drawable/ic_pause" /> diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index c3c95116..f1382aa4 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -67,7 +67,7 @@ android:id="@+id/playerToolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" android:paddingBottom="24dp" app:contentInsetEndWithActions="0dp" app:contentInsetStart="0dp" @@ -75,7 +75,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/statusBarContainer" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:titleMargin="0dp" app:titleMargins="0dp"> diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml index f56dfd02..98199dc8 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -17,7 +17,7 @@ app:layout_constraintBottom_toBottomOf="@+id/titleContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/titleContainer" - app:srcCompat="@drawable/ic_more_vert_white_24dp" /> + app:srcCompat="@drawable/ic_more_vert" /> + app:srcCompat="@drawable/ic_favorite_border" /> @@ -147,7 +147,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -179,7 +179,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -195,7 +195,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_gradient_controls.xml b/app/src/main/res/layout/fragment_gradient_controls.xml index a69f2382..10f4deac 100644 --- a/app/src/main/res/layout/fragment_gradient_controls.xml +++ b/app/src/main/res/layout/fragment_gradient_controls.xml @@ -16,7 +16,7 @@ app:layout_constraintBottom_toBottomOf="@+id/titleContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/titleContainer" - app:srcCompat="@drawable/ic_more_vert_white_24dp" + app:srcCompat="@drawable/ic_more_vert" tools:tint="@color/md_black_1000" /> @@ -130,7 +130,7 @@ app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -157,7 +157,7 @@ app:layout_constraintBottom_toBottomOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml index f0690de3..5e8898b9 100644 --- a/app/src/main/res/layout/fragment_gradient_player.xml +++ b/app/src/main/res/layout/fragment_gradient_player.xml @@ -85,7 +85,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/nextSongLabel" app:layout_constraintStart_toStartOf="parent" - app:srcCompat="@drawable/ic_queue_music_white_24dp" /> + app:srcCompat="@drawable/ic_queue_music" /> @@ -131,7 +131,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml index d99613cc..653b005e 100644 --- a/app/src/main/res/layout/fragment_home_player.xml +++ b/app/src/main/res/layout/fragment_home_player.xml @@ -94,7 +94,7 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index 75d08c2c..191b61ec 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -113,7 +113,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -128,7 +128,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -157,7 +157,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -172,7 +172,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index feaddb5c..cd2f3c29 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -35,7 +35,7 @@ android:paddingBottom="12dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_diamond_stone_white_24dp" + app:srcCompat="@drawable/ic_diamond_stone" app:tint="?colorOnSecondary" /> @@ -100,7 +100,7 @@ android:id="@+id/nowPlayingSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_play_circle_filled_white_24dp" + app:settingListItemIcon="@drawable/ic_play_circle_filled" app:settingListItemIconColor="@color/md_red_A400" app:settingListItemText="@string/now_playing_summary" app:settingListItemTitle="@string/now_playing" /> @@ -109,7 +109,7 @@ android:id="@+id/audioSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_volume_up_white_24dp" + app:settingListItemIcon="@drawable/ic_volume_up" app:settingListItemIconColor="@color/md_deep_purple_A400" app:settingListItemText="@string/audio_settings_summary" app:settingListItemTitle="@string/pref_header_audio" /> @@ -118,7 +118,7 @@ android:id="@+id/personalizeSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_hdr_strong_white_24dp" + app:settingListItemIcon="@drawable/ic_hdr_strong" app:settingListItemIconColor="@color/md_teal_A400" app:settingListItemText="@string/personalize_settings_summary" app:settingListItemTitle="@string/personalize" /> @@ -128,7 +128,7 @@ android:id="@+id/imageSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_image_white_24dp" + app:settingListItemIcon="@drawable/ic_image" app:settingListItemIconColor="@color/md_deep_orange_A400" app:settingListItemText="@string/image_settings_summary" app:settingListItemTitle="@string/pref_header_images" /> @@ -137,7 +137,7 @@ android:id="@+id/notificationSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp" + app:settingListItemIcon="@drawable/ic_notifications_active" app:settingListItemIconColor="@color/md_yellow_A400" app:settingListItemText="@string/notification_settings_summary" app:settingListItemTitle="@string/notification" /> @@ -146,7 +146,7 @@ android:id="@+id/otherSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_testing_white_24dp" + app:settingListItemIcon="@drawable/ic_testing" app:settingListItemIconColor="@color/md_indigo_A400" app:settingListItemText="@string/other_settings_summary" app:settingListItemTitle="@string/others" /> @@ -156,7 +156,7 @@ android:id="@+id/aboutSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_info_outline_white_24dp" + app:settingListItemIcon="@drawable/ic_info_outline" app:settingListItemIconColor="@color/md_light_green_A400" app:settingListItemText="@string/about_settings_summary" app:settingListItemTitle="@string/action_about" /> diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml index a07ce51e..c0e66bb1 100644 --- a/app/src/main/res/layout/fragment_material.xml +++ b/app/src/main/res/layout/fragment_material.xml @@ -48,10 +48,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml index 0c4e53a8..1b3cd50c 100644 --- a/app/src/main/res/layout/fragment_material_playback_controls.xml +++ b/app/src/main/res/layout/fragment_material_playback_controls.xml @@ -129,7 +129,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -145,7 +145,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_sharp_white_24dp" + app:srcCompat="@drawable/ic_skip_previous_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -174,7 +174,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_sharp_white_24dp" + app:srcCompat="@drawable/ic_skip_next_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -189,7 +189,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_sharp_white_24dp" + app:srcCompat="@drawable/ic_shuffle_sharp" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml index 3f5161b6..7bbef52f 100644 --- a/app/src/main/res/layout/fragment_mini_player.xml +++ b/app/src/main/res/layout/fragment_mini_player.xml @@ -25,7 +25,7 @@ android:layout_gravity="center_vertical" android:layout_margin="16dp" android:scaleType="centerCrop" - app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp" + app:srcCompat="@drawable/ic_keyboard_arrow_up" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> @@ -54,7 +54,7 @@ android:layout_gravity="center_vertical" android:background="?roundSelector" android:padding="6dp" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" app:tint="?attr/colorControlNormal" /> @@ -92,7 +92,7 @@ android:layout_gravity="center_vertical" android:background="?roundSelector" android:padding="6dp" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" app:tint="?attr/colorControlNormal" /> diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml index d106822b..39205a29 100644 --- a/app/src/main/res/layout/fragment_peak_control_player.xml +++ b/app/src/main/res/layout/fragment_peak_control_player.xml @@ -74,7 +74,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/progressSlider" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -105,7 +105,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -123,7 +123,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -140,7 +140,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml index f063fd2d..7c1148a1 100644 --- a/app/src/main/res/layout/fragment_peak_player.xml +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -42,8 +42,8 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index ffcde7a4..538e7018 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -61,7 +61,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -76,7 +76,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -104,7 +104,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -119,7 +119,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 64b44268..d9ff2a21 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -86,10 +86,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 5a4142e8..2e20ee3c 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -59,11 +59,11 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index c181fbaa..566deedc 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -126,7 +126,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -141,7 +141,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -155,7 +155,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/previousButton" app:layout_constraintTop_toBottomOf="@+id/songInfo" - app:srcCompat="@drawable/ic_pause_white_24dp" + app:srcCompat="@drawable/ic_pause" tools:tint="@color/md_black_1000" /> @@ -184,7 +184,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml index 6e8d1f4d..36f369d0 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -93,7 +93,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/previousButton" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -108,7 +108,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -136,7 +136,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -151,7 +151,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index 1eabf24b..ff6892a2 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -51,10 +51,10 @@ android:id="@+id/playerToolbar" style="@style/Toolbar" android:layout_gravity="bottom" - android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment" - app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" /> + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml index 4296f247..99fbc3e8 100644 --- a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml @@ -23,7 +23,7 @@ android:background="?attr/roundSelector" android:padding="16dp" android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_repeat_white_24dp" + app:srcCompat="@drawable/ic_repeat" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -34,7 +34,7 @@ android:background="?attr/roundSelector" android:padding="16dp" android:scaleType="fitCenter" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index 62a4d437..d3de2433 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -92,8 +92,8 @@ + android:navigationIcon="@drawable/ic_keyboard_arrow_down_black" + app:navigationIcon="@drawable/ic_keyboard_arrow_down_black" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml index ad429bba..ef73b468 100644 --- a/app/src/main/res/layout/item_contributor.xml +++ b/app/src/main/res/layout/item_contributor.xml @@ -35,7 +35,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:retroCornerSize="21dp" - app:srcCompat="@drawable/ic_account_white_24dp" + app:srcCompat="@drawable/ic_account" tools:srcCompat="@tools:sample/backgrounds/scenic" /> diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 136ad6c9..1d27814f 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical|start" android:visibility="gone" - app:srcCompat="@drawable/ic_drag_vertical_white_24dp" + app:srcCompat="@drawable/ic_drag_vertical" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml index 70fd399f..3c601d3d 100644 --- a/app/src/main/res/layout/item_list_quick_actions.xml +++ b/app/src/main/res/layout/item_list_quick_actions.xml @@ -28,7 +28,7 @@ android:layout_weight="1" android:text="@string/action_play_all" app:backgroundTint="?attr/colorSurface" - app:icon="@drawable/ic_play_arrow_white_24dp" /> + app:icon="@drawable/ic_play_arrow" /> + app:icon="@drawable/ic_shuffle" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_option_menu.xml b/app/src/main/res/layout/item_option_menu.xml index 4c5c175b..b2dfaea2 100644 --- a/app/src/main/res/layout/item_option_menu.xml +++ b/app/src/main/res/layout/item_option_menu.xml @@ -33,7 +33,7 @@ android:layout_weight="0" android:padding="12dp" app:tint="?attr/colorControlNormal" - tools:srcCompat="@drawable/ic_folder_white_24dp" /> + tools:srcCompat="@drawable/ic_folder" /> diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml index 7c021635..4e565045 100644 --- a/app/src/main/res/layout/layout_notification_collapsed.xml +++ b/app/src/main/res/layout/layout_notification_collapsed.xml @@ -117,7 +117,7 @@ android:layout_height="38dp" android:background="@drawable/notification_selector" android:scaleType="centerInside" - android:src="@drawable/ic_pause_white_24dp" + android:src="@drawable/ic_pause" tools:tint="?colorOnPrimary" /> diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml index 96ea3f17..c6518651 100644 --- a/app/src/main/res/layout/list_setting_item_view.xml +++ b/app/src/main/res/layout/list_setting_item_view.xml @@ -33,7 +33,7 @@ app:iconBackgroundColor="@color/md_blue_A400" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" - app:srcCompat="@drawable/ic_theme_palette_white_24dp" /> + app:srcCompat="@drawable/ic_theme_palette" /> @@ -37,7 +37,7 @@ app:layout_constraintEnd_toStartOf="@+id/playPauseButton" app:layout_constraintStart_toEndOf="@+id/repeatButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_previous_white_24dp" + app:srcCompat="@drawable/ic_skip_previous" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -67,7 +67,7 @@ app:layout_constraintEnd_toStartOf="@+id/shuffleButton" app:layout_constraintStart_toEndOf="@+id/playPauseButton" app:layout_constraintTop_toTopOf="@+id/playPauseButton" - app:srcCompat="@drawable/ic_skip_next_white_24dp" + app:srcCompat="@drawable/ic_skip_next" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> @@ -82,7 +82,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/nextButton" app:layout_constraintTop_toTopOf="@+id/nextButton" - app:srcCompat="@drawable/ic_shuffle_white_24dp" + app:srcCompat="@drawable/ic_shuffle" tools:ignore="MissingPrefix" tools:tint="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml index 6952d8ba..22b376fc 100644 --- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml +++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml @@ -61,7 +61,7 @@ android:focusable="false" android:padding="16dp" android:tintMode="src_in" - app:srcCompat="@drawable/ic_drag_vertical_white_24dp" + app:srcCompat="@drawable/ic_drag_vertical" app:tint="?attr/colorControlNormal" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml index 104e0340..8288aae4 100644 --- a/app/src/main/res/menu/bottom_navigation_main.xml +++ b/app/src/main/res/menu/bottom_navigation_main.xml @@ -4,28 +4,28 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml index 622c2cde..bd97edc0 100644 --- a/app/src/main/res/menu/menu_album_detail.xml +++ b/app/src/main/res/menu/menu_album_detail.xml @@ -3,7 +3,7 @@ @@ -42,7 +42,7 @@ diff --git a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml index e6d0f67d..7288b1dd 100644 --- a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml +++ b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml @@ -4,24 +4,24 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml index e2e50174..67c5e76b 100644 --- a/app/src/main/res/menu/menu_folders.xml +++ b/app/src/main/res/menu/menu_folders.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 84252a01..5c5f80af 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -20,7 +20,7 @@ @@ -57,7 +57,7 @@ @@ -89,7 +89,7 @@ diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml index 59e0dc5d..d914cf26 100644 --- a/app/src/main/res/menu/menu_media_selection.xml +++ b/app/src/main/res/menu/menu_media_selection.xml @@ -4,31 +4,31 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml index d1919c1f..d0741998 100755 --- a/app/src/main/res/menu/menu_player.xml +++ b/app/src/main/res/menu/menu_player.xml @@ -4,24 +4,24 @@ diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_playlists_selection.xml index fde5452b..f2e6baf6 100644 --- a/app/src/main/res/menu/menu_playlists_selection.xml +++ b/app/src/main/res/menu/menu_playlists_selection.xml @@ -4,37 +4,37 @@ diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_playlists_songs_selection.xml index 20e6c873..b89710bf 100644 --- a/app/src/main/res/menu/menu_playlists_songs_selection.xml +++ b/app/src/main/res/menu/menu_playlists_songs_selection.xml @@ -4,25 +4,25 @@ diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml index 2c415de9..683dbb51 100644 --- a/app/src/main/res/menu/menu_search.xml +++ b/app/src/main/res/menu/menu_search.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_smart_playlist_detail.xml b/app/src/main/res/menu/menu_smart_playlist_detail.xml index 896e26be..8aeb1315 100644 --- a/app/src/main/res/menu/menu_smart_playlist_detail.xml +++ b/app/src/main/res/menu/menu_smart_playlist_detail.xml @@ -3,7 +3,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3dba19e6..e85ac13d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -25,7 +25,7 @@