Skip to content
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

Feature/mz 174 add ledger UI textfield button focus state #51

Merged
merged 10 commits into from
Jan 12, 2024

Conversation

jinukeu
Copy link
Member

@jinukeu jinukeu commented Jan 11, 2024

💡 Issue

🌱 Key changes

  • 장부 생성 UI 구현
  • TextFieldButton Focus 상태 추가

✅ To Reviewers

서버 연동하면서 건드릴게 많아서 동작은 최소한으로 구현했습니다.
UI 위주로 코드리뷰 부탁드릴게요!

📸 스크린샷

스크린샷
장부 생성

@jinukeu jinukeu self-assigned this Jan 11, 2024
Comment on lines 19 to 21
@Composable
fun InputDateScreen() {
Column(
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요 Screen은 디자인이 변경될거같아서 뼈대만 구현했습니다!
코드 리뷰 스킵해주세요!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요건 서버 연동하면서 작업할게유~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

얘 그냥 지금하고 작업 끝나면 코멘트 남길게요~

modifier = Modifier.fillMaxWidth(),
color = GhostButtonColor.Black,
style = MediumButtonStyle.height60,
text = "결혼식",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

결혼식, 돌잔치, 장례식, 생일 기념일은 서버에서 받아올거라서 string res 추출 안했어유

Comment on lines 75 to 85
HorizontalPager(
modifier = Modifier.weight(1f),
state = pagerState,
userScrollEnabled = false,
) { page ->
when (LedgerAddPage.entries[page]) {
LedgerAddPage.CATEGORY -> SelectCategoryScreen()
LedgerAddPage.NAME -> InputNameScreen()
LedgerAddPage.DATE -> InputDateScreen()
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

어머 Pager로 구현하셨군요 저는 AnimatedContent로 구현했는데, Pager에서 애니메이션 효과를 변경할 수 있나요?
웬만하면 애니메이션만 맞춰서 수정사항을 최소화하면 좋을거 같아서요!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수진님 PR 보고 왔는데요
AnimatedContent가 더 좋아보이네요~!

Pager를 사용하게되면 rememberPagerState를 만드는게 상태가 분리된다는 느낌이 들어 별로였거든요!
제가 AnimatedContent로 수정하겠습니다! 수정 후 re-request 할게요~

@syb8200 저희 Pager말고 AnimatedContent를 사용하는 쪽으로 갈게요!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵~ 🙆‍♀️
애니메이션도 이쁘게 넣을 수 있어서 오히려좋아입니다~~

Comment on lines +191 to +194
when {
isFocused.not() -> (unFocusedBackgroundColor to unFocusedTextColor)
isSaved -> (savedBackgroundColor to savedTextColor)
else -> (editBackgroundColor to editTextColor)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

@jinukeu jinukeu requested a review from yangsooplus January 11, 2024 14:25
@jinukeu
Copy link
Member Author

jinukeu commented Jan 12, 2024

코드 리뷰 부탁드릴게요~!

Comment on lines +8 to +21
fun <S> AnimatedContentTransitionScope<S>.susuDefaultAnimatedContentTransitionSpec(leftDirectionCondition: Boolean): ContentTransform {
val direction = if (leftDirectionCondition) {
AnimatedContentTransitionScope.SlideDirection.Left
} else {
AnimatedContentTransitionScope.SlideDirection.Right
}
return slideIntoContainer(
towards = direction,
animationSpec = tween(500),
) togetherWith slideOutOfContainer(
towards = direction,
animationSpec = tween(500),
)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍👍👍 나중에 회원가입도 이거로 교체할게요~!

@jinukeu jinukeu merged commit 3d0787e into develop Jan 12, 2024
1 check passed
@jinukeu jinukeu deleted the feature/MZ-174-add-ledger-ui branch January 15, 2024 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feat] 장부 생성 UI, TextFieldButton Focused 상태 추가
2 participants