-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[feat ::102] 신청 퍼블리싱 #103
Merged
The head ref may contain hidden characters: "feature/102-feat-\uC2E0\uCCAD-\uD37C\uBE14\uB9AC\uC2F1"
Merged
[feat ::102] 신청 퍼블리싱 #103
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,26 @@ | ||
package team.aliens.dms.kmp.feature.application.ui | ||
|
||
import androidx.compose.material3.Text | ||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.border | ||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Row | ||
import androidx.compose.foundation.layout.Spacer | ||
import androidx.compose.foundation.layout.fillMaxSize | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.unit.dp | ||
import team.aliens.dms.kmp.core.designsystem.appbar.DmsTopAppBar | ||
import team.aliens.dms.kmp.core.designsystem.button.ButtonColor | ||
import team.aliens.dms.kmp.core.designsystem.button.ButtonType | ||
import team.aliens.dms.kmp.core.designsystem.button.DmsButton | ||
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTheme | ||
import team.aliens.dms.kmp.core.designsystem.foundation.DmsTypography | ||
import team.aliens.dms.kmp.core.designsystem.text.DmsText | ||
|
||
@Composable | ||
internal fun Application() { | ||
|
@@ -10,5 +29,107 @@ internal fun Application() { | |
|
||
@Composable | ||
private fun ApplicationScreen() { | ||
Text("신청") | ||
Column( | ||
modifier = Modifier | ||
.fillMaxSize() | ||
.background(DmsTheme.colors.background), | ||
horizontalAlignment = Alignment.CenterHorizontally, | ||
) { | ||
DmsTopAppBar(title = "신청") | ||
Column( | ||
modifier = Modifier | ||
.fillMaxSize() | ||
.padding( | ||
horizontal = 24.dp, | ||
vertical = 28.dp, | ||
), | ||
verticalArrangement = Arrangement.spacedBy(24.dp), | ||
) { | ||
ApplicationCard( | ||
title = "잔류", | ||
description = "주말 기숙사 잔류 여부를 확인하고, 잔류 신청을 통해서 잔류 또는 귀가를 신청해 보세요.", | ||
buttonText = "잔류 신청하기", | ||
onButtonClick = { }, | ||
) | ||
ApplicationCard( | ||
title = "외출", | ||
appliedTitle = "금요 귀가", | ||
description = "기숙사 생활 중 밖으로 나갈 일이 있다면, 외출 신청을 통해서 외출해 보세요.", | ||
buttonText = "와출 신청하기", | ||
onButtonClick = { }, | ||
) | ||
} | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion 상태 처리 개선 필요
|
||
|
||
@Composable | ||
private fun ApplicationCard( | ||
modifier: Modifier = Modifier, | ||
title: String, | ||
appliedTitle: String? = null, | ||
description: String, | ||
buttonText: String, | ||
onButtonClick: () -> Unit, | ||
) { | ||
Column( | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.border( | ||
width = 1.dp, | ||
color = DmsTheme.colors.surface, | ||
shape = RoundedCornerShape(10.dp), | ||
) | ||
.background( | ||
color = DmsTheme.colors.background, | ||
shape = RoundedCornerShape(10.dp), | ||
) | ||
.padding( | ||
horizontal = 20.dp, | ||
vertical = 16.dp, | ||
), | ||
verticalArrangement = Arrangement.spacedBy(20.dp), | ||
) { | ||
Column( | ||
verticalArrangement = Arrangement.spacedBy(12.dp), | ||
) { | ||
Row( | ||
verticalAlignment = Alignment.CenterVertically, | ||
) { | ||
DmsText( | ||
text = title, | ||
style = DmsTypography.Header3, | ||
color = DmsTheme.colors.onBackground, | ||
) | ||
Spacer(modifier = Modifier.weight(1f)) | ||
appliedTitle?.let { text -> | ||
DmsText( | ||
modifier = Modifier | ||
.background( | ||
color = DmsTheme.colors.primary, | ||
shape = RoundedCornerShape(24.dp), | ||
) | ||
.padding( | ||
horizontal = 16.dp, | ||
vertical = 6.dp, | ||
), | ||
text = text, | ||
style = DmsTypography.Caption, | ||
color = DmsTheme.colors.inversePrimary, | ||
) | ||
} | ||
} | ||
DmsText( | ||
text = description, | ||
style = DmsTypography.Body3, | ||
color = DmsTheme.colors.tertiaryContainer, | ||
) | ||
} | ||
DmsButton( | ||
modifier = Modifier.fillMaxWidth(), | ||
text = buttonText, | ||
buttonType = ButtonType.Contained, | ||
buttonColor = ButtonColor.Primary, | ||
onClick = onButtonClick, | ||
) | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
오타 수정 필요
"와출 신청하기"에 오타가 있습니다. "외출 신청하기"로 수정해 주세요.
📝 Committable suggestion