From 2c2552a57eeebe9badb10013e490fac3e88d9cf5 Mon Sep 17 00:00:00 2001 From: Kavish Devar Date: Tue, 7 Jan 2025 00:35:44 +0530 Subject: [PATCH] show last battery status when a pod or case is disconnected --- .../aln/composables/BatteryView.kt | 16 +++--- .../aln/services/AirPodsService.kt | 50 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/android/app/src/main/java/me/kavishdevar/aln/composables/BatteryView.kt b/android/app/src/main/java/me/kavishdevar/aln/composables/BatteryView.kt index 70de50d..e00e628 100644 --- a/android/app/src/main/java/me/kavishdevar/aln/composables/BatteryView.kt +++ b/android/app/src/main/java/me/kavishdevar/aln/composables/BatteryView.kt @@ -127,21 +127,21 @@ fun BatteryView(service: AirPodsService, preview: Boolean = false) { .fillMaxWidth(), horizontalArrangement = Arrangement.Center ) { - if (left?.status != BatteryStatus.DISCONNECTED) { +// if (left?.status != BatteryStatus.DISCONNECTED) { BatteryIndicator( left?.level ?: 0, left?.status == BatteryStatus.CHARGING ) - } - if (left?.status != BatteryStatus.DISCONNECTED && right?.status != BatteryStatus.DISCONNECTED) { +// } +// if (left?.status != BatteryStatus.DISCONNECTED && right?.status != BatteryStatus.DISCONNECTED) { Spacer(modifier = Modifier.width(16.dp)) - } - if (right?.status != BatteryStatus.DISCONNECTED) { +// } +// if (right?.status != BatteryStatus.DISCONNECTED) { BatteryIndicator( right?.level ?: 0, right?.status == BatteryStatus.CHARGING ) - } +// } } } } @@ -160,9 +160,9 @@ fun BatteryView(service: AirPodsService, preview: Boolean = false) { .fillMaxWidth() .scale(1.25f) ) - if (case?.status != BatteryStatus.DISCONNECTED) { +// if (case?.status != BatteryStatus.DISCONNECTED) { BatteryIndicator(case?.level ?: 0, case?.status == BatteryStatus.CHARGING) - } +// } } } } diff --git a/android/app/src/main/java/me/kavishdevar/aln/services/AirPodsService.kt b/android/app/src/main/java/me/kavishdevar/aln/services/AirPodsService.kt index c2494a2..157f603 100644 --- a/android/app/src/main/java/me/kavishdevar/aln/services/AirPodsService.kt +++ b/android/app/src/main/java/me/kavishdevar/aln/services/AirPodsService.kt @@ -171,31 +171,31 @@ class AirPodsService: Service() { it.setTextViewText( R.id.left_battery_widget, batteryNotification.getBattery().find { it.component == BatteryComponent.LEFT }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: "" ) it.setTextViewText( R.id.right_battery_widget, batteryNotification.getBattery().find { it.component == BatteryComponent.RIGHT }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: "" ) it.setTextViewText( R.id.case_battery_widget, batteryNotification.getBattery().find { it.component == BatteryComponent.CASE }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: "" ) } @@ -205,7 +205,7 @@ class AirPodsService: Service() { fun updateNotificationContent(connected: Boolean, airpodsName: String? = null, batteryList: List? = null) { val notificationManager = getSystemService(NotificationManager::class.java) - val textColor = this.getSharedPreferences("settings", MODE_PRIVATE).getLong("textColor", 0) +// val textColor = this.getSharedPreferences("settings", MODE_PRIVATE).getLong("textColor", 0) var updatedNotification: Notification? = null if (connected) { @@ -262,23 +262,23 @@ class AirPodsService: Service() { updatedNotification = NotificationCompat.Builder(this, "background_service_status") .setSmallIcon(R.drawable.airpods) .setContentTitle("""L: ${batteryList?.find { it.component == BatteryComponent.LEFT }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: ""} R: ${batteryList?.find { it.component == BatteryComponent.RIGHT }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: ""} C: ${batteryList?.find { it.component == BatteryComponent.CASE }?.let { - if (it.status != BatteryStatus.DISCONNECTED) { +// if (it.status != BatteryStatus.DISCONNECTED) { "${if (it.status == BatteryStatus.CHARGING) "⚡" else ""} ${it.level}%" - } else { - "" - } +// } else { +// "" +// } } ?: ""}""") .setCategory(Notification.CATEGORY_SERVICE) .setPriority(NotificationCompat.PRIORITY_LOW)