git.iko.soy/opencode-android
on 61d16d0 help sign in
5 files changed+5−122
since splitsnapshots
unifiedsplit
app/src/main/java/soy/iko/opencode/CoreViewModel.kt−5 app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+1−12 app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+2−44 app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+1−41 app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+1−20
app/src/main/java/soy/iko/opencode/CoreViewModel.kt−5
@@ -23,9 +23,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
2323 init {
2424 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }
2525 prefs.getString(KEY_USER, null)?.let { core.dispatch(Event.UsernameChanged(it)) }
26− // The password is stored in plain text in SharedPreferences — a deliberate
27− // convenience trade-off for a local dev tool so reconnecting is one tap.
28− prefs.getString(KEY_PASSWORD, null)?.let { core.dispatch(Event.PasswordChanged(it)) }
2926
3027 // On a fresh process after a configuration change, resume the SSE stream if
3128 // the core is already connected (no-op otherwise — it guards on `connected`).
@@ -47,7 +44,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
4744 prefs.edit {
4845 putString(KEY_URL, state.serverUrl)
4946 putString(KEY_USER, state.username)
50− putString(KEY_PASSWORD, state.password)
5147 }
5248 }
5349 }
@@ -61,6 +57,5 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
6157 private companion object {
6258 const val KEY_URL = "serverUrl"
6359 const val KEY_USER = "username"
64− const val KEY_PASSWORD = "password"
6560 }
6661}
app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+1−12
@@ -236,18 +236,7 @@ class OpencodeCore(
236236 if (connected && sse == null) startSse()
237237 }
238238
239− fun shutdown() {
240− // Cancel every tracked coroutine before tearing down the stream so none can
241− // emit into a cancelled scope after the ViewModel is cleared.
242− connectJob?.cancel()
243− loadSessionsJob?.cancel()
244− createSessionJob?.cancel()
245− loadMessagesJob?.cancel()
246− deleteSessionJob?.cancel()
247− sendMessageJob?.cancel()
248− abortJob?.cancel()
249− closeSse()
250− }
239+ fun shutdown() = closeSse()
251240
252241 // ── Effects ────────────────────────────────────────────────────────────────
253242 private fun sendMessage(raw: String) {
app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+2−44
@@ -232,50 +232,13 @@ private fun AnnotatedString.Builder.appendLinkedText(
232232 // Bold is the outermost inline layer: split on ** first so a bold span can wrap
233233 // inline code and links inside it. Odd-indexed segments sit between a pair of **
234234 // markers, so they're bold (markers dropped); even segments are ordinary prose.
235− // Only the non-bold (even) segments get single-* italic handling — splitting a bold
236− // segment on "*" would misfire on the leftover asterisks from the ** markers.
237235 val segments = text.split("**")
238− // An even segment count means an odd number of ** markers, so the final ** is unclosed:
239− // its trailing segment isn't bold. Restore the literal ** and render it as ordinary prose.
240− val unclosed = segments.size % 2 == 0
241236 segments.forEachIndexed { index, segment ->
242− val isUnclosedTail = unclosed && index == segments.size - 1
243− if (index % 2 == 1 && !isUnclosedTail) {
237+ if (index % 2 == 1) {
244238 withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
245239 appendInlineCode(segment, linkColor, codeBackground, context)
246240 }
247241 } else {
248− if (isUnclosedTail) append("**")
249− appendItalicText(segment, linkColor, codeBackground, context)
250− }
251− }
252−}
253−
254−/**
255− * Append [text] to the builder, rendering single-asterisk pairs as italic. Double
256− * asterisks are already consumed as bold upstream in [appendLinkedText], so only lone
257− * `*` markers reach here. Each segment then flows through inline-code and URL handling.
258− */
259−private fun AnnotatedString.Builder.appendItalicText(
260− text: String,
261− linkColor: Color,
262− codeBackground: Color,
263− context: Context,
264−) {
265− // Odd-indexed segments sit between a pair of single asterisks, so they're italic
266− // (markers dropped); even segments are ordinary prose.
267− val segments = text.split("*")
268− // An even segment count means an odd number of * markers, so the final * is unclosed:
269− // its trailing segment isn't italic. Restore the literal * and render it as prose.
270− val unclosed = segments.size % 2 == 0
271− segments.forEachIndexed { index, segment ->
272− val isUnclosedTail = unclosed && index == segments.size - 1
273− if (index % 2 == 1 && !isUnclosedTail) {
274− withStyle(SpanStyle(fontStyle = FontStyle.Italic)) {
275− appendInlineCode(segment, linkColor, codeBackground, context)
276− }
277− } else {
278− if (isUnclosedTail) append("*")
279242 appendInlineCode(segment, linkColor, codeBackground, context)
280243 }
281244 }
@@ -295,17 +258,12 @@ private fun AnnotatedString.Builder.appendInlineCode(
295258 // Odd-indexed segments sit between a pair of single backticks, so they're inline
296259 // code. Even segments are ordinary prose and get URL linking applied.
297260 val segments = text.split("`")
298− // An even segment count means an odd number of backtick markers, so the final backtick
299− // is unclosed: its trailing segment isn't code. Restore the literal ` and treat as prose.
300− val unclosed = segments.size % 2 == 0
301261 segments.forEachIndexed { index, segment ->
302− val isUnclosedTail = unclosed && index == segments.size - 1
303− if (index % 2 == 1 && !isUnclosedTail) {
262+ if (index % 2 == 1) {
304263 withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {
305264 append(segment)
306265 }
307266 } else {
308− if (isUnclosedTail) append("`")
309267 appendUrls(segment, linkColor, context)
310268 }
311269 }
app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+1−41
@@ -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
@@ -113,12 +111,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
113111 }
114112 }
115113
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−
122114 // Track how many messages the user has "seen" (i.e. was at the bottom for). While
123115 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
124116 var lastSeenCount by remember { mutableStateOf(0) }
@@ -269,14 +261,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
269261 }
270262 },
271263 )
272− ScrollToTopButton(
273− visible = showScrollTop,
274− onClick = {
275− coroutineScope.launch {
276− listState.animateScrollToItem(0)
277− }
278− },
279− )
280264 }
281265 }
282266 }
@@ -316,30 +300,6 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,
316300 }
317301}
318302
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−
343303private fun copyToClipboard(context: Context, text: String) {
344304 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
345305 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
@@ -510,7 +470,7 @@ private fun ChatInputBar(
510470 OutlinedTextField(
511471 value = draft,
512472 onValueChange = onDraftChange,
513− modifier = Modifier.weight(1f).heightIn(min = 48.dp),
473+ modifier = Modifier.weight(1f),
514474 enabled = !loading,
515475 placeholder = { Text("Message opencode…") },
516476 maxLines = 5,
app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+1−20
@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.size
2222import androidx.compose.foundation.lazy.LazyColumn
2323import androidx.compose.foundation.lazy.items
2424import androidx.compose.foundation.lazy.rememberLazyListState
25−import androidx.compose.foundation.shape.CircleShape
2625import androidx.compose.material.icons.Icons
2726import androidx.compose.material.icons.automirrored.filled.ArrowBack
2827import androidx.compose.material.icons.filled.Add
@@ -58,8 +57,6 @@ import androidx.compose.runtime.remember
5857import androidx.compose.runtime.setValue
5958import androidx.compose.ui.Alignment
6059import androidx.compose.ui.Modifier
61−import androidx.compose.ui.draw.clip
62−import androidx.compose.ui.graphics.Color
6360import androidx.compose.ui.hapticfeedback.HapticFeedbackType
6461import androidx.compose.ui.platform.LocalContext
6562import androidx.compose.ui.platform.LocalHapticFeedback
@@ -119,23 +116,7 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
119116 Scaffold(
120117 topBar = {
121118 TopAppBar(
122− title = {
123− Row(verticalAlignment = Alignment.CenterVertically) {
124− // A quick at-a-glance health dot for the SSE stream: green when
125− // connected, error-tinted when the stream is down (updates stall).
126− Box(
127− modifier = Modifier
128− .size(8.dp)
129− .clip(CircleShape)
130− .background(
131− if (state.sseConnected) Color(0xFF4CAF50)
132− else MaterialTheme.colorScheme.error,
133− ),
134− )
135− Spacer(Modifier.size(8.dp))
136− Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions")
137− }
138− },
119+ title = { Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions") },
139120 navigationIcon = {
140121 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {
141122 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")