Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

끝!!!!! #40

Merged
merged 1 commit into from
Nov 8, 2024
Merged

끝!!!!! #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ...in/java/com/hackathon/alddeul_babsang/presentation/detail/screen/DetailRecommendedItem.kt
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions app/src/main/java/com/hackathon/alddeul_babsang/presentation/detail/screen/DetailScreen.kt
View file
Open in desktop
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
Loading