refactor: add formattedDescricao to MaintenanceActivity and update UI screens to use it for consistent display

This commit is contained in:
Jhony Cesar
2026-08-05 22:45:53 -04:00
parent a0a541e387
commit 7bd134ed8d
3 changed files with 15 additions and 13 deletions

View File

@@ -40,9 +40,18 @@ data class MaintenanceActivity(
} }
val formattedHoras: String val formattedHoras: String
get() = if (quantidadeHoras <= 0) "0h" get() {
else if (quantidadeHoras % 1.0 == 0.0) "${quantidadeHoras.toInt()}h" val hrs = duracaoHorasCalculada
else "${quantidadeHoras}h" 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 @delegate:Transient
val dataInicioMillis: Long by lazy { val dataInicioMillis: Long by lazy {

View File

@@ -889,7 +889,7 @@ fun OverdueActivitiesListModal(
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Text( Text(
text = activity.descricao, text = activity.formattedDescricao,
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
color = Color.DarkGray, color = Color.DarkGray,

View File

@@ -984,15 +984,8 @@ fun OSListItemCard(
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
// Title Description
val displayDesc = if (activity.quantidadeHoras > 0) {
"${activity.formattedHoras} - ${activity.descricao}"
} else {
activity.descricao
}
Text( Text(
text = displayDesc, text = activity.formattedDescricao,
fontSize = 13.sp, fontSize = 13.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
color = BrandBlack, color = BrandBlack,
@@ -1409,7 +1402,7 @@ fun EditActivityBottomSheet(
) { ) {
Column(modifier = Modifier.padding(12.dp)) { Column(modifier = Modifier.padding(12.dp)) {
Text( Text(
text = activity.descricao, text = activity.formattedDescricao,
fontSize = 13.sp, fontSize = 13.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
color = BrandBlack color = BrandBlack