From 6982ed8cc6eaaf082cad224be4222135c3fd90af Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 5 Mar 2022 23:36:18 +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/ui/config/ConfigActivity.kt | 4 +++- .../main/java/io/legado/app/ui/config/ThemeConfigFragment.kt | 2 +- .../java/io/legado/app/ui/config/WelcomeConfigFragment.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt index fcae15584..d1d6dbb46 100644 --- a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt +++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt @@ -46,7 +46,9 @@ class ConfigActivity : BaseActivity() { } override fun finish() { - if (supportFragmentManager.findFragmentByTag(ConfigTag.COVER_CONFIG) != null) { + if (supportFragmentManager.findFragmentByTag(ConfigTag.COVER_CONFIG) != null + || supportFragmentManager.findFragmentByTag(ConfigTag.WELCOME_CONFIG) != null + ) { replaceFragment(ConfigTag.THEME_CONFIG) } else { super.finish() diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt index 516079948..901a828cd 100644 --- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt @@ -179,7 +179,7 @@ class ThemeConfigFragment : BasePreferenceFragment(), "coverConfig" -> (activity as? ConfigActivity) ?.replaceFragment(ConfigTag.COVER_CONFIG) "welcomeStyle" -> (activity as? ConfigActivity) - ?.replaceFragment(ConfigTag.WELCOME_CONFIG) + ?.replaceFragment(ConfigTag.WELCOME_CONFIG) } return super.onPreferenceTreeClick(preference) } diff --git a/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt index b074d43d5..11f5afbff 100644 --- a/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/WelcomeConfigFragment.kt @@ -36,7 +36,7 @@ class WelcomeConfigFragment : BasePreferenceFragment(), override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - activity?.setTitle(R.string.cover_config) + activity?.setTitle(R.string.welcome_style) listView.setEdgeEffectColor(primaryColor) setHasOptionsMenu(true) }