Skip to content

πŸ”€ :: (#309) λ””ν…ŒμΌ ν™”λ©΄ μ˜€ν”ˆ μƒνƒœμΌ λ•Œ UI μˆ˜μ • #310

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

Merged
Cjsghkd merged 2 commits into from
Aug 19, 2026
Merged

πŸ”€ :: (#309) λ””ν…ŒμΌ ν™”λ©΄ μ˜€ν”ˆ μƒνƒœμΌ λ•Œ UI μˆ˜μ • #310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b624ec4
:lipstick: λ””ν…ŒμΌ ν™”λ©΄ OPENED μƒνƒœ UI μˆ˜μ •
Cjsghkd Aug 19, 2026
15ee129
:recycle: MSDashHorizontalDivider 곡톡 호좜 μˆ˜μ • 및 isBuried 제거
Cjsghkd Aug 19, 2026
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
207 changes: 104 additions & 103 deletions feature/detail/src/main/java/com/idiotfrogs/detail/DetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ 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.graphics.ColorFilter
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.SpanStyle
Expand Down Expand Up @@ -136,7 +137,6 @@ fun DetailScreen(
val status = capsule?.timeCapsuleStatus ?: TimeCapsuleStatus.BEFOREBURIED
val role = capsule?.userRole ?: TimeCapsuleRole.CONTRIBUTOR
val isHost = role == TimeCapsuleRole.HOST
val isBuried = status == TimeCapsuleStatus.BURIED
var showBuryDialog by remember { mutableStateOf(false) }

val defaultOpenAt = remember {
Expand Down Expand Up @@ -274,7 +274,7 @@ fun DetailScreen(
.fillMaxWidth()
.padding(horizontal = 20.dp, vertical = 24.dp)
) {
if (isBuried) {
if (status == TimeCapsuleStatus.BURIED) {
Row(
modifier = Modifier
.clip(RoundedCornerShape(12.dp))
Expand Down Expand Up @@ -304,39 +304,52 @@ fun DetailScreen(
Row(
modifier = Modifier
.fillMaxWidth()
.wavyStroke(
color = MSTheme.color.primaryLight,
fillColor = MSTheme.color.primaryLight,
contentPadding = 16.dp,
),
horizontalArrangement = Arrangement.SpaceBetween,
.background(
color = MSTheme.color.greyG5,
shape = RoundedCornerShape(12.dp),
)
.padding(12.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Image(
modifier = Modifier.size(16.dp),
painter = painterResource(R.drawable.ic_shovel),
contentDescription = null,
colorFilter = ColorFilter.tint(MSTheme.color.white),
)

Spacer(Modifier.width(8.dp))

MSText(
modifier = Modifier.weight(1f),
text = "νƒ€μž„μΊ‘μŠμ΄ μ—΄λ Έμ–΄μš”!\nν•¨κ»˜ μŒ“μΈ 좔얡을 λ³΄λŸ¬κ°€μš”.",
text = "티켓이 μ˜€ν”ˆλ˜μ—ˆμ–΄μš”!",
fontSize = 14.dp,
color = MSTheme.color.primaryDark,
color = MSTheme.color.white,
)

Spacer(Modifier.width(12.dp))

MSButton(
onClick = { onAction(DetailAction.PreviewClicked(capsuleId)) },
colors = ButtonDefaults.buttonColors(
containerColor = MSTheme.color.greyG5,
),
contentPadding = PaddingValues(horizontal = 12.dp, vertical = 9.dp),
Row(
modifier = Modifier.noRippleClickable { onAction(DetailAction.PreviewClicked(capsuleId)) },
verticalAlignment = Alignment.CenterVertically,
) {
MSText(
text = "λ³΄λŸ¬κ°€κΈ°",
fontSize = 12.dp,
fontWeight = FontWeight.Medium,
color = MSTheme.color.white,
)

Spacer(Modifier.width(4.dp))

Image(
modifier = Modifier.size(16.dp),
painter = painterResource(R.drawable.ic_chevron_right),
contentDescription = null,
colorFilter = ColorFilter.tint(MSTheme.color.white),
)
}
}

Spacer(Modifier.height(16.dp))
Spacer(Modifier.height(24.dp))
}

MSText(
Expand Down Expand Up @@ -367,16 +380,17 @@ fun DetailScreen(
color = MSTheme.color.greyG3,
)

Spacer(Modifier.height(28.dp))
MSDashHorizontalDivider(
thickness = 2.dp,
dashWidth = 8.dp,
gapWidth = 8.dp,
color = MSTheme.color.greyG1,
)

when (status) {
TimeCapsuleStatus.BEFOREBURIED -> {
if (isHost) {
Spacer(Modifier.height(28.dp))
MSDashHorizontalDivider(
thickness = 2.dp,
dashWidth = 8.dp,
gapWidth = 8.dp,
color = MSTheme.color.greyG1,
)
Spacer(Modifier.height(28.dp))
Row(
modifier = Modifier.fillMaxWidth(),
Expand Down Expand Up @@ -409,25 +423,10 @@ fun DetailScreen(
gapWidth = 8.dp,
color = MSTheme.color.greyG1,
)
} else {
Spacer(Modifier.height(28.dp))
MSDashHorizontalDivider(
thickness = 2.dp,
dashWidth = 8.dp,
gapWidth = 8.dp,
color = MSTheme.color.greyG1,
)
}
}

TimeCapsuleStatus.BURIED -> {
Spacer(Modifier.height(28.dp))
MSDashHorizontalDivider(
thickness = 2.dp,
dashWidth = 8.dp,
gapWidth = 8.dp,
color = MSTheme.color.greyG1,
)
Spacer(Modifier.height(28.dp))
Box(
modifier = Modifier
Expand Down Expand Up @@ -484,75 +483,77 @@ fun DetailScreen(
TimeCapsuleStatus.OPENED -> Unit
}

Spacer(Modifier.height(28.dp))

Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
MSText(
text = "λ‚˜μ˜ μΆ”μ–΅ λ©”μ‹œμ§€",
color = MSTheme.color.greyG4,
)
Image(
modifier = Modifier
.size(16.dp)
.noRippleClickable { onAction(DetailAction.MessageSectionClicked(capsuleId)) },
painter = painterResource(R.drawable.ic_chevron_right),
contentDescription = "μΆ”μ–΅ λ©”μ‹œμ§€ 상세 μ•„μ΄μ½˜"
)
}

Spacer(Modifier.height(20.dp))
if (status != TimeCapsuleStatus.OPENED) {
Spacer(Modifier.height(28.dp))

Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Column(
modifier = Modifier
.weight(1f)
.wavyStroke(
color = MSTheme.color.primaryLight,
fillColor = MSTheme.color.primaryLight,
contentPadding = 16.dp,
),
verticalArrangement = Arrangement.Center,
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
MSText(
text = "λ©”μ‹œμ§€",
fontSize = 12.dp,
color = MSTheme.color.primaryDark,
text = "λ‚˜μ˜ μΆ”μ–΅ λ©”μ‹œμ§€",
color = MSTheme.color.greyG4,
)
Spacer(Modifier.height(4.dp))
MSText(
text = "${capsule?.myContentCount}개 등둝",
fontSize = 12.dp,
fontWeight = FontWeight.Medium,
color = MSTheme.color.primaryDark,
Image(
modifier = Modifier
.size(16.dp)
.noRippleClickable { onAction(DetailAction.MessageSectionClicked(capsuleId)) },
painter = painterResource(R.drawable.ic_chevron_right),
contentDescription = "μΆ”μ–΅ λ©”μ‹œμ§€ 상세 μ•„μ΄μ½˜"
)
}

Column(
modifier = Modifier
.weight(1f)
.wavyStroke(
color = MSTheme.color.primaryLight,
fillColor = MSTheme.color.primaryLight,
contentPadding = 16.dp,
),
verticalArrangement = Arrangement.Center,
) {
MSText(
text = "사진",
fontSize = 12.dp,
color = MSTheme.color.primaryDark,
)
Spacer(Modifier.height(4.dp))
MSText(
text = "${capsule?.myImageCount}개 등둝",
fontSize = 12.dp,
fontWeight = FontWeight.Medium,
color = MSTheme.color.primaryDark,
)
Spacer(Modifier.height(20.dp))

Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Column(
modifier = Modifier
.weight(1f)
.wavyStroke(
color = MSTheme.color.primaryLight,
fillColor = MSTheme.color.primaryLight,
contentPadding = 16.dp,
),
verticalArrangement = Arrangement.Center,
) {
MSText(
text = "λ©”μ‹œμ§€",
fontSize = 12.dp,
color = MSTheme.color.primaryDark,
)
Spacer(Modifier.height(4.dp))
MSText(
text = "${capsule?.myContentCount}개 등둝",
fontSize = 12.dp,
fontWeight = FontWeight.Medium,
color = MSTheme.color.primaryDark,
)
}

Column(
modifier = Modifier
.weight(1f)
.wavyStroke(
color = MSTheme.color.primaryLight,
fillColor = MSTheme.color.primaryLight,
contentPadding = 16.dp,
),
verticalArrangement = Arrangement.Center,
) {
MSText(
text = "사진",
fontSize = 12.dp,
color = MSTheme.color.primaryDark,
)
Spacer(Modifier.height(4.dp))
MSText(
text = "${capsule?.myImageCount}개 등둝",
fontSize = 12.dp,
fontWeight = FontWeight.Medium,
color = MSTheme.color.primaryDark,
)
}
}
}

Expand Down
Loading