UI fixes for chargers with unknown power

#357
ev-map · Aug 16, 2024 · 5130b93 · 5130b93
1 parent 520d753
commit 5130b93
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
@@ -142,7 +142,7 @@ data class ChargeLocation(
 
     fun formatChargepoints(sp: StringProvider): String {
         return chargepointsMerged.joinToString(" · ") {
-            "${it.count} × ${nameForPlugType(sp, it.type)} ${it.formatPower()}"
+            "${it.count} × ${nameForPlugType(sp, it.type)}${it.formatPower()?.let { " $it" } ?: ""}"
         }
     }
 }

diff --git a/app/src/main/res/layout/dialog_connector_details_header.xml b/app/src/main/res/layout/dialog_connector_details_header.xml
@@ -79,9 +79,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
             android:layout_marginTop="4dp"
-            android:text="@{item != null ? UtilsKt.nameForPlugType(ChargepointApiKt.stringProvider(context), item.chargepoint.type) + &quot; · &quot; + item.chargepoint.formatPower() : null}"
+            android:text="@{item != null ? UtilsKt.nameForPlugType(ChargepointApiKt.stringProvider(context), item.chargepoint.type) + (item.chargepoint.hasKnownPower() ? &quot; · &quot; + item.chargepoint.formatPower() : &quot;&quot;) : null}"
             android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:goneUnless="@{item.chargepoint.hasKnownPower()}"
             app:layout_constraintBottom_toTopOf="@id/textView8"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/imageView"