Release: 2.6.0-rc0

Add preliminary support for Beats Fit Pro (#75 )
Overhaul play/pause reaction code (#74 )
2026-09-14 18:26:11 -04:00 · 2023-01-14 16:44:16 +01:00 · 2023-01-14 16:35:04 +01:00 · 2023-01-14 16:21:57 +01:00 · 2023-01-12 12:51:46 +01:00 · 2023-01-12 12:51:03 +01:00
73 changed files with 869 additions and 156 deletions
@@ -34,15 +34,20 @@ Currently supported models:
 * Beats Studio 3
 * Beats X
 * Beats Flex
+* Fake AirPods 1. Generation 🎭
+* Fake AirPods 2. Generation 🎭
+* Fake AirPods 3. Generation 🎭
+* Fake AirPods Pro1 🎭
+* Fake AirPods Pro2 🎭

 ## Download

-| Source                | Status |
-|-----------------------|--------|
-| [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) | [![](https://img.shields.io/endpoint?color=green&logo=google-play&logoColor=green&url=https%3A%2F%2Fplayshields.herokuapp.com%2Fplay%3Fi%3Deu.darken.capod%26l%3DAndroid%26m%3D%24version)](https://play.google.com/store/apps/details?id=eu.darken.capod) |
-| [Google Play Beta](https://play.google.com/apps/testing/eu.darken.capod) | ? |
-| [Github Releases](https://github.com/d4rken-org/capod/releases) | [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases&label=GitHub)](https://github.com/d4rken-org/capod/releases/latest) |
-| [F-Droid (IzzyOnDroid)](https://apt.izzysoft.de/packages/eu.darken.capod/) | [![](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/eu.darken.capod)](https://apt.izzysoft.de/packages/eu.darken.capod/) |
+| Source                                                                       | Status                                                                                                                                                                                                                                                     |
+|------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) | [![](https://img.shields.io/endpoint?color=green&logo=google-play&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Deu.darken.capod%26l%3DGoogle%2520Play%26m%3D%24version)](https://play.google.com/store/apps/details?id=eu.darken.capod) |
+| [Google Play Beta](https://play.google.com/apps/testing/eu.darken.capod)     | [![](https://img.shields.io/badge/Google%20Play-Beta-yellowgreen?style=flat&logo=google-play)](https://play.google.com/apps/testing/eu.darken.capod)                                                                                                                                   |                                                                                                                  |
+| [Github Releases](https://github.com/d4rken-org/capod/releases)              | [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases&label=GitHub)](https://github.com/d4rken-org/capod/releases/latest)                                                 |
+| [F-Droid (IzzyOnDroid)](https://apt.izzysoft.de/packages/eu.darken.capod/)   | [![](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/eu.darken.capod)](https://apt.izzysoft.de/packages/eu.darken.capod/)                                                                                                 |


 ## Support the project
@@ -1 +1 @@
-2.4.0-rc0 20400000
+2.6.0-rc0 20600000
@@ -1,5 +1,8 @@
 package eu.darken.capod.pods.core

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface DualPodDevice : PodDevice {

    enum class Pod {
@@ -10,4 +13,12 @@ interface DualPodDevice : PodDevice {
    val batteryLeftPodPercent: Float?

    val batteryRightPodPercent: Float?
+
+    @get:DrawableRes
+    val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_left
+
+    @get:DrawableRes
+    val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_right
 }
@@ -1,9 +1,15 @@
 package eu.darken.capod.pods.core

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface HasCase {

    val batteryCasePercent: Float?

    val isCaseCharging: Boolean

+    @get:DrawableRes
+    val caseIcon: Int
+        get() = R.drawable.devic_airpods_gen1_case
 }
@@ -60,31 +60,31 @@ interface PodDevice {
    @JsonClass(generateAdapter = false)
    enum class Model(
        val label: String,
-        @DrawableRes val iconRes: Int = R.drawable.ic_device_generic_earbuds,
+        @DrawableRes val iconRes: Int = R.drawable.devic_earbuds_generic_both,
    ) {
        @Json(name = "airpods.gen1") AIRPODS_GEN1(
            label = "AirPods (Gen 1)",
-            iconRes = R.drawable.ic_device_airpods_gen1,
+            iconRes = R.drawable.devic_airpods_gen1_both,
        ),
        @Json(name = "airpods.gen2") AIRPODS_GEN2(
            "AirPods (Gen 2)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
        ),
        @Json(name = "airpods.gen3") AIRPODS_GEN3(
            "AirPods (Gen 3)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
        ),
        @Json(name = "airpods.pro") AIRPODS_PRO(
            "AirPods Pro",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
        ),
        @Json(name = "airpods.pro2") AIRPODS_PRO2(
            "AirPods Pro 2",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
        ),
        @Json(name = "airpods.max") AIRPODS_MAX(
            "AirPods Max",
-            R.drawable.ic_device_generic_headphones
+            R.drawable.devic_headphones_generic
        ),
        @Json(name = "beats.flex") BEATS_FLEX(
            "Beats Flex"
@@ -104,14 +104,28 @@ interface PodDevice {
        @Json(name = "beats.powerbeats.pro") POWERBEATS_PRO(
            "Power Beats Pro"
        ),
-        @Json(name = "fakes.tws.i99999") FAKE_AIRPODS_GEN1(
-            "AirPods (Gen 1)? \uD83C\uDFAD"
+        @Json(name = "beats.fit.pro") BEATS_FIT_PRO(
+            "Beats Fit Pro"
        ),
-        @Json(name = "fakes.varunr.airpodspro") FAKE_AIRPODS_PRO(
-            "AirPods Pro? \uD83C\uDFAD"
+        @Json(name = "fakes.tws.i99999") FAKE_AIRPODS_GEN1(
+            "AirPods (Gen 1)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen1_both,
+        ),
+        @Json(name = "fakes.generic.airpods.gen2") FAKE_AIRPODS_GEN2(
+            "AirPods (Gen 2)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen2_both,
        ),
        @Json(name = "fakes.generic.airpods.gen3") FAKE_AIRPODS_GEN3(
-            "AirPods (Gen 3)? \uD83C\uDFAD"
+            "AirPods (Gen 3)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen2_both,
+        ),
+        @Json(name = "fakes.varunr.airpodspro") FAKE_AIRPODS_PRO(
+            "AirPods Pro? \uD83C\uDFAD",
+            R.drawable.devic_airpods_pro2_both,
+        ),
+        @Json(name = "fakes.generic.airpods.pro2") FAKE_AIRPODS_PRO2(
+            "AirPods Pro2? \uD83C\uDFAD",
+            R.drawable.devic_airpods_pro2_both,
        ),
        @Json(name = "unknown") UNKNOWN(
            "Unknown"
@@ -7,9 +7,7 @@ import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.IntoSet
 import eu.darken.capod.pods.core.apple.airpods.*
 import eu.darken.capod.pods.core.apple.beats.*
-import eu.darken.capod.pods.core.apple.misc.FakeAirPodsGen1
-import eu.darken.capod.pods.core.apple.misc.FakeAirPodsGen3
-import eu.darken.capod.pods.core.apple.misc.FakeAirPodsPro
+import eu.darken.capod.pods.core.apple.misc.*

@InstallIn(SingletonComponent::class)
@Module
@@ -29,8 +27,11 @@ abstract class AppleFactoryModule {
    @Binds @IntoSet abstract fun beatsX(factory: BeatsX.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun powerBeats3(factory: PowerBeats3.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun powerBeatsPro(factory: PowerBeatsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun beatsFitPro(factory: BeatsFitPro.Factory): ApplePodsFactory<out ApplePods>

    @Binds @IntoSet abstract fun fakeAirPodsGen1(factory: FakeAirPodsGen1.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet abstract fun fakeAirPodsPro(factory: FakeAirPodsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsGen2(factory: FakeAirPodsGen2.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun fakeAirPodsGen3(factory: FakeAirPodsGen3.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsPro(factory: FakeAirPodsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsPro2(factory: FakeAirPodsPro2.Factory): ApplePodsFactory<out ApplePods>
 }
@@ -1,5 +1,7 @@
 package eu.darken.capod.pods.core.apple.airpods

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
@@ -26,6 +28,22 @@ data class AirPodsPro(

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO

+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

@@ -1,5 +1,7 @@
 package eu.darken.capod.pods.core.apple.airpods

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
@@ -26,6 +28,22 @@ data class AirPodsPro2(

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO2

+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

@@ -0,0 +1,70 @@
+package eu.darken.capod.pods.core.apple.beats
+
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+data class BeatsFitPro(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+    private val cachedCaseState: DualAirPods.LidState? = null
+) : DualAirPods {
+
+    override val model: PodDevice.Model = PodDevice.Model.BEATS_FIT_PRO
+
+    override val batteryCasePercent: Float?
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
+
+    override val caseLidState: DualAirPods.LidState
+        get() = cachedCaseState ?: super.caseLidState
+
+    override val rssi: Int
+        get() = rssiAverage ?: super.rssi
+
+    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = BeatsFitPro(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                confidence = result.confidence,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.averageRssi(basic.rssi),
+                cachedCaseState = result.getLatestCaseLidState(basic)
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x1220.toUShort()
+        private val TAG = logTag("PodDevice", "Beats", "Fit", "Pro")
+    }
+}
@@ -6,10 +6,7 @@ import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.DualPodDevice
-import eu.darken.capod.pods.core.HasCase
-import eu.darken.capod.pods.core.HasDualMicrophone
-import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -31,7 +28,7 @@ data class FakeAirPodsGen1 constructor(
    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasDualMicrophone, HasCase {
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {

    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN1

@@ -79,22 +76,32 @@ data class FakeAirPodsGen1 constructor(
            }
        }

-    val isThisPodInThecase: Boolean
+    private val isThisPodInThecase: Boolean
        get() = rawStatus.isBitSet(6)

-    /**
-     * The data flip bit is set if the left pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }

-    /**
-     * The data flip bit is UNset if the right pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }

    override val batteryCasePercent: Float?
        get() = when (val value = rawCaseBattery.toInt()) {
@@ -0,0 +1,150 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.isBitSet
+import eu.darken.capod.common.lowerNibble
+import eu.darken.capod.common.upperNibble
+import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.ApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+/**
+ * Similar data structure but a lot of placeholder values or hardcoded values
+ */
+data class FakeAirPodsGen2 constructor(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
+
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN2
+
+    override val rssi: Int
+        get() = rssiAverage ?: super<ApplePods>.rssi
+
+    /**
+     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
+     * If the right pod is the primary, the values are flipped.
+     */
+    val areValuesFlipped: Boolean
+        get() = !rawStatus.isBitSet(5)
+
+    override val batteryLeftPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.upperNibble.toInt()
+                false -> rawPodsBattery.lowerNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Left pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    (value / 10f)
+                }
+            }
+        }
+
+    override val batteryRightPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.lowerNibble.toInt()
+                false -> rawPodsBattery.upperNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Right pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    value / 10f
+                }
+            }
+        }
+
+    private val isThisPodInThecase: Boolean
+        get() = rawStatus.isBitSet(6)
+
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }
+
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    override val batteryCasePercent: Float?
+        get() = when (val value = rawCaseBattery.toInt()) {
+            15 -> cachedBatteryPercentage
+            else -> if (value > 10) {
+                log { "Case: Above 100% battery: $value" }
+                1.0f
+            } else {
+                value / 10f
+            }
+        }
+
+    override val isCaseCharging: Boolean
+        get() = rawFlags.isBitSet(2)
+
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen2>(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
+            getModelInfo().full == DEVICE_CODE && length == 19
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = FakeAirPodsGen2(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                confidence = result.confidence,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.averageRssi(basic.rssi),
+            )
+        }
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x0F20.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen2")
+    }
+}
@@ -28,7 +28,7 @@ data class FakeAirPodsGen3 constructor(
    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasDualMicrophone, HasCase, HasChargeDetectionDual {
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {

    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN3

@@ -88,22 +88,20 @@ data class FakeAirPodsGen3 constructor(
            true -> rawFlags.isBitSet(0)
        }

-    val isThisPodInThecase: Boolean
+    private val isThisPodInThecase: Boolean
        get() = rawStatus.isBitSet(6)

-    /**
-     * The data flip bit is set if the left pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }

-    /**
-     * The data flip bit is UNset if the right pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }

    override val batteryCasePercent: Float?
        get() = when (val value = rawCaseBattery.toInt()) {
@@ -1,15 +1,14 @@
 package eu.darken.capod.pods.core.apple.misc

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.DualPodDevice
-import eu.darken.capod.pods.core.HasCase
-import eu.darken.capod.pods.core.HasDualMicrophone
-import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -31,10 +30,26 @@ data class FakeAirPodsPro constructor(
    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasDualMicrophone, HasCase {
+) : ApplePods, DualPodDevice, HasChargeDetectionDual, HasEarDetectionDual, HasCase {

    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO

+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
    override val rssi: Int
        get() = rssiAverage ?: super<ApplePods>.rssi

@@ -79,22 +94,32 @@ data class FakeAirPodsPro constructor(
            }
        }

-    val isThisPodInThecase: Boolean
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    private val isThisPodInThecase: Boolean
        get() = rawStatus.isBitSet(6)

-    /**
-     * The data flip bit is set if the left pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }

-    /**
-     * The data flip bit is UNset if the right pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }

    override val batteryCasePercent: Float?
        get() = when (val value = rawCaseBattery.toInt()) {
@@ -0,0 +1,168 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.isBitSet
+import eu.darken.capod.common.lowerNibble
+import eu.darken.capod.common.upperNibble
+import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.ApplePodsFactory
+import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+/**
+ * AirPods Pro2 clone
+ * https://discord.com/channels/548521543039189022/927235844127993866/1060911213539774504
+ */
+data class FakeAirPodsPro2 constructor(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+    private val cachedCaseState: DualAirPods.LidState? = null,
+) : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase {
+
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO2
+
+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
+    override val rssi: Int
+        get() = rssiAverage ?: scanResult.rssi
+
+    private val areValuesFlipped: Boolean
+        get() = !rawStatus.isBitSet(5)
+
+    override val batteryLeftPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.upperNibble.toInt()
+                false -> rawPodsBattery.lowerNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Left pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    (value / 10f)
+                }
+            }
+        }
+
+    override val batteryRightPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.lowerNibble.toInt()
+                false -> rawPodsBattery.upperNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Right pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    value / 10f
+                }
+            }
+        }
+
+    private val isThisPodInThecase: Boolean
+        get() = rawStatus.isBitSet(6)
+
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }
+
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    override val batteryCasePercent: Float?
+        get() = when (val value = rawCaseBattery.toInt()) {
+            15 -> cachedBatteryPercentage
+            else -> if (value > 10) {
+                log { "Case: Above 100% battery: $value" }
+                1.0f
+            } else {
+                value / 10f
+            }
+        }
+
+    override val isCaseCharging: Boolean
+        get() = rawFlags.isBitSet(2)
+
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsPro2>(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
+            getModelInfo().full == DEVICE_CODE && length == 19
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = FakeAirPodsPro2(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                confidence = result.confidence,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.averageRssi(basic.rssi),
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x1420.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Pro2")
+    }
+}
@@ -3,6 +3,7 @@ package eu.darken.capod.reaction.core.playpause
 import eu.darken.capod.common.MediaControl
 import eu.darken.capod.common.bluetooth.BluetoothManager2
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.setupCommonEventHandlers
@@ -40,46 +41,51 @@ class PlayPause @Inject constructor(
        }
        .distinctUntilChanged()
        .withPrevious()
+        .filter { (previous, current) ->
+            if (previous == null || current == null) return@filter false
+            log(TAG, VERBOSE) { "previous-id=${previous.identifier}, current-id=${current.identifier}" }
+            val match = previous.identifier == current.identifier
+            if (!match) log(TAG, WARN) { "Main device switched, skipping reaction." }
+            match
+        }
        .onEach { (previous, current) ->
-            if (previous is HasEarDetection && current is HasEarDetection) {
-                log(TAG, VERBOSE) { "previous=${previous.isBeingWorn}, current=${current.isBeingWorn}" }
-                log(TAG, VERBOSE) { "previous-id=${previous.identifier}, current-id=${current.identifier}" }
-                if (previous.identifier != current.identifier) {
-                    return@onEach
-                }
+            log(TAG, VERBOSE) { "Checking\nprevious=$previous\ncurrent=$current" }

-                if (previous is HasEarDetectionDual && current is HasEarDetectionDual && reactionSettings.onePodMode.value) {
-                    log(TAG) { "Ear status changed for dual pod device in single pod mode." }
-                    val previousWorn = previous.isEitherPodInEar
-                    val currentWorn = current.isEitherPodInEar
-                    if (!previousWorn && currentWorn && !mediaControl.isPlaying) {
-                        if (reactionSettings.autoPlay.value) {
-                            mediaControl.sendPlay()
-                        } else {
-                            log(TAG) { "autoPlay is disabled" }
-                        }
-                    } else if (!currentWorn && previousWorn && mediaControl.isPlaying) {
-                        if (reactionSettings.autoPause.value) {
-                            mediaControl.sendPause()
-                        } else {
-                            log(TAG) { "autoPause is disabled" }
-                        }
-                    }
-                } else if (previous.isBeingWorn != current.isBeingWorn) {
-                    log(TAG) { "Ear status changed for monitored device." }
-                    if (current.isBeingWorn && !mediaControl.isPlaying) {
-                        if (reactionSettings.autoPlay.value) {
-                            mediaControl.sendPlay()
-                        } else {
-                            log(TAG) { "autoPlay is disabled" }
-                        }
-                    } else if (!current.isBeingWorn && mediaControl.isPlaying) {
-                        if (reactionSettings.autoPause.value) {
-                            mediaControl.sendPause()
-                        } else {
-                            log(TAG) { "autoPause is disabled" }
-                        }
-                    }
+            val previousWorn: Boolean?
+            val currentWorn: Boolean?
+
+            when {
+                reactionSettings.onePodMode.value && previous is HasEarDetectionDual && current is HasEarDetectionDual -> {
+                    previousWorn = previous.isEitherPodInEar
+                    currentWorn = current.isEitherPodInEar
+                    log(TAG, VERBOSE) { "previous: left=${previous.isLeftPodInEar}, right=${previous.isRightPodInEar}" }
+                    log(TAG, VERBOSE) { "current: left${current.isLeftPodInEar}, right=${current.isRightPodInEar}" }
+                }
+                previous is HasEarDetection && current is HasEarDetection -> {
+                    previousWorn = previous.isBeingWorn
+                    currentWorn = current.isBeingWorn
+                    log(TAG, VERBOSE) { "prev.isBeingWorn=${previousWorn}, cur.isBeingWorn=${currentWorn}" }
+                }
+                else -> {
+                    log(TAG, VERBOSE) { "Current devices don't support ear detection." }
+                    previousWorn = null
+                    currentWorn = null
+                }
+            }
+
+            if (previousWorn == false && currentWorn == true && !mediaControl.isPlaying) {
+                if (reactionSettings.autoPlay.value) {
+                    log(TAG) { "autoPlay is triggered, sendPlay()" }
+                    mediaControl.sendPlay()
+                } else {
+                    log(TAG, VERBOSE) { "autoPlay is disabled" }
+                }
+            } else if (previousWorn == true && currentWorn == false && mediaControl.isPlaying) {
+                if (reactionSettings.autoPause.value) {
+                    log(TAG) { "autoPause is triggered, sendPause()" }
+                    mediaControl.sendPause()
+                } else {
+                    log(TAG) { "autoPause is disabled" }
                }
            }
        }
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m6,11c-1.9954,0 -3,-2.0093 -3,-4s1.0046,-4 3,-4c3.1837,0 5,3.4637 5,6.4886v10.0114c0,0.8284 -0.6716,1.5 -1.5,1.5 -0.8284,0 -1.5,-0.6716 -1.5,-1.5v-8.0113c0,-0.381 -0.1426,-0.7378 -0.3906,-1.0098 -0.4267,0.3435 -0.9676,0.5211 -1.6094,0.5211zM9,11.4887v8.0113c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-10.0114c0,-2.5454 -1.5434,-5.4886 -4,-5.4886 -1.2546,0 -2,1.4907 -2,3s0.7454,3 2,3c0.7809,0 1.2592,-0.3588 1.5257,-1.1581 0.2094,-0.6282 1.1516,-0.3212 0.9508,0.3097l-0.1878,0.5902c0.4499,0.4603 0.7114,1.0823 0.7114,1.7468zM6,8c-0.5523,0 -1,-0.4477 -1,-1s0.4477,-1 1,-1 1,0.4477 1,1 -0.4477,1 -1,1zM16,11.4887v8.0113c0,0.8284 -0.6716,1.5 -1.5,1.5s-1.5,-0.6716 -1.5,-1.5v-10.0114c0,-3.0249 1.8163,-6.4886 5,-6.4886 1.9954,0 3,2.0093 3,4s-1.0046,4 -3,4c-0.6418,0 -1.1826,-0.1777 -1.6094,-0.5211 -0.248,0.2721 -0.3906,0.6288 -0.3906,1.0098zM15.5235,9.1516c-0.2008,-0.631 0.7414,-0.9379 0.9508,-0.3097 0.2665,0.7994 0.7448,1.1581 1.5257,1.1581 1.2546,0 2,-1.4907 2,-3s-0.7454,-3 -2,-3c-2.4566,0 -4,2.9433 -4,5.4886v10.0114c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-8.0113c0,-0.6645 0.2615,-1.2865 0.7114,-1.7468zM18,8c-0.5523,0 -1,-0.4477 -1,-1s0.4477,-1 1,-1 1,0.4477 1,1 -0.4477,1 -1,1z" />
-</vector>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="app_name_pro">CAPod Pro</string>
    <string name="general_value_not_available_label">Δε διατίθεται</string>
    <string name="general_error_label">Σφάλμα</string>
    <string name="general_grant_permission_action">Παραχώρηση άδειας</string>
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="app_name">CAPod</string>
+    <string name="app_name_pro">CAPod Pro</string>
    <string name="general_error_label">Erro</string>
    <string name="general_grant_permission_action">Conceder permissão</string>
    <string name="overview_nomaindevice_label">Nenhum dispositivo principal</string>
@@ -10,6 +12,7 @@
    <string name="permission_bluetooth_connect_description">Este aplicativo requer a permissão \"Conexão Bluetooth\" para interagir com dispositivos emparelhados e iniciar conexões.</string>
    <string name="permission_bluetooth_scan_label">Escaneando bluetooth</string>
    <string name="permission_bluetooth_scan_description">A permissão \"Escaneamento de Bluetooth\" permite que este aplicativo descubra e receba dados de Bluetooth de dispositivos próximos, como seus AirPods.</string>
+    <string name="permission_bluetooth_label">Bluetooth</string>
    <string name="permission_bluetooth_description">Este aplicativo requer a permissão \"Bluetooth\" para se conectar a dispositivos bluetooth emparelhados.</string>
    <string name="permission_access_fine_location_label">Acesse a boa localização</string>
    <string name="permission_access_fine_location_description">O CAPod usa a permissão \"Boa localização\" para receber dados de Bluetooth Low Energy. Seus fones de ouvido usam a tecnologia Bluetooth Low Energy para transmitir seu status. Este aplicativo NÃO usará dados Bluetooth para determinar sua localização.</string>
@@ -0,0 +1,43 @@
+package eu.darken.capod.pods.core.apple.beats
+
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.BaseAirPodsTest
+import eu.darken.capod.pods.core.apple.HasAppleColor
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
+
+class BeatsFitProTest : BaseAirPodsTest() {
+
+    /**
+     * From https://github.com/d4rken-org/capod/issues/33#issuecomment-1256235651
+     */
+    @Test
+    fun `test basics`() = runTest {
+        create<BeatsFitPro>("07 19 01 12 20 20 FA 8F 01 11 24 9B 9B 23 52 60 5A 8C 32 1C A5 C2 81 51 82 AF C8") {
+            rawPrefix shouldBe 0x01.toUByte()
+            rawDeviceModel shouldBe 0x1220.toUShort()
+            rawStatus shouldBe 0x20.toUByte()
+            rawPodsBattery shouldBe 0xFA.toUByte()
+            rawFlags shouldBe 0x8.toUShort()
+            rawCaseBattery shouldBe 0xF.toUShort()
+            rawCaseLidState shouldBe 0x01.toUByte()
+            rawDeviceColor shouldBe 0x11.toUByte()
+            rawSuffix shouldBe 0x24.toUByte()
+
+            isLeftPodMicrophone shouldBe true
+            isRightPodMicrophone shouldBe false
+
+            batteryLeftPodPercent shouldBe 1.0f
+            batteryRightPodPercent shouldBe null
+
+            isCaseCharging shouldBe false
+            isRightPodCharging shouldBe false
+            isLeftPodCharging shouldBe false
+            batteryCasePercent shouldBe null
+            podStyle.identifier shouldBe HasAppleColor.DeviceColor.UNKNOWN.name
+
+            model shouldBe PodDevice.Model.BEATS_FIT_PRO
+        }
+    }
+}
@@ -10,9 +10,9 @@ class FakeAirPodsGen1Test : BaseAirPodsTest() {

    @Test
    fun `charging in box`() = runTest {
-        create<FakeAirPodsGen1>("07 13 01 02 20 71 AA 37 32 00 10 00 64 64 FF 00 00 00 00 00 00") {
+        create<FakeAirPodsGen2>("07 13 01 0F 20 71 AA 37 32 00 10 00 64 64 FF 00 00 00 00 00 00") {
            rawPrefix shouldBe 0x01.toUByte()
-            rawDeviceModel shouldBe 0x0220.toUShort()
+            rawDeviceModel shouldBe 0x0F20.toUShort()
            rawStatus shouldBe 0x71.toUByte()
            rawPodsBattery shouldBe 0xAA.toUByte()
            rawFlags shouldBe 0x3.toUShort()
@@ -24,11 +24,17 @@ class FakeAirPodsGen1Test : BaseAirPodsTest() {
            batteryLeftPodPercent shouldBe 1.0f
            batteryRightPodPercent shouldBe 1.0f

+            isLeftPodInEar shouldBe false
+            isRightPodInEar shouldBe false
+
+            isLeftPodCharging shouldBe true
+            isRightPodCharging shouldBe true
+
            isCaseCharging shouldBe false

            batteryCasePercent shouldBe 0.7f

-            model shouldBe PodDevice.Model.FAKE_AIRPODS_GEN1
+            model shouldBe PodDevice.Model.FAKE_AIRPODS_GEN2
        }
    }
 }
@@ -0,0 +1,40 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.BaseAirPodsTest
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
+
+class FakeAirPodsGen2Test : BaseAirPodsTest() {
+
+    @Test
+    fun `charging in box`() = runTest {
+        create<FakeAirPodsGen1>("07 13 01 02 20 71 AA 37 32 00 10 00 64 64 FF 00 00 00 00 00 00") {
+            rawPrefix shouldBe 0x01.toUByte()
+            rawDeviceModel shouldBe 0x0220.toUShort()
+            rawStatus shouldBe 0x71.toUByte()
+            rawPodsBattery shouldBe 0xAA.toUByte()
+            rawFlags shouldBe 0x3.toUShort()
+            rawCaseBattery shouldBe 0x7.toUShort()
+            rawCaseLidState shouldBe 0x32.toUByte()
+            rawDeviceColor shouldBe 0x00.toUByte()
+            rawSuffix shouldBe 0x10.toUByte()
+
+            batteryLeftPodPercent shouldBe 1.0f
+            batteryRightPodPercent shouldBe 1.0f
+
+            isLeftPodInEar shouldBe false
+            isRightPodInEar shouldBe false
+
+            isLeftPodCharging shouldBe true
+            isRightPodCharging shouldBe true
+
+            isCaseCharging shouldBe false
+
+            batteryCasePercent shouldBe 0.7f
+
+            model shouldBe PodDevice.Model.FAKE_AIRPODS_GEN1
+        }
+    }
+}
@@ -24,6 +24,9 @@ class FakeAirPodsGen3Test : BaseAirPodsTest() {
            batteryLeftPodPercent shouldBe 1f
            batteryRightPodPercent shouldBe 1f

+            isLeftPodInEar shouldBe false
+            isRightPodInEar shouldBe false
+
            isCaseCharging shouldBe false
            isLeftPodCharging shouldBe true
            isRightPodCharging shouldBe true
@@ -0,0 +1,61 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.BaseAirPodsTest
+import io.kotest.matchers.shouldBe
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
+
+class FakeAirPodsPro2Test : BaseAirPodsTest() {
+
+    @Test
+    fun `guessed data`() = runTest {
+        create<FakeAirPodsPro2>("07 13 01 14 20 75 AA 58 35 00 10 00 E4 E4 26 00 00 00 00 00 00") {
+            rawPrefix shouldBe 0x01.toUByte()
+            rawDeviceModel shouldBe 0x1420.toUShort()
+            rawStatus shouldBe 0x75.toUByte()
+            rawPodsBattery shouldBe 0xAA.toUByte()
+            rawFlags shouldBe 0x5.toUShort()
+            rawCaseBattery shouldBe 0x8.toUShort()
+            rawCaseLidState shouldBe 0x35.toUByte()
+            rawDeviceColor shouldBe 0x00.toUByte()
+            rawSuffix shouldBe 0x10.toUByte()
+
+            batteryLeftPodPercent shouldBe 1.0f
+            batteryRightPodPercent shouldBe 1.0f
+
+            isCaseCharging shouldBe true
+
+            batteryCasePercent shouldBe 0.8f
+
+            model shouldBe PodDevice.Model.FAKE_AIRPODS_PRO2
+        }
+    }
+
+    /**
+     * https://discord.com/channels/548521543039189022/927235844127993866/1063027552765087754
+     */
+    @Test
+    fun `user supplied`() = runTest {
+        create<FakeAirPodsPro2>("07 13 01 14 20 75 AA 72 39 00 00 6F E4 E4 93 30 00 30 30 30 30") {
+            rawPrefix shouldBe 0x01.toUByte()
+            rawDeviceModel shouldBe 0x1420.toUShort()
+            rawStatus shouldBe 0x75.toUByte()
+            rawPodsBattery shouldBe 0xAA.toUByte()
+            rawFlags shouldBe 0x7.toUShort()
+            rawCaseBattery shouldBe 0x2.toUShort()
+            rawCaseLidState shouldBe 0x39.toUByte()
+            rawDeviceColor shouldBe 0x00.toUByte()
+            rawSuffix shouldBe 0x0.toUByte()
+
+            batteryLeftPodPercent shouldBe 1.0f
+            batteryRightPodPercent shouldBe 1.0f
+
+            isCaseCharging shouldBe true
+
+            batteryCasePercent shouldBe 0.2f
+
+            model shouldBe PodDevice.Model.FAKE_AIRPODS_PRO2
+        }
+    }
+}
@@ -24,6 +24,12 @@ class FakeAirPodsProTest : BaseAirPodsTest() {
            batteryLeftPodPercent shouldBe 1.0f
            batteryRightPodPercent shouldBe 1.0f

+            isLeftPodCharging shouldBe true
+            isRightPodCharging shouldBe true
+
+            isLeftPodInEar shouldBe false
+            isRightPodInEar shouldBe false
+
            isCaseCharging shouldBe false

            batteryCasePercent shouldBe 0.7f
@@ -37,6 +37,8 @@ class DualPodsCardVH(parent: ViewGroup) :
            }
        }
        deviceIcon.setImageResource(device.iconRes)
+        podLeftIcon.setImageResource(device.leftPodIcon)
+        podRightIcon.setImageResource(device.rightPodIcon)

        lastSeen.text = device.lastSeenFormatted(item.now)

@@ -91,6 +93,7 @@ class DualPodsCardVH(parent: ViewGroup) :
        // Case charge state
        device.apply {
            if (this is HasCase) {
+                podCaseIcon.setImageResource(caseIcon)
                podCaseBatteryIcon.isGone = false
                podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                podCaseBatteryLabel.text = getBatteryLevelCase(context)
@@ -16,7 +16,7 @@
        app:layout_constraintStart_toStartOf="parent"
        android:layout_marginBottom="2dp"
        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_airpod_both_24" />
+        app:srcCompat="@drawable/devic_airpods_gen1_both" />

    <com.google.android.material.textview.MaterialTextView
        android:id="@+id/name"
@@ -71,7 +71,7 @@
            style="@style/PodInfoItemIcon"
            android:layout_marginHorizontal="2dp"
            android:contentDescription="@string/pods_dual_left_label"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
            app:layout_constraintEnd_toStartOf="@+id/pod_left_wear_icon"
            app:layout_constraintHorizontal_chainStyle="spread"
            app:layout_constraintStart_toStartOf="parent"
@@ -145,7 +145,7 @@
        <ImageView
            android:id="@+id/pod_case_icon"
            style="@style/PodInfoItemIcon"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
@@ -198,7 +198,7 @@
            style="@style/PodInfoItemIcon"
            android:layout_marginHorizontal="2dp"
            android:contentDescription="@string/pods_dual_right_label"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_chainStyle="spread_inside"
            app:layout_constraintStart_toEndOf="@+id/pod_right_wear_icon"
@@ -15,7 +15,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_device_generic_headphones" />
+        app:srcCompat="@drawable/devic_headphones_generic" />

    <com.google.android.material.textview.MaterialTextView
        android:id="@+id/name"
@@ -4,6 +4,10 @@
    <style name="PodInfoItemIcon" parent="TextAppearance.Material3.BodySmall">
        <item name="android:layout_height">16dp</item>
        <item name="android:layout_width">16dp</item>
+        <item name="android:tintMode">multiply</item>
+        <item name="android:tint">?android:attr/colorAccent</item>
+        <item name="tint">?android:attr/colorAccent</item>
+
    </style>

    <style name="PodInfoItemText" parent="TextAppearance.Material3.BodyMedium">
@@ -39,6 +39,8 @@ class DualPodsCardVH(parent: ViewGroup) :
            }
        }
        deviceIcon.setImageResource(device.iconRes)
+        podLeftIcon.setImageResource(device.leftPodIcon)
+        podRightIcon.setImageResource(device.rightPodIcon)

        lastSeen.text = context.getString(R.string.last_seen_x, device.lastSeenFormatted(item.now))
        firstSeen.text = context.getString(R.string.first_seen_x, device.firstSeenFormatted(item.now))
@@ -109,6 +111,7 @@ class DualPodsCardVH(parent: ViewGroup) :
        // Case charge state
        device.apply {
            if (this is HasCase) {
+                podCaseIcon.setImageResource(caseIcon)
                podCaseBatteryIcon.isGone = false
                podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                podCaseBatteryLabel.text = getBatteryLevelCase(context)
@@ -172,6 +172,7 @@ class WidgetProvider : AppWidgetProvider() {
        setTextViewText(R.id.headphones_label, podDevice.getLabel(context))

        // Left
+        setImageViewResource(R.id.pod_left_icon, podDevice.leftPodIcon)
        setTextViewText(R.id.pod_left_label, podDevice.getBatteryLevelLeftPod(context))
        setViewVisibility(
            R.id.pod_left_charging,
@@ -183,6 +184,7 @@ class WidgetProvider : AppWidgetProvider() {
        )

        // Case
+        (podDevice as? HasCase)?.let { setImageViewResource(R.id.pod_case_icon, it.caseIcon) }
        setTextViewText(R.id.pod_case_label, (podDevice as? HasCase)?.getBatteryLevelCase(context))
        setViewVisibility(
            R.id.pod_case_charging,
@@ -190,6 +192,7 @@ class WidgetProvider : AppWidgetProvider() {
        )

        // Right
+        setImageViewResource(R.id.pod_right_icon, podDevice.rightPodIcon)
        setTextViewText(R.id.pod_right_label, podDevice.getBatteryLevelRightPod(context))
        setViewVisibility(
            R.id.pod_right_charging,
@@ -216,6 +219,7 @@ class WidgetProvider : AppWidgetProvider() {
        setOnClickPendingIntent(R.id.widget_root, pendingIntent)

        setTextViewText(R.id.headphones_label, podDevice.getLabel(context))
+        setImageViewResource(R.id.headphones_icon, podDevice.iconRes)
        setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(podDevice.batteryHeadsetPercent))
        setTextViewText(R.id.headphones_battery_label, podDevice.getBatteryLevelHeadset(context))

@@ -27,15 +27,18 @@ class MonitorNotificationViewFactory @Inject constructor(
    ).apply {
        device.apply {
            // Left
+            setImageViewResource(R.id.pod_left_icon, device.leftPodIcon)
            setTextViewText(R.id.pod_left_label, getBatteryLevelLeftPod(context))
            setViewVisibility(R.id.pod_left_charging, if (isLeftPodCharging) View.VISIBLE else View.GONE)
            setViewVisibility(R.id.pod_left_ear, if (isLeftPodInEar) View.VISIBLE else View.GONE)

            // Case
+            setImageViewResource(R.id.pod_case_icon, device.caseIcon)
            setTextViewText(R.id.pod_case_label, getBatteryLevelCase(context))
            setViewVisibility(R.id.pod_case_charging, if (isCaseCharging) View.VISIBLE else View.GONE)

            // Right
+            setImageViewResource(R.id.pod_right_icon, device.rightPodIcon)
            setTextViewText(R.id.pod_right_label, getBatteryLevelRightPod(context))
            setViewVisibility(R.id.pod_right_charging, if (isRightPodCharging) View.VISIBLE else View.GONE)
            setViewVisibility(R.id.pod_right_ear, if (isRightPodInEar) View.VISIBLE else View.GONE)
@@ -48,6 +51,7 @@ class MonitorNotificationViewFactory @Inject constructor(
    ).apply {
        device.apply {
            setTextViewText(R.id.headphones_label, getLabel(context))
+            setImageViewResource(R.id.headphones_icon, device.iconRes)
            setImageViewResource(R.id.headphones_battery_icon, getBatteryDrawable(batteryHeadsetPercent))
            setTextViewText(R.id.headphones_battery_label, getBatteryLevelHeadset(context))
            if (this is HasEarDetection) {
@@ -50,7 +50,7 @@ class MonitorNotifications @Inject constructor(
            setChannelId(NOTIFICATION_CHANNEL_ID)
            setContentIntent(openPi)
            priority = NotificationCompat.PRIORITY_LOW
-            setSmallIcon(R.drawable.ic_device_generic_earbuds)
+            setSmallIcon(R.drawable.devic_earbuds_generic_both)
            setOngoing(true)
            setContentTitle(context.getString(R.string.app_name))
        }
@@ -63,7 +63,7 @@ class MonitorNotifications @Inject constructor(
                setStyle(NotificationCompat.BigTextStyle())
                setContentTitle(context.getString(R.string.pods_none_label_short))
                setSubText(context.getString(R.string.app_name))
-                setSmallIcon(R.drawable.ic_device_generic_earbuds)
+                setSmallIcon(R.drawable.devic_earbuds_generic_both)
            }
        }

@@ -41,14 +41,17 @@ class PopUpPodViewFactory @Inject constructor(
                signal.isInvisible = debugSettings.isDebugModeEnabled.value

                // Left
+                podLeftIcon.setImageResource(device.leftPodIcon)
                podLeftBatteryIcon.setImageResource(getBatteryDrawable(batteryLeftPodPercent))
                podLeftBatteryLabel.text = getBatteryLevelLeftPod(context)

                // Case
+                podCaseIcon.setImageResource(device.caseIcon)
                podCaseBatteryIcon.setImageResource(getBatteryDrawable(batteryCasePercent))
                podCaseBatteryLabel.text = getBatteryLevelCase(context)

                // Right
+                podRightIcon.setImageResource(device.rightPodIcon)
                podRightBatteryIcon.setImageResource(getBatteryDrawable(batteryRightPodPercent))
                podRightBatteryLabel.text = getBatteryLevelRightPod(context)
            }
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Notification.Container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    style="@style/Notification.Container"
    android:layout_marginHorizontal="8dp"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingVertical="8dp">

    <FrameLayout
        android:layout_width="0dp"
@@ -15,12 +16,13 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
        android:orientation="horizontal">

        <ImageView
            android:id="@+id/pod_left_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24" />
+            android:src="@drawable/devic_airpods_gen1_left" />

        <TextView
            android:id="@+id/pod_left_label"
@@ -28,16 +30,21 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
+            android:paddingHorizontal="2dp"
            tools:text="100%" />

        <ImageView
            android:id="@+id/pod_left_charging"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_power_24" />

        <ImageView
            android:id="@+id/pod_left_ear"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_hearing_24" />
    </LinearLayout>

@@ -49,12 +56,13 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
        android:orientation="horizontal">

        <ImageView
            android:id="@+id/pod_case_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24" />
+            android:src="@drawable/devic_airpods_gen1_case" />

        <TextView
            android:id="@+id/pod_case_label"
@@ -62,11 +70,14 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
+            android:paddingHorizontal="4dp"
            tools:text="100%" />

        <ImageView
            android:id="@+id/pod_case_charging"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_power_24" />
    </LinearLayout>

@@ -78,12 +89,13 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
        android:orientation="horizontal">

        <ImageView
            android:id="@+id/pod_right_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24" />
+            android:src="@drawable/devic_airpods_gen1_right" />

        <TextView
            android:id="@+id/pod_right_label"
@@ -91,16 +103,21 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
+            android:paddingHorizontal="2dp"
            tools:text="100%" />

        <ImageView
            android:id="@+id/pod_right_charging"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_power_24" />

        <ImageView
            android:id="@+id/pod_right_ear"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_hearing_24" />
    </LinearLayout>

@@ -4,6 +4,7 @@
    android:layout_width="match_parent"
    style="@style/Notification.Container"
    android:layout_height="wrap_content"
+    android:paddingVertical="8dp"
    android:gravity="center_horizontal">

    <TextView
@@ -17,6 +18,7 @@
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
        android:layout_marginHorizontal="8dp"
        android:orientation="horizontal">

@@ -37,11 +39,15 @@
        <ImageView
            android:id="@+id/headphones_charging"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_power_24" />

        <ImageView
            android:id="@+id/headphones_worn"
            style="@style/PodInfoItemIcon.Notification"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
            android:src="@drawable/ic_baseline_hearing_24" />
    </LinearLayout>

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    style="@style/Notification.Container"
    android:layout_width="match_parent"
+    android:paddingVertical="8dp"
    android:layout_height="wrap_content">

    <TextView
@@ -11,8 +13,8 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="8dp"
-        android:drawableStart="@drawable/ic_baseline_question_mark_24"
        android:gravity="center"
-        tools:text="100%" />
+        tools:text="100%"
+        app:drawableStartCompat="@drawable/ic_baseline_question_mark_24" />

 </LinearLayout>
@@ -20,10 +20,11 @@
            android:layout_width="24dp"
            android:layout_height="24dp"
            android:layout_marginStart="16dp"
+            style="@style/PodInfoItemIcon"
            app:layout_constraintBottom_toBottomOf="@id/name"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="@id/name"
-            app:srcCompat="@drawable/ic_airpod_both_24" />
+            app:srcCompat="@drawable/devic_airpods_gen1_both" />

        <com.google.android.material.textview.MaterialTextView
            android:id="@+id/name"
@@ -118,7 +119,7 @@
                android:id="@+id/pod_left_icon"
                style="@style/PodInfoItemIcon"
                android:contentDescription="@string/pods_dual_left_label"
-                android:src="@drawable/ic_airpod_left_24"
+                android:src="@drawable/devic_airpods_gen1_left"
                app:layout_constraintBottom_toBottomOf="@id/pod_left_label"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="@id/pod_left_label" />
@@ -230,7 +231,7 @@
            <ImageView
                android:id="@+id/pod_case_icon"
                style="@style/PodInfoItemIcon"
-                android:src="@drawable/ic_airpod_case_24"
+                android:src="@drawable/devic_airpods_gen1_case"
                app:layout_constraintBottom_toBottomOf="@id/pod_case_label"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="@id/pod_case_label" />
@@ -324,7 +325,7 @@
                android:id="@+id/pod_right_icon"
                style="@style/PodInfoItemIcon"
                android:contentDescription="@string/pods_dual_right_label"
-                android:src="@drawable/ic_airpod_right_24"
+                android:src="@drawable/devic_airpods_gen1_right"
                app:layout_constraintBottom_toBottomOf="@id/pod_right_label"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="@id/pod_right_label" />
@@ -19,11 +19,12 @@
            android:id="@+id/device_icon"
            android:layout_width="24dp"
            android:layout_height="24dp"
+            style="@style/PodInfoItemIcon"
            android:layout_marginStart="16dp"
            app:layout_constraintBottom_toBottomOf="@id/name"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="@id/name"
-            app:srcCompat="@drawable/ic_device_generic_headphones" />
+            app:srcCompat="@drawable/devic_headphones_generic" />

        <com.google.android.material.textview.MaterialTextView
            android:id="@+id/name"
@@ -7,9 +7,10 @@

    <ImageView
        android:id="@+id/pod_icon"
+        style="@style/PodInfoItemIcon"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:src="@drawable/ic_device_generic_earbuds"
+        android:src="@drawable/devic_earbuds_generic_both"
        app:layout_constraintBottom_toBottomOf="@id/pod_label"
        app:layout_constraintEnd_toStartOf="@id/pod_label"
        app:layout_constraintHorizontal_bias="0.0"
@@ -54,10 +55,11 @@

        <ImageView
            android:id="@+id/pod_left_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
            app:layout_constraintBottom_toBottomOf="@id/pod_left_battery_label"
            app:layout_constraintEnd_toStartOf="@id/pod_left_battery_icon"
            app:layout_constraintStart_toStartOf="parent"
@@ -65,6 +67,7 @@

        <ImageView
            android:id="@id/pod_left_battery_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_baseline_battery_unknown_24"
@@ -100,10 +103,11 @@

        <ImageView
            android:id="@+id/pod_case_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
            app:layout_constraintBottom_toBottomOf="@id/pod_case_battery_label"
            app:layout_constraintEnd_toStartOf="@id/pod_case_battery_icon"
            app:layout_constraintStart_toStartOf="parent"
@@ -111,6 +115,7 @@

        <ImageView
            android:id="@id/pod_case_battery_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_baseline_battery_unknown_24"
@@ -145,10 +150,11 @@

        <ImageView
            android:id="@+id/pod_right_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
            app:layout_constraintBottom_toBottomOf="@id/pod_right_battery_label"
            app:layout_constraintEnd_toStartOf="@id/pod_right_battery_icon"
            app:layout_constraintStart_toStartOf="parent"
@@ -156,6 +162,7 @@

        <ImageView
            android:id="@id/pod_right_battery_icon"
+            style="@style/PodInfoItemIcon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_baseline_battery_unknown_24"
@@ -8,8 +8,9 @@
    <ImageView
        android:id="@+id/headphones_icon"
        android:layout_width="wrap_content"
+        style="@style/PodInfoItemIcon"
        android:layout_height="wrap_content"
-        android:src="@drawable/ic_device_generic_earbuds"
+        android:src="@drawable/devic_earbuds_generic_both"
        app:layout_constraintBottom_toBottomOf="@id/headphones_label"
        app:layout_constraintEnd_toStartOf="@id/headphones_label"
        app:layout_constraintHorizontal_bias="0.0"
@@ -56,6 +57,7 @@
        <ImageView
            android:id="@id/headphones_battery_icon"
            android:layout_width="wrap_content"
+            style="@style/PodInfoItemIcon"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_baseline_battery_unknown_24"
            app:layout_constraintBottom_toBottomOf="@id/headphones_battery_label"
@@ -12,6 +12,7 @@
        android:layout_gravity="center"
        android:layout_marginBottom="2dp"
        android:textSize="12sp"
+        android:textStyle="bold"
        tools:text="AirPods Max" />

    <LinearLayout
@@ -23,7 +24,7 @@
        <ImageView
            android:id="@+id/pod_left_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_pro2_left"
            tools:ignore="ContentDescription" />

        <TextView
@@ -57,7 +58,7 @@
        <ImageView
            android:id="@+id/pod_right_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_pro2_right"
            tools:ignore="ContentDescription" />

        <TextView
@@ -91,7 +92,7 @@
        <ImageView
            android:id="@+id/pod_case_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
            tools:ignore="ContentDescription" />

        <TextView
@@ -8,6 +8,7 @@
        android:id="@+id/headphones_label"
        style="@style/PodWidget.TextPrimary"
        android:layout_width="wrap_content"
+        android:textStyle="bold"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        tools:text="AirPods Max" />
@@ -13,7 +13,7 @@
        <ImageView
            android:id="@+id/pod_left_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_left_24"
+            android:src="@drawable/devic_airpods_gen1_left"
            tools:ignore="ContentDescription" />

        <TextView
@@ -47,7 +47,7 @@
        <ImageView
            android:id="@+id/pod_right_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_right_24"
+            android:src="@drawable/devic_airpods_gen1_right"
            tools:ignore="ContentDescription" />

        <TextView
@@ -81,7 +81,7 @@
        <ImageView
            android:id="@+id/pod_case_icon"
            style="@style/PodInfoItemIcon.Notification"
-            android:src="@drawable/ic_airpod_case_24"
+            android:src="@drawable/devic_airpods_gen1_case"
            tools:ignore="ContentDescription" />

        <TextView
@@ -19,6 +19,7 @@
    <style name="PodInfoItemIcon.Notification" parent="TextAppearance.Compat.Notification.Title">
        <item name="android:layout_height">20dp</item>
        <item name="android:layout_width">20dp</item>
+        <item name="android:tintMode">multiply</item>
        <item name="android:tint">?android:attr/colorAccent</item>
        <item name="tint">?android:attr/colorAccent</item>
    </style>
@@ -32,6 +33,9 @@
    <style name="PodInfoItemIcon" parent="TextAppearance.MaterialComponents.Body2">
        <item name="android:layout_height">20dp</item>
        <item name="android:layout_width">20dp</item>
+        <item name="android:tintMode">multiply</item>
+        <item name="android:tint">?android:attr/colorControlNormal</item>
+        <item name="tint">?android:attr/colorControlNormal</item>
    </style>

    <style name="PodInfoItemText" parent="TextAppearance.MaterialComponents.Body2">
@@ -43,7 +43,7 @@
            android:title="@string/settings_maindevice_address_label" />

        <Preference
-            android:icon="@drawable/ic_device_generic_headphones"
+            android:icon="@drawable/devic_headphones_generic"
            android:key="core.maindevice.model"
            android:summary="@string/settings_maindevice_model_description"
            android:title="@string/settings_maindevice_model_label" />
@@ -1,6 +1,6 @@
 ### Updated by release.sh ###
 project.versioning.major=2
-project.versioning.minor=4
+project.versioning.minor=6
 project.versioning.patch=0
 project.versioning.build=0
 #############################
Author	SHA1	Message	Date
darken	aaab548bfd	Release: 2.6.0-rc0	2023-01-14 16:44:16 +01:00
Matthias Urhahn	46611b5606	Add preliminary support for Beats Fit Pro (#75 )	2023-01-14 16:35:04 +01:00
Matthias Urhahn	fdbdb46577	Overhaul play/pause reaction code (#74 )	2023-01-14 16:21:57 +01:00
darken	e7fd81d0eb	Release: 2.5.3-rc1	2023-01-12 12:51:46 +01:00
darken	ce50bae6a0	Merge branch 'main' of github.com:d4rken-org/capod into main	2023-01-12 12:51:03 +01:00
darken	8331cf3866	Release: 2.5.3-rc0	2023-01-12 12:50:53 +01:00
Matthias Urhahn	670262e53b	Update README.md	2023-01-12 12:50:44 +01:00
Matthias Urhahn	c584f942cf	Support for fake AirPods 2. Generation (#73 )	2023-01-12 12:32:44 +01:00
darken	e83b6bb583	Update readme	2023-01-12 12:11:46 +01:00
darken	cc5de668f0	Add additional test data for fake AirPods Pro2	2023-01-12 12:07:24 +01:00
darken	653c7b8c4b	Release: 2.5.2-rc0	2023-01-06 16:45:28 +01:00
darken	4e38bcd4cc	Fix left pod icon tint.	2023-01-06 16:44:30 +01:00
Matthias Urhahn	fcbeda4888	Improve feature support for fake AirPods Gen3 (#72 ) Remove microphone detection and add ear detection.	2023-01-06 16:40:03 +01:00
Matthias Urhahn	4101fddc5b	Improve feature support for fake AirPods Gen1 (#71 ) Remove microphone detection and add ear detection and pod charge detection.	2023-01-06 16:39:46 +01:00
darken	86df7bea22	Improve feature support for fake AirPods Pro Remove microphone detection and add pod charging and ear detection.	2023-01-06 16:02:38 +01:00
darken	4db8c0c286	Add support for fake AirPods Pro 2	2023-01-06 16:02:25 +01:00
darken	1d03335903	Improve dual pod widget layout, use same style as notification.	2023-01-02 18:26:33 +01:00
darken	b1b541014f	Release: 2.5.1-rc0	2022-12-24 11:57:34 +01:00
darken	b40a7e435f	Update translations	2022-12-24 11:56:46 +01:00
Matthias Urhahn	8305fb4c5f	Airpod pro2 icon iteration (#64 ) * Update airpods pro icons to SVG variant * Fix AirPodsPro2 not using the new icons * Revert "Update airpods pro icons to SVG variant" This reverts commit `d7ca13d439`. * Add padding to icons	2022-12-24 11:48:32 +01:00
darken	6c678be511	Release: 2.5.0-rc1	2022-12-23 09:54:19 +01:00
darken	2823663f09	Merge branch 'main' of github.com:d4rken-org/capod into main	2022-12-23 09:53:08 +01:00
darken	033c2264f8	Release: 2.5.0-rc0	2022-12-23 09:52:59 +01:00
darken	8eb6ce19f7	Add support for specific left/right/case icons. Add AirPods Pro 2 Icons by @christoschronopoulos	2022-12-23 09:52:17 +01:00
darken	1cfc4e6f65	Merge branch 'improve_fake_airpod_support' into main	2022-12-23 08:27:00 +01:00
darken	f3609fc3a5	Update translations	2022-12-19 17:09:55 +01:00
darken	16da51d095	Refactor fake airpods code and improve tests	2022-12-19 17:09:55 +01:00