|
|
|
@ -61,13 +61,13 @@ import androidx.compose.ui.unit.dp
@@ -61,13 +61,13 @@ import androidx.compose.ui.unit.dp
|
|
|
|
|
import androidx.constraintlayout.compose.ConstraintLayout |
|
|
|
|
import androidx.constraintlayout.compose.Dimension.Companion.fillToConstraints |
|
|
|
|
import androidx.constraintlayout.compose.Visibility |
|
|
|
|
import io.element.android.libraries.designsystem.VectorIcons |
|
|
|
|
import io.element.android.libraries.designsystem.preview.DayNightPreviews |
|
|
|
|
import io.element.android.libraries.designsystem.preview.ElementPreview |
|
|
|
|
import io.element.android.libraries.designsystem.text.applyScaleUp |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.Icon |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.IconButton |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.Text |
|
|
|
|
import io.element.android.libraries.designsystem.utils.CommonDrawables |
|
|
|
|
import io.element.android.libraries.matrix.api.core.EventId |
|
|
|
|
import io.element.android.libraries.matrix.api.core.TransactionId |
|
|
|
|
import io.element.android.libraries.matrix.api.media.MediaSource |
|
|
|
@ -137,7 +137,7 @@ fun TextComposer(
@@ -137,7 +137,7 @@ fun TextComposer(
|
|
|
|
|
) { |
|
|
|
|
Icon( |
|
|
|
|
modifier = Modifier.size(30.dp.applyScaleUp()), |
|
|
|
|
resourceId = VectorIcons.Plus, |
|
|
|
|
resourceId = CommonDrawables.ic_plus, |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_a11y_add_attachment), |
|
|
|
|
tint = ElementTheme.colors.iconPrimary, |
|
|
|
|
) |
|
|
|
@ -316,7 +316,7 @@ private fun TextFormatting(
@@ -316,7 +316,7 @@ private fun TextFormatting(
|
|
|
|
|
) { |
|
|
|
|
Icon( |
|
|
|
|
modifier = Modifier.size(30.dp.applyScaleUp()), |
|
|
|
|
resourceId = VectorIcons.Cancel, |
|
|
|
|
resourceId = CommonDrawables.ic_cancel, |
|
|
|
|
contentDescription = stringResource(CommonStrings.action_close), |
|
|
|
|
tint = ElementTheme.colors.iconPrimary, |
|
|
|
|
) |
|
|
|
@ -339,25 +339,25 @@ private fun TextFormatting(
@@ -339,25 +339,25 @@ private fun TextFormatting(
|
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.BOLD].toButtonState(), |
|
|
|
|
onClick = { state.toggleInlineFormat(InlineFormat.Bold) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Bold), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_format_bold) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.ITALIC].toButtonState(), |
|
|
|
|
onClick = { state.toggleInlineFormat(InlineFormat.Italic) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Italic), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_format_italic) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.UNDERLINE].toButtonState(), |
|
|
|
|
onClick = { state.toggleInlineFormat(InlineFormat.Underline) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Underline), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_format_underline) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.STRIKE_THROUGH].toButtonState(), |
|
|
|
|
onClick = { state.toggleInlineFormat(InlineFormat.StrikeThrough) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Strikethrough), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_strikethrough), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_format_strikethrough) |
|
|
|
|
) |
|
|
|
|
|
|
|
|
@ -376,50 +376,50 @@ private fun TextFormatting(
@@ -376,50 +376,50 @@ private fun TextFormatting(
|
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.LINK].toButtonState(), |
|
|
|
|
onClick = { linkDialogAction = state.linkAction }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Link), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_link), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_link) |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.UNORDERED_LIST].toButtonState(), |
|
|
|
|
onClick = { state.toggleList(ordered = false) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.BulletList), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_bullet_list), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_bullet_list) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.ORDERED_LIST].toButtonState(), |
|
|
|
|
onClick = { state.toggleList(ordered = true) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.NumberedList), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_numbered_list), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_numbered_list) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.INDENT].toButtonState(), |
|
|
|
|
onClick = { state.indent() }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.IndentIncrease), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_indent_increase), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_indent) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.UNINDENT].toButtonState(), |
|
|
|
|
onClick = { state.unindent() }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.IndentDecrease), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_indent_decrease), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_unindent) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.INLINE_CODE].toButtonState(), |
|
|
|
|
onClick = { state.toggleInlineFormat(InlineFormat.InlineCode) }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.InlineCode), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_inline_code), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_inline_code) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.CODE_BLOCK].toButtonState(), |
|
|
|
|
onClick = { state.toggleCodeBlock() }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.CodeBlock), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_code_block), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_code_block) |
|
|
|
|
) |
|
|
|
|
FormattingOption( |
|
|
|
|
state = state.actions[ComposerAction.QUOTE].toButtonState(), |
|
|
|
|
onClick = { state.toggleQuote() }, |
|
|
|
|
imageVector = ImageVector.vectorResource(VectorIcons.Quote), |
|
|
|
|
imageVector = ImageVector.vectorResource(CommonDrawables.ic_quote), |
|
|
|
|
contentDescription = stringResource(R.string.rich_text_editor_quote) |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
@ -477,7 +477,7 @@ private fun EditingModeView(
@@ -477,7 +477,7 @@ private fun EditingModeView(
|
|
|
|
|
.padding(start = 12.dp) |
|
|
|
|
) { |
|
|
|
|
Icon( |
|
|
|
|
resourceId = VectorIcons.Edit, |
|
|
|
|
resourceId = CommonDrawables.ic_edit, |
|
|
|
|
contentDescription = stringResource(CommonStrings.common_editing), |
|
|
|
|
tint = ElementTheme.materialColors.secondary, |
|
|
|
|
modifier = Modifier |
|
|
|
|