mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Move DisabledComposer to MessageView.
This commit is contained in:
+9
@@ -55,6 +55,7 @@ import io.element.android.features.messages.impl.actionlist.ActionListView
|
|||||||
import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
|
import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
|
||||||
import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStateView
|
import io.element.android.features.messages.impl.crypto.identity.IdentityChangeStateView
|
||||||
import io.element.android.features.messages.impl.messagecomposer.AttachmentsBottomSheet
|
import io.element.android.features.messages.impl.messagecomposer.AttachmentsBottomSheet
|
||||||
|
import io.element.android.features.messages.impl.messagecomposer.DisabledComposerView
|
||||||
import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents
|
||||||
import io.element.android.features.messages.impl.messagecomposer.MessageComposerView
|
import io.element.android.features.messages.impl.messagecomposer.MessageComposerView
|
||||||
import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsPickerView
|
import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsPickerView
|
||||||
@@ -97,6 +98,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
|
|||||||
import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
|
import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
|
||||||
import io.element.android.libraries.matrix.api.core.EventId
|
import io.element.android.libraries.matrix.api.core.EventId
|
||||||
import io.element.android.libraries.matrix.api.core.UserId
|
import io.element.android.libraries.matrix.api.core.UserId
|
||||||
|
import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
|
||||||
import io.element.android.libraries.textcomposer.model.TextEditorState
|
import io.element.android.libraries.textcomposer.model.TextEditorState
|
||||||
import io.element.android.libraries.ui.strings.CommonStrings
|
import io.element.android.libraries.ui.strings.CommonStrings
|
||||||
import kotlinx.collections.immutable.ImmutableList
|
import kotlinx.collections.immutable.ImmutableList
|
||||||
@@ -425,6 +427,12 @@ private fun MessagesViewComposerBottomSheetContents(
|
|||||||
onLinkClick = onLinkClick,
|
onLinkClick = onLinkClick,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
val verificationViolation = state.composerState.roomMemberIdentityStateChanges.firstOrNull {
|
||||||
|
it.identityState == IdentityState.VerificationViolation
|
||||||
|
}
|
||||||
|
if (verificationViolation != null) {
|
||||||
|
DisabledComposerView(modifier = Modifier.fillMaxWidth())
|
||||||
|
} else {
|
||||||
MessageComposerView(
|
MessageComposerView(
|
||||||
state = state.composerState,
|
state = state.composerState,
|
||||||
voiceMessageState = state.voiceMessageComposerState,
|
voiceMessageState = state.voiceMessageComposerState,
|
||||||
@@ -433,6 +441,7 @@ private fun MessagesViewComposerBottomSheetContents(
|
|||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
CantSendMessageBanner()
|
CantSendMessageBanner()
|
||||||
}
|
}
|
||||||
|
|||||||
-9
@@ -23,7 +23,6 @@ import io.element.android.features.messages.impl.voicemessages.composer.VoiceMes
|
|||||||
import io.element.android.features.messages.impl.voicemessages.composer.aVoiceMessageComposerState
|
import io.element.android.features.messages.impl.voicemessages.composer.aVoiceMessageComposerState
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
|
|
||||||
import io.element.android.libraries.textcomposer.TextComposer
|
import io.element.android.libraries.textcomposer.TextComposer
|
||||||
import io.element.android.libraries.textcomposer.model.Suggestion
|
import io.element.android.libraries.textcomposer.model.Suggestion
|
||||||
import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
|
import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
|
||||||
@@ -38,14 +37,6 @@ internal fun MessageComposerView(
|
|||||||
enableVoiceMessages: Boolean,
|
enableVoiceMessages: Boolean,
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
) {
|
) {
|
||||||
val verificationViolation = state.roomMemberIdentityStateChanges.firstOrNull {
|
|
||||||
it.identityState == IdentityState.VerificationViolation
|
|
||||||
}
|
|
||||||
if (verificationViolation != null) {
|
|
||||||
DisabledComposerView(modifier = modifier)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val view = LocalView.current
|
val view = LocalView.current
|
||||||
fun sendMessage() {
|
fun sendMessage() {
|
||||||
state.eventSink(MessageComposerEvents.SendMessage)
|
state.eventSink(MessageComposerEvents.SendMessage)
|
||||||
|
|||||||
Reference in New Issue
Block a user