From e86103fdcc16c1b792343cbd575bb3fdce043aa5 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 29 Mar 2020 12:10:36 -0400 Subject: [PATCH] Tweak error button appearance --- .../browse/BrowseCatalogueController.kt | 16 +++++++++------- .../java/eu/kanade/tachiyomi/widget/EmptyView.kt | 4 ++-- app/src/main/res/values/themes.xml | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt index e0a166078b..8b2db2a6b8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt @@ -366,15 +366,17 @@ open class BrowseCatalogueController(bundle: Bundle) : } presenter.requestNext() } - val openInWebViewAction = View.OnClickListener { - openInWebView() - } if (adapter.isEmpty) { - empty_view.show(message, listOf( - EmptyView.Action(R.string.action_retry, retryAction), - EmptyView.Action(R.string.action_open_in_web_view, openInWebViewAction) - )) + val actions = mutableListOf(EmptyView.Action(R.string.action_retry, retryAction)) + if (presenter.source is HttpSource) { + val openInWebViewAction = View.OnClickListener { + openInWebView() + } + actions += EmptyView.Action(R.string.action_open_in_web_view, openInWebViewAction) + } + + empty_view.show(message, actions) } else { empty_view.hide() diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt index ca63025d8a..4946f2e438 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt @@ -3,10 +3,10 @@ package eu.kanade.tachiyomi.widget import android.content.Context import android.util.AttributeSet import android.view.View -import android.widget.Button import android.widget.LinearLayout import android.widget.RelativeLayout import androidx.annotation.StringRes +import androidx.appcompat.widget.AppCompatButton import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible @@ -44,7 +44,7 @@ class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? actions_container.removeAllViews() if (!actions.isNullOrEmpty()) { actions.forEach { - val button = Button(context).apply { + val button = AppCompatButton(context).apply { layoutParams = LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT) diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7e3a10c7a4..52b59ac0c9 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -50,6 +50,7 @@ @style/PreferenceThemeOverlay @style/Theme.AlertDialog.Light @style/Theme.AlertDialog.Dark + @style/Theme.Widget.Button.Outlined.Accent @style/Theme.Widget.Button @style/TextAppearance.Widget.Button @style/TextAppearance.Widget.Menu @@ -127,6 +128,7 @@ @style/PreferenceThemeOverlay @style/Theme.AlertDialog.Dark @style/Theme.AlertDialog.Dark + @style/Theme.Widget.Button.Outlined.Accent @style/Theme.Widget.Button @style/TextAppearance.Widget.Button @style/TextAppearance.Widget.Menu