Skip to content

Commit

Permalink
[fix] : etc
Browse files Browse the repository at this point in the history
  • Loading branch information
014967 committed Sep 9, 2023
1 parent a8ad019 commit a56f677
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion data/src/main/java/com/mashup/twotoo/di/NetworkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class NetworkModule {
@Singleton
fun provideOkHttpClient(
httpLoggingInterceptor: HttpLoggingInterceptor,
getPreferenceUserInfoUseCase: GetPreferenceUserInfoUseCase
getPreferenceUserInfoUseCase: GetPreferenceUserInfoUseCase,
): OkHttpClient {
val okHttpClientBuilder = OkHttpClient.Builder()
okHttpClientBuilder.apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ fun GardenScreen(
isStartAnimation = isStartAnimation,
challengeCardInfoUiModel = challengeInfo,
navigateToGarden = navigateToGarden,

)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.Text
import androidx.compose.runtime.*
Expand Down Expand Up @@ -98,7 +97,11 @@ private fun ChallengeInfo(challengeCardInfoUiModel: ChallengeCardInfoUiModel) {
) {
Text(
text = stringResource(
id = R.string.challengeAttempts,
id = if (challengeCardInfoUiModel.viewState == "InProgress") {
R.string.inProgressChallengeAttempts
} else {
R.string.challengeAttempts
},
challengeCardInfoUiModel.attempts,
),
color = TwoTooTheme.color.mainPink,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import org.orbitmvi.orbit.syntax.simple.intent
import org.orbitmvi.orbit.syntax.simple.postSideEffect
import org.orbitmvi.orbit.syntax.simple.reduce
import org.orbitmvi.orbit.viewmodel.container
import usecase.challenge.GetAllChallengeUseCase
import usecase.challenge.GetChallengeHistoriesUseCase

class GardenViewModel(
private val getAllChallengeUseCase: GetAllChallengeUseCase,
private val getChallengeHistoriesUseCase: GetChallengeHistoriesUseCase,
) : ContainerHost<GardenState, GardenSideEffect>, ViewModel() {
override val container: Container<GardenState, GardenSideEffect> = container(GardenState())

Expand All @@ -23,9 +23,9 @@ class GardenViewModel(
state.copy(loadingIndicatorState = true)
}
delay(300)
getAllChallengeUseCase().onSuccess { challenges ->
val challengeCardInfos = challenges.filter { it.isFinished }.mapIndexed { index, challengeResponseDomainModel ->
challengeResponseDomainModel.toUiModel(index)
getChallengeHistoriesUseCase().onSuccess { challenges ->
val challengeCardInfos = challenges.mapIndexed { index, challengeResponseDomainModel ->
challengeResponseDomainModel.toUiModel(index = index)
}.run {
reversed()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package com.mashup.twotoo.presenter.garden.di
import com.mashup.twotoo.presenter.garden.GardenViewModel
import dagger.Module
import dagger.Provides
import usecase.challenge.GetAllChallengeUseCase
import usecase.challenge.GetChallengeHistoriesUseCase
import javax.inject.Scope

@Module
class GardenModule {
@Provides
@GardenScope
fun provideViewModel(
getAllChallengeUseCase: GetAllChallengeUseCase,
getChallengeHistoriesUseCase: GetChallengeHistoriesUseCase,
): GardenViewModel {
return GardenViewModel(getAllChallengeUseCase = getAllChallengeUseCase)
return GardenViewModel(getChallengeHistoriesUseCase = getChallengeHistoriesUseCase)
}
}

Expand Down

0 comments on commit a56f677

Please sign in to comment.