From 0cdb12711d41eabd8b8ed775eff91a67de53e718 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Wed, 27 May 2020 20:14:49 +0200 Subject: [PATCH] do not show opening hours if they are not available --- .../java/net/vonforst/evmap/adapter/DataBindingAdapters.kt | 2 +- .../vonforst/evmap/api/goingelectric/GoingElectricModel.kt | 6 ++++-- 2 files changed, 5 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 00c3db06..693dcbad 100644 --- a/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt @@ -114,7 +114,7 @@ fun buildDetails(loc: ChargeLocation?, ctx: Context): List loc.network ) else null, // TODO: separate layout for opening hours with expandable details - if (loc.openinghours != null) DetailAdapter.Detail( + if (loc.openinghours != null && !loc.openinghours.isEmpty) DetailAdapter.Detail( R.drawable.ic_hours, R.string.hours, loc.openinghours.getStatusText(ctx), diff --git a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt index 8dee7bb1..73fb52d3 100644 --- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt +++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt @@ -107,6 +107,10 @@ data class OpeningHours( @JsonObjectOrFalse val description: String?, @Embedded val days: OpeningHoursDays? ) { + val isEmpty: Boolean + get() = description == "Leider noch keine Informationen zu Öffnungszeiten vorhanden." + && days == null && !twentyfourSeven + fun getStatusText(ctx: Context): CharSequence { if (twentyfourSeven) { return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0) @@ -134,8 +138,6 @@ data class OpeningHours( ), 0 ) } - } else if (description != null) { - return description } else { return "" }