From 13262fdb18aad0f7f58b210efe5c3c8a7bc7e3a4 Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Mon, 6 Jan 2020 16:41:44 +0100 Subject: [PATCH] Fixed the dialog not being actually closed on click outside Misplaced methods ftw --- .../main/java/com/topjohnwu/magisk/view/MagiskDialog.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt index 30107bfbf..3fba7938d 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt @@ -37,6 +37,7 @@ class MagiskDialog @JvmOverloads constructor( init { binding.setVariable(BR.data, data) + setCancelable(true) } override fun onCreate(savedInstanceState: Bundle?) { @@ -57,10 +58,16 @@ class MagiskDialog @JvmOverloads constructor( ) insets } + } - binding.dialogBaseOutsideContainer.setOnClickListener { + override fun setCancelable(flag: Boolean) { + val listener = if (!flag) { + null + } else { setCanceledOnTouchOutside(true) + View.OnClickListener { dismiss() } } + binding.dialogBaseOutsideContainer.setOnClickListener(listener) } inner class Data {