[feat/challenge]: 챌린지 기초 작업 #66
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: # settings.gradle.kts
jihyun0v0
approved these changes
Jan 9, 2024
feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeCalendarAdapter.kt
Outdated
Show resolved
Hide resolved
feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt
Show resolved
Hide resolved
|
의진님 너무 수고 많으셨습니다~ |
|
@jihyun0v0 컨벤션을 다시잡죠 ㅎㅎ 너무 비효율적이네요 |
kez-lab
force-pushed
the
feat/challenge
branch
from
f0a13fa to
682ff06
Compare
jihyun0v0
reviewed
Jan 10, 2024
| private val getUsageGoalsUseCase: GetUsageGoalsUseCase, | ||
| ) : ViewModel() { | ||
| private val _mainState = MutableStateFlow(MainState()) | ||
| val mainState = _mainState.asStateFlow() |
There was a problem hiding this comment.
mainState에 MainViewModel에서 사용하는 여러 dataFlow를 저장하는 건가요?
jihyun0v0
reviewed
Jan 10, 2024
Comment on lines
+4
to
+5
| val packageName: String = "", | ||
| val goalTime: Long = 0, |
There was a problem hiding this comment.
이런식으로 초기화 할 수 있구나~ 배워갑니다~
jihyun0v0
reviewed
Jan 10, 2024
Comment on lines
+13
to
+26
| val formattedGoalTime: String | ||
| get() { | ||
| val hours = goalTimeInHours | ||
| val minutes = goalTimeInMinutes | ||
| return buildString { | ||
| if (hours > 0) { | ||
| append("$hours 시간") | ||
| } | ||
| if (minutes > 0) { | ||
| if (hours > 0) append(" ") | ||
| append("$minutes 분") | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
확장성을 위해서 이 함수를 common에 넣는 건 안좋은 방법인가요? 궁금합니다!
jihyun0v0
reviewed
Jan 10, 2024
Comment on lines
+10
to
+13
| operator fun invoke(): List<UsageGoal> { | ||
| return getUsageGoalsUseCase.getUsageGoals() | ||
| } | ||
| } |
kangyuri1114
approved these changes
Jan 10, 2024
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="5dp" | ||
| android:text="3시간" |
There was a problem hiding this comment.
디자인 확인을 위해 적어둔 텍스트라면 tools 써도 좋을 것 같습니다!
| android:id="@+id/iv_challenge_status" | ||
| android:layout_width="38dp" | ||
| android:layout_height="38dp" | ||
| android:src="@drawable/shape_background_radius8_blackground" |
Comment on lines
+75
to
+78
| // 첫 번째와 마지막 아이템을 제외한 경우에만 마진 적용 | ||
| if (position != 0) { | ||
| outRect.top = verticalSpaceHeight | ||
| } |
There was a problem hiding this comment.
position != 0 인데 마지막 아이템도 마진 적용되는 거 맞을까요?
Comment on lines
+12
to
+15
| data class MainState( | ||
| val challengeStatus: ChallengeStatus = ChallengeStatus(), | ||
| val usageGoals: List<UsageGoal> = emptyList(), | ||
| ) |
There was a problem hiding this comment.
MVI 패턴 적용 참고해서 나중에 저도 잘 다듬어보겠습니다
Comment on lines
+46
to
+47
| val challengeAdapter = binding.rvChallengeCalendar.adapter as? ChallengeCalendarAdapter | ||
| val challengeGoalsAdapter = binding.rvAppUsageGoals.adapter as? ChallengeUsageGoalsAdapter |
There was a problem hiding this comment.
이미 어댑터가 init~함수에 있는 것 같은데 한번더 collect 함수에서 as? 를 사용해서 캐스팅한 이유 궁금합니다!
jihyun0v0
reviewed
Jan 10, 2024
Comment on lines
+46
to
+48
| val challengeAdapter = binding.rvChallengeCalendar.adapter as? ChallengeCalendarAdapter | ||
| val challengeGoalsAdapter = binding.rvAppUsageGoals.adapter as? ChallengeUsageGoalsAdapter | ||
| activityViewModel.mainState.flowWithLifecycle(viewLifeCycle).onEach { |
There was a problem hiding this comment.
제 리사이클러 뷰는 어디서 재활용하는 건가요??
jihyun0v0
approved these changes
Jan 10, 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.
개요
작업 사항