diff --git a/app/src/main/assets/themeConfig.json b/app/src/main/assets/themeConfig.json index d785fd22e..a8826cf98 100644 --- a/app/src/main/assets/themeConfig.json +++ b/app/src/main/assets/themeConfig.json @@ -9,7 +9,7 @@ }, { "themeName": "黑白", - "isNightTheme": false, + "isNightTheme": true, "primaryColor": "#303030", "accentColor": "#E0E0E0", "backgroundColor": "#424242", @@ -17,7 +17,7 @@ }, { "themeName": "A屏黑", - "isNightTheme": false, + "isNightTheme": true, "primaryColor": "#000000", "accentColor": "#FFFFFF", "backgroundColor": "#000000", diff --git a/app/src/main/java/io/legado/app/help/ThemeConfig.kt b/app/src/main/java/io/legado/app/help/ThemeConfig.kt index 6a2402485..1cea05cbd 100644 --- a/app/src/main/java/io/legado/app/help/ThemeConfig.kt +++ b/app/src/main/java/io/legado/app/help/ThemeConfig.kt @@ -66,10 +66,7 @@ object ThemeConfig { fun applyConfig(context: Context, config: Config) { val primary = Color.parseColor(config.primaryColor) val accent = Color.parseColor(config.accentColor) - var background = Color.parseColor(config.backgroundColor) - if (!ColorUtils.isColorLight(background)) { - background = context.getCompatColor(R.color.md_grey_100) - } + val background = Color.parseColor(config.backgroundColor) val bBackground = Color.parseColor(config.bottomBackground) if (config.isNightTheme) { context.putPrefInt(PreferKey.cNPrimary, primary) diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt index 16d6d68b9..b7cf85e19 100644 --- a/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeListDialog.kt @@ -85,6 +85,9 @@ class ThemeListDialog : BaseDialogFragment() { override fun registerListener(holder: ItemViewHolder) { holder.itemView.apply { + onClick { + ThemeConfig.applyConfig(context, ThemeConfig.configList[holder.layoutPosition]) + } iv_share.onClick { share(holder.layoutPosition) } diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index ba63066b7..c007a530c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -757,5 +757,4 @@ 保存夜间主题配置以共调用和分享 主题列表 使用保存主题,导入,分享主题 - 切換默認主題 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8a977be9e..94e5a1760 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -757,6 +757,5 @@ 保存夜间主题配置以共调用和分享 主题列表 使用保存主题,导入,分享主题 - 切換默認主題 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index c8d1709d3..9e10e4ff9 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -757,5 +757,4 @@ 保存夜间主题配置以共调用和分享 主题列表 使用保存主题,导入,分享主题 - 切换默认主题