fix(chat): scroll long composer model names (#1129)

This commit is contained in:
M57 authored and GitHub committed 2026-09-15 21:13:23 +03:00
1 parent 74f10ec119
commit e6b441cfc6
2 files changed
+149 -33

No files matched your search

@@ -8,17 +8,21 @@ import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.horizontalScroll
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.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Send
@@ -40,6 +44,7 @@ import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@@ -47,6 +52,7 @@ 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.clipToBounds
import androidx.compose.ui.draw.scale
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
@@ -127,32 +133,46 @@ fun ComposerToolbar(
// Model + reasoning pill — wraps its content inside the free space,
// pushing the mic/action buttons to the far end
val modelScrollState = rememberScrollState()
LaunchedEffect(currentSessionModel) {
modelScrollState.scrollTo(0)
}
Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterStart) {
Row(
modifier =
Modifier
.width(IntrinsicSize.Max)
.height(ControlSize)
.clip(CircleShape)
.background(palette.control),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
// Keeps the provider so same-named models from different providers
// stay distinguishable; trims from the middle when tight.
text = currentSessionModel?.let(::composerModelLabel) ?: "Model",
style = MaterialTheme.typography.bodyMedium,
color = palette.onControl,
maxLines = 1,
overflow = TextOverflow.MiddleEllipsis,
Box(
modifier =
Modifier
.weight(1f, fill = false)
.weight(1f)
.fillMaxHeight()
.clipToBounds()
.horizontalScroll(modelScrollState)
.clickable(onClick = onModelTap)
.wrapContentHeight()
.padding(start = 16.dp, end = 6.dp)
.testTag("model_chip"),
)
) {
Text(
// Keeps the provider so same-named models from different providers
// stay distinguishable while allowing the full label to be revealed.
text = currentSessionModel?.let(::composerModelLabel) ?: "Model",
style = MaterialTheme.typography.bodyMedium,
color = palette.onControl,
maxLines = 1,
softWrap = false,
overflow = TextOverflow.Clip,
modifier =
Modifier
.fillMaxHeight()
.wrapContentHeight()
.padding(start = 16.dp, end = 6.dp),
)
}
Box {
Row(