Skip to content

Commit

Permalink
Merge pull request #40 from DACOS-SOLUX-Hackathon-Team5/feature/26-pr…
Browse files Browse the repository at this point in the history
…ebabsang-getapi

끝!!!!!
  • Loading branch information
gaeulzzang authored Nov 8, 2024
2 parents f290aeb + 59088e0 commit d4d9868
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import com.hackathon.alddeul_babsang.core_ui.theme.Blue
import com.hackathon.alddeul_babsang.core_ui.theme.Font_B04
import com.hackathon.alddeul_babsang.core_ui.theme.Orange700
import com.hackathon.alddeul_babsang.core_ui.theme.Pink
import com.hackathon.alddeul_babsang.core_ui.theme.White
import com.hackathon.alddeul_babsang.core_ui.theme.Yellow
import com.hackathon.alddeul_babsang.core_ui.theme.body1Semi
import com.hackathon.alddeul_babsang.core_ui.theme.body4Regular
Expand All @@ -51,7 +52,13 @@ fun DetailRecommendedItem(
color = Black
)
Text(
text = data.category,
modifier = Modifier.padding(top = 6.dp),
text = when(data.category) {
"KOREAN" -> "한식"
"CHINESE" -> "중식"
"WESTERN_JAPANESE" -> "경양식/일식"
else -> "기타외식업"
},
style = body4Regular,
color = Font_B04
)
Expand Down Expand Up @@ -89,9 +96,9 @@ fun LoadImage2(codeName: String) {
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
.padding(horizontal = 15.dp)
.padding(bottom = 80.dp)
.padding(top = 15.dp)
.align(Alignment.Center)
.padding(vertical = 40.dp)
.padding(horizontal = 40.dp)
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ fun DetailScreen(
) {
AsyncImage(
model = data.storeInfo.imageUrl ?: when (data.storeInfo.category) {
"한식" -> R.drawable.ic_korean_food
"중식" -> R.drawable.ic_chinese_food
"경양식/일식" -> R.drawable.ic_japanese_food
"KOREAN" -> R.drawable.ic_korean_food
"CHINESE" -> R.drawable.ic_chinese_food
"WESTERN_JAPANESE" -> R.drawable.ic_japanese_food
else -> R.drawable.ic_etc_food
},
contentDescription = null,
Expand Down

0 comments on commit d4d9868

Please sign in to comment.