renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2022-10-26 12:46:23 +08:00
parent 28048d8aa2
commit 8f71d9af26
16 changed files with 119 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/legado/app/constant/PreferKey.kt
View File

@@ -120,6 +120,7 @@ object PreferKey {
const val noAnimScrollPage = "noAnimScrollPage"
const val webDavDeviceName = "webDavDeviceName"
const val wakeLock = "wakeLock"
const val showLastUpdateTime = "showLastUpdateTime"
const val cPrimary = "colorPrimary"
const val cAccent = "colorAccent"

6
app/src/main/java/io/legado/app/help/config/AppConfig.kt
View File

@@ -82,6 +82,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
appCtx.putPrefBoolean(PreferKey.showUnread, value)
}
var showLastUpdateTime: Boolean
get() = appCtx.getPrefBoolean(PreferKey.showLastUpdateTime, false)
set(value) {
appCtx.putPrefBoolean(PreferKey.showLastUpdateTime, value)
}
var readBrightness: Int
get() = if (isNightTheme) {
appCtx.getPrefInt(PreferKey.nightBrightness, 100)

5
app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
View File

@@ -136,6 +136,7 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
.apply {
spGroupStyle.setSelection(AppConfig.bookGroupStyle)
swShowUnread.isChecked = AppConfig.showUnread
swShowLastUpdateTime.isChecked = AppConfig.showLastUpdateTime
rgLayout.checkByIndex(bookshelfLayout)
rgSort.checkByIndex(bookshelfSort)
}
@@ -150,6 +151,10 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
AppConfig.showUnread = swShowUnread.isChecked
postEvent(EventBus.BOOKSHELF_REFRESH, "")
}
if (AppConfig.showLastUpdateTime != swShowLastUpdateTime.isChecked) {
AppConfig.showLastUpdateTime = swShowLastUpdateTime.isChecked
postEvent(EventBus.BOOKSHELF_REFRESH, "")
}
var changed = false
if (bookshelfLayout != rgLayout.getCheckedIndex()) {
putPrefInt(PreferKey.bookshelfLayout, rgLayout.getCheckedIndex())

6
app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BaseBooksAdapter.kt
View File

@@ -66,13 +66,17 @@ abstract class BaseBooksAdapter<VB : ViewBinding>(context: Context) :
for (i in 0 until itemCount) {
getItem(i)?.let {
if (it.bookUrl == bookUrl) {
notifyItemChanged(i, bundleOf(Pair("refresh", null)))
notifyItemChanged(i, bundleOf(Pair("refresh", null), Pair("lastUpdateTime", null)))
return
}
}
}
}
fun upLastUpdateTime() {
notifyItemRangeChanged(0, itemCount, bundleOf(Pair("lastUpdateTime", null)))
}
interface CallBack {
fun open(book: Book)
fun openBookInfo(book: Book)

11
app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterList.kt
View File

@@ -9,6 +9,7 @@ import io.legado.app.databinding.ItemBookshelfListBinding
import io.legado.app.help.book.isLocal
import io.legado.app.help.config.AppConfig
import io.legado.app.utils.invisible
import io.legado.app.utils.toTimeAgo
import splitties.views.onLongClick
class BooksAdapterList(context: Context, private val callBack: CallBack) :
@@ -32,6 +33,7 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) :
tvLast.text = item.latestChapterTitle
ivCover.load(item.getDisplayCover(), item.name, item.author, false, item.origin)
upRefresh(binding, item)
upLastUpdateTime(binding, item)
} else {
tvRead.text = item.durChapterTitle
tvLast.text = item.latestChapterTitle
@@ -41,6 +43,7 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) :
"author" -> tvAuthor.text = item.author
"cover" -> ivCover.load(item.getDisplayCover(), item.name, item.author, false, item.origin)
"refresh" -> upRefresh(binding, item)
"lastUpdateTime" -> upLastUpdateTime(binding, item)
}
}
}
@@ -61,6 +64,14 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) :
}
}
private fun upLastUpdateTime(binding: ItemBookshelfListBinding, item: Book) {
if (AppConfig.showLastUpdateTime && !item.isLocal) {
binding.tvLastUpdateTime.text = item.latestChapterTime.toTimeAgo()
} else {
binding.tvLastUpdateTime.text = ""
}
}
override fun registerListener(holder: ItemViewHolder, binding: ItemBookshelfListBinding) {
holder.itemView.apply {
setOnClickListener {

21
app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
View File

@@ -27,14 +27,11 @@ import io.legado.app.ui.book.read.ReadBookActivity
import io.legado.app.ui.main.MainViewModel
import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
import kotlin.math.max
/**
@@ -66,6 +63,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
private var savedInstanceState: Bundle? = null
private var position = 0
private var groupId = -1L
private var upLastUpdateTimeJob : Job? = null
override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
this.savedInstanceState = savedInstanceState
@@ -107,6 +105,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
}
}
})
startLastUpdateTimeJob()
}
private fun upRecyclerData() {
@@ -153,6 +152,19 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
}
}
private fun startLastUpdateTimeJob() {
upLastUpdateTimeJob?.cancel()
if (!AppConfig.showLastUpdateTime) {
return
}
upLastUpdateTimeJob = launch {
while (isActive) {
booksAdapter.upLastUpdateTime()
delay(30 * 1000)
}
}
}
fun getBooks(): List<Book> {
return booksAdapter.getItems()
}
@@ -222,6 +234,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
}
observeEvent<String>(EventBus.BOOKSHELF_REFRESH) {
booksAdapter.notifyDataSetChanged()
startLastUpdateTimeJob()
}
}
}

39
app/src/main/java/io/legado/app/utils/TimeUtils.kt Normal file
View File

@@ -0,0 +1,39 @@
package io.legado.app.utils
import kotlin.math.abs
fun Long.toTimeAgo(): String {
val curTime = System.currentTimeMillis()
val time = this
val seconds = abs(System.currentTimeMillis() - time) / 1000f
val end = if (time < curTime) "前" else "后"
val start = when {
seconds < 60 -> "${seconds.toInt()}秒"
seconds < 3600 -> {
val minutes = seconds / 60f
"${minutes.toInt()}分钟"
}
seconds < 86400 -> {
val hours = seconds / 3600f
"${hours.toInt()}小时"
}
seconds < 604800 -> {
val days = seconds / 86400f
"${days.toInt()}天"
}
seconds < 2_628_000 -> {
val weeks = seconds / 604800f
"${weeks.toInt()}周"
}
seconds < 31_536_000 -> {
val months = seconds / 2_628_000f
"${months.toInt()}月"
}
else -> {
val years = seconds / 31_536_000f
"${years.toInt()}年"
}
}
return start + end
}

13
app/src/main/res/layout/dialog_bookshelf_config.xml
View File

@@ -40,13 +40,22 @@
app:layout_constraintTop_toBottomOf="@+id/ll_group_style"
tools:ignore="TouchTargetSizeCheck" />
<io.legado.app.lib.theme.view.ThemeSwitch
android:id="@+id/sw_show_last_update_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
android:text="@string/show_last_update_time"
app:layout_constraintTop_toBottomOf="@+id/sw_show_unread"
tools:ignore="TouchTargetSizeCheck" />
<LinearLayout
android:id="@+id/ll_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintRight_toLeftOf="@+id/ll_sort"
app:layout_constraintTop_toBottomOf="@+id/sw_show_unread"
app:layout_constraintTop_toBottomOf="@+id/sw_show_last_update_time"
app:layout_constraintLeft_toLeftOf="parent">
<io.legado.app.ui.widget.text.AccentTextView
@@ -101,7 +110,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintLeft_toRightOf="@+id/ll_layout"
app:layout_constraintTop_toBottomOf="@id/sw_show_unread"
app:layout_constraintTop_toBottomOf="@id/sw_show_last_update_time"
app:layout_constraintRight_toRightOf="parent">
<io.legado.app.ui.widget.text.AccentTextView

17
app/src/main/res/layout/item_bookshelf_list.xml
View File

@@ -98,6 +98,23 @@
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@+id/tv_read"
app:layout_constraintLeft_toRightOf="@+id/iv_author"
app:layout_constraintRight_toLeftOf="@id/tv_last_update_time"
app:layout_constraintTop_toBottomOf="@+id/tv_name"
tools:ignore="RtlSymmetry,TextContrastCheck" />
<TextView
android:id="@+id/tv_last_update_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:maxLines="1"
android:paddingEnd="6dp"
android:text=""
android:textColor="@color/tv_text_summary"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@+id/tv_read"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toRightOf="@+id/tv_author"
app:layout_constraintRight_toRightOf="@id/fl_has_new"
app:layout_constraintTop_toBottomOf="@+id/tv_name"
tools:ignore="RtlSymmetry,TextContrastCheck" />

1
app/src/main/res/values-es-rES/strings.xml
View File

@@ -1052,4 +1052,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values-ja-rJP/strings.xml
View File

@@ -1055,4 +1055,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values-pt-rBR/strings.xml
View File

@@ -1055,4 +1055,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values-zh-rHK/strings.xml
View File

@@ -1052,4 +1052,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1054,4 +1054,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values-zh/strings.xml
View File

@@ -1054,4 +1054,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@@ -1055,4 +1055,5 @@
<string name="paste_rule">粘贴规则</string>
<string name="groups_or_source">多分组/书源</string>
<string name="replace_state_change">替换(启用/禁用)</string>
<string name="show_last_update_time">显示上次更新时间</string>
</resources>