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

Improved autoscroll

Browse Source
This commit is contained in:
NerdNumber9 2018-06-10 01:26:01 -04:00
parent b6a3f6ebd2
commit 34df0759f3
3 changed files with 37 additions and 38 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/PreferenceKeys.kt
View File

@ -171,7 +171,5 @@ object PreferenceKeys {
const val eh_readerInstantRetry = "eh_reader_instant_retry" const val eh_readerInstantRetry = "eh_reader_instant_retry"
const val eh_utilAutoscrollState = "eh_util_autoscroll_state"
const val eh_utilAutoscrollInterval = "eh_util_autoscroll_interval" const val eh_utilAutoscrollInterval = "eh_util_autoscroll_interval"
} }

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

@ -243,7 +243,5 @@ class PreferencesHelper(val context: Context) {
fun eh_readerInstantRetry() = rxPrefs.getBoolean(Keys.eh_readerInstantRetry, true) fun eh_readerInstantRetry() = rxPrefs.getBoolean(Keys.eh_readerInstantRetry, true)
fun eh_utilAutoscrollState() = rxPrefs.getBoolean(Keys.eh_utilAutoscrollState, false)
fun eh_utilAutoscrollInterval() = rxPrefs.getFloat(Keys.eh_utilAutoscrollInterval, 3f) fun eh_utilAutoscrollInterval() = rxPrefs.getFloat(Keys.eh_utilAutoscrollInterval, 3f)
} }

43
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -8,6 +8,8 @@ import android.graphics.Color
import android.os.Build import android.os.Build
import android.os.Build.VERSION_CODES.KITKAT import android.os.Build.VERSION_CODES.KITKAT
import android.os.Bundle import android.os.Bundle
import android.support.v4.graphics.drawable.DrawableCompat.applyTheme
import android.support.v4.view.ViewCompat.setRotation
import android.text.Editable import android.text.Editable
import android.text.TextWatcher import android.text.TextWatcher
import android.view.* import android.view.*
@ -20,6 +22,7 @@ import com.jakewharton.rxbinding.view.clicks
import com.jakewharton.rxbinding.widget.checkedChanges import com.jakewharton.rxbinding.widget.checkedChanges
import com.jakewharton.rxbinding.widget.textChanges import com.jakewharton.rxbinding.widget.textChanges
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.R.id.*
import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@ -164,38 +167,35 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
setEhUtilsVisibility(ehUtilsVisible) setEhUtilsVisibility(ehUtilsVisible)
} }
subscriptions += preferences.eh_utilAutoscrollState().asObservable() eh_autoscroll_freq.setText(preferences.eh_utilAutoscrollInterval().getOrDefault().let {
.combineLatest(preferences.eh_utilAutoscrollInterval().asObservable()) { state, interval -> if(it == -1f)
state to interval ""
}.observeOn(AndroidSchedulers.mainThread()) else it.toString()
.subscribe { (state, interval) -> })
if(state && interval != -1f) {
setupAutoscroll(interval) subscriptions += eh_autoscroll.checkedChanges()
} else { .observeOn(AndroidSchedulers.mainThread())
autoscrollSubscription?.unsubscribe() .subscribe {
autoscrollSubscription = null setupAutoscroll(if(it)
preferences.eh_utilAutoscrollInterval().getOrDefault()
else -1f)
} }
eh_autoscroll.isChecked = state subscriptions += eh_autoscroll_freq.textChanges()
if(interval != -1f && eh_autoscroll_freq.text?.toString()?.toFloatOrNull() != interval) .observeOn(AndroidSchedulers.mainThread())
eh_autoscroll_freq.setText(interval.toString()) .subscribe {
}
subscriptions += eh_autoscroll.checkedChanges().subscribe {
preferences.eh_utilAutoscrollState().set(it)
}
subscriptions += eh_autoscroll_freq.textChanges().subscribe {
val parsed = it?.toString()?.toFloatOrNull() val parsed = it?.toString()?.toFloatOrNull()
if (parsed == null || parsed <= 0 || parsed > 9999) { if (parsed == null || parsed <= 0 || parsed > 9999) {
eh_autoscroll_freq.error = "Invalid frequency" eh_autoscroll_freq.error = "Invalid frequency"
preferences.eh_utilAutoscrollInterval().set(-1f) preferences.eh_utilAutoscrollInterval().set(-1f)
eh_autoscroll.isEnabled = false eh_autoscroll.isEnabled = false
setupAutoscroll(-1f)
} else { } else {
eh_autoscroll_freq.error = null eh_autoscroll_freq.error = null
preferences.eh_utilAutoscrollInterval().set(parsed) preferences.eh_utilAutoscrollInterval().set(parsed)
eh_autoscroll.isEnabled = true eh_autoscroll.isEnabled = true
setupAutoscroll(if(eh_autoscroll.isChecked) parsed else -1f)
} }
} }
@ -697,6 +697,9 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
// --> EH // --> EH
private fun setupAutoscroll(interval: Float) { private fun setupAutoscroll(interval: Float) {
autoscrollSubscription?.unsubscribe() autoscrollSubscription?.unsubscribe()
autoscrollSubscription = null
if(interval == -1f) return
val intervalMs = (interval * 1000).roundToLong() val intervalMs = (interval * 1000).roundToLong()
val sub = Observable.interval(intervalMs, intervalMs, TimeUnit.MILLISECONDS) val sub = Observable.interval(intervalMs, intervalMs, TimeUnit.MILLISECONDS)