kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #6067 from Bnyro/master

Browse Source 
fix: use correct fragment manager for result callbacks
This commit is contained in:
Bnyro 2024-05-20 23:23:05 +02:00 committed by GitHub
commit 55e306965d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
View File

@ -170,7 +170,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
) )
} }
requireActivity().supportFragmentManager.setFragmentResultListener( childFragmentManager.setFragmentResultListener(
ChaptersBottomSheet.SEEK_TO_POSITION_REQUEST_KEY, ChaptersBottomSheet.SEEK_TO_POSITION_REQUEST_KEY,
viewLifecycleOwner viewLifecycleOwner
) { _, bundle -> ) { _, bundle ->
@ -187,7 +187,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
IntentData.duration to playerService.player?.duration?.div(1000) IntentData.duration to playerService.player?.duration?.div(1000)
) )
} }
.show(requireActivity().supportFragmentManager) .show(childFragmentManager)
} }
binding.miniPlayerClose.setOnClickListener { binding.miniPlayerClose.setOnClickListener {

23
app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt
View File

@ -231,19 +231,14 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment() {
private fun setupSortAndFilter() { private fun setupSortAndFilter() {
binding.filterSort.setOnClickListener { binding.filterSort.setOnClickListener {
val activityCompat = context as AppCompatActivity childFragmentManager.setFragmentResultListener(
val fragManager = activityCompat FILTER_SORT_REQUEST_KEY,
.supportFragmentManager viewLifecycleOwner
.apply { ) { _, resultBundle ->
setFragmentResultListener( selectedSortOrder = resultBundle.getInt(IntentData.sortOptions)
FILTER_SORT_REQUEST_KEY, hideWatched = resultBundle.getBoolean(IntentData.hideWatched)
activityCompat showFeed()
) { _, resultBundle -> }
selectedSortOrder = resultBundle.getInt(IntentData.sortOptions)
hideWatched = resultBundle.getBoolean(IntentData.hideWatched)
showFeed()
}
}
FilterSortBottomSheet() FilterSortBottomSheet()
.apply { .apply {
@ -252,7 +247,7 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment() {
IntentData.hideWatched to hideWatched IntentData.hideWatched to hideWatched
) )
} }
.show(fragManager) .show(childFragmentManager)
} }
} }