From 41bafbcf463900fb08edd435bd806cfbbbeee0a0 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 12 Jun 2022 17:56:10 +0200 Subject: [PATCH] fix issues after Kotlin upgrade --- .../java/net/vonforst/evmap/auto/ChargerDetailScreen.kt | 7 +++++-- .../evmap/autocomplete/MapboxAutocompleteProvider.kt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt index 627718ef..1075283e 100644 --- a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt +++ b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt @@ -83,8 +83,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : return PaneTemplate.Builder( Pane.Builder().apply { charger?.let { charger -> - if (largeImageSupported && photo != null) { - setImage(CarIcon.Builder(IconCompat.createWithBitmap(photo)).build()) + if (largeImageSupported) { + photo?.let { + setImage(CarIcon.Builder(IconCompat.createWithBitmap(it)).build()) + } } generateRows(charger).forEach { addRow(it) } addAction( @@ -205,6 +207,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : private fun generateRows(charger: ChargeLocation): List { val rows = mutableListOf() + val photo = photo // Row 1: address + chargepoints rows.add(Row.Builder().apply { diff --git a/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt b/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt index 4b1d23b6..dbaf4573 100644 --- a/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt +++ b/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt @@ -29,7 +29,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider { location?.let { proximity(Point.fromLngLat(location.longitude, location.latitude)) } - languages(ConfigurationCompat.getLocales(context.resources.configuration)[0].language) + languages(ConfigurationCompat.getLocales(context.resources.configuration)[0]?.language) accessToken(context.getString(R.string.mapbox_key)) autocomplete(true) this.query(query)