From 7e182ed6625783b9fe060425d929d1ff19dda1fd Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Mon, 7 Feb 2022 17:35:26 +0300 Subject: [PATCH 1/3] Remove redundant highlight on add poll option button. --- changelog.d/5178.bugfix | 1 + .../java/im/vector/app/core/ui/list/GenericButtonItem.kt | 8 ++++++++ .../app/features/poll/create/CreatePollController.kt | 1 + 3 files changed, 10 insertions(+) create mode 100644 changelog.d/5178.bugfix diff --git a/changelog.d/5178.bugfix b/changelog.d/5178.bugfix new file mode 100644 index 0000000000..73021a0485 --- /dev/null +++ b/changelog.d/5178.bugfix @@ -0,0 +1 @@ +Remove redundant highlight on add poll option button \ No newline at end of file diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt index fe59c82ce9..bea65ecd64 100644 --- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt @@ -15,10 +15,12 @@ */ package im.vector.app.core.ui.list +import android.content.res.ColorStateList import android.graphics.Typeface import android.view.Gravity import androidx.annotation.ColorInt import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.google.android.material.button.MaterialButton @@ -55,6 +57,9 @@ abstract class GenericButtonItem : VectorEpoxyModel() @EpoxyAttribute var bold: Boolean = false + @EpoxyAttribute + var highlight: Boolean = true + override fun bind(holder: Holder) { super.bind(holder) holder.button.text = text @@ -70,6 +75,9 @@ abstract class GenericButtonItem : VectorEpoxyModel() val textStyle = if (bold) Typeface.BOLD else Typeface.NORMAL holder.button.setTypeface(null, textStyle) + holder.button.rippleColor = if (highlight) ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.colorSecondary)) else + ContextCompat.getColorStateList(holder.view.context, android.R.color.transparent) + holder.button.onClick(buttonClickAction) } diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt index d938b98eed..6ccf7fc6aa 100644 --- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt +++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt @@ -121,6 +121,7 @@ class CreatePollController @Inject constructor( textColor(host.colorProvider.getColor(R.color.palette_element_green)) gravity(Gravity.START) bold(true) + highlight(false) buttonClickAction { host.callback?.onAddOption() } From 457a6a2dd0bd4b0672f8223e72d2b3e053bcea7e Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Mon, 7 Feb 2022 17:44:27 +0300 Subject: [PATCH 2/3] Lint fix. --- .../java/im/vector/app/core/ui/list/GenericButtonItem.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt index bea65ecd64..215f999755 100644 --- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt @@ -75,8 +75,11 @@ abstract class GenericButtonItem : VectorEpoxyModel() val textStyle = if (bold) Typeface.BOLD else Typeface.NORMAL holder.button.setTypeface(null, textStyle) - holder.button.rippleColor = if (highlight) ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.colorSecondary)) else + holder.button.rippleColor = if (highlight) { + ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.colorSecondary)) + } else { ContextCompat.getColorStateList(holder.view.context, android.R.color.transparent) + } holder.button.onClick(buttonClickAction) } From f6a24e964e1b7c8c3f959b5e00e2cab4a37eff0e Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Tue, 8 Feb 2022 23:23:03 +0300 Subject: [PATCH 3/3] Code review fix. --- .../java/im/vector/app/core/ui/list/GenericButtonItem.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt index 215f999755..d4838289a6 100644 --- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt @@ -15,7 +15,6 @@ */ package im.vector.app.core.ui.list -import android.content.res.ColorStateList import android.graphics.Typeface import android.view.Gravity import androidx.annotation.ColorInt @@ -76,9 +75,9 @@ abstract class GenericButtonItem : VectorEpoxyModel() holder.button.setTypeface(null, textStyle) holder.button.rippleColor = if (highlight) { - ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.colorSecondary)) + ContextCompat.getColorStateList(holder.view.context, R.color.mtrl_btn_text_btn_ripple_color) } else { - ContextCompat.getColorStateList(holder.view.context, android.R.color.transparent) + null } holder.button.onClick(buttonClickAction)