master..0c49daf · opencode-android

git.iko.soy/opencode-android

9 files changed+13−273

unifiedsplit

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/HttpClient.kt−1

@@ -51,7 +51,6 @@ class HttpClient(

5151 ): Result<HttpResp> = withContext(Dispatchers.IO) {

5252 runCatching {

5353 val builder = Request.Builder().url(url).method()

54− builder.header("User-Agent", "opencode-android/1.0")

5554 if (auth != null) builder.header("Authorization", auth)

5655 await(okhttp.newCall(builder.build()))

5756 }

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/core/SseClient.kt−1

@@ -33,7 +33,6 @@ class SseClient(

3333

3434 fun connect() {

3535 val builder = Request.Builder().url(url).header("Accept", "text/event-stream")

36− builder.header("User-Agent", "opencode-android/1.0")

3736 if (auth != null) builder.header("Authorization", auth)

3837 source = EventSources.createFactory(client).newEventSource(builder.build(), listener)

3938 }

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+2−98

@@ -49,7 +49,6 @@ import androidx.compose.ui.text.TextLinkStyles

4949import androidx.compose.ui.text.buildAnnotatedString

5050import androidx.compose.ui.text.font.FontFamily

5151import androidx.compose.ui.text.font.FontStyle

52−import androidx.compose.ui.text.font.FontWeight

5352import androidx.compose.ui.text.withLink

5453import androidx.compose.ui.text.withStyle

5554import androidx.compose.ui.text.style.TextDecoration

@@ -210,109 +209,14 @@ private fun buildLinkedText(

210209 append(segment)

211210 }

212211 } else {

213− appendLinkedText(segment, linkColor, codeBackground, context)

212+ appendLinkedText(segment, linkColor, context)

214213 }

215214 }

216215 if (streaming) append(" ▌")

217216}

218217

219−/**

220− * Append [text] to the builder. Double-asterisk pairs are rendered bold; within each

221− * segment, single-backtick pairs are rendered as inline code (monospace, backticks

222− * dropped), and the remaining prose has each http(s) URL turned into a clickable link.

223− * Triple-backtick fences are already stripped upstream in [buildLinkedText], so only

224− * inline spans reach here.

225− */

226−private fun AnnotatedString.Builder.appendLinkedText(

227− text: String,

228− linkColor: Color,

229− codeBackground: Color,

230− context: Context,

231−) {

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

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

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

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

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

245− appendInlineCode(segment, linkColor, codeBackground, context)

246− }

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

280− }

281− }

282−}

283−

284−/**

285− * Append [text] to the builder, rendering single-backtick pairs as inline code

286− * (monospace, backticks dropped) and turning each http(s) URL in the remaining prose

287− * into a clickable link.

288− */

289−private fun AnnotatedString.Builder.appendInlineCode(

290− text: String,

291− linkColor: Color,

292− codeBackground: Color,

293− context: Context,

294−) {

295− // 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.

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

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

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

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

305− append(segment)

306− }

307− } else {

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

309− appendUrls(segment, linkColor, context)

310− }

311− }

312−}

313−

314218/** Append [text] to the builder, turning each http(s) URL into a clickable link. */

315−private fun AnnotatedString.Builder.appendUrls(

219+private fun AnnotatedString.Builder.appendLinkedText(

316220 text: String,

317221 linkColor: Color,

318222 context: Context,

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+7−96

@@ -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

@@ -43,10 +42,8 @@ import androidx.compose.foundation.text.KeyboardOptions

4342import androidx.compose.material.icons.Icons

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

4544import androidx.compose.material.icons.automirrored.filled.Send

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

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

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

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

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

5148import androidx.compose.material3.CircularProgressIndicator

5249import androidx.compose.material3.ExperimentalMaterial3Api

@@ -61,7 +58,6 @@ import androidx.compose.material3.OutlinedTextField

6158import androidx.compose.material3.Scaffold

6259import androidx.compose.material3.Surface

6360import androidx.compose.material3.Text

64−import androidx.compose.material3.TextButton

6561import androidx.compose.material3.TopAppBar

6662import androidx.compose.runtime.Composable

6763import androidx.compose.runtime.LaunchedEffect

@@ -75,7 +71,6 @@ import androidx.compose.ui.Alignment

7571import androidx.compose.ui.Modifier

7672import androidx.compose.ui.draw.clip

7773import androidx.compose.ui.hapticfeedback.HapticFeedbackType

78−import androidx.compose.ui.platform.LocalClipboardManager

7974import androidx.compose.ui.platform.LocalContext

8075import androidx.compose.ui.platform.LocalDensity

8176import androidx.compose.ui.platform.LocalHapticFeedback

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

113108 }

114109 }

115110

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−

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

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

124113 var lastSeenCount by remember { mutableStateOf(0) }

@@ -205,24 +194,12 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

205194 }

206195 Box(Modifier.fillMaxWidth().weight(1f)) {

207196 if (state.messages.isEmpty() && !state.loading) {

208− Column(

197+ Text(

198+ text = "Send a message to start the conversation.",

199+ style = MaterialTheme.typography.bodyMedium,

200+ color = MaterialTheme.colorScheme.onSurfaceVariant,

209201 modifier = Modifier.align(Alignment.Center).padding(32.dp),

210− horizontalAlignment = Alignment.CenterHorizontally,

211− ) {

212− Icon(

213− Icons.Filled.ChatBubbleOutline,

214− contentDescription = null,

215− modifier = Modifier.size(48.dp),

216− tint = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),

217− )

218− Spacer(Modifier.size(16.dp))

219− Text(

220− text = "Send a message to start the conversation.",

221− style = MaterialTheme.typography.bodyMedium,

222− color = MaterialTheme.colorScheme.onSurfaceVariant,

223− textAlign = TextAlign.Center,

224− )

225− }

202+ )

226203 }

227204 LazyColumn(

228205 state = listState,

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

269246 }

270247 },

271248 )

272− ScrollToTopButton(

273− visible = showScrollTop,

274− onClick = {

275− coroutineScope.launch {

276− listState.animateScrollToItem(0)

277− }

278− },

279− )

280249 }

281250 }

282251 }

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

316285 }

317286}

318287

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−

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

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

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

@@ -497,41 +442,19 @@ private fun ChatInputBar(

497442 onStop: () -> Unit,

498443) {

499444 val haptic = LocalHapticFeedback.current

500− val clipboardManager = LocalClipboardManager.current

501445 Surface(tonalElevation = 3.dp) {

502− Column(

503− modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),

504− ) {

505446 Row(

506− modifier = Modifier.fillMaxWidth(),

447+ modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),

507448 verticalAlignment = Alignment.Bottom,

508449 horizontalArrangement = Arrangement.spacedBy(8.dp),

509450 ) {

510451 OutlinedTextField(

511452 value = draft,

512453 onValueChange = onDraftChange,

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

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

514455 enabled = !loading,

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

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

535458 // Surface a running count once the draft gets long, so the user has a

536459 // sense of scale before sending a wall of text.

537460 supportingText = if (draft.length > 500) {

@@ -574,17 +497,5 @@ private fun ChatInputBar(

574497 }

575498 }

576499 }

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

589500 }

590501}

app/src/main/java/soy/iko/opencode/ui/screens/ConnectScreen.kt+1−21

@@ -155,15 +155,7 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

155155 },

156156 modifier = Modifier.fillMaxWidth(),

157157 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),

158− keyboardActions = KeyboardActions(onGo = {

159− // Mirror the connect button's enabled condition so the keyboard's

160− // Go action can't fire a request the form isn't ready for.

161− if (!state.loading && state.serverUrl.isNotBlank() &&

162− (!state.authRequired || state.username.isNotBlank() || state.password.isNotBlank())

163− ) {

164− dispatch(Event.Connect)

165− }

166− }),

158+ keyboardActions = KeyboardActions(onGo = { dispatch(Event.Connect) }),

167159 enabled = !state.loading,

168160 )

169161 Spacer(Modifier.height(4.dp))

@@ -195,18 +187,6 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

195187 }

196188 }

197189

198− // While connecting (including auto-connect on launch), echo the target URL

199− // so the user knows what the spinner is waiting on.

200− if (state.loading) {

201− Spacer(Modifier.height(8.dp))

202− Text(

203− text = "Connecting to ${state.serverUrl}...",

204− style = MaterialTheme.typography.bodySmall,

205− color = MaterialTheme.colorScheme.onSurfaceVariant,

206− textAlign = TextAlign.Center,

207− )

208− }

209−

210190 // Surface the error inline as well, so it stays visible while the user

211191 // corrects the form (the snackbar is transient).

212192 if (state.error != null && !state.loading) {

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+2−29

@@ -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,12 +57,9 @@ 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

66−import androidx.compose.ui.text.style.TextAlign

6763import androidx.compose.ui.text.style.TextOverflow

6864import androidx.compose.ui.unit.dp

6965import soy.iko.opencode.core.Event

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

119115 Scaffold(

120116 topBar = {

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

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

139119 navigationIcon = {

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

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

@@ -287,7 +267,7 @@ private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () ->

287267 Icon(

288268 Icons.Filled.DeleteOutline,

289269 contentDescription = "Delete session",

290− tint = MaterialTheme.colorScheme.error,

270+ tint = MaterialTheme.colorScheme.onSurfaceVariant,

291271 )

292272 }

293273 }

@@ -391,12 +371,5 @@ private fun EmptySessions() {

391371 style = MaterialTheme.typography.bodyMedium,

392372 color = MaterialTheme.colorScheme.onSurfaceVariant,

393373 )

394− Spacer(Modifier.height(8.dp))

395− Text(

396− text = "Sessions you create on this server will appear here.",

397− style = MaterialTheme.typography.bodySmall,

398− color = MaterialTheme.colorScheme.onSurfaceVariant,

399− textAlign = TextAlign.Center,

400− )

401374 }

402375}

app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt−10

@@ -17,11 +17,6 @@ private val DarkColors = darkColorScheme(

1717 primaryContainer = Color(0xFF1A3D2A),

1818 onPrimaryContainer = Color(0xFFA8E6C1),

1919 secondary = EmeraldDark,

20− onSecondary = Color(0xFFE6E9EF),

21− secondaryContainer = Color(0xFF1A2A3D),

22− onSecondaryContainer = Color(0xFFA8C5E6),

23− tertiary = Color(0xFF6B7280),

24− onTertiary = Color(0xFFE6E9EF),

2520 tertiaryContainer = Color(0xFF2A2A3D),

2621 onTertiaryContainer = Color(0xFFC5C5E6),

2722 errorContainer = Color(0xFF4D2626),

@@ -38,11 +33,6 @@ private val LightColors = lightColorScheme(

3833 primaryContainer = Color(0xFFD7F5E3),

3934 onPrimaryContainer = Color(0xFF0A3D22),

4035 secondary = Emerald,

41− onSecondary = Color(0xFF1A1C1F),

42− secondaryContainer = Color(0xFFD7E8F5),

43− onSecondaryContainer = Color(0xFF0A2A4D),

44− tertiary = Color(0xFF6B7280),

45− onTertiary = Color(0xFFFFFFFF),

4636 tertiaryContainer = Color(0xFFE8E8F5),

4737 onTertiaryContainer = Color(0xFF2A2A4D),

4838 errorContainer = Color(0xFFFFE0E0),