diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt index b9a49d040..83e3e7426 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt @@ -12,6 +12,7 @@ import android.text.StaticLayout import android.text.TextPaint import androidx.core.net.toUri import androidx.core.os.postDelayed +import io.legado.app.constant.AppLog import io.legado.app.constant.AppPattern import io.legado.app.constant.EventBus import io.legado.app.data.entities.Book @@ -1101,7 +1102,11 @@ object ChapterProvider { visibleRight = viewWidth - paddingRight visibleBottom = paddingTop + visibleHeight - val shadowPad = (contentPaint.shadowLayerRadius + 2).toInt() + val shadowPad = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + (contentPaint.shadowLayerRadius + 2).toInt() + } else { + 20 + } visibleRect.set( (paddingLeft - shadowPad).toFloat(), diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt index b14d7f871..3f570a7b9 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt @@ -261,7 +261,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2) } booksFlowJob?.cancel() booksFlowJob = viewLifecycleOwner.lifecycleScope.launch { - viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) { appDb.bookDao.flowByGroup(groupId) .map { list -> val isDescending = AppConfig.bookshelfSortOrder == 1