Skip to content

Commit 636c484

Browse files
authored
Merge #62 -> develop
[Mod/#58] 마이페이지 디테일 수정
2 parents 68b8bcf + b1a643b commit 636c484

File tree

15 files changed

+447
-406
lines changed

15 files changed

+447
-406
lines changed

app/src/main/java/com/paw/key/core/designsystem/component/CourseCard.kt

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
2020
import androidx.compose.material3.Icon
2121
import androidx.compose.material3.Text
2222
import androidx.compose.runtime.Composable
23+
import androidx.compose.runtime.mutableStateOf
24+
import androidx.compose.runtime.remember
2325
import androidx.compose.ui.Alignment
2426
import androidx.compose.ui.Modifier
2527
import androidx.compose.ui.draw.clip
@@ -88,7 +90,7 @@ fun CourseCard(
8890
verticalAlignment = Alignment.CenterVertically,
8991
modifier = Modifier
9092
.align(Alignment.BottomStart)
91-
.padding(start = 16.dp, bottom = 16.dp)
93+
.padding(start = 16.dp, end = 16.dp,bottom = 16.dp)
9294
) {
9395
AsyncImage(
9496
model = ImageRequest.Builder(LocalContext.current)
@@ -119,23 +121,32 @@ fun CourseCard(
119121
Text(
120122
text = date,
121123
style = PawKeyTheme.typography.caption12R,
122-
color = PawKeyTheme.colors.gray300
124+
color = PawKeyTheme.colors.gray100
123125
)
124126
}
125127
}
126-
Spacer(modifier = Modifier.width(120.dp))
128+
Spacer(modifier = Modifier.weight(1f)) // 아이콘을 Row 끝으로 밀기 위한 Spacer
129+
130+
val isLiked = remember { mutableStateOf(false) }
127131

128132
Icon(
129-
imageVector = ImageVector.vectorResource(id = R.drawable.ic_heart_default),
130-
modifier = modifier.clickable { },
131-
tint = PawKeyTheme.colors.white1,
132-
contentDescription = "찜하기"
133+
imageVector = if (isLiked.value) {
134+
ImageVector.vectorResource(id = R.drawable.ic_heart_filled)
135+
} else {
136+
ImageVector.vectorResource(id = R.drawable.ic_heart_default)
137+
},
138+
contentDescription = "좋아요",
139+
tint = Color.Unspecified,
140+
modifier = Modifier.clickable {
141+
isLiked.value = !isLiked.value
142+
}
133143
)
134144
}
135145
}
136146

137147
Spacer(modifier = Modifier.height(12.dp))
138-
//칩로우 넣깅
148+
149+
139150
ChipRow(tags = listOf(
140151
"이륜차 거의 없음",
141152
"배변 쓰레기통",

0 commit comments

Comments
 (0)