[1.1.0/AN-FEAT] 배틀 선택 / 결과 UI 개선 #316
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
sh1mj1
approved these changes
Sep 10, 2024
| power = power.toString(), | ||
| fun BattlePrediction.toUi(format: String = DEFAULT_NUMBER_FORMAT): BattlePredictionUiModel { | ||
| val formattedPower = if (power < 0) NO_EFFECT_VALUE else power.toString() | ||
| val formattedResult = if (calculatedResult < 0) NO_EFFECT_VALUE else String.format(format, calculatedResult) |
There was a problem hiding this comment.
기술 위력과 계산된 위력이 - 로 표시되는 군요.
이러한 상황일 때 추가로 배수도 - 로 표시하는 게 더 자연스러워 보입니다.
그리고 오른쪽 하단에 명중 확률도 조정을 해야 할 듯..
There was a problem hiding this comment.
이러한 상황일 때 추가로 배수도 - 로 표시하는 게 더 자연스러워 보입니다.
저는 배수는 1.0으로 보여주는 것도 좋아요 !
3개 다 - - - 로 보여주면 뭔가 어색할 것 같기도 해요
명중 확률
이 부분은 동의합니다 !
| @@ -80,7 +80,12 @@ class SkillSelectionFragment : | |||
|
|
|||
| repeatOnStarted { | |||
| viewModel.filteredSkills.collect { | |||
| skillAdapter.submitList(it) | |||
| skillAdapter.submitList(it) { | |||
| if (viewModel.previousSkillsId != null) { | |||
There was a problem hiding this comment.
viewModel.previousSkillsId
이제 봤는데 이전 스킬 id 가 이전 스킬들 id 로 되어 있네요 ㅋㅋ
| if (sharedViewModel.previousSelection.selectedPokemon() != null) { | ||
| val position = it.indexOfFirst { it.isSelected } | ||
| binding.rvPokemons.scrollToPosition(position) | ||
| } |
There was a problem hiding this comment.
오 섬세한데요~
submitList 에 람다로 바로 콜백을 지정할 수 있군요~
kkosang
approved these changes
Sep 11, 2024
| power = power.toString(), | ||
| fun BattlePrediction.toUi(format: String = DEFAULT_NUMBER_FORMAT): BattlePredictionUiModel { | ||
| val formattedPower = if (power < 0) NO_EFFECT_VALUE else power.toString() | ||
| val formattedResult = if (calculatedResult < 0) NO_EFFECT_VALUE else String.format(format, calculatedResult) |
There was a problem hiding this comment.
이러한 상황일 때 추가로 배수도 - 로 표시하는 게 더 자연스러워 보입니다.
저는 배수는 1.0으로 보여주는 것도 좋아요 !
3개 다 - - - 로 보여주면 뭔가 어색할 것 같기도 해요
명중 확률
이 부분은 동의합니다 !
| if (sharedViewModel.previousSelection.selectedPokemon() != null) { | ||
| val position = it.indexOfFirst { it.isSelected } | ||
| binding.rvPokemons.scrollToPosition(position) | ||
| } |
murjune
approved these changes
Sep 11, 2024
| power = power.toString(), | ||
| fun BattlePrediction.toUi(format: String = DEFAULT_NUMBER_FORMAT): BattlePredictionUiModel { | ||
| val formattedPower = if (power < 0) NO_EFFECT_VALUE else power.toString() | ||
| val formattedResult = if (calculatedResult < 0) NO_EFFECT_VALUE else String.format(format, calculatedResult) |
| if (sharedViewModel.previousSelection.selectedPokemon() != null) { | ||
| val position = it.indexOfFirst { it.isSelected } | ||
| binding.rvPokemons.scrollToPosition(position) | ||
| } |
| @@ -80,7 +80,12 @@ class SkillSelectionFragment : | |||
|
|
|||
| repeatOnStarted { | |||
| viewModel.filteredSkills.collect { | |||
| skillAdapter.submitList(it) | |||
| skillAdapter.submitList(it) { | |||
| if (viewModel.previousSkillsId != null) { | |||
|
/noti |
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.
-> 작업 단위가 작아서 두 개 이슈 합침 이슈
작업 영상
XRecorder_Edited_10092024_140105.mp4
작업한 내용
-로 표시distinct로 방지해두었습니당🚀Next Feature