yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Merge pull request #1061 from Hy4ri/feat/group-chat-bidi-rtl

Browse Source 
feat(group-chat): support dynamic BiDi Arabic input and RTL message bubbles
This commit is contained in:
M57 authored and GitHub committed 2026-09-04 15:50:02 +03:00
2 parents 2d0d749cbe fd011ac78d
commit 31e292d7fe
1 file changed
+107 -44
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/m57/hermescontrol/ui/bots/group/GroupChatScreen.kt
+107 -44
View File
@@ -87,6 +87,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
@@ -274,6 +275,8 @@ fun GroupChatScreen(
state.activeSpeaker?.let { speaker -> state.activeSpeaker?.let { speaker ->
item(key = "active_speaker") { item(key = "active_speaker") {
val thinkingText = stringResource(R.string.group_chat_thinking, speaker)
val isThinkingRtl = remember(thinkingText) { BidiUtils.isRtlText(thinkingText) }
Row( Row(
modifier = Modifier.padding(start = 8.dp, top = 4.dp), modifier = Modifier.padding(start = 8.dp, top = 4.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -284,8 +287,16 @@ fun GroupChatScreen(
) )
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
Text( Text(
text = stringResource(R.string.group_chat_thinking, speaker), text = thinkingText,
style = MaterialTheme.typography.bodySmall, style =
MaterialTheme.typography.bodySmall.copy(
textDirection =
if (isThinkingRtl) {
TextDirection.ContentOrRtl
} else {
TextDirection.ContentOrLtr
},
),
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
) )
} }
@@ -409,11 +420,37 @@ fun GroupChatScreen(
} }
// ── COMPOSER (uses TextFieldValue + embedded Send button matching ChatComposer) ── // ── COMPOSER (uses TextFieldValue + embedded Send button matching ChatComposer) ──
Surface( val ambientLayoutDirection = LocalLayoutDirection.current
val inputLayoutDirection =
remember(inputFieldValue.text, ambientLayoutDirection) {
BidiUtils.resolveLayoutDirection(inputFieldValue.text, fallback = ambientLayoutDirection)
}
val isInputRtl = inputLayoutDirection == LayoutDirection.Rtl
CompositionLocalProvider(LocalLayoutDirection provides inputLayoutDirection) {
BasicTextField(
value = inputFieldValue,
onValueChange = { inputFieldValue = it },
modifier = modifier =
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 4.dp), .padding(horizontal = 12.dp, vertical = 4.dp)
.onFocusChanged { isFocused = it.isFocused }
.testTag("group_chat_input"),
textStyle =
MaterialTheme.typography.bodyMedium.copy(
color = MaterialTheme.colorScheme.onSurface,
textAlign = if (isInputRtl) TextAlign.Right else TextAlign.Left,
textDirection = if (isInputRtl) TextDirection.Rtl else TextDirection.Ltr,
),
singleLine = false,
maxLines = 4,
cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
keyboardActions = KeyboardActions(onSend = { handleSend() }),
decorationBox = { innerTextField ->
CompositionLocalProvider(LocalLayoutDirection provides ambientLayoutDirection) {
Surface(
shape = RoundedCornerShape(20.dp), shape = RoundedCornerShape(20.dp),
border = border =
BorderStroke( BorderStroke(
@@ -426,6 +463,7 @@ fun GroupChatScreen(
}, },
), ),
color = MaterialTheme.colorScheme.surface, color = MaterialTheme.colorScheme.surface,
modifier = Modifier.fillMaxWidth(),
) { ) {
Row( Row(
modifier = modifier =
@@ -434,23 +472,16 @@ fun GroupChatScreen(
.padding(start = 14.dp, end = 4.dp, top = 6.dp, bottom = 6.dp), .padding(start = 14.dp, end = 4.dp, top = 6.dp, bottom = 6.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
val isInputRtl = remember(inputFieldValue.text) { BidiUtils.isRtlText(inputFieldValue.text) }
val ambientLayoutDirection = LocalLayoutDirection.current
val inputLayoutDirection =
remember(inputFieldValue.text, ambientLayoutDirection) {
if (inputFieldValue.text.isBlank()) {
ambientLayoutDirection
} else if (isInputRtl) {
LayoutDirection.Rtl
} else {
LayoutDirection.Ltr
}
}
Box( Box(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
contentAlignment = if (isInputRtl) Alignment.CenterEnd else Alignment.CenterStart, contentAlignment =
if (isInputRtl) {
Alignment.CenterEnd
} else {
Alignment.CenterStart
},
) { ) {
CompositionLocalProvider(LocalLayoutDirection provides inputLayoutDirection) {
if (inputFieldValue.text.isEmpty()) { if (inputFieldValue.text.isEmpty()) {
Text( Text(
text = text =
@@ -459,32 +490,15 @@ fun GroupChatScreen(
state.groupName.ifBlank { groupName }, state.groupName.ifBlank { groupName },
), ),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f), color =
MaterialTheme.colorScheme.onSurfaceVariant.copy(
alpha = 0.6f,
),
textAlign = if (isInputRtl) TextAlign.Right else TextAlign.Left, textAlign = if (isInputRtl) TextAlign.Right else TextAlign.Left,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
} }
CompositionLocalProvider(LocalLayoutDirection provides inputLayoutDirection) { innerTextField()
BasicTextField(
value = inputFieldValue,
onValueChange = { inputFieldValue = it },
modifier =
Modifier
.fillMaxWidth()
.heightIn(min = 24.dp, max = 120.dp)
.onFocusChanged { isFocused = it.isFocused }
.testTag("group_chat_input"),
textStyle =
MaterialTheme.typography.bodyMedium.copy(
color = MaterialTheme.colorScheme.onSurface,
textAlign = if (isInputRtl) TextAlign.Right else TextAlign.Left,
),
singleLine = false,
maxLines = 4,
cursorBrush = SolidColor(MaterialTheme.colorScheme.primary),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
keyboardActions = KeyboardActions(onSend = { handleSend() }),
)
} }
} }
@@ -529,6 +543,10 @@ fun GroupChatScreen(
} }
} }
} }
},
)
}
}
} }
if (showSettingsDialog) { if (showSettingsDialog) {
@@ -865,6 +883,8 @@ private fun GroupMessageCard(
message.text message.text
} }
} }
val isSystemRtl = remember(displayText) { BidiUtils.isRtlText(displayText) }
val systemDirection = if (isSystemRtl) LayoutDirection.Rtl else LocalLayoutDirection.current
Box( Box(
modifier = modifier.fillMaxWidth().padding(vertical = 4.dp), modifier = modifier.fillMaxWidth().padding(vertical = 4.dp),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
@@ -874,6 +894,7 @@ private fun GroupMessageCard(
color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = if (message.isPass) 0.5f else 0.6f), color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = if (message.isPass) 0.5f else 0.6f),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)), border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)),
) { ) {
CompositionLocalProvider(LocalLayoutDirection provides systemDirection) {
Row( Row(
modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp), modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -889,13 +910,24 @@ private fun GroupMessageCard(
} }
Text( Text(
text = displayText, text = displayText,
style = MaterialTheme.typography.labelSmall, style =
MaterialTheme.typography.labelSmall.copy(
textDirection =
if (isSystemRtl) {
TextDirection.ContentOrRtl
} else {
TextDirection.ContentOrLtr
},
),
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
} }
} }
} }
}
} else if (message.isUser) { } else if (message.isUser) {
val isUserRtl = remember(message.text) { BidiUtils.isRtlText(message.text) }
val userBubbleDirection = if (isUserRtl) LayoutDirection.Rtl else LocalLayoutDirection.current
Row( Row(
modifier = modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.End, horizontalArrangement = Arrangement.End,
@@ -905,11 +937,20 @@ private fun GroupMessageCard(
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
modifier = Modifier.fillMaxWidth(0.85f), modifier = Modifier.fillMaxWidth(0.85f),
) { ) {
CompositionLocalProvider(LocalLayoutDirection provides userBubbleDirection) {
Column(modifier = Modifier.padding(12.dp)) { Column(modifier = Modifier.padding(12.dp)) {
SelectionContainer { SelectionContainer {
Text( Text(
text = message.text, text = message.text,
style = MaterialTheme.typography.bodyMedium, style =
MaterialTheme.typography.bodyMedium.copy(
textDirection =
if (isUserRtl) {
TextDirection.ContentOrRtl
} else {
TextDirection.ContentOrLtr
},
),
color = MaterialTheme.colorScheme.onPrimary, color = MaterialTheme.colorScheme.onPrimary,
) )
} }
@@ -950,7 +991,9 @@ private fun GroupMessageCard(
} }
} }
} }
}
} else { } else {
val isBotNameRtl = remember(message.senderDisplayName) { BidiUtils.isRtlText(message.senderDisplayName) }
Row( Row(
modifier = modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Start, horizontalArrangement = Arrangement.Start,
@@ -970,7 +1013,15 @@ private fun GroupMessageCard(
Column(modifier = Modifier.padding(12.dp)) { Column(modifier = Modifier.padding(12.dp)) {
Text( Text(
text = message.senderDisplayName, text = message.senderDisplayName,
style = MaterialTheme.typography.labelMedium, style =
MaterialTheme.typography.labelMedium.copy(
textDirection =
if (isBotNameRtl) {
TextDirection.ContentOrRtl
} else {
TextDirection.ContentOrLtr
},
),
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.primary, color = MaterialTheme.colorScheme.primary,
) )
@@ -1112,9 +1163,13 @@ private fun GroupChatToolChip(
} else { } else {
tool.name tool.name
} }
val isLabelRtl = remember(label) { BidiUtils.isRtlText(label) }
Text( Text(
text = label, text = label,
style = MaterialTheme.typography.labelSmall, style =
MaterialTheme.typography.labelSmall.copy(
textDirection = if (isLabelRtl) TextDirection.ContentOrRtl else TextDirection.ContentOrLtr,
),
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
@@ -1160,6 +1215,7 @@ private fun GroupChatToolChip(
style = style =
MaterialTheme.typography.bodySmall.copy( MaterialTheme.typography.bodySmall.copy(
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
textDirection = TextDirection.Ltr,
), ),
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp), modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp),
@@ -1175,6 +1231,7 @@ private fun GroupChatToolChip(
tool.exitCode == 0 -> stringResource(R.string.group_chat_tool_no_output_success) tool.exitCode == 0 -> stringResource(R.string.group_chat_tool_no_output_success)
else -> stringResource(R.string.group_chat_tool_no_output) else -> stringResource(R.string.group_chat_tool_no_output)
} }
val isOutputRtl = remember(outputText) { BidiUtils.isRtlText(outputText) }
Surface( Surface(
shape = RoundedCornerShape(4.dp), shape = RoundedCornerShape(4.dp),
@@ -1187,6 +1244,12 @@ private fun GroupChatToolChip(
style = style =
MaterialTheme.typography.bodySmall.copy( MaterialTheme.typography.bodySmall.copy(
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
textDirection =
if (isOutputRtl) {
TextDirection.ContentOrRtl
} else {
TextDirection.Ltr
},
), ),
color = color =
if (tool.isError) { if (tool.isError) {