peachsim 0.1.661 → 0.1.663

package/kotlin/AppSources/androidx/activity/ActivityViewModelLazy.kt

@@ -0,0 +1,21 @@
+package androidx.activity
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelLazy
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.CreationExtras
+
+// activity-ktx's viewModels(): the activity's store, its default factory and
+// creation extras unless the caller passes its own
+inline fun <reified VM : ViewModel> ComponentActivity.viewModels(
+    noinline extrasProducer: (() -> CreationExtras)? = null,
+    noinline factoryProducer: (() -> ViewModelProvider.Factory)? = null,
+): Lazy<VM> {
+    val factoryPromise = factoryProducer ?: { defaultViewModelProviderFactory }
+    return ViewModelLazy(
+        VM::class,
+        { viewModelStore },
+        factoryPromise,
+        { extrasProducer?.invoke() ?: this.defaultViewModelCreationExtras },
+    )
+}

package/kotlin/AppSources/androidx/activity/ComponentActivity.kt

@@ -8,7 +8,6 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.SAVED_STATE_REGISTRY_OWNER_KEY
-import androidx.lifecycle.SavedStateViewModelFactory
 import androidx.lifecycle.VIEW_MODEL_STORE_OWNER_KEY
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
@@ -23,7 +22,8 @@ import androidx.savedstate.SavedStateRegistryOwner
 // lifecycle, viewmodel and savedstate libraries: the registry attaches in the
 // constructor and restores in onCreate before super, the lifecycle moves up on
 // the post callbacks and down on the pre callbacks, as ReportFragment does from
-// API 29, and destroy clears the view model store.
+// API 29, and destroy clears the view model store unless the activity is
+// changing configurations.
 open class ComponentActivity : Activity(), LifecycleOwner, ViewModelStoreOwner,
     HasDefaultViewModelProviderFactory, SavedStateRegistryOwner, OnBackPressedDispatcherOwner {
     private val lifecycleRegistry = LifecycleRegistry(this)
@@ -48,7 +48,9 @@ open class ComponentActivity : Activity(), LifecycleOwner, ViewModelStoreOwner,
         }
     }
     override val savedStateRegistry: SavedStateRegistry get() = savedStateRegistryController.savedStateRegistry
-    override val defaultViewModelProviderFactory = SavedStateViewModelFactory()
+    // SavedStateViewModelFactory's constructor choice, made at compile time
+    // for the app's view models since Kotlin/Wasm has no reflection
+    override val defaultViewModelProviderFactory get() = dev.peach.app.viewModelFactory()
     override val defaultViewModelCreationExtras: CreationExtras
         get() = MutableCreationExtras().also {
             it[SAVED_STATE_REGISTRY_OWNER_KEY] = this

package/kotlin/AppSources/androidx/lifecycle/AndroidViewModel.kt

@@ -0,0 +1,10 @@
+package androidx.lifecycle
+
+import android.app.Application
+
+// androidx.lifecycle's AndroidViewModel: a view model that holds its
+// application, which the default factory passes to its constructor
+open class AndroidViewModel(private val application: Application) : ViewModel() {
+    @Suppress("UNCHECKED_CAST")
+    open fun <T : Application> getApplication(): T = application as T
+}

package/kotlin/AppSources/dev/peach/app/PeachApp.kt

@@ -15,6 +15,7 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowTheme
 import androidx.activity.ComponentActivity
+import androidx.lifecycle.ViewModelProvider
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -45,14 +46,24 @@ import org.json.JSONObject
 internal class PeachAppSpec(
     val launcher: ComponentName,
     val component: ComponentName,
-    val window: WindowTheme,
+    // the launcher activity's window theme in a day and a night configuration,
+    // values-night over values
+    val dayWindow: WindowTheme,
+    val nightWindow: WindowTheme,
     val createApplication: () -> Application,
     val createActivity: () -> Activity,
     // the activity's configChanges includes uiMode: it takes a night mode
     // change in onConfigurationChanged rather than relaunching
     val handlesUiMode: Boolean,
+    // the app's view models, each built with the constructor the device's
+    // default factory finds for it
+    val viewModels: ViewModelProvider.Factory,
 )
 
+internal fun viewModelFactory(): ViewModelProvider.Factory = runningApp().spec.viewModels
+
+internal fun peachApplication(): Application = runningApp().application
+
 // the insets the device delivers to the window's content, in pixels: all of
 // them on an edge-to-edge window, none once the decor fits system windows.
 // insets lists the status bars, navigation bars, display cutout, system
@@ -192,7 +203,10 @@ private fun launchActivity(app: AppProcess, lastNonConfigurationInstance: Any?):
                 mount.emitAtFrame("window") { window.describe().toString() }
         }
     }
-    window = Window(activity, spec.window, host)
+    // the theme the activity is created under: a relaunch after a night
+    // change takes the other one
+    val theme = if (isNight(processResources.configuration)) spec.nightWindow else spec.dayWindow
+    window = Window(activity, theme, host)
     activity.attach(
         app.application,
         spec.component,

package/kotlin/tools/abi-classes.main.kts

@@ -0,0 +1,41 @@
+// prints an app klib's classes as the compiler resolved them, one JSON object
+// per line: qualified name, kind, modality, whether it is inner or generic,
+// its supertypes and its public constructors' parameter types, each marked
+// when every parameter has a default
+@file:OptIn(org.jetbrains.kotlin.library.abi.ExperimentalLibraryAbiReader::class)
+
+import org.jetbrains.kotlin.library.abi.*
+
+fun name(qualified: AbiQualifiedName): String {
+    val pkg = qualified.packageName.value.replace('/', '.')
+    val relative = qualified.relativeName.value
+    return if (pkg.isEmpty()) relative else "$pkg.$relative"
+}
+
+fun type(type: AbiType): String =
+    ((type as? AbiType.Simple)?.classifierReference as? AbiClassifierReference.ClassReference)
+        ?.let { name(it.className) } ?: "?"
+
+fun quote(value: String) = "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\""
+
+fun walk(declaration: AbiDeclaration) {
+    if (declaration !is AbiClass) return
+    val constructors = declaration.declarations.filterIsInstance<AbiFunction>()
+        .filter { it.isConstructor }
+        .map { constructor ->
+            val parameters = constructor.valueParameters.joinToString(",", "[", "]") { quote(type(it.type)) }
+            "{\"parameters\":$parameters,\"defaulted\":${constructor.valueParameters.all { it.hasDefaultArg }}}"
+        }
+    println(
+        "{\"name\":${quote(name(declaration.qualifiedName))}" +
+            ",\"kind\":${quote(declaration.kind.name)}" +
+            ",\"modality\":${quote(declaration.modality.name)}" +
+            ",\"inner\":${declaration.isInner}" +
+            ",\"generic\":${declaration.typeParameters.isNotEmpty()}" +
+            ",\"supers\":${declaration.superTypes.joinToString(",", "[", "]") { quote(type(it)) }}" +
+            ",\"constructors\":${constructors.joinToString(",", "[", "]")}}",
+    )
+    declaration.declarations.forEach(::walk)
+}
+
+LibraryAbiReader.readAbiInfo(java.io.File(args[0])).topLevelDeclarations.declarations.forEach(::walk)

package/package.json

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

package/src/bridge-contract-input.ts

@@ -415,8 +415,12 @@ export function parseSemanticWaitOptions(value: unknown): SemanticWaitOptions {
   const type = stringValue(condition.type, 'waitFor.condition.type')
   const timeoutMs = semanticWaitTimeout(input, 'waitFor')
   if (type === 'ready') {
+    const stableMs = optionalNumber(condition, 'stableMs', 'waitFor.condition')
+    if (stableMs !== undefined && stableMs < 0) {
+      validationFailure('waitFor.condition.stableMs', 'must be at least 0')
+    }
     return {
-      condition: { type },
+      condition: { type, ...(stableMs === undefined ? {} : { stableMs }) },
       ...(timeoutMs === undefined ? {} : { timeoutMs }),
     }
   }

package/src/bridge-contract.ts

@@ -332,7 +332,10 @@ export interface PerformResult {
 // something to look at — those are 1x1 and painted under the whole app, so they
 // are permanently occluded and `present` can never match one.
 export type SemanticWaitCondition =
-  | { type: 'ready' }
+  // stableMs: how long the node count must hold before ready matches
+  // (SEMANTIC_READY_NODE_STABLE_MS by default). a caller that already waited
+  // for the app to settle passes 0 to read the settled tree at once.
+  | { type: 'ready'; stableMs?: number }
   | { type: 'present'; selector: SimSemanticResolveSelector }
   | { type: 'mounted'; selector: SimSemanticResolveSelector }
   | { type: 'absent'; selector: SimSemanticResolveSelector }

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

@@ -6299,5 +6299,346 @@
     "legacy_light_control_normal": "#99000000",
     "legacy_light_button_pressed": "@color/legacy_orange",
     "legacy_light_button_normal": "#f3dbdbdb"
+  },
+  "night": {
+    "styles": {
+      "Theme.DeviceDefault.Settings": {
+        "parent": "Theme.DeviceDefault",
+        "items": {
+          "windowLightStatusBar": "false",
+          "navigationBarColor": "@android:color/black",
+          "windowLightNavigationBar": "false",
+          "colorPrimary": "@color/primary_dark_device_default_settings",
+          "colorPrimaryDark": "@color/primary_dark_device_default_settings",
+          "colorBackground": "@color/primary_dark_device_default_settings",
+          "colorEdgeEffect": "@color/edge_effect_device_default_dark",
+          "colorListDivider": "@color/list_divider_color_dark",
+          "opacityListDivider": "@color/list_divider_opacity_device_default_dark"
+        }
+      },
+      "Theme.DeviceDefault.Settings.DialogBase": {
+        "parent": "Theme.Material.BaseDialog",
+        "items": {
+          "colorPrimary": "@color/primary_dark_device_default_settings",
+          "colorPrimaryDark": "@color/primary_dark_device_default_settings",
+          "colorSecondary": "@color/secondary_device_default_settings",
+          "colorAccent": "@color/accent_device_default_dark",
+          "colorError": "@color/error_color_device_default_dark",
+          "alertDialogTheme": "@style/Theme.DeviceDefault.Dialog.Alert"
+        }
+      },
+      "Theme.DeviceDefault.Dialog.AppError": {
+        "parent": "Theme.DeviceDefault.Dialog.Alert",
+        "items": {}
+      },
+      "Theme.DeviceDefault.Dialog.Alert.DayNight": {
+        "parent": "Theme.DeviceDefault.Dialog.Alert",
+        "items": {}
+      },
+      "Theme.DeviceDefault.DayNight": {
+        "parent": "Theme.DeviceDefault",
+        "items": {}
+      },
+      "ThemeOverlay.DeviceDefault.Accent.DayNight": {
+        "parent": "@style/ThemeOverlay.DeviceDefault.Accent",
+        "items": {}
+      },
+      "Theme.DeviceDefault.Resolver": {
+        "parent": "Theme.DeviceDefault.ResolverCommon",
+        "items": {
+          "windowLightNavigationBar": "false",
+          "colorBackgroundFloating": "@android:color/GM2_grey_800",
+          "textColorSecondary": "@android:color/resolver_text_color_secondary_dark"
+        }
+      },
+      "Theme.DeviceDefault.AutofillHalfScreenDialogButton": {
+        "parent": "Theme.DeviceDefault.Panel",
+        "items": {
+          "selectableItemBackground": "@android:color/transparent",
+          "colorAccentPrimaryVariant": "@color/system_accent1_200",
+          "colorAccentPrimary": "@color/system_accent1_700",
+          "textColorPrimary": "@color/system_neutral1_100",
+          "textColorSecondary": "@color/system_neutral2_100",
+          "colorListDivider": "@color/white"
+        }
+      },
+      "Theme.DeviceDefault.AutofillHalfScreenDialogList": {
+        "parent": "Theme.DeviceDefault.DayNight",
+        "items": {
+          "colorForeground": "@android:color/white"
+        }
+      },
+      "Theme.DeviceDefault.AutofillDialogExpressiveButton": {
+        "parent": "Theme.DeviceDefault.Panel",
+        "items": {
+          "colorPrimary": "@color/system_primary_dark"
+        }
+      }
+    },
+    "colors": {
+      "accent_device_default": "@color/accent_device_default_dark",
+      "notification_primary_text_color_current": "@color/notification_primary_text_color_dark",
+      "notification_secondary_text_color_current": "@color/notification_secondary_text_color_dark",
+      "notification_default_color_current": "@color/notification_default_color_dark",
+      "chooser_row_divider": "@color/list_divider_color_dark",
+      "chooser_gradient_background": "@color/loading_gradient_background_color_dark",
+      "chooser_gradient_highlight": "@color/loading_gradient_highlight_color_dark",
+      "call_notification_decline_color": "#E66A5E",
+      "call_notification_answer_color": "#5DBA80",
+      "personal_apps_suspension_notification_color": "#8AB4F8",
+      "overview_background": "@color/overview_background_dark",
+      "user_icon_4": "#fff439a0",
+      "user_icon_6": "#ff4ecde6",
+      "user_icon_7": "#fffbbc04",
+      "user_icon_8": "#fffa903e",
+      "language_picker_item_text_color": "#F1F3F4",
+      "language_picker_item_text_color_secondary": "#BDC1C6",
+      "language_picker_item_text_color_selected": "#202124",
+      "language_picker_item_text_color_secondary_selected": "#202124",
+      "language_picker_item_selected_indicator": "#202124",
+      "language_picker_item_selected_bg": "#92B3F2",
+      "language_picker_item_selected_stroke": "#185ABC",
+      "shade_panel_fg": "@color/shade_panel_fg_color",
+      "shade_panel_bg": "@color/shade_panel_bg_color",
+      "side_fps_toast_background": "#2E3132",
+      "side_fps_text_color": "#EFF1F2",
+      "side_fps_button_color": "#33B9DB",
+      "security_privacy_notification_tint_normal": "#8AB4F8",
+      "system_on_primary_fixed": "@color/system_on_primary_fixed_dark",
+      "system_on_primary_fixed_variant": "@color/system_on_primary_fixed_variant_dark",
+      "system_on_secondary_fixed": "@color/system_on_secondary_fixed_dark",
+      "system_on_secondary_fixed_variant": "@color/system_on_secondary_fixed_variant_dark",
+      "system_on_tertiary_fixed": "@color/system_on_tertiary_fixed_dark",
+      "system_on_tertiary_fixed_variant": "@color/system_on_tertiary_fixed_variant_dark",
+      "system_primary_fixed": "@color/system_primary_fixed_dark",
+      "system_primary_fixed_dim": "@color/system_primary_fixed_dim_dark",
+      "system_secondary_fixed": "@color/system_secondary_fixed_dark",
+      "system_secondary_fixed_dim": "@color/system_secondary_fixed_dim_dark",
+      "system_tertiary_fixed": "@color/system_tertiary_fixed_dark",
+      "system_tertiary_fixed_dim": "@color/system_tertiary_fixed_dim_dark",
+      "semanticGreenContainerLow": "#00522D",
+      "semanticGreenOnContainerLow": "#84FAB1",
+      "semanticGreenContainer": "#26A565",
+      "semanticGreenOnContainer": "#00210F",
+      "semanticGreenOnContainerVariant": "#00210F",
+      "semanticGreenContainerHigh": "#3FB876",
+      "semanticGreenOnContainerHigh": "#410002",
+      "semanticGreenOnSurface": "#E5F9E1",
+      "semanticGreenOnSurfaceVariant": "#3FB876",
+      "semanticGreenSurfaceContainerLow": "#00210F",
+      "semanticGreenSurfaceContainer": "#022513",
+      "semanticGreenSurfaceContainerHigh": "#0D301C",
+      "semanticGreenSurfaceContainerHighest": "#193B27",
+      "semanticYellowContainerLow": "#594400",
+      "semanticYellowOnContainerLow": "#FFDF93",
+      "semanticYellowContainer": "#F5BF00",
+      "semanticYellowOnContainer": "#241A00",
+      "semanticYellowContainerHigh": "#F5BF00",
+      "semanticYellowOnContainerHigh": "#241A00",
+      "semanticYellowOnSurface": "#FFF2DB",
+      "semanticYellowOnSurfaceVariant": "#CA9D00",
+      "semanticYellowSurfaceContainerLow": "#241A00",
+      "semanticYellowSurfaceContainer": "#291E00",
+      "semanticYellowSurfaceContainerHigh": "#362800",
+      "semanticYellowSurfaceContainerHighest": "#423308",
+      "semanticRedContainerLow": "#910A0E",
+      "semanticRedOnContainerLow": "#FFDAD6",
+      "semanticRedContainer": "#F95A4F",
+      "semanticRedOnContainer": "#410002",
+      "semanticRedOnContainerVariant": "#410002",
+      "semanticRedContainerHigh": "#F95A4F",
+      "semanticRedOnContainerHigh": "#410002",
+      "semanticRedOnSurface": "#FFF0EE",
+      "semanticRedOnSurfaceVariant": "#FF7B6E",
+      "semanticRedSurfaceContainerLow": "#33110E",
+      "semanticRedSurfaceContainer": "#381511",
+      "semanticRedSurfaceContainerHigh": "#441F1B",
+      "semanticRedSurfaceContainerHighest": "#512925",
+      "semanticBlueContainerLow": "#00429B",
+      "semanticBlueOnContainerLow": "#D5E3FF",
+      "semanticBlueContainer": "#4E8FF8",
+      "semanticBlueOnContainer": "#001945",
+      "semanticBlueOnContainerVariant": "#001945",
+      "semanticBlueContainerHigh": "#68A4FE",
+      "semanticBlueOnContainerHigh": "#001945",
+      "semanticBlueOnSurface": "#F0F3FF",
+      "semanticBlueOnSurfaceVariant": "#68A4FE",
+      "semanticBlueSurfaceContainerLow": "#001945",
+      "semanticBlueSurfaceContainer": "#001D4D",
+      "semanticBlueSurfaceContainerHigh": "#002761",
+      "semanticBlueSurfaceContainerHighest": "#003177",
+      "system_accent1_0": "@color/system_accent1_0_dark",
+      "system_accent1_10": "@color/system_accent1_10_dark",
+      "system_accent1_50": "@color/system_accent1_50_dark",
+      "system_accent1_100": "@color/system_accent1_100_dark",
+      "system_accent1_200": "@color/system_accent1_200_dark",
+      "system_accent1_300": "@color/system_accent1_300_dark",
+      "system_accent1_400": "@color/system_accent1_400_dark",
+      "system_accent1_500": "@color/system_accent1_500_dark",
+      "system_accent1_600": "@color/system_accent1_600_dark",
+      "system_accent1_700": "@color/system_accent1_700_dark",
+      "system_accent1_800": "@color/system_accent1_800_dark",
+      "system_accent1_900": "@color/system_accent1_900_dark",
+      "system_accent1_1000": "@color/system_accent1_1000_dark",
+      "system_accent2_0": "@color/system_accent2_0_dark",
+      "system_accent2_10": "@color/system_accent2_10_dark",
+      "system_accent2_50": "@color/system_accent2_50_dark",
+      "system_accent2_100": "@color/system_accent2_100_dark",
+      "system_accent2_200": "@color/system_accent2_200_dark",
+      "system_accent2_300": "@color/system_accent2_300_dark",
+      "system_accent2_400": "@color/system_accent2_400_dark",
+      "system_accent2_500": "@color/system_accent2_500_dark",
+      "system_accent2_600": "@color/system_accent2_600_dark",
+      "system_accent2_700": "@color/system_accent2_700_dark",
+      "system_accent2_800": "@color/system_accent2_800_dark",
+      "system_accent2_900": "@color/system_accent2_900_dark",
+      "system_accent2_1000": "@color/system_accent2_1000_dark",
+      "system_accent3_0": "@color/system_accent3_0_dark",
+      "system_accent3_10": "@color/system_accent3_10_dark",
+      "system_accent3_50": "@color/system_accent3_50_dark",
+      "system_accent3_100": "@color/system_accent3_100_dark",
+      "system_accent3_200": "@color/system_accent3_200_dark",
+      "system_accent3_300": "@color/system_accent3_300_dark",
+      "system_accent3_400": "@color/system_accent3_400_dark",
+      "system_accent3_500": "@color/system_accent3_500_dark",
+      "system_accent3_600": "@color/system_accent3_600_dark",
+      "system_accent3_700": "@color/system_accent3_700_dark",
+      "system_accent3_800": "@color/system_accent3_800_dark",
+      "system_accent3_900": "@color/system_accent3_900_dark",
+      "system_accent3_1000": "@color/system_accent3_1000_dark",
+      "system_neutral1_0": "@color/system_neutral1_0_dark",
+      "system_neutral1_10": "@color/system_neutral1_10_dark",
+      "system_neutral1_50": "@color/system_neutral1_50_dark",
+      "system_neutral1_100": "@color/system_neutral1_100_dark",
+      "system_neutral1_200": "@color/system_neutral1_200_dark",
+      "system_neutral1_300": "@color/system_neutral1_300_dark",
+      "system_neutral1_400": "@color/system_neutral1_400_dark",
+      "system_neutral1_500": "@color/system_neutral1_500_dark",
+      "system_neutral1_600": "@color/system_neutral1_600_dark",
+      "system_neutral1_700": "@color/system_neutral1_700_dark",
+      "system_neutral1_800": "@color/system_neutral1_800_dark",
+      "system_neutral1_900": "@color/system_neutral1_900_dark",
+      "system_neutral1_1000": "@color/system_neutral1_1000_dark",
+      "system_neutral2_0": "@color/system_neutral2_0_dark",
+      "system_neutral2_10": "@color/system_neutral2_10_dark",
+      "system_neutral2_50": "@color/system_neutral2_50_dark",
+      "system_neutral2_100": "@color/system_neutral2_100_dark",
+      "system_neutral2_200": "@color/system_neutral2_200_dark",
+      "system_neutral2_300": "@color/system_neutral2_300_dark",
+      "system_neutral2_400": "@color/system_neutral2_400_dark",
+      "system_neutral2_500": "@color/system_neutral2_500_dark",
+      "system_neutral2_600": "@color/system_neutral2_600_dark",
+      "system_neutral2_700": "@color/system_neutral2_700_dark",
+      "system_neutral2_800": "@color/system_neutral2_800_dark",
+      "system_neutral2_900": "@color/system_neutral2_900_dark",
+      "system_neutral2_1000": "@color/system_neutral2_1000_dark",
+      "system_error_0": "@color/system_error_0_dark",
+      "system_error_10": "@color/system_error_10_dark",
+      "system_error_50": "@color/system_error_50_dark",
+      "system_error_100": "@color/system_error_100_dark",
+      "system_error_200": "@color/system_error_200_dark",
+      "system_error_300": "@color/system_error_300_dark",
+      "system_error_400": "@color/system_error_400_dark",
+      "system_error_500": "@color/system_error_500_dark",
+      "system_error_600": "@color/system_error_600_dark",
+      "system_error_700": "@color/system_error_700_dark",
+      "system_error_800": "@color/system_error_800_dark",
+      "system_error_900": "@color/system_error_900_dark",
+      "system_error_1000": "@color/system_error_1000_dark",
+      "materialColorBackground": "@color/system_background_dark",
+      "materialColorControlActivated": "@color/system_control_activated_dark",
+      "materialColorControlHighlight": "@color/system_control_highlight_dark",
+      "materialColorControlNormal": "@color/system_control_normal_dark",
+      "materialColorError": "@color/system_error_dark",
+      "materialColorErrorContainer": "@color/system_error_container_dark",
+      "materialColorErrorDim": "@color/system_error_dim_dark",
+      "materialColorInverseOnSurface": "@color/system_inverse_on_surface_dark",
+      "materialColorInversePrimary": "@color/system_inverse_primary_dark",
+      "materialColorInverseSurface": "@color/system_inverse_surface_dark",
+      "materialColorOnBackground": "@color/system_on_background_dark",
+      "materialColorOnError": "@color/system_on_error_dark",
+      "materialColorOnErrorContainer": "@color/system_on_error_container_dark",
+      "materialColorOnPrimary": "@color/system_on_primary_dark",
+      "materialColorOnPrimaryContainer": "@color/system_on_primary_container_dark",
+      "materialColorOnSecondary": "@color/system_on_secondary_dark",
+      "materialColorOnSecondaryContainer": "@color/system_on_secondary_container_dark",
+      "materialColorOnSurface": "@color/system_on_surface_dark",
+      "materialColorOnSurfaceVariant": "@color/system_on_surface_variant_dark",
+      "materialColorOnTertiary": "@color/system_on_tertiary_dark",
+      "materialColorOnTertiaryContainer": "@color/system_on_tertiary_container_dark",
+      "materialColorOutline": "@color/system_outline_dark",
+      "materialColorOutlineVariant": "@color/system_outline_variant_dark",
+      "materialColorPaletteKeyColorError": "@color/system_palette_key_color_error_dark",
+      "materialColorPaletteKeyColorNeutral": "@color/system_palette_key_color_neutral_dark",
+      "materialColorPaletteKeyColorNeutralVariant": "@color/system_palette_key_color_neutral_variant_dark",
+      "materialColorPaletteKeyColorPrimary": "@color/system_palette_key_color_primary_dark",
+      "materialColorPaletteKeyColorSecondary": "@color/system_palette_key_color_secondary_dark",
+      "materialColorPaletteKeyColorTertiary": "@color/system_palette_key_color_tertiary_dark",
+      "materialColorPrimary": "@color/system_primary_dark",
+      "materialColorPrimaryContainer": "@color/system_primary_container_dark",
+      "materialColorPrimaryDim": "@color/system_primary_dim_dark",
+      "materialColorScrim": "@color/system_scrim_dark",
+      "materialColorSecondary": "@color/system_secondary_dark",
+      "materialColorSecondaryContainer": "@color/system_secondary_container_dark",
+      "materialColorSecondaryDim": "@color/system_secondary_dim_dark",
+      "materialColorShadow": "@color/system_shadow_dark",
+      "materialColorSurface": "@color/system_surface_dark",
+      "materialColorSurfaceBright": "@color/system_surface_bright_dark",
+      "materialColorSurfaceContainer": "@color/system_surface_container_dark",
+      "materialColorSurfaceContainerHigh": "@color/system_surface_container_high_dark",
+      "materialColorSurfaceContainerHighest": "@color/system_surface_container_highest_dark",
+      "materialColorSurfaceContainerLow": "@color/system_surface_container_low_dark",
+      "materialColorSurfaceContainerLowest": "@color/system_surface_container_lowest_dark",
+      "materialColorSurfaceDim": "@color/system_surface_dim_dark",
+      "materialColorSurfaceTint": "@color/system_surface_tint_dark",
+      "materialColorSurfaceVariant": "@color/system_surface_variant_dark",
+      "materialColorTertiary": "@color/system_tertiary_dark",
+      "materialColorTertiaryContainer": "@color/system_tertiary_container_dark",
+      "materialColorTertiaryDim": "@color/system_tertiary_dim_dark",
+      "materialColorTextHintInverse": "@color/system_text_hint_inverse_dark",
+      "materialColorTextPrimaryInverse": "@color/system_text_primary_inverse_dark",
+      "materialColorTextPrimaryInverseDisableOnly": "@color/system_text_primary_inverse_disable_only_dark",
+      "materialColorTextSecondaryAndTertiaryInverse": "@color/system_text_secondary_and_tertiary_inverse_dark",
+      "materialColorTextSecondaryAndTertiaryInverseDisabled": "@color/system_text_secondary_and_tertiary_inverse_disabled_dark",
+      "materialColorOnPrimaryFixed": "@color/system_on_primary_fixed_dark",
+      "materialColorOnPrimaryFixedVariant": "@color/system_on_primary_fixed_variant_dark",
+      "materialColorOnSecondaryFixed": "@color/system_on_secondary_fixed_dark",
+      "materialColorOnSecondaryFixedVariant": "@color/system_on_secondary_fixed_variant_dark",
+      "materialColorOnTertiaryFixed": "@color/system_on_tertiary_fixed_dark",
+      "materialColorOnTertiaryFixedVariant": "@color/system_on_tertiary_fixed_variant_dark",
+      "materialColorPrimaryFixed": "@color/system_primary_fixed_dark",
+      "materialColorPrimaryFixedDim": "@color/system_primary_fixed_dim_dark",
+      "materialColorSecondaryFixed": "@color/system_secondary_fixed_dark",
+      "materialColorSecondaryFixedDim": "@color/system_secondary_fixed_dim_dark",
+      "materialColorTertiaryFixed": "@color/system_tertiary_fixed_dark",
+      "materialColorTertiaryFixedDim": "@color/system_tertiary_fixed_dim_dark",
+      "customColorBrandA": "@color/system_brand_a_dark",
+      "customColorBrandB": "@color/system_brand_b_dark",
+      "customColorBrandC": "@color/system_brand_c_dark",
+      "customColorBrandD": "@color/system_brand_d_dark",
+      "customColorClockHour": "@color/system_clock_hour_dark",
+      "customColorClockMinute": "@color/system_clock_minute_dark",
+      "customColorClockSecond": "@color/system_clock_second_dark",
+      "customColorOnShadeActive": "@color/system_on_shade_active_dark",
+      "customColorOnShadeActiveVariant": "@color/system_on_shade_active_variant_dark",
+      "customColorOnShadeInactive": "@color/system_on_shade_inactive_dark",
+      "customColorOnShadeInactiveVariant": "@color/system_on_shade_inactive_variant_dark",
+      "customColorOnThemeApp": "@color/system_on_theme_app_dark",
+      "customColorOverviewBackground": "@color/system_overview_background_dark",
+      "customColorShadeActive": "@color/system_shade_active_dark",
+      "customColorShadeDisabled": "@color/system_shade_disabled_dark",
+      "customColorShadeInactive": "@color/system_shade_inactive_dark",
+      "customColorSurfaceEffect0": "@color/system_surface_effect_0_dark",
+      "customColorSurfaceEffect0Fallback": "@color/system_surface_effect_0_fallback_dark",
+      "customColorSurfaceEffect1": "@color/system_surface_effect_1_dark",
+      "customColorSurfaceEffect2": "@color/system_surface_effect_2_dark",
+      "customColorSurfaceEffect3": "@color/system_surface_effect_3_dark",
+      "customColorThemeApp": "@color/system_theme_app_dark",
+      "customColorThemeAppRing": "@color/system_theme_app_ring_dark",
+      "customColorThemeNotif": "@color/system_theme_notif_dark",
+      "customColorUnderSurface": "@color/system_under_surface_dark",
+      "customColorWeatherTemp": "@color/system_weather_temp_dark",
+      "customColorWidgetBackground": "@color/system_widget_background_dark"
+    }
   }
 }

package/src/kotlin-app.ts

@@ -9,10 +9,22 @@ import {
   frameworkColor,
   readResourceValues,
   resolveThemeAttribute,
+  type ResourceValues,
 } from './android-theme'
 import { parseXml, type XmlElement } from './android-xml'
 import frameworkThemes from './generated/android-framework-themes.json' with { type: 'json' }
 
+// statusBarColor and navigationBarColor are ARGB
+export interface KotlinWindowTheme {
+  edgeToEdgeEnforced: boolean
+  statusBarColor: number
+  navigationBarColor: number
+  statusBarContrastEnforced: boolean
+  navigationBarContrastEnforced: boolean
+  lightStatusBar: boolean
+  lightNavigationBar: boolean
+}
+
 export interface KotlinAppProject {
   projectDir: string
   moduleDir: string
@@ -21,17 +33,9 @@ export interface KotlinAppProject {
   packageName: string
   namespace: string
   targetSdk: number
-  // the launched activity's window as its theme and target SDK configure it;
-  // statusBarColor and navigationBarColor are ARGB
-  window: {
-    edgeToEdgeEnforced: boolean
-    statusBarColor: number
-    navigationBarColor: number
-    statusBarContrastEnforced: boolean
-    navigationBarContrastEnforced: boolean
-    lightStatusBar: boolean
-    lightNavigationBar: boolean
-  }
+  // 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 }
   applicationClass: string | null
   launcher: { name: string; targetClass: string }
   // back reaches the activity through its window's back dispatch rather than
@@ -188,24 +192,38 @@ function defaultTheme(targetSdk: number): string {
 // 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,
-): KotlinAppProject['window'] {
-  const values = path.join(moduleDir, 'src/main/res/values')
-  const app = 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') }
-          })
-      : [],
-  )
-  const sources = { android: frameworkThemes, app }
+  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') }
+            })
+        : [],
+    )
+  }
+  const over = (base: ResourceValues, qualified: ResourceValues): ResourceValues => ({
+    styles: { ...base.styles, ...qualified.styles },
+    colors: { ...base.colors, ...qualified.colors },
+  })
+  const sources = night
+    ? {
+        android: over(frameworkThemes, frameworkThemes.night),
+        app: over(read('values'), read('values-night')),
+      }
+    : { android: frameworkThemes, app: read('values') }
   const name = theme ?? defaultTheme(targetSdk)
   const flag = (attribute: string, fallback = false) => {
     const value = resolveThemeAttribute(name, attribute, sources)
@@ -452,7 +470,10 @@ export function readKotlinApp(
     packageName: applicationId ?? base,
     namespace: base,
     targetSdk,
-    window: readWindowTheme(moduleDir, theme, targetSdk),
+    window: {
+      day: readWindowTheme(moduleDir, theme, targetSdk, false),
+      night: readWindowTheme(moduleDir, theme, targetSdk, true),
+    },
     applicationClass: applicationName ? className(applicationName) : null,
     launcher: { name: launcherName, targetClass },
     predictiveBack,