Singletonize ReaderPreferences

app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.kt

@@ -22,7 +22,7 @@ import androidx.annotation.IntDef
 import com.davemorrissey.labs.subscaleview.decoder.Decoder
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecoder
 import com.davemorrissey.labs.subscaleview.provider.InputProvider
-import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -463,7 +463,7 @@ open class SubsamplingScaleImageView @JvmOverloads constructor(
                 }
 
                 override fun onDoubleTap(e: MotionEvent): Boolean {
-                    if (!ReaderActivity.readerPreferences.doubleTapToZoom().get()) return false
+                    if (!ReaderPreferences.doubleTapToZoom().get()) return false
                     if (isZoomEnabled && isReady && vTranslate != null) {
                         // Hacky solution for #15 - after a double tap the GestureDetector gets in a state
                         // where the next fling is ignored, so here we replace it with a new one.

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -45,8 +45,6 @@ import com.hippo.ehviewer.ui.keepNoMediaFileStatus
 import com.hippo.ehviewer.ui.lockObserver
 import com.hippo.ehviewer.util.ReadableTime
 import com.hippo.ehviewer.yorozuya.FileUtils
-import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -177,8 +175,6 @@ class EhApplication : Application(), ImageLoaderFactory {
             }
         }
 
-        val readerPreferences by lazy { ReaderPreferences(AndroidPreferenceStore) }
-
         val ehDatabase by lazy { roomDb<EhDatabase>("eh.db") { allowMainThreadQueries() } }
 
         val imageCache by lazy {

app/src/main/java/com/hippo/ehviewer/image/Image.kt

@@ -25,8 +25,8 @@ import android.graphics.drawable.Animatable
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
-import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import splitties.init.appCtx
 import java.nio.ByteBuffer
 import kotlin.math.min
@@ -80,7 +80,7 @@ class Image private constructor(private val src: CloseableSource) {
         val screenHeight = appCtx.resources.displayMetrics.heightPixels
         val isWideColorGamut = appCtx.resources.configuration.isScreenWideColorGamut
         var colorSpace = ColorSpace.get(
-            if (isWideColorGamut && EhApplication.readerPreferences.wideColorGamut().get()) {
+            if (isWideColorGamut && ReaderPreferences.wideColorGamut().get()) {
                 ColorSpace.Named.DISPLAY_P3
             } else {
                 ColorSpace.Named.SRGB