diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt index 2fd83d0..0c2d722 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt @@ -3,6 +3,7 @@ package de.cdaut.dbtapp.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -12,12 +13,13 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.ArrowDropUp -import androidx.compose.material.icons.outlined.Star +import androidx.compose.material.icons.filled.Star import androidx.compose.material.icons.outlined.StarOutline import androidx.compose.material3.Card import androidx.compose.material3.Icon @@ -28,6 +30,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue 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.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -72,7 +75,7 @@ fun SkillsCategoryCard(skills: List, title: String) { modifier = Modifier .fillMaxWidth() .clickable(onClick = { enabled = !enabled }), - ) { + ) { TitleText( modifier = Modifier.padding(10.dp), content = title @@ -129,16 +132,29 @@ private fun SingleSkillCard(title: String, description: String) { DescriptionText(description) } - Icon( - modifier = Modifier - .padding(10.dp) - .clickable(onClick = { - selected = !selected - }), - imageVector = if (selected) Icons.Outlined.Star else Icons.Outlined.StarOutline, - contentDescription = stringResource(R.string.desc_btn_fav), - tint = if (selected) Color.Yellow else Color.Black - ) + Box( + modifier = Modifier.clip(CircleShape), + contentAlignment = Alignment.Center + ) { + if (selected) { + Icon( + modifier = Modifier.clip(CircleShape), + imageVector = Icons.Filled.Star, + contentDescription = "Filled Star", + tint = Color.Yellow + ) + } + Icon( + modifier = Modifier + .clip(CircleShape) + .padding(10.dp) + .clickable(onClick = { + selected = !selected + }), + imageVector = Icons.Outlined.StarOutline, + contentDescription = stringResource(R.string.desc_btn_fav) + ) + } } } \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt index 7dbdeed..23dad64 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt @@ -21,17 +21,17 @@ class Skill( fun mockSkills(): List { return listOf( Skill( - title = "Test Hallo :3", - description = "lorem ipsum dolor sid amnet consequetur blabla yada yada" + title = "5-4-3-2-1", + description = "5 sehen, 5 hören, 5 fühlen, 4 sehen, 4 hören…" ), Skill( - title = "5-4-3-2-1", + title = "Skilltitel", description = "Hier kurz beschreiben wie die Übung funktioniert. Ggf. mehrere Zeilen aber nicht super lang" ), - Skill( - title = "UwU UwU awawawa", - description = "Just arf a little like the good fopsgirl you are :3" - ) +// Skill( +// title = "UwU UwU awawawa", +// description = "Just arf a little like the good fopsgirl you are :3" +// ) ) } }