From c26cc56f20dbaf1e01e09aa1e4b1a88da75c0395 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 21 Mar 2023 16:06:15 -0300 Subject: [PATCH] Fix bottom bar state handling and active state when menu is open. --- .../thoughtcrime/securesms/calls/log/CallLogContextMenu.kt | 2 ++ .../securesms/stories/tabs/ConversationListTabsViewModel.kt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogContextMenu.kt index 0cf6287069..0cd5d7031a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogContextMenu.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogContextMenu.kt @@ -19,8 +19,10 @@ class CallLogContextMenu( private val callbacks: Callbacks ) { fun show(anchor: View, call: CallLogRow.Call) { + anchor.isSelected = true SignalContextMenu.Builder(anchor, anchor.parent as ViewGroup) .preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW) + .onDismiss { anchor.isSelected = false } .show( listOfNotNull( getVideoCallActionItem(call), diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt index 9312c38495..3b26dfc715 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt @@ -15,7 +15,9 @@ import org.thoughtcrime.securesms.util.livedata.Store class ConversationListTabsViewModel(repository: ConversationListTabRepository) : ViewModel() { private val store = Store(ConversationListTabsState()) - val stateSnapshot: ConversationListTabsState = store.state + val stateSnapshot: ConversationListTabsState + get() = store.state + val state: LiveData = Transformations.distinctUntilChanged(store.stateLiveData) val disposables = CompositeDisposable()