From 535a2c931b6546a72b96bcfd0a8089fa2f4c3446 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 30 Sep 2021 12:02:05 +0200 Subject: [PATCH] Clean code and add changelog --- changelog.d/4077.bugfix | 1 + .../app/features/home/room/detail/RoomDetailFragment.kt | 2 +- .../app/features/home/room/detail/RoomDetailViewEvents.kt | 2 -- .../app/features/home/room/detail/RoomDetailViewState.kt | 2 -- .../home/room/detail/composer/TextComposerAction.kt | 1 - .../features/home/room/detail/composer/TextComposerView.kt | 7 +++---- .../home/room/detail/composer/TextComposerViewState.kt | 2 +- 7 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 changelog.d/4077.bugfix diff --git a/changelog.d/4077.bugfix b/changelog.d/4077.bugfix new file mode 100644 index 0000000000..a8ab6b3c54 --- /dev/null +++ b/changelog.d/4077.bugfix @@ -0,0 +1 @@ +Fix Reply/Edit mode animation is broken when sending \ No newline at end of file diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index c9ec12c4c3..2ee0a33c15 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -1393,7 +1393,7 @@ class RoomDetailFragment @Inject constructor( views.voiceMessageRecorderView.isVisible = !textComposerState.isSendButtonVisible views.composerLayout.views.sendButton.isInvisible = !textComposerState.isSendButtonVisible views.composerLayout.setRoomEncrypted(summary.isEncrypted) - //views.composerLayout.alwaysShowSendButton = false + // views.composerLayout.alwaysShowSendButton = false if (textComposerState.canSendMessage) { views.notificationAreaView.render(NotificationAreaView.State.Hidden) } else { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt index abd9a52e6b..fa22a16b55 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt @@ -18,10 +18,8 @@ package im.vector.app.features.home.room.detail import android.net.Uri import android.view.View -import androidx.annotation.StringRes import im.vector.app.core.platform.VectorViewEvents import im.vector.app.features.call.webrtc.WebRtcCall -import im.vector.app.features.command.Command import org.matrix.android.sdk.api.session.widgets.model.Widget import org.matrix.android.sdk.api.util.MatrixItem import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt index d63ba0b973..4c6e4ac3fe 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt @@ -25,12 +25,10 @@ import org.matrix.android.sdk.api.session.initsync.SyncStatusService import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary import org.matrix.android.sdk.api.session.room.model.RoomSummary -import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.sync.SyncState import org.matrix.android.sdk.api.session.widgets.model.Widget import org.matrix.android.sdk.api.session.widgets.model.WidgetType - sealed class UnreadState { object Unknown : UnreadState() object HasNoUnread : UnreadState() diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt index e51d9219e6..7725400187 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerAction.kt @@ -17,7 +17,6 @@ package im.vector.app.features.home.room.detail.composer import im.vector.app.core.platform.VectorViewModelAction -import im.vector.app.features.home.room.detail.RoomDetailAction sealed class TextComposerAction : VectorViewModelAction { data class SaveDraft(val draft: String) : TextComposerAction() diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt index a033e7366e..34b3c1777c 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt @@ -24,7 +24,6 @@ import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.core.text.toSpannable -import androidx.core.view.isInvisible import androidx.transition.ChangeBounds import androidx.transition.Fade import androidx.transition.Transition @@ -107,12 +106,12 @@ class TextComposerView @JvmOverloads constructor( applyNewConstraintSet(animate, transitionComplete) } - fun setTextIfDifferent(text: CharSequence?): Boolean{ + fun setTextIfDifferent(text: CharSequence?): Boolean { return views.composerEditText.setTextIfDifferent(text) } private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) { - //val wasSendButtonInvisible = views.sendButton.isInvisible + // val wasSendButtonInvisible = views.sendButton.isInvisible if (animate) { configureAndBeginTransition(transitionComplete) } @@ -121,7 +120,7 @@ class TextComposerView @JvmOverloads constructor( it.applyTo(this) } // Might be updated by view state just after, but avoid blinks - //views.sendButton.isInvisible = wasSendButtonInvisible + // views.sendButton.isInvisible = wasSendButtonInvisible } private fun configureAndBeginTransition(transitionComplete: (() -> Unit)? = null) { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt index 2fe9b58b21..379add779b 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerViewState.kt @@ -46,7 +46,7 @@ data class TextComposerViewState( val canSendMessage: Boolean = true, val isVoiceRecording: Boolean = false, val isSendButtonVisible : Boolean = false, - val sendMode: SendMode = SendMode.REGULAR("", false), + val sendMode: SendMode = SendMode.REGULAR("", false) ) : MvRxState { val isComposerVisible: Boolean