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

This commit is contained in:
James Babcock committed 2026-09-27 17:57:23 -07:00
commit 80f16c0cd6
40 files changed
+975 -160

No files matched your search

+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;
}
+70 -33
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";
@@ -109,30 +110,61 @@ export const EVENHUB_BRIDGE_INJECT_SCRIPT = `
};
})();
(function () {
// Host-driven timers. Chromium heavily throttles a page's own
// setTimeout/setInterval when the phone screen is off, which slows
// timer-driven apps to a crawl. Replace them with a queue fired by
// window.__fcTimerTick(), which the native host calls at ~60Hz regardless of
// Host-driven timers and requestAnimationFrame. Chromium heavily throttles a
// page's own setTimeout/setInterval when the phone screen is off, and pauses
// or throttles a hidden page's rAF, which slows timer-driven apps to a crawl
// and stalls canvas apps that render on a rAF loop. Replace them with queues
// fired by window.__fcTick(), which the native host calls regardless of
// screen state (host-initiated evaluateJavascript escapes the throttle).
if (window.__fcTimerTick) return;
// (The glasses render via BLE, not the phone's display, so vsync alignment
// doesn't matter — a steady frame rate does.)
//
// __fcTick returns how many ms until it next has work (-1: none), and the
// host sleeps until then instead of evaluating JS at 60Hz for an idle page.
// Work added outside a tick that is due before the host's next tick wakes it
// through the bridge.
if (window.__fcTick) return;
var FRAME_MS = 16;
var timers = new Map();
var nextId = 1;
var rafs = new Map();
var nextRafId = 1;
var inTick = false;
// When the host will next call __fcTick; Infinity while it is idle.
var hostNextTickAt = Infinity;
function needTickBy(due) {
if (inTick || due >= hostNextTickAt) return;
hostNextTickAt = Date.now();
var bridge = window.__faceclawEvenHub;
if (bridge && bridge.wakeTimers) bridge.wakeTimers();
}
window.setTimeout = function (cb, delay) {
var args = Array.prototype.slice.call(arguments, 2);
var id = nextId++;
timers.set(id, { cb: cb, args: args, due: Date.now() + (+delay || 0), interval: 0 });
var due = Date.now() + (+delay || 0);
timers.set(id, { cb: cb, args: args, due: due, interval: 0 });
needTickBy(due);
return id;
};
window.setInterval = function (cb, delay) {
var args = Array.prototype.slice.call(arguments, 2);
var id = nextId++;
var d = +delay || 0;
timers.set(id, { cb: cb, args: args, due: Date.now() + d, interval: d });
var due = Date.now() + d;
timers.set(id, { cb: cb, args: args, due: due, interval: d });
needTickBy(due);
return id;
};
window.clearTimeout = function (id) { timers.delete(id); };
window.clearInterval = function (id) { timers.delete(id); };
window.__fcTimerTick = function () {
window.requestAnimationFrame = function (cb) {
var id = nextRafId++;
rafs.set(id, cb);
needTickBy(Date.now() + FRAME_MS);
return id;
};
window.cancelAnimationFrame = function (id) { rafs.delete(id); };
function runTimers() {
var now = Date.now();
var dueIds = [];
timers.forEach(function (entry, id) { if (entry.due <= now) dueIds.push(id); });
@@ -150,24 +182,8 @@ export const EVENHUB_BRIDGE_INJECT_SCRIPT = `
}
try { entry.cb.apply(null, entry.args); } catch (e) { if (window.console) console.error(e); }
}
};
})();
(function () {
// Host-driven requestAnimationFrame, same idea as the timers above: a hidden
// page's rAF is paused/throttled with the screen off, stalling canvas apps
// that render on a rAF loop. Drive it from window.__fcRafTick(), called by the
// native ticker each frame. (The glasses render via BLE, not the phone's
// display, so vsync alignment doesn't matter — a steady frame rate does.)
if (window.__fcRafTick) return;
var rafs = new Map();
var nextRafId = 1;
window.requestAnimationFrame = function (cb) {
var id = nextRafId++;
rafs.set(id, cb);
return id;
};
window.cancelAnimationFrame = function (id) { rafs.delete(id); };
window.__fcRafTick = function () {
}
function runRafs() {
if (rafs.size === 0) return;
var ts = window.performance && performance.now ? performance.now() : Date.now();
// Snapshot and clear: callbacks that re-request during this frame run on
@@ -177,6 +193,32 @@ export const EVENHUB_BRIDGE_INJECT_SCRIPT = `
current.forEach(function (cb) {
try { cb(ts); } catch (e) { if (window.console) console.error(e); }
});
}
function inTickDo(fn) {
inTick = true;
try { fn(); } finally { inTick = false; }
}
// Fixed-rate entry points for hosts that don't use __fcTick's schedule (the
// iOS host calls both every frame).
window.__fcTimerTick = function () { inTickDo(runTimers); };
window.__fcRafTick = function () { inTickDo(runRafs); };
window.__fcTick = function () {
inTick = true;
try {
runTimers();
runRafs();
} finally {
inTick = false;
}
var now = Date.now();
var delay = rafs.size ? FRAME_MS : -1;
timers.forEach(function (entry) {
var d = entry.due - now;
if (delay < 0 || d < delay) delay = d;
});
if (delay >= 0) delay = Math.max(FRAME_MS, Math.ceil(delay));
hostNextTickAt = delay < 0 ? Infinity : now + delay;
return delay;
};
})();
`;
@@ -502,13 +544,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();
}
+6 -12
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);
@@ -94,16 +96,7 @@ export function createEvenHubWebView(session: EvenHubSession): EvenHubWebView {
webView.addJavascriptInterface(new com.faceclaw.app.FaceclawEvenHubJsBridge(listener), "__faceclawEvenHub");
// Surface the app's console in logcat (tag FaceclawEvenHubConsole).
const ChromeClient = (android.webkit.WebChromeClient as any).extend({
onConsoleMessage: (message: any): boolean => {
android.util.Log.i(
"FaceclawEvenHubConsole",
`${message.message()} (${message.sourceId()}:${message.lineNumber()})`,
);
return true;
},
});
webView.setWebChromeClient(new ChromeClient());
webView.setWebChromeClient(new com.faceclaw.app.FaceclawEvenHubChromeClient());
const nativeHost = com.faceclaw.app.FaceclawEvenHubWebViewHost.getInstance();
nativeHost.attach(activity, webView);
@@ -125,7 +118,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(),
};
}