From c48318df736507674436a71a375332ae3599f77c Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 24 Jun 2022 12:06:43 -0400 Subject: [PATCH] Fix crashes from KTX extension changes (cherry picked from commit 915e38f636e2fba9ae53ee8d87026ea1e0edacf3) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt --- .../ui/browse/source/browse/BrowseSourceController.kt | 3 +-- .../tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 434abcfaf..71ec69e4d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -8,7 +8,6 @@ import android.view.MenuInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import androidx.core.view.get import androidx.core.view.isVisible import androidx.core.view.updatePadding import androidx.recyclerview.widget.GridLayoutManager @@ -359,7 +358,7 @@ open class BrowseSourceController(bundle: Bundle) : numColumnsJob?.cancel() var oldPosition = RecyclerView.NO_POSITION - val oldRecycler = binding.catalogueView[1] + val oldRecycler = binding.catalogueView.getChildAt(1) if (oldRecycler is RecyclerView) { oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() oldRecycler.adapter = null 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 d4fab9eba..a498c27ae 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 @@ -6,7 +6,6 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.view.get import androidx.core.view.isVisible import androidx.recyclerview.widget.ConcatAdapter import com.google.android.material.chip.Chip @@ -127,7 +126,7 @@ class SourceFilterSheet( ) // SY <-- recycler.setHasFixedSize(true) - (binding.root[1] as ViewGroup).addView(recycler) + (binding.root.getChildAt(1) as ViewGroup).addView(recycler) addView(binding.root) // SY --> binding.saveSearchBtn.setOnClickListener { onSaveClicked() }