Merge pull request #94 from eshc123/feature/mod-home-screen

[FEATURE] Modified Home Screen Team DashBoard
eshc123 · Jun 9, 2024 · f80da90 · f80da90
2 parents c84ffa3 + 957c25f
commit f80da90
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/core/data/src/main/java/com/eshc/goonersapp/core/data/mapper/SeasonMapper.kt b/core/data/src/main/java/com/eshc/goonersapp/core/data/mapper/SeasonMapper.kt
@@ -29,5 +29,6 @@ fun RemoteRank.toModel() = Rank(
     goalDifference = goalDifference,
     teamId = teamId,
     teamName = teamName,
+    teamImgUrl = teamImgUrl,
     shortCode = shortCode
 )
diff --git a/core/domain/src/main/java/com/eshc/goonersapp/core/domain/model/season/Rank.kt b/core/domain/src/main/java/com/eshc/goonersapp/core/domain/model/season/Rank.kt
@@ -10,6 +10,7 @@ data class Rank(
     val goalDifference: Int,
     val teamId: Int,
     val teamName: String,
+    val teamImgUrl: String,
     val shortCode: String
 ) {
     fun getTotalGames(): Int = wins + draw + loss

diff --git a/core/network/src/main/java/com/eshc/goonersapp/core/network/model/season/RemoteRank.kt b/core/network/src/main/java/com/eshc/goonersapp/core/network/model/season/RemoteRank.kt
@@ -14,5 +14,6 @@ data class RemoteRank(
     @SerialName("goal_difference") val goalDifference : Int,
     @SerialName("team_id") val teamId : Int,
     @SerialName("team_name") val teamName : String,
+    @SerialName("team_image_url") val teamImgUrl: String,
     @SerialName("short_code") val shortCode : String,
 )
diff --git a/feature/home/src/main/java/com/eshc/goonersapp/feature/home/component/DashboardCard.kt b/feature/home/src/main/java/com/eshc/goonersapp/feature/home/component/DashboardCard.kt
@@ -75,7 +75,7 @@ fun DashboardCard(
                 LeagueDashboardItem(
                     rank = rank.position,
                     teamId = rank.teamId,
-                    teamImgUrl = "",
+                    teamImgUrl = rank.teamImgUrl,
                     teamShortName = rank.shortCode,
                     totalGames = rank.getTotalGames(),
                     wins = rank.wins,
@@ -127,7 +127,7 @@ fun LeagueDashboardRow(modifier: Modifier = Modifier) {
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .padding(start = 10.dp, end = 17.dp),
+            .padding(start = 17.dp, end = 17.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
@@ -145,36 +145,42 @@ fun LeagueDashboardRow(modifier: Modifier = Modifier) {
         )
         Text(
             text = "PL",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
         )
         Text(
             text = "W",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
         )
         Text(
             text = "D",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
         )
         Text(
             text = "L",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
         )
         Text(
             text = "GD",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
         )
         Text(
             text = "Pts",
+            textAlign = TextAlign.Center,
             modifier = modifier.weight(1f),
             color = ColorFF9E9E9E,
             style = GnrTypography.descriptionMedium
@@ -207,7 +213,7 @@ fun LeagueDashboardItem(
         Row(
             modifier = modifier
                 .fillMaxWidth()
-                .padding(top = 2.dp, bottom = 2.dp, end = 17.dp, start = 10.dp),
+                .padding(top = 2.dp, bottom = 2.dp, end = 17.dp, start = 17.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
@@ -225,37 +231,43 @@ fun LeagueDashboardItem(
             )
             Text(
                 text = "$totalGames",
+                textAlign = TextAlign.Center,
                 modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2Regular
             )
             Text(
-                text = "$wins", 
-                modifier = modifier.weight(1f), 
+                text = "$wins",
+                textAlign = TextAlign.Center,
+                modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2Regular
             )
             Text(
                 text = "$draws",
+                textAlign = TextAlign.Center,
                 modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2Regular
             )
             Text(
                 text = "$losses",
+                textAlign = TextAlign.Center,
                 modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2Regular
             )
 
             Text(
                 text = "${if(goalDiff > 0)"+" else ""}${goalDiff}",
+                textAlign = TextAlign.Center,
                 modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2Regular
             )
             Text(
                 text = "$points",
+                textAlign = TextAlign.Center,
                 modifier = modifier.weight(1f),
                 color = cardItemTextColor,
                 style = GnrTypography.body2SemiBold