From 1a81fa646a034639e820dd5f5150bcc790bfe88f Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 6 Mar 2022 00:06:22 +0800 Subject: [PATCH] =?UTF-8?q?pro=E7=89=88=E6=9C=AC=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=90=AF=E5=8A=A8=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/base/BaseActivity.kt | 6 +++++- app/src/main/java/io/legado/app/constant/PreferKey.kt | 1 + .../main/java/io/legado/app/ui/welcome/WelcomeActivity.kt | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/base/BaseActivity.kt b/app/src/main/java/io/legado/app/base/BaseActivity.kt index 2b7de78d7..18327f3a7 100644 --- a/app/src/main/java/io/legado/app/base/BaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt @@ -66,6 +66,7 @@ abstract class BaseActivity( override fun onCreate(savedInstanceState: Bundle?) { window.decorView.disableAutoFill() initTheme() + upBackgroundImage() super.onCreate(savedInstanceState) setContentView(binding.root) setupSystemBar() @@ -121,7 +122,7 @@ abstract class BaseActivity( open fun onCompatOptionsItemSelected(item: MenuItem) = super.onOptionsItemSelected(item) - private fun initTheme() { + open fun initTheme() { when (theme) { Theme.Transparent -> setTheme(R.style.AppTheme_Transparent) Theme.Dark -> { @@ -141,6 +142,9 @@ abstract class BaseActivity( window.decorView.applyBackgroundTint(backgroundColor) } } + } + + open fun upBackgroundImage() { if (imageBg) { try { ThemeConfig.getBgImage(this, windowSize)?.let { diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 2b52b04da..d5a697839 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -95,6 +95,7 @@ object PreferKey { const val uploadRule = "uploadRule" const val tocUiUseReplace = "tocUiUseReplace" const val enableReadRecord = "enableReadRecord" + const val customWelcome = "customWelcome" const val welcomeImage = "welcomeImagePath" const val welcomeImageDark = "welcomeImagePathDark" const val welcomeShowText = "welcomeShowText" diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt index f2490d775..fb0621691 100644 --- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt @@ -69,6 +69,14 @@ open class WelcomeActivity : BaseActivity() { binding.root.postDelayed({ startMainActivity() }, 500) } + override fun upBackgroundImage() { + if (getPrefBoolean(PreferKey.customWelcome)) { + super.upBackgroundImage() + } else { + super.upBackgroundImage() + } + } + private fun startMainActivity() { startActivity() if (getPrefBoolean(PreferKey.defaultToRead)) {