[Feat/IPLC-15] 자격증 관리 뷰 UI 작업 #190
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
|
Member
There was a problem hiding this comment. [3]: ㅋㅋㅋㅋ 병렬작업하느라 이전 pr에 잇는거 여기도 잇음 헐랭띠 |
This file contains hidden or 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,67 @@ | ||
| package org.sopt.certi.core.component.header | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import org.sopt.certi.R | ||
| import org.sopt.certi.core.util.noRippleClickable | ||
| import org.sopt.certi.core.util.screenHeightDp | ||
| import org.sopt.certi.core.util.screenWidthDp | ||
| import org.sopt.certi.ui.theme.CERTITheme | ||
| import org.sopt.certi.ui.theme.CertiTheme | ||
|
|
||
| @Composable | ||
| fun MyPageHeader( | ||
| modifier: Modifier = Modifier, | ||
| headerTitle: String? = null, | ||
| isSaveEnable: Boolean = false, | ||
| onSaveClick: (() -> Unit)? = null | ||
| ) { | ||
| Box( | ||
| modifier = modifier.fillMaxWidth() | ||
| ) { | ||
| headerTitle?.let { | ||
| Text( | ||
| text = headerTitle, | ||
| style = CertiTheme.typography.subtitle.semibold_20, | ||
| color = CertiTheme.colors.gray600, | ||
| modifier = Modifier.align(Alignment.Center) | ||
| ) | ||
| } | ||
|
|
||
| onSaveClick?.let { | ||
| Text( | ||
| text = stringResource(R.string.personal_save), | ||
| style = CertiTheme.typography.body.semibold_18, | ||
| color = if (isSaveEnable) CertiTheme.colors.mainBlue else CertiTheme.colors.gray400, | ||
| modifier = Modifier | ||
| .align(Alignment.CenterEnd) | ||
| .noRippleClickable { | ||
| if (isSaveEnable) { | ||
| onSaveClick() | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun EditPersonalInfoHeaderPreview() { | ||
| CERTITheme { | ||
| MyPageHeader( | ||
| headerTitle = "헤더", | ||
| isSaveEnable = false, | ||
| onSaveClick = {}, | ||
| modifier = Modifier.padding(vertical = screenHeightDp(22.dp), horizontal = screenWidthDp(20.dp)) | ||
| ) | ||
| } | ||
| } |
This file contains hidden or 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,41 @@ | ||
| package org.sopt.certi.core.component.section | ||
|
|
||
| import androidx.annotation.DrawableRes | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.res.vectorResource | ||
| import androidx.compose.ui.unit.dp | ||
| import org.sopt.certi.core.util.screenWidthDp | ||
| import org.sopt.certi.ui.theme.CertiTheme | ||
|
|
||
| @Composable | ||
| fun CertInfoSection( | ||
| @DrawableRes iconRes: Int, | ||
| testInfo: String, | ||
| modifier: Modifier = Modifier, | ||
| iconColor: Color = CertiTheme.colors.gray300 | ||
| ) { | ||
| Row( | ||
| modifier = modifier, | ||
| horizontalArrangement = Arrangement.spacedBy(screenWidthDp(4.dp)), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Icon( | ||
| imageVector = ImageVector.vectorResource(iconRes), | ||
| contentDescription = null, | ||
| tint = iconColor | ||
| ) | ||
| Text( | ||
| text = testInfo, | ||
| style = CertiTheme.typography.caption.regular_14, | ||
| color = CertiTheme.colors.black | ||
| ) | ||
| } | ||
| } |
This file contains hidden or 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,54 @@ | ||
| package org.sopt.certi.core.component.section | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import androidx.compose.ui.res.vectorResource | ||
| import androidx.compose.ui.unit.dp | ||
| import org.sopt.certi.R | ||
| import org.sopt.certi.core.util.noRippleClickable | ||
| import org.sopt.certi.core.util.screenWidthDp | ||
| import org.sopt.certi.ui.theme.CertiTheme | ||
|
|
||
| @Composable | ||
| fun CertItemTitleSection( | ||
| certName: String, | ||
| certType: String, | ||
| modifier: Modifier = Modifier, | ||
| onFavoriteClick: (() -> Unit)? = null, | ||
| isFavorite: Boolean = false | ||
| ) { | ||
| Row( | ||
| modifier = modifier, | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.spacedBy(screenWidthDp(8.dp)) | ||
| ) { | ||
| Text( | ||
| text = certName, | ||
| style = CertiTheme.typography.subtitle.semibold_20, | ||
| color = CertiTheme.colors.black | ||
| ) | ||
| Text( | ||
| text = certType, | ||
| style = CertiTheme.typography.caption.regular_12, | ||
| color = CertiTheme.colors.black | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.weight(1f)) | ||
|
|
||
| onFavoriteClick?.let { | ||
| Icon( | ||
| imageVector = ImageVector.vectorResource(R.drawable.ic_star_24), | ||
| contentDescription = null, | ||
| tint = if (isFavorite) CertiTheme.colors.subYellow else CertiTheme.colors.gray100, | ||
| modifier = Modifier.noRippleClickable(onFavoriteClick) | ||
| ) | ||
| } | ||
| } | ||
| } |
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.
[3]: 기존에 있던거 확장하는거 넘넘 조음 역시 리드