From 2959f2aa9c63ab9cf9805f182d3accaa9559444b Mon Sep 17 00:00:00 2001 From: Adolfo Santiago Date: Sat, 21 May 2022 12:30:56 +0200 Subject: [PATCH] Attempt to fix the Preview behavior This fix should fix the behavior where the Preview view does not close properly when the button is pressed again. Fixes: https://todo.sr.ht/~captainepoch/husky/29 --- .../tusky/components/compose/ComposeActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/husky/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index 2fe1af5..dd90b96 100644 --- a/husky/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/husky/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -1100,8 +1100,12 @@ class ComposeActivity : BaseActivity(), } private fun onSendClicked(preview: Boolean) { - if(preview && previewBehavior.state != BottomSheetBehavior.STATE_HIDDEN) { + if(preview && previewBehavior.state != BottomSheetBehavior.STATE_HIDDEN + && previewBehavior.state != BottomSheetBehavior.STATE_COLLAPSED + ) { previewBehavior.state = BottomSheetBehavior.STATE_HIDDEN + + return } if(verifyScheduledTime()) { @@ -1113,7 +1117,9 @@ class ComposeActivity : BaseActivity(), private fun onStatusPreviewReady(status: Status) { enableButtons(true) - if(previewBehavior.state != BottomSheetBehavior.STATE_HIDDEN) { + if(previewBehavior.state != BottomSheetBehavior.STATE_HIDDEN + && previewBehavior.state != BottomSheetBehavior.STATE_COLLAPSED + ) { previewBehavior.state = BottomSheetBehavior.STATE_HIDDEN } else { binding.previewView.setupWithStatus(status)