mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-12-21 15:51:49 +01:00
Bump compile SDK version 34 (#9625)
This commit is contained in:
parent
245985bf42
commit
740e370465
@ -58,21 +58,21 @@ class ReaderNavigationOverlayView(context: Context, attributeSet: AttributeSet)
|
|||||||
strokeWidth = 8f
|
strokeWidth = 8f
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDraw(canvas: Canvas?) {
|
override fun onDraw(canvas: Canvas) {
|
||||||
if (navigation == null) return
|
if (navigation == null) return
|
||||||
|
|
||||||
navigation?.regions?.forEach { region ->
|
navigation?.regions?.forEach { region ->
|
||||||
val rect = region.rectF
|
val rect = region.rectF
|
||||||
|
|
||||||
// Scale rect from 1f,1f to screen width and height
|
// Scale rect from 1f,1f to screen width and height
|
||||||
canvas?.withScale(width.toFloat(), height.toFloat()) {
|
canvas.withScale(width.toFloat(), height.toFloat()) {
|
||||||
regionPaint.color = context.getColor(region.type.colorRes)
|
regionPaint.color = context.getColor(region.type.colorRes)
|
||||||
drawRect(rect, regionPaint)
|
drawRect(rect, regionPaint)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't want scale anymore because it messes with drawText
|
// Don't want scale anymore because it messes with drawText
|
||||||
// Translate origin to rect start (left, top)
|
// Translate origin to rect start (left, top)
|
||||||
canvas?.withTranslation(x = (width * rect.left), y = (height * rect.top)) {
|
canvas.withTranslation(x = (width * rect.left), y = (height * rect.top)) {
|
||||||
// Calculate center of rect width on screen
|
// Calculate center of rect width on screen
|
||||||
val x = width * (abs(rect.left - rect.right) / 2)
|
val x = width * (abs(rect.left - rect.right) / 2)
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ class WebtoonFrame(context: Context) : FrameLayout(context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onFling(
|
override fun onFling(
|
||||||
e1: MotionEvent,
|
e1: MotionEvent?,
|
||||||
e2: MotionEvent,
|
e2: MotionEvent,
|
||||||
velocityX: Float,
|
velocityX: Float,
|
||||||
velocityY: Float,
|
velocityY: Float,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
object AndroidConfig {
|
object AndroidConfig {
|
||||||
const val compileSdk = 33
|
const val compileSdk = 34
|
||||||
const val minSdk = 23
|
const val minSdk = 23
|
||||||
const val targetSdk = 29
|
const val targetSdk = 29
|
||||||
const val ndk = "22.1.7171670"
|
const val ndk = "22.1.7171670"
|
||||||
|
Loading…
Reference in New Issue
Block a user