gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-19 01:17:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei 2023-07-16 22:29:14 +08:00
commit a4eb2a1408
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/legado/app/base/BaseActivity.kt
View File

@ -41,6 +41,7 @@ abstract class BaseActivity<VB : ViewBinding>(
protected abstract val binding: VB
val isInMultiWindow: Boolean
@SuppressLint("ObsoleteSdkInt")
get() {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
isInMultiWindowMode

5
app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
View File

@ -415,7 +415,10 @@ class ReadView(context: Context, attrs: AttributeSet) :
*/
private fun click(action: Int) {
when (action) {
0 -> callBack.showActionMenu()
0 -> {
pageDelegate?.dismissSnackBar()
callBack.showActionMenu()
}
1 -> pageDelegate?.nextPageByAnim(defaultAnimationSpeed)
2 -> pageDelegate?.prevPageByAnim(defaultAnimationSpeed)
3 -> ReadBook.moveToNextChapter(true)

6
app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
View File

@ -26,12 +26,14 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie
curBitmap?.recycle()
curBitmap = curPage.screenshot()
}
PageDirection.NEXT -> {
nextBitmap?.recycle()
nextBitmap = nextPage.screenshot()
curBitmap?.recycle()
curBitmap = curPage.screenshot()
}
else -> Unit
}
}
@ -41,9 +43,11 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie
MotionEvent.ACTION_DOWN -> {
abortAnim()
}
MotionEvent.ACTION_MOVE -> {
onScroll(event)
}
MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
onAnimStart(readView.defaultAnimationSpeed)
}
@ -120,7 +124,7 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie
if (!hasNext()) return
setDirection(PageDirection.NEXT)
val y = when {
viewHeight / 2 < startY -> viewHeight.toFloat() * 0.9f
startY > viewHeight / 2 -> viewHeight.toFloat() * 0.9f
else -> 1f
}
readView.setStartPoint(viewWidth.toFloat() * 0.9f, y, false)

12
app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
View File

@ -141,11 +141,6 @@ abstract class PageDelegate(protected val readView: ReadView) {
* 按下
*/
fun onDown() {
// 判断snackBar是否显示，并关闭
if (snackBar.isShown) {
snackBar.dismiss()
}
//是否移动
isMoved = false
//是否存在下一章
@ -187,6 +182,13 @@ abstract class PageDelegate(protected val readView: ReadView) {
return hasNext
}
fun dismissSnackBar() {
// 判断snackBar是否显示，并关闭
if (snackBar.isShown) {
snackBar.dismiss()
}
}
open fun onDestroy() {
// run on destroy
}

6
app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
View File

@ -91,7 +91,7 @@ object ChapterProvider {
private var titleBottomSpacing = 0
@JvmStatic
var typeface: Typeface = Typeface.DEFAULT
var typeface: Typeface? = Typeface.DEFAULT
private set
@JvmStatic
@ -637,7 +637,7 @@ object ChapterProvider {
upLayout()
}
private fun getTypeface(fontPath: String): Typeface {
private fun getTypeface(fontPath: String): Typeface? {
return kotlin.runCatching {
when {
fontPath.isContentScheme() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
@ -666,7 +666,7 @@ object ChapterProvider {
} ?: Typeface.DEFAULT
}
private fun getPaints(typeface: Typeface): Pair<TextPaint, TextPaint> {
private fun getPaints(typeface: Typeface?): Pair<TextPaint, TextPaint> {
// 字体统一处理
val bold = Typeface.create(typeface, Typeface.BOLD)
val normal = Typeface.create(typeface, Typeface.NORMAL)