diff --git a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt index bba29803..50e5b8af 100644 --- a/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt +++ b/app/src/main/java/eu/darken/capod/monitor/ui/MonitorNotifications.kt @@ -55,7 +55,7 @@ class MonitorNotifications @Inject constructor( builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID).apply { setContentIntent(openPi) priority = NotificationCompat.PRIORITY_LOW - setSmallIcon(R.drawable.devic_earbuds_generic_both) + setSmallIcon(R.drawable.device_earbuds_generic_both) setOngoing(true) setContentTitle(context.getString(R.string.app_name)) } @@ -68,7 +68,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.devic_earbuds_generic_both) + setSmallIcon(R.drawable.device_earbuds_generic_both) } } @@ -135,7 +135,7 @@ class MonitorNotifications @Inject constructor( setStyle(NotificationCompat.DecoratedCustomViewStyle()) setCustomBigContentView(notificationViewFactory.createContentView(device)) - setSmallIcon(device.iconRes) + setSmallIcon(R.drawable.device_earbuds_generic_both) setContentTitle("$batteryText ~ $stateText") setSubText(null) log(TAG, VERBOSE) { "updatingNotification(): $device" } @@ -186,7 +186,7 @@ class MonitorNotifications @Inject constructor( ) return NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID) .setContentIntent(openPi) - .setSmallIcon(R.drawable.devic_earbuds_generic_both) + .setSmallIcon(R.drawable.device_earbuds_generic_both) .setContentTitle(context.getString(R.string.app_name)) .setPriority(NotificationCompat.PRIORITY_LOW) .setOngoing(true) diff --git a/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt index 172f16db..3397ee21 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/DualPodDevice.kt @@ -16,9 +16,9 @@ interface DualPodDevice : PodDevice { @get:DrawableRes val leftPodIcon: Int - get() = R.drawable.devic_airpods_gen1_left + get() = R.drawable.device_airpods_gen1_left @get:DrawableRes val rightPodIcon: Int - get() = R.drawable.devic_airpods_gen1_right + get() = R.drawable.device_airpods_gen1_right } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt b/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt index 118fc237..88a63f54 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/HasCase.kt @@ -11,5 +11,5 @@ interface HasCase { @get:DrawableRes val caseIcon: Int - get() = R.drawable.devic_airpods_gen1_case + get() = R.drawable.device_airpods_gen1_case } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt index 58cfe7af..3caa2b8f 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/PodDevice.kt @@ -77,98 +77,107 @@ interface PodDevice { @JsonClass(generateAdapter = false) enum class Model( val label: String, - @DrawableRes val iconRes: Int = R.drawable.devic_earbuds_generic_both, + @DrawableRes val iconRes: Int = R.drawable.device_earbuds_generic_both, ) { @Json(name = "airpods.gen1") AIRPODS_GEN1( label = "AirPods (Gen 1)", - iconRes = R.drawable.devic_airpods_gen1_both, + iconRes = R.drawable.device_airpods_gen1_both, ), @Json(name = "airpods.gen2") AIRPODS_GEN2( "AirPods (Gen 2)", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen1_both, ), @Json(name = "airpods.gen3") AIRPODS_GEN3( "AirPods (Gen 3)", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen3_both, ), @Json(name = "airpods.gen4") AIRPODS_GEN4( "AirPods (Gen 4)", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen3_both, ), @Json(name = "airpods.gen4.anc") AIRPODS_GEN4_ANC( "AirPods (Gen 4 ANC)", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen4anc_both, ), @Json(name = "airpods.pro") AIRPODS_PRO( "AirPods Pro", - R.drawable.devic_airpods_pro2_both + R.drawable.device_airpods_pro2_both ), @Json(name = "airpods.pro2") AIRPODS_PRO2( "AirPods Pro 2", - R.drawable.devic_airpods_pro2_both + R.drawable.device_airpods_pro2_both ), @Json(name = "airpods.pro2.usbc") AIRPODS_PRO2_USBC( "AirPods Pro 2 USB-C", - R.drawable.devic_airpods_pro2_both + R.drawable.device_airpods_pro2_both ), @Json(name = "airpods.pro3") AIRPODS_PRO3( "AirPods Pro 3", - R.drawable.devic_airpods_pro2_both + R.drawable.device_airpods_pro2_both ), @Json(name = "airpods.max") AIRPODS_MAX( "AirPods Max", - R.drawable.devic_headphones_generic + R.drawable.device_airpods_max ), @Json(name = "airpods.max.usbc") AIRPODS_MAX_USBC( "AirPods Max USB-C", - R.drawable.devic_headphones_generic + R.drawable.device_airpods_max ), @Json(name = "beats.flex") BEATS_FLEX( - "Beats Flex" + "Beats Flex", + R.drawable.device_beats_earbuds, ), @Json(name = "beats.solo.3") BEATS_SOLO_3( - "Beats Solo 3" + "Beats Solo 3", + R.drawable.device_beats_headphones, ), @Json(name = "beats.studio.3") BEATS_STUDIO_3( - "Beats Studio 3" + "Beats Studio 3", + R.drawable.device_beats_studio3, ), @Json(name = "beats.x") BEATS_X( - "Beats X" + "Beats X", + R.drawable.device_beats_x, ), @Json(name = "beats.powerbeats.3") POWERBEATS_3( - "Power Beats 3" + "Power Beats 3", + R.drawable.device_powerbeats_3, ), @Json(name = "beats.powerbeats.4") POWERBEATS_4( - "Power Beats 4" + "Power Beats 4", + R.drawable.device_powerbeats_4, ), @Json(name = "beats.powerbeats.pro") POWERBEATS_PRO( - "Power Beats Pro" + "Power Beats Pro", + R.drawable.device_powerbeats_pro_both, ), @Json(name = "beats.powerbeats.pro2") POWERBEATS_PRO2( - "Power Beats Pro 2" + "Power Beats Pro 2", + R.drawable.device_powerbeats_pro2_both, ), @Json(name = "beats.fit.pro") BEATS_FIT_PRO( - "Beats Fit Pro" + "Beats Fit Pro", + R.drawable.device_beats_fitpro_both, ), @Json(name = "fakes.tws.i99999") FAKE_AIRPODS_GEN1( "AirPods (Gen 1)? \uD83C\uDFAD", - R.drawable.devic_airpods_gen1_both, + R.drawable.device_airpods_gen1_both, ), @Json(name = "fakes.generic.airpods.gen2") FAKE_AIRPODS_GEN2( "AirPods (Gen 2)? \uD83C\uDFAD", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen1_both, ), @Json(name = "fakes.generic.airpods.gen3") FAKE_AIRPODS_GEN3( "AirPods (Gen 3)? \uD83C\uDFAD", - R.drawable.devic_airpods_gen2_both, + R.drawable.device_airpods_gen3_both, ), @Json(name = "fakes.varunr.airpodspro") FAKE_AIRPODS_PRO( "AirPods Pro? \uD83C\uDFAD", - R.drawable.devic_airpods_pro2_both, + R.drawable.device_airpods_pro2_both, ), @Json(name = "fakes.generic.airpods.pro2") FAKE_AIRPODS_PRO2( "AirPods Pro2? \uD83C\uDFAD", - R.drawable.devic_airpods_pro2_both, + R.drawable.device_airpods_pro2_both, ), @Json(name = "unknown") UNKNOWN( "Unknown" diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt index b86e1e8e..d274e18b 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen3.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class AirPodsGen3( override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN3 + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_airpods_gen3_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_airpods_gen3_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_airpods_gen3_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt index f3bf75e5..2a599713 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class AirPodsGen4( override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN4 + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_airpods_gen3_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_airpods_gen3_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_airpods_gen3_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt index 1c84bef0..59c3b1e8 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsGen4Anc.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.airpods +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class AirPodsGen4Anc( override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN4_ANC + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_airpods_gen4anc_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_airpods_gen4anc_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_airpods_gen4anc_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt index 964c512c..0728b9dc 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro.kt @@ -34,19 +34,19 @@ data class AirPodsPro( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt index 947d3eab..fe4e6ef0 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2.kt @@ -34,19 +34,19 @@ data class AirPodsPro2( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt index c74d5f8d..68181c6c 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro2Usbc.kt @@ -34,19 +34,19 @@ data class AirPodsPro2Usbc( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt index 8414116f..c007c458 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsPro3.kt @@ -34,19 +34,19 @@ data class AirPodsPro3( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt index 5de224b1..12fcac6f 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/BeatsFitPro.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.beats +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class BeatsFitPro( override val model: PodDevice.Model = PodDevice.Model.BEATS_FIT_PRO + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_beats_fitpro_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_beats_fitpro_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_beats_fitpro_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt index f1445e0a..1bcb93ab 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.beats +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class PowerBeatsPro( override val model: PodDevice.Model = PodDevice.Model.POWERBEATS_PRO + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_powerbeats_pro_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_powerbeats_pro_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_powerbeats_pro_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt index e48d48cc..beecff52 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/beats/PowerBeatsPro2.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.beats +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.PodDevice @@ -29,6 +31,18 @@ data class PowerBeatsPro2( override val model: PodDevice.Model = PodDevice.Model.POWERBEATS_PRO2 + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_powerbeats_pro2_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_powerbeats_pro2_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_powerbeats_pro2_case + override val batteryCasePercent: Float? get() = super.batteryCasePercent ?: cachedBatteryPercentage diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt index 4128118a..c02898dc 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt @@ -1,5 +1,7 @@ package eu.darken.capod.pods.core.apple.misc +import androidx.annotation.DrawableRes +import eu.darken.capod.R import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.pods.core.HasCase @@ -35,6 +37,18 @@ data class FakeAirPodsGen3( override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN3 + @get:DrawableRes + override val leftPodIcon: Int + get() = R.drawable.device_airpods_gen3_left + + @get:DrawableRes + override val rightPodIcon: Int + get() = R.drawable.device_airpods_gen3_right + + @get:DrawableRes + override val caseIcon: Int + get() = R.drawable.device_airpods_gen3_case + override val rssi: Int get() = rssiAverage ?: super.rssi diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt index b93c4f91..adc71f37 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt @@ -39,19 +39,19 @@ data class FakeAirPodsPro( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val rssi: Int get() = rssiAverage ?: super.rssi diff --git a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt index e18ed853..a71fe899 100644 --- a/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt +++ b/app/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt @@ -41,19 +41,19 @@ data class FakeAirPodsPro2( @get:DrawableRes override val iconRes: Int - get() = R.drawable.devic_airpods_pro2_both + get() = R.drawable.device_airpods_pro2_both @get:DrawableRes override val caseIcon: Int - get() = R.drawable.devic_airpods_pro2_case + get() = R.drawable.device_airpods_pro2_case @get:DrawableRes override val leftPodIcon: Int - get() = R.drawable.devic_airpods_pro2_left + get() = R.drawable.device_airpods_pro2_left @get:DrawableRes override val rightPodIcon: Int - get() = R.drawable.devic_airpods_pro2_right + get() = R.drawable.device_airpods_pro2_right override val rssi: Int get() = rssiAverage ?: super.rssi diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt index f3f81f28..26a4ee80 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt +++ b/app/src/main/java/eu/darken/capod/reaction/ui/popup/PopUpPodViewFactory.kt @@ -41,11 +41,12 @@ class PopUpPodViewFactory @Inject constructor( PopupNotificationDualPodsBinding.inflate(layoutInflater, parent, false).apply { podLabel.text = device.getLabel(context) signal.text = device.getSignalQuality(context) - signal.isGone = debugSettings.isDebugModeEnabled.value + signal.isGone = !debugSettings.isDebugModeEnabled.value // Left val leftPercent = device.batteryLeftPodPercent podLeftIcon.setImageResource(device.leftPodIcon) + podLeftIcon.imageTintList = null podLeftBatteryIcon.setImageResource(getBatteryDrawable(leftPercent)) podLeftBatteryLabel.text = formatBatteryPercent(context, leftPercent) @@ -54,6 +55,7 @@ class PopUpPodViewFactory @Inject constructor( (device as? HasCase)?.let { case -> val casePercent = case.batteryCasePercent podCaseIcon.setImageResource(case.caseIcon) + podCaseIcon.imageTintList = null podCaseBatteryIcon.setImageResource(getBatteryDrawable(casePercent)) podCaseBatteryLabel.text = formatBatteryPercent(context, casePercent) } @@ -61,6 +63,7 @@ class PopUpPodViewFactory @Inject constructor( // Right val rightPercent = device.batteryRightPodPercent podRightIcon.setImageResource(device.rightPodIcon) + podRightIcon.imageTintList = null podRightBatteryIcon.setImageResource(getBatteryDrawable(rightPercent)) podRightBatteryLabel.text = formatBatteryPercent(context, rightPercent) }.root @@ -68,9 +71,10 @@ class PopUpPodViewFactory @Inject constructor( private fun createSinglePod(parent: ViewGroup, device: SinglePodDevice): View = PopupNotificationSinglePodsBinding.inflate(layoutInflater, parent, false).apply { headphonesIcon.setImageResource(device.iconRes) + headphonesIcon.imageTintList = null headphonesLabel.text = device.getLabel(context) signal.text = device.getSignalQuality(context) - signal.isGone = debugSettings.isDebugModeEnabled.value + signal.isGone = !debugSettings.isDebugModeEnabled.value val headsetPercent = device.batteryHeadsetPercent headphonesBatteryIcon.setImageResource(getBatteryDrawable(headsetPercent)) diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen1_both.png b/app/src/main/res/drawable-hdpi/device_airpods_gen1_both.png new file mode 100644 index 00000000..ce9f7178 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen1_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen1_case.png b/app/src/main/res/drawable-hdpi/device_airpods_gen1_case.png new file mode 100644 index 00000000..9133f3f9 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen1_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen1_left.png b/app/src/main/res/drawable-hdpi/device_airpods_gen1_left.png new file mode 100644 index 00000000..e2088c35 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen1_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen1_right.png b/app/src/main/res/drawable-hdpi/device_airpods_gen1_right.png new file mode 100644 index 00000000..1d14328a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen1_right.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen3_both.png b/app/src/main/res/drawable-hdpi/device_airpods_gen3_both.png new file mode 100644 index 00000000..e39ba7af Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen3_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen3_case.png b/app/src/main/res/drawable-hdpi/device_airpods_gen3_case.png new file mode 100644 index 00000000..8265c704 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen3_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen3_left.png b/app/src/main/res/drawable-hdpi/device_airpods_gen3_left.png new file mode 100644 index 00000000..c0572d05 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen3_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen3_right.png b/app/src/main/res/drawable-hdpi/device_airpods_gen3_right.png new file mode 100644 index 00000000..c2fdf04c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen3_right.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_both.png b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_both.png new file mode 100644 index 00000000..85f8c61f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_case.png b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_case.png new file mode 100644 index 00000000..c5b9952d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_left.png b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_left.png new file mode 100644 index 00000000..19660db5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_right.png b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_right.png new file mode 100644 index 00000000..37ac8619 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_gen4anc_right.png differ diff --git a/app/src/main/res/drawable-hdpi/device_airpods_max.png b/app/src/main/res/drawable-hdpi/device_airpods_max.png new file mode 100644 index 00000000..7aa3a1be Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_airpods_max.png differ diff --git a/app/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-hdpi/device_airpods_pro2_both.png similarity index 100% rename from app/src/main/res/drawable-hdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-hdpi/device_airpods_pro2_both.png diff --git a/app/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-hdpi/device_airpods_pro2_case.png similarity index 100% rename from app/src/main/res/drawable-hdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-hdpi/device_airpods_pro2_case.png diff --git a/app/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-hdpi/device_airpods_pro2_left.png similarity index 100% rename from app/src/main/res/drawable-hdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-hdpi/device_airpods_pro2_left.png diff --git a/app/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-hdpi/device_airpods_pro2_right.png similarity index 100% rename from app/src/main/res/drawable-hdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-hdpi/device_airpods_pro2_right.png diff --git a/app/src/main/res/drawable-hdpi/device_beats_earbuds.png b/app/src/main/res/drawable-hdpi/device_beats_earbuds.png new file mode 100644 index 00000000..66b7543a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_earbuds.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_fitpro_both.png b/app/src/main/res/drawable-hdpi/device_beats_fitpro_both.png new file mode 100644 index 00000000..ec4bfe89 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_fitpro_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_fitpro_case.png b/app/src/main/res/drawable-hdpi/device_beats_fitpro_case.png new file mode 100644 index 00000000..610050e5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_fitpro_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_fitpro_left.png b/app/src/main/res/drawable-hdpi/device_beats_fitpro_left.png new file mode 100644 index 00000000..c4f87062 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_fitpro_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_fitpro_right.png b/app/src/main/res/drawable-hdpi/device_beats_fitpro_right.png new file mode 100644 index 00000000..44e5c017 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_fitpro_right.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_headphones.png b/app/src/main/res/drawable-hdpi/device_beats_headphones.png new file mode 100644 index 00000000..4760a083 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_headphones.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_studio3.png b/app/src/main/res/drawable-hdpi/device_beats_studio3.png new file mode 100644 index 00000000..fd32a37a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_studio3.png differ diff --git a/app/src/main/res/drawable-hdpi/device_beats_x.png b/app/src/main/res/drawable-hdpi/device_beats_x.png new file mode 100644 index 00000000..ae007d89 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_beats_x.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_3.png b/app/src/main/res/drawable-hdpi/device_powerbeats_3.png new file mode 100644 index 00000000..0b7b9cd5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_3.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_4.png b/app/src/main/res/drawable-hdpi/device_powerbeats_4.png new file mode 100644 index 00000000..fd308e22 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_4.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_both.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_both.png new file mode 100644 index 00000000..54f14b83 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_case.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_case.png new file mode 100644 index 00000000..01ddc4ba Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_left.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_left.png new file mode 100644 index 00000000..aaa1b0b0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_right.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_right.png new file mode 100644 index 00000000..8fb093e6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro2_right.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro_both.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_both.png new file mode 100644 index 00000000..5919d707 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_both.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro_case.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_case.png new file mode 100644 index 00000000..01ddc4ba Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_case.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro_left.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_left.png new file mode 100644 index 00000000..9b0e9898 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_left.png differ diff --git a/app/src/main/res/drawable-hdpi/device_powerbeats_pro_right.png b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_right.png new file mode 100644 index 00000000..129ab26a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/device_powerbeats_pro_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen1_both.png b/app/src/main/res/drawable-mdpi/device_airpods_gen1_both.png new file mode 100644 index 00000000..49de7f2d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen1_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen1_case.png b/app/src/main/res/drawable-mdpi/device_airpods_gen1_case.png new file mode 100644 index 00000000..4d7853d4 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen1_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen1_left.png b/app/src/main/res/drawable-mdpi/device_airpods_gen1_left.png new file mode 100644 index 00000000..be3aafa7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen1_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen1_right.png b/app/src/main/res/drawable-mdpi/device_airpods_gen1_right.png new file mode 100644 index 00000000..988d8f6e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen1_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen3_both.png b/app/src/main/res/drawable-mdpi/device_airpods_gen3_both.png new file mode 100644 index 00000000..4f7e6b9d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen3_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen3_case.png b/app/src/main/res/drawable-mdpi/device_airpods_gen3_case.png new file mode 100644 index 00000000..242e60f5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen3_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen3_left.png b/app/src/main/res/drawable-mdpi/device_airpods_gen3_left.png new file mode 100644 index 00000000..dc6da77c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen3_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen3_right.png b/app/src/main/res/drawable-mdpi/device_airpods_gen3_right.png new file mode 100644 index 00000000..1c938302 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen3_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_both.png b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_both.png new file mode 100644 index 00000000..d5c88135 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_case.png b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_case.png new file mode 100644 index 00000000..6878a89a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_left.png b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_left.png new file mode 100644 index 00000000..ae886dae Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_right.png b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_right.png new file mode 100644 index 00000000..dfe03d76 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_gen4anc_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_airpods_max.png b/app/src/main/res/drawable-mdpi/device_airpods_max.png new file mode 100644 index 00000000..60b62af1 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_airpods_max.png differ diff --git a/app/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-mdpi/device_airpods_pro2_both.png similarity index 100% rename from app/src/main/res/drawable-mdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-mdpi/device_airpods_pro2_both.png diff --git a/app/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-mdpi/device_airpods_pro2_case.png similarity index 100% rename from app/src/main/res/drawable-mdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-mdpi/device_airpods_pro2_case.png diff --git a/app/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-mdpi/device_airpods_pro2_left.png similarity index 100% rename from app/src/main/res/drawable-mdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-mdpi/device_airpods_pro2_left.png diff --git a/app/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-mdpi/device_airpods_pro2_right.png similarity index 100% rename from app/src/main/res/drawable-mdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-mdpi/device_airpods_pro2_right.png diff --git a/app/src/main/res/drawable-mdpi/device_beats_earbuds.png b/app/src/main/res/drawable-mdpi/device_beats_earbuds.png new file mode 100644 index 00000000..203b99df Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_earbuds.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_fitpro_both.png b/app/src/main/res/drawable-mdpi/device_beats_fitpro_both.png new file mode 100644 index 00000000..62acafa9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_fitpro_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_fitpro_case.png b/app/src/main/res/drawable-mdpi/device_beats_fitpro_case.png new file mode 100644 index 00000000..741d717b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_fitpro_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_fitpro_left.png b/app/src/main/res/drawable-mdpi/device_beats_fitpro_left.png new file mode 100644 index 00000000..85b21022 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_fitpro_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_fitpro_right.png b/app/src/main/res/drawable-mdpi/device_beats_fitpro_right.png new file mode 100644 index 00000000..b9f7003b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_fitpro_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_headphones.png b/app/src/main/res/drawable-mdpi/device_beats_headphones.png new file mode 100644 index 00000000..67020115 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_headphones.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_studio3.png b/app/src/main/res/drawable-mdpi/device_beats_studio3.png new file mode 100644 index 00000000..9d81a3cf Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_studio3.png differ diff --git a/app/src/main/res/drawable-mdpi/device_beats_x.png b/app/src/main/res/drawable-mdpi/device_beats_x.png new file mode 100644 index 00000000..d80086d6 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_beats_x.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_3.png b/app/src/main/res/drawable-mdpi/device_powerbeats_3.png new file mode 100644 index 00000000..21712597 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_3.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_4.png b/app/src/main/res/drawable-mdpi/device_powerbeats_4.png new file mode 100644 index 00000000..704bc439 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_4.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_both.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_both.png new file mode 100644 index 00000000..b3a4ca30 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_case.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_case.png new file mode 100644 index 00000000..b14e2e85 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_left.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_left.png new file mode 100644 index 00000000..d54a1e45 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_right.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_right.png new file mode 100644 index 00000000..d3259d87 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro2_right.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro_both.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_both.png new file mode 100644 index 00000000..8081160a Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_both.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro_case.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_case.png new file mode 100644 index 00000000..b14e2e85 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_case.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro_left.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_left.png new file mode 100644 index 00000000..30e9350b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_left.png differ diff --git a/app/src/main/res/drawable-mdpi/device_powerbeats_pro_right.png b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_right.png new file mode 100644 index 00000000..3f963839 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/device_powerbeats_pro_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen1_both.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_both.png new file mode 100644 index 00000000..102585f9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen1_case.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_case.png new file mode 100644 index 00000000..800367b6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen1_left.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_left.png new file mode 100644 index 00000000..7658ae9d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen1_right.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_right.png new file mode 100644 index 00000000..c5b460d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen1_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen3_both.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_both.png new file mode 100644 index 00000000..d37ab977 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen3_case.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_case.png new file mode 100644 index 00000000..58b82d3c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen3_left.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_left.png new file mode 100644 index 00000000..e18aca82 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen3_right.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_right.png new file mode 100644 index 00000000..58fcb977 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen3_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_both.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_both.png new file mode 100644 index 00000000..63f7fd75 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_case.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_case.png new file mode 100644 index 00000000..a6078601 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_left.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_left.png new file mode 100644 index 00000000..2ad9bccf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_right.png b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_right.png new file mode 100644 index 00000000..7964d6c0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_gen4anc_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_airpods_max.png b/app/src/main/res/drawable-xhdpi/device_airpods_max.png new file mode 100644 index 00000000..338dd56a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_airpods_max.png differ diff --git a/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xhdpi/device_airpods_pro2_both.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xhdpi/device_airpods_pro2_both.png diff --git a/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xhdpi/device_airpods_pro2_case.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xhdpi/device_airpods_pro2_case.png diff --git a/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xhdpi/device_airpods_pro2_left.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xhdpi/device_airpods_pro2_left.png diff --git a/app/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xhdpi/device_airpods_pro2_right.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xhdpi/device_airpods_pro2_right.png diff --git a/app/src/main/res/drawable-xhdpi/device_beats_earbuds.png b/app/src/main/res/drawable-xhdpi/device_beats_earbuds.png new file mode 100644 index 00000000..44c63ae4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_earbuds.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_fitpro_both.png b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_both.png new file mode 100644 index 00000000..435d8b25 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_fitpro_case.png b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_case.png new file mode 100644 index 00000000..120e9f1e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_fitpro_left.png b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_left.png new file mode 100644 index 00000000..be367d7a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_fitpro_right.png b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_right.png new file mode 100644 index 00000000..e5ebae96 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_fitpro_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_headphones.png b/app/src/main/res/drawable-xhdpi/device_beats_headphones.png new file mode 100644 index 00000000..1163c7b5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_headphones.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_studio3.png b/app/src/main/res/drawable-xhdpi/device_beats_studio3.png new file mode 100644 index 00000000..86942161 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_studio3.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_beats_x.png b/app/src/main/res/drawable-xhdpi/device_beats_x.png new file mode 100644 index 00000000..5930fe1e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_beats_x.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_3.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_3.png new file mode 100644 index 00000000..048e8781 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_3.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_4.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_4.png new file mode 100644 index 00000000..dad14c63 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_4.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_both.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_both.png new file mode 100644 index 00000000..79fce5e9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_case.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_case.png new file mode 100644 index 00000000..8d7b3c5d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_left.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_left.png new file mode 100644 index 00000000..c34a94e9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_right.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_right.png new file mode 100644 index 00000000..481d9bd0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro2_right.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_both.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_both.png new file mode 100644 index 00000000..44497e73 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_both.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_case.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_case.png new file mode 100644 index 00000000..8d7b3c5d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_case.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_left.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_left.png new file mode 100644 index 00000000..0c7291be Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_left.png differ diff --git a/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_right.png b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_right.png new file mode 100644 index 00000000..c294251c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/device_powerbeats_pro_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_both.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_both.png new file mode 100644 index 00000000..cef7652e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_case.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_case.png new file mode 100644 index 00000000..5b1490dc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_left.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_left.png new file mode 100644 index 00000000..5608bf55 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_right.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_right.png new file mode 100644 index 00000000..4e91ed3b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen1_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_both.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_both.png new file mode 100644 index 00000000..4cfb7ec1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_case.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_case.png new file mode 100644 index 00000000..c23e8d5d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_left.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_left.png new file mode 100644 index 00000000..2f270c6f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_right.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_right.png new file mode 100644 index 00000000..6786ba4c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen3_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_both.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_both.png new file mode 100644 index 00000000..8e79c8fd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_case.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_case.png new file mode 100644 index 00000000..91d318fe Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_left.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_left.png new file mode 100644 index 00000000..1244d85f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_right.png b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_right.png new file mode 100644 index 00000000..6500b739 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_gen4anc_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_airpods_max.png b/app/src/main/res/drawable-xxhdpi/device_airpods_max.png new file mode 100644 index 00000000..1944abe8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_airpods_max.png differ diff --git a/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xxhdpi/device_airpods_pro2_both.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xxhdpi/device_airpods_pro2_both.png diff --git a/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xxhdpi/device_airpods_pro2_case.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xxhdpi/device_airpods_pro2_case.png diff --git a/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xxhdpi/device_airpods_pro2_left.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xxhdpi/device_airpods_pro2_left.png diff --git a/app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xxhdpi/device_airpods_pro2_right.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xxhdpi/device_airpods_pro2_right.png diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_earbuds.png b/app/src/main/res/drawable-xxhdpi/device_beats_earbuds.png new file mode 100644 index 00000000..64acc810 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_earbuds.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_both.png b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_both.png new file mode 100644 index 00000000..d49fec17 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_case.png b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_case.png new file mode 100644 index 00000000..f36fd11d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_left.png b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_left.png new file mode 100644 index 00000000..0781f8cf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_right.png b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_right.png new file mode 100644 index 00000000..233b5dc3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_fitpro_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_headphones.png b/app/src/main/res/drawable-xxhdpi/device_beats_headphones.png new file mode 100644 index 00000000..e85e208d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_headphones.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_studio3.png b/app/src/main/res/drawable-xxhdpi/device_beats_studio3.png new file mode 100644 index 00000000..d9a0d686 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_studio3.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_beats_x.png b/app/src/main/res/drawable-xxhdpi/device_beats_x.png new file mode 100644 index 00000000..30306590 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_beats_x.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_3.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_3.png new file mode 100644 index 00000000..35d73b86 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_3.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_4.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_4.png new file mode 100644 index 00000000..1c0920a2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_4.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_both.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_both.png new file mode 100644 index 00000000..ef61600d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_case.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_case.png new file mode 100644 index 00000000..c537a2d3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_left.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_left.png new file mode 100644 index 00000000..f4c584ed Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_right.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_right.png new file mode 100644 index 00000000..79f4cbb8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro2_right.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_both.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_both.png new file mode 100644 index 00000000..ca6c58bf Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_both.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_case.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_case.png new file mode 100644 index 00000000..c537a2d3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_case.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_left.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_left.png new file mode 100644 index 00000000..e8cdf693 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_left.png differ diff --git a/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_right.png b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_right.png new file mode 100644 index 00000000..e1a2aea7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/device_powerbeats_pro_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png~ b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png~ deleted file mode 100644 index aa886eb1..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png~ and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png~ b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png~ deleted file mode 100644 index 2f0c197d..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png~ and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png~ b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png~ deleted file mode 100644 index 355d3a46..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png~ and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png~ b/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png~ deleted file mode 100644 index ff110468..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png~ and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_both.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_both.png new file mode 100644 index 00000000..f37e1c91 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_case.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_case.png new file mode 100644 index 00000000..3a36c88a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_left.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_left.png new file mode 100644 index 00000000..f6032ddd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_right.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_right.png new file mode 100644 index 00000000..c38fa6c2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen1_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_both.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_both.png new file mode 100644 index 00000000..beb1a2f8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_case.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_case.png new file mode 100644 index 00000000..7a4a442d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_left.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_left.png new file mode 100644 index 00000000..436c365d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_right.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_right.png new file mode 100644 index 00000000..375428eb Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen3_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_both.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_both.png new file mode 100644 index 00000000..bb3a0510 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_case.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_case.png new file mode 100644 index 00000000..a4fa9524 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_left.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_left.png new file mode 100644 index 00000000..3a620a55 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_right.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_right.png new file mode 100644 index 00000000..9a95b1f7 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_gen4anc_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_airpods_max.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_max.png new file mode 100644 index 00000000..5dffb605 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_airpods_max.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_both.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_both.png rename to app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_both.png diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_case.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_case.png rename to app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_case.png diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_left.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_left.png rename to app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_left.png diff --git a/app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png b/app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_right.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/devic_airpods_pro2_right.png rename to app/src/main/res/drawable-xxxhdpi/device_airpods_pro2_right.png diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_earbuds.png b/app/src/main/res/drawable-xxxhdpi/device_beats_earbuds.png new file mode 100644 index 00000000..c6c18db0 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_earbuds.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_both.png b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_both.png new file mode 100644 index 00000000..455c3473 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_case.png b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_case.png new file mode 100644 index 00000000..5a2a5529 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_left.png b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_left.png new file mode 100644 index 00000000..3777df5b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_right.png b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_right.png new file mode 100644 index 00000000..6d9f7a4c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_fitpro_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_headphones.png b/app/src/main/res/drawable-xxxhdpi/device_beats_headphones.png new file mode 100644 index 00000000..991c75be Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_headphones.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_studio3.png b/app/src/main/res/drawable-xxxhdpi/device_beats_studio3.png new file mode 100644 index 00000000..939c69f9 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_studio3.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_beats_x.png b/app/src/main/res/drawable-xxxhdpi/device_beats_x.png new file mode 100644 index 00000000..7430c402 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_beats_x.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_3.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_3.png new file mode 100644 index 00000000..cf8d5ec7 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_3.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_4.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_4.png new file mode 100644 index 00000000..72c748f3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_4.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_both.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_both.png new file mode 100644 index 00000000..68513f42 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_case.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_case.png new file mode 100644 index 00000000..774e6f38 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_left.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_left.png new file mode 100644 index 00000000..def09897 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_right.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_right.png new file mode 100644 index 00000000..4038de51 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro2_right.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_both.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_both.png new file mode 100644 index 00000000..5ac9b9bb Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_both.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_case.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_case.png new file mode 100644 index 00000000..774e6f38 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_case.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_left.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_left.png new file mode 100644 index 00000000..632b0527 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_left.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_right.png b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_right.png new file mode 100644 index 00000000..752f52ed Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/device_powerbeats_pro_right.png differ diff --git a/app/src/main/res/drawable/devic_airpods_gen1_both.xml b/app/src/main/res/drawable/device_airpods_gen1_both.xml similarity index 100% rename from app/src/main/res/drawable/devic_airpods_gen1_both.xml rename to app/src/main/res/drawable/device_airpods_gen1_both.xml diff --git a/app/src/main/res/drawable/devic_airpods_gen1_case.xml b/app/src/main/res/drawable/device_airpods_gen1_case.xml similarity index 100% rename from app/src/main/res/drawable/devic_airpods_gen1_case.xml rename to app/src/main/res/drawable/device_airpods_gen1_case.xml diff --git a/app/src/main/res/drawable/devic_airpods_gen1_left.xml b/app/src/main/res/drawable/device_airpods_gen1_left.xml similarity index 100% rename from app/src/main/res/drawable/devic_airpods_gen1_left.xml rename to app/src/main/res/drawable/device_airpods_gen1_left.xml diff --git a/app/src/main/res/drawable/devic_airpods_gen1_right.xml b/app/src/main/res/drawable/device_airpods_gen1_right.xml similarity index 100% rename from app/src/main/res/drawable/devic_airpods_gen1_right.xml rename to app/src/main/res/drawable/device_airpods_gen1_right.xml diff --git a/app/src/main/res/drawable/devic_airpods_gen2_both.xml b/app/src/main/res/drawable/device_airpods_gen2_both.xml similarity index 100% rename from app/src/main/res/drawable/devic_airpods_gen2_both.xml rename to app/src/main/res/drawable/device_airpods_gen2_both.xml diff --git a/app/src/main/res/drawable/devic_earbuds_generic_both.xml b/app/src/main/res/drawable/device_earbuds_generic_both.xml similarity index 100% rename from app/src/main/res/drawable/devic_earbuds_generic_both.xml rename to app/src/main/res/drawable/device_earbuds_generic_both.xml diff --git a/app/src/main/res/drawable/devic_headphones_generic.xml b/app/src/main/res/drawable/device_headphones_generic.xml similarity index 100% rename from app/src/main/res/drawable/devic_headphones_generic.xml rename to app/src/main/res/drawable/device_headphones_generic.xml diff --git a/app/src/main/res/layout/model_dropdown_item.xml b/app/src/main/res/layout/model_dropdown_item.xml index fcac6348..28aa16c1 100644 --- a/app/src/main/res/layout/model_dropdown_item.xml +++ b/app/src/main/res/layout/model_dropdown_item.xml @@ -13,7 +13,7 @@ android:layout_height="24dp" android:layout_marginEnd="16dp" android:scaleType="centerInside" - tools:src="@drawable/devic_airpods_gen1_both" /> + tools:src="@drawable/device_airpods_gen1_both" /> + android:src="@drawable/device_airpods_gen1_left" /> + android:src="@drawable/device_airpods_gen1_case" /> + android:src="@drawable/device_airpods_gen1_right" /> + app:srcCompat="@drawable/device_airpods_gen1_both" /> @@ -257,7 +257,7 @@ @@ -351,7 +351,7 @@ android:id="@+id/pod_right_icon" style="@style/PodInfoItemIcon" android:contentDescription="@string/pods_dual_right_label" - android:src="@drawable/devic_airpods_gen1_right" + android:src="@drawable/device_airpods_gen1_right" app:layout_constraintBottom_toBottomOf="@id/pod_right_label" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/pod_right_label" /> diff --git a/app/src/main/res/layout/overview_pods_single_item.xml b/app/src/main/res/layout/overview_pods_single_item.xml index 0de69a25..4fe32422 100644 --- a/app/src/main/res/layout/overview_pods_single_item.xml +++ b/app/src/main/res/layout/overview_pods_single_item.xml @@ -24,7 +24,7 @@ app:layout_constraintBottom_toBottomOf="@id/name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/name" - app:srcCompat="@drawable/devic_headphones_generic" /> + app:srcCompat="@drawable/device_headphones_generic" /> @@ -109,7 +109,7 @@ @@ -152,7 +152,7 @@ diff --git a/app/src/main/res/layout/popup_notification_single_pods.xml b/app/src/main/res/layout/popup_notification_single_pods.xml index cc743d5d..b6a92991 100644 --- a/app/src/main/res/layout/popup_notification_single_pods.xml +++ b/app/src/main/res/layout/popup_notification_single_pods.xml @@ -46,7 +46,7 @@ android:id="@+id/headphones_icon" style="@style/PodInfoItemIcon.Popup.Large" android:layout_marginTop="16dp" - android:src="@drawable/devic_earbuds_generic_both" + android:src="@drawable/device_earbuds_generic_both" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/signal" /> diff --git a/app/src/main/res/layout/widget_config_preview.xml b/app/src/main/res/layout/widget_config_preview.xml index 01755582..dca0e403 100644 --- a/app/src/main/res/layout/widget_config_preview.xml +++ b/app/src/main/res/layout/widget_config_preview.xml @@ -20,7 +20,7 @@ + tools:src="@drawable/device_airpods_gen1_both" />