master..61d16d0 · opencode-android

git.iko.soy/opencode-android

on 61d16d0 help sign in

app/src/main/java/soy/iko/opencode/CoreViewModel.kt−5

since splitsnapshots

unifiedsplit

@@ -23,9 +23,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

23 init {

24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }

25 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)) }

30 // On a fresh process after a configuration change, resume the SSE stream if

27 // On a fresh process after a configuration change, resume the SSE stream if

31 // the core is already connected (no-op otherwise — it guards on `connected`).

28 // the core is already connected (no-op otherwise — it guards on `connected`).

@@ -47,7 +44,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

47 prefs.edit {

44 prefs.edit {

48 putString(KEY_URL, state.serverUrl)

45 putString(KEY_URL, state.serverUrl)

49 putString(KEY_USER, state.username)

46 putString(KEY_USER, state.username)

50− putString(KEY_PASSWORD, state.password)

51 }

47 }

52 }

48 }

53 }

49 }

@@ -61,6 +57,5 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

61 private companion object {

57 private companion object {

62 const val KEY_URL = "serverUrl"

58 const val KEY_URL = "serverUrl"

63 const val KEY_USER = "username"

59 const val KEY_USER = "username"

64− const val KEY_PASSWORD = "password"

65 }

60 }

66}

61}

app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+1−12

@@ -236,18 +236,7 @@ class OpencodeCore(

236 if (connected && sse == null) startSse()

237 }

238

239− fun shutdown() {

239+ fun shutdown() = closeSse()

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− }

251

240

252 // ── Effects ────────────────────────────────────────────────────────────────

241 // ── Effects ────────────────────────────────────────────────────────────────

253 private fun sendMessage(raw: String) {

242 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(

232 // Bold is the outermost inline layer: split on ** first so a bold span can wrap

233 // inline code and links inside it. Odd-indexed segments sit between a pair of **

234 // 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.

237 val segments = text.split("**")

235 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

241 segments.forEachIndexed { index, segment ->

236 segments.forEachIndexed { index, segment ->

242− val isUnclosedTail = unclosed && index == segments.size - 1

243− if (index % 2 == 1 && !isUnclosedTail) {

237+ if (index % 2 == 1) {

244 withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {

238 withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {

245 appendInlineCode(segment, linkColor, codeBackground, context)

239 appendInlineCode(segment, linkColor, codeBackground, context)

246 }

240 }

247 } else {

241 } 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("*")

279 appendInlineCode(segment, linkColor, codeBackground, context)

242 appendInlineCode(segment, linkColor, codeBackground, context)

280 }

243 }

281 }

244 }

@@ -295,17 +258,12 @@ private fun AnnotatedString.Builder.appendInlineCode(

295 // Odd-indexed segments sit between a pair of single backticks, so they're inline

258 // Odd-indexed segments sit between a pair of single backticks, so they're inline

296 // code. Even segments are ordinary prose and get URL linking applied.

259 // code. Even segments are ordinary prose and get URL linking applied.

297 val segments = text.split("`")

260 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

301 segments.forEachIndexed { index, segment ->

261 segments.forEachIndexed { index, segment ->

302− val isUnclosedTail = unclosed && index == segments.size - 1

303− if (index % 2 == 1 && !isUnclosedTail) {

262+ if (index % 2 == 1) {

304 withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {

263 withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {

305 append(segment)

264 append(segment)

306 }

265 }

307 } else {

266 } else {

308− if (isUnclosedTail) append("`")

309 appendUrls(segment, linkColor, context)

267 appendUrls(segment, linkColor, context)

310 }

268 }

311 }

269 }

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+1−41

@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Row

26import androidx.compose.foundation.layout.Spacer

27import androidx.compose.foundation.layout.fillMaxSize

28import androidx.compose.foundation.layout.fillMaxWidth

29−import androidx.compose.foundation.layout.heightIn

30import androidx.compose.foundation.layout.PaddingValues

29import androidx.compose.foundation.layout.PaddingValues

31import androidx.compose.foundation.layout.WindowInsets

30import androidx.compose.foundation.layout.WindowInsets

32import androidx.compose.foundation.layout.ime

31import androidx.compose.foundation.layout.ime

@@ -46,7 +45,6 @@ import androidx.compose.material.icons.automirrored.filled.Send

46import androidx.compose.material.icons.filled.ChatBubbleOutline

45import androidx.compose.material.icons.filled.ChatBubbleOutline

47import androidx.compose.material.icons.filled.Close

46import androidx.compose.material.icons.filled.Close

48import androidx.compose.material.icons.filled.KeyboardArrowDown

47import androidx.compose.material.icons.filled.KeyboardArrowDown

49−import androidx.compose.material.icons.filled.KeyboardArrowUp

50import androidx.compose.material.icons.filled.Stop

48import androidx.compose.material.icons.filled.Stop

51import androidx.compose.material3.CircularProgressIndicator

49import androidx.compose.material3.CircularProgressIndicator

52import androidx.compose.material3.ExperimentalMaterial3Api

50import androidx.compose.material3.ExperimentalMaterial3Api

@@ -113,12 +111,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

113 }

111 }

114 }

112 }

115

113

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−

122 // Track how many messages the user has "seen" (i.e. was at the bottom for). While

114 // Track how many messages the user has "seen" (i.e. was at the bottom for). While

123 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.

115 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.

124 var lastSeenCount by remember { mutableStateOf(0) }

116 var lastSeenCount by remember { mutableStateOf(0) }

@@ -269,14 +261,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

269 }

261 }

270 },

262 },

271 )

263 )

272− ScrollToTopButton(

273− visible = showScrollTop,

274− onClick = {

275− coroutineScope.launch {

276− listState.animateScrollToItem(0)

277− }

278− },

279− )

280 }

264 }

281 }

265 }

282 }

266 }

@@ -316,30 +300,6 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,

316 }

300 }

317}

301}

318

302

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−

343private fun copyToClipboard(context: Context, text: String) {

303private fun copyToClipboard(context: Context, text: String) {

344 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

304 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

345 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))

305 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))

@@ -510,7 +470,7 @@ private fun ChatInputBar(

510 OutlinedTextField(

470 OutlinedTextField(

511 value = draft,

471 value = draft,

512 onValueChange = onDraftChange,

472 onValueChange = onDraftChange,

513− modifier = Modifier.weight(1f).heightIn(min = 48.dp),

473+ modifier = Modifier.weight(1f),

514 enabled = !loading,

474 enabled = !loading,

515 placeholder = { Text("Message opencode…") },

475 placeholder = { Text("Message opencode…") },

516 maxLines = 5,

476 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

22import androidx.compose.foundation.lazy.LazyColumn

23import androidx.compose.foundation.lazy.items

24import androidx.compose.foundation.lazy.rememberLazyListState

25−import androidx.compose.foundation.shape.CircleShape

26import androidx.compose.material.icons.Icons

25import androidx.compose.material.icons.Icons

27import androidx.compose.material.icons.automirrored.filled.ArrowBack

26import androidx.compose.material.icons.automirrored.filled.ArrowBack

28import androidx.compose.material.icons.filled.Add

27import androidx.compose.material.icons.filled.Add

@@ -58,8 +57,6 @@ import androidx.compose.runtime.remember

58import androidx.compose.runtime.setValue

57import androidx.compose.runtime.setValue

59import androidx.compose.ui.Alignment

58import androidx.compose.ui.Alignment

60import androidx.compose.ui.Modifier

59import androidx.compose.ui.Modifier

61−import androidx.compose.ui.draw.clip

62−import androidx.compose.ui.graphics.Color

63import androidx.compose.ui.hapticfeedback.HapticFeedbackType

60import androidx.compose.ui.hapticfeedback.HapticFeedbackType

64import androidx.compose.ui.platform.LocalContext

61import androidx.compose.ui.platform.LocalContext

65import androidx.compose.ui.platform.LocalHapticFeedback

62import androidx.compose.ui.platform.LocalHapticFeedback

@@ -119,23 +116,7 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

119 Scaffold(

116 Scaffold(

120 topBar = {

117 topBar = {

121 TopAppBar(

118 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")

119+ title = { Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions") },

137− }

138− },

139 navigationIcon = {

120 navigationIcon = {

140 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {

121 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {

141 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")

122 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")