|
|
|
@ -51,7 +51,6 @@ import androidx.compose.ui.unit.dp
@@ -51,7 +51,6 @@ import androidx.compose.ui.unit.dp
|
|
|
|
|
import io.element.android.libraries.designsystem.components.media.createFakeWaveform |
|
|
|
|
import io.element.android.libraries.designsystem.preview.ElementPreview |
|
|
|
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight |
|
|
|
|
import io.element.android.libraries.designsystem.text.applyScaleUp |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.Icon |
|
|
|
|
import io.element.android.libraries.designsystem.theme.components.Text |
|
|
|
@ -135,7 +134,7 @@ fun TextComposer(
@@ -135,7 +134,7 @@ fun TextComposer(
|
|
|
|
|
@Composable { |
|
|
|
|
ComposerOptionsButton( |
|
|
|
|
modifier = Modifier |
|
|
|
|
.size(48.dp.applyScaleUp()), |
|
|
|
|
.size(48.dp), |
|
|
|
|
onClick = onAddAttachment |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
@ -182,7 +181,7 @@ fun TextComposer(
@@ -182,7 +181,7 @@ fun TextComposer(
|
|
|
|
|
} |
|
|
|
|
val uploadVoiceProgress = @Composable { |
|
|
|
|
CircularProgressIndicator( |
|
|
|
|
modifier = Modifier.size(24.dp.applyScaleUp()), |
|
|
|
|
modifier = Modifier.size(24.dp), |
|
|
|
|
) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -289,7 +288,7 @@ private fun StandardLayout(
@@ -289,7 +288,7 @@ private fun StandardLayout(
|
|
|
|
|
Box( |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding(bottom = 5.dp, top = 5.dp, end = 3.dp, start = 3.dp) |
|
|
|
|
.size(48.dp.applyScaleUp()), |
|
|
|
|
.size(48.dp), |
|
|
|
|
contentAlignment = Alignment.Center, |
|
|
|
|
) { |
|
|
|
|
voiceDeleteButton() |
|
|
|
@ -322,7 +321,7 @@ private fun StandardLayout(
@@ -322,7 +321,7 @@ private fun StandardLayout(
|
|
|
|
|
Box( |
|
|
|
|
Modifier |
|
|
|
|
.padding(bottom = 5.dp, top = 5.dp, end = 6.dp, start = 6.dp) |
|
|
|
|
.size(48.dp.applyScaleUp()), |
|
|
|
|
.size(48.dp), |
|
|
|
|
contentAlignment = Alignment.Center, |
|
|
|
|
) { |
|
|
|
|
endButton() |
|
|
|
@ -393,7 +392,7 @@ private fun TextInput(
@@ -393,7 +392,7 @@ private fun TextInput(
|
|
|
|
|
.clip(roundedCorners) |
|
|
|
|
.border(0.5.dp, borderColor, roundedCorners) |
|
|
|
|
.background(color = bgColor) |
|
|
|
|
.requiredHeightIn(min = 42.dp.applyScaleUp()) |
|
|
|
|
.requiredHeightIn(min = 42.dp) |
|
|
|
|
.fillMaxSize(), |
|
|
|
|
) { |
|
|
|
|
if (composerMode is MessageComposerMode.Special) { |
|
|
|
@ -402,12 +401,7 @@ private fun TextInput(
@@ -402,12 +401,7 @@ private fun TextInput(
|
|
|
|
|
val defaultTypography = ElementTheme.typography.fontBodyLgRegular |
|
|
|
|
Box( |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding( |
|
|
|
|
top = 4.dp.applyScaleUp(), |
|
|
|
|
bottom = 4.dp.applyScaleUp(), |
|
|
|
|
start = 12.dp.applyScaleUp(), |
|
|
|
|
end = 42.dp.applyScaleUp() |
|
|
|
|
) |
|
|
|
|
.padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 42.dp) |
|
|
|
|
.testTag(TestTags.richTextEditor), |
|
|
|
|
contentAlignment = Alignment.CenterStart, |
|
|
|
|
) { |
|
|
|
@ -429,7 +423,7 @@ private fun TextInput(
@@ -429,7 +423,7 @@ private fun TextInput(
|
|
|
|
|
// This prevents it gaining focus and mutating the state. |
|
|
|
|
registerStateUpdates = !subcomposing, |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding(top = 6.dp.applyScaleUp(), bottom = 6.dp.applyScaleUp()) |
|
|
|
|
.padding(top = 6.dp, bottom = 6.dp) |
|
|
|
|
.fillMaxWidth(), |
|
|
|
|
style = ElementRichTextEditorStyle.create( |
|
|
|
|
hasFocus = state.hasFocus |
|
|
|
@ -481,7 +475,7 @@ private fun EditingModeView(
@@ -481,7 +475,7 @@ private fun EditingModeView(
|
|
|
|
|
tint = ElementTheme.materialColors.secondary, |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding(vertical = 8.dp) |
|
|
|
|
.size(16.dp.applyScaleUp()), |
|
|
|
|
.size(16.dp), |
|
|
|
|
) |
|
|
|
|
Text( |
|
|
|
|
stringResource(CommonStrings.common_editing), |
|
|
|
@ -498,7 +492,7 @@ private fun EditingModeView(
@@ -498,7 +492,7 @@ private fun EditingModeView(
|
|
|
|
|
tint = ElementTheme.materialColors.secondary, |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding(top = 8.dp, bottom = 8.dp, start = 16.dp, end = 12.dp) |
|
|
|
|
.size(16.dp.applyScaleUp()) |
|
|
|
|
.size(16.dp) |
|
|
|
|
.clickable( |
|
|
|
|
enabled = true, |
|
|
|
|
onClick = onResetComposerMode, |
|
|
|
@ -561,7 +555,7 @@ private fun ReplyToModeView(
@@ -561,7 +555,7 @@ private fun ReplyToModeView(
|
|
|
|
|
tint = MaterialTheme.colorScheme.secondary, |
|
|
|
|
modifier = Modifier |
|
|
|
|
.padding(end = 4.dp, top = 4.dp, start = 16.dp, bottom = 16.dp) |
|
|
|
|
.size(16.dp.applyScaleUp()) |
|
|
|
|
.size(16.dp) |
|
|
|
|
.clickable( |
|
|
|
|
enabled = true, |
|
|
|
|
onClick = onResetComposerMode, |
|
|
|
|