Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Overlapping Conversation Banner Position for Hidden Toolbar #13962

Closed
wants to merge 1 commit into from
+6 −3
Closed

Fixes Overlapping Conversation Banner Position for Hidden Toolbar #13962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import androidx.core.content.ContextCompat
import androidx.core.content.pm.ShortcutManagerCompat
import androidx.core.view.ViewCompat
import androidx.core.view.doOnPreDraw
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentResultListener
Expand Down Expand Up @@ -532,7 +533,9 @@ class ConversationFragment :

private val motionEventRelay: MotionEventRelay by viewModels(ownerProducer = { requireActivity() })

private val actionModeCallback = ActionModeCallback()
private val actionModeCallback by lazy {
ActionModeCallback()
}

private val container: InputAwareConstraintLayout
get() = requireView() as InputAwareConstraintLayout
Expand Down Expand Up @@ -3643,7 +3646,7 @@ class ConversationFragment :
mode.title = calculateSelectedItemCount()

searchMenuItem?.collapseActionView()
binding.toolbar.visible = false
binding.toolbar.isInvisible = true
if (scheduledMessagesStub.isVisible) {
reShowScheduleMessagesBar = true
scheduledMessagesStub.visibility = View.GONE
Expand All @@ -3661,7 +3664,7 @@ class ConversationFragment :
adapter.clearSelection()
setBottomActionBarVisibility(false)

binding.toolbar.visible = true
binding.toolbar.isInvisible = false
if (reShowScheduleMessagesBar) {
scheduledMessagesStub.visibility = View.VISIBLE
reShowScheduleMessagesBar = false
Expand Down