From c23a22a62b00ac3ad85471c79ef9b3ff3dd4fad5 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Wed, 6 Sep 2023 21:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/constant/PreferKey.kt | 1 + .../java/io/legado/app/help/config/AppConfig.kt | 2 ++ .../java/io/legado/app/ui/main/MainActivity.kt | 16 ++++++++++++++++ app/src/main/res/values-es-rES/strings.xml | 1 + app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values/arrays.xml | 16 +++++++++++++++- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_config_backup.xml | 2 +- app/src/main/res/xml/pref_config_other.xml | 17 ++++++++++++----- 10 files changed, 51 insertions(+), 7 deletions(-) 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 8b13715d9..3b2efff86 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -135,6 +135,7 @@ object PreferKey { const val shrinkDatabase = "shrinkDatabase" const val batchChangeSourceDelay = "batchChangeSourceDelay" const val openBookInfoByClickTitle = "openBookInfoByClickTitle" + const val defaultHomePage = "defaultHomePage" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index 6739ccc79..7dd34330e 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -429,6 +429,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { val onlyLatestBackup get() = appCtx.getPrefBoolean(PreferKey.onlyLatestBackup, true) + val defaultHomePage get() = appCtx.getPrefString(PreferKey.defaultHomePage, "bookshelf") + val doublePageHorizontal: String? get() = appCtx.getPrefString(PreferKey.doublePageHorizontal) diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index e5fcc5bb4..5b735c57d 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -91,6 +91,7 @@ class MainActivity : VMBaseActivity(), bottomNavigationView.setOnNavigationItemSelectedListener(this@MainActivity) bottomNavigationView.setOnNavigationItemReselectedListener(this@MainActivity) } + upHomePage() onBackPressedDispatcher.addCallback(this) { if (pagePosition != 0) { binding.viewPagerMain.currentItem = 0 @@ -369,6 +370,21 @@ class MainActivity : VMBaseActivity(), adapter.notifyDataSetChanged() } + private fun upHomePage() { + when (AppConfig.defaultHomePage) { + "bookshelf" -> {} + "explore" -> if (AppConfig.showDiscovery) { + binding.viewPagerMain.setCurrentItem(realPositions.indexOf(idExplore), false) + } + + "rss" -> if (AppConfig.showRSS) { + binding.viewPagerMain.setCurrentItem(realPositions.indexOf(idRss), false) + } + + "my" -> binding.viewPagerMain.setCurrentItem(realPositions.indexOf(idMy), false) + } + } + private fun getFragmentId(position: Int): Int { val id = realPositions[position] if (id == idBookshelf) { diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 7500824fa..de8aa6522 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1128,4 +1128,5 @@ 换源间隔 点击书名打开详情 等待导出 + 默认主页 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 4a49f09d8..098a2d015 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1131,4 +1131,5 @@ 换源间隔 点击书名打开详情 等待导出 + 默认主页 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5c24dc941..f6c98883a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1131,4 +1131,5 @@ 换源间隔 点击书名打开详情 等待导出 + 默认主页 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index aa7287672..2ab33848c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -144,4 +144,18 @@ ReplaceRule - \ No newline at end of file + + @string/bookshelf + @string/discovery + @string/rss + @string/my + + + + bookshelf + explore + rss + my + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 605dbe826..f129c9b91 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1131,4 +1131,5 @@ 换源间隔 点击书名打开详情 等待导出 + 默认主页 diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml index 38810e148..b02913d7c 100644 --- a/app/src/main/res/xml/pref_config_backup.xml +++ b/app/src/main/res/xml/pref_config_backup.xml @@ -90,7 +90,7 @@ + + + app:entries="@array/default_home_page" + app:entryValues="@array/default_home_page_value" /> @@ -54,8 +61,8 @@ + android:summary="@string/set_local_password_summary" + android:title="@string/set_local_password" /> + android:summary="@string/web_service_wake_lock_summary" + android:title="@string/web_service_wake_lock" />