mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Always use method aRichTextEditorState instead of invoking the constructor directly, and remove parameter when it's the default value.
This commit is contained in:
committed by
Benoit Marty
parent
7d247b062e
commit
131edd0ba4
+2
-1
@@ -22,6 +22,7 @@ import io.element.android.features.messages.impl.mentions.MentionSuggestion
|
|||||||
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.permalink.PermalinkData
|
import io.element.android.libraries.matrix.api.permalink.PermalinkData
|
||||||
import io.element.android.libraries.matrix.api.permalink.PermalinkParser
|
import io.element.android.libraries.matrix.api.permalink.PermalinkParser
|
||||||
|
import io.element.android.libraries.textcomposer.aRichTextEditorState
|
||||||
import io.element.android.libraries.textcomposer.model.MessageComposerMode
|
import io.element.android.libraries.textcomposer.model.MessageComposerMode
|
||||||
import io.element.android.wysiwyg.compose.RichTextEditorState
|
import io.element.android.wysiwyg.compose.RichTextEditorState
|
||||||
import kotlinx.collections.immutable.ImmutableList
|
import kotlinx.collections.immutable.ImmutableList
|
||||||
@@ -35,7 +36,7 @@ open class MessageComposerStateProvider : PreviewParameterProvider<MessageCompos
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun aMessageComposerState(
|
fun aMessageComposerState(
|
||||||
richTextEditorState: RichTextEditorState = RichTextEditorState(""),
|
richTextEditorState: RichTextEditorState = aRichTextEditorState(),
|
||||||
isFullScreen: Boolean = false,
|
isFullScreen: Boolean = false,
|
||||||
mode: MessageComposerMode = MessageComposerMode.Normal,
|
mode: MessageComposerMode = MessageComposerMode.Normal,
|
||||||
showTextFormatting: Boolean = false,
|
showTextFormatting: Boolean = false,
|
||||||
|
|||||||
+6
-7
@@ -637,7 +637,7 @@ internal fun TextComposerSimplePreview() = ElementPreview {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
ATextComposer(
|
ATextComposer(
|
||||||
aRichTextEditorState(initialText = "A message without focus", initialFocus = false),
|
aRichTextEditorState(initialText = "A message without focus"),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
composerMode = MessageComposerMode.Normal,
|
composerMode = MessageComposerMode.Normal,
|
||||||
enableTextFormatting = true,
|
enableTextFormatting = true,
|
||||||
@@ -654,7 +654,7 @@ internal fun TextComposerSimplePreview() = ElementPreview {
|
|||||||
internal fun TextComposerFormattingPreview() = ElementPreview {
|
internal fun TextComposerFormattingPreview() = ElementPreview {
|
||||||
PreviewColumn(items = persistentListOf({
|
PreviewColumn(items = persistentListOf({
|
||||||
ATextComposer(
|
ATextComposer(
|
||||||
aRichTextEditorState(initialText = "", initialFocus = false),
|
aRichTextEditorState(),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
showTextFormatting = true,
|
showTextFormatting = true,
|
||||||
composerMode = MessageComposerMode.Normal,
|
composerMode = MessageComposerMode.Normal,
|
||||||
@@ -664,7 +664,7 @@ internal fun TextComposerFormattingPreview() = ElementPreview {
|
|||||||
)
|
)
|
||||||
}, {
|
}, {
|
||||||
ATextComposer(
|
ATextComposer(
|
||||||
aRichTextEditorState(initialText = "A message", initialFocus = false),
|
aRichTextEditorState(initialText = "A message"),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
showTextFormatting = true,
|
showTextFormatting = true,
|
||||||
composerMode = MessageComposerMode.Normal,
|
composerMode = MessageComposerMode.Normal,
|
||||||
@@ -676,7 +676,6 @@ internal fun TextComposerFormattingPreview() = ElementPreview {
|
|||||||
ATextComposer(
|
ATextComposer(
|
||||||
aRichTextEditorState(
|
aRichTextEditorState(
|
||||||
initialText = "A message\nWith several lines\nTo preview larger textfields and long lines with overflow",
|
initialText = "A message\nWith several lines\nTo preview larger textfields and long lines with overflow",
|
||||||
initialFocus = false
|
|
||||||
),
|
),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
showTextFormatting = true,
|
showTextFormatting = true,
|
||||||
@@ -710,7 +709,7 @@ internal fun TextComposerReplyPreview() = ElementPreview {
|
|||||||
items = persistentListOf(
|
items = persistentListOf(
|
||||||
{
|
{
|
||||||
ATextComposer(
|
ATextComposer(
|
||||||
aRichTextEditorState(""),
|
aRichTextEditorState(),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
composerMode = MessageComposerMode.Reply(
|
composerMode = MessageComposerMode.Reply(
|
||||||
isThreaded = false,
|
isThreaded = false,
|
||||||
@@ -728,7 +727,7 @@ internal fun TextComposerReplyPreview() = ElementPreview {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
ATextComposer(
|
ATextComposer(
|
||||||
RichTextEditorState(""),
|
aRichTextEditorState(),
|
||||||
voiceMessageState = VoiceMessageState.Idle,
|
voiceMessageState = VoiceMessageState.Idle,
|
||||||
composerMode = MessageComposerMode.Reply(
|
composerMode = MessageComposerMode.Reply(
|
||||||
isThreaded = true,
|
isThreaded = true,
|
||||||
@@ -839,7 +838,7 @@ internal fun TextComposerVoicePreview() = ElementPreview {
|
|||||||
fun VoicePreview(
|
fun VoicePreview(
|
||||||
voiceMessageState: VoiceMessageState
|
voiceMessageState: VoiceMessageState
|
||||||
) = ATextComposer(
|
) = ATextComposer(
|
||||||
RichTextEditorState("", initialFocus = true),
|
aRichTextEditorState(initialFocus = true),
|
||||||
voiceMessageState = voiceMessageState,
|
voiceMessageState = voiceMessageState,
|
||||||
composerMode = MessageComposerMode.Normal,
|
composerMode = MessageComposerMode.Normal,
|
||||||
enableTextFormatting = true,
|
enableTextFormatting = true,
|
||||||
|
|||||||
+2
-1
@@ -35,6 +35,7 @@ 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.textcomposer.R
|
import io.element.android.libraries.textcomposer.R
|
||||||
import io.element.android.libraries.textcomposer.TextComposerLinkDialog
|
import io.element.android.libraries.textcomposer.TextComposerLinkDialog
|
||||||
|
import io.element.android.libraries.textcomposer.aRichTextEditorState
|
||||||
import io.element.android.wysiwyg.compose.RichTextEditorState
|
import io.element.android.wysiwyg.compose.RichTextEditorState
|
||||||
import io.element.android.wysiwyg.view.models.InlineFormat
|
import io.element.android.wysiwyg.view.models.InlineFormat
|
||||||
import io.element.android.wysiwyg.view.models.LinkAction
|
import io.element.android.wysiwyg.view.models.LinkAction
|
||||||
@@ -209,5 +210,5 @@ private fun ActionState?.toButtonState(): FormattingOptionState =
|
|||||||
@PreviewsDayNight
|
@PreviewsDayNight
|
||||||
@Composable
|
@Composable
|
||||||
internal fun TextFormattingPreview() = ElementPreview {
|
internal fun TextFormattingPreview() = ElementPreview {
|
||||||
TextFormatting(state = RichTextEditorState())
|
TextFormatting(state = aRichTextEditorState())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user