#25 [fix] 온보딩 테마 선택 뷰 이슈 해결 #28
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
stellar-halo
requested changes
Jan 11, 2024
app/src/main/res/values/strings.xml
Outdated
| @@ -3,7 +3,7 @@ | |||
| <!-- onboarding --> | |||
| <string name="onboarding_choice_theme_btn">다 선택했어</string> | |||
| <string name="theme_text">하루의 시작</string> | |||
| <string name="onboarding_choice_theme_speech">안녕 난 %s!\n나와 함께 루틴을 만들어볼까?</string> | |||
| <string name="onboarding_choice_theme_speech">안녕 난 %s야!\n나와 함께 루틴을 만들어볼까?</string> | |||
There was a problem hiding this comment.
pull 받는 과정에서 conflict난 파일에서 잘못 받아온 것 같네요... 수정했습니다!!
minemi00
approved these changes
Jan 11, 2024
|
|
||
| private fun initSetSpeechText() { | ||
| val nickname = viewModel.bearNickname.value ?: "" | ||
| val message = getString(R.string.onboarding_choice_theme_speech).format(nickname) |
There was a problem hiding this comment.
아 여기서 format은 nickname을 앞의 "%s"에 포맷팅하는데 사용됩니다!
pump9918
approved these changes
Jan 11, 2024
| @@ -70,4 +113,9 @@ class OnboardingActivity : | |||
| .replace(R.id.fcv_onboarding_fragment, fragment) | |||
| .commit() | |||
| } | |||
|
|
|||
| companion object { | |||
There was a problem hiding this comment.
companion이 그냥 변수 선언하는 것보다 어떤 면에서 더 좋은가요?
stellar-halo
approved these changes
Jan 11, 2024
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
🛠️ Issue
📷 Screenshot
fix.onboarding.routine.theme.mp4
💬 To Reviewers