From 80554796d354d5592d32b951382eff770248c74e Mon Sep 17 00:00:00 2001 From: Antoine POPINEAU Date: Mon, 1 Jun 2020 17:05:13 +0200 Subject: [PATCH] Resize native radios icons to be more legible. --- .../apognu/otter/adapters/RadiosAdapter.kt | 27 +++++++++++-------- app/src/main/res/layout/row_radio.xml | 10 +++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt b/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt index a596ec2..cc094cf 100644 --- a/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt +++ b/app/src/main/java/com/github/apognu/otter/adapters/RadiosAdapter.kt @@ -30,26 +30,31 @@ class RadiosAdapter(val context: Context?, private val listener: OnRadioClickLis override fun onBindViewHolder(holder: RadiosAdapter.ViewHolder, position: Int) { val radio = data[position] + holder.art.visibility = View.VISIBLE + holder.nativeArt.visibility = View.GONE holder.name.text = radio.name holder.description.text = radio.description context?.let { context -> - when (radio.radio_type) { - "random" -> { - holder.art.setImageDrawable(context.getDrawable(R.drawable.shuffle)) - holder.art.alpha = 0.7f - holder.art.setColorFilter(context.getColor(R.color.controlForeground)) - } - "less-listened" -> { - holder.art.setImageDrawable(context.getDrawable(R.drawable.sad)) - holder.art.alpha = 0.7f - holder.art.setColorFilter(context.getColor(R.color.controlForeground)) - } + val icon = when (radio.radio_type) { + "random" -> R.drawable.shuffle + "less-listened" -> R.drawable.sad + else -> null + } + + icon?.let { + holder.art.visibility = View.GONE + holder.nativeArt.visibility = View.VISIBLE + + holder.nativeArt.setImageDrawable(context.getDrawable(icon)) + holder.nativeArt.alpha = 0.7f + holder.nativeArt.setColorFilter(context.getColor(R.color.controlForeground)) } } } inner class ViewHolder(view: View, private val listener: OnRadioClickListener) : RecyclerView.ViewHolder(view), View.OnClickListener { + val nativeArt = view.native_art val art = view.art val name = view.name val description = view.description diff --git a/app/src/main/res/layout/row_radio.xml b/app/src/main/res/layout/row_radio.xml index ce1d259..7ddf271 100644 --- a/app/src/main/res/layout/row_radio.xml +++ b/app/src/main/res/layout/row_radio.xml @@ -13,6 +13,16 @@ android:transitionGroup="true" tools:showIn="@layout/fragment_radios"> + +