mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-27 11:37:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix MangaAllInOneHolder lazy vars

Browse Source
This commit is contained in:
Jobobby04
2020-05-21 00:38:25 -04:00
parent 51c8430e9c
commit b02813f30a
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
View File

@ -17,7 +17,6 @@ import androidx.core.graphics.drawable.DrawableCompat
import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.google.gson.Gson
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.SelectableAdapter import eu.davidea.flexibleadapter.SelectableAdapter
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -61,7 +60,6 @@ import eu.kanade.tachiyomi.util.view.snack
import eu.kanade.tachiyomi.util.view.visible import eu.kanade.tachiyomi.util.view.visible
import exh.EH_SOURCE_ID import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID import exh.EXH_SOURCE_ID
import java.text.DateFormat
import java.util.Date import java.util.Date
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
@ -156,20 +154,12 @@ class MangaAllInOneController :
private var lastClickPosition = -1 private var lastClickPosition = -1
private val dateFormat: DateFormat by lazy {
preferences.dateFormat()
}
private var initialLoad: Boolean = true private var initialLoad: Boolean = true
// EXH --> // EXH -->
val smartSearchConfig: SourceController.SmartSearchConfig? = args.getParcelable(SMART_SEARCH_CONFIG_EXTRA) val smartSearchConfig: SourceController.SmartSearchConfig? = args.getParcelable(SMART_SEARCH_CONFIG_EXTRA)
override val coroutineContext: CoroutineContext = Job() + Dispatchers.Main override val coroutineContext: CoroutineContext = Job() + Dispatchers.Main
private val gson: Gson by injectLazy()
private val sourceManager: SourceManager by injectLazy()
// EXH <-- // EXH <--
val fromSource = args.getBoolean(FROM_SOURCE_EXTRA, false) val fromSource = args.getBoolean(FROM_SOURCE_EXTRA, false)

13
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
View File

@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.manga
import android.content.Context import android.content.Context
import android.view.View import android.view.View
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.accessibility.AccessibilityEventCompat.setAction
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.google.gson.Gson import com.google.gson.Gson
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
@ -11,7 +10,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.data.glide.GlideApp
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
import eu.kanade.tachiyomi.data.preference.PreferenceKeys.dateFormat import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
@ -24,8 +23,8 @@ import eu.kanade.tachiyomi.util.view.snack
import eu.kanade.tachiyomi.util.view.visible import eu.kanade.tachiyomi.util.view.visible
import eu.kanade.tachiyomi.util.view.visibleIf import eu.kanade.tachiyomi.util.view.visibleIf
import exh.MERGED_SOURCE_ID import exh.MERGED_SOURCE_ID
import exh.debug.DebugFunctions.sourceManager
import exh.util.setChipsExtended import exh.util.setChipsExtended
import java.text.DateFormat
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Date import java.util.Date
import kotlinx.android.synthetic.main.manga_all_in_one_header.backdrop import kotlinx.android.synthetic.main.manga_all_in_one_header.backdrop
@ -73,8 +72,16 @@ class MangaAllInOneHolder(
smartSearchConfig: SourceController.SmartSearchConfig? = null smartSearchConfig: SourceController.SmartSearchConfig? = null
) : BaseFlexibleViewHolder(view, adapter) { ) : BaseFlexibleViewHolder(view, adapter) {
private val preferences: PreferencesHelper by injectLazy()
private val gson: Gson by injectLazy() private val gson: Gson by injectLazy()
private val dateFormat: DateFormat by lazy {
preferences.dateFormat()
}
private val sourceManager: SourceManager by injectLazy()
init { init {
val presenter = adapter.delegate.mangaPresenter() val presenter = adapter.delegate.mangaPresenter()