Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Material Dialogs Eh Part 2

Browse Source
This commit is contained in:
Jobobby04 2020-04-26 17:09:40 -04:00
parent ddf0357c5c
commit cb4fbb19ed
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/exh/debug/SettingsDebugController.kt
View File

@ -8,6 +8,7 @@ import android.widget.TextView
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.customview.customView
import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsController
import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.preference.defaultValue
import eu.kanade.tachiyomi.util.preference.onClick import eu.kanade.tachiyomi.util.preference.onClick
@ -43,12 +44,12 @@ class SettingsDebugController : SettingsController() {
try { try {
val result = it.call(DebugFunctions) val result = it.call(DebugFunctions)
view.text = "Function returned result:\n\n$result" view.text = "Function returned result:\n\n$result"
MaterialDialog.Builder(context) MaterialDialog(context)
.customView(hView, true) .customView(view = hView, scrollable = true)
} catch (t: Throwable) { } catch (t: Throwable) {
view.text = "Function threw exception:\n\n${Log.getStackTraceString(t)}" view.text = "Function threw exception:\n\n${Log.getStackTraceString(t)}"
MaterialDialog.Builder(context) MaterialDialog(context)
.customView(hView, true) .customView(view = hView, scrollable = true)
}.show() }.show()
} }
} }

16
app/src/main/java/exh/ui/intercept/InterceptActivity.kt
View File

@ -4,6 +4,8 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem import android.view.MenuItem
import com.afollestad.materialdialogs.MaterialDialog 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.R
import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding import eu.kanade.tachiyomi.databinding.EhActivityInterceptBinding
import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity import eu.kanade.tachiyomi.ui.base.activity.BaseRxActivity
@ -67,14 +69,14 @@ class InterceptActivity : BaseRxActivity<EhActivityInterceptBinding, InterceptAc
is InterceptResult.Failure -> { is InterceptResult.Failure -> {
binding.interceptProgress.gone() binding.interceptProgress.gone()
binding.interceptStatus.text = "Error: ${it.reason}" binding.interceptStatus.text = "Error: ${it.reason}"
MaterialDialog.Builder(this) MaterialDialog(this)
.title("Error") .title(text = "Error")
.content("Could not open this gallery:\n\n${it.reason}") .message(text = "Could not open this gallery:\n\n${it.reason}")
.cancelable(true) .cancelable(true)
.canceledOnTouchOutside(true) .cancelOnTouchOutside(true)
.positiveText("Ok") .positiveButton(android.R.string.ok)
.cancelListener { onBackPressed() } .onCancel { onBackPressed() }
.dismissListener { onBackPressed() } .onDismiss { onBackPressed() }
.show() .show()
} }
} }