[TNT-114] 회원가입 화면 플로우 연결 #37
Merged
Conversation
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
- 정책에 따라 키 정수로 변경
- TNT-115 머지되면 Home 대신 Connect화면으로 이동하게 수정
- develop과 머지 된 TNT-115 branch
- isFromMyPage를 추가해 TopBar와 뒤로가기 동작을 다르게 설정
hoyahozz
approved these changes
Jan 26, 2025
| verticalAlignment = Alignment.CenterVertically, | ||
| modifier = Modifier.padding(vertical = 8.dp), | ||
| ) { | ||
| if (isError && !warningMessage.isNullOrEmpty()) { |
There was a problem hiding this comment.
Suggested change
| if (isError && !warningMessage.isNullOrEmpty()) { | |
| if (isError && warningMessage.isNullOrEmpty().not()) { |
요런 방식으로도 쓸 수 있어염 ㅎ.ㅎ 근데 이건 취향차이 !
| @@ -33,28 +30,43 @@ import co.kr.tnt.core.ui.R as uiResource | |||
| @Composable | |||
| internal fun CodeEntryPage( | |||
| state: TraineeConnectUiState, | |||
| isFromMyPage: Boolean, | |||
| @@ -13,6 +13,7 @@ import co.kr.tnt.trainee.connect.model.PTSessionFormData | |||
|
|
|||
| @Composable | |||
| internal fun TraineeConnectRoute( | |||
| isFromMyPage: Boolean, | |||
| @@ -63,8 +70,7 @@ fun TraineeProfileSetupScreen() { | |||
| ) | |||
|
|
|||
| Scaffold( | |||
| // TODO 버튼 클릭 시 트레이너/트레이니 화면으로 이동 | |||
| topBar = { TnTTopBarWithBackButton(onBackClick = {}) }, | |||
| topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, | |||
There was a problem hiding this comment.
Suggested change
| topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, | |
| topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, |
람다도 리컴포지션 카운트에 영향을 줍니다!
| enabled = text.isNotBlank() && !isWarning, | ||
| onClick = { }, | ||
| onClick = { onNextClick() }, |
There was a problem hiding this comment.
Suggested change
| onClick = { onNextClick() }, | |
| onClick = onNextClick, |
| } | ||
| TnTBottomButton( | ||
| text = stringResource(uiResource.string.start), | ||
| onClick = { onNextClick() }, |
There was a problem hiding this comment.
Suggested change
| onClick = { onNextClick() }, | |
| onClick = onNextClick, |
| @@ -63,7 +70,7 @@ fun TrainerProfileSetupScreen() { | |||
| ) | |||
|
|
|||
| Scaffold( | |||
| topBar = { TnTTopBarWithBackButton(onBackClick = {}) }, | |||
| topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, | |||
There was a problem hiding this comment.
Suggested change
| topBar = { TnTTopBarWithBackButton(onBackClick = { onBackClick() }) }, | |
| topBar = { TnTTopBarWithBackButton(onBackClick = onBackClick) }, |
| modifier = Modifier.align(Alignment.BottomCenter), | ||
| enabled = text.isNotBlank() && !isWarning, | ||
| onClick = { }, | ||
| onClick = { onNextClick() }, |
There was a problem hiding this comment.
Suggested change
| onClick = { onNextClick() }, | |
| onClick = onNextClick, |
| } | ||
| TnTBottomButton( | ||
| text = stringResource(uiResource.string.start), | ||
| onClick = { onNextClick() }, |
There was a problem hiding this comment.
Suggested change
| onClick = { onNextClick() }, | |
| onClick = onNextClick, |
| // TODO 115 머지되면 connect로 이동 | ||
| TrainerSignUpRoute( | ||
| navigateToPrevious = navigateToPrevious, | ||
| navigateToConnect = { navigateToConnect() }, |
There was a problem hiding this comment.
Suggested change
| navigateToConnect = { navigateToConnect() }, | |
| navigateToConnect = navigateToConnect, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
📝 작업 내용
화면 연결
뒤로가기or건너뛰기를 누르면 홈 화면으로 이동하도록 수정했습니다뒤로가기**의 경우,isFromMyPage를 넘겨받아isFromMyPage를 통해 **상단바**도 다르게 보여지도록 수정해뒀습니다수정 사항
Screen에서Page로 변경uiResource)📸 실행 화면
트레이너 회원가입 + 연결 코드
trainer.mp4
트레이니 회원가입 + 연결 코드
⬇️ 연결하기 화면
건너뛰기trainee.mp4
⬇️ 연결하기 화면
뒤로가기trainee_3.mp4
⬇️
연결 완료trainee_2.mp4
🙆🏻 리뷰 요청 사항
없습니다!
👀 레퍼런스