From 417c1c28a0f25faa79a259681bbd2d49c190a544 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 6 Mar 2022 18:46:55 +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/assets/updateLog.md | 1 + .../java/io/legado/app/constant/PreferKey.kt | 2 ++ .../legado/app/ui/welcome/WelcomeActivity.kt | 2 ++ app/src/main/res/values-es-rES/strings.xml | 2 ++ app/src/main/res/values-ja-rJP/strings.xml | 2 ++ app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-zh-rHK/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values-zh/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/pref_config_welcome.xml | 18 ++++++++++++++++++ 11 files changed, 37 insertions(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 95b37ea12..5e295f5de 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -15,6 +15,7 @@ * 导入本地书籍界面添加排序功能 * 修复txt最后一句不显示的bug +* pro版本可以单独订阅启动画面 **2022/03/04** 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 d5a697839..c393cbde4 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -100,6 +100,8 @@ object PreferKey { const val welcomeImageDark = "welcomeImagePathDark" const val welcomeShowText = "welcomeShowText" const val welcomeShowTextDark = "welcomeShowTextDark" + const val welcomeShowIcon = "welcomeShowIcon" + const val welcomeShowIconDark = "welcomeShowIconDark" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" 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 30ac95ab1..2705e3449 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 @@ -78,6 +78,7 @@ open class WelcomeActivity : BaseActivity() { val size = windowSize BitmapUtils.decodeBitmap(path, size.widthPixels, size.heightPixels).let { binding.tvLegado.visible(getPrefBoolean(PreferKey.welcomeShowTextDark)) + binding.ivBook.visible(getPrefBoolean(PreferKey.welcomeShowIconDark)) window.decorView.background = BitmapDrawable(resources, it) return } @@ -86,6 +87,7 @@ open class WelcomeActivity : BaseActivity() { val size = windowSize BitmapUtils.decodeBitmap(path, size.widthPixels, size.heightPixels).let { binding.tvLegado.visible(getPrefBoolean(PreferKey.welcomeShowText)) + binding.ivBook.visible(getPrefBoolean(PreferKey.welcomeShowIcon)) window.decorView.background = BitmapDrawable(resources, it) return } diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 26f2996d9..077961d1d 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -952,5 +952,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 735e71f62..5dd7706a8 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -955,5 +955,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f7d1d3205..b935c1896 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -955,5 +955,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d5d161398..f0c93b16a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -952,5 +952,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a56779e27..845eb87b9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -954,5 +954,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 29d4b61ae..8b337ce1b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -954,5 +954,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3eb526734..9b5441891 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -955,5 +955,7 @@ 阅读|享受美好时光 自定义欢迎页 是否使用自定义欢迎页 + 显示图标 + 显示默认书籍图标 diff --git a/app/src/main/res/xml/pref_config_welcome.xml b/app/src/main/res/xml/pref_config_welcome.xml index 38b3ce61d..66f780983 100644 --- a/app/src/main/res/xml/pref_config_welcome.xml +++ b/app/src/main/res/xml/pref_config_welcome.xml @@ -35,6 +35,15 @@ app:allowDividerBelow="false" app:iconSpaceReserved="false" /> + + + + \ No newline at end of file