Merge branch 'develop' of https://github.com/team-yello/YELLO-Android …

…into fix/#435-shop-amplitude
team-yello · Apr 5, 2024 · bd9f2b6 · bd9f2b6
2 parents 58f6391 + 7319911
commit bd9f2b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt b/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt
@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
@@ -91,6 +92,7 @@ class PayActivity : BindingActivity<ActivityPayBinding>(R.layout.activity_pay) {
         observeCheckInAppValidState()
         initPrivacyBtnListener()
         initServiceBtnListener()
+        setBackPressedWhenLoading()
     }
 
     private fun initView() {
@@ -448,6 +450,17 @@ class PayActivity : BindingActivity<ActivityPayBinding>(R.layout.activity_pay) {
         window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
     }
 
+    private fun setBackPressedWhenLoading(){
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (!manager.isPurchasing.value) {
+                    finish()
+                }
+            }
+        }
+        onBackPressedDispatcher.addCallback(this, callback)
+    }
+
     // 서버 오류(500) 시 시스템 다이얼로그 띄우기
     private fun showErrorDialog() {
         AlertDialog.Builder(this).setTitle(getString(R.string.pay_error_dialog_title))

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 = 33
     const val minSdk = 28
     const val targetSdk = 33
-    const val versionCode = 44
+    const val versionCode = 45
     const val versionName = "2.1"
     const val jvmVersion = "17"
 }