From d1eb2795632e042c5a26fadd732ae25840688c6c Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 20 Dec 2022 16:45:29 +0100
Subject: [PATCH] Hide the comments bottom sheet when entering PiP

---
 .../github/libretube/ui/fragments/SearchResultFragment.kt   | 2 +-
 .../java/com/github/libretube/ui/sheets/BaseBottomSheet.kt  | 5 -----
 .../com/github/libretube/ui/sheets/ExpandedBottomSheet.kt   | 6 ++++++
 .../com/github/libretube/ui/views/CustomSwipeToRefresh.kt   | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
index b36382665..4eefe16d2 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
@@ -18,8 +18,8 @@ import com.github.libretube.extensions.hideKeyboard
 import com.github.libretube.ui.adapters.SearchAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.util.PreferenceHelper
-import retrofit2.HttpException
 import java.io.IOException
+import retrofit2.HttpException
 
 class SearchResultFragment : BaseFragment() {
     private lateinit var binding: FragmentSearchResultBinding
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/BaseBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/BaseBottomSheet.kt
index 635620be1..162e80719 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/BaseBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/BaseBottomSheet.kt
@@ -45,9 +45,4 @@ open class BaseBottomSheet : ExpandedBottomSheet() {
             dialog?.dismiss()
         }
     }
-
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
-        dialog?.dismiss()
-    }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
index f203460b1..a1e2d6007 100644
--- a/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
+++ b/app/src/main/java/com/github/libretube/ui/sheets/ExpandedBottomSheet.kt
@@ -33,4 +33,10 @@ open class ExpandedBottomSheet : BottomSheetDialogFragment() {
         fragmentManager,
         null
     )
+
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
+        // ensure that the sheet doesn't hide parts of the video
+        dialog?.dismiss()
+    }
 }
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt b/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
index e5a037def..733e7ea1e 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomSwipeToRefresh.kt
@@ -18,7 +18,9 @@ class CustomSwipeToRefresh(context: Context?, attrs: AttributeSet?) :
 
     init {
         setColorSchemeColors(ThemeHelper.getThemeColor(this.context, R.attr.colorPrimary))
-        setProgressBackgroundColorSchemeColor(ThemeHelper.getThemeColor(this.context, R.attr.colorSurface))
+        setProgressBackgroundColorSchemeColor(
+            ThemeHelper.getThemeColor(this.context, R.attr.colorSurface)
+        )
     }
 
     @SuppressLint("Recycle")