From cb4fbb19ed0a3855cb28c80b168672f9b729a0cd Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 26 Apr 2020 17:09:40 -0400 Subject: [PATCH] Material Dialogs Eh Part 2 --- .../java/exh/debug/SettingsDebugController.kt | 9 +++++---- .../java/exh/ui/intercept/InterceptActivity.kt | 16 +++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/exh/debug/SettingsDebugController.kt b/app/src/main/java/exh/debug/SettingsDebugController.kt index 3783e58d3..1a96399ed 100644 --- a/app/src/main/java/exh/debug/SettingsDebugController.kt +++ b/app/src/main/java/exh/debug/SettingsDebugController.kt @@ -8,6 +8,7 @@ import android.widget.TextView import androidx.core.text.HtmlCompat import androidx.preference.PreferenceScreen import com.afollestad.materialdialogs.MaterialDialog +import com.afollestad.materialdialogs.customview.customView import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.preference.onClick @@ -43,12 +44,12 @@ class SettingsDebugController : SettingsController() { try { val result = it.call(DebugFunctions) view.text = "Function returned result:\n\n$result" - MaterialDialog.Builder(context) - .customView(hView, true) + MaterialDialog(context) + .customView(view = hView, scrollable = true) } catch (t: Throwable) { view.text = "Function threw exception:\n\n${Log.getStackTraceString(t)}" - MaterialDialog.Builder(context) - .customView(hView, true) + MaterialDialog(context) + .customView(view = hView, scrollable = true) }.show() } } diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index 799d9b8b5..0ad5011fa 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -4,6 +4,8 @@ import android.content.Intent import android.os.Bundle import android.view.MenuItem import com.afollestad.materialdialogs.MaterialDialog +import com.afollestad.materialdialogs.callbacks.onCancel +import com.afollestad.materialdialogs.callbacks.onDismiss import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity @@ -67,14 +69,14 @@ class InterceptActivity : BaseRxActivity { binding.interceptProgress.gone() binding.interceptStatus.text = "Error: ${it.reason}" - MaterialDialog.Builder(this) - .title("Error") - .content("Could not open this gallery:\n\n${it.reason}") + MaterialDialog(this) + .title(text = "Error") + .message(text = "Could not open this gallery:\n\n${it.reason}") .cancelable(true) - .canceledOnTouchOutside(true) - .positiveText("Ok") - .cancelListener { onBackPressed() } - .dismissListener { onBackPressed() } + .cancelOnTouchOutside(true) + .positiveButton(android.R.string.ok) + .onCancel { onBackPressed() } + .onDismiss { onBackPressed() } .show() } }