diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/BasicSingleApplePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/BasicSingleApplePodsCardVH.kt index 4d18499f..6353f80a 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/BasicSingleApplePodsCardVH.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/BasicSingleApplePodsCardVH.kt @@ -38,11 +38,8 @@ class BasicSingleApplePodsCardVH(parent: ViewGroup) : reception.append("\n(${getString(R.string.pods_yours)})") } - headphones.apply { - val sb = StringBuilder(context.getString(R.string.pods_single_headphones_label)) - sb.append("\n").append(device.getBatteryLevelHeadset(context)) - text = sb - } + batteryLabel.text = device.getBatteryLevelHeadset(context) + batteryIcon.setImageResource(getBatteryDrawable(device.batteryHeadsetPercent)) status.apply { val sb = StringBuilder() diff --git a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SingleApplePodsCardVH.kt b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SingleApplePodsCardVH.kt index 61e8a752..e2cc2c24 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SingleApplePodsCardVH.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SingleApplePodsCardVH.kt @@ -3,6 +3,7 @@ package eu.darken.capod.main.ui.overview.cards.pods import android.graphics.Typeface import android.view.ViewGroup import androidx.core.view.isGone +import androidx.core.view.isInvisible import eu.darken.capod.R import eu.darken.capod.common.lists.binding import eu.darken.capod.databinding.OverviewPodsAppleSingleItemBinding @@ -38,16 +39,14 @@ class SingleApplePodsCardVH(parent: ViewGroup) : reception.append("\n(${getString(R.string.pods_yours)})") } - headphones.apply { - val sb = StringBuilder(context.getString(R.string.pods_single_headphones_label)) - sb.append("\n").append(device.getBatteryLevelHeadset(context)) - when { - device.isHeadsetBeingCharged -> sb.append("\n").append("Charging") - device.isHeadphonesBeingWorn -> sb.append("\n").append("In ear") - else -> {} - } - text = sb - } + batteryLabel.text = device.getBatteryLevelHeadset(context) + batteryIcon.setImageResource(getBatteryDrawable(device.batteryHeadsetPercent)) + + chargingIcon.isInvisible = device.isHeadsetBeingCharged + chargingLabel.isInvisible = device.isHeadsetBeingCharged + + wearIcon.isInvisible = device.isHeadphonesBeingWorn + wearLabel.isInvisible = device.isHeadphonesBeingWorn status.apply { val sb = StringBuilder() diff --git a/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml b/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml index 0e1d39e3..5886920c 100644 --- a/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml +++ b/app/src/main/res/layout/overview_pods_apple_single_basic_item.xml @@ -90,21 +90,40 @@ app:constraint_referenced_ids="headphones" tools:layout_editor_absoluteY="60dp" /> - + app:layout_goneMarginBottom="16dp"> + + + + + + - + app:layout_goneMarginBottom="16dp"> + + + + + + + + + + + + + + In ear Microphone Yours + Being worn No primary device All detected devices are unlikely to be yours. Power on and connect your device or adjust the settings.