diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecb309347..564aa1cc0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,7 +24,6 @@ (val binding: VB, private val context: Conte RecyclerView.ViewHolder(binding.root) { protected lateinit var mLoading: ProgressBar - protected lateinit var mImage: GlideZoomImageView + protected lateinit var mImage: AppCompatImageView protected lateinit var mProgress: TextView protected lateinit var mFlProgress: FrameLayout protected var mRetry: Button? = null fun initComponent( loading: ProgressBar, - image: GlideZoomImageView, + image: AppCompatImageView, progress: TextView, button: Button? = null, flProgress: FrameLayout, diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt b/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt index 0cf6360f0..5716ffe51 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/rv/MangaAdapter.kt @@ -14,7 +14,6 @@ import androidx.viewbinding.ViewBinding import com.bumptech.glide.Glide import com.bumptech.glide.ListPreloader.PreloadModelProvider import com.bumptech.glide.RequestBuilder -import com.github.panpf.zoomimage.zoom.GestureType import io.legado.app.R import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.base.adapter.RecyclerAdapter.Companion.TYPE_FOOTER_VIEW @@ -89,10 +88,6 @@ class MangaAdapter(private val context: Context) : binding.retry, binding.flProgress ) - binding.image.zoomable.disabledGestureTypesState.value = - GestureType.DOUBLE_TAP_SCALE or GestureType.ONE_FINGER_SCALE or - GestureType.TWO_FINGER_SCALE or GestureType.KEYBOARD_DRAG or - GestureType.ONE_FINGER_DRAG or GestureType.KEYBOARD_SCALE or GestureType.MOUSE_WHEEL_SCALE binding.retry.setOnClickListener { val item = mDiffer.currentList[layoutPosition] if (item is MangeContent) { diff --git a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt index cab988fea..438a8120d 100644 --- a/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt +++ b/app/src/main/java/io/legado/app/ui/book/manga/rv/WebtoonRecyclerView.kt @@ -102,7 +102,7 @@ class WebtoonRecyclerView @JvmOverloads constructor( override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { super.onSizeChanged(w, h, oldw, oldh) - mcRect.set(width * 0.33f, height * 0.33f, width * 0.66f, height * 0.46f) + mcRect.set(width * 0.33f, height * 0.33f, width * 0.66f, height * 0.66f) } private fun getPositionX(positionX: Float): Float { @@ -306,7 +306,7 @@ class WebtoonRecyclerView @JvmOverloads constructor( MotionEvent.ACTION_MOVE -> { if (disableMangaScaling) { - return false + return super.onTouchEvent(ev) } if (isDoubleTapping && isQuickScaling) { return true diff --git a/app/src/main/res/layout/book_comic_rv.xml b/app/src/main/res/layout/book_comic_rv.xml index 93912470d..de79022aa 100644 --- a/app/src/main/res/layout/book_comic_rv.xml +++ b/app/src/main/res/layout/book_comic_rv.xml @@ -8,12 +8,12 @@ android:background="@color/book_ant_10" android:contentDescription="@null"> - + android:scaleType="fitCenter" />