git.iko.soy/opencode-android
on 38cabc4 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 {
23 init {
24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }
24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }
25 prefs.getString(KEY_USER, null)?.let { core.dispatch(Event.UsernameChanged(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)) }
29
26
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()
236 if (connected && sse == null) startSse()
237 }
237 }
238
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+7−78
@@ -49,7 +49,6 @@ import androidx.compose.ui.text.TextLinkStyles
49import androidx.compose.ui.text.buildAnnotatedString
49import androidx.compose.ui.text.buildAnnotatedString
50import androidx.compose.ui.text.font.FontFamily
50import androidx.compose.ui.text.font.FontFamily
51import androidx.compose.ui.text.font.FontStyle
51import androidx.compose.ui.text.font.FontStyle
52−import androidx.compose.ui.text.font.FontWeight
53import androidx.compose.ui.text.withLink
52import androidx.compose.ui.text.withLink
54import androidx.compose.ui.text.withStyle
53import androidx.compose.ui.text.withStyle
55import androidx.compose.ui.text.style.TextDecoration
54import androidx.compose.ui.text.style.TextDecoration
@@ -210,102 +209,32 @@ private fun buildLinkedText(
210 append(segment)
209 append(segment)
211 }
210 }
212 } else {
211 } else {
213− appendLinkedText(segment, linkColor, codeBackground, context)
212+ appendLinkedText(segment, linkColor, context)
214 }
213 }
215 }
214 }
216 if (streaming) append(" ▌")
215 if (streaming) append(" ▌")
217}
216}
218
217
219/**
218/**
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
219+ * Append [text] to the builder. Single-backtick pairs are rendered as inline code
222− * dropped), and the remaining prose has each http(s) URL turned into a clickable link.
220+ * (monospace, backticks dropped); the remaining prose has each http(s) URL turned
223− * Triple-backtick fences are already stripped upstream in [buildLinkedText], so only
221+ * into a clickable link. Triple-backtick fences are already stripped upstream in
224− * inline spans reach here.
222+ * [buildLinkedText], so only inline spans reach here.
225 */
223 */
226private fun AnnotatedString.Builder.appendLinkedText(
224private fun AnnotatedString.Builder.appendLinkedText(
227 text: String,
225 text: String,
228 linkColor: Color,
226 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,
227 context: Context,
294) {
228) {
295 // Odd-indexed segments sit between a pair of single backticks, so they're inline
229 // 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.
230 // code. Even segments are ordinary prose and get URL linking applied.
297 val segments = text.split("`")
231 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 ->
232 segments.forEachIndexed { index, segment ->
302− val isUnclosedTail = unclosed && index == segments.size - 1
303− if (index % 2 == 1 && !isUnclosedTail) {
233+ if (index % 2 == 1) {
304− withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {
234+ withStyle(SpanStyle(fontFamily = FontFamily.Monospace)) {
305 append(segment)
235 append(segment)
306 }
236 }
307 } else {
237 } else {
308− if (isUnclosedTail) append("`")
309 appendUrls(segment, linkColor, context)
238 appendUrls(segment, linkColor, context)
310 }
239 }
311 }
240 }
app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+2−78
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Row
26import androidx.compose.foundation.layout.Spacer
26import androidx.compose.foundation.layout.Spacer
27import androidx.compose.foundation.layout.fillMaxSize
27import androidx.compose.foundation.layout.fillMaxSize
28import androidx.compose.foundation.layout.fillMaxWidth
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
@@ -61,7 +59,6 @@ import androidx.compose.material3.OutlinedTextField
61import androidx.compose.material3.Scaffold
59import androidx.compose.material3.Scaffold
62import androidx.compose.material3.Surface
60import androidx.compose.material3.Surface
63import androidx.compose.material3.Text
61import androidx.compose.material3.Text
64−import androidx.compose.material3.TextButton
65import androidx.compose.material3.TopAppBar
62import androidx.compose.material3.TopAppBar
66import androidx.compose.runtime.Composable
63import androidx.compose.runtime.Composable
67import androidx.compose.runtime.LaunchedEffect
64import androidx.compose.runtime.LaunchedEffect
@@ -75,7 +72,6 @@ import androidx.compose.ui.Alignment
75import androidx.compose.ui.Modifier
72import androidx.compose.ui.Modifier
76import androidx.compose.ui.draw.clip
73import androidx.compose.ui.draw.clip
77import androidx.compose.ui.hapticfeedback.HapticFeedbackType
74import androidx.compose.ui.hapticfeedback.HapticFeedbackType
78−import androidx.compose.ui.platform.LocalClipboardManager
79import androidx.compose.ui.platform.LocalContext
75import androidx.compose.ui.platform.LocalContext
80import androidx.compose.ui.platform.LocalDensity
76import androidx.compose.ui.platform.LocalDensity
81import androidx.compose.ui.platform.LocalHapticFeedback
77import androidx.compose.ui.platform.LocalHapticFeedback
@@ -113,12 +109,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
113 }
109 }
114 }
110 }
115
111
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
112 // 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.
113 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
124 var lastSeenCount by remember { mutableStateOf(0) }
114 var lastSeenCount by remember { mutableStateOf(0) }
@@ -269,14 +259,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
269 }
259 }
270 },
260 },
271 )
261 )
272− ScrollToTopButton(
273− visible = showScrollTop,
274− onClick = {
275− coroutineScope.launch {
276− listState.animateScrollToItem(0)
277− }
278− },
279− )
280 }
262 }
281 }
263 }
282 }
264 }
@@ -316,30 +298,6 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,
316 }
298 }
317}
299}
318
300
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) {
301private fun copyToClipboard(context: Context, text: String) {
344 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
302 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
345 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
303 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
@@ -497,41 +455,19 @@ private fun ChatInputBar(
497 onStop: () -> Unit,
455 onStop: () -> Unit,
498) {
456) {
499 val haptic = LocalHapticFeedback.current
457 val haptic = LocalHapticFeedback.current
500− val clipboardManager = LocalClipboardManager.current
501 Surface(tonalElevation = 3.dp) {
458 Surface(tonalElevation = 3.dp) {
502− Column(
503− modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
504− ) {
505 Row(
459 Row(
506− modifier = Modifier.fillMaxWidth(),
460+ modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
507 verticalAlignment = Alignment.Bottom,
461 verticalAlignment = Alignment.Bottom,
508 horizontalArrangement = Arrangement.spacedBy(8.dp),
462 horizontalArrangement = Arrangement.spacedBy(8.dp),
509 ) {
463 ) {
510 OutlinedTextField(
464 OutlinedTextField(
511 value = draft,
465 value = draft,
512 onValueChange = onDraftChange,
466 onValueChange = onDraftChange,
513− modifier = Modifier.weight(1f).heightIn(min = 48.dp),
467+ modifier = Modifier.weight(1f),
514 enabled = !loading,
468 enabled = !loading,
515 placeholder = { Text("Message opencode…") },
469 placeholder = { Text("Message opencode…") },
516 maxLines = 5,
470 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− },
535 // Surface a running count once the draft gets long, so the user has a
471 // Surface a running count once the draft gets long, so the user has a
536 // sense of scale before sending a wall of text.
472 // sense of scale before sending a wall of text.
537 supportingText = if (draft.length > 500) {
473 supportingText = if (draft.length > 500) {
@@ -574,17 +510,5 @@ private fun ChatInputBar(
574 }
510 }
575 }
511 }
576 }
512 }
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− }
589 }
513 }
590}
514}
app/src/main/java/soy/iko/opencode/ui/screens/ConnectScreen.kt+1−9
@@ -155,15 +155,7 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
155 },
155 },
156 modifier = Modifier.fillMaxWidth(),
156 modifier = Modifier.fillMaxWidth(),
157 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
157 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
158− keyboardActions = KeyboardActions(onGo = {
158+ keyboardActions = KeyboardActions(onGo = { dispatch(Event.Connect) }),
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− }),
167 enabled = !state.loading,
159 enabled = !state.loading,
168 )
160 )
169 Spacer(Modifier.height(4.dp))
161 Spacer(Modifier.height(4.dp))
app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+1−28
@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.size
22import androidx.compose.foundation.lazy.LazyColumn
22import androidx.compose.foundation.lazy.LazyColumn
23import androidx.compose.foundation.lazy.items
23import androidx.compose.foundation.lazy.items
24import androidx.compose.foundation.lazy.rememberLazyListState
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,12 +57,9 @@ 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
66−import androidx.compose.ui.text.style.TextAlign
67import androidx.compose.ui.text.style.TextOverflow
63import androidx.compose.ui.text.style.TextOverflow
68import androidx.compose.ui.unit.dp
64import androidx.compose.ui.unit.dp
69import soy.iko.opencode.core.Event
65import soy.iko.opencode.core.Event
@@ -119,23 +115,7 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
119 Scaffold(
115 Scaffold(
120 topBar = {
116 topBar = {
121 TopAppBar(
117 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")
118+ title = { Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions") },
137− }
138− },
139 navigationIcon = {
119 navigationIcon = {
140 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {
120 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {
141 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")
121 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")
@@ -391,12 +371,5 @@ private fun EmptySessions() {
391 style = MaterialTheme.typography.bodyMedium,
371 style = MaterialTheme.typography.bodyMedium,
392 color = MaterialTheme.colorScheme.onSurfaceVariant,
372 color = MaterialTheme.colorScheme.onSurfaceVariant,
393 )
373 )
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− )
401 }
374 }
402}
375}
app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt−6
@@ -17,11 +17,8 @@ private val DarkColors = darkColorScheme(
17 primaryContainer = Color(0xFF1A3D2A),
17 primaryContainer = Color(0xFF1A3D2A),
18 onPrimaryContainer = Color(0xFFA8E6C1),
18 onPrimaryContainer = Color(0xFFA8E6C1),
19 secondary = EmeraldDark,
19 secondary = EmeraldDark,
20− onSecondary = Color(0xFFE6E9EF),
21 secondaryContainer = Color(0xFF1A2A3D),
20 secondaryContainer = Color(0xFF1A2A3D),
22 onSecondaryContainer = Color(0xFFA8C5E6),
21 onSecondaryContainer = Color(0xFFA8C5E6),
23− tertiary = Color(0xFF6B7280),
24− onTertiary = Color(0xFFE6E9EF),
25 tertiaryContainer = Color(0xFF2A2A3D),
22 tertiaryContainer = Color(0xFF2A2A3D),
26 onTertiaryContainer = Color(0xFFC5C5E6),
23 onTertiaryContainer = Color(0xFFC5C5E6),
27 errorContainer = Color(0xFF4D2626),
24 errorContainer = Color(0xFF4D2626),
@@ -38,11 +35,8 @@ private val LightColors = lightColorScheme(
38 primaryContainer = Color(0xFFD7F5E3),
35 primaryContainer = Color(0xFFD7F5E3),
39 onPrimaryContainer = Color(0xFF0A3D22),
36 onPrimaryContainer = Color(0xFF0A3D22),
40 secondary = Emerald,
37 secondary = Emerald,
41− onSecondary = Color(0xFF1A1C1F),
42 secondaryContainer = Color(0xFFD7E8F5),
38 secondaryContainer = Color(0xFFD7E8F5),
43 onSecondaryContainer = Color(0xFF0A2A4D),
39 onSecondaryContainer = Color(0xFF0A2A4D),
44− tertiary = Color(0xFF6B7280),
45− onTertiary = Color(0xFFFFFFFF),
46 tertiaryContainer = Color(0xFFE8E8F5),
40 tertiaryContainer = Color(0xFFE8E8F5),
47 onTertiaryContainer = Color(0xFF2A2A4D),
41 onTertiaryContainer = Color(0xFF2A2A4D),
48 errorContainer = Color(0xFFFFE0E0),
42 errorContainer = Color(0xFFFFE0E0),