peachsim 0.1.675 → 0.1.677

package/dist-lib/scripts/dev-server-scanner.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/sdk.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);

package/dist-lib/skills.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2 } from "node:child_process";

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-package.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-package.ts
 function isSwiftManifestFile(file) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-submit.ts
 var SWIFT_COMPILE_PATH = "/api/swift-compile";

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.675 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.677 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/kotlin/AppSources/android/content/Context.kt

@@ -6,6 +6,10 @@ import android.content.res.processResources
 abstract class Context {
     abstract val resources: Resources
 
+    abstract val theme: Resources.Theme
+
+    fun getColor(id: Int): Int = resources.getColor(id, theme)
+
     fun getString(resId: Int): String = resources.getString(resId)
 
     fun getString(resId: Int, vararg formatArgs: Any?): String = resources.getString(resId, *formatArgs)
@@ -13,4 +17,6 @@ abstract class Context {
 
 open class ContextWrapper : Context() {
     override val resources: Resources get() = processResources
+
+    override val theme: Resources.Theme = Resources.Theme()
 }

package/kotlin/AppSources/android/content/res/Resources.kt

@@ -2,12 +2,17 @@ package android.content.res
 
 import dev.peach.app.javaFormat
 import dev.peach.app.peachAppArrays
+import dev.peach.app.peachAppColors
 import dev.peach.app.peachAppPlurals
 import dev.peach.app.peachAppStrings
 
 class Resources internal constructor(val configuration: Configuration) {
     class NotFoundException(name: String) : RuntimeException(name)
 
+    // a context's theme; app color resources are plain values, so getColor
+    // reads none of it
+    class Theme internal constructor()
+
     fun getString(id: Int): String =
         resolve(peachAppStrings[id]) ?: throw NotFoundException("String resource ID #0x${id.toString(16)}")
 
@@ -31,6 +36,17 @@ class Resources internal constructor(val configuration: Configuration) {
         resolve(peachAppArrays[id])?.toTypedArray()
             ?: throw NotFoundException("String array resource ID #0x${id.toString(16)}")
 
+    // the color the configuration's night mode selects, values-night over
+    // values
+    fun getColor(id: Int, theme: Theme?): Int {
+        val colors = peachAppColors[id] ?: throw NotFoundException("Resource ID #0x${id.toString(16)}")
+        val night = configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        return colors[if (night) 1 else 0]
+    }
+
+    @Deprecated("Use getColor(int, Theme) instead.")
+    fun getColor(id: Int): Int = getColor(id, null)
+
     // the value the configuration's locale selects: its language and region,
     // then its language, then the default values, as the resource table
     // matches a locale qualifier. a plurals or array resource resolves whole

package/kotlin/AppSources/androidx/compose/ui/platform/AndroidCompositionLocals.kt

@@ -2,18 +2,26 @@ package androidx.compose.ui.platform
 
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
 import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.compositionLocalWithComputedDefaultOf
 import androidx.compose.runtime.neverEqualPolicy
 import androidx.compose.runtime.staticCompositionLocalOf
 
-// AndroidCompositionLocals.android.kt: the configuration and context a
-// ComposeView's content reads, provided where its composition starts
+// AndroidCompositionLocals.android.kt: the configuration, context and
+// resources a ComposeView's content reads, provided where its composition starts
 val LocalConfiguration = compositionLocalOf<Configuration>(neverEqualPolicy()) {
     noLocalProvidedFor("LocalConfiguration")
 }
 
 val LocalContext = staticCompositionLocalOf<Context> { noLocalProvidedFor("LocalContext") }
 
+// the context's resources, recomputed when the configuration changes
+val LocalResources = compositionLocalWithComputedDefaultOf<Resources> {
+    LocalConfiguration.currentValue
+    LocalContext.currentValue.resources
+}
+
 private fun noLocalProvidedFor(name: String): Nothing {
     error("CompositionLocal $name not present")
 }

package/kotlin/AppSources/androidx/compose/ui/res/ColorResources.kt

@@ -0,0 +1,16 @@
+package androidx.compose.ui.res
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
+
+// ColorResources.android.kt: ResourcesCompat.getColor on API 23 and up is
+// Resources.getColor with the context's theme
+@Composable
+@ReadOnlyComposable
+fun colorResource(id: Int): Color {
+    val context = LocalContext.current
+    return Color(LocalResources.current.getColor(id, context.theme))
+}

package/kotlin/AppSources/androidx/compose/ui/res/StringResources.kt

@@ -1,53 +1,38 @@
 package androidx.compose.ui.res
 
-import android.content.res.Resources
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 
-// StringResources.android.kt and Resources.android.kt: a string, plural or
-// string array resource read through the composition's context, recomposed
-// when its configuration changes
+// StringResources.android.kt: string, string array and plural resources read
+// through the composition's resources
 
 @Composable
 @ReadOnlyComposable
 fun stringResource(id: Int): String {
-    val resources = resources()
-    return resources.getString(id)
+    return LocalResources.current.getString(id)
 }
 
 @Composable
 @ReadOnlyComposable
 fun stringResource(id: Int, vararg formatArgs: Any): String {
-    val resources = resources()
-    return resources.getString(id, *formatArgs)
+    return LocalResources.current.getString(id, *formatArgs)
 }
 
 @Composable
 @ReadOnlyComposable
-fun pluralStringResource(id: Int, count: Int): String {
-    val resources = resources()
-    return resources.getQuantityString(id, count)
-}
-
-@Composable
-@ReadOnlyComposable
-fun pluralStringResource(id: Int, count: Int, vararg formatArgs: Any): String {
-    val resources = resources()
-    return resources.getQuantityString(id, count, *formatArgs)
+fun stringArrayResource(id: Int): Array<String> {
+    return LocalResources.current.getStringArray(id)
 }
 
 @Composable
 @ReadOnlyComposable
-fun stringArrayResource(id: Int): Array<String> {
-    val resources = resources()
-    return resources.getStringArray(id)
+fun pluralStringResource(id: Int, count: Int): String {
+    return LocalResources.current.getQuantityString(id, count)
 }
 
 @Composable
 @ReadOnlyComposable
-internal fun resources(): Resources {
-    LocalConfiguration.current
-    return LocalContext.current.resources
+fun pluralStringResource(id: Int, count: Int, vararg formatArgs: Any): String {
+    return LocalResources.current.getQuantityString(id, count, *formatArgs)
 }

package/kotlin/fixtures/kotlin-app-variants/Colors.kt

@@ -0,0 +1,41 @@
+package dev.contrast.kotlinapp
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.unit.dp
+
+// color resources through colorResource and the context: each swatch and its
+// ARGB, in the day values and after a night relaunch in values-night
+@Composable
+fun ColorsScreen() {
+    val context = LocalContext.current
+    val ids = listOf(R.color.brand, R.color.short_rgb, R.color.alpha, R.color.short_argb, R.color.alias, R.color.framework)
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        Text("Colors: " + context.getColor(R.color.brand).toUInt().toString(16))
+        Text(ids.joinToString(" ") { context.getColor(it).toUInt().toString(16) })
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            Box(Modifier.size(48.dp).background(colorResource(R.color.brand)))
+            Box(Modifier.size(48.dp).background(colorResource(R.color.short_rgb)))
+            Box(Modifier.size(48.dp).background(colorResource(R.color.alpha)))
+            Box(Modifier.size(48.dp).background(colorResource(R.color.short_argb)))
+            Box(Modifier.size(48.dp).background(colorResource(R.color.alias)))
+            Box(Modifier.size(48.dp).background(colorResource(R.color.framework)))
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.675",
+  "version": "0.1.677",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/src/android-theme.ts

@@ -40,7 +40,7 @@ export function readResourceValues(
   return values
 }
 
-type Namespace = 'android' | 'app'
+export type Namespace = 'android' | 'app'
 interface StyleRef {
   namespace: Namespace
   name: string
@@ -155,10 +155,7 @@ export function resolveThemeAttribute(
         throw new Error(
           `${theme}: ${attribute} uses the dynamic color ${ref[2]}, which peach kotlin does not model`,
         )
-      const next = sources[colorNamespace].colors[ref[2]]
-      if (next === undefined) throw new Error(`${theme}: ${value} is not defined`)
-      found = { value: next, namespace: colorNamespace }
-      continue
+      return resourceColor(colorNamespace, ref[2], sources)
     }
     throw new Error(`${theme}: ${attribute} has the unsupported value ${value}`)
   }
@@ -166,16 +163,35 @@ export function resolveThemeAttribute(
   return undefined
 }
 
-// a framework color resource as context.getColor reads it, following
-// references to other framework colors
-export function frameworkColor(name: string, sources: ThemeSources): number {
-  let value = sources.android.colors[name]
-  while (value !== undefined && !value.startsWith('#')) {
-    const ref = /^@(?:android:)?color\/(.+)$/.exec(value)
-    if (!ref?.[1])
-      throw new Error(`@android:color/${name} has the unsupported value ${value}`)
-    value = sources.android.colors[ref[1]]
+// a color resource as context.getColor reads it, following references to
+// other colors in either namespace; a reference written in a framework file
+// stays in the framework
+export function resourceColor(
+  namespace: Namespace,
+  name: string,
+  sources: ThemeSources,
+): number {
+  const seen = new Set<string>()
+  let ref = { namespace, name }
+  for (;;) {
+    const key = `${ref.namespace}:${ref.name}`
+    if (seen.has(key)) throw new Error(`@${key} refers to itself`)
+    seen.add(key)
+    const value = sources[ref.namespace].colors[ref.name]
+    if (value === undefined)
+      throw new Error(`@${ref.namespace}:color/${ref.name} is not defined`)
+    if (value.startsWith('#')) return color(value)
+    const next = /^@(?:(android):)?color\/(.+)$/.exec(value)
+    if (!next?.[2])
+      throw new Error(
+        `@${ref.namespace}:color/${ref.name} has the unsupported value ${value}`,
+      )
+    const nextNamespace: Namespace = next[1] ? 'android' : ref.namespace
+    // system_ colors are the device's dynamic palette, set at runtime
+    if (nextNamespace === 'android' && next[2].startsWith('system_'))
+      throw new Error(
+        `@${ref.namespace}:color/${ref.name} uses the dynamic color ${next[2]}, which peach kotlin does not model`,
+      )
+    ref = { namespace: nextNamespace, name: next[2] }
   }
-  if (value === undefined) throw new Error(`@android:color/${name} is not defined`)
-  return color(value)
 }

package/src/kotlin-app.ts

@@ -7,10 +7,11 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { readAndroidStrings, type AndroidStringResources } from './android-strings'
 import {
-  frameworkColor,
   readResourceValues,
   resolveThemeAttribute,
+  resourceColor,
   type ResourceValues,
+  type ThemeSources,
 } from './android-theme'
 import { parseXml, type XmlElement } from './android-xml'
 import frameworkThemes from './generated/android-framework-themes.json' with { type: 'json' }
@@ -50,6 +51,14 @@ export interface KotlinAppProject {
   softInputAdjust: 'pan' | 'resize' | 'nothing'
   // the module's string resources, which its R class names
   strings: AndroidStringResources
+  colors: KotlinAppColor[]
+}
+
+// a color resource's ARGB in the day and the night configuration
+export interface KotlinAppColor {
+  name: string
+  day: number
+  night: number
 }
 
 export interface AndroidPins {
@@ -195,43 +204,71 @@ function defaultTheme(targetSdk: number): string {
   return '@android:style/Theme.DeviceDefault.Light.DarkActionBar'
 }
 
-// PhoneWindow.generateLayout's status bar reads from the activity's theme.
-// enforcement is isEdgeToEdgeEnforced: target 35 and up unless the theme opts
-// out, which only target 35 may. an enforced window's status bar is
-// transparent and setStatusBarColor does nothing. an unset or @null value
-// reads as the default PhoneWindow passes, as TypedArray returns it.
 // a night configuration takes the styles and colors values-night redefines,
 // in the app and the framework, over values.
-function readWindowTheme(
-  moduleDir: string,
-  theme: string | undefined,
-  targetSdk: number,
-  night: boolean,
-): KotlinWindowTheme {
-  const read = (qualifier: string) => {
-    const values = path.join(moduleDir, 'src/main/res', qualifier)
-    return readResourceValues(
-      fs.existsSync(values)
-        ? fs
-            .readdirSync(values)
-            .filter((entry) => entry.endsWith('.xml'))
-            .map((entry) => {
-              const file = path.join(values, entry)
-              return { file, text: fs.readFileSync(file, 'utf8') }
-            })
-        : [],
-    )
-  }
+function themeSources(moduleDir: string, night: boolean): ThemeSources {
+  const read = (qualifier: string) =>
+    readResourceValues(valuesFiles(moduleDir, qualifier))
   const over = (base: ResourceValues, qualified: ResourceValues): ResourceValues => ({
     styles: { ...base.styles, ...qualified.styles },
     colors: { ...base.colors, ...qualified.colors },
   })
-  const sources = night
+  return night
     ? {
         android: over(frameworkThemes, frameworkThemes.night),
         app: over(read('values'), read('values-night')),
       }
     : { android: frameworkThemes, app: read('values') }
+}
+
+function valuesFiles(moduleDir: string, qualifier: string) {
+  const values = path.join(moduleDir, 'src/main/res', qualifier)
+  return fs.existsSync(values)
+    ? fs
+        .readdirSync(values)
+        .filter((entry) => entry.endsWith('.xml'))
+        .map((entry) => {
+          const file = path.join(values, entry)
+          return { file, text: fs.readFileSync(file, 'utf8') }
+        })
+    : []
+}
+
+// the app's color resources as getColor resolves them in a day and a night
+// configuration. only colors the default values define get an R field, as
+// AGP's compile R lists; a color under a qualifier other than night is
+// rejected by name
+function readAppColors(moduleDir: string): KotlinAppColor[] {
+  const res = path.join(moduleDir, 'src/main/res')
+  for (const dir of fs.existsSync(res) ? fs.readdirSync(res).sort() : []) {
+    if (!dir.startsWith('values') || dir === 'values' || dir === 'values-night') continue
+    const colors = Object.keys(readResourceValues(valuesFiles(moduleDir, dir)).colors)
+    if (colors.length > 0)
+      throw new Error(
+        `${res}/${dir}: color ${colors[0]} is not resolved by peach kotlin yet (only values and values-night colors)`,
+      )
+  }
+  const day = themeSources(moduleDir, false)
+  const night = themeSources(moduleDir, true)
+  return Object.keys(day.app.colors)
+    .sort()
+    .map((name) => ({
+      name,
+      day: resourceColor('app', name, day),
+      night: resourceColor('app', name, night),
+    }))
+}
+
+// PhoneWindow.generateLayout's status bar reads from the activity's theme.
+// enforcement is isEdgeToEdgeEnforced: target 35 and up unless the theme opts
+// out, which only target 35 may. an enforced window's status bar is
+// transparent and setStatusBarColor does nothing. an unset or @null value
+// reads as the default PhoneWindow passes, as TypedArray returns it.
+function readWindowTheme(
+  theme: string | undefined,
+  targetSdk: number,
+  sources: ThemeSources,
+): KotlinWindowTheme {
   const name = theme ?? defaultTheme(targetSdk)
   const flag = (attribute: string, fallback = false) => {
     const value = resolveThemeAttribute(name, attribute, sources)
@@ -259,11 +296,11 @@ function readWindowTheme(
   const navigationColor = resolveThemeAttribute(name, 'navigationBarColor', sources)
   if (typeof navigationColor === 'boolean')
     throw new Error(`${name}: navigationBarColor is not a color`)
-  const navigationDefault = frameworkColor('navigation_bar_default', sources)
+  const navigationDefault = resourceColor('android', 'navigation_bar_default', sources)
   const navigationTheme = navigationColor ?? navigationDefault
   const navigationBarColor =
     navigationTheme === navigationDefault && !edgeToEdgeEnforced
-      ? frameworkColor('navigation_bar_compatible', sources)
+      ? resourceColor('android', 'navigation_bar_compatible', sources)
       : navigationTheme
   // PhoneWindow enforces edge to edge apart from whether the theme draws bar
   // backgrounds: either way the bar is transparent
@@ -496,8 +533,8 @@ export function readKotlinApp(
     namespace: base,
     targetSdk,
     window: {
-      day: readWindowTheme(moduleDir, theme, targetSdk, false),
-      night: readWindowTheme(moduleDir, theme, targetSdk, true),
+      day: readWindowTheme(theme, targetSdk, themeSources(moduleDir, false)),
+      night: readWindowTheme(theme, targetSdk, themeSources(moduleDir, true)),
     },
     applicationClass: applicationName ? className(applicationName) : null,
     launcher: { name: launcherName, targetClass },
@@ -505,5 +542,6 @@ export function readKotlinApp(
     handlesUiMode,
     softInputAdjust,
     strings: readAndroidStrings(moduleDir),
+    colors: readAppColors(moduleDir),
   }
 }

package/src/kotlin-host.ts

@@ -436,8 +436,8 @@ export async function kotlinAppArtifact(
   )
 }
 
-// the module's R class in its namespace and the string, plurals and array
-// tables Resources reads. an id is 0x7f, the type, then the entry in name
+// the module's R class in its namespace and the string, plurals, array and
+// color tables Resources reads. an id is 0x7f, the type, then the entry in name
 // order. a device's ids also count the module's other resource types and the
 // resources its libraries merge in, which Peach does not build, so the
 // numbers themselves differ
@@ -459,48 +459,61 @@ function appResourceSources(app: KotlinAppProject): Record<string, string> {
   const field = (name: string) => `\`${name.replace(/[.-]/g, '_')}\``
   const id = (type: number, entry: number) =>
     `0x7f${type.toString(16).padStart(2, '0')}${entry.toString(16).padStart(4, '0')}`
+  const localized = <Value>(
+    resources: Array<{ name: string; values: Record<string, Value> }>,
+    render: (value: Value) => string,
+  ) =>
+    resources.map((resource) => ({
+      name: resource.name,
+      init: `mapOf(${Object.entries(resource.values)
+        .map(([locale, value]) => `${literal(locale)} to ${render(value)}`)
+        .join(', ')})`,
+    }))
+  const argb = (value: number) =>
+    `0x${value.toString(16).padStart(8, '0').toUpperCase()}.toInt()`
   const kinds = [
     {
       type: 'string',
       table: 'peachAppStrings',
-      value: 'String',
-      resources: app.strings.strings,
+      value: 'Map<String, String>',
+      entries: localized(app.strings.strings, literal),
     },
     {
       type: 'plurals',
       table: 'peachAppPlurals',
-      value: 'Map<String, String>',
-      resources: app.strings.plurals,
+      value: 'Map<String, Map<String, String>>',
+      entries: localized(
+        app.strings.plurals,
+        (items) =>
+          `mapOf(${Object.entries(items)
+            .map(([quantity, text]) => `${literal(quantity)} to ${literal(text ?? '')}`)
+            .join(', ')})`,
+      ),
     },
     {
       type: 'array',
       table: 'peachAppArrays',
-      value: 'List<String>',
-      resources: app.strings.arrays,
+      value: 'Map<String, List<String>>',
+      entries: localized(
+        app.strings.arrays,
+        (items) => `listOf(${items.map(literal).join(', ')})`,
+      ),
+    },
+    // the day and the night ARGB
+    {
+      type: 'color',
+      table: 'peachAppColors',
+      value: 'IntArray',
+      entries: app.colors.map((color) => ({
+        name: color.name,
+        init: `intArrayOf(${argb(color.day)}, ${argb(color.night)})`,
+      })),
     },
   ].map((kind, index) => ({
     ...kind,
-    entries: kind.resources.map((resource, entry) => ({
-      name: resource.name,
-      id: id(index + 1, entry),
-      values: Object.entries(resource.values).map(
-        ([locale, value]: [
-          string,
-          string | string[] | Partial<Record<string, string>>,
-        ]) =>
-          `${literal(locale)} to ${
-            typeof value === 'string'
-              ? literal(value)
-              : Array.isArray(value)
-                ? `listOf(${value.map(literal).join(', ')})`
-                : `mapOf(${Object.entries(value)
-                    .map(
-                      ([quantity, text]) =>
-                        `${literal(quantity)} to ${literal(text ?? '')}`,
-                    )
-                    .join(', ')})`
-          }`,
-      ),
+    entries: kind.entries.map((entry, number) => ({
+      ...entry,
+      id: id(index + 1, number),
     })),
   }))
   return {
@@ -522,10 +535,8 @@ function appResourceSources(app: KotlinAppProject): Record<string, string> {
       'package dev.peach.app',
       '',
       ...kinds.flatMap((kind) => [
-        `internal val ${kind.table}: Map<Int, Map<String, ${kind.value}>> = mapOf(`,
-        ...kind.entries.map(
-          (entry) => `    ${entry.id} to mapOf(${entry.values.join(', ')}),`,
-        ),
+        `internal val ${kind.table}: Map<Int, ${kind.value}> = mapOf(`,
+        ...kind.entries.map((entry) => `    ${entry.id} to ${entry.init},`),
         ')',
         '',
       ]),