peachsim 0.1.2207 → 0.1.2209

package/src/generated/android-framework-themes.json

@@ -2189,6 +2189,17 @@
         "windowMinWidthMinor": "@null"
       }
     },
+    "Theme.DeviceDefault.AppLockActivity": {
+      "parent": "Theme.DeviceDefault.Resolver",
+      "items": {
+        "android:windowIsFloating": "false",
+        "android:windowBackground": "@android:color/transparent",
+        "android:windowIsTranslucent": "true",
+        "android:windowNoDisplay": "false",
+        "android:windowDisablePreview": "true",
+        "android:windowAnimationStyle": "@android:style/Animation.Activity"
+      }
+    },
     "Theme": {
       "parent": null,
       "items": {

package/src/kotlin-app.ts

@@ -10,12 +10,15 @@ import { readAndroidLayoutIds, type AndroidLayoutIds } from './android-layout-id
 import { readAndroidStrings, type AndroidStringResources } from './android-strings'
 import {
   readResourceValues,
+  resolveTextAppearance,
   resolveThemeAttribute,
   resourceColor,
   type ResourceValues,
+  type TextAppearance,
   type ThemeSources,
 } from './android-theme'
 import { parseXml, type XmlElement } from './android-xml'
+import frameworkText from './generated/android-framework-text.json' with { type: 'json' }
 import frameworkThemes from './generated/android-framework-themes.json' with { type: 'json' }
 import { isRecord } from './is-record'
 import { composeBomVersions } from './kotlin-compose-bom'
@@ -47,6 +50,8 @@ export interface KotlinAppProject {
   // the launched activity's window as its theme and target SDK configure it
   // in a day and a night configuration
   window: { day: KotlinWindowTheme; night: KotlinWindowTheme }
+  // a TextView's default color and size under the launched activity's theme
+  text: { day: TextAppearance; night: TextAppearance }
   applicationClass: string | null
   launcher: { name: string; targetClass: string }
   // back reaches the activity through its window's back dispatch rather than
@@ -399,21 +404,32 @@ function defaultTheme(targetSdk: number): string {
   return '@android:style/Theme.DeviceDefault.Light.DarkActionBar'
 }
 
-// a night configuration takes the styles and colors values-night redefines,
-// in the app and the framework, over values.
+// a night configuration takes what values-night and color-night redefine, in
+// the app and the framework, over values.
 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 },
+    dimens: { ...base.dimens, ...qualified.dimens },
+    stateColors: { ...base.stateColors, ...qualified.stateColors },
   })
+  const framework = (
+    themes: Pick<ResourceValues, 'styles' | 'colors'>,
+    text: Omit<ResourceValues, 'colors'>,
+  ): ResourceValues => ({
+    ...text,
+    styles: { ...themes.styles, ...text.styles },
+    colors: themes.colors,
+  })
+  const android = framework(frameworkThemes, frameworkText)
   return night
     ? {
-        android: over(frameworkThemes, frameworkThemes.night),
+        android: over(android, framework(frameworkThemes.night, frameworkText.night)),
         app: over(read('values'), read('values-night')),
       }
-    : { android: frameworkThemes, app: read('values') }
+    : { android, app: read('values') }
 }
 
 function valuesFiles(moduleDir: string, qualifier: string) {
@@ -774,6 +790,10 @@ export async function readKotlinApp(
       day: readWindowTheme(theme, targetSdk, resources.day),
       night: readWindowTheme(theme, targetSdk, resources.night),
     },
+    text: {
+      day: resolveTextAppearance(theme ?? defaultTheme(targetSdk), resources.day),
+      night: resolveTextAppearance(theme ?? defaultTheme(targetSdk), resources.night),
+    },
     applicationClass: applicationName ? className(applicationName) : null,
     launcher: { name: launcherName, targetClass },
     predictiveBack,

package/src/kotlin-host.ts

@@ -40,6 +40,7 @@ import {
   type ViewModelClass,
 } from './kotlin-view-models'
 import type { DayNight, DrawableFile } from './android-drawables'
+import type { TextAppearance } from './android-theme'
 import type { XmlElement } from './android-xml'
 import type { ExpoKotlinModules } from './expo-kotlin-host'
 import type { KotlinAppProject, KotlinWindowTheme } from './kotlin-app'
@@ -848,6 +849,13 @@ function windowTheme(window: KotlinWindowTheme): string[] {
   ]
 }
 
+// a TextView appearance: its ARGB, and its size split into number and unit
+function themeText(text: TextAppearance): string {
+  const [, size, unit] = /^([\d.]+)([a-z]+)$/.exec(text.size) ?? []
+  if (!size || !unit) throw new Error(`unreadable text size ${text.size}`)
+  return `        android.content.res.ThemeText(${argb(text.color)}, ${size}f, ${literal(unit)}),`
+}
+
 // a pure Kotlin app: its module's sources, the Android platform actuals and
 // the compose host, with an entry that cold-starts the resolved launcher
 
@@ -873,6 +881,7 @@ export async function kotlinAppArtifact(
       `        android.content.ComponentName(${literal(app.packageName)}, ${literal(app.launcher.targetClass)}),`,
       ...windowTheme(app.window.day),
       ...windowTheme(app.window.night),
+      ...[app.text.day, app.text.night].map(themeText),
       `        { ${app.applicationClass ?? 'android.app.Application'}() },`,
       `        { ${app.launcher.targetClass}() },`,
       `        ${app.handlesUiMode},`,