From 7bd134ed8d45f8e7d73dfc0279778d9c15778a65 Mon Sep 17 00:00:00 2001 From: Jhony Cesar Date: Wed, 5 Aug 2026 22:45:53 -0400 Subject: [PATCH] refactor: add formattedDescricao to MaintenanceActivity and update UI screens to use it for consistent display --- .../com/example/data/model/MaintenanceActivity.kt | 15 ++++++++++++--- .../com/example/ui/screens/AnalyticsScreen.kt | 2 +- .../ui/screens/MaintenanceDashboardScreen.kt | 11 ++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/example/data/model/MaintenanceActivity.kt b/app/src/main/java/com/example/data/model/MaintenanceActivity.kt index 4a5531a..ac2558c 100644 --- a/app/src/main/java/com/example/data/model/MaintenanceActivity.kt +++ b/app/src/main/java/com/example/data/model/MaintenanceActivity.kt @@ -40,9 +40,18 @@ data class MaintenanceActivity( } val formattedHoras: String - get() = if (quantidadeHoras <= 0) "0h" - else if (quantidadeHoras % 1.0 == 0.0) "${quantidadeHoras.toInt()}h" - else "${quantidadeHoras}h" + get() { + val hrs = duracaoHorasCalculada + return if (hrs <= 0.0) "0h" + else if (hrs % 1.0 == 0.0) "${hrs.toInt()}h" + else "${hrs}h" + } + + val formattedDescricao: String + get() { + val prefix = "$formattedHoras - " + return if (descricao.startsWith(prefix)) descricao else "$prefix$descricao" + } @delegate:Transient val dataInicioMillis: Long by lazy { diff --git a/app/src/main/java/com/example/ui/screens/AnalyticsScreen.kt b/app/src/main/java/com/example/ui/screens/AnalyticsScreen.kt index 1f40910..5f3e730 100644 --- a/app/src/main/java/com/example/ui/screens/AnalyticsScreen.kt +++ b/app/src/main/java/com/example/ui/screens/AnalyticsScreen.kt @@ -889,7 +889,7 @@ fun OverdueActivitiesListModal( Spacer(modifier = Modifier.height(4.dp)) Text( - text = activity.descricao, + text = activity.formattedDescricao, fontSize = 12.sp, fontWeight = FontWeight.Medium, color = Color.DarkGray, diff --git a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt index c531518..3f7df5c 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -984,15 +984,8 @@ fun OSListItemCard( Spacer(modifier = Modifier.height(6.dp)) - // Title Description - val displayDesc = if (activity.quantidadeHoras > 0) { - "${activity.formattedHoras} - ${activity.descricao}" - } else { - activity.descricao - } - Text( - text = displayDesc, + text = activity.formattedDescricao, fontSize = 13.sp, fontWeight = FontWeight.Medium, color = BrandBlack, @@ -1409,7 +1402,7 @@ fun EditActivityBottomSheet( ) { Column(modifier = Modifier.padding(12.dp)) { Text( - text = activity.descricao, + text = activity.formattedDescricao, fontSize = 13.sp, fontWeight = FontWeight.Medium, color = BrandBlack