k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: E-Ink模式合并到主题模式里, E-Ink模式不能修改阅读界面背景和文字颜色

Browse Source
pull/254/head
gedoor 4 years ago
parent ed622adc02
commit 6745ba4baf
2 changed files with 37 additions and 62 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 61
      app/src/main/java/io/legado/app/App.kt
  2. 38
      app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt

61
app/src/main/java/io/legado/app/App.kt
Unescape View File

@ -5,6 +5,7 @@ import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
import android.graphics.Color
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
@ -69,30 +70,42 @@ class App : Application() {
* 更新主题 * 更新主题
*/ */
fun applyTheme() { fun applyTheme() {
if (AppConfig.isNightTheme) { when {
ThemeStore.editTheme(this) AppConfig.isEInkMode -> {
.coloredNavigationBar(true) ThemeStore.editTheme(this)
.primaryColor( .coloredNavigationBar(true)
getPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_blue_grey_600)) .primaryColor(Color.WHITE)
).accentColor( .accentColor(Color.BLACK)
getPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_deep_orange_800)) .backgroundColor(Color.WHITE)
).backgroundColor( .bottomBackground(Color.WHITE)
getPrefInt(PreferKey.cNBackground, getCompatColor(R.color.shine_color)) .apply()
).bottomBackground( }
getPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_850)) AppConfig.isNightTheme -> {
).apply() ThemeStore.editTheme(this)
} else { .coloredNavigationBar(true)
ThemeStore.editTheme(this) .primaryColor(
.coloredNavigationBar(true) getPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_blue_grey_600))
.primaryColor( ).accentColor(
getPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_indigo_800)) getPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_deep_orange_800))
).accentColor( ).backgroundColor(
getPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_red_600)) getPrefInt(PreferKey.cNBackground, getCompatColor(R.color.shine_color))
).backgroundColor( ).bottomBackground(
getPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100)) getPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_850))
).bottomBackground( ).apply()
getPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200)) }
).apply() else -> {
ThemeStore.editTheme(this)
.coloredNavigationBar(true)
.primaryColor(
getPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_indigo_800))
).accentColor(
getPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_red_600))
).backgroundColor(
getPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
).bottomBackground(
getPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
).apply()
}
} }
} }

38
app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt
Unescape View File

@ -14,7 +14,6 @@ import io.legado.app.base.BaseFragment
import io.legado.app.constant.EventBus import io.legado.app.constant.EventBus
import io.legado.app.constant.PreferKey import io.legado.app.constant.PreferKey
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import io.legado.app.help.ReadBookConfig
import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.ATH
import io.legado.app.service.WebService import io.legado.app.service.WebService
import io.legado.app.ui.about.AboutActivity import io.legado.app.ui.about.AboutActivity
@ -122,43 +121,6 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.
} }
} }
"recordLog" -> LogUtils.upLevel() "recordLog" -> LogUtils.upLevel()
PreferKey.eInkMode -> {
//既然是 E-Ink 模式，为什么不一步到位呢
if (AppConfig.isEInkMode) {
//保存开启前的设置
putPrefInt(PreferKey.lastPageAnim, ReadBookConfig.pageAnim)
putPrefInt(PreferKey.cLPrimary, getPrefInt(PreferKey.cPrimary))
putPrefInt(PreferKey.cLAccent, getPrefInt(PreferKey.cAccent))
putPrefInt(PreferKey.cLBackground, getPrefInt(PreferKey.cBackground))
putPrefInt(PreferKey.cLBBackground, getPrefInt(PreferKey.cBBackground))
putPrefString(
PreferKey.lastThemeMode,
getPrefString(PreferKey.themeMode) ?: "0"
)
//设置 E-Ink 模式配置
ReadBookConfig.pageAnim = 4
putPrefInt(PreferKey.cPrimary, getCompatColor(R.color.white))
putPrefInt(PreferKey.cAccent, getCompatColor(R.color.black))
putPrefInt(PreferKey.cBackground, getCompatColor(R.color.white))
putPrefInt(PreferKey.cBBackground, getCompatColor(R.color.white))
AppConfig.isNightTheme = false
App.INSTANCE.applyDayNight()
postEvent(EventBus.RECREATE, "")
} else if (getPrefString(PreferKey.lastThemeMode) != null) {
ReadBookConfig.pageAnim = getPrefInt(PreferKey.lastPageAnim)
putPrefInt(PreferKey.cPrimary, getPrefInt(PreferKey.cLPrimary))
putPrefInt(PreferKey.cAccent, getPrefInt(PreferKey.cLAccent))
putPrefInt(PreferKey.cBackground, getPrefInt(PreferKey.cLBackground))
putPrefInt(PreferKey.cBBackground, getPrefInt(PreferKey.cLBBackground))
putPrefString(
PreferKey.themeMode,
getPrefString(PreferKey.lastThemeMode) ?: "0"
)
App.INSTANCE.applyDayNight()
postEvent(EventBus.RECREATE, "")
}
}
} }
} }

Write Preview
Loading…
Cancel
Save