From 51e6f44588eec23eac71d612c6d6623b1a334686 Mon Sep 17 00:00:00 2001 From: "Thomas W." Date: Tue, 14 Jan 2025 15:20:33 +0100 Subject: [PATCH 1/2] Pop from replies to comments instead of closing comments sheet --- .../java/com/github/libretube/ui/sheets/CommentsSheet.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt index f223722075..5d11ba3894 100644 --- a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt +++ b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt @@ -20,6 +20,14 @@ class CommentsSheet : ExpandablePlayerSheet() { private val commonPlayerViewModel: CommonPlayerViewModel by activityViewModels() + private val backPressedCallback by lazy(LazyThreadSafetyMode.NONE) { + (dialog as ComponentDialog?)?.onBackPressedDispatcher?.addCallback(owner = viewLifecycleOwner, enabled = false) { + if (childFragmentManager.backStackEntryCount > 0) { + childFragmentManager.popBackStack() + } + } + } + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -70,6 +78,7 @@ class CommentsSheet : ExpandablePlayerSheet() { fun updateFragmentInfo(showBackButton: Boolean, title: String) { binding.btnBack.isVisible = showBackButton binding.commentsTitle.text = title + backPressedCallback?.isEnabled = showBackButton } companion object { From fa788d7d50ae7d244fdc7f63c59cea0eb36f9b6a Mon Sep 17 00:00:00 2001 From: "Thomas W." Date: Tue, 14 Jan 2025 15:24:25 +0100 Subject: [PATCH 2/2] Pop from replies to comments instead of closing comments sheet --- .../main/java/com/github/libretube/ui/sheets/CommentsSheet.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt index 5d11ba3894..517ccfaaae 100644 --- a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt +++ b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt @@ -4,6 +4,8 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.activity.ComponentDialog +import androidx.activity.addCallback import androidx.core.view.isVisible import androidx.fragment.app.activityViewModels import androidx.fragment.app.commit