mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements & fixes related to bottom sheets

Browse source
This commit is contained in:
Sylvain Berfini 2024-06-20 13:34:04 +02:00
parent ec6316f6e5
commit 72f8574a1e
3 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt
View file

@ -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)

17
app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
View file

@ -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()

4
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -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
}