From b32fa6600dba7659f97b11d3066081ecb030ad2b Mon Sep 17 00:00:00 2001 From: johan12345 Date: Wed, 17 Jun 2020 21:43:18 +0200 Subject: [PATCH] support HTML for fault reports --- .../net/vonforst/evmap/adapter/DataBindingAdapters.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt index bd210795..814df9aa 100644 --- a/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity +import androidx.core.text.HtmlCompat import androidx.core.view.children import androidx.databinding.DataBindingUtil import androidx.databinding.Observable @@ -138,12 +139,16 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List R.drawable.ic_fault_report, R.string.fault_report, loc.faultReport.created?.let { - ctx.getString(R.string.fault_report_date, + ctx.getString( + R.string.fault_report_date, loc.faultReport.created .atZone(ZoneId.systemDefault()) - .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))) + .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)) + ) + } ?: "", + loc.faultReport.description?.let { + HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY) } ?: "", - loc.faultReport.description ?: "", clickable = true ) else null, if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailAdapter.Detail(