From fc2c939e0b7c7aca3f6f81298de8ea19b36551fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= <leo@leomurca.xyz>
Date: Sat, 19 Jul 2025 11:07:13 -0300
Subject: [PATCH] refactor: rename status to matchStatus and inline modifier
 call

---
 .../leomurca/csgomatches/data/mapper/MatchMapper.kt |  2 +-
 .../xyz/leomurca/csgomatches/domain/model/Match.kt  |  2 +-
 .../leomurca/csgomatches/ui/components/MatchCard.kt |  4 ++--
 .../csgomatches/ui/navigation/MatchDetailsRoute.kt  |  2 +-
 .../ui/screens/matchdetails/MatchDetailsScreen.kt   | 13 ++++++-------
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/xyz/leomurca/csgomatches/data/mapper/MatchMapper.kt b/app/src/main/java/xyz/leomurca/csgomatches/data/mapper/MatchMapper.kt
index 200851e..e840a25 100644
--- a/app/src/main/java/xyz/leomurca/csgomatches/data/mapper/MatchMapper.kt
+++ b/app/src/main/java/xyz/leomurca/csgomatches/data/mapper/MatchMapper.kt
@@ -29,7 +29,7 @@ fun MatchDto.toDomain(): Match {
             id = serie.id,
             name = serie.fullName ?: ""
         ),
-        status = status?.toMatchStatus() ?: MatchStatus.UNKNOWN
+        matchStatus = status?.toMatchStatus() ?: MatchStatus.UNKNOWN
     )
 }
 
diff --git a/app/src/main/java/xyz/leomurca/csgomatches/domain/model/Match.kt b/app/src/main/java/xyz/leomurca/csgomatches/domain/model/Match.kt
index f9140a7..18f8d27 100644
--- a/app/src/main/java/xyz/leomurca/csgomatches/domain/model/Match.kt
+++ b/app/src/main/java/xyz/leomurca/csgomatches/domain/model/Match.kt
@@ -7,5 +7,5 @@ data class Match(
     val opponents: List<Opponent>,
     val league: League,
     val serie: Serie,
-    val status: MatchStatus
+    val matchStatus: MatchStatus
 )
\ No newline at end of file
diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/components/MatchCard.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/components/MatchCard.kt
index 983d6a7..0e9abfe 100644
--- a/app/src/main/java/xyz/leomurca/csgomatches/ui/components/MatchCard.kt
+++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/components/MatchCard.kt
@@ -51,7 +51,7 @@ fun MatchCard(
     Box(modifier = modifier.fillMaxWidth()) {
         val (leftOpponent, rightOpponent) = getOrDefaultOpponents(match.opponents)
         val leagueAndSerieName = "${match.league.name} + ${match.serie.name}"
-        val scheduleConfig = match.status.scheduleConfigFor(match.beginAt)
+        val scheduleConfig = match.matchStatus.scheduleConfigFor(match.beginAt)
 
         Card(
             modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp), onClick = {
@@ -61,7 +61,7 @@ fun MatchCard(
                         rightOpponentId = rightOpponent.id,
                         leagueAndSerieName = leagueAndSerieName,
                         scheduleString = scheduleConfig.first,
-                        status = match.status
+                        matchStatus = match.matchStatus
                     )
                 )
             }, colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)
diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchDetailsRoute.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchDetailsRoute.kt
index c55db96..95361dc 100644
--- a/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchDetailsRoute.kt
+++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchDetailsRoute.kt
@@ -13,7 +13,7 @@ data class MatchDetailsRoute(
     val rightOpponentId: Long,
     val leagueAndSerieName: String,
     val scheduleString: String,
-    val status: MatchStatus
+    val matchStatus: MatchStatus
 )
 
 fun NavGraphBuilder.matchDetailsScreen(onBackClick: () -> Unit) {
diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matchdetails/MatchDetailsScreen.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matchdetails/MatchDetailsScreen.kt
index 15cba17..0ada304 100644
--- a/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matchdetails/MatchDetailsScreen.kt
+++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matchdetails/MatchDetailsScreen.kt
@@ -70,7 +70,7 @@ fun MatchDetailsScreen(
             value.isLoading -> LoadingIndicator()
             value.leftTeam != null && value.rightTeam != null -> Column {
                 MatchupRow(leftTeam = value.leftTeam, rightTeam = value.rightTeam)
-                ScheduleRow(matchDetails.scheduleString, matchDetails.status)
+                ScheduleRow(matchDetails.scheduleString, matchDetails.matchStatus)
             }
         }
     }
@@ -78,11 +78,6 @@ fun MatchDetailsScreen(
 
 @Composable
 fun ScheduleRow(scheduleString: String, matchStatus: MatchStatus) {
-    val modifier = if (matchStatus == MatchStatus.LIVE)
-        Modifier
-            .background(LiveRed, RoundedCornerShape(16.dp))
-            .padding(horizontal = 12.dp, vertical = 8.dp)
-    else Modifier
     Row(
         Modifier
             .fillMaxWidth()
@@ -92,7 +87,11 @@ fun ScheduleRow(scheduleString: String, matchStatus: MatchStatus) {
             scheduleString,
             style = MaterialTheme.typography.headlineMedium,
             color = White,
-            modifier = modifier
+            modifier = if (matchStatus == MatchStatus.LIVE)
+                Modifier
+                    .background(LiveRed, RoundedCornerShape(16.dp))
+                    .padding(horizontal = 12.dp, vertical = 8.dp)
+            else Modifier
         )
     }
 }