2 files changed, 17 insertions, 11 deletions
diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt
index 94750e3..82d5608 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/utils/ContextUtils.kt
@@ -45,7 +45,9 @@ import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import ca.allanwang.kau.R
 import ca.allanwang.kau.logging.KL
+import com.afollestad.materialdialogs.DialogBehavior
 import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.ModalDialog
 
 /**
  * Created by Allan Wang on 2017-06-03.
@@ -193,17 +195,20 @@ fun Context.resolveString(@AttrRes attr: Int, fallback: String = ""): String {
 }
 
 /**
- * Wrapper function for the MaterialDialog adapterBuilder
- * There is no need to call build() or show() as those are done by default
+ * Wrapper function for MaterialDialog
+ *
+ * Mainly handles invalid creations, such as showing a dialog when an activity is finishing
+ * See https://github.com/afollestad/material-dialogs/issues/1778
  */
-inline fun Context.materialDialog(action: MaterialDialog.Builder.() -> Unit): MaterialDialog {
-    val builder = MaterialDialog.Builder(this)
-    builder.action()
+inline fun Context.materialDialog(
+    dialogBehavior: DialogBehavior = ModalDialog,
+    action: MaterialDialog.() -> Unit
+) {
+    val dialog = MaterialDialog(this, dialogBehavior)
     if (isFinishing) {
-        KL.d { "Material Dialog triggered from finishing context; did not show" }
-        return builder.build()
+        return KL.d { "Material Dialog triggered from finishing context; did not show" }
     }
-    return builder.show()
+    dialog.show(action)
 }
 
 fun Context.getDip(value: Float): Float =
diff --git a/core/src/main/kotlin/ca/allanwang/kau/xml/Changelog.kt b/core/src/main/kotlin/ca/allanwang/kau/xml/Changelog.kt
index 22e8e76..2e66a97 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/xml/Changelog.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/xml/Changelog.kt
@@ -30,6 +30,7 @@ import ca.allanwang.kau.utils.ctxCoroutine
 import ca.allanwang.kau.utils.materialDialog
 import ca.allanwang.kau.utils.use
 import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.list.customListAdapter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -40,13 +41,13 @@ import org.xmlpull.v1.XmlPullParser
  *
  * Easy changelog loader
  */
-fun Context.showChangelog(@XmlRes xmlRes: Int, @ColorInt textColor: Int? = null, customize: MaterialDialog.Builder.() -> Unit = {}) {
+fun Context.showChangelog(@XmlRes xmlRes: Int, @ColorInt textColor: Int? = null, customize: MaterialDialog.() -> Unit = {}) {
     ctxCoroutine.launch {
         val items = withContext(Dispatchers.Default) { parse(this@showChangelog, xmlRes) }
         materialDialog {
             title(R.string.kau_changelog)
-            positiveText(R.string.kau_great)
-            adapter(ChangelogAdapter(items, textColor), null)
+            positiveButton(R.string.kau_great)
+            customListAdapter(ChangelogAdapter(items, textColor), null)
             customize()
         }
     }