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

fix(#571): make clarify dialog scrollable so long questions/options aren't clipped (#579)

Browse Source 
Co-authored-by: M57 <m57@hermes-control.app>
This commit is contained in:
M57andM57 authored and GitHub committed 2026-07-13 18:15:26 +03:00
1 parent 594255d534
commit 109fb1a04d
1 file changed
+43 -33
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+43 -33
View File
@@ -43,10 +43,12 @@ import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.InsertDriveFile import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
import androidx.compose.material.icons.automirrored.filled.Send import androidx.compose.material.icons.automirrored.filled.Send
@@ -1049,45 +1051,53 @@ private fun ClarifyDialog(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
title = { Text(stringResource(R.string.chat_clarify_title)) }, title = { Text(stringResource(R.string.chat_clarify_title)) },
text = { text = {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { Column(modifier = Modifier.fillMaxWidth()) {
Text(text = clarify.text) Column(
modifier =
Modifier
.weight(1f, fill = false)
.verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
Text(text = clarify.text)
if (clarify.options.isNotEmpty()) { if (clarify.options.isNotEmpty()) {
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Text( Text(
text = stringResource(R.string.chat_clarify_hint), text = stringResource(R.string.chat_clarify_hint),
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
clarify.options.forEach { option -> clarify.options.forEach { option ->
Surface( Surface(
onClick = { typedText = option }, onClick = { typedText = option },
modifier =
Modifier
.fillMaxWidth()
.testTag("clarify_option"),
shape = MaterialTheme.shapes.medium,
color = MaterialTheme.colorScheme.secondaryContainer,
) {
Box(
modifier = modifier =
Modifier Modifier
.combinedClickable( .fillMaxWidth()
role = Role.Button, .testTag("clarify_option"),
onClick = { typedText = option }, shape = MaterialTheme.shapes.medium,
onLongClick = { onOptionSelected(option) }, color = MaterialTheme.colorScheme.secondaryContainer,
).padding(horizontal = 24.dp, vertical = 10.dp),
contentAlignment = Alignment.Center,
) { ) {
Text( Box(
text = option, modifier =
color = MaterialTheme.colorScheme.onSecondaryContainer, Modifier
style = MaterialTheme.typography.labelLarge, .combinedClickable(
) role = Role.Button,
onClick = { typedText = option },
onLongClick = { onOptionSelected(option) },
).padding(horizontal = 24.dp, vertical = 10.dp),
contentAlignment = Alignment.Center,
) {
Text(
text = option,
color = MaterialTheme.colorScheme.onSecondaryContainer,
style = MaterialTheme.typography.labelLarge,
)
}
} }
Spacer(modifier = Modifier.height(4.dp))
} }
Spacer(modifier = Modifier.height(4.dp))
} }
} }