diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bc03e9b254..c1f3386206 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -145,10 +145,11 @@ dependencies { implementation("com.fredporciuncula:flow-preferences:1.6.0") // Network client - implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") - implementation("com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}") - implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${Versions.okhttp}") - implementation("com.squareup.okio:okio:2.10.0") + val okhttpVersion = "4.9.3" + implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") + implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion") + implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion") + implementation("com.squareup.okio:okio:3.0.0") // Chucker val chuckerVersion = "3.5.2" @@ -212,8 +213,9 @@ dependencies { // UI implementation("com.dmitrymalkovich.android:material-design-dimens:1.4") implementation("br.com.simplepass:loading-button-android:2.2.0") - implementation("com.mikepenz:fastadapter:${Versions.fastAdapter}") - implementation("com.mikepenz:fastadapter-extensions-binding:${Versions.fastAdapter}") + val fastAdapterVersion = "5.6.0" + implementation("com.mikepenz:fastadapter:$fastAdapterVersion") + implementation("com.mikepenz:fastadapter-extensions-binding:$fastAdapterVersion") implementation("com.github.arkon.FlexibleAdapter:flexible-adapter:c8013533") implementation("com.github.arkon.FlexibleAdapter:flexible-adapter-ui:c8013533") implementation("com.nononsenseapps:filepicker:2.5.2") @@ -224,19 +226,13 @@ dependencies { implementation("com.github.chrisbanes:PhotoView:2.3.0") implementation("com.github.tachiyomiorg:DirectionalViewPager:1.0.0") implementation("com.github.florent37:viewtooltip:1.2.2") - implementation("com.getkeepsafe.taptargetview:taptargetview:1.13.0") + implementation("com.getkeepsafe.taptargetview:taptargetview:1.13.3") // Conductor val conductorVersion = "3.0.0" implementation("com.bluelinelabs:conductor:$conductorVersion") implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion") - // RxBindings - implementation("com.jakewharton.rxbinding:rxbinding-kotlin:${Versions.RX_BINDING}") - implementation("com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:${Versions.RX_BINDING}") - implementation("com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:${Versions.RX_BINDING}") - implementation("com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:${Versions.RX_BINDING}") - // Shizuku val shizukuVersion = "12.1.0" implementation("dev.rikka.shizuku:api:$shizukuVersion") diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt index ddf8b4064a..8ca439c5cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt @@ -8,7 +8,6 @@ import androidx.appcompat.widget.SearchView import androidx.preference.CheckBoxPreference import androidx.preference.PreferenceGroup import androidx.preference.PreferenceScreen -import com.jakewharton.rxbinding.support.v7.widget.queryTextChanges import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.minusAssign import eu.kanade.tachiyomi.data.preference.plusAssign @@ -19,7 +18,6 @@ import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.view.activityBinding -import eu.kanade.tachiyomi.util.view.isControllerVisible import eu.kanade.tachiyomi.util.view.setOnQueryTextChangeListener import eu.kanade.tachiyomi.widget.preference.SwitchPreferenceCategory import uy.kohesive.injekt.Injekt @@ -195,11 +193,11 @@ class SettingsSourcesController : SettingsController(), FloatingSearchInterface true } - searchView?.queryTextChanges()?.filter { isControllerVisible } - ?.subscribeUntilDestroy { - query = it.toString() - drawSources() - } + setOnQueryTextChangeListener(searchView) { + query = it ?: "" + drawSources() + true + } if (useSearchTB) { // Fixes problem with the overflow icon showing up in lieu of search diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 76df4a3edb..bf5751eefa 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -3,45 +3,11 @@ object Versions { const val OSS_LICENSE = "17.0.0" const val ROBO_ELECTRIC = "3.1.4" const val RX_BINDING = "1.0.1" - const val androidAppCompat = "1.1.0" - const val androidWorkManager = "2.4.0" - const val changelog = "2.1.0" - const val coil = "1.1.1" - const val conductor = "2.1.5" - const val directionalViewPager = "a844dbca0a" - const val diskLruCache = "2.0.2" - const val fastAdapter = "5.4.1" - const val filePicker = "2.5.2" - const val firebase = "17.5.0" - const val firebaseCrashlytics = "17.2.1" - const val googleServices = "4.3.3" - const val gradleVersions = "0.29.0" - const val injekt = "65b0440" - const val junit = "4.13" const val kotlin = "1.6.20" - const val kotson = "2.5.0" - const val mockito = "1.10.19" - const val moshi = "1.9.3" - const val nucleus = "3.0.0" - const val okhttp = "4.9.1" - const val okio = "2.10.0" - const val photoView = "2.3.0" - const val reactiveNetwork = "0.13.0" - const val rxAndroid = "1.2.1" - const val rxBinding = "1.0.1" - const val rxJava = "1.3.8" - const val rxRelay = "1.2.0" - const val subsamplingImageScale = "93d74f0" - const val systemUiHelper = "1.0.0" - const val tapTargetView = "1.13.0" - const val unifile = "e9ee588" - const val viewStatePagerAdapter = "1.1.0" - const val viewToolTip = "1.2.2" - const val kotlinter = "3.4.4" } object LegacyPluginClassPath { - const val googleServices = "com.google.gms:google-services:${Versions.googleServices}" + const val googleServices = "com.google.gms:google-services:4.3.10" const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}" const val fireBaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.3.0" @@ -65,8 +31,8 @@ object Plugins { const val kotlinAndroid = "android" const val jetbrainsKotlin = "org.jetbrains.kotlin.android" const val kotlinSerialization = "org.jetbrains.kotlin.plugin.serialization" - val gradleVersions = PluginClass("com.github.ben-manes.versions", Versions.gradleVersions) - val kotlinter = PluginClass("org.jmailen.kotlinter", Versions.kotlinter) + val gradleVersions = PluginClass("com.github.ben-manes.versions", "0.42.0") + val kotlinter = PluginClass("org.jmailen.kotlinter", "3.10.0") } data class PluginClass(val name: String, val version: String)