38cabc4...master · opencode-android

git.iko.soy/opencode-android

on master help sign in

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

since splitsnapshots

unifiedsplit

@@ -23,6 +23,9 @@ 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)) }

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

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

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

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

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

44 prefs.edit {

47 prefs.edit {

45 putString(KEY_URL, state.serverUrl)

48 putString(KEY_URL, state.serverUrl)

46 putString(KEY_USER, state.username)

49 putString(KEY_USER, state.username)

50+ putString(KEY_PASSWORD, state.password)

47 }

51 }

48 }

52 }

49 }

53 }

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

57 private companion object {

61 private companion object {

58 const val KEY_URL = "serverUrl"

62 const val KEY_URL = "serverUrl"

59 const val KEY_USER = "username"

63 const val KEY_USER = "username"

64+ const val KEY_PASSWORD = "password"

60 }

65 }

61}

66}

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

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

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

237 }

238

239− fun shutdown() = closeSse()

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

240

251

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

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

242 private fun sendMessage(raw: String) {

253 private fun sendMessage(raw: String) {

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+78−7

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

49import androidx.compose.ui.text.buildAnnotatedString

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

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

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

52import androidx.compose.ui.text.withLink

53import androidx.compose.ui.text.withLink

53import androidx.compose.ui.text.withStyle

54import androidx.compose.ui.text.withStyle

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

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

@@ -209,32 +210,102 @@ private fun buildLinkedText(

209 append(segment)

210 append(segment)

210 }

211 }

211 } else {

212 } else {

212− appendLinkedText(segment, linkColor, context)

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

213 }

214 }

215 }

215 if (streaming) append(" ▌")

216 if (streaming) append(" ▌")

216}

217}

217

218

218/**

219/**

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

219− * Append [text] to the builder. Single-backtick pairs are rendered as inline code

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

220− * (monospace, backticks dropped); the remaining prose has each http(s) URL turned

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

221− * into a clickable link. Triple-backtick fences are already stripped upstream in

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

222− * [buildLinkedText], so only inline spans reach here.

224+ * inline spans reach here.

223 */

225 */

224private fun AnnotatedString.Builder.appendLinkedText(

226private fun AnnotatedString.Builder.appendLinkedText(

225 text: String,

227 text: String,

226 linkColor: Color,

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,

227 context: Context,

293 context: Context,

228) {

294) {

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

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

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

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

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

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

232 segments.forEachIndexed { index, segment ->

301 segments.forEachIndexed { index, segment ->

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

233− if (index % 2 == 1) {

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

234− withStyle(SpanStyle(fontFamily = FontFamily.Monospace)) {

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

235 append(segment)

305 append(segment)

236 }

306 }

237 } else {

307 } else {

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

238 appendUrls(segment, linkColor, context)

309 appendUrls(segment, linkColor, context)

239 }

310 }

240 }

311 }

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+78−2

@@ -26,6 +26,7 @@ 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

29import androidx.compose.foundation.layout.PaddingValues

30import androidx.compose.foundation.layout.PaddingValues

30import androidx.compose.foundation.layout.WindowInsets

31import androidx.compose.foundation.layout.WindowInsets

31import androidx.compose.foundation.layout.ime

32import androidx.compose.foundation.layout.ime

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

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

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

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

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

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

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

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

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

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

49import androidx.compose.material3.CircularProgressIndicator

51import androidx.compose.material3.CircularProgressIndicator

50import androidx.compose.material3.ExperimentalMaterial3Api

52import androidx.compose.material3.ExperimentalMaterial3Api

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

59import androidx.compose.material3.Scaffold

61import androidx.compose.material3.Scaffold

60import androidx.compose.material3.Surface

62import androidx.compose.material3.Surface

61import androidx.compose.material3.Text

63import androidx.compose.material3.Text

64+import androidx.compose.material3.TextButton

62import androidx.compose.material3.TopAppBar

65import androidx.compose.material3.TopAppBar

63import androidx.compose.runtime.Composable

66import androidx.compose.runtime.Composable

64import androidx.compose.runtime.LaunchedEffect

67import androidx.compose.runtime.LaunchedEffect

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

72import androidx.compose.ui.Modifier

75import androidx.compose.ui.Modifier

73import androidx.compose.ui.draw.clip

76import androidx.compose.ui.draw.clip

74import androidx.compose.ui.hapticfeedback.HapticFeedbackType

77import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

75import androidx.compose.ui.platform.LocalContext

79import androidx.compose.ui.platform.LocalContext

76import androidx.compose.ui.platform.LocalDensity

80import androidx.compose.ui.platform.LocalDensity

77import androidx.compose.ui.platform.LocalHapticFeedback

81import androidx.compose.ui.platform.LocalHapticFeedback

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

109 }

113 }

110 }

114 }

111

115

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+

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

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

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

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

114 var lastSeenCount by remember { mutableStateOf(0) }

124 var lastSeenCount by remember { mutableStateOf(0) }

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

259 }

269 }

260 },

270 },

261 )

271 )

272+ ScrollToTopButton(

273+ visible = showScrollTop,

274+ onClick = {

275+ coroutineScope.launch {

276+ listState.animateScrollToItem(0)

277+ }

278+ },

279+ )

262 }

280 }

263 }

281 }

264 }

282 }

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

298 }

316 }

299}

317}

300

318

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+

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

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

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

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

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

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

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

455 onStop: () -> Unit,

497 onStop: () -> Unit,

456) {

498) {

457 val haptic = LocalHapticFeedback.current

499 val haptic = LocalHapticFeedback.current

500+ val clipboardManager = LocalClipboardManager.current

458 Surface(tonalElevation = 3.dp) {

501 Surface(tonalElevation = 3.dp) {

459− Row(

502+ Column(

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

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

504+ ) {

505+ Row(

506+ modifier = Modifier.fillMaxWidth(),

461 verticalAlignment = Alignment.Bottom,

507 verticalAlignment = Alignment.Bottom,

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

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

463 ) {

509 ) {

464 OutlinedTextField(

510 OutlinedTextField(

465 value = draft,

511 value = draft,

466 onValueChange = onDraftChange,

512 onValueChange = onDraftChange,

467− modifier = Modifier.weight(1f),

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

468 enabled = !loading,

514 enabled = !loading,

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

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

470 maxLines = 5,

516 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+ },

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

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

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

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

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

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

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

510 }

574 }

511 }

575 }

512 }

576 }

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

513 }

589 }

514}

590}

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

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

155 },

156 modifier = Modifier.fillMaxWidth(),

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

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

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+ }),

159 enabled = !state.loading,

167 enabled = !state.loading,

160 )

168 )

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

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

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+28−1

@@ -22,6 +22,7 @@ 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

25import androidx.compose.material.icons.Icons

26import androidx.compose.material.icons.Icons

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

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

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

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

@@ -57,9 +58,12 @@ import androidx.compose.runtime.remember

57import androidx.compose.runtime.setValue

58import androidx.compose.runtime.setValue

58import androidx.compose.ui.Alignment

59import androidx.compose.ui.Alignment

59import androidx.compose.ui.Modifier

60import androidx.compose.ui.Modifier

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

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

60import androidx.compose.ui.hapticfeedback.HapticFeedbackType

63import androidx.compose.ui.hapticfeedback.HapticFeedbackType

61import androidx.compose.ui.platform.LocalContext

64import androidx.compose.ui.platform.LocalContext

62import androidx.compose.ui.platform.LocalHapticFeedback

65import androidx.compose.ui.platform.LocalHapticFeedback

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

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

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

64import androidx.compose.ui.unit.dp

68import androidx.compose.ui.unit.dp

65import soy.iko.opencode.core.Event

69import soy.iko.opencode.core.Event

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

115 Scaffold(

119 Scaffold(

116 topBar = {

120 topBar = {

117 TopAppBar(

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

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

136+ Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions")

137+ }

138+ },

119 navigationIcon = {

139 navigationIcon = {

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

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

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

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

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

371 style = MaterialTheme.typography.bodyMedium,

391 style = MaterialTheme.typography.bodyMedium,

372 color = MaterialTheme.colorScheme.onSurfaceVariant,

392 color = MaterialTheme.colorScheme.onSurfaceVariant,

373 )

393 )

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

374 }

401 }

375}

402}

app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt+6

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

17 primaryContainer = Color(0xFF1A3D2A),

18 onPrimaryContainer = Color(0xFFA8E6C1),

19 secondary = EmeraldDark,

20+ onSecondary = Color(0xFFE6E9EF),

20 secondaryContainer = Color(0xFF1A2A3D),

21 secondaryContainer = Color(0xFF1A2A3D),

21 onSecondaryContainer = Color(0xFFA8C5E6),

22 onSecondaryContainer = Color(0xFFA8C5E6),

23+ tertiary = Color(0xFF6B7280),

24+ onTertiary = Color(0xFFE6E9EF),

22 tertiaryContainer = Color(0xFF2A2A3D),

25 tertiaryContainer = Color(0xFF2A2A3D),

23 onTertiaryContainer = Color(0xFFC5C5E6),

26 onTertiaryContainer = Color(0xFFC5C5E6),

24 errorContainer = Color(0xFF4D2626),

27 errorContainer = Color(0xFF4D2626),

@@ -35,8 +38,11 @@ private val LightColors = lightColorScheme(

35 primaryContainer = Color(0xFFD7F5E3),

38 primaryContainer = Color(0xFFD7F5E3),

36 onPrimaryContainer = Color(0xFF0A3D22),

39 onPrimaryContainer = Color(0xFF0A3D22),

37 secondary = Emerald,

40 secondary = Emerald,

41+ onSecondary = Color(0xFF1A1C1F),

38 secondaryContainer = Color(0xFFD7E8F5),

42 secondaryContainer = Color(0xFFD7E8F5),

39 onSecondaryContainer = Color(0xFF0A2A4D),

43 onSecondaryContainer = Color(0xFF0A2A4D),

44+ tertiary = Color(0xFF6B7280),

45+ onTertiary = Color(0xFFFFFFFF),

40 tertiaryContainer = Color(0xFFE8E8F5),

46 tertiaryContainer = Color(0xFFE8E8F5),

41 onTertiaryContainer = Color(0xFF2A2A4D),

47 onTertiaryContainer = Color(0xFF2A2A4D),

42 errorContainer = Color(0xFFFFE0E0),

48 errorContainer = Color(0xFFFFE0E0),