Close UpNext sheet whenever player sheet is closed (#1731)

Author: MiSikora

app/src/main/java/au/com/shiftyjelly/pocketcasts/ui/MainActivity.kt

@@ -884,6 +884,14 @@ class MainActivity :
         return binding.playerBottomSheet.sheetBehavior?.state ?: BottomSheetBehavior.STATE_COLLAPSED
     }
 
+    override fun addPlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
+        binding.playerBottomSheet.sheetBehavior?.addBottomSheetCallback(callback)
+    }
+
+    override fun removePlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) {
+        binding.playerBottomSheet.sheetBehavior?.removeBottomSheetCallback(callback)
+    }
+
     override fun lockPlayerBottomSheet(locked: Boolean) {
         binding.playerBottomSheet.isDragEnabled = !locked
     }

automotive/src/main/java/au/com/shiftyjelly/pocketcasts/AutomotiveSettingsActivity.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import au.com.shiftyjelly.pocketcasts.models.type.EpisodeViewSource
 import au.com.shiftyjelly.pocketcasts.ui.helper.FragmentHostListener
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import dagger.hilt.android.AndroidEntryPoint
 import au.com.shiftyjelly.pocketcasts.images.R as IR
 import au.com.shiftyjelly.pocketcasts.profile.R as PR
@@ -117,6 +118,10 @@ class AutomotiveSettingsActivity : AppCompatActivity(), FragmentHostListener {
         return 0
     }
 
+    override fun addPlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) = Unit
+
+    override fun removePlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback) = Unit
+
     override fun openEpisodeDialog(
         episodeUuid: String?,
         source: EpisodeViewSource,

modules/features/player/src/main/java/au/com/shiftyjelly/pocketcasts/player/view/PlayerContainerFragment.kt

@@ -66,13 +66,24 @@ class PlayerContainerFragment : BaseFragment(), HasBackstack {
     val overrideTheme: Theme.ThemeType
         get() = if (settings.useDarkUpNextTheme.value) Theme.ThemeType.DARK else theme.activeTheme
 
+    private val closeUpNextCallback = object : BottomSheetBehavior.BottomSheetCallback() {
+        override fun onStateChanged(bottomSheet: View, newState: Int) {
+            if (newState in listOf(BottomSheetBehavior.STATE_COLLAPSED, BottomSheetBehavior.STATE_HIDDEN)) {
+                upNextBottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+            }
+        }
+
+        override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = FragmentPlayerContainerBinding.inflate(inflater, container, false)
         return binding?.root
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
+        (activity as? FragmentHostListener)?.removePlayerBottomSheetCallback(closeUpNextCallback)
         binding = null
         bookmarksViewModel.multiSelectHelper.context = null
     }
@@ -92,6 +103,7 @@ class PlayerContainerFragment : BaseFragment(), HasBackstack {
         // Having it gone from the beginning adds a small delay before it can be initially shown.
         binding.upNextFrameBottomSheet.doOnLayout {
             it.isGone = true
+            (activity as? FragmentHostListener)?.addPlayerBottomSheetCallback(closeUpNextCallback)
         }
         upNextBottomSheetBehavior = BottomSheetBehavior.from(binding.upNextFrameBottomSheet)
         upNextBottomSheetBehavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {

modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/FragmentHostListener.kt

@@ -3,6 +3,7 @@ package au.com.shiftyjelly.pocketcasts.ui.helper
 import android.view.View
 import androidx.fragment.app.Fragment
 import au.com.shiftyjelly.pocketcasts.models.type.EpisodeViewSource
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 
 interface FragmentHostListener {
     fun addFragment(fragment: Fragment, onTop: Boolean = false)
@@ -22,6 +23,8 @@ interface FragmentHostListener {
     fun showAccountUpgradeNow(autoSelectPlus: Boolean)
     fun updateStatusBar()
     fun getPlayerBottomSheetState(): Int
+    fun addPlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback)
+    fun removePlayerBottomSheetCallback(callback: BottomSheetBehavior.BottomSheetCallback)
     fun openEpisodeDialog(episodeUuid: String?, source: EpisodeViewSource, podcastUuid: String?, forceDark: Boolean)
     fun lockPlayerBottomSheet(locked: Boolean)
     fun updateSystemColors()