From e5a85865607e54739a6534ac97577968b15cd376 Mon Sep 17 00:00:00 2001 From: FirephoenixX02 Date: Fri, 12 Apr 2024 13:15:52 +0200 Subject: [PATCH] Minor changes --- composeApp/src/commonMain/kotlin/DetailScreen.kt | 2 +- composeApp/src/commonMain/kotlin/PokemonStatCard.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/DetailScreen.kt b/composeApp/src/commonMain/kotlin/DetailScreen.kt index 43bf8a3..d10b303 100644 --- a/composeApp/src/commonMain/kotlin/DetailScreen.kt +++ b/composeApp/src/commonMain/kotlin/DetailScreen.kt @@ -115,7 +115,7 @@ data class DetailScreen( detailRow("Type:", pokemonData?.type?.capitalize() ?: "") detailRow("Base XP:", pokemonData?.baseExperience.toString()) detailRow("Height:", pokemonData?.height.toString()) - detailRow("Weight:", pokemonData?.weight.toString()) + detailRow("Weight:", pokemonData?.weight.toString() + "kg") } } diff --git a/composeApp/src/commonMain/kotlin/PokemonStatCard.kt b/composeApp/src/commonMain/kotlin/PokemonStatCard.kt index 3a4d42e..ce53c0b 100644 --- a/composeApp/src/commonMain/kotlin/PokemonStatCard.kt +++ b/composeApp/src/commonMain/kotlin/PokemonStatCard.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape @@ -14,6 +15,7 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp @@ -55,7 +57,7 @@ private fun StatRow(statName: String, progress: Int, color: Color) { Spacer(modifier = Modifier.width(16.dp)) LinearProgressIndicator( progress = progress / 200f, - modifier = Modifier.weight(2f), + modifier = Modifier.weight(2f).height(8.dp).clip(RoundedCornerShape(8.dp)), color = color, ) }