From 574d0bdcd5d8c43f560b0c83cd0d34758e7b968a Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 28 Jun 2020 22:38:24 -0400 Subject: [PATCH] Dependency updates (cherry picked from commit eef39b75a64db369b18adc963f6ea3952d0b4aac) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt --- app/build.gradle | 8 ++++---- .../extension/details/ExtensionDetailsController.kt | 4 ++-- .../ui/browse/source/browse/SourceFilterSheet.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 36de1a7ce..4551de0c8 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,9 +158,9 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01' - implementation 'androidx.webkit:webkit:1.3.0-beta01' + implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + implementation 'androidx.webkit:webkit:1.3.0-rc01' final lifecycle_version = '2.2.0' implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" @@ -168,7 +168,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" // Job scheduling - final work_version = '2.4.0-beta01' + final work_version = '2.4.0-rc01' implementation "androidx.work:work-runtime:$work_version" implementation "androidx.work:work-runtime-ktx:$work_version" diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index e8fba01fb..fefc3717c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -16,10 +16,10 @@ import androidx.preference.PreferenceGroupAdapter import androidx.preference.PreferenceManager import androidx.preference.PreferenceScreen import androidx.preference.SwitchPreferenceCompat +import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.DividerItemDecoration.VERTICAL import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.MergeAdapter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.EmptyPreferenceDataStore import eu.kanade.tachiyomi.data.preference.PreferencesHelper @@ -83,7 +83,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : val context = view.context binding.extensionPrefsRecycler.layoutManager = LinearLayoutManager(context) - binding.extensionPrefsRecycler.adapter = MergeAdapter( + binding.extensionPrefsRecycler.adapter = ConcatAdapter( ExtensionDetailsHeaderAdapter(presenter), initPreferencesAdapter(context, extension) ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt index d04f914f2..871ff5a6f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt @@ -5,7 +5,7 @@ import android.content.Context import android.util.AttributeSet import android.view.View import android.view.ViewGroup -import androidx.recyclerview.widget.MergeAdapter +import androidx.recyclerview.widget.ConcatAdapter import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.chip.Chip import eu.davidea.flexibleadapter.FlexibleAdapter @@ -88,7 +88,7 @@ class SourceFilterSheet( init { // SY --> - recycler.adapter = MergeAdapter(savedSearchesAdapter, adapter) + recycler.adapter = ConcatAdapter(savedSearchesAdapter, adapter) // SY <-- recycler.setHasFixedSize(true) val view = inflate(R.layout.source_filter_sheet)