,
+ fontSize: Float
+ ): AnnotatedString {
+ if (source.length == 0) return renderedText
+
+ return buildAnnotatedString {
+ append(renderedText)
+
+ source.getStringAnnotations(LATEX_TAG, 0, source.length).forEach { annotation ->
+ val start = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.start,
+ displayTextLength = renderedText.length
+ )
+ val end = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.end,
+ displayTextLength = renderedText.length
+ )
+ if (start >= end) return@forEach
+
+ val isBlock = annotation.item == "block"
+ addStyle(
+ androidx.compose.ui.text.SpanStyle(
+ fontFamily = FontFamily.Monospace,
+ color = previewPrimaryColor,
+ background = previewPrimaryColor.copy(alpha = if (isBlock) 0.16f else 0.12f),
+ fontSize = if (isBlock) (fontSize * 1.08f).sp else androidx.compose.ui.unit.TextUnit.Unspecified
+ ),
+ start,
+ end
+ )
+ if (isBlock) {
+ addStyle(
+ ParagraphStyle(textAlign = TextAlign.Center),
+ start,
+ end
+ )
+ }
+ }
+
+ source.getStringAnnotations(EDITOR_HEADING_TAG, 0, source.length)
+ .forEach { annotation ->
+ val start = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.start,
+ displayTextLength = renderedText.length
+ )
+ val end = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.end,
+ displayTextLength = renderedText.length
+ )
+ if (start >= end) return@forEach
+
+ val level = annotation.item.toIntOrNull()?.coerceIn(1, 3) ?: 1
+ addStyle(
+ androidx.compose.ui.text.SpanStyle(
+ fontWeight = FontWeight.Bold,
+ color = previewPrimaryColor,
+ fontSize = when (level) {
+ 1 -> (fontSize * 1.48f).sp
+ 2 -> (fontSize * 1.28f).sp
+ else -> (fontSize * 1.12f).sp
+ }
+ ),
+ start,
+ end
+ )
+ }
+
+ source.getStringAnnotations(EDITOR_DIVIDER_TAG, 0, source.length)
+ .forEach { annotation ->
+ val start = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.start,
+ displayTextLength = renderedText.length
+ )
+ val end = previewRawOffsetToDisplayOffset(
+ rawText = rawText,
+ entities = entities,
+ rawOffset = annotation.end,
+ displayTextLength = renderedText.length
+ )
+ if (start >= end) return@forEach
+
+ addStyle(
+ androidx.compose.ui.text.SpanStyle(
+ color = previewPrimaryColor.copy(alpha = 0.7f)
+ ),
+ start,
+ end
+ )
+ addStyle(
+ ParagraphStyle(textAlign = TextAlign.Center),
+ start,
+ end
+ )
+ }
+ }
+ }
+
fun buildPreviewForDisplay(source: AnnotatedString): AnnotatedString {
val previewAnnotated = buildEditorPreviewAnnotatedString(
source = source,
@@ -360,15 +505,18 @@ fun FullScreenEditorSheet(
}
}
- val previewText = remember(
- textValue.annotatedString,
- knownCustomEmojis.size,
- knownCustomEmojis.hashCode(),
- previewPrimaryColor,
- emojiFontFamily
- ) {
- buildPreviewForDisplay(textValue.annotatedString)
+ val displayTextValue = remember(textValue, parseMode) {
+ applyEditorFormatting(textValue, parseMode)
}
+ LaunchedEffect(displayTextValue.annotatedString) {
+ previewRevealedSpoilers.clear()
+ }
+ val displayMessageLength = displayTextValue.text.length
+ val isDisplayOverMessageLimit = displayMessageLength > maxMessageLength
+ val wordCount = remember(displayTextValue.text) {
+ Regex("\\S+").findAll(displayTextValue.text).count()
+ }
+ val readingMinutes = remember(wordCount) { ((wordCount + 179) / 180).coerceAtLeast(1) }
fun applyEditorChange(newValue: TextFieldValue, trackHistory: Boolean = true) {
if (newValue == textValue) return
@@ -393,8 +541,42 @@ fun FullScreenEditorSheet(
)
}
- val entities = remember(textValue.annotatedString, knownCustomEmojis.size) {
- extractEntities(textValue.annotatedString, knownCustomEmojis)
+ val entities = remember(
+ displayTextValue.annotatedString,
+ knownCustomEmojis.size,
+ knownCustomEmojis.hashCode()
+ ) {
+ extractEntities(displayTextValue.annotatedString, knownCustomEmojis)
+ }
+ val previewFontSize =
+ MaterialTheme.typography.bodyLarge.fontSize.value * fontScale.coerceIn(0.8f, 1.6f)
+ val previewCustomEmojiPaths = remember(knownCustomEmojis.size, knownCustomEmojis.hashCode()) {
+ knownCustomEmojis.mapValues { (_, sticker) -> sticker.path }
+ }
+ val previewRenderData = rememberMessageTextRenderData(
+ text = displayTextValue.text,
+ entities = entities,
+ fontSize = previewFontSize,
+ isOutgoing = false,
+ revealedSpoilers = previewRevealedSpoilers,
+ emojiFontFamily = emojiFontFamily,
+ customEmojiPaths = previewCustomEmojiPaths
+ )
+ val previewMessageText = remember(
+ previewRenderData.annotatedText,
+ displayTextValue.annotatedString,
+ displayTextValue.text,
+ entities,
+ previewFontSize,
+ previewPrimaryColor
+ ) {
+ buildMessagePreviewText(
+ renderedText = previewRenderData.annotatedText,
+ source = displayTextValue.annotatedString,
+ rawText = displayTextValue.text,
+ entities = entities,
+ fontSize = previewFontSize
+ )
}
val richEntityCount = remember(entities) { entities.count { richEntityToAnnotation(it.type) != null } }
val hasSelection = hasFormattableSelection(textValue)
@@ -415,11 +597,18 @@ fun FullScreenEditorSheet(
aiResultText = buildPreviewForDisplay(mappedTextValue.annotatedString)
}
- fun runAiRequest(request: suspend () -> FormattedTextResult?) {
- if (textValue.text.isBlank()) {
+ fun runAiRequest(
+ requireText: Boolean = true,
+ request: suspend () -> FormattedTextResult?
+ ) {
+ if (requireText && textValue.text.isBlank()) {
aiErrorMessage = context.getString(R.string.editor_ai_error_empty)
return
}
+ if (!requireText && aiPrompt.isBlank()) {
+ aiErrorMessage = context.getString(R.string.editor_ai_error_empty_prompt)
+ return
+ }
aiScope.launch {
aiLoading = true
@@ -453,6 +642,7 @@ fun FullScreenEditorSheet(
undoStack.clear()
redoStack.clear()
showAutoSaved = false
+ parseMode = initialParseMode
aiErrorMessage = null
aiShowDiffMode = true
aiResultText = null
@@ -478,12 +668,17 @@ fun FullScreenEditorSheet(
showAutoSaved = false
}
- val onSendClick: () -> Unit = {
- val outgoingValue = if (markdownMode) applyMarkdownFormatting(textValue) else textValue
- if (outgoingValue != textValue) {
- onTextValueChange(outgoingValue)
+ val onSendClick: () -> Unit = send@{
+ if (isSending) return@send
+
+ fun sendResolvedValue(outgoingValue: TextFieldValue) {
+ if (outgoingValue != textValue) {
+ onTextValueChange(outgoingValue)
+ }
+ onSend(outgoingValue, parseMode)
}
- onSend()
+
+ sendResolvedValue(textValue)
}
Dialog(
@@ -502,15 +697,12 @@ fun FullScreenEditorSheet(
.padding(16.dp)
.imePadding()
) {
- FullScreenEditorHeader(isOverMessageLimit, onDismiss, onSendClick)
- FullScreenEditorTopActions(
+ FullScreenEditorHeader(
+ isOverLimit = isDisplayOverMessageLimit,
+ isSending = isSending,
canUndo = undoStack.isNotEmpty(),
canRedo = redoStack.isNotEmpty(),
- isPreviewMode = isPreviewMode,
- markdownMode = markdownMode,
- showFindReplace = showFindReplace,
- fontScale = fontScale,
- showAiAction = canUseAi,
+ onDismiss = onDismiss,
onUndo = {
if (undoStack.isNotEmpty()) {
val previous = undoStack.removeAt(undoStack.lastIndex)
@@ -525,8 +717,16 @@ fun FullScreenEditorSheet(
onTextValueChange(next)
}
},
+ onSend = onSendClick
+ )
+ FullScreenEditorTopActions(
+ isPreviewMode = isPreviewMode,
+ parseMode = parseMode,
+ showFindReplace = showFindReplace,
+ fontScale = fontScale,
+ showAiAction = canUseAi,
onTogglePreview = { isPreviewMode = !isPreviewMode },
- onToggleMarkdown = { markdownMode = !markdownMode },
+ onParseModeChange = { parseMode = it },
onToggleFindReplace = { showFindReplace = !showFindReplace },
onTemplatesClick = { showTemplatesSheet = true },
onAiClick = {
@@ -568,6 +768,8 @@ fun FullScreenEditorSheet(
)
}
+ Spacer(modifier = Modifier.height(if (showFindReplace) 14.dp else 10.dp))
+
Row(
modifier = Modifier
.fillMaxWidth()
@@ -575,11 +777,17 @@ fun FullScreenEditorSheet(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
FullScreenEditorMetaPill(
- text = stringResource(R.string.message_length_counter, currentMessageLength, maxMessageLength),
- color = if (isOverMessageLimit) MaterialTheme.colorScheme.error.copy(alpha = 0.22f) else MaterialTheme.colorScheme.primary.copy(
+ text = stringResource(
+ R.string.message_length_counter,
+ displayMessageLength,
+ maxMessageLength
+ ),
+ color = if (isDisplayOverMessageLimit) MaterialTheme.colorScheme.error.copy(
+ alpha = 0.22f
+ ) else MaterialTheme.colorScheme.primary.copy(
alpha = 0.2f
),
- contentColor = if (isOverMessageLimit) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary
+ contentColor = if (isDisplayOverMessageLimit) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary
)
FullScreenEditorMetaPill(
text = stringResource(R.string.fullscreen_editor_blocks, richEntityCount),
@@ -606,17 +814,40 @@ fun FullScreenEditorSheet(
color = MaterialTheme.colorScheme.surfaceContainerHigh
) {
if (isPreviewMode) {
- Text(
- text = previewText,
- inlineContent = previewInlineContent,
- style = MaterialTheme.typography.bodyLarge.copy(
- fontSize = MaterialTheme.typography.bodyLarge.fontSize * fontScale.coerceIn(0.8f, 1.6f)
- ),
- color = MaterialTheme.colorScheme.onSurface,
+ val previewTextStyle = MaterialTheme.typography.bodyLarge.copy(
+ fontSize = if (previewRenderData.isBigEmoji) (previewFontSize * 5f).sp else previewFontSize.sp,
+ lineHeight = if (previewRenderData.isBigEmoji) (previewFontSize * 5.5f).sp else (previewFontSize * 1.1f).sp
+ )
+ Box(
modifier = Modifier
.fillMaxSize()
.padding(horizontal = 16.dp, vertical = 12.dp)
- )
+ .verticalScroll(rememberScrollState())
+ ) {
+ if (previewRenderData.isBigEmoji && previewRenderData.bigEmojiItems.isNotEmpty()) {
+ BigEmojiContent(
+ items = previewRenderData.bigEmojiItems,
+ sizeDp = previewFontSize * 5f,
+ emojiFontFamily = emojiFontFamily
+ )
+ } else {
+ MessageText(
+ text = previewMessageText,
+ rawText = displayTextValue.text,
+ inlineContent = previewRenderData.inlineContent,
+ entities = entities,
+ style = previewTextStyle,
+ color = MaterialTheme.colorScheme.onSurface,
+ onSpoilerClick = { spoilerKey ->
+ if (previewRevealedSpoilers.contains(spoilerKey)) {
+ previewRevealedSpoilers.remove(spoilerKey)
+ } else {
+ previewRevealedSpoilers.add(spoilerKey)
+ }
+ }
+ )
+ }
+ }
} else {
InputTextField(
textValue = textValue,
@@ -644,7 +875,7 @@ fun FullScreenEditorSheet(
}
}
Spacer(modifier = Modifier.height(10.dp))
- AnimatedVisibility(visible = !isPreviewMode) {
+ AnimatedVisibility(visible = !isPreviewMode && parseMode == EditorParseMode.Plain) {
FullScreenEditorTools(
hasSelection = hasSelection,
canCopy = hasTextSelection,
@@ -691,6 +922,245 @@ fun FullScreenEditorSheet(
onEmoji = { showEmojiPicker = true }
)
}
+ AnimatedVisibility(visible = !isPreviewMode && parseMode != EditorParseMode.Plain) {
+ FullScreenEditorMarkupTools(
+ mode = parseMode,
+ canCopy = hasTextSelection,
+ canCut = canWriteText && hasTextSelection,
+ canPaste = canPasteFromClipboard,
+ onCopy = {
+ selectedTextOrNull(textValue)?.let { selectedText ->
+ nativeClipboard.setPrimaryClip(
+ ClipData.newPlainText(
+ "",
+ selectedText
+ )
+ )
+ }
+ },
+ onCut = {
+ selectedTextOrNull(textValue)?.let { selectedText ->
+ nativeClipboard.setPrimaryClip(
+ ClipData.newPlainText(
+ "",
+ selectedText
+ )
+ )
+ applyEditorChange(replaceSelection(textValue, ""))
+ }
+ },
+ onPaste = {
+ val clipboardText =
+ nativeClipboard.primaryClip?.takeIf { it.itemCount > 0 }
+ ?.getItemAt(0)
+ ?.coerceToText(context)
+ ?.toString()
+ .orEmpty()
+ if (clipboardText.isNotEmpty()) {
+ applyEditorChange(replaceSelection(textValue, clipboardText))
+ }
+ },
+ onBold = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "**",
+ "**"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onItalic = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "_",
+ "_"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onUnderline = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "__",
+ "__"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onStrike = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "~~",
+ "~~"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onSpoiler = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "||",
+ "||"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onCode = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "`",
+ "`"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ ""
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onLink = {
+ linkValue = currentTextUrl(textValue) ?: "https://"
+ showLinkDialog = true
+ },
+ onQuote = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> prefixSelectionLines(
+ textValue,
+ "> "
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ "
"
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onPre = {
+ languageValue = ""
+ showLanguageDialog = true
+ },
+ onLatex = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> wrapSelectionWith(
+ textValue,
+ "$",
+ "$",
+ "x^2 + y^2 = z^2"
+ )
+
+ EditorParseMode.Html -> wrapSelectionWith(
+ textValue,
+ "",
+ "",
+ "x^2 + y^2 = z^2"
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onBlockLatex = {
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Markdown -> replaceSelection(
+ textValue,
+ "\n$$\nx^2 + y^2 = z^2\n$$\n"
+ )
+
+ EditorParseMode.Html -> replaceSelection(
+ textValue,
+ "\nx^2 + y^2 = z^2\n"
+ )
+
+ EditorParseMode.Plain -> textValue
+ }
+ )
+ },
+ onHeading1 = {
+ applyEditorChange(applyMarkupHeading(textValue, parseMode, 1))
+ },
+ onHeading2 = {
+ applyEditorChange(applyMarkupHeading(textValue, parseMode, 2))
+ },
+ onHeading3 = {
+ applyEditorChange(applyMarkupHeading(textValue, parseMode, 3))
+ },
+ onBulletList = {
+ applyEditorChange(applyMarkupBulletList(textValue, parseMode))
+ },
+ onNumberedList = {
+ applyEditorChange(applyMarkupNumberedList(textValue, parseMode))
+ },
+ onDivider = {
+ applyEditorChange(applyMarkupDivider(textValue, parseMode))
+ },
+ onTable = {
+ applyEditorChange(applyMarkupTable(textValue, parseMode))
+ }
+ )
+ }
AnimatedVisibility(visible = showAutoSaved) {
Text(
text = stringResource(R.string.editor_autosave_done),
@@ -734,7 +1204,13 @@ fun FullScreenEditorSheet(
confirmButton = {
TextButton(onClick = {
normalizeEditorUrl(linkValue)?.let {
- applyEditorChange(applyTextUrlEntity(textValue, it))
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Plain -> applyTextUrlEntity(textValue, it)
+ EditorParseMode.Markdown -> applyMarkdownLink(textValue, it)
+ EditorParseMode.Html -> applyHtmlLink(textValue, it)
+ }
+ )
}
showLinkDialog = false
}) { Text(text = stringResource(R.string.action_apply)) }
@@ -763,7 +1239,13 @@ fun FullScreenEditorSheet(
},
confirmButton = {
TextButton(onClick = {
- applyEditorChange(applyPreEntity(textValue, languageValue))
+ applyEditorChange(
+ when (parseMode) {
+ EditorParseMode.Plain -> applyPreEntity(textValue, languageValue)
+ EditorParseMode.Markdown -> applyMarkdownPre(textValue, languageValue)
+ EditorParseMode.Html -> applyHtmlPre(textValue, languageValue)
+ }
+ )
showLanguageDialog = false
}) { Text(text = stringResource(R.string.action_apply)) }
},
@@ -794,7 +1276,7 @@ fun FullScreenEditorSheet(
}
if (showAiSheet) {
- FullScreenEditorAiSheet(
+ FullScreenEditorAiSheetContent(
visible = showAiSheet,
mode = aiMode,
loading = aiLoading,
@@ -803,6 +1285,7 @@ fun FullScreenEditorSheet(
stickerRepository = stickerRepository,
selectedStyleName = aiSelectedStyle,
translateLanguage = aiTranslateLanguage,
+ prompt = aiPrompt,
addEmojis = aiAddEmojis,
emojiFontFamily = emojiFontFamily,
inlineContent = previewInlineContent,
@@ -810,6 +1293,7 @@ fun FullScreenEditorSheet(
resultText = aiResultText,
resultPlainText = aiResultTextValue?.text,
showDiffMode = aiShowDiffMode,
+ supportsPromptBasedAi = supportsPromptBasedAi,
onDismiss = {
showAiSheet = false
aiErrorMessage = null
@@ -839,6 +1323,13 @@ fun FullScreenEditorSheet(
aiResultText = null
aiResultTextValue = null
},
+ onPromptChange = {
+ aiPrompt = it
+ aiErrorMessage = null
+ aiShowDiffMode = true
+ aiResultText = null
+ aiResultTextValue = null
+ },
onAddEmojisChange = {
aiAddEmojis = it
aiErrorMessage = null
@@ -870,6 +1361,14 @@ fun FullScreenEditorSheet(
)
}
+ AiEditorMode.Generate -> runAiRequest(requireText = false) {
+ messageRepository.generateTextWithAi(
+ prompt = aiPrompt.trim(),
+ languageCode = aiTranslateLanguage.ifBlank { Locale.getDefault().language },
+ addEmojis = aiAddEmojis
+ )
+ }
+
AiEditorMode.Fix -> runAiRequest {
messageRepository.fixTextWithAi(
text = textValue.text,
@@ -933,114 +1432,6 @@ private fun FullScreenEditorSystemBars() {
}
}
-@Composable
-private fun FullScreenEditorHeader(isOverLimit: Boolean, onDismiss: () -> Unit, onSend: () -> Unit) {
- Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
- IconButton(onClick = onDismiss) {
- Icon(
- Icons.AutoMirrored.Filled.ArrowBack,
- contentDescription = stringResource(R.string.action_cancel),
- tint = MaterialTheme.colorScheme.primary
- )
- }
- Text(
- text = stringResource(R.string.fullscreen_editor_title),
- style = MaterialTheme.typography.headlineSmall,
- textAlign = TextAlign.Center,
- modifier = Modifier.weight(1f)
- )
- IconButton(onClick = onSend, enabled = !isOverLimit) {
- Icon(
- imageVector = Icons.Filled.Check,
- contentDescription = stringResource(R.string.action_send),
- tint = if (isOverLimit) MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.4f) else MaterialTheme.colorScheme.primary
- )
- }
- }
-}
-
-@Composable
-private fun FullScreenEditorTopActions(
- canUndo: Boolean,
- canRedo: Boolean,
- isPreviewMode: Boolean,
- markdownMode: Boolean,
- showFindReplace: Boolean,
- fontScale: Float,
- showAiAction: Boolean,
- onUndo: () -> Unit,
- onRedo: () -> Unit,
- onTogglePreview: () -> Unit,
- onToggleMarkdown: () -> Unit,
- onToggleFindReplace: () -> Unit,
- onTemplatesClick: () -> Unit,
- onAiClick: () -> Unit,
- onZoomOut: () -> Unit,
- onZoomIn: () -> Unit
-) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .horizontalScroll(rememberScrollState())
- .padding(bottom = 8.dp),
- horizontalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- TextButton(onClick = onUndo, enabled = canUndo) {
- Text(text = stringResource(R.string.editor_undo))
- }
- TextButton(onClick = onRedo, enabled = canRedo) {
- Text(text = stringResource(R.string.editor_redo))
- }
- if (showAiAction) {
- TextButton(onClick = onAiClick) {
- Icon(
- imageVector = Icons.Outlined.AutoAwesome,
- contentDescription = null,
- modifier = Modifier.size(18.dp)
- )
- Spacer(modifier = Modifier.width(4.dp))
- Text(text = stringResource(R.string.editor_ai))
- }
- }
- TextButton(onClick = onTogglePreview) {
- Text(
- text = if (isPreviewMode) {
- stringResource(R.string.editor_mode_edit)
- } else {
- stringResource(R.string.editor_mode_preview)
- }
- )
- }
- TextButton(onClick = onToggleMarkdown) {
- Text(
- text = if (markdownMode) {
- stringResource(R.string.editor_markdown_on)
- } else {
- stringResource(R.string.editor_markdown_off)
- }
- )
- }
- TextButton(onClick = onToggleFindReplace) {
- Text(
- text = if (showFindReplace) {
- stringResource(R.string.action_close)
- } else {
- stringResource(R.string.editor_find)
- }
- )
- }
- TextButton(onClick = onTemplatesClick) {
- Text(text = stringResource(R.string.editor_templates))
- }
- TextButton(onClick = onZoomOut, enabled = fontScale > 0.8f) {
- Text(text = stringResource(R.string.editor_zoom_out))
- }
- TextButton(onClick = onZoomIn, enabled = fontScale < 1.6f) {
- Text(text = stringResource(R.string.editor_zoom_in))
- }
- }
-}
-
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun FullScreenEditorAiSheet(
@@ -1080,6 +1471,7 @@ private fun FullScreenEditorAiSheet(
val runButtonText = when (mode) {
AiEditorMode.Translate -> stringResource(R.string.editor_ai_run_translate)
AiEditorMode.Stylize -> stringResource(R.string.editor_ai_run_stylize)
+ AiEditorMode.Generate -> stringResource(R.string.editor_ai_run_generate)
AiEditorMode.Fix -> stringResource(R.string.editor_ai_run_fix)
}
val sectionTitleStyle = MaterialTheme.typography.labelLarge
@@ -1131,7 +1523,7 @@ private fun FullScreenEditorAiSheet(
}
val actionButtonText = if (resultText != null) stringResource(R.string.editor_ai_apply_result) else runButtonText
val languageOptions = remember { buildAiLanguageOptions() }
- val fallbackLanguageCode = Locale.getDefault().language.ifBlank { "en" }
+ val fallbackLanguageCode = LocalLocale.current.platformLocale.language.ifBlank { "en" }
val selectedLanguageCode = translateLanguage.ifBlank { fallbackLanguageCode }
val selectedLanguage = languageOptions.firstOrNull { it.code == selectedLanguageCode }
var languageMenuExpanded by remember { mutableStateOf(false) }
@@ -1368,6 +1760,7 @@ private fun FullScreenEditorAiSheet(
}
}
+ AiEditorMode.Generate -> Unit
AiEditorMode.Fix -> Unit
}
}
@@ -1635,268 +2028,3 @@ private fun AiStyleChip(
}
}
-@Composable
-private fun FullScreenEditorMetaPill(text: String, color: Color, contentColor: Color) {
- Surface(color = color, shape = RoundedCornerShape(999.dp)) {
- Text(
- text = text,
- color = contentColor,
- style = MaterialTheme.typography.labelMedium,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp)
- )
- }
-}
-
-@Composable
-private fun FullScreenEditorToolButton(icon: ImageVector, hint: String, enabled: Boolean = true, onClick: () -> Unit) {
- val context = LocalContext.current
- Box(
- modifier = Modifier
- .clip(RoundedCornerShape(16.dp))
- .combinedClickable(
- enabled = enabled,
- onClick = onClick,
- onLongClick = { Toast.makeText(context, hint, Toast.LENGTH_SHORT).show() })
- .padding(horizontal = 10.dp, vertical = 8.dp),
- contentAlignment = Alignment.Center
- ) {
- Icon(
- icon,
- contentDescription = hint,
- tint = if (enabled) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.onSurfaceVariant.copy(
- alpha = 0.38f
- )
- )
- }
-}
-
-@Composable
-private fun FullScreenEditorTools(
- hasSelection: Boolean,
- canCopy: Boolean,
- canCut: Boolean,
- canPaste: Boolean,
- onCopy: () -> Unit,
- onCut: () -> Unit,
- onPaste: () -> Unit,
- onBold: () -> Unit,
- onItalic: () -> Unit,
- onUnderline: () -> Unit,
- onStrike: () -> Unit,
- onSpoiler: () -> Unit,
- onCode: () -> Unit,
- onLink: () -> Unit,
- onMention: () -> Unit,
- onPre: () -> Unit,
- onClear: () -> Unit,
- onEmoji: () -> Unit
-) {
- Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
- Surface(
- modifier = Modifier
- .weight(1f)
- .height(58.dp),
- shape = RoundedCornerShape(32.dp),
- color = MaterialTheme.colorScheme.surfaceContainerHighest
- ) {
- Row(
- modifier = Modifier
- .fillMaxSize()
- .horizontalScroll(rememberScrollState())
- .padding(horizontal = 8.dp),
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(2.dp)
- ) {
- FullScreenEditorToolButton(
- Icons.Outlined.ContentCopy,
- stringResource(R.string.editor_action_copy),
- canCopy,
- onCopy
- )
- FullScreenEditorToolButton(
- Icons.Outlined.ContentCut,
- stringResource(R.string.editor_action_cut),
- canCut,
- onCut
- )
- FullScreenEditorToolButton(
- Icons.Outlined.ContentPaste,
- stringResource(R.string.editor_action_paste),
- canPaste,
- onPaste
- )
- FullScreenEditorToolButton(
- Icons.Outlined.FormatBold,
- stringResource(R.string.rich_text_bold),
- hasSelection,
- onBold
- )
- FullScreenEditorToolButton(
- Icons.Outlined.FormatItalic,
- stringResource(R.string.rich_text_italic),
- hasSelection,
- onItalic
- )
- FullScreenEditorToolButton(
- Icons.Outlined.FormatUnderlined,
- stringResource(R.string.rich_text_underline),
- hasSelection,
- onUnderline
- )
- FullScreenEditorToolButton(
- Icons.Outlined.FormatStrikethrough,
- stringResource(R.string.rich_text_strikethrough),
- hasSelection,
- onStrike
- )
- FullScreenEditorToolButton(
- Icons.Outlined.VisibilityOff,
- stringResource(R.string.rich_text_spoiler),
- hasSelection,
- onSpoiler
- )
- FullScreenEditorToolButton(
- Icons.Outlined.Code,
- stringResource(R.string.rich_text_code),
- hasSelection,
- onCode
- )
- FullScreenEditorToolButton(
- Icons.Outlined.Link,
- stringResource(R.string.rich_text_link),
- hasSelection,
- onLink
- )
- FullScreenEditorToolButton(
- Icons.Outlined.AlternateEmail,
- stringResource(R.string.rich_text_mention),
- true,
- onMention
- )
- FullScreenEditorToolButton(
- Icons.AutoMirrored.Outlined.Subject,
- stringResource(R.string.rich_text_pre),
- hasSelection,
- onPre
- )
- FullScreenEditorToolButton(
- Icons.Outlined.FormatClear,
- stringResource(R.string.rich_text_clear),
- hasSelection,
- onClear
- )
- }
- }
- Spacer(modifier = Modifier.width(10.dp))
- Surface(
- modifier = Modifier.size(58.dp),
- shape = CircleShape,
- color = MaterialTheme.colorScheme.surfaceContainerHighest
- ) {
- IconButton(onClick = onEmoji) {
- Text(
- text = "☺",
- style = MaterialTheme.typography.headlineSmall,
- color = MaterialTheme.colorScheme.primary
- )
- }
- }
- }
-}
-
-private fun currentTextUrl(value: TextFieldValue): String? {
- val range = normalizedSelection(value.selection) ?: return null
- return value.annotatedString.getStringAnnotations(RICH_ENTITY_TAG, range.start, range.end)
- .firstOrNull { decodeRichEntity(it.item) is MessageEntityType.TextUrl }
- ?.let { decodeRichEntity(it.item) as? MessageEntityType.TextUrl }
- ?.url
-}
-
-private fun currentPreLanguage(value: TextFieldValue): String {
- val range = normalizedSelection(value.selection) ?: return ""
- return value.annotatedString.getStringAnnotations(RICH_ENTITY_TAG, range.start, range.end)
- .firstOrNull { decodeRichEntity(it.item) is MessageEntityType.Pre }
- ?.let { decodeRichEntity(it.item) as? MessageEntityType.Pre }
- ?.language
- .orEmpty()
-}
-
-private fun selectedTextOrNull(value: TextFieldValue): String? {
- val selection = normalizedSelection(value.selection) ?: return null
- return value.text.substring(selection.start, selection.end)
-}
-
-private fun replaceSelection(value: TextFieldValue, replacement: String): TextFieldValue {
- val rawSelection = if (value.selection.start <= value.selection.end) {
- value.selection
- } else {
- TextRange(value.selection.end, value.selection.start)
- }
- val maxLength = value.annotatedString.length
- val selection = TextRange(
- start = rawSelection.start.coerceIn(0, maxLength),
- end = rawSelection.end.coerceIn(0, maxLength)
- )
- val newAnnotated = buildAnnotatedString {
- append(value.annotatedString.subSequence(0, selection.start))
- append(replacement)
- append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
- }
- val cursor = selection.start + replacement.length
- return value.copy(annotatedString = newAnnotated, selection = TextRange(cursor, cursor))
-}
-
-private fun insertSnippetAtSelection(value: TextFieldValue, snippet: String): TextFieldValue {
- if (snippet.isBlank()) return value
- val rawSelection = if (value.selection.start <= value.selection.end) {
- value.selection
- } else {
- TextRange(value.selection.end, value.selection.start)
- }
- val maxLength = value.annotatedString.length
- val selection = TextRange(
- start = rawSelection.start.coerceIn(0, maxLength),
- end = rawSelection.end.coerceIn(0, maxLength)
- )
- val newAnnotated = buildAnnotatedString {
- append(value.annotatedString.subSequence(0, selection.start))
- append(snippet)
- append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
- }
- val cursor = selection.start + snippet.length
- return value.copy(annotatedString = newAnnotated, selection = TextRange(cursor, cursor))
-}
-
-private fun normalizedSelection(selection: TextRange): TextRange? {
- if (selection.start == selection.end) return null
- return if (selection.start <= selection.end) selection else TextRange(selection.end, selection.start)
-}
-
-private fun normalizeEditorUrl(raw: String): String? {
- val trimmed = raw.trim()
- if (trimmed.isEmpty()) return null
- return if (trimmed.contains("://")) trimmed else "https://$trimmed"
-}
-
-private fun insertMentionAtSelection(value: TextFieldValue): TextFieldValue {
- val rawSelection = if (value.selection.start <= value.selection.end) value.selection else TextRange(
- value.selection.end,
- value.selection.start
- )
- val maxLength = value.annotatedString.length
- val selection = TextRange(
- start = rawSelection.start.coerceIn(0, maxLength),
- end = rawSelection.end.coerceIn(0, maxLength)
- )
- val insertion =
- if (selection.start == selection.end) "@" else "@${value.text.substring(selection.start, selection.end)}"
- val newAnnotated = buildAnnotatedString {
- append(value.annotatedString.subSequence(0, selection.start))
- append(insertion)
- append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
- }
- val newCursor = selection.start + insertion.length
- return value.copy(annotatedString = newAnnotated, selection = TextRange(newCursor, newCursor))
-}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTemplatesSheet.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTemplatesSheet.kt
index 688a2a16c..9e2b187dd 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTemplatesSheet.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTemplatesSheet.kt
@@ -1,14 +1,44 @@
package org.monogram.presentation.features.chats.conversation.ui.inputbar
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
+import androidx.compose.material.icons.outlined.ContentCopy
import androidx.compose.material.icons.outlined.Edit
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.BottomSheetDefaults
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
@@ -30,10 +60,14 @@ fun FullScreenEditorTemplatesSheet(
onDeleteSnippet: (EditorSnippet) -> Unit
) {
if (!visible) return
+
var customTitle by rememberSaveable { mutableStateOf("") }
ModalBottomSheet(
onDismissRequest = onDismiss,
+ dragHandle = { BottomSheetDefaults.DragHandle() },
+ containerColor = MaterialTheme.colorScheme.background,
+ contentColor = MaterialTheme.colorScheme.onSurface,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp)
) {
@@ -41,92 +75,159 @@ fun FullScreenEditorTemplatesSheet(
modifier = Modifier
.fillMaxWidth()
.navigationBarsPadding()
- .padding(horizontal = 16.dp, vertical = 8.dp),
- verticalArrangement = Arrangement.spacedBy(10.dp)
+ .padding(horizontal = 16.dp, vertical = 10.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
) {
- Text(
- text = stringResource(R.string.editor_templates),
- style = MaterialTheme.typography.titleMedium
- )
-
- SettingsTextField(
- value = customTitle,
- onValueChange = { customTitle = it },
- placeholder = stringResource(R.string.editor_snippet_title_hint),
- icon = Icons.Outlined.Edit,
- position = ItemPosition.STANDALONE,
- singleLine = true,
- )
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = MaterialTheme.colorScheme.surfaceContainer,
+ shape = RoundedCornerShape(28.dp)
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Surface(
+ shape = CircleShape,
+ color = MaterialTheme.colorScheme.primaryContainer
+ ) {
+ Box(
+ modifier = Modifier.size(40.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ Icon(
+ imageVector = Icons.Outlined.Edit,
+ contentDescription = null,
+ tint = MaterialTheme.colorScheme.onPrimaryContainer
+ )
+ }
+ }
- Button(
- onClick = {
- val generated = customTitle.ifBlank {
- currentText
- .lineSequence()
- .firstOrNull { it.isNotBlank() }
- ?.take(32)
- .orEmpty()
+ Column(
+ modifier = Modifier
+ .weight(1f)
+ .padding(start = 12.dp)
+ ) {
+ Text(
+ text = stringResource(R.string.editor_templates),
+ style = MaterialTheme.typography.titleMedium
+ )
+ Text(
+ text = stringResource(
+ R.string.scheduled_messages_summary_count,
+ snippets.size
+ ),
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
}
- if (currentText.isNotBlank() && generated.isNotBlank()) {
- onSaveCurrentAsSnippet(generated)
- customTitle = ""
+
+ IconButton(onClick = onDismiss) {
+ Icon(
+ imageVector = Icons.Outlined.Close,
+ contentDescription = stringResource(R.string.action_close)
+ )
}
- },
- enabled = currentText.isNotBlank(),
- modifier = Modifier.fillMaxWidth()
+ }
+ }
+
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = MaterialTheme.colorScheme.surfaceContainer,
+ shape = RoundedCornerShape(24.dp)
) {
- Text(text = stringResource(R.string.editor_save_as_snippet))
+ Column(
+ modifier = Modifier.padding(12.dp),
+ verticalArrangement = Arrangement.spacedBy(10.dp)
+ ) {
+ Text(
+ text = stringResource(R.string.editor_save_as_snippet),
+ style = MaterialTheme.typography.labelLarge,
+ color = MaterialTheme.colorScheme.primary
+ )
+
+ SettingsTextField(
+ value = customTitle,
+ onValueChange = { customTitle = it },
+ placeholder = stringResource(R.string.editor_snippet_title_hint),
+ icon = Icons.Outlined.Edit,
+ position = ItemPosition.STANDALONE,
+ singleLine = true,
+ containerColor = MaterialTheme.colorScheme.surfaceContainerHigh
+ )
+
+ Button(
+ onClick = {
+ val generated = customTitle.ifBlank {
+ currentText
+ .lineSequence()
+ .firstOrNull { it.isNotBlank() }
+ ?.take(32)
+ .orEmpty()
+ }
+ if (currentText.isNotBlank() && generated.isNotBlank()) {
+ onSaveCurrentAsSnippet(generated)
+ customTitle = ""
+ }
+ },
+ enabled = currentText.isNotBlank(),
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(52.dp),
+ shape = RoundedCornerShape(16.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Outlined.ContentCopy,
+ contentDescription = null
+ )
+ Spacer(modifier = Modifier.size(8.dp))
+ Text(text = stringResource(R.string.editor_save_as_snippet))
+ }
+ }
}
if (snippets.isEmpty()) {
Surface(
modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.surfaceContainer,
- shape = RoundedCornerShape(14.dp)
+ shape = RoundedCornerShape(24.dp)
) {
- Text(
- text = stringResource(R.string.editor_no_snippets),
- modifier = Modifier.padding(12.dp),
- color = MaterialTheme.colorScheme.onSurfaceVariant
- )
+ Column(
+ modifier = Modifier.padding(16.dp),
+ verticalArrangement = Arrangement.spacedBy(6.dp)
+ ) {
+ Text(
+ text = stringResource(R.string.editor_no_snippets),
+ style = MaterialTheme.typography.titleSmall
+ )
+ Text(
+ text = stringResource(R.string.editor_snippet_title_hint),
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
}
} else {
- LazyColumn(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- items(
- items = snippets,
- key = { snippet -> "${snippet.title}|${snippet.text}" }
- ) { snippet ->
- Surface(
- modifier = Modifier.fillMaxWidth(),
- color = MaterialTheme.colorScheme.surfaceContainer,
- shape = RoundedCornerShape(14.dp)
- ) {
- Column(modifier = Modifier
- .fillMaxWidth()
- .padding(12.dp)) {
- Text(text = snippet.title, style = MaterialTheme.typography.titleSmall)
- Text(
- text = snippet.text,
- style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- maxLines = 2,
- overflow = TextOverflow.Ellipsis,
- modifier = Modifier.padding(top = 2.dp)
- )
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(top = 6.dp),
- horizontalArrangement = Arrangement.SpaceBetween
- ) {
- TextButton(onClick = { onInsertSnippet(snippet.text) }) {
- Text(text = stringResource(R.string.action_insert))
- }
- TextButton(onClick = { onDeleteSnippet(snippet) }) {
- Text(text = stringResource(R.string.action_delete_message))
- }
- }
- }
+ Surface(
+ modifier = Modifier
+ .fillMaxWidth()
+ .heightIn(max = 380.dp),
+ color = MaterialTheme.colorScheme.surfaceContainer,
+ shape = RoundedCornerShape(24.dp)
+ ) {
+ LazyColumn(
+ contentPadding = PaddingValues(12.dp),
+ verticalArrangement = Arrangement.spacedBy(10.dp)
+ ) {
+ items(
+ items = snippets,
+ key = { snippet -> "${snippet.title}|${snippet.text}" }
+ ) { snippet ->
+ TemplateSnippetCard(
+ snippet = snippet,
+ onInsertSnippet = onInsertSnippet,
+ onDeleteSnippet = onDeleteSnippet
+ )
}
}
}
@@ -134,3 +235,84 @@ fun FullScreenEditorTemplatesSheet(
}
}
}
+
+@Composable
+private fun TemplateSnippetCard(
+ snippet: EditorSnippet,
+ onInsertSnippet: (String) -> Unit,
+ onDeleteSnippet: (EditorSnippet) -> Unit
+) {
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ color = MaterialTheme.colorScheme.surfaceContainerHigh,
+ shape = RoundedCornerShape(20.dp)
+ ) {
+ Column(
+ modifier = Modifier.padding(14.dp),
+ verticalArrangement = Arrangement.spacedBy(10.dp)
+ ) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Surface(
+ shape = CircleShape,
+ color = MaterialTheme.colorScheme.primaryContainer
+ ) {
+ Box(
+ modifier = Modifier.size(32.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ Icon(
+ imageVector = Icons.Outlined.ContentCopy,
+ contentDescription = null,
+ tint = MaterialTheme.colorScheme.onPrimaryContainer,
+ modifier = Modifier.size(18.dp)
+ )
+ }
+ }
+
+ Column(
+ modifier = Modifier
+ .weight(1f)
+ .padding(start = 10.dp)
+ ) {
+ Text(
+ text = snippet.title,
+ style = MaterialTheme.typography.titleSmall,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ Text(
+ text = snippet.text,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+ }
+
+ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+ FilledTonalButton(
+ onClick = { onInsertSnippet(snippet.text) },
+ modifier = Modifier
+ .weight(1f)
+ .height(40.dp),
+ shape = RoundedCornerShape(14.dp)
+ ) {
+ Text(text = stringResource(R.string.action_insert))
+ }
+ TextButton(
+ onClick = { onDeleteSnippet(snippet) },
+ modifier = Modifier
+ .weight(1f)
+ .height(40.dp),
+ colors = ButtonDefaults.textButtonColors(
+ contentColor = MaterialTheme.colorScheme.error
+ ),
+ shape = RoundedCornerShape(14.dp)
+ ) {
+ Text(text = stringResource(R.string.action_delete_message))
+ }
+ }
+ }
+ }
+}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTransforms.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTransforms.kt
new file mode 100644
index 000000000..536bb2b58
--- /dev/null
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/FullScreenEditorTransforms.kt
@@ -0,0 +1,287 @@
+package org.monogram.presentation.features.chats.conversation.ui.inputbar
+
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.input.TextFieldValue
+import org.monogram.domain.models.MessageEntityType
+
+internal fun currentTextUrl(value: TextFieldValue): String? {
+ val range = normalizedSelection(value.selection) ?: return null
+ return value.annotatedString.getStringAnnotations(RICH_ENTITY_TAG, range.start, range.end)
+ .firstOrNull { decodeRichEntity(it.item) is MessageEntityType.TextUrl }
+ ?.let { decodeRichEntity(it.item) as? MessageEntityType.TextUrl }
+ ?.url
+}
+
+internal fun currentPreLanguage(value: TextFieldValue): String {
+ val range = normalizedSelection(value.selection) ?: return ""
+ return value.annotatedString.getStringAnnotations(RICH_ENTITY_TAG, range.start, range.end)
+ .firstOrNull { decodeRichEntity(it.item) is MessageEntityType.Pre }
+ ?.let { decodeRichEntity(it.item) as? MessageEntityType.Pre }
+ ?.language
+ .orEmpty()
+}
+
+internal fun selectedTextOrNull(value: TextFieldValue): String? {
+ val selection = normalizedSelection(value.selection) ?: return null
+ return value.text.substring(selection.start, selection.end)
+}
+
+internal fun replaceSelection(value: TextFieldValue, replacement: String): TextFieldValue {
+ val rawSelection = if (value.selection.start <= value.selection.end) {
+ value.selection
+ } else {
+ TextRange(value.selection.end, value.selection.start)
+ }
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(replacement)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ val cursor = selection.start + replacement.length
+ return value.copy(annotatedString = newAnnotated, selection = TextRange(cursor, cursor))
+}
+
+internal fun insertSnippetAtSelection(value: TextFieldValue, snippet: String): TextFieldValue {
+ if (snippet.isBlank()) return value
+ val rawSelection = if (value.selection.start <= value.selection.end) {
+ value.selection
+ } else {
+ TextRange(value.selection.end, value.selection.start)
+ }
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(snippet)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ val cursor = selection.start + snippet.length
+ return value.copy(annotatedString = newAnnotated, selection = TextRange(cursor, cursor))
+}
+
+internal fun normalizedSelection(selection: TextRange): TextRange? {
+ if (selection.start == selection.end) return null
+ return if (selection.start <= selection.end) selection else TextRange(
+ selection.end,
+ selection.start
+ )
+}
+
+internal fun normalizeEditorUrl(raw: String): String? {
+ val trimmed = raw.trim()
+ if (trimmed.isEmpty()) return null
+ return if (trimmed.contains("://")) trimmed else "https://$trimmed"
+}
+
+internal fun insertMentionAtSelection(value: TextFieldValue): TextFieldValue {
+ val rawSelection =
+ if (value.selection.start <= value.selection.end) value.selection else TextRange(
+ value.selection.end,
+ value.selection.start
+ )
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val insertion =
+ if (selection.start == selection.end) "@" else "@${
+ value.text.substring(
+ selection.start,
+ selection.end
+ )
+ }"
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(insertion)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ val newCursor = selection.start + insertion.length
+ return value.copy(annotatedString = newAnnotated, selection = TextRange(newCursor, newCursor))
+}
+
+internal fun wrapSelectionWith(
+ value: TextFieldValue,
+ prefix: String,
+ suffix: String,
+ placeholder: String = "text"
+): TextFieldValue {
+ val rawSelection =
+ if (value.selection.start <= value.selection.end) value.selection else TextRange(
+ value.selection.end,
+ value.selection.start
+ )
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val selected = value.text.substring(selection.start, selection.end)
+ val content = selected.ifEmpty { placeholder }
+ val replacement = prefix + content + suffix
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(replacement)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ val contentStart = selection.start + prefix.length
+ val contentEnd = contentStart + content.length
+ return value.copy(
+ annotatedString = newAnnotated,
+ selection = TextRange(contentStart, contentEnd)
+ )
+}
+
+internal fun prefixSelectionLines(value: TextFieldValue, prefix: String): TextFieldValue {
+ val rawSelection =
+ if (value.selection.start <= value.selection.end) value.selection else TextRange(
+ value.selection.end,
+ value.selection.start
+ )
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val selected = value.text.substring(selection.start, selection.end).ifEmpty { "quote" }
+ val replacement = selected
+ .split('\n')
+ .joinToString("\n") { line -> if (line.startsWith(prefix)) line else prefix + line }
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(replacement)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ return value.copy(
+ annotatedString = newAnnotated,
+ selection = TextRange(selection.start, selection.start + replacement.length)
+ )
+}
+
+internal fun applyMarkdownLink(value: TextFieldValue, url: String): TextFieldValue {
+ val label = selectedTextOrNull(value).orEmpty().ifBlank { "link" }
+ return replaceSelection(value, "[$label]($url)")
+}
+
+internal fun applyHtmlLink(value: TextFieldValue, url: String): TextFieldValue {
+ val label = selectedTextOrNull(value).orEmpty().ifBlank { "link" }
+ return replaceSelection(value, "$label")
+}
+
+internal fun applyMarkdownPre(value: TextFieldValue, language: String): TextFieldValue {
+ val selected = selectedTextOrNull(value).orEmpty().ifBlank { "code" }
+ val info = language.trim()
+ val prefix = if (info.isBlank()) "```\n" else "```$info\n"
+ return replaceSelection(value, prefix + selected + "\n```")
+}
+
+internal fun applyHtmlPre(value: TextFieldValue, language: String): TextFieldValue {
+ val selected = selectedTextOrNull(value).orEmpty().ifBlank { "code" }
+ val info = language.trim()
+ val openTag = if (info.isBlank()) "" else ""
+ return replaceSelection(value, openTag + selected + "
")
+}
+
+internal fun applyMarkupHeading(
+ value: TextFieldValue,
+ mode: EditorParseMode,
+ level: Int
+): TextFieldValue {
+ val safeLevel = level.coerceIn(1, 6)
+ return when (mode) {
+ EditorParseMode.Markdown -> prefixSelectionLines(value, "#".repeat(safeLevel) + " ")
+ EditorParseMode.Html -> wrapSelectionWith(
+ value,
+ "",
+ "",
+ "Heading $safeLevel"
+ )
+
+ EditorParseMode.Plain -> value
+ }
+}
+
+internal fun applyMarkupBulletList(value: TextFieldValue, mode: EditorParseMode): TextFieldValue {
+ return when (mode) {
+ EditorParseMode.Markdown -> prefixSelectionLines(value, "- ")
+ EditorParseMode.Html -> applyHtmlList(value, ordered = false)
+ EditorParseMode.Plain -> value
+ }
+}
+
+internal fun applyMarkupNumberedList(value: TextFieldValue, mode: EditorParseMode): TextFieldValue {
+ return when (mode) {
+ EditorParseMode.Markdown -> applyMarkdownOrderedList(value)
+ EditorParseMode.Html -> applyHtmlList(value, ordered = true)
+ EditorParseMode.Plain -> value
+ }
+}
+
+internal fun applyMarkupDivider(value: TextFieldValue, mode: EditorParseMode): TextFieldValue {
+ return when (mode) {
+ EditorParseMode.Markdown -> replaceSelection(value, "\n---\n")
+ EditorParseMode.Html -> replaceSelection(value, "\n
\n")
+ EditorParseMode.Plain -> value
+ }
+}
+
+internal fun applyMarkupTable(value: TextFieldValue, mode: EditorParseMode): TextFieldValue {
+ return when (mode) {
+ EditorParseMode.Markdown -> replaceSelection(
+ value,
+ "| Column 1 | Column 2 |\n| --- | --- |\n| Value 1 | Value 2 |"
+ )
+
+ EditorParseMode.Html -> replaceSelection(
+ value,
+ "
\n| Column 1 | Column 2 |
|---|
\n| Value 1 | Value 2 |
\n
"
+ )
+
+ EditorParseMode.Plain -> value
+ }
+}
+
+internal fun applyMarkdownOrderedList(value: TextFieldValue): TextFieldValue {
+ val rawSelection =
+ if (value.selection.start <= value.selection.end) value.selection else TextRange(
+ value.selection.end,
+ value.selection.start
+ )
+ val maxLength = value.annotatedString.length
+ val selection = TextRange(
+ start = rawSelection.start.coerceIn(0, maxLength),
+ end = rawSelection.end.coerceIn(0, maxLength)
+ )
+ val selected = value.text.substring(selection.start, selection.end).ifEmpty { "item" }
+ val replacement = selected
+ .split('\n')
+ .mapIndexed { index, line -> "${index + 1}. $line" }
+ .joinToString("\n")
+ val newAnnotated = buildAnnotatedString {
+ append(value.annotatedString.subSequence(0, selection.start))
+ append(replacement)
+ append(value.annotatedString.subSequence(selection.end, value.annotatedString.length))
+ }
+ return value.copy(
+ annotatedString = newAnnotated,
+ selection = TextRange(selection.start, selection.start + replacement.length)
+ )
+}
+
+internal fun applyHtmlList(value: TextFieldValue, ordered: Boolean): TextFieldValue {
+ val tag = if (ordered) "ol" else "ul"
+ val selected = selectedTextOrNull(value).orEmpty().ifBlank { "item" }
+ val items = selected
+ .split('\n')
+ .joinToString("\n") { line -> "${line.ifBlank { "item" }}" }
+ return replaceSelection(value, "<$tag>\n$items\n")
+}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/InputTextField.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/InputTextField.kt
index 58d4cfb03..07d97215b 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/InputTextField.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/InputTextField.kt
@@ -82,9 +82,21 @@ private const val ENTITY_ITALIC = "italic"
private const val ENTITY_UNDERLINE = "underline"
private const val ENTITY_STRIKE = "strikethrough"
private const val ENTITY_SPOILER = "spoiler"
+private const val ENTITY_BLOCK_QUOTE = "blockquote"
+private const val ENTITY_BLOCK_QUOTE_EXPANDABLE = "blockquote_expandable"
private const val ENTITY_CODE = "code"
private const val ENTITY_PRE = "pre"
private const val ENTITY_TEXT_URL = "text_url"
+private const val ENTITY_MENTION = "mention"
+private const val ENTITY_HASHTAG = "hashtag"
+private const val ENTITY_CASHTAG = "cashtag"
+private const val ENTITY_BOT_COMMAND = "bot_command"
+private const val ENTITY_URL = "url"
+private const val ENTITY_EMAIL = "email"
+private const val ENTITY_PHONE_NUMBER = "phone_number"
+private const val ENTITY_BANK_CARD_NUMBER = "bank_card_number"
+private const val ENTITY_DATE_TIME = "date_time"
+private const val ENTITY_MEDIA_TIMESTAMP = "media_timestamp"
private object RichMenuActionBold
private object RichMenuActionItalic
@@ -179,30 +191,16 @@ fun InputTextField(
finalBuilder.addEmojiStyle(result.text, emojiFontFamily)
- mentionAnnotations.forEach { annotation ->
- if (annotation.start < annotation.end && annotation.start >= 0 && annotation.end <= result.length) {
+ val styledEntities = extractEntities(text, knownCustomEmojis)
+ styledEntities.forEach { entity ->
+ val style = entity.type.toEditorStyle(primaryColor) ?: return@forEach
+ val start = entity.offset.coerceIn(0, result.length)
+ val end = (entity.offset + entity.length).coerceIn(0, result.length)
+ if (start < end) {
finalBuilder.addStyle(
- SpanStyle(color = primaryColor),
- annotation.start,
- annotation.end
- )
- }
- }
-
- text.getStringAnnotations(RICH_ENTITY_TAG, 0, text.length).forEach { annotation ->
- val style = decodeRichEntity(annotation.item)?.toEditorStyle(primaryColor)
- if (style != null && annotation.start < annotation.end && annotation.end <= result.length) {
- finalBuilder.addStyle(style, annotation.start, annotation.end)
- }
- }
-
- val mentionRegex = Regex("@(\\w+)")
- mentionRegex.findAll(result.text).forEach { match ->
- if (mentionAnnotations.none { it.start <= match.range.first && it.end >= match.range.last + 1 }) {
- finalBuilder.addStyle(
- SpanStyle(color = primaryColor),
- match.range.first,
- match.range.last + 1
+ style,
+ start,
+ end
)
}
}
@@ -311,7 +309,7 @@ fun InputTextField(
Box(modifier = modifier.fillMaxWidth()) {
Box(
modifier = Modifier
- .padding(vertical = 10.dp)
+ .padding(vertical = 8.dp)
.heightIn(max = maxEditorHeight)
.verticalScroll(scrollState),
contentAlignment = Alignment.CenterStart
@@ -801,19 +799,33 @@ fun extractEntities(text: AnnotatedString, knownCustomEmojis: Map
- if (entities.none { it.offset <= match.range.first && it.offset + it.length >= match.range.last + 1 }) {
- entities.add(
- MessageEntity(
- offset = match.range.first,
- length = match.range.last - match.range.first + 1,
- type = MessageEntityType.Mention
- )
- )
- }
+ addDetectedEntities(entities, URL_REGEX.findAll(text.text), MessageEntityType.Url)
+ addDetectedEntities(entities, EMAIL_REGEX.findAll(text.text), MessageEntityType.Email)
+ addDetectedEntities(
+ entities,
+ BANK_CARD_REGEX.findAll(text.text),
+ MessageEntityType.BankCardNumber
+ ) { match ->
+ val candidate = match.value.trim()
+ candidate.filter(Char::isDigit).length in 13..19 && passesLuhn(candidate)
+ }
+ addDetectedEntities(
+ entities,
+ PHONE_REGEX.findAll(text.text),
+ MessageEntityType.PhoneNumber
+ ) { match ->
+ val candidate = match.value.trim()
+ val digitCount = candidate.count(Char::isDigit)
+ digitCount in 7..15 && !passesLuhn(candidate)
}
+ addDetectedEntities(entities, HASHTAG_REGEX.findAll(text.text), MessageEntityType.Hashtag)
+ addDetectedEntities(entities, CASHTAG_REGEX.findAll(text.text), MessageEntityType.Cashtag)
+ addDetectedEntities(
+ entities,
+ BOT_COMMAND_REGEX.findAll(text.text),
+ MessageEntityType.BotCommand
+ )
+ addDetectedEntities(entities, MENTION_REGEX.findAll(text.text), MessageEntityType.Mention)
return entities
.sortedWith(compareBy { it.offset }.thenByDescending { it.length })
@@ -827,9 +839,21 @@ internal fun richEntityToAnnotation(type: MessageEntityType): String? {
is MessageEntityType.Underline -> ENTITY_UNDERLINE
is MessageEntityType.Strikethrough -> ENTITY_STRIKE
is MessageEntityType.Spoiler -> ENTITY_SPOILER
+ is MessageEntityType.BlockQuote -> ENTITY_BLOCK_QUOTE
+ is MessageEntityType.BlockQuoteExpandable -> ENTITY_BLOCK_QUOTE_EXPANDABLE
is MessageEntityType.Code -> ENTITY_CODE
is MessageEntityType.Pre -> if (type.language.isBlank()) ENTITY_PRE else "$ENTITY_PRE:${type.language}"
is MessageEntityType.TextUrl -> "$ENTITY_TEXT_URL:${type.url}"
+ is MessageEntityType.Mention -> ENTITY_MENTION
+ is MessageEntityType.Hashtag -> ENTITY_HASHTAG
+ is MessageEntityType.Cashtag -> ENTITY_CASHTAG
+ is MessageEntityType.BotCommand -> ENTITY_BOT_COMMAND
+ is MessageEntityType.Url -> ENTITY_URL
+ is MessageEntityType.Email -> ENTITY_EMAIL
+ is MessageEntityType.PhoneNumber -> ENTITY_PHONE_NUMBER
+ is MessageEntityType.BankCardNumber -> ENTITY_BANK_CARD_NUMBER
+ is MessageEntityType.DateTime -> "$ENTITY_DATE_TIME:${type.unixTime}"
+ is MessageEntityType.MediaTimestamp -> "$ENTITY_MEDIA_TIMESTAMP:${type.mediaTimestampSeconds}"
else -> null
}
}
@@ -841,10 +865,27 @@ internal fun decodeRichEntity(value: String): MessageEntityType? {
value == ENTITY_UNDERLINE -> MessageEntityType.Underline
value == ENTITY_STRIKE -> MessageEntityType.Strikethrough
value == ENTITY_SPOILER -> MessageEntityType.Spoiler
+ value == ENTITY_BLOCK_QUOTE -> MessageEntityType.BlockQuote
+ value == ENTITY_BLOCK_QUOTE_EXPANDABLE -> MessageEntityType.BlockQuoteExpandable
value == ENTITY_CODE -> MessageEntityType.Code
value == ENTITY_PRE -> MessageEntityType.Pre()
value.startsWith("$ENTITY_PRE:") -> MessageEntityType.Pre(value.substringAfter(':'))
value.startsWith("$ENTITY_TEXT_URL:") -> MessageEntityType.TextUrl(value.substringAfter(':'))
+ value == ENTITY_MENTION -> MessageEntityType.Mention
+ value == ENTITY_HASHTAG -> MessageEntityType.Hashtag
+ value == ENTITY_CASHTAG -> MessageEntityType.Cashtag
+ value == ENTITY_BOT_COMMAND -> MessageEntityType.BotCommand
+ value == ENTITY_URL -> MessageEntityType.Url
+ value == ENTITY_EMAIL -> MessageEntityType.Email
+ value == ENTITY_PHONE_NUMBER -> MessageEntityType.PhoneNumber
+ value == ENTITY_BANK_CARD_NUMBER -> MessageEntityType.BankCardNumber
+ value.startsWith("$ENTITY_DATE_TIME:") -> MessageEntityType.DateTime(
+ value.substringAfter(':').toIntOrNull() ?: 0
+ )
+
+ value.startsWith("$ENTITY_MEDIA_TIMESTAMP:") -> MessageEntityType.MediaTimestamp(
+ value.substringAfter(':').toIntOrNull() ?: 0
+ )
else -> null
}
}
@@ -852,15 +893,60 @@ internal fun decodeRichEntity(value: String): MessageEntityType? {
private fun MessageEntityType.toEditorStyle(primaryColor: Color): SpanStyle? {
val codeBackground = primaryColor.copy(alpha = 0.14f)
val spoilerBackground = primaryColor.copy(alpha = 0.25f)
+ val quoteBackground = primaryColor.copy(alpha = 0.09f)
return when (this) {
is MessageEntityType.Bold -> SpanStyle(fontWeight = FontWeight.Bold)
is MessageEntityType.Italic -> SpanStyle(fontStyle = FontStyle.Italic)
is MessageEntityType.Underline -> SpanStyle(textDecoration = TextDecoration.Underline)
is MessageEntityType.Strikethrough -> SpanStyle(textDecoration = TextDecoration.LineThrough)
is MessageEntityType.Spoiler -> SpanStyle(background = spoilerBackground)
+ is MessageEntityType.BlockQuote -> SpanStyle(
+ color = primaryColor,
+ background = quoteBackground,
+ fontStyle = FontStyle.Italic
+ )
+
+ is MessageEntityType.BlockQuoteExpandable -> SpanStyle(
+ color = primaryColor,
+ background = quoteBackground,
+ fontStyle = FontStyle.Italic
+ )
is MessageEntityType.Code -> SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)
is MessageEntityType.Pre -> SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)
is MessageEntityType.TextUrl -> SpanStyle(color = primaryColor, textDecoration = TextDecoration.Underline)
+ is MessageEntityType.Mention -> SpanStyle(color = primaryColor)
+ is MessageEntityType.Hashtag -> SpanStyle(color = primaryColor)
+ is MessageEntityType.Cashtag -> SpanStyle(color = primaryColor)
+ is MessageEntityType.BotCommand -> SpanStyle(color = primaryColor)
+ is MessageEntityType.Url -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
+
+ is MessageEntityType.Email -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
+
+ is MessageEntityType.PhoneNumber -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
+
+ is MessageEntityType.BankCardNumber -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
+
+ is MessageEntityType.DateTime -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
+
+ is MessageEntityType.MediaTimestamp -> SpanStyle(
+ color = primaryColor,
+ textDecoration = TextDecoration.Underline
+ )
else -> null
}
}
@@ -1096,3 +1182,50 @@ private fun normalizeUrl(raw: String): String? {
if (trimmed.isEmpty()) return null
return if (trimmed.contains("://")) trimmed else "https://$trimmed"
}
+
+private fun addDetectedEntities(
+ entities: MutableList,
+ matches: Sequence,
+ type: MessageEntityType,
+ predicate: (MatchResult) -> Boolean = { true }
+) {
+ matches.forEach { match ->
+ if (!predicate(match)) return@forEach
+ val start = match.range.first
+ val end = match.range.last + 1
+ if (entities.none { it.offset < end && (it.offset + it.length) > start }) {
+ entities += MessageEntity(
+ offset = start,
+ length = end - start,
+ type = type
+ )
+ }
+ }
+}
+
+private fun passesLuhn(value: String): Boolean {
+ val digits = value.filter(Char::isDigit)
+ if (digits.length !in 13..19) return false
+
+ var sum = 0
+ var shouldDouble = false
+ for (index in digits.length - 1 downTo 0) {
+ var digit = digits[index].digitToInt()
+ if (shouldDouble) {
+ digit *= 2
+ if (digit > 9) digit -= 9
+ }
+ sum += digit
+ shouldDouble = !shouldDouble
+ }
+ return sum % 10 == 0
+}
+
+private val MENTION_REGEX = Regex("""(?()]+""")
+private val EMAIL_REGEX = Regex("""(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b""")
+private val PHONE_REGEX = Regex("""(?,
+ renderData: MessageTextRenderData,
+ style: TextStyle,
+ color: Color,
+ emojiFontFamily: FontFamily,
+ modifier: Modifier = Modifier,
+ onSpoilerClick: (Int) -> Unit = {}
+) {
+ val previewStyle = style.copy(
+ fontSize = if (renderData.isBigEmoji) (style.fontSize.value * 5f).sp else style.fontSize,
+ lineHeight = if (renderData.isBigEmoji) (style.fontSize.value * 5.5f).sp else style.lineHeight
+ )
+
+ if (renderData.isBigEmoji && renderData.bigEmojiItems.isNotEmpty()) {
+ BigEmojiContent(
+ items = renderData.bigEmojiItems,
+ sizeDp = style.fontSize.value * 5f,
+ modifier = modifier,
+ emojiFontFamily = emojiFontFamily
+ )
+ } else {
+ MessageText(
+ text = renderData.annotatedText,
+ rawText = rawText,
+ inlineContent = renderData.inlineContent,
+ entities = entities,
+ style = previewStyle,
+ color = color,
+ modifier = modifier,
+ onSpoilerClick = onSpoilerClick
+ )
+ }
+}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/AudioMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/AudioMessageBubble.kt
index fd60a4d51..c5552ab0a 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/AudioMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/AudioMessageBubble.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@@ -136,7 +135,6 @@ fun AudioMessageBubble(
Column(
modifier = Modifier
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 6.dp)
- .width(IntrinsicSize.Max)
.widthIn(min = 184.dp, max = 300.dp)
) {
if (isGroup && !isOutgoing && !isSameSenderAbove) {
@@ -361,7 +359,6 @@ fun AudioAlbumBubble(
Column(
modifier = Modifier
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 6.dp)
- .width(IntrinsicSize.Max)
.widthIn(min = 200.dp, max = 300.dp)
) {
if (isGroup && !isOutgoing && !isSameSenderAbove) {
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/DocumentMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/DocumentMessageBubble.kt
index 50baa4c8f..bbb26bacc 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/DocumentMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/DocumentMessageBubble.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@@ -150,7 +149,6 @@ fun DocumentMessageBubble(
Column(
modifier = Modifier
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 6.dp)
- .width(IntrinsicSize.Max)
.widthIn(min = 184.dp, max = 300.dp)
) {
if (isGroup && !isOutgoing && !isSameSenderAbove) {
@@ -384,7 +382,6 @@ fun DocumentAlbumBubble(
Column(
modifier = Modifier
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 6.dp)
- .width(IntrinsicSize.Max)
.widthIn(min = 200.dp, max = 300.dp)
) {
if (isGroup && !isOutgoing && !isSameSenderAbove) {
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/LinkPreview.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/LinkPreview.kt
index cb9c6ffc1..8fb3b135d 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/LinkPreview.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/LinkPreview.kt
@@ -5,12 +5,10 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@@ -33,6 +31,9 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
@@ -83,62 +84,64 @@ internal fun LinkPreview(
else colorScheme.onSurface.copy(alpha = 0.05f)
)
) {
- Row(modifier = Modifier.height(IntrinsicSize.Min)) {
- Box(
- modifier = Modifier
- .width(3.dp)
- .fillMaxHeight()
- .background(borderColor)
- )
- Column(modifier = Modifier.padding(8.dp)) {
- if (resolved.isSmallMedia) {
- Row {
- Column(
- modifier = Modifier
- .weight(1f)
- .previewTapTarget(
- onTap = { onAction(resolved.primaryAction) },
- onLongClick = onLongClick
- )
- ) {
- LinkPreviewTextContent(
- meta = resolved.meta,
- isOutgoing = isOutgoing
- )
- }
- Spacer(modifier = Modifier.width(8.dp))
- LinkPreviewSmallImage(
- thumbnailData = resolved.thumbnailData,
- thumbnailCacheKey = resolved.thumbnailCacheKey,
- onTap = { onAction(resolved.mediaAction) },
- onLongClick = onLongClick
- )
- }
- } else {
+ Column(
+ modifier = Modifier
+ .drawBehind {
+ drawRect(
+ color = borderColor,
+ topLeft = Offset.Zero,
+ size = Size(3.dp.toPx(), size.height)
+ )
+ }
+ .padding(start = 11.dp, top = 8.dp, end = 8.dp, bottom = 8.dp)
+ ) {
+ if (resolved.isSmallMedia) {
+ Row {
Column(
- modifier = Modifier.previewTapTarget(
- onTap = { onAction(resolved.primaryAction) },
- onLongClick = onLongClick
- )
+ modifier = Modifier
+ .weight(1f)
+ .previewTapTarget(
+ onTap = { onAction(resolved.primaryAction) },
+ onLongClick = onLongClick
+ )
) {
LinkPreviewTextContent(
meta = resolved.meta,
isOutgoing = isOutgoing
)
}
+ Spacer(modifier = Modifier.width(8.dp))
+ LinkPreviewSmallImage(
+ thumbnailData = resolved.thumbnailData,
+ thumbnailCacheKey = resolved.thumbnailCacheKey,
+ onTap = { onAction(resolved.mediaAction) },
+ onLongClick = onLongClick
+ )
+ }
+ } else {
+ Column(
+ modifier = Modifier.previewTapTarget(
+ onTap = { onAction(resolved.primaryAction) },
+ onLongClick = onLongClick
+ )
+ ) {
+ LinkPreviewTextContent(
+ meta = resolved.meta,
+ isOutgoing = isOutgoing
+ )
+ }
- if (resolved.hasMedia) {
- Spacer(modifier = Modifier.height(8.dp))
- LinkPreviewLargeMedia(
- thumbnailData = resolved.thumbnailData,
- thumbnailCacheKey = resolved.thumbnailCacheKey,
- aspectRatio = resolved.aspectRatio,
- showPlayOverlay = resolved.showPlayOverlay,
- duration = webPage.duration,
- onTap = { onAction(resolved.mediaAction) },
- onLongClick = onLongClick
- )
- }
+ if (resolved.hasMedia) {
+ Spacer(modifier = Modifier.height(8.dp))
+ LinkPreviewLargeMedia(
+ thumbnailData = resolved.thumbnailData,
+ thumbnailCacheKey = resolved.thumbnailCacheKey,
+ aspectRatio = resolved.aspectRatio,
+ showPlayOverlay = resolved.showPlayOverlay,
+ duration = webPage.duration,
+ onTap = { onAction(resolved.mediaAction) },
+ onLongClick = onLongClick
+ )
}
}
}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MarkdownTableBlock.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MarkdownTableBlock.kt
new file mode 100644
index 000000000..27c820007
--- /dev/null
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MarkdownTableBlock.kt
@@ -0,0 +1,183 @@
+package org.monogram.presentation.features.chats.conversation.ui.message
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Composable
+internal fun MarkdownTableBlock(
+ text: String,
+ isOutgoing: Boolean,
+ modifier: Modifier = Modifier
+) {
+ val rows = remember(text) { parseMarkdownTableRows(text) }
+ if (rows.isEmpty()) {
+ CodeBlock(
+ text = text,
+ language = "table",
+ isOutgoing = isOutgoing,
+ modifier = modifier
+ )
+ return
+ }
+
+ BoxWithConstraints(modifier = modifier.fillMaxWidth()) {
+ val tableWidth = remember(rows, maxWidth) {
+ resolveMarkdownTableWidth(
+ availableWidth = maxWidth,
+ columnCount = rows.maxOfOrNull { it.size } ?: 1
+ )
+ }
+ val dividerColor = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.45f)
+
+ Box(
+ modifier = Modifier.horizontalScroll(rememberScrollState())
+ ) {
+ Column(
+ modifier = Modifier
+ .width(tableWidth)
+ .clip(RoundedCornerShape(12.dp))
+ .background(MaterialTheme.colorScheme.surfaceContainerLow)
+ .padding(12.dp)
+ ) {
+ rows.forEachIndexed { rowIndex, row ->
+ val isLastRow = rowIndex == rows.lastIndex
+ val rowBackground = when {
+ rowIndex == 0 -> MaterialTheme.colorScheme.surfaceContainerHighest
+ rowIndex % 2 == 1 -> MaterialTheme.colorScheme.surfaceContainer
+ else -> Color.Transparent
+ }
+
+ androidx.compose.foundation.layout.Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .drawBehind {
+ if (!isLastRow) {
+ val lineWidth = 1.dp.toPx()
+ drawLine(
+ color = dividerColor,
+ start = Offset(0f, size.height - lineWidth / 2f),
+ end = Offset(size.width, size.height - lineWidth / 2f),
+ strokeWidth = lineWidth
+ )
+ }
+ }
+ ) {
+ row.forEachIndexed { cellIndex, cell ->
+ Box(
+ modifier = Modifier
+ .weight(1f)
+ .background(rowBackground)
+ .drawBehind {
+ if (cellIndex < row.lastIndex) {
+ val lineWidth = 1.dp.toPx()
+ drawLine(
+ color = dividerColor,
+ start = Offset(size.width - lineWidth / 2f, 0f),
+ end = Offset(
+ size.width - lineWidth / 2f,
+ size.height
+ ),
+ strokeWidth = lineWidth
+ )
+ }
+ }
+ .padding(horizontal = 10.dp, vertical = 8.dp)
+ ) {
+ Text(
+ text = cell,
+ style = if (rowIndex == 0) {
+ MaterialTheme.typography.labelLarge
+ } else {
+ MaterialTheme.typography.bodyMedium
+ },
+ fontWeight = if (rowIndex == 0) FontWeight.Bold else FontWeight.Normal,
+ color = MaterialTheme.colorScheme.onSurface,
+ textAlign = TextAlign.Start
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+private fun resolveMarkdownTableWidth(
+ availableWidth: Dp,
+ columnCount: Int
+): Dp {
+ val columnSpacing = 8.dp
+ val minColumnWidth = 120.dp
+ val minTableWidth =
+ minColumnWidth * columnCount + columnSpacing * (columnCount - 1).coerceAtLeast(0)
+ return maxOf(availableWidth, minTableWidth)
+}
+
+internal fun parseMarkdownTableRows(text: String): List> {
+ val lines = text.lineSequence()
+ .map { it.trimEnd() }
+ .filter { it.isNotBlank() }
+ .toList()
+
+ if (lines.isEmpty()) return emptyList()
+
+ val boxRows = lines.filter { it.contains('│') }
+ if (boxRows.size >= 2) {
+ return boxRows.mapNotNull { line -> parseDelimitedTableRow(line, '│') }
+ .takeIf { it.size >= 2 && it.allSameSize() }
+ .orEmpty()
+ }
+
+ val pipeRows = lines
+ .filterNot { isMarkdownTableSeparatorRow(it) }
+ .filter { it.contains('|') }
+
+ return pipeRows.mapNotNull { line -> parseDelimitedTableRow(line, '|') }
+ .takeIf { it.size >= 2 && it.allSameSize() }
+ .orEmpty()
+}
+
+private fun parseDelimitedTableRow(line: String, delimiter: Char): List? {
+ val parts = line.split(delimiter).map { it.trim() }
+ val normalized = when {
+ parts.size >= 2 && parts.first().isEmpty() && parts.last().isEmpty() -> parts.drop(1)
+ .dropLast(1)
+
+ else -> parts
+ }
+ return normalized.takeIf { it.size >= 2 }
+ ?.let { if (it.any { cell -> cell.isNotEmpty() }) it else null }
+}
+
+private fun List>.allSameSize(): Boolean {
+ val firstSize = firstOrNull()?.size ?: return false
+ return all { it.size == firstSize }
+}
+
+private fun isMarkdownTableSeparatorRow(line: String): Boolean {
+ val compact = line.trim()
+ if (compact.isEmpty()) return false
+ return compact.all { it == '|' || it == ':' || it == '-' || it.isWhitespace() }
+}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MediaBubbleSizing.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MediaBubbleSizing.kt
index 3dbd2490d..afd367b1b 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MediaBubbleSizing.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MediaBubbleSizing.kt
@@ -3,6 +3,7 @@ package org.monogram.presentation.features.chats.conversation.ui.message
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import org.monogram.domain.models.MessageContent
+import org.monogram.domain.models.webapp.PageBlock
private const val DEFAULT_MEDIA_ASPECT_RATIO = 1f
private const val MIN_MEDIA_ASPECT_RATIO = 0.5f
@@ -10,7 +11,22 @@ private const val MAX_MEDIA_ASPECT_RATIO = 2f
private const val MEDIA_BUBBLE_WIDTH_FRACTION = 0.92f
internal fun MessageContent.prefersExpandedBubbleWidth(): Boolean =
- this is MessageContent.Photo || this is MessageContent.Video || this is MessageContent.Gif
+ this is MessageContent.Photo ||
+ this is MessageContent.Video ||
+ this is MessageContent.Gif ||
+ (this is MessageContent.RichMessage && blocks.any(PageBlock::prefersExpandedWidth))
+
+private fun PageBlock.prefersExpandedWidth(): Boolean {
+ return when (this) {
+ is PageBlock.Table -> true
+ is PageBlock.BlockQuote -> pageBlocks.any(PageBlock::prefersExpandedWidth)
+ is PageBlock.Details -> pageBlocks.any(PageBlock::prefersExpandedWidth)
+ is PageBlock.Collage -> pageBlocks.any(PageBlock::prefersExpandedWidth)
+ is PageBlock.Slideshow -> pageBlocks.any(PageBlock::prefersExpandedWidth)
+ is PageBlock.EmbeddedPost -> pageBlocks.any(PageBlock::prefersExpandedWidth)
+ else -> false
+ }
+}
internal fun resolveMediaBubbleAspectRatio(
mediaWidth: Int,
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageText.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageText.kt
index 5993e6ba6..4ea716fdb 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageText.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageText.kt
@@ -35,7 +35,7 @@ import org.koin.compose.koinInject
import org.monogram.domain.models.MessageEntity
import org.monogram.domain.models.MessageEntityType
import org.monogram.domain.repository.TelegramLinkRepository
-import org.monogram.presentation.features.chats.conversation.ui.message.model.isBlockElement
+import org.monogram.presentation.features.chats.conversation.ui.message.model.topLevelBlockEntities
internal data class MessageTextLayoutInfo(
val width: Int,
@@ -70,7 +70,7 @@ internal fun MessageText(
val linkHandler = LocalLinkHandler.current
val blockEntities = entities
- .filter { it.type.isBlockElement() }
+ .topLevelBlockEntities()
.sortedBy { it.offset }
Column(modifier = modifier) {
@@ -325,6 +325,16 @@ private fun DefaultTextRender(
consumed = true
}
+ "EMAIL" -> {
+ uriHandler.openUri("mailto:${annotation.item}")
+ consumed = true
+ }
+
+ "PHONE" -> {
+ uriHandler.openUri("tel:${annotation.item}")
+ consumed = true
+ }
+
"SPOILER", "SPOILER_REVEALED", "SPOILER_UNREVEALED" -> {
annotation.item.toIntOrNull()?.let {
onSpoilerClick(it)
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageTextFormatter.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageTextFormatter.kt
index 4ee131be5..e13201481 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageTextFormatter.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/MessageTextFormatter.kt
@@ -400,6 +400,88 @@ fun buildAnnotatedMessageTextWithEmoji(
)
}
+ is MessageEntityType.Cashtag -> {
+ addStyle(SpanStyle(color = linkColor), start, end)
+ addStringAnnotation(
+ "CASHTAG",
+ text.safeSubstring(safeStart, safeEnd),
+ start,
+ end
+ )
+ }
+
+ is MessageEntityType.BotCommand -> {
+ addStyle(SpanStyle(color = linkColor), start, end)
+ addStringAnnotation(
+ "COPY",
+ text.safeSubstring(safeStart, safeEnd),
+ start,
+ end
+ )
+ }
+
+ is MessageEntityType.Email -> {
+ val email = text.safeSubstring(safeStart, safeEnd)
+ addStyle(
+ SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline
+ ), start, end
+ )
+ addStringAnnotation("EMAIL", email, start, end)
+ }
+
+ is MessageEntityType.PhoneNumber -> {
+ val phone = text.safeSubstring(safeStart, safeEnd)
+ addStyle(
+ SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline
+ ), start, end
+ )
+ addStringAnnotation("PHONE", phone, start, end)
+ }
+
+ is MessageEntityType.BankCardNumber -> {
+ addStyle(
+ SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline
+ ), start, end
+ )
+ addStringAnnotation(
+ "COPY",
+ text.safeSubstring(safeStart, safeEnd),
+ start,
+ end
+ )
+ }
+
+ is MessageEntityType.DateTime -> {
+ addStyle(
+ SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline
+ ), start, end
+ )
+ addStringAnnotation("DATE_TIME", type.unixTime.toString(), start, end)
+ }
+
+ is MessageEntityType.MediaTimestamp -> {
+ addStyle(
+ SpanStyle(
+ color = linkColor,
+ textDecoration = TextDecoration.Underline
+ ), start, end
+ )
+ addStringAnnotation(
+ "MEDIA_TIMESTAMP",
+ type.mediaTimestampSeconds.toString(),
+ start,
+ end
+ )
+ }
+
else -> {}
}
}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/PollMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/PollMessageBubble.kt
index d0e4a9044..4ce22e0fe 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/PollMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/PollMessageBubble.kt
@@ -12,7 +12,6 @@ import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
@@ -137,7 +136,6 @@ fun PollMessageBubble(
Column(
modifier = modifier
- .width(IntrinsicSize.Max)
.widthIn(min = 240.dp, max = 332.dp)
.pointerInput(Unit) {
detectTapGestures(
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/QuoteBlock.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/QuoteBlock.kt
index 9f3d5cd3b..e55abed4f 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/QuoteBlock.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/QuoteBlock.kt
@@ -6,11 +6,8 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
@@ -29,6 +26,10 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@@ -75,7 +76,6 @@ internal fun QuoteBlock(
Surface(
modifier = Modifier
- .height(IntrinsicSize.Min)
.animateContentSize()
.clickable(
interactionSource = null,
@@ -84,7 +84,17 @@ internal fun QuoteBlock(
) {
isCollapsed = !isCollapsed
}
- .padding(vertical = 4.dp),
+ .padding(vertical = 4.dp)
+ .drawBehind {
+ val stripeWidth = 3.dp.toPx()
+ val stripeRadius = 999.dp.toPx()
+ drawRoundRect(
+ color = stripeColor,
+ topLeft = Offset(8.dp.toPx(), 10.dp.toPx()),
+ size = Size(stripeWidth, size.height - 20.dp.toPx()),
+ cornerRadius = CornerRadius(stripeRadius, stripeRadius)
+ )
+ },
shape = RoundedCornerShape(12.dp),
color = background
) {
@@ -92,16 +102,7 @@ internal fun QuoteBlock(
modifier = Modifier.padding(start = 8.dp, end = 10.dp, top = 8.dp, bottom = 8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
- Spacer(
- Modifier
- .width(3.dp)
- .padding(vertical = 2.dp)
- .fillMaxHeight()
- .background(
- color = stripeColor,
- shape = RoundedCornerShape(999.dp)
- )
- )
+ Spacer(modifier = Modifier.width(6.dp))
val textModifier = Modifier
.weight(1f, fill = false)
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/RichMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/RichMessageBubble.kt
index 1c7ba0044..446326f28 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/RichMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/RichMessageBubble.kt
@@ -3,9 +3,7 @@ package org.monogram.presentation.features.chats.conversation.ui.message
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
@@ -140,7 +138,6 @@ internal fun RichMessageBubble(
Column(
modifier = modifier
- .width(IntrinsicSize.Max)
.widthIn(min = 120.dp),
horizontalAlignment = if (isOutgoing) Alignment.End else Alignment.Start
) {
@@ -187,6 +184,9 @@ internal fun RichMessageBubble(
block = renderModel.block,
textSizeMultiplier = (fontSize / 16f).coerceIn(0.75f, 1.5f),
stateKeyPrefix = renderModel.stateKeyPrefix,
+ useMessageQuoteStyle = true,
+ onRichTextTap = onClick,
+ onRichTextLongPress = onLongClick,
onOpenPhotoFullscreen = { photo, caption ->
openRichPhoto(
photo = photo,
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextBlocks.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextBlocks.kt
index d3362ea24..0965401f7 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextBlocks.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextBlocks.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
import org.monogram.domain.models.MessageEntity
import org.monogram.domain.models.MessageEntityType
import org.monogram.presentation.features.chats.conversation.ui.message.model.blockFor
-import org.monogram.presentation.features.chats.conversation.ui.message.model.inlineEntitiesForBlock
+import org.monogram.presentation.features.chats.conversation.ui.message.model.entitiesForBlock
@Composable
internal fun TextBlocks(
@@ -15,16 +15,23 @@ internal fun TextBlocks(
) {
when (val type = entity.type) {
is MessageEntityType.Pre -> {
- CodeBlock(
- text = text blockFor entity,
- language = type.language,
- isOutgoing = isOutgoing
- )
+ if (type.language.equals("table", ignoreCase = true)) {
+ MarkdownTableBlock(
+ text = text blockFor entity,
+ isOutgoing = isOutgoing
+ )
+ } else {
+ CodeBlock(
+ text = text blockFor entity,
+ language = type.language,
+ isOutgoing = isOutgoing
+ )
+ }
}
is MessageEntityType.BlockQuote -> {
QuoteBlock(
text = text blockFor entity,
- entities = entities.inlineEntitiesForBlock(entity),
+ entities = entities.entitiesForBlock(entity),
isOutgoing = isOutgoing,
expandable = false,
)
@@ -32,7 +39,7 @@ internal fun TextBlocks(
is MessageEntityType.BlockQuoteExpandable -> {
QuoteBlock(
text = text blockFor entity,
- entities = entities.inlineEntitiesForBlock(entity),
+ entities = entities.entitiesForBlock(entity),
isOutgoing = isOutgoing,
expandable = true,
)
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextMessageBubble.kt
index 25b6f09e7..03db480aa 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/TextMessageBubble.kt
@@ -1,9 +1,7 @@
package org.monogram.presentation.features.chats.conversation.ui.message
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
@@ -78,7 +76,6 @@ internal fun TextMessageBubble(
Column(
modifier = modifier
- .width(IntrinsicSize.Max)
.widthIn(min = 60.dp),
horizontalAlignment = if (isOutgoing) Alignment.End else Alignment.Start
) {
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/VoiceMessageBubble.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/VoiceMessageBubble.kt
index b81a42099..3fee48f89 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/VoiceMessageBubble.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/VoiceMessageBubble.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@@ -136,7 +135,6 @@ fun VoiceMessageBubble(
Column(
modifier = Modifier
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 6.dp)
- .width(IntrinsicSize.Max)
.widthIn(min = 184.dp, max = 300.dp)
) {
if (isGroup && !isOutgoing && !isSameSenderAbove) {
diff --git a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/model/Mappers.kt b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/model/Mappers.kt
index 2ccccb721..15e2eaa0c 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/model/Mappers.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/chats/conversation/ui/message/model/Mappers.kt
@@ -10,6 +10,45 @@ internal infix fun String.blockFor(entity: MessageEntity): String =
safeSubstring(entity.offset, entity.offset.toLong() + entity.length.toLong())
internal fun List.inlineEntitiesForBlock(blockEntity: MessageEntity): List {
+ return entitiesForBlock(blockEntity).filterNot { it.type.isBlockElement() }
+}
+
+internal fun List.topLevelBlockEntities(): List {
+ val blockEntities = asSequence()
+ .filter { it.type.isBlockElement() }
+ .sortedWith(compareBy { it.offset }.thenByDescending { it.length })
+ .toList()
+
+ return blockEntities.filter { entity ->
+ val entityStart = entity.offset
+ val entityEnd = (entity.offset.toLong() + entity.length.toLong())
+ .coerceAtLeast(entityStart.toLong())
+ .coerceAtMost(Int.MAX_VALUE.toLong())
+ .toInt()
+
+ blockEntities.none { parent ->
+ if (parent == entity) return@none false
+
+ val parentStart = parent.offset
+ val parentEnd = (parent.offset.toLong() + parent.length.toLong())
+ .coerceAtLeast(parentStart.toLong())
+ .coerceAtMost(Int.MAX_VALUE.toLong())
+ .toInt()
+
+ val strictlyContains = parentStart <= entityStart &&
+ parentEnd >= entityEnd &&
+ (parentStart < entityStart || parentEnd > entityEnd)
+ val sameRangeQuoteContainer = parentStart == entityStart &&
+ parentEnd == entityEnd &&
+ parent.type.isQuoteBlockElement() &&
+ !entity.type.isQuoteBlockElement()
+
+ strictlyContains || sameRangeQuoteContainer
+ }
+ }
+}
+
+internal fun List.entitiesForBlock(blockEntity: MessageEntity): List {
val blockStart = blockEntity.offset
val blockEnd = (blockEntity.offset.toLong() + blockEntity.length.toLong())
.coerceAtLeast(blockStart.toLong())
@@ -18,7 +57,6 @@ internal fun List.inlineEntitiesForBlock(blockEntity: MessageEnti
return asSequence()
.filterNot { it == blockEntity }
- .filterNot { it.type.isBlockElement() }
.mapNotNull { entity ->
val start = entity.offset
val end = (entity.offset.toLong() + entity.length.toLong())
@@ -50,4 +88,13 @@ internal fun MessageEntityType.isBlockElement(): Boolean {
is MessageEntityType.BlockQuoteExpandable -> true
else -> false
}
-}
\ No newline at end of file
+}
+
+private fun MessageEntityType.isQuoteBlockElement(): Boolean {
+ return when (this) {
+ is MessageEntityType.BlockQuote,
+ is MessageEntityType.BlockQuoteExpandable -> true
+
+ else -> false
+ }
+}
diff --git a/presentation/src/main/java/org/monogram/presentation/features/instantview/InstantViewer.kt b/presentation/src/main/java/org/monogram/presentation/features/instantview/InstantViewer.kt
index c31348bd8..bfcdd5494 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/instantview/InstantViewer.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/instantview/InstantViewer.kt
@@ -17,25 +17,22 @@ import androidx.compose.animation.scaleOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.basicMarquee
-import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@@ -44,7 +41,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
@@ -109,6 +105,10 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.TransformOrigin
@@ -131,6 +131,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.koin.compose.koinInject
import org.monogram.domain.models.WebPage
+import org.monogram.domain.models.webapp.HorizontalAlignment
import org.monogram.domain.models.webapp.InstantViewModel
import org.monogram.domain.models.webapp.PageBlock
import org.monogram.domain.models.webapp.PageBlockCaption
@@ -551,6 +552,7 @@ internal fun PageBlock.stableBlockSignature(): String {
is PageBlock.VideoBlock -> "video:${video.fileId}:${caption.stableCaptionSignature()}:${video.duration}"
is PageBlock.AnimationBlock -> "animation:${animation.fileId}:${caption.stableCaptionSignature()}:${animation.duration}"
is PageBlock.AudioBlock -> "audio:${audio.fileId}:${audio.title.orEmpty()}"
+ is PageBlock.VoiceNoteBlock -> "voice:${voiceNote.fileId}:${voiceNote.duration}:${caption.stableCaptionSignature()}"
is PageBlock.Embedded -> "embedded:$url:${posterPhoto?.fileId ?: 0}"
is PageBlock.EmbeddedPost -> "embedded_post:$author:$date:${authorPhoto?.fileId ?: 0}"
is PageBlock.Details -> "details:${richTextPlainText(header)}:${pageBlocks.joinToString("|") { it.stableBlockSignature() }}"
@@ -573,12 +575,30 @@ internal fun PageBlock.stableBlockSignature(): String {
private fun PageBlockCaption.stableCaptionSignature(): String = renderedTextOrNull().orEmpty()
+internal fun resolveInstantViewTableWidth(
+ availableWidth: androidx.compose.ui.unit.Dp,
+ columnCount: Int
+): androidx.compose.ui.unit.Dp {
+ val columnSpacing = 8.dp
+ val minColumnWidth = 120.dp
+ val minTableWidth =
+ minColumnWidth * columnCount + columnSpacing * (columnCount - 1).coerceAtLeast(0)
+ return if (availableWidth.value.isFinite()) {
+ maxOf(availableWidth, minTableWidth)
+ } else {
+ minTableWidth
+ }
+}
+
@Composable
fun InstantViewBlock(
block: PageBlock,
textSizeMultiplier: Float,
searchQuery: String = "",
stateKeyPrefix: String = "instant_view_block",
+ useMessageQuoteStyle: Boolean = false,
+ onRichTextTap: ((Offset) -> Unit)? = null,
+ onRichTextLongPress: ((Offset) -> Unit)? = null,
onOpenPhotoFullscreen: (WebPage.Photo, PageBlockCaption) -> Unit = { _, _ -> },
onOpenVideoFullscreen: (String?, Int, Boolean, String?) -> Unit = { _, _, _, _ -> },
onOpenFileExternally: (String?, Int) -> Unit = { _, _ -> }
@@ -594,14 +614,18 @@ fun InstantViewBlock(
style = MaterialTheme.typography.displaySmall,
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Subtitle -> RichTextView(
richText = block.subtitle,
style = MaterialTheme.typography.headlineSmall,
textSizeMultiplier = textSizeMultiplier,
- color = MaterialTheme.colorScheme.primary
+ color = MaterialTheme.colorScheme.primary,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.AuthorDate -> {
@@ -619,7 +643,9 @@ fun InstantViewBlock(
style = MaterialTheme.typography.labelLarge,
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
if (dateStr != null) {
@@ -645,7 +671,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(top = 16.dp),
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Subheader -> RichTextView(
@@ -654,7 +682,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(top = 8.dp),
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.SectionHeading -> RichTextView(
@@ -670,7 +700,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(top = 8.dp),
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Kicker -> RichTextView(
@@ -678,14 +710,18 @@ fun InstantViewBlock(
style = MaterialTheme.typography.labelLarge,
textSizeMultiplier = textSizeMultiplier,
color = MaterialTheme.colorScheme.primary,
- fontWeight = FontWeight.Bold
+ fontWeight = FontWeight.Bold,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Paragraph -> RichTextView(
richText = block.text,
style = MaterialTheme.typography.bodyLarge.copy(lineHeight = 32.sp),
textSizeMultiplier = textSizeMultiplier,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Preformatted -> Surface(
@@ -698,7 +734,9 @@ fun InstantViewBlock(
style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
textSizeMultiplier = textSizeMultiplier,
modifier = Modifier.padding(16.dp),
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
}
@@ -706,7 +744,9 @@ fun InstantViewBlock(
richText = block.footer,
style = MaterialTheme.typography.bodySmall,
textSizeMultiplier = textSizeMultiplier,
- color = MaterialTheme.colorScheme.onSurfaceVariant
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
is PageBlock.Thinking -> Surface(
@@ -718,7 +758,9 @@ fun InstantViewBlock(
style = MaterialTheme.typography.bodyMedium,
textSizeMultiplier = textSizeMultiplier,
color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp)
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
}
@@ -824,8 +866,7 @@ fun InstantViewBlock(
Surface(
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(12.dp),
- color = MaterialTheme.colorScheme.surfaceContainer,
- tonalElevation = 2.dp
+ color = MaterialTheme.colorScheme.surfaceContainerHigh
) {
Column {
ListItem(
@@ -872,6 +913,64 @@ fun InstantViewBlock(
}
}
+ is PageBlock.VoiceNoteBlock -> {
+ Surface(
+ modifier = Modifier.fillMaxWidth(),
+ shape = RoundedCornerShape(12.dp),
+ color = MaterialTheme.colorScheme.surfaceContainerHigh
+ ) {
+ Column {
+ ListItem(
+ modifier = Modifier.clickable {
+ onOpenFileExternally(block.voiceNote.path, block.voiceNote.fileId)
+ },
+ headlineContent = {
+ Text(
+ text = stringResource(R.string.instant_view_voice_note),
+ fontWeight = FontWeight.SemiBold
+ )
+ },
+ supportingContent = block.voiceNote.mimeType?.takeIf { it.isNotBlank() }
+ ?.let { mimeType ->
+ { Text(mimeType) }
+ },
+ leadingContent = {
+ IconButton(
+ onClick = {
+ onOpenFileExternally(
+ block.voiceNote.path,
+ block.voiceNote.fileId
+ )
+ },
+ colors = IconButtonDefaults.filledIconButtonColors(
+ containerColor = MaterialTheme.colorScheme.primaryContainer,
+ contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+ )
+ ) {
+ Icon(
+ Icons.Rounded.PlayArrow,
+ contentDescription = stringResource(R.string.instant_view_play)
+ )
+ }
+ },
+ trailingContent = {
+ val duration = block.voiceNote.duration
+ Text(
+ "${duration / 60}:${(duration % 60).toString().padStart(2, '0')}",
+ style = MaterialTheme.typography.labelMedium
+ )
+ },
+ colors = ListItemDefaults.colors(containerColor = Color.Transparent)
+ )
+ PageBlockCaptionView(
+ block.caption,
+ textSizeMultiplier,
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
+ )
+ }
+ }
+ }
+
is PageBlock.Embedded -> {
Column(modifier = Modifier.fillMaxWidth()) {
Box(
@@ -909,8 +1008,7 @@ fun InstantViewBlock(
is PageBlock.EmbeddedPost -> {
Card(
modifier = Modifier.fillMaxWidth(),
- colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerLow),
- border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)
+ colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh)
) {
Column(modifier = Modifier.padding(16.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
@@ -951,6 +1049,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:list:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -962,35 +1063,90 @@ fun InstantViewBlock(
}
is PageBlock.BlockQuote -> {
- Row(modifier = Modifier
- .fillMaxWidth()
- .height(IntrinsicSize.Min)) {
- Box(
- modifier = Modifier
- .width(4.dp)
- .fillMaxHeight()
- .background(MaterialTheme.colorScheme.primary, RoundedCornerShape(2.dp))
- )
- Spacer(modifier = Modifier.width(16.dp))
- Column {
- RichTextView(
- richText = block.text,
- style = MaterialTheme.typography.bodyLarge,
- textSizeMultiplier = textSizeMultiplier,
- fontStyle = FontStyle.Italic,
- color = MaterialTheme.colorScheme.onSurface
- )
+ val quoteStripeColor = MaterialTheme.colorScheme.primary
+ val quoteContent: @Composable () -> Unit = {
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ verticalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ block.pageBlocks.forEachIndexed { index, innerBlock ->
+ InstantViewBlock(
+ block = innerBlock,
+ textSizeMultiplier = textSizeMultiplier,
+ searchQuery = searchQuery,
+ stateKeyPrefix = "$blockStateKey:quote:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
+ onOpenPhotoFullscreen = onOpenPhotoFullscreen,
+ onOpenVideoFullscreen = onOpenVideoFullscreen,
+ onOpenFileExternally = onOpenFileExternally
+ )
+ }
if (block.credit !is RichText.Plain || (block.credit as RichText.Plain).text.isNotEmpty()) {
RichTextView(
richText = block.credit,
style = MaterialTheme.typography.labelMedium,
textSizeMultiplier = textSizeMultiplier,
color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(top = 8.dp)
+ modifier = Modifier.padding(top = 4.dp),
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
}
}
}
+
+ if (useMessageQuoteStyle) {
+ Surface(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(vertical = 4.dp)
+ .drawBehind {
+ val stripeWidth = 3.dp.toPx()
+ val stripeRadius = 999.dp.toPx()
+ drawRoundRect(
+ color = quoteStripeColor.copy(alpha = 0.82f),
+ topLeft = Offset(8.dp.toPx(), 10.dp.toPx()),
+ size = Size(stripeWidth, size.height - 20.dp.toPx()),
+ cornerRadius = CornerRadius(stripeRadius, stripeRadius)
+ )
+ },
+ shape = RoundedCornerShape(12.dp),
+ color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.045f)
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(start = 18.dp, end = 12.dp, top = 10.dp, bottom = 10.dp)
+ ) {
+ quoteContent()
+ }
+ }
+ } else {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .drawBehind {
+ val stripeWidth = 4.dp.toPx()
+ val stripeRadius = 2.dp.toPx()
+ drawRoundRect(
+ color = quoteStripeColor,
+ topLeft = Offset.Zero,
+ size = Size(stripeWidth, size.height),
+ cornerRadius = CornerRadius(stripeRadius, stripeRadius)
+ )
+ }
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(start = 20.dp)
+ ) {
+ quoteContent()
+ }
+ }
+ }
}
is PageBlock.PullQuote -> {
@@ -1006,7 +1162,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
fontStyle = FontStyle.Italic,
textAlign = TextAlign.Center,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
if (block.credit !is RichText.Plain || (block.credit as RichText.Plain).text.isNotEmpty()) {
RichTextView(
@@ -1014,7 +1172,9 @@ fun InstantViewBlock(
style = MaterialTheme.typography.labelMedium,
textSizeMultiplier = textSizeMultiplier,
color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(top = 12.dp)
+ modifier = Modifier.padding(top = 12.dp),
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
}
}
@@ -1022,7 +1182,10 @@ fun InstantViewBlock(
is PageBlock.ListBlock -> Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
block.items.forEach { item ->
- Row(verticalAlignment = Alignment.Top) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.Top
+ ) {
Text(
text = if (item.label.isNotEmpty()) "${item.label} " else "• ",
style = MaterialTheme.typography.bodyLarge.copy(
@@ -1031,13 +1194,19 @@ fun InstantViewBlock(
modifier = Modifier.padding(end = 8.dp),
color = MaterialTheme.colorScheme.primary
)
- Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ Column(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
item.pageBlocks.forEachIndexed { index, innerBlock ->
InstantViewBlock(
block = innerBlock,
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:list_item:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -1053,6 +1222,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:cover",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -1071,8 +1243,7 @@ fun InstantViewBlock(
Surface(
modifier = Modifier.animateContentSize(animationSpec = spring(stiffness = Spring.StiffnessLow)),
shape = RoundedCornerShape(12.dp),
- color = MaterialTheme.colorScheme.surfaceContainer,
- tonalElevation = 1.dp
+ color = MaterialTheme.colorScheme.surfaceContainerHigh
) {
Column {
Row(
@@ -1088,7 +1259,9 @@ fun InstantViewBlock(
richText = block.header,
style = MaterialTheme.typography.titleMedium,
textSizeMultiplier = textSizeMultiplier,
- fontWeight = FontWeight.SemiBold
+ fontWeight = FontWeight.SemiBold,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
}
Icon(
@@ -1109,6 +1282,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:details:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -1128,6 +1304,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:collage:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -1145,6 +1324,9 @@ fun InstantViewBlock(
textSizeMultiplier = textSizeMultiplier,
searchQuery = searchQuery,
stateKeyPrefix = "$blockStateKey:slideshow:$index",
+ useMessageQuoteStyle = useMessageQuoteStyle,
+ onRichTextTap = onRichTextTap,
+ onRichTextLongPress = onRichTextLongPress,
onOpenPhotoFullscreen = onOpenPhotoFullscreen,
onOpenVideoFullscreen = onOpenVideoFullscreen,
onOpenFileExternally = onOpenFileExternally
@@ -1155,52 +1337,102 @@ fun InstantViewBlock(
}
is PageBlock.Table -> {
- Card(
- colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
- shape = RoundedCornerShape(12.dp)
- ) {
- Column(
+ BoxWithConstraints(modifier = Modifier.fillMaxWidth()) {
+ val tableWidth = remember(block.cells, maxWidth) {
+ resolveInstantViewTableWidth(
+ availableWidth = maxWidth,
+ columnCount = block.cells.maxOfOrNull { row ->
+ row.sumOf { it.colspan.coerceAtLeast(1) }
+ } ?: 1
+ )
+ }
+ val dividerColor = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.45f)
+ Box(
modifier = Modifier
.horizontalScroll(rememberScrollState())
- .padding(16.dp)
) {
- if (block.caption !is RichText.Plain || (block.caption as RichText.Plain).text.isNotEmpty()) {
- RichTextView(
- richText = block.caption,
- style = MaterialTheme.typography.titleSmall,
- textSizeMultiplier = textSizeMultiplier,
- modifier = Modifier.padding(bottom = 12.dp),
- color = MaterialTheme.colorScheme.onSurface
- )
- }
- block.cells.forEachIndexed { index, row ->
- Row(modifier = Modifier.fillMaxWidth()) {
- row.forEach { cell ->
- Box(
- modifier = Modifier
- .widthIn(min = 120.dp * cell.colspan)
- .border(
- width = if (block.isBordered) 1.dp else 0.dp,
- color = MaterialTheme.colorScheme.outlineVariant
- )
- .background(
- if (cell.isHeader) MaterialTheme.colorScheme.surfaceContainerHigh else Color.Transparent
+ Column(
+ modifier = Modifier
+ .width(tableWidth)
+ .clip(RoundedCornerShape(12.dp))
+ .background(MaterialTheme.colorScheme.surfaceContainerLow)
+ .padding(12.dp)
+ ) {
+ if (block.caption !is RichText.Plain || (block.caption as RichText.Plain).text.isNotEmpty()) {
+ RichTextView(
+ richText = block.caption,
+ style = MaterialTheme.typography.titleSmall,
+ textSizeMultiplier = textSizeMultiplier,
+ modifier = Modifier.padding(bottom = 10.dp),
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
+ )
+ }
+ block.cells.forEachIndexed { index, row ->
+ val rowBackground = when {
+ row.any { it.isHeader } -> MaterialTheme.colorScheme.surfaceContainerHighest
+ block.isStriped && index % 2 == 1 -> MaterialTheme.colorScheme.surfaceContainer
+ else -> Color.Transparent
+ }
+ val isLastRow = index == block.cells.lastIndex
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .drawBehind {
+ if (!isLastRow) {
+ val lineWidth = 1.dp.toPx()
+ drawLine(
+ color = dividerColor,
+ start = Offset(0f, size.height - lineWidth / 2f),
+ end = Offset(
+ size.width,
+ size.height - lineWidth / 2f
+ ),
+ strokeWidth = lineWidth
+ )
+ }
+ },
+ verticalAlignment = Alignment.Top
+ ) {
+ row.forEachIndexed { cellIndex, cell ->
+ Box(
+ modifier = Modifier
+ .weight(cell.colspan.toFloat())
+ .background(rowBackground)
+ .drawBehind {
+ val lineWidth = 1.dp.toPx()
+ if (cellIndex < row.lastIndex) {
+ drawLine(
+ color = dividerColor,
+ start = Offset(
+ size.width - lineWidth / 2f,
+ 0f
+ ),
+ end = Offset(
+ size.width - lineWidth / 2f,
+ size.height
+ ),
+ strokeWidth = lineWidth
+ )
+ }
+ }
+ .padding(horizontal = 10.dp, vertical = 8.dp)
+ ) {
+ RichTextView(
+ richText = cell.text,
+ style = if (cell.isHeader) MaterialTheme.typography.labelLarge else MaterialTheme.typography.bodyMedium,
+ textSizeMultiplier = textSizeMultiplier,
+ fontWeight = if (cell.isHeader) FontWeight.Bold else FontWeight.Normal,
+ color = MaterialTheme.colorScheme.onSurface,
+ textAlign = cell.align.toTextAlign(),
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
- .padding(8.dp)
- ) {
- RichTextView(
- richText = cell.text,
- style = if (cell.isHeader) MaterialTheme.typography.labelLarge else MaterialTheme.typography.bodyMedium,
- textSizeMultiplier = textSizeMultiplier,
- fontWeight = if (cell.isHeader) FontWeight.Bold else FontWeight.Normal,
- color = MaterialTheme.colorScheme.onSurface
- )
+ }
}
}
}
- if (index < block.cells.size - 1 && !block.isBordered) {
- HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant)
- }
}
}
}
@@ -1213,14 +1445,15 @@ fun InstantViewBlock(
style = MaterialTheme.typography.titleMedium,
textSizeMultiplier = textSizeMultiplier,
fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ onClick = onRichTextTap,
+ onLongClick = onRichTextLongPress
)
block.articles.forEach { article ->
Card(
onClick = { onUrlClick(normalizeUrl(article.url)) },
modifier = Modifier.fillMaxWidth(),
- colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerLow),
- border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)
+ colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh)
) {
ListItem(
headlineContent = {
@@ -1342,6 +1575,14 @@ private sealed interface InstantViewFullscreenMedia {
) : InstantViewFullscreenMedia
}
+private fun HorizontalAlignment.toTextAlign(): TextAlign {
+ return when (this) {
+ HorizontalAlignment.LEFT -> TextAlign.Left
+ HorizontalAlignment.CENTER -> TextAlign.Center
+ HorizontalAlignment.RIGHT -> TextAlign.Right
+ }
+}
+
@Composable
private fun InstantViewPlayablePreview(
stateKey: String,
diff --git a/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewComponents.kt b/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewComponents.kt
index 2c2e92b37..6affd9ac3 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewComponents.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewComponents.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.blur
+import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.takeOrElse
import androidx.compose.ui.input.pointer.pointerInput
@@ -61,12 +62,28 @@ fun RichTextView(
fontStyle: FontStyle? = null,
color: Color = Color.Unspecified,
textAlign: TextAlign? = null,
- maxLines: Int = Int.MAX_VALUE
+ maxLines: Int = Int.MAX_VALUE,
+ onClick: ((Offset) -> Unit)? = null,
+ onLongClick: ((Offset) -> Unit)? = null
) {
val onUrlClick = LocalOnUrlClick.current
val linkColor = MaterialTheme.colorScheme.primary
val annotatedString = remember(richText, linkColor) { renderRichText(richText, linkColor) }
var textLayoutResult by remember { mutableStateOf(null) }
+ val hasInteractiveAnnotations = remember(annotatedString) {
+ annotatedString.getStringAnnotations(tag = "URL", start = 0, end = annotatedString.length)
+ .isNotEmpty() ||
+ annotatedString.getStringAnnotations(
+ tag = "EMAIL",
+ start = 0,
+ end = annotatedString.length
+ ).isNotEmpty() ||
+ annotatedString.getStringAnnotations(
+ tag = "PHONE",
+ start = 0,
+ end = annotatedString.length
+ ).isNotEmpty()
+ }
val scaledStyle = style.copy(
fontSize = style.fontSize * textSizeMultiplier,
@@ -80,55 +97,75 @@ fun RichTextView(
Text(
text = annotatedString,
style = scaledStyle,
- modifier = modifier.pointerInput(annotatedString, onUrlClick) {
- detectTapGestures { position ->
- val layout = textLayoutResult ?: return@detectTapGestures
- val offset = layout.getOffsetForPosition(position)
+ modifier = modifier.then(
+ if (hasInteractiveAnnotations || onClick != null || onLongClick != null) {
+ Modifier.pointerInput(annotatedString, onUrlClick, onClick, onLongClick) {
+ detectTapGestures(
+ onTap = { position ->
+ val layout = textLayoutResult ?: run {
+ onClick?.invoke(position)
+ return@detectTapGestures
+ }
+ val offset = layout.getOffsetForPosition(position)
- when {
- annotatedString.getStringAnnotations(tag = "URL", start = offset, end = offset)
- .firstOrNull() != null -> {
- val annotation = annotatedString.getStringAnnotations(
- tag = "URL",
- start = offset,
- end = offset
- )
- .first()
- onUrlClick(normalizeUrl(annotation.item))
- }
+ val handled = when {
+ annotatedString.getStringAnnotations(
+ tag = "URL",
+ start = offset,
+ end = offset
+ )
+ .firstOrNull() != null -> {
+ val annotation = annotatedString.getStringAnnotations(
+ tag = "URL",
+ start = offset,
+ end = offset
+ ).first()
+ onUrlClick(normalizeUrl(annotation.item))
+ true
+ }
- annotatedString.getStringAnnotations(
- tag = "EMAIL",
- start = offset,
- end = offset
- )
- .firstOrNull() != null -> {
- val annotation = annotatedString.getStringAnnotations(
- tag = "EMAIL",
- start = offset,
- end = offset
- )
- .first()
- onUrlClick("mailto:${annotation.item}")
- }
+ annotatedString.getStringAnnotations(
+ tag = "EMAIL",
+ start = offset,
+ end = offset
+ ).firstOrNull() != null -> {
+ val annotation = annotatedString.getStringAnnotations(
+ tag = "EMAIL",
+ start = offset,
+ end = offset
+ ).first()
+ onUrlClick("mailto:${annotation.item}")
+ true
+ }
+
+ annotatedString.getStringAnnotations(
+ tag = "PHONE",
+ start = offset,
+ end = offset
+ ).firstOrNull() != null -> {
+ val annotation = annotatedString.getStringAnnotations(
+ tag = "PHONE",
+ start = offset,
+ end = offset
+ ).first()
+ onUrlClick("tel:${annotation.item}")
+ true
+ }
- annotatedString.getStringAnnotations(
- tag = "PHONE",
- start = offset,
- end = offset
+ else -> false
+ }
+
+ if (!handled) {
+ onClick?.invoke(position)
+ }
+ },
+ onLongPress = { position -> onLongClick?.invoke(position) }
)
- .firstOrNull() != null -> {
- val annotation = annotatedString.getStringAnnotations(
- tag = "PHONE",
- start = offset,
- end = offset
- )
- .first()
- onUrlClick("tel:${annotation.item}")
- }
}
+ } else {
+ Modifier
}
- },
+ ),
maxLines = maxLines,
onTextLayout = { textLayoutResult = it }
)
diff --git a/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewUtils.kt b/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewUtils.kt
index 55be0be19..2877b560d 100644
--- a/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewUtils.kt
+++ b/presentation/src/main/java/org/monogram/presentation/features/instantview/components/InstantViewUtils.kt
@@ -178,6 +178,18 @@ fun AnnotatedString.Builder.appendRichText(richText: RichText, linkColor: Color)
}
is RichText.Reference -> {
+ withStyle(SpanStyle(color = linkColor, textDecoration = TextDecoration.Underline)) {
+ if (richText.url.isNotBlank()) {
+ pushStringAnnotation(tag = "URL", annotation = richText.url)
+ }
+ appendRichText(richText.text, linkColor)
+ if (richText.url.isNotBlank()) {
+ pop()
+ }
+ }
+ }
+
+ is RichText.ReferenceLink -> {
pushStringAnnotation(tag = "URL", annotation = richText.url)
withStyle(SpanStyle(color = linkColor, textDecoration = TextDecoration.Underline)) {
appendRichText(richText.text, linkColor)
@@ -185,6 +197,18 @@ fun AnnotatedString.Builder.appendRichText(richText: RichText, linkColor: Color)
pop()
}
+ is RichText.Diff -> {
+ withStyle(SpanStyle(textDecoration = TextDecoration.LineThrough, color = Color.Gray)) {
+ appendRichText(richText.oldText, linkColor)
+ }
+ val newText = richTextPlainText(richText.text)
+ val oldText = richTextPlainText(richText.oldText)
+ if (oldText.isNotBlank() && newText.isNotBlank()) {
+ append(" -> ")
+ }
+ appendRichText(richText.text, linkColor)
+ }
+
is RichText.Subscript -> withStyle(SpanStyle(baselineShift = BaselineShift.Subscript)) {
appendRichText(richText.text, linkColor)
}
@@ -213,7 +237,9 @@ fun PageBlock.containsText(query: String): Boolean {
is PageBlock.Footer -> footer.containsText(query)
is PageBlock.Thinking -> text.containsText(query)
is PageBlock.MathematicalExpression -> expression.contains(query, ignoreCase = true)
- is PageBlock.BlockQuote -> text.containsText(query) || credit.containsText(query)
+ is PageBlock.BlockQuote -> pageBlocks.any { it.containsText(query) } || credit.containsText(
+ query
+ )
is PageBlock.PullQuote -> text.containsText(query) || credit.containsText(query)
is PageBlock.ListBlock -> items.any { item ->
item.label.contains(
@@ -250,6 +276,9 @@ fun PageBlock.containsText(query: String): Boolean {
is PageBlock.Anchor -> name.contains(query, ignoreCase = true)
is PageBlock.AudioBlock -> caption.text.containsText(query) || caption.credit.containsText(query)
+ is PageBlock.VoiceNoteBlock -> caption.text.containsText(query) || caption.credit.containsText(
+ query
+ )
is PageBlock.Cover -> cover.containsText(query)
PageBlock.Divider -> false
is PageBlock.Embedded -> caption.text.containsText(query) || caption.credit.containsText(query) || url.contains(
@@ -319,6 +348,12 @@ fun RichText.containsText(query: String): Boolean {
query,
ignoreCase = true
) || url.contains(query, ignoreCase = true)
+ is RichText.ReferenceLink -> text.containsText(query) || referenceName.contains(
+ query,
+ ignoreCase = true
+ ) || url.contains(query, ignoreCase = true)
+
+ is RichText.Diff -> text.containsText(query) || oldText.containsText(query)
is RichText.Subscript -> text.containsText(query)
is RichText.Superscript -> text.containsText(query)
diff --git a/presentation/src/main/res/values/string.xml b/presentation/src/main/res/values/string.xml
index e2ce565dd..080cad177 100644
--- a/presentation/src/main/res/values/string.xml
+++ b/presentation/src/main/res/values/string.xml
@@ -1557,8 +1557,8 @@
Apply
Done
Refresh
- Fullscreen editor
- Editor
+ Open fullscreen
+ Compose
Send silently
Schedule message
Scheduled messages
@@ -1665,6 +1665,20 @@
Edit
Markdown: on
Markdown: off
+ Plain
+ Markdown
+ HTML
+ Failed to parse markup
+ HTML pre
+ LaTeX
+ Block LaTeX
+ Heading 1
+ Heading 2
+ Heading 3
+ Bulleted list
+ Numbered list
+ Divider
+ Table
A+
A-
Snippets
@@ -1683,9 +1697,11 @@
Cut
Paste
AI
- AI editor
+ AI tools
+ Translate, rewrite, or fix text
Translate
Stylize
+ Generate
Fix
Original
Result
@@ -1693,7 +1709,9 @@
Apply result
Translate text
Apply style
+ Generate text
Fix text
+ Prompt
Target language
Select language
No languages found
@@ -1707,8 +1725,10 @@
Add emojis
Processing...
Enter text to use AI
+ Enter a prompt to generate text
Too many AI requests. Telegram Premium may be required.
AI processing failed
+ Describe what to generate…
Insert
Prev
Next
@@ -1721,6 +1741,7 @@
Spoiler
Code
Monospace
+ Quote
Link
Mention
Emoji
@@ -2497,6 +2518,7 @@
Play Video
Play Animation
Audio
+ Voice note
Unknown Artist
Play
Open
diff --git a/presentation/src/test/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/EditorRichTextParsingTest.kt b/presentation/src/test/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/EditorRichTextParsingTest.kt
new file mode 100644
index 000000000..c15b850d2
--- /dev/null
+++ b/presentation/src/test/java/org/monogram/presentation/features/chats/conversation/ui/inputbar/EditorRichTextParsingTest.kt
@@ -0,0 +1,59 @@
+package org.monogram.presentation.features.chats.conversation.ui.inputbar
+
+import androidx.compose.ui.text.AnnotatedString
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.monogram.domain.models.MessageEntityType
+import org.monogram.presentation.features.chats.conversation.ui.message.model.entitiesForBlock
+import org.monogram.presentation.features.chats.conversation.ui.message.model.topLevelBlockEntities
+
+class EditorRichTextParsingTest {
+ @Test
+ fun `markdown quote keeps nested table content`() {
+ val input = AnnotatedString(
+ "> A | B\n> --- | ---\n> 1 | 2\n> 3 | 4"
+ )
+
+ val parsed = MarkdownRichTextParser(input).parse()
+
+ assertTrue(parsed.text.contains("┌"))
+ assertTrue(parsed.text.contains("1"))
+ assertTrue(parsed.text.contains("4"))
+ assertFalse(parsed.text.contains(">"))
+ }
+
+ @Test
+ fun `markdown quote table is extracted as nested table block`() {
+ val input = AnnotatedString(
+ "> | A | B |\n> | --- | --- |\n> | 1 | 2 |"
+ )
+
+ val parsed = MarkdownRichTextParser(input).parse()
+ val entities = extractEntities(parsed, emptyMap())
+
+ assertTrue(parsed.text.contains("┌"))
+ assertTrue(parsed.text.contains("│ A │ B │"))
+ assertEquals(1, entities.count { it.type is MessageEntityType.BlockQuote })
+ assertEquals(1, entities.count { (it.type as? MessageEntityType.Pre)?.language == "table" })
+ }
+
+ @Test
+ fun `markdown quote table keeps table nested under top level quote block`() {
+ val input = AnnotatedString(
+ "> | A | B |\n> | --- | --- |\n> | 1 | 2 |"
+ )
+
+ val parsed = MarkdownRichTextParser(input).parse()
+ val entities = extractEntities(parsed, emptyMap())
+ val topLevelBlock = entities.topLevelBlockEntities().single()
+
+ assertTrue(topLevelBlock.type is MessageEntityType.BlockQuote)
+ assertEquals(
+ 1,
+ entities.entitiesForBlock(topLevelBlock)
+ .count { (it.type as? MessageEntityType.Pre)?.language == "table" }
+ )
+ }
+}
diff --git a/README_ES.md b/README_ES.md
index 07bb42cd7..4ebb06f2c 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -15,7 +15,7 @@
- 
+ 
diff --git a/README_UR.md b/README_UR.md
index dc7fd1f4f..ce3876a4d 100644
--- a/README_UR.md
+++ b/README_UR.md
@@ -15,7 +15,7 @@