Skip to content

Commit

Permalink
🎨 resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-j0y committed Aug 1, 2024
1 parent c4c6dcb commit 042d9cd
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.whyranoid.presentation.screens.challenge

import android.widget.Toast
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -27,6 +26,7 @@ import androidx.navigation.NavController
import coil.compose.AsyncImage
import com.whyranoid.presentation.component.button.WalkieNegativeButton
import com.whyranoid.presentation.component.button.WalkiePositiveButton
import com.whyranoid.presentation.reusable.SingleToast
import com.whyranoid.presentation.reusable.WalkieCircularProgressIndicator
import com.whyranoid.presentation.theme.WalkieTypography
import com.whyranoid.presentation.viewmodel.challenge.ChallengeExitSideEffect
Expand Down Expand Up @@ -54,12 +54,12 @@ fun ChallengeExitScreen(
viewModel.collectSideEffect {
when (it) {
ChallengeExitSideEffect.StopChallengeSuccess -> {
Toast.makeText(context, "챌린지를 성공적으로 중단하였습니다.", Toast.LENGTH_SHORT).show()
SingleToast.show(context, "챌린지를 성공적으로 중단하였습니다.")
navController.popBackStack()
}

ChallengeExitSideEffect.StopChallengeFailure -> {
Toast.makeText(context, "챌린지 중단에 실패하였습니다.", Toast.LENGTH_SHORT).show()
SingleToast.show(context, "챌린지 중단에 실패하였습니다.")
}
}
}
Expand Down

0 comments on commit 042d9cd

Please sign in to comment.