Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix colors

Browse source
This commit is contained in:
Hemanth S 2020-05-11 15:57:12 +05:30
parent 336f67fd48
commit adf2d57703
8 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package code.name.monkey.retromusic.adapter.song
import android.app.ActivityOptions
import android.content.res.ColorStateList
import android.graphics.drawable.Drawable
import android.view.LayoutInflater
import android.view.MenuItem
@ -84,10 +85,13 @@ open class SongAdapter(
loadAlbumCover(song, holder)
}
private fun setColors(color: Int, holder: ViewHolder) {
private fun setColors(color: MediaNotificationProcessor, holder: ViewHolder) {
if (holder.paletteColorContainer != null) {
holder.paletteColorContainer?.setBackgroundColor(color)
holder.title?.setTextColor(color.primaryTextColor)
holder.text?.setTextColor(color.secondaryTextColor)
holder.paletteColorContainer?.setBackgroundColor(color.backgroundColor)
}
holder.mask?.backgroundTintList = ColorStateList.valueOf(color.primaryTextColor)
}
protected open fun loadAlbumCover(song: Song, holder: ViewHolder) {
@ -100,11 +104,11 @@ open class SongAdapter(
.into(object : RetroMusicColoredTarget(holder.image!!) {
override fun onLoadCleared(placeholder: Drawable?) {
super.onLoadCleared(placeholder)
setColors(defaultFooterColor, holder)
}
override fun onColorReady(colors: MediaNotificationProcessor) {
setColors(colors.backgroundColor, holder)
setColors(colors, holder)
}
})
}

2
app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
View file

@ -32,9 +32,9 @@ class ColorFragment : AbsPlayerFragment() {
get() = navigationColor
override fun onColorChanged(color: MediaNotificationProcessor) {
lastColor = color.secondaryTextColor
playbackControlsFragment.setDark(color)
navigationColor = color.backgroundColor
lastColor = color.secondaryTextColor
callbacks?.onPaletteColorChanged()
ToolbarContentTintHelper.colorizeToolbar(

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

@ -98,8 +98,8 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() {
fun setDark(colors: MediaNotificationProcessor) {
setDark(colors.secondaryTextColor)
TintHelper.setTintAuto(playPauseButton, colors.backgroundColor, false)
TintHelper.setTintAuto(playPauseButton, colors.primaryTextColor, true)
TintHelper.setTintAuto(playPauseButton, colors.backgroundColor, false)
title.setTextColor(colors.primaryTextColor)
text.setTextColor(colors.secondaryTextColor)

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

@ -29,9 +29,6 @@ abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(vi
protected val defaultFooterColor: Int
get() = ATHUtil.resolveColor(getView().context, R.attr.colorControlNormal)
protected val albumArtistFooterColor: Int
get() = ATHUtil.resolveColor(getView().context, R.attr.colorControlNormal)
abstract fun onColorReady(colors: MediaNotificationProcessor)
override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {