Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move back to rx for catalogueViewSetting

Browse Source
This commit is contained in:
Jobobby04 2020-05-24 18:03:54 -04:00
parent be681696ea
commit 1ba236e551
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View File

@ -143,7 +143,7 @@ class PreferencesHelper(val context: Context) {
fun lastVersionCode() = flowPrefs.getInt("last_version_code", 0)
fun catalogueViewSetting() = flowPrefs.getInt(Keys.catalogueViewSetting, 0)
fun catalogueViewSetting() = rxPrefs.getInteger(Keys.catalogueViewSetting, 0)
fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("all", "en", Locale.getDefault().language))

19
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
View File

@ -37,11 +37,6 @@ import eu.kanade.tachiyomi.ui.browse.source.filter.TriStateSectionItem
import eu.kanade.tachiyomi.util.removeCovers
import exh.EXHSavedSearch
import java.lang.RuntimeException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.subscribe
import rx.Observable
import rx.Subscription
@ -124,11 +119,6 @@ open class BrowseSourcePresenter(
*/
private var initializerSubscription: Subscription? = null
/**
* Scope to watch the view setting
*/
private val scope = CoroutineScope(Job() + Dispatchers.Default)
override fun onCreate(savedState: Bundle?) {
super.onCreate(savedState)
@ -140,9 +130,8 @@ open class BrowseSourcePresenter(
query = savedState.getString(::query.name, "")
}
prefs.catalogueViewSetting().asFlow()
.onEach { setDisplayMode(it) }
.launchIn(scope)
prefs.catalogueViewSetting().asObservable()
.subscribe { setDisplayMode(it) }
restartPager()
}
@ -171,7 +160,7 @@ open class BrowseSourcePresenter(
val sourceId = source.id
val catalogueAsList = prefs.catalogueViewSetting()
val catalogueViewSetting = prefs.catalogueViewSetting()
// Prepare the pager.
pagerSubscription?.let { remove(it) }
@ -179,7 +168,7 @@ open class BrowseSourcePresenter(
.observeOn(Schedulers.io())
.map { pair -> pair.first to pair.second.map { networkToLocalManga(it, sourceId) } }
.doOnNext { initializeMangas(it.second) }
.map { pair -> pair.first to pair.second.map { SourceItem(it, catalogueAsList) } }
.map { pair -> pair.first to pair.second.map { SourceItem(it, catalogueViewSetting) } }
.observeOn(AndroidSchedulers.mainThread())
.subscribeReplay(
{ view, (page, mangas) ->

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
View File

@ -6,7 +6,7 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.widget.FrameLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.RecyclerView
import com.tfcporciuncula.flow.Preference
import com.f2prateek.rx.preferences.Preference
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible