Skip to content

Commit

Permalink
Merge pull request #19 from gyurim/issue-#18/FixItem
Browse files Browse the repository at this point in the history
[issue-#18] 아이템 높이 수정 및 빈 스트링 처리
  • Loading branch information
014967 authored Oct 6, 2022
2 parents 0de4643 + f6632fa commit 374ac4e
Showing 1 changed file with 17 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fun BoxOfficeItem(
Row(
modifier = Modifier
.fillMaxWidth()
.height(100.dp)
.height(150.dp)
.clickable(
interactionSource = interactionSource,
indication = null
Expand Down Expand Up @@ -130,15 +130,21 @@ fun BoxOfficeItem(
.fillMaxHeight()
.width(150.dp)
) {
Text(
modifier = Modifier,
text = "영화 제목 : ${boxOffice.movieName}"
)
Text(
modifier = Modifier,
text = "개봉일 : ${boxOffice.movieOpen}"
)
Text(text = "관객 수 : ${boxOffice.audiAcc}")
if (boxOffice.movieName.isNotEmpty()) {
Text(
modifier = Modifier,
text = "영화 제목 : ${boxOffice.movieName}"
)
}
if (boxOffice.movieOpen.isNotEmpty() && boxOffice.movieOpen.isNotBlank()) {
Text(
modifier = Modifier,
text = "개봉일 : ${boxOffice.movieOpen}"
)
}
if (boxOffice.audiAcc.isNotEmpty() && boxOffice.audiAcc.isNotBlank()) {
Text(text = "관객 수 : ${boxOffice.audiAcc}")
}
}

if (boxOffice.rankInten.toInt() < 0) {
Expand Down Expand Up @@ -195,7 +201,7 @@ fun DummyBoxOfficeItem(
Row(
modifier = Modifier
.fillMaxWidth()
.height(100.dp),
.height(150.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Expand Down

0 comments on commit 374ac4e

Please sign in to comment.