Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes from KTX extension changes

Browse Source 
(cherry picked from commit 915e38f636e2fba9ae53ee8d87026ea1e0edacf3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
This commit is contained in:
arkon 2022-06-24 12:06:43 -04:00 committed by Jobobby04
parent 14a57b7d4d
commit c48318df73
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
View File

@ -8,7 +8,6 @@ import android.view.MenuInflater
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.get
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
@ -359,7 +358,7 @@ open class BrowseSourceController(bundle: Bundle) :
numColumnsJob?.cancel() numColumnsJob?.cancel()
var oldPosition = RecyclerView.NO_POSITION var oldPosition = RecyclerView.NO_POSITION
val oldRecycler = binding.catalogueView[1] val oldRecycler = binding.catalogueView.getChildAt(1)
if (oldRecycler is RecyclerView) { if (oldRecycler is RecyclerView) {
oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
oldRecycler.adapter = null oldRecycler.adapter = null

3
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
View File

@ -6,7 +6,6 @@ import android.util.AttributeSet
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.get
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.ConcatAdapter
import com.google.android.material.chip.Chip import com.google.android.material.chip.Chip
@ -127,7 +126,7 @@ class SourceFilterSheet(
) )
// SY <-- // SY <--
recycler.setHasFixedSize(true) recycler.setHasFixedSize(true)
(binding.root[1] as ViewGroup).addView(recycler) (binding.root.getChildAt(1) as ViewGroup).addView(recycler)
addView(binding.root) addView(binding.root)
// SY --> // SY -->
binding.saveSearchBtn.setOnClickListener { onSaveClicked() } binding.saveSearchBtn.setOnClickListener { onSaveClicked() }