From facbee99a53d5582a656c4d73ba7dd0f237381ec Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Mon, 15 Jul 2024 10:46:46 +1000 Subject: [PATCH] Fixing new color access for action items --- .../org/thoughtcrime/securesms/components/menu/ActionItem.kt | 4 ++-- .../thoughtcrime/securesms/components/menu/ContextMenuList.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt index 700534fad1..af32b7f50f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.menu import android.content.Context import androidx.annotation.AttrRes -import androidx.annotation.ColorRes +import androidx.annotation.ColorInt /** * Represents an action to be rendered @@ -13,5 +13,5 @@ data class ActionItem( val action: Runnable, val contentDescription: Int? = null, val subtitle: ((Context) -> CharSequence?)? = null, - @ColorRes val color: Int? = null, + @ColorInt val color: Int? = null, ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt index 69dec0cdd6..7b92e505c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt @@ -78,7 +78,7 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) { override fun bind(model: DisplayItem) { val item = model.item - val color = item.color?.let { ContextCompat.getColor(context, it) } + val color = item.color if (item.iconRes > 0) { val typedValue = TypedValue()