From c260c91df09010c5c04ad6e1b28efaa9b7585f9a Mon Sep 17 00:00:00 2001 From: pmj1459 <76741702+minju1459@users.noreply.github.com> Date: Sat, 8 Jun 2024 14:54:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[ADD]=20=EC=95=B1=EC=97=90=20=EC=95=84?= =?UTF-8?q?=EB=8A=94=20=EC=82=AC=EB=9E=8C=EC=9D=B4=20=EC=97=86=EC=96=B4?= =?UTF-8?q?=EC=84=9C=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=EC=97=90=EB=A7=8C=20?= =?UTF-8?q?profileQuitInviteDailog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/ProfileQuitReasonActivity.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/el/yello/presentation/setting/ProfileQuitReasonActivity.kt b/app/src/main/java/com/el/yello/presentation/setting/ProfileQuitReasonActivity.kt index 7be47ab3..e6046818 100644 --- a/app/src/main/java/com/el/yello/presentation/setting/ProfileQuitReasonActivity.kt +++ b/app/src/main/java/com/el/yello/presentation/setting/ProfileQuitReasonActivity.kt @@ -23,6 +23,7 @@ class ProfileQuitReasonActivity : private var clickedItemPosition: Int = RecyclerView.NO_POSITION private var isItemClicked: Boolean = false private var profileQuitInviteDialog: ProfileQuitInviteDialog? = null + private var profileQuitDialog: ProfileQuitDialog? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -65,8 +66,13 @@ class ProfileQuitReasonActivity : private fun initInviteDialogBtnListener() { binding.btnProfileQuitReasonDone.setOnSingleClickListener { - profileQuitInviteDialog = ProfileQuitInviteDialog() - profileQuitInviteDialog?.show(supportFragmentManager, QUIT_DIALOG) + if (clickedItemPosition == 0) { + profileQuitInviteDialog = ProfileQuitInviteDialog() + profileQuitInviteDialog?.show(supportFragmentManager, QUIT_DIALOG) + } else { + profileQuitDialog = ProfileQuitDialog() + profileQuitDialog?.show(supportFragmentManager, QUIT_DIALOG) + } } } @@ -97,6 +103,7 @@ class ProfileQuitReasonActivity : override fun onDestroy() { super.onDestroy() profileQuitInviteDialog?.dismiss() + profileQuitDialog?.dismiss() _adapter = null } From 78f6744223f81188b4b270985511c09e48ea1fed Mon Sep 17 00:00:00 2001 From: pmj1459 <76741702+minju1459@users.noreply.github.com> Date: Sun, 9 Jun 2024 00:25:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[CHORE/#445]=20version=20code=2047=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-logic/convention/src/main/kotlin/Constants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt index 74564636..c869215a 100644 --- 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 = 46 + const val versionCode = 47 const val versionName = "2.1" const val jvmVersion = "17" }