diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt index 277cde943..40af2c32d 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt @@ -21,37 +21,30 @@ import kotlinx.android.synthetic.main.view_read_menu.view.* import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onLongClick -class ReadMenu : FrameLayout { +/** + * 阅读界面菜单 + */ +class ReadMenu @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { var cnaShowMenu: Boolean = false - private var callBack: CallBack? = null + private val callBack: CallBack? get() = activity as? CallBack private lateinit var menuTopIn: Animation private lateinit var menuTopOut: Animation private lateinit var menuBottomIn: Animation private lateinit var menuBottomOut: Animation - private val bgColor: Int - private val textColor: Int - private var bottomBackgroundList: ColorStateList + private val bgColor: Int = context.bottomBackground + private val textColor: Int = context.getPrimaryTextColor(ColorUtils.isColorLight(bgColor)) + private val bottomBackgroundList: ColorStateList = Selector.colorBuild() + .setDefaultColor(bgColor) + .setPressedColor(ColorUtils.darkenColor(bgColor)) + .create() private var onMenuOutEnd: (() -> Unit)? = null val showBrightnessView get() = context.getPrefBoolean(PreferKey.showBrightnessView, true) - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) - init { - callBack = activity as? CallBack - bgColor = context.bottomBackground - textColor = context.getPrimaryTextColor(ColorUtils.isColorLight(bgColor)) - bottomBackgroundList = Selector.colorBuild() - .setDefaultColor(bgColor) - .setPressedColor(ColorUtils.darkenColor(bgColor)) - .create() inflate(context, R.layout.view_read_menu, this) if (AppConfig.isNightTheme) { fabNightTheme.setImageResource(R.drawable.ic_daytime) @@ -254,9 +247,7 @@ class ReadMenu : FrameLayout { } } - override fun onAnimationRepeat(animation: Animation) { - - } + override fun onAnimationRepeat(animation: Animation) = Unit }) //隐藏菜单 @@ -277,9 +268,7 @@ class ReadMenu : FrameLayout { callBack?.upSystemUiVisibility() } - override fun onAnimationRepeat(animation: Animation) { - - } + override fun onAnimationRepeat(animation: Animation) = Unit }) } diff --git a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt index 2f83c8594..82d24c671 100644 --- a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt @@ -16,21 +16,14 @@ import android.widget.TextView import androidx.appcompat.widget.SearchView import io.legado.app.R -class SearchView : SearchView { +class SearchView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : SearchView(context, attrs, defStyleAttr) { private var mSearchHintIcon: Drawable? = null private var textView: TextView? = null - constructor( - context: Context, - attrs: AttributeSet? = null - ) : super(context, attrs) - - constructor( - context: Context, - attrs: AttributeSet?, - defStyleAttr: Int - ) : super(context, attrs, defStyleAttr) - @SuppressLint("UseCompatLoadingForDrawables") override fun onLayout( changed: Boolean, diff --git a/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt index b1d1a5376..2364deab7 100644 --- a/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt @@ -26,10 +26,7 @@ import kotlin.math.pow @Suppress("unused", "MemberVisibilityCanBePrivate") class CircleImageView(context: Context, attrs: AttributeSet) : - AppCompatImageView( - context, - attrs - ) { + AppCompatImageView(context, attrs) { private val mDrawableRect = RectF() private val mBorderRect = RectF() diff --git a/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt index 52b0517c2..5a85a0573 100644 --- a/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/CoverImageView.kt @@ -20,7 +20,15 @@ import io.legado.app.utils.getPrefString * 封面 */ @Suppress("unused") -class CoverImageView : androidx.appcompat.widget.AppCompatImageView { +class CoverImageView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : androidx.appcompat.widget.AppCompatImageView( + context, + attrs, + defStyleAttr +) { internal var width: Float = 0.toFloat() internal var height: Float = 0.toFloat() private var nameHeight = 0f @@ -45,16 +53,6 @@ class CoverImageView : androidx.appcompat.widget.AppCompatImageView { private var author: String? = null private var loadFailed = false - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) - - constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) - override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { val measuredWidth = MeasureSpec.getSize(widthMeasureSpec) val measuredHeight = measuredWidth * 7 / 5 diff --git a/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt index bcb449329..57428fe47 100644 --- a/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/FilletImageView.kt @@ -10,7 +10,11 @@ import io.legado.app.R import io.legado.app.utils.dp import kotlin.math.max -class FilletImageView : AppCompatImageView { +class FilletImageView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatImageView(context, attrs, defStyleAttr) { internal var width: Float = 0.toFloat() internal var height: Float = 0.toFloat() private var leftTopRadius: Int = 0 @@ -18,26 +22,29 @@ class FilletImageView : AppCompatImageView { private var rightBottomRadius: Int = 0 private var leftBottomRadius: Int = 0 - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { - init(context, attrs) - } - - constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { - init(context, attrs) - } - - private fun init(context: Context, attrs: AttributeSet) { + init { // 读取配置 val array = context.obtainStyledAttributes(attrs, R.styleable.FilletImageView) val defaultRadius = 5.dp - val radius = array.getDimensionPixelOffset(R.styleable.FilletImageView_radius, defaultRadius) - leftTopRadius = array.getDimensionPixelOffset(R.styleable.FilletImageView_left_top_radius, defaultRadius) - rightTopRadius = array.getDimensionPixelOffset(R.styleable.FilletImageView_right_top_radius, defaultRadius) + val radius = + array.getDimensionPixelOffset(R.styleable.FilletImageView_radius, defaultRadius) + leftTopRadius = array.getDimensionPixelOffset( + R.styleable.FilletImageView_left_top_radius, + defaultRadius + ) + rightTopRadius = array.getDimensionPixelOffset( + R.styleable.FilletImageView_right_top_radius, + defaultRadius + ) rightBottomRadius = - array.getDimensionPixelOffset(R.styleable.FilletImageView_right_bottom_radius, defaultRadius) - leftBottomRadius = array.getDimensionPixelOffset(R.styleable.FilletImageView_left_bottom_radius, defaultRadius) + array.getDimensionPixelOffset( + R.styleable.FilletImageView_right_bottom_radius, + defaultRadius + ) + leftBottomRadius = array.getDimensionPixelOffset( + R.styleable.FilletImageView_left_bottom_radius, + defaultRadius + ) //如果四个角的值没有设置，那么就使用通用的radius的值。 if (defaultRadius == leftTopRadius) { @@ -53,7 +60,6 @@ class FilletImageView : AppCompatImageView { leftBottomRadius = radius } array.recycle() - } override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) { diff --git a/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt b/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt index 5a2c7588f..08cc63e3a 100644 --- a/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/PhotoView.kt @@ -16,6 +16,7 @@ import android.view.animation.Interpolator import android.widget.ImageView import android.widget.OverScroller import android.widget.Scroller +import androidx.appcompat.widget.AppCompatImageView import io.legado.app.R import io.legado.app.ui.widget.image.photo.Info import io.legado.app.ui.widget.image.photo.OnRotateListener @@ -23,10 +24,12 @@ import io.legado.app.ui.widget.image.photo.RotateGestureDetector import kotlin.math.abs import kotlin.math.roundToInt - -@Suppress("UNUSED_PARAMETER", "unused", "MemberVisibilityCanBePrivate") -@SuppressLint("AppCompatCustomView") -class PhotoView : ImageView { +@Suppress("UNUSED_PARAMETER", "unused", "MemberVisibilityCanBePrivate", "PropertyName") +class PhotoView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatImageView(context, attrs, defStyleAttr) { val MIN_ROTATE = 35 val ANIMA_DURING = 340 val MAX_SCALE = 2.5f @@ -45,9 +48,9 @@ class PhotoView : ImageView { private val mSynthesisMatrix: Matrix = Matrix() private val mTmpMatrix: Matrix = Matrix() - private var mRotateDetector: RotateGestureDetector? = null - private var mDetector: GestureDetector? = null - private var mScaleDetector: ScaleGestureDetector? = null + private val mRotateDetector: RotateGestureDetector + private val mDetector: GestureDetector + private val mScaleDetector: ScaleGestureDetector private var mClickListener: OnClickListener? = null private var mScaleType: ScaleType? = null @@ -100,23 +103,11 @@ class PhotoView : ImageView { private var mLongClick: OnLongClickListener? = null - constructor(context: Context) : super(context) { - init() - } + private val mRotateListener = RotateListener() + private val mGestureListener = GestureListener() + private val mScaleListener = ScaleGestureListener() - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { - init() - } - - constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super( - context, - attrs, - defStyleAttr - ) { - init() - } - - private fun init() { + init { super.setScaleType(ScaleType.MATRIX) if (mScaleType == null) mScaleType = ScaleType.CENTER_INSIDE mRotateDetector = RotateGestureDetector(mRotateListener) @@ -484,11 +475,11 @@ class PhotoView : ImageView { return if (isEnable) { val action = event.actionMasked if (event.pointerCount >= 2) hasMultiTouch = true - mDetector!!.onTouchEvent(event) + mDetector.onTouchEvent(event) if (isRotateEnable) { - mRotateDetector!!.onTouchEvent(event) + mRotateDetector.onTouchEvent(event) } - mScaleDetector!!.onTouchEvent(event) + mScaleDetector.onTouchEvent(event) if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) onUp() true } else { @@ -566,49 +557,6 @@ class PhotoView : ImageView { return abs(rect.left.roundToInt() - (mWidgetRect.width() - rect.width()) / 2) < 1 } - private val mRotateListener: OnRotateListener = object : - OnRotateListener { - override fun onRotate( - degrees: Float, - focusX: Float, - focusY: Float - ) { - mRotateFlag += degrees - if (canRotate) { - mDegrees += degrees - mAnimMatrix.postRotate(degrees, focusX, focusY) - } else { - if (abs(mRotateFlag) >= mMinRotate) { - canRotate = true - mRotateFlag = 0f - } - } - } - } - - private val mScaleListener: OnScaleGestureListener = object : OnScaleGestureListener { - override fun onScale(detector: ScaleGestureDetector): Boolean { - val scaleFactor = detector.scaleFactor - if (java.lang.Float.isNaN(scaleFactor) || java.lang.Float.isInfinite(scaleFactor)) return false - mScale *= scaleFactor - //mScaleCenter.set(detector.getFocusX(), detector.getFocusY()); - mAnimMatrix.postScale( - scaleFactor, - scaleFactor, - detector.focusX, - detector.focusY - ) - executeTranslate() - return true - } - - override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { - return true - } - - override fun onScaleEnd(detector: ScaleGestureDetector) {} - } - private fun resistanceScrollByX( overScroll: Float, detalX: Float @@ -652,147 +600,6 @@ class PhotoView : ImageView { mClickListener?.onClick(this) } - private val mGestureListener: GestureDetector.OnGestureListener = - object : SimpleOnGestureListener() { - override fun onLongPress(e: MotionEvent) { - mLongClick?.onLongClick(this@PhotoView) - } - - override fun onDown(e: MotionEvent): Boolean { - hasOverTranslate = false - hasMultiTouch = false - canRotate = false - removeCallbacks(mClickRunnable) - return false - } - - override fun onFling( - e1: MotionEvent, - e2: MotionEvent, - velocityX: Float, - velocityY: Float - ): Boolean { - if (hasMultiTouch) return false - if (!imgLargeWidth && !imgLargeHeight) return false - if (mTranslate.isRunning) return false - var vx = velocityX - var vy = velocityY - if (mImgRect.left.roundToInt() >= mWidgetRect.left - || mImgRect.right.roundToInt() <= mWidgetRect.right - ) { - vx = 0f - } - if (mImgRect.top.roundToInt() >= mWidgetRect.top - || mImgRect.bottom.roundToInt() <= mWidgetRect.bottom - ) { - vy = 0f - } - if (canRotate || mDegrees % 90 != 0f) { - var toDegrees = (mDegrees / 90).toInt() * 90.toFloat() - val remainder = mDegrees % 90 - if (remainder > 45) toDegrees += 90f else if (remainder < -45) toDegrees -= 90f - mTranslate.withRotate(mDegrees.toInt(), toDegrees.toInt()) - mDegrees = toDegrees - } - doTranslateReset(mImgRect) - mTranslate.withFling(vx, vy) - mTranslate.start() - // onUp(e2); - return super.onFling(e1, e2, velocityX, velocityY) - } - - override fun onScroll( - e1: MotionEvent, - e2: MotionEvent, - distanceX: Float, - distanceY: Float - ): Boolean { - var x = distanceX - var y = distanceY - if (mTranslate.isRunning) { - mTranslate.stop() - } - if (canScrollHorizontallySelf(x)) { - if (x < 0 && mImgRect.left - x > mWidgetRect.left) - x = mImgRect.left - if (x > 0 && mImgRect.right - x < mWidgetRect.right) - x = mImgRect.right - mWidgetRect.right - mAnimMatrix.postTranslate(-x, 0f) - mTranslateX -= x.toInt() - } else if (imgLargeWidth || hasMultiTouch || hasOverTranslate) { - checkRect() - if (!hasMultiTouch) { - if (x < 0 && mImgRect.left - x > mCommonRect.left) x = - resistanceScrollByX(mImgRect.left - mCommonRect.left, x) - if (x > 0 && mImgRect.right - x < mCommonRect.right) x = - resistanceScrollByX(mImgRect.right - mCommonRect.right, x) - } - mTranslateX -= x.toInt() - mAnimMatrix.postTranslate(-x, 0f) - hasOverTranslate = true - } - if (canScrollVerticallySelf(y)) { - if (y < 0 && mImgRect.top - y > mWidgetRect.top) y = - mImgRect.top - if (y > 0 && mImgRect.bottom - y < mWidgetRect.bottom) y = - mImgRect.bottom - mWidgetRect.bottom - mAnimMatrix.postTranslate(0f, -y) - mTranslateY -= y.toInt() - } else if (imgLargeHeight || hasOverTranslate || hasMultiTouch) { - checkRect() - if (!hasMultiTouch) { - if (y < 0 && mImgRect.top - y > mCommonRect.top) y = - resistanceScrollByY(mImgRect.top - mCommonRect.top, y) - if (y > 0 && mImgRect.bottom - y < mCommonRect.bottom) y = - resistanceScrollByY(mImgRect.bottom - mCommonRect.bottom, y) - } - mAnimMatrix.postTranslate(0f, -y) - mTranslateY -= y.toInt() - hasOverTranslate = true - } - executeTranslate() - return true - } - - override fun onSingleTapUp(e: MotionEvent): Boolean { - postDelayed(mClickRunnable, 250) - return false - } - - override fun onDoubleTap(e: MotionEvent): Boolean { - mTranslate.stop() - val from: Float - val to: Float - val imgCx = mImgRect.left + mImgRect.width() / 2 - val imgCy = mImgRect.top + mImgRect.height() / 2 - mScaleCenter[imgCx] = imgCy - mRotateCenter[imgCx] = imgCy - mTranslateX = 0 - mTranslateY = 0 - if (isZoonUp) { - from = mScale - to = 1f - } else { - from = mScale - to = mMaxScale - mScaleCenter[e.x] = e.y - } - mTmpMatrix.reset() - mTmpMatrix.postTranslate(-mBaseRect.left, -mBaseRect.top) - mTmpMatrix.postTranslate(mRotateCenter.x, mRotateCenter.y) - mTmpMatrix.postTranslate(-mHalfBaseRectWidth, -mHalfBaseRectHeight) - mTmpMatrix.postRotate(mDegrees, mRotateCenter.x, mRotateCenter.y) - mTmpMatrix.postScale(to, to, mScaleCenter.x, mScaleCenter.y) - mTmpMatrix.postTranslate(mTranslateX.toFloat(), mTranslateY.toFloat()) - mTmpMatrix.mapRect(mTmpRect, mBaseRect) - doTranslateReset(mTmpRect) - isZoonUp = !isZoonUp - mTranslate.withScale(from, to) - mTranslate.start() - return false - } - } - fun canScrollHorizontallySelf(direction: Float): Boolean { if (mImgRect.width() <= mWidgetRect.width()) return false @@ -1268,4 +1075,185 @@ class PhotoView : ImageView { executeTranslate() } + inner class RotateListener : OnRotateListener { + override fun onRotate( + degrees: Float, + focusX: Float, + focusY: Float + ) { + mRotateFlag += degrees + if (canRotate) { + mDegrees += degrees + mAnimMatrix.postRotate(degrees, focusX, focusY) + } else { + if (abs(mRotateFlag) >= mMinRotate) { + canRotate = true + mRotateFlag = 0f + } + } + } + } + + inner class GestureListener : SimpleOnGestureListener() { + override fun onLongPress(e: MotionEvent) { + mLongClick?.onLongClick(this@PhotoView) + } + + override fun onDown(e: MotionEvent): Boolean { + hasOverTranslate = false + hasMultiTouch = false + canRotate = false + removeCallbacks(mClickRunnable) + return false + } + + override fun onFling( + e1: MotionEvent, + e2: MotionEvent, + velocityX: Float, + velocityY: Float + ): Boolean { + if (hasMultiTouch) return false + if (!imgLargeWidth && !imgLargeHeight) return false + if (mTranslate.isRunning) return false + var vx = velocityX + var vy = velocityY + if (mImgRect.left.roundToInt() >= mWidgetRect.left + || mImgRect.right.roundToInt() <= mWidgetRect.right + ) { + vx = 0f + } + if (mImgRect.top.roundToInt() >= mWidgetRect.top + || mImgRect.bottom.roundToInt() <= mWidgetRect.bottom + ) { + vy = 0f + } + if (canRotate || mDegrees % 90 != 0f) { + var toDegrees = (mDegrees / 90).toInt() * 90.toFloat() + val remainder = mDegrees % 90 + if (remainder > 45) toDegrees += 90f else if (remainder < -45) toDegrees -= 90f + mTranslate.withRotate(mDegrees.toInt(), toDegrees.toInt()) + mDegrees = toDegrees + } + doTranslateReset(mImgRect) + mTranslate.withFling(vx, vy) + mTranslate.start() + // onUp(e2); + return super.onFling(e1, e2, velocityX, velocityY) + } + + override fun onScroll( + e1: MotionEvent, + e2: MotionEvent, + distanceX: Float, + distanceY: Float + ): Boolean { + var x = distanceX + var y = distanceY + if (mTranslate.isRunning) { + mTranslate.stop() + } + if (canScrollHorizontallySelf(x)) { + if (x < 0 && mImgRect.left - x > mWidgetRect.left) + x = mImgRect.left + if (x > 0 && mImgRect.right - x < mWidgetRect.right) + x = mImgRect.right - mWidgetRect.right + mAnimMatrix.postTranslate(-x, 0f) + mTranslateX -= x.toInt() + } else if (imgLargeWidth || hasMultiTouch || hasOverTranslate) { + checkRect() + if (!hasMultiTouch) { + if (x < 0 && mImgRect.left - x > mCommonRect.left) x = + resistanceScrollByX(mImgRect.left - mCommonRect.left, x) + if (x > 0 && mImgRect.right - x < mCommonRect.right) x = + resistanceScrollByX(mImgRect.right - mCommonRect.right, x) + } + mTranslateX -= x.toInt() + mAnimMatrix.postTranslate(-x, 0f) + hasOverTranslate = true + } + if (canScrollVerticallySelf(y)) { + if (y < 0 && mImgRect.top - y > mWidgetRect.top) y = + mImgRect.top + if (y > 0 && mImgRect.bottom - y < mWidgetRect.bottom) y = + mImgRect.bottom - mWidgetRect.bottom + mAnimMatrix.postTranslate(0f, -y) + mTranslateY -= y.toInt() + } else if (imgLargeHeight || hasOverTranslate || hasMultiTouch) { + checkRect() + if (!hasMultiTouch) { + if (y < 0 && mImgRect.top - y > mCommonRect.top) y = + resistanceScrollByY(mImgRect.top - mCommonRect.top, y) + if (y > 0 && mImgRect.bottom - y < mCommonRect.bottom) y = + resistanceScrollByY(mImgRect.bottom - mCommonRect.bottom, y) + } + mAnimMatrix.postTranslate(0f, -y) + mTranslateY -= y.toInt() + hasOverTranslate = true + } + executeTranslate() + return true + } + + override fun onSingleTapUp(e: MotionEvent): Boolean { + postDelayed(mClickRunnable, 250) + return false + } + + override fun onDoubleTap(e: MotionEvent): Boolean { + mTranslate.stop() + val from: Float + val to: Float + val imgCx = mImgRect.left + mImgRect.width() / 2 + val imgCy = mImgRect.top + mImgRect.height() / 2 + mScaleCenter[imgCx] = imgCy + mRotateCenter[imgCx] = imgCy + mTranslateX = 0 + mTranslateY = 0 + if (isZoonUp) { + from = mScale + to = 1f + } else { + from = mScale + to = mMaxScale + mScaleCenter[e.x] = e.y + } + mTmpMatrix.reset() + mTmpMatrix.postTranslate(-mBaseRect.left, -mBaseRect.top) + mTmpMatrix.postTranslate(mRotateCenter.x, mRotateCenter.y) + mTmpMatrix.postTranslate(-mHalfBaseRectWidth, -mHalfBaseRectHeight) + mTmpMatrix.postRotate(mDegrees, mRotateCenter.x, mRotateCenter.y) + mTmpMatrix.postScale(to, to, mScaleCenter.x, mScaleCenter.y) + mTmpMatrix.postTranslate(mTranslateX.toFloat(), mTranslateY.toFloat()) + mTmpMatrix.mapRect(mTmpRect, mBaseRect) + doTranslateReset(mTmpRect) + isZoonUp = !isZoonUp + mTranslate.withScale(from, to) + mTranslate.start() + return false + } + } + + inner class ScaleGestureListener : OnScaleGestureListener { + override fun onScale(detector: ScaleGestureDetector): Boolean { + val scaleFactor = detector.scaleFactor + if (java.lang.Float.isNaN(scaleFactor) || java.lang.Float.isInfinite(scaleFactor)) return false + mScale *= scaleFactor + //mScaleCenter.set(detector.getFocusX(), detector.getFocusY()); + mAnimMatrix.postScale( + scaleFactor, + scaleFactor, + detector.focusX, + detector.focusY + ) + executeTranslate() + return true + } + + override fun onScaleBegin(detector: ScaleGestureDetector): Boolean { + return true + } + + override fun onScaleEnd(detector: ScaleGestureDetector) {} + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt index f6fc05cd4..3d9df36f0 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt @@ -11,7 +11,7 @@ import io.legado.app.utils.ColorUtils import io.legado.app.utils.dp import io.legado.app.utils.getCompatColor -class AccentBgTextView(context: Context, attrs: AttributeSet?) : +class AccentBgTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : AppCompatTextView(context, attrs) { private var radius = 0 diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt index 1319aac5e..c7eb18ee4 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt @@ -16,12 +16,12 @@ import io.legado.app.utils.visible import kotlinx.android.synthetic.main.item_1line_text_and_del.view.* import org.jetbrains.anko.sdk27.listeners.onClick - -class AutoCompleteTextView : AppCompatAutoCompleteTextView { - - constructor(context: Context) : super(context) - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) +@Suppress("unused") +class AutoCompleteTextView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatAutoCompleteTextView(context, attrs, defStyleAttr) { var delCallBack: ((value: String) -> Unit)? = null @@ -33,7 +33,6 @@ class AutoCompleteTextView : AppCompatAutoCompleteTextView { return true } - @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent?): Boolean { if (event?.action == MotionEvent.ACTION_DOWN) {