From 52587dfa626418fc5579b39cc2e949aba7592be6 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 30 Nov 2025 13:43:29 +0100 Subject: [PATCH] Properly format battery percentage --- .../widgets/clock/parts/BatteryPartProvider.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt index 4590980f4..26ebb2b84 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.content.getSystemService import de.mm20.launcher2.ui.R +import de.mm20.launcher2.ui.utils.formatPercent import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.trySendBlocking import kotlinx.coroutines.flow.* @@ -57,20 +58,21 @@ class BatteryPartProvider : PartProvider { if (!compactLayout) { Row( Modifier.padding(8.dp), - verticalAlignment = Alignment.CenterVertically + verticalAlignment = Alignment.CenterVertically, ) { Icon( painter = painterResource(getBatteryIcon(it)), + modifier = Modifier.alignByBaseline(), contentDescription = null ) Text( - modifier = Modifier.padding(start = 8.dp), - text = "${it.level} %", + modifier = Modifier.padding(start = 8.dp).alignByBaseline(), + text = formatPercent(it.level.toFloat()), style = MaterialTheme.typography.titleMedium, ) if (it.charging) { Text( - modifier = Modifier.padding(start = 8.dp), + modifier = Modifier.padding(start = 8.dp).alignByBaseline(), text = it.fullIn?.let { val m = (it / 60000).toInt() pluralStringResource(R.plurals.battery_part_remaining_charge_time, m, m)