From 826b4f89f14db109be60ed4b034acf9944d29be1 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sat, 6 Nov 2021 22:51:16 +0100 Subject: [PATCH] fix crash in light mode introduced in 5d7d8817295d38304941b0891209df2e1dfc7f95 --- .../main/java/net/vonforst/evmap/ui/BindingAdapters.kt | 9 +++++++++ app/src/main/res/layout/item_chargeprice.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt index 73c1d5e7..653adc47 100644 --- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt @@ -401,4 +401,13 @@ fun loadImage(view: ImageView, url: String?) { @BindingAdapter("tooltipTextCompat") fun setTooltipTextCompat(view: View, text: String) { TooltipCompat.setTooltipText(view, text) +} + +@BindingAdapter("tintNullable") +fun setImageTint(view: ImageView, @ColorInt tint: Int?) { + if (tint != null) { + view.imageTintList = ColorStateList.valueOf(tint) + } else { + view.imageTintList = null + } } \ No newline at end of file diff --git a/app/src/main/res/layout/item_chargeprice.xml b/app/src/main/res/layout/item_chargeprice.xml index f13e785b..50e53f90 100644 --- a/app/src/main/res/layout/item_chargeprice.xml +++ b/app/src/main/res/layout/item_chargeprice.xml @@ -167,7 +167,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/guideline5" app:layout_constraintTop_toTopOf="parent" - app:tint="@{BindingAdaptersKt.isDarkMode(context) ? @android:color/white : null}" + app:tintNullable="@{BindingAdaptersKt.isDarkMode(context) ? @android:color/white : null}" tools:srcCompat="@tools:sample/avatars" />