diff --git a/app/src/main/java/com/matedroid/ui/screens/stats/StatsScreen.kt b/app/src/main/java/com/matedroid/ui/screens/stats/StatsScreen.kt index e85f2fd..4d821ff 100644 --- a/app/src/main/java/com/matedroid/ui/screens/stats/StatsScreen.kt +++ b/app/src/main/java/com/matedroid/ui/screens/stats/StatsScreen.kt @@ -276,22 +276,19 @@ private fun StatsContent( QuickStatsChargesCard(quickStats = stats.quickStats, palette = palette) } + // AC/DC Ratio (moved here, near charges) + stats.deepStats?.let { deepStats -> + item { + AcDcRatioCard(deepStats = deepStats, palette = palette) + } + } + // Deep Stats - only if available stats.deepStats?.let { deepStats -> // Temperature Stats item { TemperatureStatsCard(deepStats = deepStats, palette = palette) } - - // Charging Power Stats - item { - ChargingPowerCard(deepStats = deepStats, palette = palette) - } - - // AC/DC Ratio - item { - AcDcRatioCard(deepStats = deepStats, palette = palette) - } } } } @@ -688,35 +685,6 @@ private fun TemperatureStatsCard(deepStats: DeepStats, palette: CarColorPalette) } } -@Composable -private fun ChargingPowerCard(deepStats: DeepStats, palette: CarColorPalette) { - if (deepStats.maxChargerPowerKw == null) { - return // No charging power data - } - - StatsCard( - title = "Charging Power", - icon = Icons.Default.ElectricBolt, - palette = palette - ) { - Row(modifier = Modifier.fillMaxWidth()) { - StatItem( - label = "Max Power Achieved", - value = "${deepStats.maxChargerPowerKw} kW", - modifier = Modifier.weight(1f) - ) - } - deepStats.chargeWithMaxPower?.let { record -> - Spacer(modifier = Modifier.height(8.dp)) - Text( - text = "on ${record.date?.take(10) ?: "unknown date"}", - style = MaterialTheme.typography.bodySmall, - color = palette.onSurfaceVariant - ) - } - } -} - private fun formatEnergy(kwh: Double): String { return if (kwh >= 1000) { "%.1f MWh".format(kwh / 1000)