diff --git a/app/build.gradle b/app/build.gradle index 02ddc2b3b..ea816bd1b 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -209,7 +209,6 @@ dependencies { implementation 'io.requery:sqlite-android:3.31.0' // Preferences - implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2' implementation 'com.github.tfcporciuncula:flow-preferences:1.1.1' // Model View Presenter diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index d7882566e..b0f7bfb9f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -4,8 +4,6 @@ import android.content.Context import android.net.Uri import android.os.Environment import androidx.preference.PreferenceManager -import com.f2prateek.rx.preferences.Preference as RxPreference -import com.f2prateek.rx.preferences.RxSharedPreferences import com.tfcporciuncula.flow.FlowSharedPreferences import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R @@ -21,8 +19,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.onEach -fun RxPreference.getOrDefault(): T = get() ?: defaultValue()!! - @OptIn(ExperimentalCoroutinesApi::class) fun Preference.asImmediateFlow(block: (value: T) -> Unit): Flow { block(get()) @@ -34,7 +30,6 @@ fun Preference.asImmediateFlow(block: (value: T) -> Unit): Flow { class PreferencesHelper(val context: Context) { private val prefs = PreferenceManager.getDefaultSharedPreferences(context) - private val rxPrefs = RxSharedPreferences.create(prefs) val flowPrefs = FlowSharedPreferences(prefs) private val defaultDownloadsDir = Uri.fromFile( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt index 75b13f68f..c2c74de03 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt @@ -6,12 +6,10 @@ import android.widget.CompoundButton import android.widget.Spinner import androidx.annotation.ArrayRes import androidx.core.widget.NestedScrollView -import com.f2prateek.rx.preferences.Preference as RxPreference import com.google.android.material.bottomsheet.BottomSheetDialog import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer import eu.kanade.tachiyomi.util.view.invisible @@ -131,16 +129,6 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BottomSheetDia setOnCheckedChangeListener { _, isChecked -> pref.set(isChecked) } } - /** - * Binds a spinner to an int preference with an optional offset for the value. - */ - private fun Spinner.bindToPreference(pref: RxPreference, offset: Int = 0) { - onItemSelectedListener = IgnoreFirstSpinnerListener { position -> - pref.set(position + offset) - } - setSelection(pref.getOrDefault() - offset, false) - } - /** * Binds a spinner to an int preference with an optional offset for the value. */