Merge pull request #2296 from 821938089/little-fix

优化
pull/2288/head
kunfei 2 years ago committed by GitHub
commit 8e74ee85d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
  2. 1
      app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt

@ -150,7 +150,7 @@ class ReadMenu @JvmOverloads constructor(
bindEvent() bindEvent()
} }
private fun initView() = binding.run { private fun initView(reset: Boolean = false) = binding.run {
if (AppConfig.isNightTheme) { if (AppConfig.isNightTheme) {
fabNightTheme.setImageResource(R.drawable.ic_daytime) fabNightTheme.setImageResource(R.drawable.ic_daytime)
} else { } else {
@ -164,7 +164,7 @@ class ReadMenu @JvmOverloads constructor(
titleBar.setColorFilter(textColor) titleBar.setColorFilter(textColor)
tvChapterName.setTextColor(lightTextColor) tvChapterName.setTextColor(lightTextColor)
tvChapterUrl.setTextColor(lightTextColor) tvChapterUrl.setTextColor(lightTextColor)
} else { } else if (reset) {
val bgColor = context.primaryColor val bgColor = context.primaryColor
val textColor = context.primaryTextColor val textColor = context.primaryTextColor
titleBar.setTextColor(textColor) titleBar.setTextColor(textColor)
@ -210,7 +210,7 @@ class ReadMenu @JvmOverloads constructor(
fun reset() { fun reset() {
upColorConfig() upColorConfig()
initView() initView(true)
} }
fun refreshMenuColorFilter() { fun refreshMenuColorFilter() {

@ -77,6 +77,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
execute { execute {
appDb.searchKeywordDao.get(key)?.let { appDb.searchKeywordDao.get(key)?.let {
it.usage = it.usage + 1 it.usage = it.usage + 1
it.lastUseTime = System.currentTimeMillis()
appDb.searchKeywordDao.update(it) appDb.searchKeywordDao.update(it)
} ?: appDb.searchKeywordDao.insert(SearchKeyword(key, 1)) } ?: appDb.searchKeywordDao.insert(SearchKeyword(key, 1))
} }

Loading…
Cancel
Save