@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.reader.viewer.pager
import android.annotation.SuppressLint
import android.app.ActionBar
import android.content.Context
import android.graphics.PointF
import android.graphics.drawable.Animatable
import android.view.GestureDetector
@ -30,7 +31,6 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator
import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.ZoomType
import eu.kanade.tachiyomi.ui.webview.WebViewActivity
import eu.kanade.tachiyomi.util.system.ImageUtil
import eu.kanade.tachiyomi.util.system.createReaderThemeContext
import eu.kanade.tachiyomi.util.system.dpToPx
import eu.kanade.tachiyomi.widget.ViewPagerAdapter
import rx.Observable
@ -46,9 +46,10 @@ import java.util.concurrent.TimeUnit
* /
@SuppressLint ( " ViewConstructor " )
class PagerPageHolder (
readerThemedContext : Context ,
val viewer : PagerViewer ,
val page : ReaderPage
) : FrameLayout ( viewer. activity ) , ViewPagerAdapter . PositionableView {
) : FrameLayout ( readerThemedContext ) , ViewPagerAdapter . PositionableView {
/ * *
* Item that identifies this view . Needed by the adapter to not recreate views .
@ -97,12 +98,6 @@ class PagerPageHolder(
* /
private var readImageHeaderSubscription : Subscription ? = null
/ * *
* Context that has been wrapped to use the correct theme values based on the
* current app theme and reader background color
* /
private val readerThemedContext = context . createReaderThemeContext ( viewer . config . theme )
val stateChangedListener = object : SubsamplingScaleImageView . OnStateChangedListener {
override fun onScaleChanged ( newScale : Float , origin : Int ) {
viewer . activity . hideMenu ( )
@ -423,7 +418,7 @@ class PagerPageHolder(
private fun initRetryButton ( ) : PagerButton {
if ( retryButton != null ) return retryButton !!
retryButton = PagerButton ( readerThemedC ontext, viewer ) . apply {
retryButton = PagerButton ( c ontext, viewer ) . apply {
layoutParams = LayoutParams ( WRAP _CONTENT , WRAP _CONTENT ) . apply {
gravity = Gravity . CENTER
}
@ -450,7 +445,7 @@ class PagerPageHolder(
}
decodeErrorLayout = decodeLayout
TextView ( readerThemedC ontext) . apply {
TextView ( c ontext) . apply {
layoutParams = LinearLayout . LayoutParams ( WRAP _CONTENT , WRAP _CONTENT ) . apply {
setMargins ( margins , margins , margins , margins )
}
@ -460,7 +455,7 @@ class PagerPageHolder(
decodeLayout . addView ( this )
}
PagerButton ( readerThemedC ontext, viewer ) . apply {
PagerButton ( c ontext, viewer ) . apply {
layoutParams = LayoutParams ( WRAP _CONTENT , WRAP _CONTENT ) . apply {
setMargins ( margins , margins , margins , margins )
}
@ -474,7 +469,7 @@ class PagerPageHolder(
val imageUrl = page . imageUrl
if ( imageUrl . orEmpty ( ) . startsWith ( " http " , true ) ) {
PagerButton ( readerThemedC ontext, viewer ) . apply {
PagerButton ( c ontext, viewer ) . apply {
layoutParams = LayoutParams ( WRAP _CONTENT , WRAP _CONTENT ) . apply {
setMargins ( margins , margins , margins , margins )
}