diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialog.kt index 76036ba3..ef5f5cfa 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialog.kt @@ -18,7 +18,8 @@ class V2ModalDialog( confirmButtonTitle: String, confirmButtonClick: () -> Unit, cancelButtonTitle: String = "", - cancelButtonClick: (() -> Unit)? = null + cancelButtonClick: (() -> Unit)? = null, + dismissOnConfirm: Boolean = true ) { private val alertDialog: AlertDialog @@ -46,7 +47,11 @@ class V2ModalDialog( dialogView.tvConfirm.text = confirmButtonTitle dialogView.tvConfirm.setOnClickListener { - dismissAndRun(confirmButtonClick) + if (dismissOnConfirm) { + dismissAndRun(confirmButtonClick) + } else { + confirmButtonClick() + } } dialogView.tvCancel.visibility = if (cancelButtonTitle.isNotBlank()) { @@ -68,6 +73,10 @@ class V2ModalDialog( alertDialog.window?.attributes = lp } + fun dismiss() { + alertDialog.dismiss() + } + private fun dismissAndRun(action: () -> Unit) { if (isButtonClicked) return isButtonClicked = true diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialogTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialogTest.kt index 1aca224d..3a74ff37 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialogTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/components/modal/V2ModalDialogTest.kt @@ -61,6 +61,7 @@ class V2ModalDialogTest { dialog.dialogView.tvConfirm.performClick() dialog.dialogView.tvConfirm.performClick() + assertFalse(alertDialogOf(dialog).isShowing) assertEquals(1, confirmClickCount) } @@ -83,6 +84,7 @@ class V2ModalDialogTest { val alertDialog = alertDialogOf(dialog) assertTrue(alertDialog.isShowing) dialog.dialogView.tvCancel.performClick() + dialog.dialogView.tvCancel.performClick() assertEquals(View.VISIBLE, dialog.dialogView.tvCancel.visibility) assertEquals(View.VISIBLE, dialog.dialogView.tvConfirm.visibility) @@ -92,6 +94,66 @@ class V2ModalDialogTest { assertEquals(1, cancelClickCount) } + @Test + fun `자동 닫힘을 끄면 확인 후 재시도하고 명시적으로 닫을 수 있다`() { + val activity = Robolectric.buildActivity(FragmentActivity::class.java).setup().get() + var confirmClickCount = 0 + val dialog = V2ModalDialog( + activity = activity, + layoutInflater = activity.layoutInflater, + title = "안내", + desc = "실패 후 재시도", + confirmButtonTitle = "확인", + confirmButtonClick = { confirmClickCount += 1 }, + dismissOnConfirm = false + ) + + dialog.show(width = 360) + val alertDialog = alertDialogOf(dialog) + dialog.dialogView.tvConfirm.performClick() + assertEquals(1, confirmClickCount) + assertTrue(alertDialog.isShowing) + + dialog.dialogView.tvConfirm.isEnabled = false + dialog.dialogView.tvConfirm.isEnabled = true + dialog.dialogView.tvConfirm.performClick() + assertEquals(2, confirmClickCount) + assertTrue(alertDialog.isShowing) + + dialog.dismiss() + assertFalse(alertDialog.isShowing) + assertEquals(2, confirmClickCount) + } + + @Test + fun `자동 닫힘을 꺼도 확인 후 취소는 닫히고 한 번만 실행한다`() { + val activity = Robolectric.buildActivity(FragmentActivity::class.java).setup().get() + var confirmClickCount = 0 + var cancelClickCount = 0 + val dialog = V2ModalDialog( + activity = activity, + layoutInflater = activity.layoutInflater, + title = "안내", + desc = "취소 확인", + confirmButtonTitle = "확인", + confirmButtonClick = { confirmClickCount += 1 }, + cancelButtonTitle = "취소", + cancelButtonClick = { cancelClickCount += 1 }, + dismissOnConfirm = false + ) + + dialog.show(width = 360) + val alertDialog = alertDialogOf(dialog) + dialog.dialogView.tvConfirm.performClick() + assertTrue(alertDialog.isShowing) + dialog.dialogView.tvCancel.performClick() + dialog.dialogView.tvCancel.performClick() + + assertFalse(alertDialog.isShowing) + assertEquals(1, confirmClickCount) + assertEquals(1, cancelClickCount) + } + @Test fun `title과 desc는 파라미터 값을 표시한다`() { val activity = Robolectric.buildActivity(FragmentActivity::class.java).setup().get()