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) }