-
Notifications
You must be signed in to change notification settings - Fork 0
feat: 온보딩-온보딩 UI 구현 #41
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
Merged
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
3d002f7
feat: 온보딩 UI 구현 (#21)
dada4679 688fa48
feat: 온보딩 UI 구현 (#21)
dada4679 9d46a6d
feat: 온보딩 UI 구현 (#21)
dada4679 8b4f4de
chore: develop 브랜치 변경사항을 feature 브랜치로 머지
dada4679 3e766dd
feat: 온보딩 UI 구현 (#21)
dada4679 96c8665
feat: 온보딩 UI 구현 (#21)
dada4679 c8d63f7
feat: 온보딩 UI 구현 (#21)
dada4679 29350bf
Merge branch 'develop' into feature/21-onboarding-ui
dada4679 40252a7
fix: preserve onboarding AppScreen changes
dada4679 4b869f6
fix: pr리뷰 반영 (#21)
dada4679 540bbed
Merge branch 'develop' into feature/21-onboarding-ui
dada4679 10625e1
fix: pr리뷰 반영 (#21)
dada4679 e7dfd3a
Merge branch 'develop' of https://github.com/call-from-ai/CallFromAi_…
dada4679 82f64a2
Merge branch 'feature/21-onboarding-ui' of https://github.com/call-fr…
dada4679 34666a8
fix: pr리뷰 반영 (#21)
dada4679 2c6e21e
fix: pr리뷰 반영 (#21)
dada4679 471a07a
Merge remote-tracking branch 'origin/develop' into feature/21-onboard…
dada4679 de7ca5e
Merge branch 'develop' of https://github.com/call-from-ai/CallFromAi_…
dada4679 94fb158
fix: 다시 랜딩화면 못가게 설정(#21)
dada4679 37b54a7
fix: pr리뷰 반영(#21)
dada4679 19cbbe0
fix: pr리뷰 반영(#21)
dada4679 e7fe9bc
fix: pr리뷰 반영(#21)
dada4679 ca61c41
Merge remote-tracking branch 'origin/develop' into feature/21-onboard…
dada4679 dc00ec2
feat: 프로필 선택 BottomModal기능 추가(#21)
dada4679 6a1a790
fix:온보딩4 그리드 수정 (#21)
dada4679 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
Some comments aren't visible on the classic Files Changed page.
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
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
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
115 changes: 115 additions & 0 deletions
115
feature/onboarding/impl/src/main/java/kr/co/call/impl/component/AgeInputField.kt
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,115 @@ | ||
| package kr.co.call.impl.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| 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.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.foundation.text.BasicTextField | ||
| import androidx.compose.foundation.text.KeyboardOptions | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.text.input.KeyboardType | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import kr.co.call.designsystem.theme.CallFromAiTheme | ||
| import kr.co.call.designsystem.theme.CallTheme | ||
| import kr.co.call.designsystem.theme.Gray100 | ||
| import kr.co.call.designsystem.theme.Gray600 | ||
| import kr.co.call.designsystem.theme.Gray900 | ||
| import kr.co.call.designsystem.theme.SubRed | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.setValue | ||
|
|
||
| @Composable | ||
| fun AgeInputField( | ||
| age: String, | ||
| onAgeChange: (String) -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| ){ | ||
| Column(modifier = modifier) { | ||
| Row { | ||
| Text( | ||
| text = "만 나이", | ||
| style = CallTheme.typography.bodyMedium, | ||
| color = Gray600, | ||
| ) | ||
| Text( | ||
| text = "*", | ||
| style = CallTheme.typography.bodyMedium, | ||
| color = SubRed, | ||
| ) | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(7.dp)) | ||
|
|
||
| BasicTextField( | ||
| value = age, | ||
| onValueChange = { input -> | ||
| if (input.all(Char::isDigit)) onAgeChange(input) | ||
| }, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(51.dp) | ||
| .background( | ||
| color = Gray100, | ||
| shape = RoundedCornerShape(10.dp), | ||
| ), | ||
| singleLine = true, | ||
| keyboardOptions = KeyboardOptions( | ||
| keyboardType = KeyboardType.Number, | ||
| ), | ||
| textStyle = CallTheme.typography.bodyMediumMedium.copy( | ||
| color = Gray900, | ||
| ), | ||
| decorationBox = { innerTextField -> | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding( | ||
| start = 19.dp, | ||
| top = 16.dp, | ||
| end = 15.dp, | ||
| bottom = 15.dp, | ||
| ), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Box(modifier = Modifier.weight(1f)) { | ||
| innerTextField() | ||
| } | ||
| Text( | ||
| text = "(세)", | ||
| style = CallTheme.typography.bodyMedium, | ||
| color = Gray600, | ||
| ) | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Preview( | ||
| name = "AgeInputField", | ||
| showBackground = true, | ||
| widthDp = 393, | ||
| ) | ||
| @Composable | ||
| private fun AgeInputFieldPreview() { | ||
| var age by rememberSaveable { mutableStateOf("25") } | ||
| CallFromAiTheme { | ||
| AgeInputField( | ||
| age = age, | ||
| onAgeChange = { age = it }, | ||
| modifier = Modifier.padding(16.dp), | ||
| ) | ||
| } | ||
| } |
60 changes: 60 additions & 0 deletions
60
feature/onboarding/impl/src/main/java/kr/co/call/impl/component/BackStepBar.kt
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,60 @@ | ||
| package kr.co.call.impl.component | ||
|
|
||
| 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.material3.Icon | ||
| import androidx.compose.material3.IconButton | ||
| 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.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import kr.co.call.designsystem.theme.Black | ||
| import kr.co.call.onboarding.impl.R | ||
|
|
||
| @Composable | ||
| fun BackStepBar( | ||
| onBackClick:()->Unit, | ||
| modifier: Modifier =Modifier, | ||
| ){ | ||
| Row( | ||
| modifier=modifier | ||
| .fillMaxWidth() | ||
| .height(58.dp) | ||
| .padding( | ||
| start=0.dp, | ||
| end=8.dp,), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ){ | ||
| IconButton( | ||
| onClick=onBackClick, | ||
| ){ | ||
| Icon( | ||
| painter= painterResource(R.drawable.ic_back), | ||
| contentDescription="뒤로가기", | ||
| tint= Black, | ||
| modifier=Modifier | ||
| .size( | ||
| width=8.dp, | ||
| height=15.dp | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview( | ||
| showBackground = true, | ||
| widthDp = 393, | ||
| heightDp=58 | ||
| ) | ||
| @Composable | ||
| private fun BackTopBarPreview() { | ||
| BackStepBar( | ||
| onBackClick = {} | ||
| ) | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.