recloudstream/cloudstream
3
3
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Fix cast recycler scrolling (#1221)

Browse source
This commit is contained in:
Luna712 2024-07-30 12:45:25 -06:00 committed by GitHub
parent 30adb1cd9d
commit 8fcb3e3121
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
View file

@ -23,6 +23,7 @@ import androidx.core.widget.NestedScrollView
import androidx.core.widget.doOnTextChanged import androidx.core.widget.doOnTextChanged
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.discord.panels.OverlappingPanelsLayout import com.discord.panels.OverlappingPanelsLayout
import com.discord.panels.PanelState
import com.discord.panels.PanelsChildGestureRegionObserver import com.discord.panels.PanelsChildGestureRegionObserver
import com.google.android.gms.cast.framework.CastButtonFactory import com.google.android.gms.cast.framework.CastButtonFactory
import com.google.android.gms.cast.framework.CastContext import com.google.android.gms.cast.framework.CastContext
@ -118,6 +119,14 @@ open class ResultFragmentPhone : FullScreenPlayer() {
return root return root
} }
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
PanelsChildGestureRegionObserver.Provider.get().apply {
resultBinding?.resultCastItems?.let { register(it) }
}
}
var currentTrailers: List<ExtractorLink> = emptyList() var currentTrailers: List<ExtractorLink> = emptyList()
var currentTrailerIndex = 0 var currentTrailerIndex = 0
@ -210,9 +219,6 @@ open class ResultFragmentPhone : FullScreenPlayer() {
} }
override fun onDestroyView() { override fun onDestroyView() {
//somehow this still leaks and I dont know why????
// todo look at https://github.com/discord/OverlappingPanels/blob/70b4a7cf43c6771873b1e091029d332896d41a1a/sample_app/src/main/java/com/discord/sampleapp/MainActivity.kt
PanelsChildGestureRegionObserver.Provider.get().let { obs -> PanelsChildGestureRegionObserver.Provider.get().let { obs ->
resultBinding?.resultCastItems?.let { resultBinding?.resultCastItems?.let {
obs.unregister(it) obs.unregister(it)
@ -329,13 +335,18 @@ open class ResultFragmentPhone : FullScreenPlayer() {
syncModel.addFromUrl(storedData.url) syncModel.addFromUrl(storedData.url)
val api = APIHolder.getApiFromNameNull(storedData.apiName) val api = APIHolder.getApiFromNameNull(storedData.apiName)
PanelsChildGestureRegionObserver.Provider.get().apply { // This may not be 100% reliable, and may delay for small period
resultBinding?.resultCastItems?.let { // before resultCastItems will be scrollable again, but this does work
register(it) // most of the time.
binding?.resultOverlappingPanels?.registerEndPanelStateListeners(
object : OverlappingPanelsLayout.PanelStateListener {
override fun onPanelStateChange(panelState: PanelState) {
PanelsChildGestureRegionObserver.Provider.get().apply {
resultBinding?.resultCastItems?.let { register(it) }
}
}
} }
addGestureRegionsUpdateListener(gestureRegionsListener) )
}
// ===== ===== ===== // ===== ===== =====
@ -674,6 +685,9 @@ open class ResultFragmentPhone : FullScreenPlayer() {
observe(viewModel.page) { data -> observe(viewModel.page) { data ->
if (data == null) return@observe if (data == null) return@observe
resultBinding?.apply { resultBinding?.apply {
PanelsChildGestureRegionObserver.Provider.get().apply {
register(resultCastItems)
}
(data as? Resource.Success)?.value?.let { d -> (data as? Resource.Success)?.value?.let { d ->
resultVpn.setText(d.vpnText) resultVpn.setText(d.vpnText)
resultInfo.setText(d.metaText) resultInfo.setText(d.metaText)
@ -1167,4 +1181,4 @@ open class ResultFragmentPhone : FullScreenPlayer() {
} }
} }
} }
} }