-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [UI] #10 text 간격 조절 * [UI] #10 icon만 존재하는 PokitButton의 좌우 패딩값이 상하 패딩값과 동일해지도록 수정 * [UI] #10 컴포넌트 이름 변경 CategoryCard -> PokitList * [FEATURE] #10 PokitCard 컴포넌트 구현 * [UI] #10 LinkCard 컴포넌트에서 즐겨찾기 제거 및 안읽음 표시 UI 수정 * [UI] #10 LabeledInput에서 글자수 표시 부분을 선택 가능하도록 수정 * [UI] #10 PokitButton Large 사이즈의 높이 조정 * [UI] #10 typography의 글자 크기를 sp에서 dp로 수정 * [UI] #10 PokitBottomSheet가 시스템 navigation bar영역에 겹쳐보이는 문제 수정 * [UI] #10 ktlintFormat 적용 * [UI] #10 PokitInput Default, Input 상태일 시 디자인 수정 및 Round Shape일 때 높이 수정 * [UI] #10 PushCard 컴포넌트 구현 * [chore] core:ui 모듈 추가 * [ui] 로그인 화면 UI 구현 * [chore] ci 코드 컨벤션 반영 * [chore] 로그인 프로세스 string resouce 추가 * [ui] 디자인 시스템 수정 - checkbox iconOnly 대응 * [chore] string resource 추가 * [chore] 디자인 시스템 반영 및 리소스 적용 * [ui] 약관화면 구현 * [chore] string id 수정 * [chore] adjustResize 속성 추가 * [feature] LoginNavHost 구현 * [ui] LoginScreen 구현 * [chore] string resource 수정 * [feature] 약관동의 화면 구현 * [ui] 체크박스 디자인시스템 로직 수정 * [chore] string resource 추가 * [ui] 카테고리, 회원가입 완료 화면 추가 * [chore] 코딩 컨벤션 반영 * [chore] loginbutton 패키지 추가 및 파일 이동 * [chore] string 및 디자인 resource casting * [chore] 컨벤션 반영 * [chore] 컨벤션 반영 * [chore] Preview 수정 * [chore] 로그인 버튼 속성 수정 * [chore] 미사용 리소스 제거 * [chore] padding 속성 수정 --------- Co-authored-by: yunsehwan <[email protected]>
- Loading branch information
Showing
18 changed files
with
814 additions
and
9 deletions.
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
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
86 changes: 86 additions & 0 deletions
86
.../ui/src/main/java/pokitmons/pokit/core/ui/components/atom/loginbutton/PokitLoginButton.kt
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,86 @@ | ||
| package pokitmons.pokit.core.ui.components.atom.loginbutton | ||
|
|
||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Surface | ||
| 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.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
| import pokitmons.pokit.core.ui.R | ||
| import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitLoginButtonType | ||
| import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitLoginResource | ||
| import pokitmons.pokit.core.ui.theme.PokitTheme | ||
|
|
||
| @Composable | ||
| fun PokitLoginButton( | ||
| modifier: Modifier = Modifier, | ||
| onClick: () -> Unit, | ||
| loginType: PokitLoginButtonType, | ||
| text: String, | ||
| ) { | ||
| val loginResource: PokitLoginResource = getLoginResource(loginType) | ||
|
|
||
| Surface( | ||
| modifier = Modifier | ||
| .height(50.dp) | ||
| .border( | ||
| shape = RoundedCornerShape(8.dp), | ||
| width = 1.dp, | ||
| color = loginResource.borderColor | ||
| ), | ||
| shape = RoundedCornerShape(8.dp), | ||
| color = loginResource.backgroundColor, | ||
| onClick = onClick | ||
| ) { | ||
| Row( | ||
| modifier = modifier.fillMaxWidth(), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.Center | ||
| ) { | ||
| Icon( | ||
| modifier = Modifier | ||
| .size(24.dp), | ||
| painter = painterResource(id = loginResource.iconResourceId), | ||
| tint = loginResource.iconTintColor, | ||
| contentDescription = null | ||
| ) | ||
| Text( | ||
| modifier = Modifier | ||
| .padding(start = 12.dp), | ||
| text = text, | ||
| color = loginResource.textColor, | ||
| style = PokitTheme.typography.label1Regular | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun getLoginResource(loginType: PokitLoginButtonType): PokitLoginResource { | ||
| return when (loginType) { | ||
| PokitLoginButtonType.APPLE -> PokitLoginResource( | ||
| iconResourceId = R.drawable.icon_24_apple, | ||
| iconTintColor = PokitTheme.colors.inverseWh, | ||
| textColor = PokitTheme.colors.inverseWh, | ||
| backgroundColor = PokitTheme.colors.backgroundTertiary, | ||
| borderColor = PokitTheme.colors.backgroundTertiary | ||
| ) | ||
|
|
||
| PokitLoginButtonType.GOOGLE -> PokitLoginResource( | ||
| iconResourceId = R.drawable.icon_24_google, | ||
| textColor = PokitTheme.colors.textPrimary, | ||
| backgroundColor = PokitTheme.colors.backgroundBase, | ||
| borderColor = PokitTheme.colors.borderSecondary | ||
| ) | ||
| } | ||
| } |
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
161 changes: 161 additions & 0 deletions
161
feature/login/src/main/java/pokitmons/pokit/keyword/KeywordScreen.kt
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,161 @@ | ||
| package pokitmons.pokit.keyword | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| 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.height | ||
| import androidx.compose.foundation.layout.padding | ||
| 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.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import pokitmons.pokit.core.ui.components.atom.button.PokitButton | ||
| import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonSize | ||
| import pokitmons.pokit.core.ui.components.atom.chip.PokitChip | ||
| import pokitmons.pokit.core.ui.components.atom.chip.attributes.PokitChipSize | ||
| import pokitmons.pokit.core.ui.theme.PokitTheme | ||
| import pokitmons.pokit.core.ui.R as Ui | ||
| import pokitmons.pokit.login.R as Login | ||
|
|
||
| @Composable | ||
| fun KeywordScreen( | ||
| onNavigateToSignUpScreen: () -> Unit, | ||
| popBackStack: () -> Unit, | ||
| ) { | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(all = 20.dp) | ||
| .padding(bottom = 8.dp) | ||
| ) { | ||
| Column { | ||
| Icon(painter = painterResource(id = Ui.drawable.icon_24_arrow_left), contentDescription = null) | ||
| Spacer(modifier = Modifier.height(32.dp)) | ||
| Text( | ||
| text = stringResource(id = Login.string.keyword_title), | ||
| style = PokitTheme.typography.title1 | ||
| ) | ||
| Spacer(modifier = Modifier.height(12.dp)) | ||
| Text( | ||
| text = stringResource(id = Login.string.select_keyword), | ||
| style = PokitTheme.typography.title3 | ||
| ) | ||
| Spacer(modifier = Modifier.height(36.dp)) | ||
|
|
||
| // TODO FlowRow도 사용해보기 | ||
| Column { | ||
| val categories: List<List<String>> = listOf( | ||
| stringResource(id = Login.string.sports_and_leisure), | ||
| stringResource(id = Login.string.phrases_and_office), | ||
| stringResource(id = Login.string.fashion), | ||
| stringResource(id = Login.string.travel), | ||
| stringResource(id = Login.string.economy_and_politics), | ||
| stringResource(id = Login.string.movies_and_dramas), | ||
| stringResource(id = Login.string.restaurants), | ||
| stringResource(id = Login.string.interior), | ||
| stringResource(id = Login.string.it), | ||
| stringResource(id = Login.string.design), | ||
| stringResource(id = Login.string.self_development), | ||
| stringResource(id = Login.string.humor), | ||
| stringResource(id = Login.string.music), | ||
| stringResource(id = Login.string.job_info) | ||
| ).chunked(3) | ||
|
|
||
| Row { | ||
| categories[0].forEach { category -> | ||
| PokitChip( | ||
| data = null, | ||
| size = PokitChipSize.MEDIUM, | ||
| text = category, | ||
| removeIconPosition = null, | ||
| onClickRemove = { }, | ||
| onClickItem = { } | ||
| ) | ||
| Spacer(modifier = Modifier.padding(start = 12.dp)) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Row { | ||
| categories[1].forEach { category -> | ||
| PokitChip( | ||
| data = null, | ||
| size = PokitChipSize.MEDIUM, | ||
| text = category, | ||
| removeIconPosition = null, | ||
| onClickRemove = { }, | ||
| onClickItem = { } | ||
| ) | ||
| Spacer(modifier = Modifier.padding(start = 12.dp)) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Row { | ||
| categories[2].forEach { category -> | ||
| PokitChip( | ||
| data = null, | ||
| size = PokitChipSize.MEDIUM, | ||
| text = category, | ||
| removeIconPosition = null, | ||
| onClickRemove = { }, | ||
| onClickItem = { } | ||
| ) | ||
| Spacer(modifier = Modifier.padding(start = 12.dp)) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Row { | ||
| categories[3].forEach { category -> | ||
| PokitChip( | ||
| data = null, | ||
| size = PokitChipSize.MEDIUM, | ||
| text = category, | ||
| removeIconPosition = null, | ||
| onClickRemove = { }, | ||
| onClickItem = { } | ||
| ) | ||
| Spacer(modifier = Modifier.padding(start = 12.dp)) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(16.dp)) | ||
|
|
||
| Row { | ||
| categories[4].forEach { category -> | ||
| PokitChip( | ||
| data = null, | ||
| size = PokitChipSize.MEDIUM, | ||
| text = category, | ||
| removeIconPosition = null, | ||
| onClickRemove = { }, | ||
| onClickItem = { } | ||
| ) | ||
| Spacer(modifier = Modifier.padding(start = 12.dp)) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| PokitButton( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .align(Alignment.BottomCenter), | ||
| text = stringResource(id = pokitmons.pokit.login.R.string.next), | ||
| icon = null, | ||
| size = PokitButtonSize.LARGE, | ||
| onClick = { onNavigateToSignUpScreen() } | ||
| ) | ||
| } | ||
| } |
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.