[UI/#12] 홈뷰 / 홈 기본 화면 구현 #47
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
# Conflicts: # feature/src/main/res/values/strings.xml
arinming
approved these changes
Jul 11, 2024
| verticalArrangement = Arrangement.Center, | ||
| ) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.ic_empty_logo), |
There was a problem hiding this comment.
ic_empty_logo가 저랑 겹치는 아이콘,.! 화긴
Comment on lines
63
to
88
| HomeFilteringText( | ||
| text = grade.toString() + stringResource(id = R.string.home_recommend_filtering_grade), | ||
| modifier = Modifier | ||
| .padding(vertical = 7.dp, horizontal = 28.dp), | ||
| ) | ||
| HomeFilteringDivider() | ||
| HomeFilteringText( | ||
| text = stringResource( | ||
| id = when (period) { | ||
| 1 -> R.string.home_recommend_filtering_working_period_1 | ||
| 2 -> R.string.home_recommend_filtering_working_period_2 | ||
| 3 -> R.string.home_recommend_filtering_working_period_3 | ||
| else -> R.string.server_failure | ||
| } | ||
| ), | ||
| modifier = Modifier | ||
| .padding(vertical = 7.dp, horizontal = 25.dp) | ||
| ) | ||
| HomeFilteringDivider() | ||
| HomeFilteringText( | ||
| text = month.toString() + stringResource(id = R.string.home_recommend_filtering_month), | ||
| modifier = Modifier | ||
| .padding(vertical = 7.dp) | ||
| .padding(start = 34.dp, end = 13.dp) | ||
| ) | ||
| } |
There was a problem hiding this comment.
여기 뭔가 반복을 줄일 방법이 있우묜,,,,,있을까요....?음!!!!
There was a problem hiding this comment.
아 진짜 여기가 반복이 너무 심한데 묘하게 패딩 값 등이 달라서 어떻게 해결할 수 있을지 모르겠네요ㅜㅜ 계속 고민해보겠습니다!! 감사해요:)
| } | ||
| Image( | ||
| painter = painterResource(id = R.drawable.ic_home_bookmark_28), | ||
| contentDescription = "scrap", |
There was a problem hiding this comment.
웁씨 여기를 놓쳤네요!! 근데 이게 컴포넌트로 수정될 예정이라 혹시 적용 안되어있으면 수정할게요!
| HomeTodayIntern() | ||
| } | ||
| } | ||
| stickyHeader { |
leeeyubin
approved these changes
Jul 11, 2024
Comment on lines
80
to
82
|
|
||
| HomeFilteringScreen(3, 1, 7) | ||
|
|
# Conflicts: # feature/src/main/java/com/terning/feature/home/HomeRoute.kt
boiledEgg-s
approved these changes
Jul 11, 2024
Comment on lines
50
to
57
| Text( | ||
| text = stringResource( | ||
| id = R.string.home_today_title_start | ||
| ) | ||
| + "남지우" | ||
| + stringResource( | ||
| id = R.string.home_today_title_end | ||
| ), |
There was a problem hiding this comment.
Suggested change
| Text( | |
| text = stringResource( | |
| id = R.string.home_today_title_start | |
| ) | |
| + "남지우" | |
| + stringResource( | |
| id = R.string.home_today_title_end | |
| ), | |
| Text( | |
| text = stringResource(id = R.string.home_today_title, "남지우" | |
| ), |
와 같은 방식으로 수정하는게 좋아보여요!!
문자열 리소스에서 변수를 넣을 부분을 %s로 지정하면 됩니다!!
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.
⛳️ Work Description
📸 Screenshot
Screen_Recording_20240711_070948_Terning-Android.mp4
📢 To Reviewers