@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Row
2626import androidx.compose.foundation.layout.Spacer
2727import androidx.compose.foundation.layout.fillMaxSize
2828import androidx.compose.foundation.layout.fillMaxWidth
29−import androidx.compose.foundation.layout.heightIn
3029import androidx.compose.foundation.layout.PaddingValues
3130import androidx.compose.foundation.layout.WindowInsets
3231import androidx.compose.foundation.layout.ime
@@ -46,7 +45,6 @@ import androidx.compose.material.icons.automirrored.filled.Send
4645import androidx.compose.material.icons.filled.ChatBubbleOutline
4746import androidx.compose.material.icons.filled.Close
4847import androidx.compose.material.icons.filled.KeyboardArrowDown
49−import androidx.compose.material.icons.filled.KeyboardArrowUp
5048import androidx.compose.material.icons.filled.Stop
5149import androidx.compose.material3.CircularProgressIndicator
5250import androidx.compose.material3.ExperimentalMaterial3Api
@@ -61,7 +59,6 @@ import androidx.compose.material3.OutlinedTextField
6159import androidx.compose.material3.Scaffold
6260import androidx.compose.material3.Surface
6361import androidx.compose.material3.Text
64−import androidx.compose.material3.TextButton
6562import androidx.compose.material3.TopAppBar
6663import androidx.compose.runtime.Composable
6764import androidx.compose.runtime.LaunchedEffect
@@ -75,7 +72,6 @@ import androidx.compose.ui.Alignment
7572import androidx.compose.ui.Modifier
7673import androidx.compose.ui.draw.clip
7774import androidx.compose.ui.hapticfeedback.HapticFeedbackType
78−import androidx.compose.ui.platform.LocalClipboardManager
7975import androidx.compose.ui.platform.LocalContext
8076import androidx.compose.ui.platform.LocalDensity
8177import androidx.compose.ui.platform.LocalHapticFeedback
@@ -113,12 +109,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
113109 }
114110 }
115111
116− // Offer a jump-to-top shortcut once the conversation is long and the user has
117− // scrolled a few messages down — saves flick-scrolling back through history.
118− val showScrollTop by remember {
119− derivedStateOf { state.messages.size > 10 && listState.firstVisibleItemIndex > 3 }
120− }
121−
122112 // Track how many messages the user has "seen" (i.e. was at the bottom for). While
123113 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
124114 var lastSeenCount by remember { mutableStateOf(0) }
@@ -269,14 +259,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
269259 }
270260 },
271261 )
272− ScrollToTopButton(
273− visible = showScrollTop,
274− onClick = {
275− coroutineScope.launch {
276− listState.animateScrollToItem(0)
277− }
278− },
279− )
280262 }
281263 }
282264 }
@@ -316,30 +298,6 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,
316298 }
317299}
318300
319−// Mirror of ScrollToBottomButton, pinned to the top-start corner. Same BoxScope
320−// extension trick so the top-level AnimatedVisibility overload resolves cleanly.
321−@Composable
322−private fun BoxScope.ScrollToTopButton(visible: Boolean, onClick: () -> Unit) {
323− AnimatedVisibility(
324− visible = visible,
325− modifier = Modifier.align(Alignment.TopStart),
326− enter = scaleIn() + fadeIn(),
327− exit = scaleOut() + fadeOut(),
328− ) {
329− Box(Modifier.padding(16.dp)) {
330− FloatingActionButton(
331− onClick = onClick,
332− modifier = Modifier.size(44.dp),
333− ) {
334− Icon(
335− Icons.Filled.KeyboardArrowUp,
336− contentDescription = "Scroll to top",
337− )
338− }
339− }
340− }
341−}
342−
343301private fun copyToClipboard(context: Context, text: String) {
344302 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
345303 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
@@ -497,41 +455,19 @@ private fun ChatInputBar(
497455 onStop: () -> Unit,
498456) {
499457 val haptic = LocalHapticFeedback.current
500− val clipboardManager = LocalClipboardManager.current
501458 Surface(tonalElevation = 3.dp) {
502− Column(
503− modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
504− ) {
505459 Row(
506− modifier = Modifier.fillMaxWidth(),
460+ modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
507461 verticalAlignment = Alignment.Bottom,
508462 horizontalArrangement = Arrangement.spacedBy(8.dp),
509463 ) {
510464 OutlinedTextField(
511465 value = draft,
512466 onValueChange = onDraftChange,
513− modifier = Modifier.weight(1f).heightIn(min = 48.dp),
467+ modifier = Modifier.weight(1f),
514468 enabled = !loading,
515469 placeholder = { Text("Message opencode…") },
516470 maxLines = 5,
517− // Offer a quick way to wipe the draft once there's something to clear
518− // and we're not mid-generation (where the field is a poor place to fuss).
519− trailingIcon = if (draft.isNotEmpty() && !generating) {
520− {
521− IconButton(
522− onClick = { onDraftChange("") },
523− modifier = Modifier.size(20.dp),
524− ) {
525− Icon(
526− Icons.Filled.Close,
527− contentDescription = "Clear draft",
528− modifier = Modifier.size(16.dp),
529− )
530− }
531− }
532− } else {
533− null
534− },
535471 // Surface a running count once the draft gets long, so the user has a
536472 // sense of scale before sending a wall of text.
537473 supportingText = if (draft.length > 500) {
@@ -574,17 +510,5 @@ private fun ChatInputBar(
574510 }
575511 }
576512 }
577− // With nothing typed yet, offer a one-tap way to drop in clipboard contents.
578− if (draft.isEmpty() && !generating && !loading) {
579− TextButton(
580− onClick = {
581− clipboardManager.getText()?.text?.let { onDraftChange(it) }
582− },
583− contentPadding = PaddingValues(0.dp),
584− ) {
585− Text("Paste")
586− }
587− }
588− }
589513 }
590514}