From 72f8574a1e50b378d147f42cc54df63e35c6e499 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 20 Jun 2024 13:34:04 +0200 Subject: [PATCH] Improvements & fixes related to bottom sheets --- .../fragment/ActiveConferenceCallFragment.kt | 15 ++------------- .../ui/call/fragment/ActiveCallFragment.kt | 17 +++-------------- .../main/chat/fragment/ConversationFragment.kt | 4 +++- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt index 217177af6..fd8a56c94 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt @@ -54,17 +54,6 @@ class ActiveConferenceCallFragment : GenericCallFragment() { private lateinit var callsViewModel: CallsViewModel - private val bottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) { - if (newState == BottomSheetBehavior.STATE_COLLAPSED) { - val bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet) - bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - } - } - - override fun onSlide(bottomSheet: View, slideOffset: Float) { } - } - private val actionsBottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() { override fun onStateChanged(bottomSheet: View, newState: Int) { if (newState == BottomSheetBehavior.STATE_EXPANDED) { @@ -144,13 +133,13 @@ class ActiveConferenceCallFragment : GenericCallFragment() { val callStatsBottomSheetBehavior = BottomSheetBehavior.from(binding.callStats.root) callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - callStatsBottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback) + callStatsBottomSheetBehavior.skipCollapsed = true val callMediaEncryptionStatsBottomSheetBehavior = BottomSheetBehavior.from( binding.callMediaEncryptionStats.root ) callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - callMediaEncryptionStatsBottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback) + callMediaEncryptionStatsBottomSheetBehavior.skipCollapsed = true callViewModel.callDuration.observe(viewLifecycleOwner) { duration -> binding.chronometer.base = SystemClock.elapsedRealtime() - (1000 * duration) diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt index 95fd828c1..e37b978d0 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt @@ -93,17 +93,6 @@ class ActiveCallFragment : GenericCallFragment() { } } - private val bottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) { - if (newState == BottomSheetBehavior.STATE_COLLAPSED) { - val bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet) - bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - } - } - - override fun onSlide(bottomSheet: View, slideOffset: Float) { } - } - private val actionsBottomSheetCallback = object : BottomSheetBehavior.BottomSheetCallback() { override fun onStateChanged(bottomSheet: View, newState: Int) { if (newState == BottomSheetBehavior.STATE_EXPANDED) { @@ -167,17 +156,17 @@ class ActiveCallFragment : GenericCallFragment() { val numpadBottomSheetBehavior = BottomSheetBehavior.from(binding.callNumpad.root) numpadBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - numpadBottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback) + numpadBottomSheetBehavior.skipCollapsed = true val callStatsBottomSheetBehavior = BottomSheetBehavior.from(binding.callStats.root) callStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - callStatsBottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback) + callStatsBottomSheetBehavior.skipCollapsed = true val callMediaEncryptionStatsBottomSheetBehavior = BottomSheetBehavior.from( binding.callMediaEncryptionStats.root ) callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN - callMediaEncryptionStatsBottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback) + callMediaEncryptionStatsBottomSheetBehavior.skipCollapsed = true binding.setBackClickListener { requireActivity().finish() diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index 86eade847..6c7ba0e28 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -1022,6 +1022,9 @@ class ConversationFragment : SlidingPaneChildFragment() { null, false ) + val emojiSheetBehavior = BottomSheetBehavior.from(layout.emojiPickerBottomSheet.root) + emojiSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN + emojiSheetBehavior.skipCollapsed = true layout.root.setOnClickListener { dismissDialog() @@ -1045,7 +1048,6 @@ class ConversationFragment : SlidingPaneChildFragment() { layout.setPickEmojiClickListener { Log.i("$TAG Opening emoji-picker for reaction") - val emojiSheetBehavior = BottomSheetBehavior.from(layout.emojiPickerBottomSheet.root) emojiSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED }