null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update preference dependencies + constraintlayout

Browse source
This commit is contained in:
Jays2Kings 2022-04-21 21:03:32 -04:00
parent f3dc38b629
commit 6c14ea5654
13 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle.kts
View file

@ -117,14 +117,14 @@ dependencies {
implementation("com.google.android.material:material:1.5.0")
implementation("androidx.webkit:webkit:1.4.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.preference:preference:1.1.1")
implementation("androidx.preference:preference:1.2.0")
implementation("androidx.annotation:annotation:1.3.0")
implementation("androidx.browser:browser:1.4.0")
implementation("androidx.biometric:biometric:1.1.0")
implementation("androidx.palette:palette:1.0.0")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.2")
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
implementation("androidx.multidex:multidex:2.0.1")
@ -142,7 +142,7 @@ dependencies {
implementation("com.github.pwittchen:reactivenetwork:0.13.0")
// Coroutines
implementation("com.github.tfcporciuncula:flow-preferences:1.3.4")
implementation("com.fredporciuncula:flow-preferences:1.6.0")
// Network client
implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")

4
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View file

@ -5,9 +5,9 @@ import android.net.Uri
import android.os.Environment
import androidx.appcompat.app.AppCompatDelegate
import androidx.preference.PreferenceManager
import com.fredporciuncula.flow.preferences.FlowSharedPreferences
import com.fredporciuncula.flow.preferences.Preference
import com.google.android.material.color.DynamicColors
import com.tfcporciuncula.flow.FlowSharedPreferences
import com.tfcporciuncula.flow.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.track.TrackService

2
app/src/main/java/eu/kanade/tachiyomi/ui/category/ManageCategoryDialog.kt
View file

@ -6,8 +6,8 @@ import android.content.DialogInterface
import android.os.Bundle
import androidx.core.view.isVisible
import androidx.core.widget.addTextChangedListener
import com.fredporciuncula.flow.preferences.Preference
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.tfcporciuncula.flow.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Category

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View file

@ -41,10 +41,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.fredporciuncula.flow.preferences.Preference
import com.github.florent37.viewtooltip.ViewTooltip
import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.Snackbar
import com.tfcporciuncula.flow.Preference
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.SelectableAdapter
import eu.davidea.flexibleadapter.items.IFlexible

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterTagGroup.kt
View file

@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.core.view.isVisible
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.FilterTagGroupBinding
import eu.kanade.tachiyomi.util.system.dpToPx

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt
View file

@ -12,7 +12,7 @@ import android.widget.Toast
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
import com.bluelinelabs.conductor.Controller
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.MigrationBottomSheetBinding

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
View file

@ -1,6 +1,6 @@
package eu.kanade.tachiyomi.ui.reader.viewer
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.launchIn

2
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaAdapter.kt
View file

@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.ui.recents
import androidx.recyclerview.widget.ItemTouchHelper
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.ui.manga.chapter.BaseChapterAdapter

11
app/src/main/java/eu/kanade/tachiyomi/ui/setting/PreferenceDSL.kt
View file

@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.ui.setting
import android.app.Activity
import androidx.annotation.StringRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.biometric.BiometricPrompt
import androidx.core.graphics.drawable.DrawableCompat
import androidx.fragment.app.FragmentActivity
import androidx.preference.CheckBoxPreference
import androidx.preference.DialogPreference
@ -16,7 +16,6 @@ import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceManager
import androidx.preference.PreferenceScreen
import androidx.preference.SwitchPreferenceCompat
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
@ -169,12 +168,12 @@ inline fun Preference.onChange(crossinline block: (Any?) -> Boolean) {
setOnPreferenceChangeListener { _, newValue -> block(newValue) }
}
inline fun <T> Preference.bindTo(preference: com.tfcporciuncula.flow.Preference<T>) {
inline fun <T> Preference.bindTo(preference: com.fredporciuncula.flow.preferences.Preference<T>) {
key = preference.key
defaultValue = preference.defaultValue
}
inline fun <T> ListPreference.bindTo(preference: com.tfcporciuncula.flow.Preference<T>) {
inline fun <T> ListPreference.bindTo(preference: com.fredporciuncula.flow.preferences.Preference<T>) {
key = preference.key
// ListPreferences persist values as strings, even when we're using our IntListPreference
defaultValue = preference.defaultValue.toString()
@ -220,7 +219,7 @@ var Preference.titleRes: Int
var Preference.iconRes: Int
get() = 0 // set only
set(value) { icon = VectorDrawableCompat.create(context.resources, value, context.theme) }
set(value) { icon = AppCompatResources.getDrawable(context, value) }
var Preference.summaryRes: Int
get() = 0 // set only
@ -228,4 +227,4 @@ var Preference.summaryRes: Int
var Preference.iconTint: Int
get() = 0 // set only
set(value) { DrawableCompat.setTint(icon, value) }
set(value) { icon?.setTint(value) }

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
View file

@ -147,7 +147,7 @@ abstract class SettingsController : PreferenceController() {
return subscribe(onNext).also { untilDestroySubscriptions.add(it) }
}
inline fun <T> Preference.visibleIf(preference: com.tfcporciuncula.flow.Preference<T>, crossinline block: (T) -> Boolean) {
inline fun <T> Preference.visibleIf(preference: com.fredporciuncula.flow.preferences.Preference<T>, crossinline block: (T) -> Boolean) {
preference.asImmediateFlowIn(viewScope) { isVisible = block(it) }
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceItem.kt
View file

@ -9,7 +9,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import androidx.core.view.updateLayoutParams
import androidx.recyclerview.widget.RecyclerView
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible

2
app/src/main/java/eu/kanade/tachiyomi/util/PreferenceExtensions.kt
View file

@ -5,7 +5,7 @@ import android.widget.CompoundButton
import android.widget.RadioButton
import android.widget.RadioGroup
import android.widget.Spinner
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
inline fun <reified T> SharedPreferences.getItem(key: String, default: T): T {

2
app/src/main/java/eu/kanade/tachiyomi/widget/MaterialSpinnerView.kt
View file

@ -16,7 +16,7 @@ import androidx.core.content.ContextCompat
import androidx.core.graphics.ColorUtils
import androidx.core.view.forEach
import androidx.core.view.get
import com.tfcporciuncula.flow.Preference
import com.fredporciuncula.flow.preferences.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.MaterialSpinnerViewBinding
import eu.kanade.tachiyomi.util.lang.tintText