Merge branch 'main' of https://github.com/jimrandomh/faceclaw into ring-health-fixes

This commit is contained in:
James Babcock committed 2026-09-26 23:01:41 -07:00
commit a8c9ab0a98
27 files changed
+528 -77

No files matched your search

@@ -1,6 +1,7 @@
package com.faceclaw.app
import android.app.Activity
import android.content.MutableContextWrapper
import android.os.Build
import android.os.Handler
import android.os.Looper
@@ -54,9 +55,20 @@ import java.util.ArrayList
* timers/onResume asserted on attach. The main Looper keeps ticking under the
* foreground service, so apps keep driving their glasses windows in the
* background.
*
* Activity recreation: this host outlives any one activity (it is a process
* singleton, and apps keep running while the activity is destroyed and
* recreated, e.g. after an app update or a config change). The overlay lives in
* one activity's content view, so attach and showOnPhone first move it, with
* every WebView in it, into the activity they are given if it isn't already
* there; otherwise "show" would raise it in a dead window. WebViews are created
* on a MutableContextWrapper whose base is re-pointed at the same time, so the
* dialogs Chromium opens from the page (e.g. a <select>'s picker) use the live
* activity too.
*/
class FaceclawEvenHubWebViewHost {
private var overlay: FrameLayout? = null
private var overlayActivity: Activity? = null
private var shown = false
private val mainHandler = Handler(Looper.getMainLooper())
@@ -86,20 +98,38 @@ class FaceclawEvenHubWebViewHost {
}
}
/** The overlay, in [activity]'s content view (moved there, with its WebViews, if it was elsewhere). */
private fun ensureOverlay(activity: Activity): FrameLayout {
overlay?.let { return it }
val existing = overlay
if (existing != null && overlayActivity === activity && existing.parent != null) return existing
val content = activity.findViewById<ViewGroup>(android.R.id.content)
val created = FrameLayout(activity)
if (existing != null) {
(existing.parent as ViewGroup?)?.removeView(existing)
for (web in webViews) {
existing.removeView(web)
rebaseContext(web, activity)
created.addView(web, FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
}
}
overlay = created
// index 0 = behind the NativeScript content view.
overlayActivity = activity
// index 0 = behind the NativeScript content view (raised again below if shown).
content.addView(created, 0, FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
if (shown) created.bringToFront()
return created
}
private fun rebaseContext(web: WebView, activity: Activity) {
(web.context as? MutableContextWrapper)?.baseContext = activity
}
/** Add a WebView to the host, full-size and rendering, hidden behind the UI. */
fun attach(activity: Activity, web: WebView) {
val o = ensureOverlay(activity)
rebaseContext(web, activity)
web.visibility = View.VISIBLE
if (web.parent == null) {
o.addView(web, FrameLayout.LayoutParams(
@@ -124,9 +154,9 @@ class FaceclawEvenHubWebViewHost {
}
}
/** Bring an app's WebView to the front so it is visible on the phone. */
fun showOnPhone(web: WebView) {
val o = overlay ?: return
/** Bring an app's WebView to the front of [activity] so it is visible on the phone. */
fun showOnPhone(activity: Activity?, web: WebView) {
val o = if (activity != null) ensureOverlay(activity) else overlay ?: return
web.bringToFront()
o.bringToFront()
shown = true
+22 -1
View File
@@ -1,16 +1,23 @@
# Changelog
## 0.7.3 - Future
## 0.8.1 - Future
* Add config settings to disable animation categories
* EvenHub compatibility uses menu animations and is closer to style matched
## 0.8.0 - 2026-09-26
### Depth and Animation
* A new display-list system for glasses-side drawing, unlocking z-effects and animation
* Menus animate when changing selection and scrolling
* Menus bounce at the ends, and show part of the next row when there is more below
* The launcher and Files app icon grids animate sliding, scrolling and bouncing
* Fade-in/out effects when turning the screen on/off
* Custom auto-brightness control algorithm, with configurable min, max and curve
* Depth effects for the window switcher, top bar, and modals
* Glanceboard has configurable distance
* Dimmed background behind the system context menu dithers rather than hiding minimum-brightness underlays
### Other Features and Bugfixes
@@ -20,12 +27,26 @@
* EvenHub: Fix login form being stuck open without a cancel button
* Calendar: Fix a timezone issue that could cause all-day events to appear on the preceding day
* Compass: Make the calibration readiness visible by default
* Terminal app: Tap a host heading to launch a shell there (alternative to the app context menu)
* Nightscout: Move the "Always show in top bar" setting earlier in the form so it's harder to miss
* EvenHub: Fix the sign-in form reopening on every launch after an unfinished sign-in
* EvenHub: Fix the installer not rerendering when an app finishes downloading
* Fix a frozen menu in the notification modal
* Fix a race when restoring open apps at startup, which could leave the previously-foreground window covering the new one
* Reduce phone CPU usage
* Fix a memory leak
* Better handling of silent mode
* Tweak the layout of the voice input dialog
* Add GitHub workflows for automated tests
### iOS port:
* Add iOS calendar integration
* iOS main screen matches the Android version's styling
* Hub apps on iOS no longer have their timers stopped while the phone app is in the background
* Some settings that were Android-only are now available on iOS
* Move a lot more of the iOS implementation onto shared Kotlin code
* Converted most Android-specific duplicative code to shared code
## 0.7.2 - 2026-09-19
+6 -39
View File
@@ -7,8 +7,10 @@
* match what apps expect.
*
* Known deviations from stock, acceptable for now:
* - List rendering is a plain vertical list; itemWidth-based horizontal
* layouts are not implemented yet.
* - List rendering is a plain vertical list. A non-zero itemWidth sets the
* selection outline's width and truncates long items to fit, as on stock;
* whether stock also lays narrow items out side by side is unknown.
* - Lists scroll with our menus' animation and bounce (see list-menu.ts).
*/
import { GrayImage } from "../../graphics/image";
import { EvenHubFont } from "../../graphics/evenhub-font";
@@ -19,12 +21,12 @@ import {
type EvenHubPage,
type EvenHubTextContainer,
} from "./containers";
import { paintListItems } from "./list-menu";
export const EVENHUB_SCREEN_WIDTH = 576;
export const EVENHUB_SCREEN_HEIGHT = 288;
const TEXT_WHITE = 255;
const LIST_ROW_PADDING = 4;
/**
* SDK 0.0.14 textColor levels 0..4 as grey values. Level 4 is the default and
@@ -90,44 +92,9 @@ function paintImageContainer(image: GrayImage, container: EvenHubImageContainer)
}
}
/** Horizontal padding between the selection outline and the item text. */
const LIST_SELECT_PADDING = 8;
const LIST_SELECT_RADIUS = 8;
function paintListContainer(image: GrayImage, container: EvenHubListContainer, focused: boolean): void {
paintBorder(image, container);
const font = EvenHubFont.get();
const inset = container.borderWidth + container.paddingLength;
const rowHeight = font.lineHeight + LIST_ROW_PADDING;
const left = container.x + inset;
const top = container.y + inset;
const innerWidth = Math.max(1, container.width - 2 * inset);
// Text is indented by the selection padding so the outline sits inside the list.
const textX = left + LIST_SELECT_PADDING;
const visibleRows = Math.max(1, Math.floor((container.height - 2 * inset) / rowHeight));
// Keep the selection in view.
let firstRow = 0;
if (container.selectedIndex >= visibleRows) firstRow = container.selectedIndex - visibleRows + 1;
for (let row = 0; row < visibleRows; row++) {
const index = firstRow + row;
if (index >= container.itemNames.length) break;
const name = container.itemNames[index]!;
const y = top + row * rowHeight;
if (index === container.selectedIndex) {
// Selection: a rounded outline sized to the text (not the full row width),
// with padding on each side and no fill — matching stock's appearance.
const textWidth = font.measureLine(name);
image.drawRoundedRect(
left,
y,
Math.min(textWidth + 2 * LIST_SELECT_PADDING, innerWidth),
rowHeight - 1,
focused ? TEXT_WHITE : 130,
LIST_SELECT_RADIUS,
);
}
font.drawText(image, textX, y + Math.floor(LIST_ROW_PADDING / 2), name, TEXT_WHITE);
}
paintListItems(image, container, EvenHubFont.get(), focused);
}
/** Bottom-to-top paint order for a page's containers. */
+11 -2
View File
@@ -57,7 +57,9 @@ export type EvenHubListContainer = {
zOrderIndex: number | undefined;
preserve: boolean;
itemNames: string[];
/** Fixed width of each item's selection outline; 0 is auto (the outline hugs the text). */
itemWidth: number;
/** isItemSelectBorderEn: whether the selected item is outlined. A protobuf field, so absent means off. */
selectBorder: boolean;
/** Selection is host-local: scroll moves it with no app round-trip. */
selectedIndex: number;
@@ -82,6 +84,9 @@ export type EvenHubPage = {
menuItems: EvenHubMenuItem[];
};
/** Stock draws at most a 5px border; wider requests are clamped. */
const MAX_BORDER_WIDTH = 5;
/** Firmware brightness levels for text; 4 is the device default. */
const MIN_TEXT_BRIGHTNESS = 0;
const MAX_TEXT_BRIGHTNESS = 4;
@@ -129,6 +134,10 @@ export function asRecord(value: unknown): Record<string, unknown> {
return value && typeof value === "object" && !Array.isArray(value) ? (value as Record<string, unknown>) : {};
}
function readBorderWidth(json: Record<string, unknown>): number {
return Math.max(0, Math.min(MAX_BORDER_WIDTH, readNumber(json, "borderWidth", 0)));
}
function parseTextContainer(json: Record<string, unknown>): EvenHubTextContainer {
return {
kind: "text",
@@ -138,7 +147,7 @@ function parseTextContainer(json: Record<string, unknown>): EvenHubTextContainer
y: readNumber(json, "yPosition", 0),
width: readNumber(json, "width", 0),
height: readNumber(json, "height", 0),
borderWidth: readNumber(json, "borderWidth", 0),
borderWidth: readBorderWidth(json),
borderRadius: readNumber(json, "borderRadius", 0),
paddingLength: readNumber(json, "paddingLength", 0),
isEventCapture: readNumber(json, "isEventCapture", 0) !== 0,
@@ -230,7 +239,7 @@ function parseListContainer(json: Record<string, unknown>): EvenHubListContainer
y: readNumber(json, "yPosition", 0),
width: readNumber(json, "width", 0),
height: readNumber(json, "height", 0),
borderWidth: readNumber(json, "borderWidth", 0),
borderWidth: readBorderWidth(json),
borderRadius: readNumber(json, "borderRadius", 0),
paddingLength: readNumber(json, "paddingLength", 0),
isEventCapture: readNumber(json, "isEventCapture", 0) !== 0,
+126
View File
@@ -0,0 +1,126 @@
/**
* EvenHub list containers, drawn and navigated by the shared Menu<T> in the
* stock list style: the selected item gets a rounded outline sized to its
* text, with no fill, and every other item's text is dimmed to 2/15
* brightness. Scrolling animates and the ends bounce, like our own menus, but the
* selection itself moves instantly (no highlight slide), as on stock.
*
* Native-free (the font is passed in) so it can be unit-tested under Node.
*/
import { GrayImage } from "../../graphics/image";
import { Menu } from "../../ui/menu-core";
import type { EvenHubListContainer } from "./containers";
/** The subset of EvenHubFont a list needs. */
export type EvenHubListFont = {
readonly lineHeight: number;
measureLine(text: string): number;
drawText(image: GrayImage, x: number, y: number, text: string, value?: number): void;
};
/** Space between the selection outline and the item text, horizontally and vertically. */
export const LIST_ITEM_PADDING_X = 12;
export const LIST_ITEM_PADDING_Y = 6;
const LIST_SELECT_RADIUS = 8;
const SELECTED_TEXT = 255;
/** 4-bit level 3 (3/15). */
export const DESELECTED_TEXT = 50;
const OUTLINE_FOCUSED = 255;
const OUTLINE_UNFOCUSED = 130;
export function listRowHeight(font: EvenHubListFont): number {
return font.lineHeight + 2 * LIST_ITEM_PADDING_Y;
}
/**
* One Menu per container object, so its scroll motion persists across paints.
* A rebuilt page has new container objects and so starts without motion.
*/
const menus = new WeakMap<EvenHubListContainer, Menu<string>>();
const ELLIPSIS = "...";
/** `text`, or its longest prefix that fits in `maxWidth` with "..." appended. */
export function truncateToWidth(font: EvenHubListFont, text: string, maxWidth: number): string {
if (font.measureLine(text) <= maxWidth) return text;
const chars = Array.from(text);
// Binary search for the longest prefix that fits with the ellipsis.
let low = 0, high = chars.length - 1;
while (low < high) {
const mid = (low + high + 1) >> 1;
if (font.measureLine(chars.slice(0, mid).join("") + ELLIPSIS) <= maxWidth) low = mid;
else high = mid - 1;
}
return chars.slice(0, low).join("") + ELLIPSIS;
}
/** The container's menu, synced to its items and selection (the container is the source of truth). */
function listMenu(list: EvenHubListContainer, font: EvenHubListFont): Menu<string> {
let menu = menus.get(list);
if (!menu) {
const rowHeight = listRowHeight(font);
menu = new Menu<string>({
items: list.itemNames,
selectedIndex: list.selectedIndex,
getHeight: () => rowHeight,
// The draw callback shows the selection, so there is no highlight to slide.
highlight: false,
// No wrap and no exit callbacks: the ends bounce. The session tells the app.
wrap: false,
draw: ({ image, item, x, y, width, height, selected, focused }) => {
// itemWidth 0 is auto: the outline hugs the text. A fixed itemWidth
// sets the outline's width exactly, and text that doesn't fit inside
// its padding is cut short with "...".
const fixedWidth = list.itemWidth > 0 ? Math.min(list.itemWidth, width) : 0;
const text = fixedWidth ? truncateToWidth(font, item, fixedWidth - 2 * LIST_ITEM_PADDING_X) : item;
if (selected && list.selectBorder) {
image.drawRoundedRect(
x,
y,
fixedWidth || Math.min(font.measureLine(text) + 2 * LIST_ITEM_PADDING_X, width),
height - 1,
focused ? OUTLINE_FOCUSED : OUTLINE_UNFOCUSED,
LIST_SELECT_RADIUS,
);
}
font.drawText(image, x + LIST_ITEM_PADDING_X, y + LIST_ITEM_PADDING_Y, text,
selected ? SELECTED_TEXT : DESELECTED_TEXT);
},
});
menus.set(list, menu);
}
if (menu.items !== list.itemNames) menu.setItems(list.itemNames, list.selectedIndex);
else if (menu.selectedIndex !== list.selectedIndex) menu.select(list.selectedIndex);
return menu;
}
/** Paint the list's items inside its border and padding. */
export function paintListItems(
image: GrayImage,
list: EvenHubListContainer,
font: EvenHubListFont,
focused: boolean,
): void {
const inset = list.borderWidth + list.paddingLength;
const rowHeight = listRowHeight(font);
// A row cut by the bottom edge is drawn clipped, as a hint that there is
// more. A container shorter than one row still shows one whole row.
listMenu(list, font).paint(image, {
x: list.x + inset,
y: list.y + inset,
width: Math.max(1, list.width - 2 * inset),
height: Math.max(rowHeight, list.height - 2 * inset),
}, focused);
}
/**
* Step the selection (swipe up = previous). Returns false when it was already
* at that end: the selection stays put and the list bounces.
*/
export function stepListSelection(list: EvenHubListContainer, font: EvenHubListFont, delta: -1 | 1): boolean {
const menu = listMenu(list, font);
const before = list.selectedIndex;
menu.moveSelection(delta);
list.selectedIndex = menu.selectedIndex ?? 0;
return list.selectedIndex !== before;
}
+3 -7
View File
@@ -52,6 +52,7 @@ import {
type EvenHubPage,
} from "./containers";
import { compositePage } from "./compositor";
import { stepListSelection } from "./list-menu";
import { type EvenHubManifest } from "./ehpk";
import { permissionsIncludeMicrophone, permissionsInclude } from "./permissions";
import { evenHubMicRouter, type EvenHubMicClient } from "./mic-router";
@@ -502,13 +503,8 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
private scrollList(list: EvenHubListContainer, eventType: number): void {
// Swipe up selects the previous item, swipe down the next (stock direction).
const delta = eventType === SCROLL_TOP_EVENT ? -1 : 1;
const next = list.selectedIndex + delta;
if (next < 0 || next >= list.itemNames.length) {
// At a boundary the selection stays put and the app hears about it.
this.emitListEvent(list, eventType);
return;
}
list.selectedIndex = next;
// At a boundary the selection stays put (the list bounces) and the app hears about it.
if (!stepListSelection(list, EvenHubFont.get(), delta)) this.emitListEvent(list, eventType);
this.windowHooks?.requestRender();
}
+5 -2
View File
@@ -54,7 +54,9 @@ function originRule(url: string): string {
export function createEvenHubWebView(session: EvenHubSession): EvenHubWebView {
const activity = Application.android?.foregroundActivity ?? Application.android?.startActivity;
const context = activity ?? Utils.android.getApplicationContext();
const webView = new com.faceclaw.app.FaceclawEvenHubWebView(context);
// A mutable wrapper, so the host can re-point the WebView at a recreated
// activity (see FaceclawEvenHubWebViewHost).
const webView = new com.faceclaw.app.FaceclawEvenHubWebView(new android.content.MutableContextWrapper(context));
const settings = webView.getSettings();
settings.setJavaScriptEnabled(true);
settings.setDomStorageEnabled(true);
@@ -125,7 +127,8 @@ export function createEvenHubWebView(session: EvenHubSession): EvenHubWebView {
console.warn(`evenhub webview destroy failed: ${error}`);
}
},
showOnPhone: () => nativeHost.showOnPhone(webView),
showOnPhone: () =>
nativeHost.showOnPhone(Application.android?.foregroundActivity ?? Application.android?.startActivity ?? null, webView),
hideOnPhone: () => nativeHost.hideOnPhone(),
};
}
+18 -4
View File
@@ -2537,6 +2537,19 @@ class DashboardController {
this.pendingShellRenderCauseFrameId = 0;
const frameId = frameTimings.startFrame("render:shell", causeFrameId);
frameTimings.annotateFrame(frameId, shell.describeInputTarget());
// Nothing to send a frame to: stop here, BEFORE painting. This check used
// to run only after the paint, which made a no-display state a
// main-thread busy loop: paint (~55 ms) -> endRenderPass reports stale
// data -> requestShellRender re-queues (shellRenderQueued, since a render
// is in progress) -> the display check discards the work -> the do/while
// in requestShellRender goes straight round again. Measured on a device
// with the glasses not presenting: 40 of 40 frames discarded, ~19 a
// second, enough to starve input and ANR. Leaving early costs nothing and
// breaks the loop, because the re-request lives downstream of this point.
if (!this.display || this.phase === "charging") {
frameTimings.finishFrame(frameId, "discarded: shell render with no display target");
return;
}
const wantFreshData = this.nextShellRenderWantsFreshData;
this.nextShellRenderWantsFreshData = false;
if (wantFreshData) frameTimings.logFrame(frameId, "follow-up repaint that must not use cached data");
@@ -2555,11 +2568,12 @@ class DashboardController {
this.nextShellRenderWantsFreshData = true;
this.requestShellRender(frameId);
}
// The display-target check that used to live here now runs before the
// paint, at the top of this function. Nothing between the two can change
// it -- paintScene is synchronous and there is no await in between -- so
// repeating it here is dead code, and the compiler agrees: the early
// return narrows this.phase, making the "charging" comparison impossible.
const display = this.display;
if (!display || this.phase === "charging") {
frameTimings.finishFrame(frameId, "discarded: shell render with no display target");
return;
}
await frameTimings.spanAsync(frameId, "submit", () => display.submitShellScene(planes, paintMs, frameId));
// Backpressure: the next shell render waits for this one to reach the
// glasses. Timing out here means the loop was blocked for the full timeout
+18 -1
View File
@@ -18,6 +18,7 @@ import {
} from "~/assistant/models";
import { isLocalModelReady } from "../native/llama";
import { drawRightValueMenuItem, drawToggleMenuItem, MenuItem, openModalMenu } from "./menu";
import { MENU_ANIMATION_KEY } from "./menu-animation-pref";
import { LIST_ROW_TEXT_INSET, lineStep } from "./metrics";
import { Layer, type LayerContext } from "./layers";
import { GrayImage } from "~/graphics/image";
@@ -361,11 +362,27 @@ export const autoBrightnessCurveSetting = new ConfigSettingString({
});
const SCREEN_FADE_MS = 280;
export const menuAnimationSetting = new ConfigSettingBoolean({
id: "menu-animation",
label: "Menu animation",
storageKey: MENU_ANIMATION_KEY,
defaultValue: true,
description: "Slide the highlight, scroll, and bounce at the ends in menus, lists, and the launcher and Files icon grids. When off, they move instantly.",
});
export const screenFadeSetting = new ConfigSettingBoolean({
id: "screen-fade",
label: "Screen fade",
storageKey: "display.screenFade",
defaultValue: true,
description: "Fade the display in and out when the screen turns on or off. When off, it switches instantly.",
});
export function getBrightnessPreferences() {
const level = brightnessSettingToLevel(brightnessSetting.get());
return { auto: level === null, level: level ?? 50,
minimum: Number(autoBrightnessMinSetting.get()), maximum: Number(autoBrightnessMaxSetting.get()),
curve: autoBrightnessCurveSetting.getValidValue(), fadeMs: SCREEN_FADE_MS };
curve: autoBrightnessCurveSetting.getValidValue(), fadeMs: screenFadeSetting.get() ? SCREEN_FADE_MS : 0 };
}
export const screenTimeoutSetting = new ConfigSettingEnum<ScreenTimeoutSetting>({
+18
View File
@@ -60,9 +60,11 @@ import {
phoneRotationSetting,
ringConnectionModeSetting,
sonioxApiKeySetting,
screenFadeSetting,
enumSettingMenuItem,
firmwareDebugFlagsSetting,
lockScreenEnabledSetting,
menuAnimationSetting,
saveVoiceRecordingsSetting,
showBleBandwidthSetting,
suspendEvenHubWhenScreenOffSetting,
@@ -114,6 +116,8 @@ function settingsSections(): SettingsSection[] {
enumSettingMenuItem(displayModeSetting),
// Submenu: top-bar battery indicator style plus per-device visibility.
batteryIndicatorsMenuItem(),
// Submenu: toggles for menu/icon-grid motion and the screen on/off fade.
animationsMenuItem(),
// Controls the top-bar clock (24-hour vs 12-hour).
enumSettingMenuItem(timeFormatSetting),
// Opens the modal font picker (face, weight, size) for UI text.
@@ -312,6 +316,20 @@ function batteryIndicatorsMenuItem(): MenuItem {
};
}
/** The Display section's "Animations" row: opens a modal submenu of animation toggles. */
function animationsMenuItem(): MenuItem {
return {
label: "Animations",
description: "Turn off menu and icon-grid motion, or the fade when the screen turns on and off.",
onSelect: (ctx) => {
openSettingsSubMenu(ctx, "Animations", [
toggleSettingMenuItem(menuAnimationSetting),
toggleSettingMenuItem(screenFadeSetting),
]);
},
};
}
const LOCAL_MODEL_GB = `${(LOCAL_MODEL.sizeBytes / 1e9).toFixed(1)}GB`;
// While a download is running, re-render on progress updates so the row's
+18
View File
@@ -0,0 +1,18 @@
/**
* Whether menus and icon grids animate on the glasses (Settings > Display >
* Animations > Menu animation). The motion classes can't read the settings
* store themselves (it is native, and they load under Node in unit tests),
* so ui/menu.ts installs a reader in each isolate that paints menus. Without
* one, menus animate.
*/
export const MENU_ANIMATION_KEY = "display.menuAnimation";
let readMenuAnimation: () => boolean = () => true;
export function menuAnimationEnabled(): boolean {
return readMenuAnimation();
}
export function setMenuAnimationReader(read: () => boolean): void {
readMenuAnimation = read;
}
+3 -1
View File
@@ -1,3 +1,5 @@
import { menuAnimationEnabled } from "./menu-animation-pref";
export const MENU_HIGHLIGHT_DURATION_MS = 240;
export type MenuHighlightAnimation = { dx: number; dy: number; startedAt: number; token: number; durationMs: number };
@@ -30,7 +32,7 @@ export class MenuHighlightMotion {
fromX += this.animation.dx * remaining;
fromY += this.animation.dy * remaining;
}
const eligible = previous && previous.index !== index && this.fromIndex === previous.index &&
const eligible = menuAnimationEnabled() && previous && previous.index !== index && this.fromIndex === previous.index &&
(previous.scroll === scroll || scrolling) && previous.width === width && previous.height === height;
this.animation = eligible ? { dx: Math.round(fromX - x), dy: Math.round(fromY - y), startedAt: now, token: nextAnimationToken(), durationMs: MENU_HIGHLIGHT_DURATION_MS } : undefined;
this.fromIndex = null;
+4 -2
View File
@@ -1,4 +1,5 @@
import { DrawExpression as E, ExprOp } from "../graphics/draw-expression";
import { menuAnimationEnabled } from "./menu-animation-pref";
import { MENU_HIGHLIGHT_DURATION_MS, nextAnimationToken } from "./menu-highlight-motion";
/** Longest scroll, in pixels, that animates; longer jumps snap. */
@@ -72,16 +73,17 @@ export class MenuScrollMotion {
/** Record this paint's settled offset; returns the animation in flight, if any. */
paint(scroll: number, box: Box, now: number): MenuScrollAnimation | undefined {
const previous = this.previous;
const enabled = menuAnimationEnabled();
const sameBox = !!previous && previous.box.x === box.x && previous.box.y === box.y &&
previous.box.width === box.width && previous.box.height === box.height;
if (!previous || !sameBox || previous.scroll !== scroll) {
const from = previous ? this.offsetAt(previous.scroll, now) : scroll;
const eligible = sameBox && this.navigated && from !== scroll && Math.abs(scroll - from) <= MAX_ANIMATED_SCROLL;
const eligible = enabled && sameBox && this.navigated && from !== scroll && Math.abs(scroll - from) <= MAX_ANIMATED_SCROLL;
this.animation = eligible
? { from, to: scroll, startedAt: now, token: nextAnimationToken(), durationMs: MENU_HIGHLIGHT_DURATION_MS }
: undefined;
this.previous = { scroll, box: { ...box } };
} else if (this.bounceBy) {
} else if (this.bounceBy && enabled) {
const from = this.offsetAt(scroll, now);
this.animation = Math.abs(scroll - from) <= MAX_ANIMATED_SCROLL
? { from, peak: scroll + this.bounceBy, to: scroll, startedAt: now, token: nextAnimationToken(), durationMs: MENU_BOUNCE_DURATION_MS }
+7
View File
@@ -1,12 +1,19 @@
import { G2_LENS_HEIGHT, G2_LENS_WIDTH, GrayImage, type UiFont } from "../graphics/image";
import { wrapText } from "../graphics/textwrap";
import { getDefaultSmallFont } from "../graphics/ui-fonts";
import { getBooleanSetting } from "../native/settings-store";
import { clamp } from "../util/numeric-util";
import { Layer, LayerContext, PaintBelow } from "./layers";
import { MENU_ANIMATION_KEY, setMenuAnimationReader } from "./menu-animation-pref";
import { Menu, MENU_HIGHLIGHT_FILL, MENU_HIGHLIGHT_STROKE } from "./menu-core";
import { GESTURE_DOUBLE_CLICK, InputEvent } from "./gestures";
import { LIST_ROW_TEXT_INSET, centeredTextY, lineStep, listRowHeight, menuTitleHeight } from "./metrics";
// Menu<T> and IconGrid consult this (through their motion classes) at each
// paint; a SharedPreferences read, so changes apply to the next navigation.
setMenuAnimationReader(() => getBooleanSetting(MENU_ANIMATION_KEY, true));
const DEFAULT_MENU_X = 8;
const DEFAULT_MENU_Y = 8;
const DEFAULT_MENU_WIDTH = 272;
+32 -11
View File
@@ -1,15 +1,15 @@
import { G2_LENS_WIDTH, type GrayImage } from "../../graphics/image";
import { G2_LENS_WIDTH, GrayImage, type UiFont } from "../../graphics/image";
import { wrapText, truncateText } from "../../graphics/textwrap";
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
import { Menu, type MenuDrawArgs } from "../menu-core";
import { listRowHeight } from "../metrics";
import { listRowHeight, textInkBounds } from "../metrics";
import { MIN_WINDOW_HEIGHT, minWindowTop } from "./geometry";
/**
* The shared look of the shell's text dialogs (voice input, phone keyboard
* input, and the assistant's reply): a solid box over whatever is on screen with a title line,
* a status line, the message so far, and either a menu of destinations at
* the bottom or a gesture hint.
* input, and the assistant's reply): a solid box over whatever is on screen with a header
* line (title, then status), the message so far, and either a menu of
* destinations at the bottom or a gesture hint.
*/
const DIALOG_X = 40;
@@ -27,6 +27,9 @@ const MENU_W = DIALOG_W - 24;
const MENU_ROW_GAP = 2;
const MENU_LABEL_INSET_X = 8;
const MENU_LABEL_INSET_Y = 4;
const HEADER_STATUS_GAP = 10;
const HINT_VALUE = 100;
const HINT_DEPTH = 2;
/** Dialog top edge; band-relative, so computed per paint. */
function dialogY(): number {
@@ -89,15 +92,20 @@ export function paintInputDialog<T extends InputDialogRow>(image: GrayImage, con
image.fillRect(DIALOG_X, top, DIALOG_W, DIALOG_H, 1);
image.drawRect(DIALOG_X, top, DIALOG_W, DIALOG_H, 90);
// Title and status share one header line, the status in the space after the title.
const left = TEXT_LEFT;
image.drawText(font, left, top + 12, content.title, 220);
image.drawText(font, left, top + 30, truncateText(font, content.status, TEXT_MAX_WIDTH), content.statusValue ?? 130);
const headerY = top + 12;
image.drawText(font, left, headerY, content.title, 220);
const statusLeft = left + Math.ceil(font.measureText(content.title)) + HEADER_STATUS_GAP;
const statusWidth = TEXT_LEFT + TEXT_MAX_WIDTH - statusLeft;
image.drawText(font, statusLeft, headerY, truncateText(font, content.status, statusWidth), content.statusValue ?? 130);
const menu = content.menu;
const rowCount = menu?.items.length ?? 0;
// Reserve space for the actual number of rows this menu has.
const textBottom = rowCount > 0 ? top + DIALOG_H - rowCount * menuRowH - 8 : top + DIALOG_H - 8;
const textTop = top + 56;
// Reserve space for the actual number of rows this menu has, or one row for the hint.
const reservedRows = rowCount > 0 ? rowCount : content.hint ? 1 : 0;
const textBottom = top + DIALOG_H - reservedRows * menuRowH - 8;
const textTop = headerY + font.lineHeight + 12;
const maxLines = Math.max(1, ((textBottom - textTop) / 16) | 0);
// The tail of a long message stays in view: it is what was said last (or
@@ -113,6 +121,19 @@ export function paintInputDialog<T extends InputDialogRow>(image: GrayImage, con
const menuTop = top + DIALOG_H - rowCount * menuRowH - 4;
menu.paint(image, { x: MENU_X, y: menuTop, width: MENU_W, height: rowCount * menuRowH - MENU_ROW_GAP }, true);
} else if (content.hint) {
image.drawText(font, left, top + DIALOG_H - 14, content.hint, 110 - font.lineHeight);
// On the line the last menu row's label would occupy, floating in front of the dialog.
drawDepthText(image, font, truncateText(font, content.hint, TEXT_MAX_WIDTH), left, top + DIALOG_H - menuRowH, HINT_VALUE, HINT_DEPTH);
}
}
/**
* Draw one line of text at stereo depth: rendered into its own image (sized
* to the font's ink, which can overshoot the line box) and replayed at depth.
*/
function drawDepthText(image: GrayImage, font: UiFont, text: string, x: number, y: number, value: number, depth: number): void {
const ink = textInkBounds(font);
const above = Math.max(0, -ink.top);
const source = new GrayImage(Math.ceil(font.measureText(text)) + 2, above + Math.max(font.lineHeight, ink.bottom));
source.drawText(font, 0, above, text, value);
image.drawDepthImage(source, x, y - above, depth);
}
+1 -1
View File
@@ -1,2 +1,2 @@
export const FACECLAW_VERSION = "0.7.2";
export const FACECLAW_VERSION = "0.8.0";
export const USER_AGENT = "Faceclaw/"+FACECLAW_VERSION;
+7
View File
@@ -22,6 +22,7 @@ function settingsFixture(store = new Map()) {
if (id.includes('settings-store')) return {
onSettingsStoreChanged() {}, getStringSetting: (k, d) => store.get(k) ?? d,
setStringSetting: (k, v) => store.set(k, v),
getBooleanSetting: (k, d) => store.get(k) ?? d, setBooleanSetting: (k, v) => store.set(k, v),
};
if (id.includes('brightness-curve')) return require('../.test-build/app/g2/brightness-curve.js');
return { Layer: class {}, ASSISTANT_MODEL_CHOICES: [] };
@@ -35,6 +36,12 @@ test('auto minimum defaults to 20 and preserves a saved preference', () => {
assert.equal(settingsFixture().getBrightnessPreferences().minimum, 20);
assert.equal(settingsFixture(new Map([['display.autoBrightnessMin', '25']])).getBrightnessPreferences().minimum, 25);
});
test('the screen fade setting switches the on/off fade between 280 ms and instant', () => {
const api = settingsFixture();
assert.equal(api.getBrightnessPreferences().fadeMs, 280);
api.screenFadeSetting.set(false);
assert.equal(api.getBrightnessPreferences().fadeMs, 0);
});
test('curve drafts preview exactly while brightness keeps the previous valid saved curve', () => {
const store = new Map([['display.autoBrightnessCurve', '0:0,2:50,8:100']]);
let api = settingsFixture(store), curve = api.autoBrightnessCurveSetting;
+1
View File
@@ -27,6 +27,7 @@ const layers = load('app/ui/layers.ts', {
'../native/frame-timings': { spanCurrent: (_name, paint) => paint() },
});
const menu = load('app/ui/menu.ts', {
'./menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), '../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
'../graphics/image': graphics, '../graphics/ui-fonts': fonts, '../graphics/textwrap': textwrap,
'../util/numeric-util': numeric, './gestures': gestures, './metrics': load('app/ui/metrics.ts'),
+14
View File
@@ -89,3 +89,17 @@ test("an omitted or out-of-range textColor falls back to the device default", ()
assert.equal(page.containers[0].textColor, undefined);
}
});
test("borderWidth is clamped to stock's maximum of 5", () => {
const page = parsePage({
listObject: [{ containerID: 1, containerName: "l", borderWidth: 9 }],
textObject: [{ containerID: 2, containerName: "t", borderWidth: 12 }, { containerID: 3, containerName: "u", borderWidth: 3 }],
});
assert.deepEqual(page.containers.map((c) => c.borderWidth), [5, 5, 3]);
});
test("a list without isItemSelectBorderEn has no selection border (protobuf default 0)", () => {
const page = parsePage({ listObject: [{ containerID: 1, containerName: "l", itemContainer: { itemName: ["a"] } }] });
assert.equal(page.containers[0].selectBorder, false);
assert.equal(page.containers[0].itemWidth, 0);
});
+148
View File
@@ -0,0 +1,148 @@
// EvenHub list containers in the stock style, on the shared Menu: dim
// unselected text, a text-sized outline, animated scrolling and bounce, and a
// selection that moves instantly.
const test = require("node:test");
const assert = require("node:assert/strict");
const {
paintListItems, stepListSelection, listRowHeight, truncateToWidth, DESELECTED_TEXT, LIST_ITEM_PADDING_X, LIST_ITEM_PADDING_Y,
} = require("../.test-build/app/apps/evenhub/list-menu.js");
const { GrayImage } = require("../.test-build/app/graphics/image.js");
const { DrawOp } = require("../.test-build/app/graphics/display-list.js");
/** Each character is a 6x10 block of ink at 10px advance. */
const font = {
lineHeight: 20,
measureLine: (text) => text.length * 10,
drawText: (image, x, y, text, value = 255) => {
for (let i = 0; i < text.length; i++) image.fillRect(x + i * 10, y + 4, 6, 10, value);
},
};
function list(itemNames, height) {
return {
kind: "list", id: 1, name: "list", x: 0, y: 0, width: 200, height,
borderWidth: 0, borderRadius: 0, paddingLength: 0, isEventCapture: true, zOrderIndex: undefined,
preserve: false, itemNames, itemWidth: 0, selectBorder: true, selectedIndex: 0,
};
}
function paint(container, now, focused = true) {
const original = Date.now;
Date.now = () => now;
try {
const image = new GrayImage(200, 200, 0);
paintListItems(image, container, font, focused);
return image;
} finally {
Date.now = original;
}
}
const displayLists = (image) => image.draws.map((draw) => draw.presentation?.displayList).filter(Boolean);
const pixel = (image, x, y) => image.withDrawsBaked().pixels[y * image.width + x];
test("rows are padded 6px around the text; unselected text is at level 2/15", () => {
const rowHeight = listRowHeight(font);
assert.equal(rowHeight, 32);
const container = list(["ab", "cd"], 100);
const image = paint(container, 1000);
const textX = LIST_ITEM_PADDING_X, textY = LIST_ITEM_PADDING_Y + 4;
assert.equal(pixel(image, textX, textY), 255, "selected text is full brightness");
assert.equal(pixel(image, textX, rowHeight + textY), DESELECTED_TEXT, "unselected text is 2/15");
assert.equal(DESELECTED_TEXT + 8 >> 4, 2);
// The outline hugs the text plus padding, not the row width.
const outlineRight = 2 * 10 + 2 * LIST_ITEM_PADDING_X - 1;
assert.equal(pixel(image, outlineRight, rowHeight / 2), 255);
assert.equal(pixel(image, outlineRight + 2, rowHeight / 2), 0);
});
test("the unfocused outline is dimmer", () => {
const image = paint(list(["ab"], 100), 1000, false);
assert.equal(pixel(image, 0, 16), 130);
});
test("selection within the viewport changes instantly, with no animation", () => {
const container = list(["a", "b", "c", "d", "e", "f"], 128);
paint(container, 1000);
assert.equal(stepListSelection(container, font, 1), true);
assert.equal(container.selectedIndex, 1);
const image = paint(container, 2000);
assert.deepEqual(displayLists(image), []);
});
test("navigation that scrolls animates a strip", () => {
const container = list(["a", "b", "c", "d", "e", "f"], 128);
paint(container, 1000);
for (let i = 0; i < 3; i++) {
stepListSelection(container, font, 1);
paint(container, 1000 + i);
}
assert.equal(container.selectedIndex, 3);
const scrolled = displayLists(paint(container, 5000));
assert.deepEqual(scrolled, [], "settled paints don't animate");
stepListSelection(container, font, 1);
const [strip] = displayLists(paint(container, 6000));
assert.ok(strip?.calls.some((call) => call.op === DrawOp.RECT_COPY), "the scroll animates");
assert.ok(!strip.calls.some((call) => call.op === DrawOp.ROUNDED_RECT), "no separate sliding highlight");
});
test("stepping past an end keeps the selection and bounces", () => {
const container = list(["a", "b", "c", "d", "e", "f"], 128);
paint(container, 1000);
assert.equal(stepListSelection(container, font, -1), false);
assert.equal(container.selectedIndex, 0);
const [bounce] = displayLists(paint(container, 2000));
assert.ok(bounce?.calls.some((call) => call.op === DrawOp.RECT_COPY), "the list bounces");
});
test("a row cut by the bottom edge is drawn clipped", () => {
// 100px fits three 32px rows and the top 4px of the fourth, whose ink
// starts 10px into the row, so a 16px taller box shows its first 10 lines.
const clipped = paint(list(["a", "b", "c", "d"], 100), 1000);
const textTop = 3 * 32 + LIST_ITEM_PADDING_Y + 4;
assert.equal(pixel(clipped, LIST_ITEM_PADDING_X, textTop), 0, "below the edge");
const partial = paint(list(["a", "b", "c", "d"], 3 * 32 + 16), 1000);
assert.equal(pixel(partial, LIST_ITEM_PADDING_X, 3 * 32 + 16), 0, "nothing past the edge");
assert.equal(pixel(partial, LIST_ITEM_PADDING_X, textTop), DESELECTED_TEXT, "the visible part is drawn");
});
test("at the end of a list with a partial row, the top row stays whole", () => {
const container = list(["a", "b", "c", "d", "e"], 3 * 32 + 16);
paint(container, 1000);
for (let i = 0; i < 4; i++) {
stepListSelection(container, font, 1);
paint(container, 1000 + i);
}
const image = paint(container, 9000);
// As in every Menu, the viewport never starts on a partial row: c, d and
// e show whole, leaving 16px empty below e rather than cutting c in half.
assert.equal(pixel(image, LIST_ITEM_PADDING_X, LIST_ITEM_PADDING_Y + 4), DESELECTED_TEXT, "c at the top");
assert.equal(pixel(image, LIST_ITEM_PADDING_X, 64 + LIST_ITEM_PADDING_Y + 4), 255, "e selected, third row");
});
test("with the selection border off, the selected item has no outline", () => {
const container = { ...list(["ab"], 100), selectBorder: false };
const image = paint(container, 1000);
assert.equal(pixel(image, 0, 16), 0, "no outline edge");
assert.equal(pixel(image, LIST_ITEM_PADDING_X, LIST_ITEM_PADDING_Y + 4), 255, "text still selected-bright");
});
test("a fixed itemWidth sets the outline's width exactly", () => {
const container = { ...list(["ab"], 100), itemWidth: 150 };
const image = paint(container, 1000);
assert.equal(pixel(image, 149, 16), 255, "right edge at itemWidth");
assert.equal(pixel(image, 150, 16), 0);
});
test("text wider than a fixed itemWidth is truncated with an ellipsis", () => {
// 10px per char: 100 - 2 * 12 = 76px holds "abcd..." (70px) but not "abcde..." (80px).
assert.equal(truncateToWidth(font, "abcdefghij", 76), "abcd...");
assert.equal(truncateToWidth(font, "abcdefg", 76), "abcdefg", "fits: unchanged");
assert.equal(truncateToWidth(font, "abcdefgh", 20), "...", "room for nothing but the ellipsis");
const drawn = [];
const recording = { ...font, drawText: (image, x, y, text, value) => { drawn.push(text); font.drawText(image, x, y, text, value); } };
const image = new GrayImage(200, 200, 0);
paintListItems(image, { ...list(["abcdefghij", "ab"], 100), itemWidth: 100 }, recording, true);
assert.deepEqual(drawn, ["abcd...", "ab"]);
});
+5 -1
View File
@@ -60,7 +60,11 @@ function loadIconGrid({ lastInputWasWatch = false } = {}) {
'./menu-core': build('ui/menu-core'),
'./metrics': metrics,
};
const menu = load('app/ui/menu.ts', { ...common, './layers': {} });
const menu = load('app/ui/menu.ts', {
...common, './layers': {},
'./menu-animation-pref': build('ui/menu-animation-pref'),
'../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
});
const grid = load('app/ui/icon-grid.ts', {
...common,
'../graphics/draw-expression': build('graphics/draw-expression'),
+1
View File
@@ -19,6 +19,7 @@ const menuCore=load('app/ui/menu-core.ts',{
'../graphics/image':graphics,'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
});
const {MenuLayer}=load('app/ui/menu.ts',{
'./menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), '../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
'../graphics/image':graphics,'../graphics/textwrap':{},'../graphics/ui-fonts':{getDefaultSmallFont:()=>font},
'../util/numeric-util':{clamp:(n,a,b)=>Math.max(a,Math.min(b,n))},'./gestures':{},
'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
+21
View File
@@ -9,6 +9,7 @@ const { DrawExpression: E } = require('../.test-build/app/graphics/draw-expressi
const { menuScrollList, slidingHighlightY } = require('../.test-build/app/graphics/menu-scroll-list.js');
const { MENU_BOUNCE_DURATION_MS, scrollOffsetExpression } = require('../.test-build/app/ui/menu-scroll-motion.js');
const { encodePresentation } = require('../.test-build/app/graphics/presentation-wire.js');
const { setMenuAnimationReader } = require('../.test-build/app/ui/menu-animation-pref.js');
// Also consumed by FrameDisplayListTest.kt.
const SCROLL = '078a000000030002000400020000070000009600000001000200040011223344556677880200020000000000ff250100300102300180f0800180f0161101001732800180f01610300180f0302341403101001102000200010008000000ff280101300100300180f0800180f0161101001732800180f01610300180f030234140310100170100160400020000000103';
@@ -196,6 +197,26 @@ test('a bounce during a scroll starts from the offset on screen', () => {
assert.ok(offsets[0] < offsets[1], 'it starts where the scroll had got to, above its settled offset');
});
test('with menu animation off, scrolls, slides and bounces snap', (t) => {
setMenuAnimationReader(() => false);
t.after(() => setMenuAnimationReader(() => true));
const timed = (image) => image.draws.filter((draw) => draw.presentation?.displayList?.timeline);
const menu = inkMenu();
paint(menu, 1000);
menu.moveSelection(1);
const slid = paint(menu, 2000);
assert.equal(menu.scrollTop, 0);
assert.equal(timed(slid).length, 0, 'the highlight snaps');
menu.moveSelection(1);
const scrolled = paint(menu, 3000);
assert.equal(menu.scrollTop, 20);
assert.equal(timed(scrolled).length, 0, 'the scroll snaps');
menu.select(6);
paint(menu, 4000);
menu.moveSelection(1);
assert.equal(timed(paint(menu, 5000)).length, 0, 'no bounce');
});
test('scroll lists survive the bridge with animated copy coordinates', () => {
const strip = { width: 2, height: 4, pixels: Uint8Array.of(17, 34, 51, 68, 85, 102, 119, 136) };
const timeline = { from: 0, to: 2, startedAt: 1000, token: 7, durationMs: MENU_HIGHLIGHT_DURATION_MS };
+1
View File
@@ -155,6 +155,7 @@ test('Music settings keeps toggles and selection when a new app arrives and supp
'../util/numeric-util': { clamp: (n, lo, hi) => Math.max(lo, Math.min(hi, n)) },
'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
'./metrics': load('app/ui/metrics.ts'), './gestures': {},
'./menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), '../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
};
deps['./menu-core'] = load('app/ui/menu-core.ts', (name) => deps[name]);
const menu = load('app/ui/menu.ts', (name) => deps[name]);
+1
View File
@@ -86,6 +86,7 @@ function ui(fontSize = 12) {
'../util/render-freshness': { renderPassAllowsStaleData: () => false },
'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
'./metrics': load('app/ui/metrics.ts'),
'./menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), '../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
'./gestures': {},
};
const requireModule = (name) => {
+1
View File
@@ -22,6 +22,7 @@ const font = BdfFont.parse(fs.readFileSync(path.join(__dirname, '../app/fonts/te
const textwrap = load('app/graphics/textwrap.ts', {});
const fonts = { getDefaultSmallFont: () => font };
const menu = load('app/ui/menu.ts', {
'./menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), '../native/settings-store': { getBooleanSetting: (_key, fallback) => fallback },
'../graphics/image': graphics, '../graphics/textwrap': textwrap, '../graphics/ui-fonts': fonts,
'../util/numeric-util': { clamp: (n, lo, hi) => Math.max(lo, Math.min(hi, n)) }, './gestures': {},
'./metrics': metrics, './menu-core': menuCore,
+1
View File
@@ -45,6 +45,7 @@
"../app/apps/microphones/radar-dots.ts",
"../app/apps/microphones/name-guess.ts",
"../app/apps/evenhub/containers.ts",
"../app/apps/evenhub/list-menu.ts",
"../app/apps/timer/timer-model.ts",
"../app/apps/teleprompter/script-tracker.ts",
"../app/apps/nightscout/nightscout-alerts.ts",