From 9f704651dd29dee0059884f731e85fd6983b75e8 Mon Sep 17 00:00:00 2001 From: Daniel Shokouhi Date: Sun, 13 Sep 2020 10:05:23 -0700 Subject: [PATCH] Fix some stale icons (#927) --- .../android/sensors/BatterySensorManager.kt | 31 ++++++---- .../android/sensors/NetworkSensorManager.kt | 60 ++----------------- 2 files changed, 24 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/BatterySensorManager.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/BatterySensorManager.kt index d8d748cc5..c8bcf1db6 100644 --- a/app/src/main/java/io/homeassistant/companion/android/sensors/BatterySensorManager.kt +++ b/app/src/main/java/io/homeassistant/companion/android/sensors/BatterySensorManager.kt @@ -128,17 +128,23 @@ class BatterySensorManager : SensorManager { if (!isEnabled(context, batteryState.id)) return - val percentage: Int = getBatteryPercentage(intent) val isCharging = getIsCharging(intent) val chargerType = getChargerType(intent) val chargingStatus = getChargingStatus(intent) val batteryHealth = getBatteryHealth(intent) + val icon = when (chargingStatus) { + "charging" -> "mdi:battery-plus" + "discharging" -> "mdi:battery-minus" + "full" -> "mdi:battery-charging" + "not_charging" -> "mdi:battery" + else -> "mdi:battery-unknown" + } onSensorUpdated( context, batteryState, chargingStatus, - getBatteryIcon(percentage, isCharging, chargerType, chargingStatus), + icon, mapOf( "is_charging" to isCharging, // Remove after next release "charger_type" to chargerType, // Remove after next release @@ -167,16 +173,19 @@ class BatterySensorManager : SensorManager { if (!isEnabled(context, chargerTypeState.id)) return - val percentage: Int = getBatteryPercentage(intent) - val isCharging = getIsCharging(intent) val chargerType = getChargerType(intent) - val chargingStatus = getChargingStatus(intent) + val icon = when (chargerType) { + "ac" -> "mdi:power-plug" + "usb" -> "mdi:usb-port" + "wireless" -> "battery-charging-wireless" + else -> "mdi:battery-unknown" + } onSensorUpdated( context, chargerTypeState, chargerType, - getBatteryIcon(percentage, isCharging, chargerType, chargingStatus), + icon, mapOf() ) } @@ -185,17 +194,17 @@ class BatterySensorManager : SensorManager { if (!isEnabled(context, batteryHealthState.id)) return - val percentage: Int = getBatteryPercentage(intent) - val isCharging = getIsCharging(intent) - val chargerType = getChargerType(intent) - val chargingStatus = getChargingStatus(intent) val batteryHealth = getBatteryHealth(intent) + val icon = when (batteryHealth) { + "good" -> "mdi:battery-heart-variant" + else -> "mdi:battery-alert" + } onSensorUpdated( context, batteryHealthState, batteryHealth, - getBatteryIcon(percentage, isCharging, chargerType, chargingStatus), + icon, mapOf() ) } diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt index 838c584c3..7e1e97612 100644 --- a/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt +++ b/app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt @@ -139,16 +139,7 @@ class NetworkSensorManager : SensorManager { }?.level ?: -1 } - var signalStrength = -1 - if (lastScanStrength != -1) { - signalStrength = WifiManager.calculateSignalLevel(lastScanStrength, 4) - } - - val icon = "mdi:wifi-strength-" + when (signalStrength) { - -1 -> "off" - 0 -> "outline" - else -> signalStrength - } + val icon = if (ssid != "") "mdi:wifi" else "mdi:wifi-off" val attributes = conInfo?.let { mapOf( @@ -176,30 +167,15 @@ class NetworkSensorManager : SensorManager { return var conInfo: WifiInfo? = null - var lastScanStrength = -1 if (checkPermission(context)) { val wifiManager = (context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager) conInfo = wifiManager.connectionInfo - - lastScanStrength = wifiManager.scanResults.firstOrNull { - it.BSSID == conInfo.bssid - }?.level ?: -1 - } - - var signalStrength = -1 - if (lastScanStrength != -1) { - signalStrength = WifiManager.calculateSignalLevel(lastScanStrength, 4) - } - - val icon = "mdi:wifi-strength-" + when (signalStrength) { - -1 -> "off" - 0 -> "outline" - else -> signalStrength } val bssid = if (conInfo!!.bssid == null) "" else conInfo.bssid + val icon = if (bssid != "") "mdi:wifi" else "mdi:wifi-off" onSensorUpdated( context, bssidState, @@ -215,7 +191,6 @@ class NetworkSensorManager : SensorManager { var conInfo: WifiInfo? = null var deviceIp = "Unknown" - var lastScanStrength = -1 if (checkPermission(context)) { val wifiManager = @@ -227,22 +202,9 @@ class NetworkSensorManager : SensorManager { } else { getIpAddress(conInfo.ipAddress) } - - lastScanStrength = wifiManager.scanResults.firstOrNull { - it.BSSID == conInfo.bssid - }?.level ?: -1 } - var signalStrength = -1 - if (lastScanStrength != -1) { - signalStrength = WifiManager.calculateSignalLevel(lastScanStrength, 4) - } - - val icon = "mdi:wifi-strength-" + when (signalStrength) { - -1 -> "off" - 0 -> "outline" - else -> signalStrength - } + val icon = "mdi:ip" onSensorUpdated( context, @@ -326,7 +288,6 @@ class NetworkSensorManager : SensorManager { var conInfo: WifiInfo? = null var frequency = 0 - var lastScanStrength = -1 if (checkPermission(context)) { val wifiManager = @@ -338,22 +299,9 @@ class NetworkSensorManager : SensorManager { } else { conInfo.frequency } - - lastScanStrength = wifiManager.scanResults.firstOrNull { - it.BSSID == conInfo.bssid - }?.level ?: -1 } - var signalStrength = -1 - if (lastScanStrength != -1) { - signalStrength = WifiManager.calculateSignalLevel(lastScanStrength, 4) - } - - val icon = "mdi:wifi-strength-" + when (signalStrength) { - -1 -> "off" - 0 -> "outline" - else -> signalStrength - } + val icon = "mdi:wifi" onSensorUpdated( context,