[MERGE] #464 -> develop

[HOTFIX/#464] 투표완료뷰 / 보상형 광고 검증 로직 해제
team-yello · Aug 6, 2024 · 6ac47a7 · 6ac47a7
2 parents 4ab1777 + 075474c
commit 6ac47a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app/src/main/java/com/el/yello/presentation/main/yello/point/PointFragment.kt b/app/src/main/java/com/el/yello/presentation/main/yello/point/PointFragment.kt
@@ -166,7 +166,14 @@ class PointFragment : BindingFragment<FragmentPointBinding>(R.layout.fragment_po
 
                 is UiState.Failure -> {
                     stopLoadingScreen()
-                    toast(getString(R.string.internet_connection_error_msg))
+//                    toast(getString(R.string.internet_connection_error_msg))
+                    showDoubleConfirm(true)
+                    val originalPoint = voteViewModel.totalPoint
+                    val doubledPoint = originalPoint + voteViewModel.votePointSum
+                    with(binding) {
+                        tvPointMyPoint.text = doubledPoint.toString()
+                        tvPointCurrentPoint.text = doubledPoint.toString()
+                    }
                 }
 
                 is UiState.Loading -> startLoadingScreen()

diff --git a/app/src/main/java/com/el/yello/presentation/main/yello/vote/VoteViewModel.kt b/app/src/main/java/com/el/yello/presentation/main/yello/vote/VoteViewModel.kt
@@ -351,11 +351,7 @@ class VoteViewModel @Inject constructor(
                 )
             )
                 .onSuccess { reward ->
-                    if (reward == null) {
-                        _postRewardAdState.value = UiState.Failure(toString())
-                    } else {
-                        _postRewardAdState.value = UiState.Success(reward)
-                    }
+                    _postRewardAdState.value = UiState.Success(reward)
                 }
                 .onFailure {
                     _postRewardAdState.value = UiState.Failure(it.message.orEmpty())

diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt
@@ -3,7 +3,7 @@ object Constants {
     const val compileSdk = 34
     const val minSdk = 28
     const val targetSdk = 34
-    const val versionCode = 51
+    const val versionCode = 52
     const val versionName = "2.2"
     const val jvmVersion = "18"
 }