[Feature/#8] : 약속 확정 페이지 구현 #14
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
|
There was a problem hiding this comment. P3: 이 버튼 각자 다 만든걸로 알고있는데 뭘로 통일할까요?? There was a problem hiding this comment. 나중에 다 통일해야될 것 같아유.. 😢 |
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 |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.sopt.core.designsystem.component.button | ||
|
|
||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import com.sopt.core.designsystem.theme.NoostakTheme | ||
|
|
||
| @Composable | ||
| fun NoostakButton( | ||
| modifier: Modifier = Modifier, | ||
| text: String, | ||
| onButtonClick: () -> Unit, | ||
| isEnabled: Boolean | ||
| ) { | ||
| BaseButton( | ||
| modifier = modifier.fillMaxWidth(), | ||
| isEnabled = isEnabled, | ||
| shape = RoundedCornerShape(8.dp), | ||
| style = NoostakTheme.typography.t3Bold, | ||
| paddingVertical = 15.dp, | ||
| text = text, | ||
| onButtonClick = { onButtonClick() } | ||
| ) | ||
|
There was a problem hiding this comment. P3: 오 BaseButton 활용하는거 너무 좋습니다!! |
||
| } | ||
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
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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package com.sopt.core.designsystem.component.dialog | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.ButtonDefaults | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.dp | ||
| import com.sopt.core.designsystem.theme.NoostakTheme | ||
| import com.sopt.core.extension.noRippleClickable | ||
| import com.sopt.core.util.NoRippleInteractionSource | ||
|
|
||
| @Composable | ||
| fun AppointmentDialog( | ||
| onDismissRequest: () -> Unit, | ||
| onConfirmButtonClick: () -> Unit, | ||
| description: String, | ||
| dismissText: String, | ||
| confirmButtonText: String | ||
| ) { | ||
| BaseDialog( | ||
| onDismissRequest = onDismissRequest, | ||
| radius = 20.dp | ||
| ) { | ||
| Column( | ||
| modifier = Modifier.padding(35.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center | ||
| ) { | ||
| Box( | ||
| modifier = Modifier | ||
| .size(53.dp) | ||
| .background( | ||
| shape = CircleShape, | ||
| color = NoostakTheme.colors.gray200 | ||
| ) | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Text( | ||
| text = description, | ||
| color = NoostakTheme.colors.gray900, | ||
| style = NoostakTheme.typography.b2Regular, | ||
| textAlign = TextAlign.Center | ||
| ) | ||
| Spacer(modifier = Modifier.height(20.dp)) | ||
| Button( | ||
| modifier = Modifier.padding(horizontal = 36.dp, vertical = 8.5.dp), | ||
|
There was a problem hiding this comment. P3: 소수는 사용을 지양하고 반올림하여 정수 단위를 사용하는 걸로 알고 있는데 디자인 측에 문의해볼까요??
There was a problem hiding this comment. 요 부분 디자인 확정이 안나서 소수점 부분은 일단 패스해주세욥 |
||
| colors = ButtonDefaults.buttonColors( | ||
| containerColor = NoostakTheme.colors.gray700 | ||
| ), | ||
| shape = RoundedCornerShape(6.dp), | ||
| onClick = onConfirmButtonClick, | ||
| interactionSource = NoRippleInteractionSource | ||
| ) { | ||
| Text( | ||
| text = confirmButtonText, | ||
| color = NoostakTheme.colors.white, | ||
| textAlign = TextAlign.Center | ||
| ) | ||
| } | ||
| Spacer(modifier = Modifier.height(6.5.dp)) | ||
| Text( | ||
| modifier = Modifier.noRippleClickable { onDismissRequest() }, | ||
| text = dismissText, | ||
| color = NoostakTheme.colors.gray700, | ||
| style = NoostakTheme.typography.b2Regular | ||
| ) | ||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
P3: 여기 컬러 값도 받아와서 사용하는걸로 바꾸면 활용도가 높아질 것 같습니다!
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.
컴포넌트 나중에 역할 분담해서 싹다 통일시켜봅시다 ㅠ