forked from Blendman974/faceclaw
Merge branch 'main' into microphone-fixes
This commit is contained in:
commit
10865fc0cb
32 files changed
+832
-160
No files matched your search
+13
-2
@@ -16,8 +16,9 @@ ActionItem {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
/* The main page's custom titleView: title left, connection status and the
|
||||
* warning triangle right-aligned beside the overflow menu. */
|
||||
/* The main page's custom titleView: title left; the EvenHub app icon,
|
||||
* connection status and the warning triangle right-aligned beside the
|
||||
* overflow menu. */
|
||||
.action-bar-title {
|
||||
color: #ffffff;
|
||||
font-size: 18;
|
||||
@@ -32,6 +33,16 @@ ActionItem {
|
||||
vertical-align: center;
|
||||
}
|
||||
|
||||
/* The foreground EvenHub app's icon (opens its phone UI); the padding widens
|
||||
* the tap target. */
|
||||
.action-bar-app-icon {
|
||||
width: 32;
|
||||
height: 32;
|
||||
padding: 5.5;
|
||||
margin-right: 8;
|
||||
vertical-align: center;
|
||||
}
|
||||
|
||||
/* The emoji brings its own yellow; the padding widens the tap target. */
|
||||
.action-bar-warning {
|
||||
font-size: 18;
|
||||
|
||||
@@ -51,9 +51,19 @@ export function installedEvenHubPackageId(appId: string): string | null {
|
||||
}
|
||||
}
|
||||
|
||||
// The parsed index for the last stored value: the launcher and the watch
|
||||
// state both list installed apps on every refresh, and the sort's
|
||||
// localeCompare dominated the cost.
|
||||
let parsedIndex: { raw: string; apps: InstalledEvenHubApp[] } | null = null;
|
||||
|
||||
export function getInstalledEvenHubApps(): InstalledEvenHubApp[] {
|
||||
const raw = getStringSetting(STORAGE_KEY, "");
|
||||
if (!raw) return [];
|
||||
if (parsedIndex?.raw !== raw) parsedIndex = { raw, apps: parseInstalledIndex(raw) };
|
||||
return parsedIndex.apps.map((app) => ({ ...app }));
|
||||
}
|
||||
|
||||
function parseInstalledIndex(raw: string): InstalledEvenHubApp[] {
|
||||
try {
|
||||
const parsed = JSON.parse(raw);
|
||||
if (!Array.isArray(parsed)) return [];
|
||||
|
||||
@@ -6,11 +6,12 @@
|
||||
*
|
||||
* Glasses-first: launching does NOT take over the phone screen. The phone
|
||||
* stays on the Faceclaw dashboard; an app's phone UI is shown on demand
|
||||
* (window menu -> "Show phone UI"), overlaying the dashboard, and the Back
|
||||
* button returns to it. Apps are kept alive until explicitly closed (no memory
|
||||
* eviction yet).
|
||||
* (window menu -> "Show phone UI", or the app-icon button in the phone's
|
||||
* action bar while the app is foreground on the glasses), overlaying the
|
||||
* dashboard, and the Back button or the overlay's close button returns to it.
|
||||
* Apps are kept alive until explicitly closed (no memory eviction yet).
|
||||
*/
|
||||
import { Application } from "@nativescript/core";
|
||||
import { Application, type ImageSource } from "@nativescript/core";
|
||||
import { type AppContext } from "../app-definition";
|
||||
import {
|
||||
appFilesDirPath,
|
||||
@@ -23,6 +24,8 @@ import { EvenHubSession } from "./session";
|
||||
import { createEvenHubWindow } from "./evenhub-window";
|
||||
import { createEvenHubWebView, type EvenHubWebView } from "./webview";
|
||||
import { shell } from "../../ui/shell/shell";
|
||||
import { GrayImage } from "../../graphics/image";
|
||||
import { grayImageToWhiteIconSource } from "../../native/gray-image-preview";
|
||||
import {
|
||||
readEvenHubPackageManifest,
|
||||
installedEvenHubAppId,
|
||||
@@ -36,12 +39,31 @@ type RunningApp = {
|
||||
packageId: string;
|
||||
session: EvenHubSession;
|
||||
webView: EvenHubWebView;
|
||||
/** The app's icon for the phone action bar, rendered on first use. */
|
||||
phoneIcon?: ImageSource | null;
|
||||
};
|
||||
|
||||
/** The phone action bar's button for opening the foreground app's phone UI. */
|
||||
export type PhoneUiButton = { windowId: string; title: string; icon: ImageSource | null };
|
||||
|
||||
/** Pixel size the action-bar icon is rendered at (~21dp at xxhdpi). */
|
||||
const PHONE_ICON_SIZE = 63;
|
||||
|
||||
const running = new Map<string, RunningApp>();
|
||||
let nextSerial = 1;
|
||||
let phoneShownWindowId: string | null = null;
|
||||
let backHandlerRegistered = false;
|
||||
const phoneShownListeners = new Set<() => void>();
|
||||
|
||||
/** Called whenever an app's phone UI is shown or hidden. Returns an unsubscribe. */
|
||||
export function onPhoneShownChanged(listener: () => void): () => void {
|
||||
phoneShownListeners.add(listener);
|
||||
return () => phoneShownListeners.delete(listener);
|
||||
}
|
||||
|
||||
function notifyPhoneShownChanged(): void {
|
||||
for (const listener of phoneShownListeners) listener();
|
||||
}
|
||||
|
||||
/** Intercept Android Back while an app's phone UI is overlaying the dashboard. */
|
||||
function ensureBackHandler(): void {
|
||||
@@ -112,6 +134,7 @@ async function startApp(
|
||||
if (phoneShownWindowId === windowId) {
|
||||
webView.hideOnPhone();
|
||||
phoneShownWindowId = null;
|
||||
notifyPhoneShownChanged();
|
||||
}
|
||||
webView.destroy();
|
||||
cleanup?.();
|
||||
@@ -205,15 +228,35 @@ export function showOnPhone(windowId: string): void {
|
||||
const app = running.get(windowId);
|
||||
if (!app) return;
|
||||
if (phoneShownWindowId && phoneShownWindowId !== windowId) hidePhone();
|
||||
app.webView.showOnPhone();
|
||||
app.webView.showOnPhone(hidePhone);
|
||||
phoneShownWindowId = windowId;
|
||||
notifyPhoneShownChanged();
|
||||
}
|
||||
|
||||
/** Return the phone to the dashboard (Back, or the shown app closing). */
|
||||
/** Return the phone to the dashboard (Back, the close button, or the shown app closing). */
|
||||
export function hidePhone(): void {
|
||||
if (!phoneShownWindowId) return;
|
||||
running.get(phoneShownWindowId)?.webView.hideOnPhone();
|
||||
phoneShownWindowId = null;
|
||||
notifyPhoneShownChanged();
|
||||
}
|
||||
|
||||
/**
|
||||
* The foreground glasses window, when it is an EvenHub app whose phone UI
|
||||
* isn't showing: the phone action bar then offers a button to show it.
|
||||
*/
|
||||
export function phoneUiButton(): PhoneUiButton | null {
|
||||
const window = shell.foregroundWindow();
|
||||
const app = window ? running.get(window.windowId) : undefined;
|
||||
if (!window || !app || phoneShownWindowId === app.windowId) return null;
|
||||
if (app.phoneIcon === undefined) {
|
||||
// The same artwork as the glasses sidebar (installed icon, else the
|
||||
// generic package icon), drawn white.
|
||||
const image = new GrayImage(PHONE_ICON_SIZE, PHONE_ICON_SIZE, 0);
|
||||
window.drawIcon(image, 0, 0, PHONE_ICON_SIZE);
|
||||
app.phoneIcon = grayImageToWhiteIconSource(image);
|
||||
}
|
||||
return { windowId: app.windowId, title: window.title, icon: app.phoneIcon };
|
||||
}
|
||||
|
||||
export function runningAppCount(): number {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||
import { GrayImage } from "../../graphics/image";
|
||||
import { truncateText } from "../../graphics/textwrap";
|
||||
import { truncateText, wrapText } from "../../graphics/textwrap";
|
||||
import { type InputEvent } from "../../ui/gestures";
|
||||
import { Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
|
||||
import { drawListScrollbar, drawSelectionHighlight } from "../../ui/menu";
|
||||
@@ -8,9 +8,9 @@ import { permissionDetail, permissionLabel, type EvenHubPermission } from "./per
|
||||
import { openPrivacyPolicyOnPhone } from "./privacy-policy";
|
||||
import { lineStep, listRowHeight } from "../../ui/metrics";
|
||||
|
||||
const DIALOG_X = 8;
|
||||
const DIALOG_Y = 8;
|
||||
const DIALOG_WIDTH = 272;
|
||||
/** Minimum gap between the dialog and the edges of the window it's centered in. */
|
||||
const DIALOG_MARGIN = 8;
|
||||
const DIALOG_WIDTH = 320;
|
||||
const PADDING = 10;
|
||||
const PERM_GAP = 4;
|
||||
|
||||
@@ -27,6 +27,8 @@ const PERM_GAP = 4;
|
||||
* list on screen.
|
||||
*/
|
||||
export class EvenHubPermissionDialogLayer implements Layer {
|
||||
/** Floats in front of the window content, like the context menus. */
|
||||
readonly depth = 2;
|
||||
/** Starts on Allow; the optional privacy-policy action is inserted after it. */
|
||||
private selectedIndex = 0;
|
||||
/** First content row drawn; rows above it are scrolled off. */
|
||||
@@ -50,10 +52,12 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
||||
|
||||
paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
|
||||
const font = getDefaultSmallFont();
|
||||
const { height: viewportHeight } = ctx.stack.getBaseSize();
|
||||
const { width: viewportWidth, height: viewportHeight } = ctx.stack.getBaseSize();
|
||||
const image = paintBelow();
|
||||
const textWidth = DIALOG_WIDTH - 2 * PADDING - 4;
|
||||
const left = DIALOG_X + PADDING + 2;
|
||||
const dialogWidth = Math.min(DIALOG_WIDTH, viewportWidth - 2 * DIALOG_MARGIN);
|
||||
const dialogX = ((viewportWidth - dialogWidth) / 2) | 0;
|
||||
const textWidth = dialogWidth - 2 * PADDING - 4;
|
||||
const left = dialogX + PADDING + 2;
|
||||
|
||||
const headerStep = lineStep(font) + 2;
|
||||
const permLabelStep = lineStep(font) + 1;
|
||||
@@ -80,15 +84,17 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
||||
for (let index = 0; index < this.permissions.length; index++) {
|
||||
const permission = this.permissions[index]!;
|
||||
const detail = permissionDetail(permission);
|
||||
// One row per wrapped line, so the explanation scrolls line by line.
|
||||
const detailLines = detail ? wrapText(font, detail, textWidth - 8) : [];
|
||||
const gapBelow = PERM_GAP + (index === this.permissions.length - 1 ? 2 : 0);
|
||||
rows.push({
|
||||
height: permLabelStep + (detail ? 0 : gapBelow),
|
||||
height: permLabelStep + (detailLines.length ? 0 : gapBelow),
|
||||
draw: (top) => image.drawText(font, left, top, truncateText(font, permissionLabel(permission.name), textWidth), 220),
|
||||
});
|
||||
if (detail) {
|
||||
for (let line = 0; line < detailLines.length; line++) {
|
||||
rows.push({
|
||||
height: permDetailStep + gapBelow,
|
||||
draw: (top) => image.drawText(font, left + 8, top, truncateText(font, detail, textWidth - 8), 140),
|
||||
height: permDetailStep + (line === detailLines.length - 1 ? gapBelow : 0),
|
||||
draw: (top) => image.drawText(font, left + 8, top, detailLines[line]!, 140),
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -98,15 +104,16 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
||||
draw: (top) => {
|
||||
const selected = this.atBottom() && index === this.selectedIndex;
|
||||
if (selected) {
|
||||
drawSelectionHighlight(image, DIALOG_X + 12, top, DIALOG_WIDTH - 24, actionRowH - 1, focused, 8);
|
||||
drawSelectionHighlight(image, dialogX + 12, top, dialogWidth - 24, actionRowH - 1, focused, 8);
|
||||
}
|
||||
image.drawText(font, DIALOG_X + 22, top + 3, actions[index]!, selected ? 255 : 200);
|
||||
image.drawText(font, dialogX + 22, top + 3, actions[index]!, selected ? 255 : 200);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const contentHeight = rows.reduce((sum, row) => sum + row.height, 0);
|
||||
const height = Math.min(contentHeight + 2 * PADDING, viewportHeight - 2 * DIALOG_Y);
|
||||
const height = Math.min(contentHeight + 2 * PADDING, viewportHeight - 2 * DIALOG_MARGIN);
|
||||
const dialogY = ((viewportHeight - height) / 2) | 0;
|
||||
const visibleHeight = height - 2 * PADDING;
|
||||
|
||||
// The bottommost scroll position: the largest suffix of rows that fits.
|
||||
@@ -120,13 +127,13 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
||||
this.firstRow = Math.max(0, Math.min(this.firstRow, maxFirstRow));
|
||||
|
||||
// Fill 1 (transparent color key is 0), outline for the dialog edge.
|
||||
image.fillRoundedRect(DIALOG_X, DIALOG_Y, DIALOG_WIDTH, height, 1);
|
||||
image.drawRoundedRect(DIALOG_X, DIALOG_Y, DIALOG_WIDTH, height, 72);
|
||||
image.fillRoundedRect(dialogX, dialogY, dialogWidth, height, 1);
|
||||
image.drawRoundedRect(dialogX, dialogY, dialogWidth, height, 72);
|
||||
|
||||
let y = DIALOG_Y + PADDING;
|
||||
let y = dialogY + PADDING;
|
||||
for (let index = this.firstRow; index < rows.length; index++) {
|
||||
const row = rows[index]!;
|
||||
if (y + row.height > DIALOG_Y + PADDING + visibleHeight) break;
|
||||
if (y + row.height > dialogY + PADDING + visibleHeight) break;
|
||||
row.draw(y);
|
||||
y += row.height;
|
||||
}
|
||||
@@ -134,8 +141,8 @@ export class EvenHubPermissionDialogLayer implements Layer {
|
||||
if (maxFirstRow > 0) {
|
||||
drawListScrollbar(
|
||||
image,
|
||||
DIALOG_X + DIALOG_WIDTH - 7,
|
||||
DIALOG_Y + PADDING,
|
||||
dialogX + dialogWidth - 7,
|
||||
dialogY + PADDING,
|
||||
visibleHeight,
|
||||
this.firstRow,
|
||||
rows.length - maxFirstRow,
|
||||
|
||||
@@ -22,11 +22,13 @@ import { FACECLAW_VERSION } from "../../version";
|
||||
|
||||
declare const android: any;
|
||||
declare const com: any;
|
||||
declare const java: any;
|
||||
|
||||
export type EvenHubWebView = {
|
||||
evaluateJs: (js: string) => void;
|
||||
destroy: () => void;
|
||||
showOnPhone: () => void;
|
||||
/** Show the app's phone UI; `onClose` runs when its top bar's close button is tapped. */
|
||||
showOnPhone: (onClose: () => void) => void;
|
||||
hideOnPhone: () => void;
|
||||
/** The native android.webkit.WebView, for the host. */
|
||||
native: unknown;
|
||||
@@ -118,8 +120,13 @@ export function createEvenHubWebView(session: EvenHubSession): EvenHubWebView {
|
||||
console.warn(`evenhub webview destroy failed: ${error}`);
|
||||
}
|
||||
},
|
||||
showOnPhone: () =>
|
||||
nativeHost.showOnPhone(Application.android?.foregroundActivity ?? Application.android?.startActivity ?? null, webView),
|
||||
showOnPhone: (onClose: () => void) =>
|
||||
nativeHost.showOnPhone(
|
||||
Application.android?.foregroundActivity ?? Application.android?.startActivity ?? null,
|
||||
webView,
|
||||
session.manifest.name,
|
||||
new java.lang.Runnable({ run: onClose }),
|
||||
),
|
||||
hideOnPhone: () => nativeHost.hideOnPhone(),
|
||||
};
|
||||
}
|
||||
@@ -78,7 +78,14 @@ import {
|
||||
installedEvenHubPackageId,
|
||||
uninstallEvenHubPackage,
|
||||
} from "../apps/evenhub/installed-apps";
|
||||
import { closeRunningPackage, launchInstalledPackage } from "../apps/evenhub/manager";
|
||||
import {
|
||||
closeRunningPackage,
|
||||
launchInstalledPackage,
|
||||
onPhoneShownChanged,
|
||||
phoneUiButton,
|
||||
showOnPhone as showEvenHubPhoneUi,
|
||||
type PhoneUiButton,
|
||||
} from "../apps/evenhub/manager";
|
||||
import { openEvenHubStoreForPackage } from "../apps/evenhub";
|
||||
import { isInstalledPackagePresent } from "../apps/evenhub/updates";
|
||||
import { wearerVerificationOptions } from "../apps/microphones/speakers";
|
||||
@@ -133,6 +140,11 @@ export type DashboardSnapshot = {
|
||||
* nothing is paired, so "Disconnected" would be the wrong label.
|
||||
*/
|
||||
previewMode: boolean;
|
||||
/**
|
||||
* The foreground glasses window's EvenHub phone UI, when it can be opened
|
||||
* (the action bar's app-icon button); null otherwise.
|
||||
*/
|
||||
evenHubPhoneUi: PhoneUiButton | null;
|
||||
};
|
||||
|
||||
type DashboardListener = (snapshot: DashboardSnapshot) => void;
|
||||
@@ -149,6 +161,9 @@ const SHELL_REFRESH_INTERVAL_MS = 60_000;
|
||||
// schedules a refresh), so this just covers anything that slips through.
|
||||
const PREVIEW_INTERVAL_MS = 1_000;
|
||||
const SCREEN_TIMEOUT_CHECK_MS = 1_000;
|
||||
// The lock screen is a short notice, not something to read at leisure; it
|
||||
// ignores the screen-timeout setting (including "never").
|
||||
const LOCK_SCREEN_TIMEOUT_MS = 15_000;
|
||||
const EVENHUB_SCREEN_OFF_SUSPEND_DELAY_MS = 5_000;
|
||||
const EVENHUB_WAKE_READY_TIMEOUT_MS = 4_500;
|
||||
const FOREGROUND_NOTIFICATION_MIN_UPDATE_MS = 30_000;
|
||||
@@ -358,6 +373,8 @@ class DashboardController {
|
||||
launchApp: (appId) => this.launchApp(appId),
|
||||
requestShellRender: () => this.requestShellRender(),
|
||||
});
|
||||
// The action bar's EvenHub phone-UI button hides while that UI is showing.
|
||||
onPhoneShownChanged(() => this.emit());
|
||||
shell.configure({
|
||||
actions: {
|
||||
...sharedActions,
|
||||
@@ -365,7 +382,8 @@ class DashboardController {
|
||||
// surface, so their repaints go through the shell render path.
|
||||
requestRender: () => this.requestShellRender(),
|
||||
},
|
||||
getScreenTimeoutMs: () => screenTimeoutSettingToMs(screenTimeoutSetting.get()),
|
||||
getScreenTimeoutMs: () =>
|
||||
this.glassesLocked ? LOCK_SCREEN_TIMEOUT_MS : screenTimeoutSettingToMs(screenTimeoutSetting.get()),
|
||||
requestShellRender: () => this.requestShellRender(),
|
||||
prepareVoiceCapture: () => this.prepareVoiceCapture(),
|
||||
onKeyboardInputChanged: (session) => {
|
||||
@@ -626,6 +644,9 @@ class DashboardController {
|
||||
}
|
||||
|
||||
private handleWearState(wearing: boolean): void {
|
||||
// Only an observed OFF_HEAD -> ON_HEAD transition counts as putting the
|
||||
// glasses on; the first snapshot of a session (null) is just the status.
|
||||
const putOn = wearing && this.glassesWorn === false;
|
||||
this.glassesWorn = wearing;
|
||||
updateGlassesPresence({ worn: wearing });
|
||||
this.appendLog(wearing ? "glasses wear state: ON_HEAD" : "glasses wear state: OFF_HEAD");
|
||||
@@ -633,6 +654,19 @@ class DashboardController {
|
||||
if (!wearing && this.phoneLocked && lockScreenEnabledSetting.get()) {
|
||||
this.setGlassesLocked(true, "glasses removed while phone locked");
|
||||
}
|
||||
if (putOn) this.wakeForGlassesPutOn();
|
||||
}
|
||||
|
||||
/**
|
||||
* Putting the glasses on wakes the screen, like a double-tap would. While
|
||||
* locked that shows the lock-screen notice (which then times out on its
|
||||
* own short timer); otherwise it lands on the sidebar as a normal wake.
|
||||
*/
|
||||
private wakeForGlassesPutOn(): void {
|
||||
if (this.phase !== "connected" || !this.communicator || shell.isScreenOn()) return;
|
||||
// wake() -> onScreenStateChanged(true) dismisses a showing Glanceboard,
|
||||
// runs the EvenHub wake barrier and repaints the shell.
|
||||
if (shell.wake("sidebar")) this.appendLog("screen woken: glasses put on");
|
||||
}
|
||||
|
||||
private handlePhoneLockState(locked: boolean): void {
|
||||
@@ -1005,9 +1039,15 @@ class DashboardController {
|
||||
fontsMissingWarningVisible: this.fontsMissingWarningVisible,
|
||||
alarmReliabilityMessage: this.alarmReliabilityMessage,
|
||||
previewMode: this.isPreviewDisplayActive(),
|
||||
evenHubPhoneUi: phoneUiButton(),
|
||||
};
|
||||
}
|
||||
|
||||
/** Overlay an EvenHub app's phone UI (the action bar's app-icon button). */
|
||||
showEvenHubPhoneUi(windowId: string): void {
|
||||
showEvenHubPhoneUi(windowId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Message to show in place of the display preview, or "" to show the preview.
|
||||
*
|
||||
@@ -2475,6 +2515,13 @@ class DashboardController {
|
||||
return;
|
||||
}
|
||||
const fingerprint = frameTimings.span(frameId, "fingerprint", () => planesFingerprint(planes));
|
||||
// An identical repaint (e.g. every in-process window re-renders when the
|
||||
// switcher brings it to the foreground) would flatten, encode and
|
||||
// composite only to be deduped before sending.
|
||||
if (display.isSurfaceCurrent(surfaceId, fingerprint)) {
|
||||
frameTimings.finishFrame(frameId, "discarded: surface unchanged");
|
||||
return;
|
||||
}
|
||||
const { image, draws } = frameTimings.span(frameId, "flatten", () => flattenPlanesWithDraws(planes));
|
||||
const buffer = frameTimings.span(frameId, "to8bpp", () => image.to8bppBuffer());
|
||||
const preparedDraws = frameTimings.span(frameId, "prepareFrameDraws", () => prepareFrameDraws(draws));
|
||||
|
||||
@@ -362,9 +362,13 @@ export class IosPreviewController {
|
||||
// Sample false to catch a notification missed during suspension. Do not
|
||||
// sample true here: WillBecomeUnavailable precedes the property transition.
|
||||
if (!UIApplication.sharedApplication.protectedDataAvailable) this.handlePhoneLockState(true)
|
||||
// Putting the glasses on (an observed OFF_HEAD -> ON_HEAD transition, not
|
||||
// a session's first snapshot) wakes the screen, to the lock notice if locked.
|
||||
const putOn = wearing && this.glassesWorn === false
|
||||
this.glassesWorn = wearing
|
||||
this.logBluetooth(`Glasses wear state: ${wearing ? 'ON_HEAD' : 'OFF_HEAD'}`)
|
||||
if (!wearing && this.phoneLocked && this.lockEnabled) this.setGlassesLocked(true)
|
||||
if (putOn && this.runtimeRunning && !shell.isScreenOn()) shell.wake('sidebar')
|
||||
}
|
||||
private setGlassesLocked(locked: boolean): void {
|
||||
if (locked === this.glassesLocked) return
|
||||
|
||||
@@ -36,14 +36,34 @@ export type DisplayList = {
|
||||
};
|
||||
export type PlacedDisplayList = { displayList: DisplayList; x: number; y: number; width: number; height: number; depth: number };
|
||||
|
||||
/**
|
||||
* Growable byte buffer. Lists are encoded on every frame that carries one, and
|
||||
* twice more for its fingerprint and the preview; resources (whole menu rows,
|
||||
* scroll strips) are tens of KB, so they go in with one set() rather than a
|
||||
* push per byte.
|
||||
*/
|
||||
class Writer {
|
||||
bytes: number[] = [];
|
||||
u8(n: number): void { this.bytes.push(integer(n, 0, 255)); }
|
||||
private buffer = new Uint8Array(256);
|
||||
length = 0;
|
||||
private reserve(count: number): void {
|
||||
const needed = this.length + count;
|
||||
if (needed <= this.buffer.length) return;
|
||||
let size = this.buffer.length * 2;
|
||||
while (size < needed) size *= 2;
|
||||
const grown = new Uint8Array(size);
|
||||
grown.set(this.buffer.subarray(0, this.length));
|
||||
this.buffer = grown;
|
||||
}
|
||||
u8(n: number): void { integer(n, 0, 255); this.reserve(1); this.buffer[this.length++] = n; }
|
||||
i8(n: number): void { this.u8(integer(n, -128, 127) & 255); }
|
||||
u16(n: number): void { integer(n, 0, 65535); this.bytes.push(n & 255, n >>> 8); }
|
||||
u16(n: number): void { integer(n, 0, 65535); this.reserve(2); this.buffer[this.length++] = n & 255; this.buffer[this.length++] = n >>> 8; }
|
||||
i16(n: number): void { this.u16(integer(n, -32768, 32767) & 65535); }
|
||||
u32(n: number): void { integer(n, 0, 4294967295); this.u16(n & 65535); this.u16(n >>> 16); }
|
||||
raw(bytes: ArrayLike<number>): void { for (let i = 0; i < bytes.length; i++) this.bytes.push(bytes[i]); }
|
||||
raw(bytes: ArrayLike<number>): void { this.reserve(bytes.length); this.buffer.set(bytes, this.length); this.length += bytes.length; }
|
||||
/** The written bytes, in a buffer of their own. */
|
||||
bytes(): Uint8Array { return this.buffer.slice(0, this.length); }
|
||||
/** A view of the written bytes; valid until the next write. */
|
||||
view(): Uint8Array { return this.buffer.subarray(0, this.length); }
|
||||
}
|
||||
|
||||
/** Length-delimited bridge envelope; call operands use fixed widths except extended x/y. */
|
||||
@@ -85,9 +105,9 @@ export function encodeDisplayList(placed: PlacedDisplayList, now = Date.now()):
|
||||
}
|
||||
}
|
||||
}
|
||||
if (out.bytes.length > 4 * 1024 * 1024) throw new Error('Display list exceeds bridge limit');
|
||||
const header = new Writer(); header.u8(DISPLAY_LIST_RECORD); header.u32(out.bytes.length); header.raw(out.bytes);
|
||||
return Uint8Array.from(header.bytes);
|
||||
if (out.length > 4 * 1024 * 1024) throw new Error('Display list exceeds bridge limit');
|
||||
const header = new Writer(); header.u8(DISPLAY_LIST_RECORD); header.u32(out.length); header.raw(out.view());
|
||||
return header.bytes();
|
||||
}
|
||||
|
||||
/** Replay-record sizes by tag, as in glyph-wire's frame draw buffer. */
|
||||
|
||||
+47
-32
@@ -277,17 +277,28 @@ export class GrayImage {
|
||||
const destX = dx | 0;
|
||||
const destY = dy | 0;
|
||||
|
||||
for (let row = 0; row < copyHeight; row++) {
|
||||
const sy = srcY + row;
|
||||
const ty = destY + row;
|
||||
if (sy < 0 || sy >= source.height || ty < 0 || ty >= this.height) continue;
|
||||
for (let col = 0; col < copyWidth; col++) {
|
||||
const sx = srcX + col;
|
||||
const tx = destX + col;
|
||||
if (sx < 0 || sx >= source.width || tx < 0 || tx >= this.width) continue;
|
||||
const value = source.pixels[sy * source.width + sx] ?? 0;
|
||||
// Clip once, then copy row spans: flattening a frame blits every plane,
|
||||
// and per-pixel bounds checks made that a sizeable share of a paint.
|
||||
const colStart = Math.max(0, -destX);
|
||||
const colEnd = Math.min(copyWidth, source.width - srcX, this.width - destX);
|
||||
const rowStart = Math.max(0, -destY);
|
||||
const rowEnd = Math.min(copyHeight, source.height - srcY, this.height - destY);
|
||||
const span = colEnd - colStart;
|
||||
const src = source.pixels;
|
||||
const dst = this.pixels;
|
||||
// A blit within one image copies pixel by pixel, forwards, as it always has.
|
||||
const bulk = !opts.transparentZero && source !== this;
|
||||
for (let row = rowStart; span > 0 && row < rowEnd; row++) {
|
||||
const from = (srcY + row) * source.width + srcX + colStart;
|
||||
const to = (destY + row) * this.width + destX + colStart;
|
||||
if (bulk) {
|
||||
dst.set(src.subarray(from, from + span), to);
|
||||
continue;
|
||||
}
|
||||
for (let i = 0; i < span; i++) {
|
||||
const value = src[from + i]!;
|
||||
if (opts.transparentZero && value === 0) continue;
|
||||
this.pixels[ty * this.width + tx] = value;
|
||||
dst[to + i] = value;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,7 +409,7 @@ export class GrayImage {
|
||||
hash = mixInt(hash, placed.source.height);
|
||||
hash = mixInt(hash, placed.source.sourceContentHash32());
|
||||
if (placed.presentation) { const p = placed.presentation; for (const value of [p.radius, p.background, p.border, p.depth, p.mode === "image" ? 1 : p.mode === "masked-image" ? 2 : 0]) hash = mixInt(hash, value);
|
||||
if (p.displayList) for (const byte of encodeDisplayList({ displayList: p.displayList, x: 0, y: 0, width: placed.source.width, height: placed.source.height, depth: p.depth }, p.displayList.timeline?.startedAt ?? 0)) hash = mixInt(hash, byte);
|
||||
if (p.displayList) hash = mixInt(hash, bytesHash32(encodeDisplayList({ displayList: p.displayList, x: 0, y: 0, width: placed.source.width, height: placed.source.height, depth: p.depth }, p.displayList.timeline?.startedAt ?? 0)));
|
||||
}
|
||||
} else {
|
||||
hash = mixInt(hash, 0xf17e);
|
||||
@@ -415,28 +426,9 @@ export class GrayImage {
|
||||
return hash >>> 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* FNV-1a over the raster pixels. Four bytes at a time where alignment
|
||||
* allows: this runs on every frame's fingerprint, over the whole screen, on
|
||||
* the thread that is about to hand the frame to the transport.
|
||||
*/
|
||||
/** Hash of the raster pixels; see bytesHash32. */
|
||||
private pixelsHash32(): number {
|
||||
const pixels = this.pixels;
|
||||
let hash = 2166136261;
|
||||
let i = 0;
|
||||
if ((pixels.byteOffset & 3) === 0) {
|
||||
const words = new Uint32Array(pixels.buffer, pixels.byteOffset, pixels.length >>> 2);
|
||||
for (let w = 0; w < words.length; w++) {
|
||||
hash ^= words[w]!;
|
||||
hash = Math.imul(hash, 16777619);
|
||||
}
|
||||
i = words.length << 2;
|
||||
}
|
||||
for (; i < pixels.length; i++) {
|
||||
hash ^= pixels[i]!;
|
||||
hash = Math.imul(hash, 16777619);
|
||||
}
|
||||
return hash >>> 0;
|
||||
return bytesHash32(this.pixels);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -744,6 +736,29 @@ function clampByte(value: number): number {
|
||||
}
|
||||
|
||||
/** Fold a 32-bit int into an FNV-style running hash. */
|
||||
/**
|
||||
* FNV-1a over bytes. Four bytes at a time where alignment allows: this runs on
|
||||
* every frame's fingerprint, over the whole screen, on the thread that is
|
||||
* about to hand the frame to the transport.
|
||||
*/
|
||||
function bytesHash32(bytes: Uint8Array): number {
|
||||
let hash = 2166136261;
|
||||
let i = 0;
|
||||
if ((bytes.byteOffset & 3) === 0) {
|
||||
const words = new Uint32Array(bytes.buffer, bytes.byteOffset, bytes.length >>> 2);
|
||||
for (let w = 0; w < words.length; w++) {
|
||||
hash ^= words[w]!;
|
||||
hash = Math.imul(hash, 16777619);
|
||||
}
|
||||
i = words.length << 2;
|
||||
}
|
||||
for (; i < bytes.length; i++) {
|
||||
hash ^= bytes[i]!;
|
||||
hash = Math.imul(hash, 16777619);
|
||||
}
|
||||
return hash >>> 0;
|
||||
}
|
||||
|
||||
function mixInt(hash: number, value: number): number {
|
||||
hash ^= value | 0;
|
||||
return Math.imul(hash, 16777619);
|
||||
|
||||
@@ -536,6 +536,14 @@ export class FaceclawCommunicatorBridge {
|
||||
await this.enqueueNativeCall(() => { this.communicator.setScreenBlankedBlanked(Boolean(blanked)); });
|
||||
}
|
||||
|
||||
/**
|
||||
* See the Android bridge. Not wired to the shared compositor's check on iOS
|
||||
* yet, so every repaint is submitted as before.
|
||||
*/
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitSurfaceFrame(
|
||||
surfaceId: string,
|
||||
pixels8bpp: Uint8Array,
|
||||
|
||||
@@ -133,6 +133,8 @@ export class FaceclawCommunicatorBridge {
|
||||
private javaCallQueue: Promise<void> = Promise.resolve();
|
||||
/** Calls waiting on javaCallQueue; 0 means enqueueJavaCall's fast path is safe. */
|
||||
private queuedJavaCalls = 0;
|
||||
/** Queued calls that may change what a surface holds; see isSurfaceCurrent. */
|
||||
private queuedSurfaceChanges = 0;
|
||||
// Reused Java-side buffers for byte payloads; passing a JS ArrayBuffer to
|
||||
// Java leaks it (see java-direct-buffer.ts). Loaded inside the queued call,
|
||||
// immediately before the synchronous Java call that consumes them.
|
||||
@@ -267,8 +269,12 @@ export class FaceclawCommunicatorBridge {
|
||||
* the frame timings), which is pure latency on a call the caller is already
|
||||
* awaiting. Off by default: a call that might block for a while should keep
|
||||
* yielding to the main looper first.
|
||||
*
|
||||
* preservesSurfaces marks a call that neither changes a surface's retained
|
||||
* content nor leaves a change waiting for a later composite (it composites
|
||||
* itself), so having it queued does not make isSurfaceCurrent answer false.
|
||||
*/
|
||||
private enqueueJavaCall<T>(operation: () => T, inlineWhenIdle = false): Promise<T> {
|
||||
private enqueueJavaCall<T>(operation: () => T, inlineWhenIdle = false, preservesSurfaces = false): Promise<T> {
|
||||
if (inlineWhenIdle && this.queuedJavaCalls === 0) {
|
||||
try {
|
||||
return Promise.resolve(operation());
|
||||
@@ -277,10 +283,12 @@ export class FaceclawCommunicatorBridge {
|
||||
}
|
||||
}
|
||||
this.queuedJavaCalls++;
|
||||
if (!preservesSurfaces) this.queuedSurfaceChanges++;
|
||||
const run = () =>
|
||||
new Promise<T>((resolve, reject) => {
|
||||
setTimeout(() => {
|
||||
this.queuedJavaCalls--;
|
||||
if (!preservesSurfaces) this.queuedSurfaceChanges--;
|
||||
try {
|
||||
resolve(operation());
|
||||
} catch (error) {
|
||||
@@ -549,6 +557,7 @@ export class FaceclawCommunicatorBridge {
|
||||
await this.enqueueJavaCall(
|
||||
() => this.communicator.submitShellScene(this.shellSceneBuffer.load(snapshot), paintMs, frameId),
|
||||
true,
|
||||
true,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -562,7 +571,19 @@ export class FaceclawCommunicatorBridge {
|
||||
async setSurfaceVisible(id: string, visible: boolean): Promise<void> {
|
||||
await this.enqueueJavaCall(() => {
|
||||
this.communicator.setSurfaceVisible(id, Boolean(visible));
|
||||
});
|
||||
}, false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether submitting a full-surface frame with this fingerprint would
|
||||
* change nothing: Java already holds that content for the surface, and no
|
||||
* queued or not-yet-composited change is waiting on a composite. Lets a
|
||||
* repaint that came out identical (a window re-rendered when it comes to
|
||||
* the foreground, say) skip flattening and submitting its frame.
|
||||
*/
|
||||
isSurfaceCurrent(surfaceId: string, fingerprint: string): boolean {
|
||||
if (this.queuedSurfaceChanges > 0) return false;
|
||||
return Boolean(this.communicator.isSurfaceCurrent(surfaceId, fingerprint));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -27,3 +27,21 @@ export function grayImageToPreviewSource(image: GrayImage): ImageSource | null {
|
||||
);
|
||||
return new ImageSource(bitmap);
|
||||
}
|
||||
|
||||
/**
|
||||
* A glasses icon as a white-on-transparent phone image (gray becomes alpha),
|
||||
* for the dark action bar.
|
||||
*/
|
||||
export function grayImageToWhiteIconSource(image: GrayImage): ImageSource | null {
|
||||
if (!global.isAndroid) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const baked = image.withDrawsBaked();
|
||||
const bitmap = com.faceclaw.app.PreviewBitmapUtil.whiteIconFromGray(
|
||||
copyToJavaByteBuffer(baked.pixels),
|
||||
baked.width,
|
||||
baked.height,
|
||||
);
|
||||
return new ImageSource(bitmap);
|
||||
}
|
||||
@@ -7,7 +7,25 @@ export type PhoneBatteryState = {
|
||||
charging: boolean | null;
|
||||
};
|
||||
|
||||
// The Android read is a sticky-broadcast binder round trip, and the top bar
|
||||
// asks on every shell paint; the level moves far slower than that.
|
||||
const ANDROID_CACHE_MS = 5000;
|
||||
let cachedState: PhoneBatteryState | null = null;
|
||||
let cachedAtMs = 0;
|
||||
|
||||
export function readPhoneBatteryState(): PhoneBatteryState {
|
||||
if (global.isAndroid) {
|
||||
const now = Date.now();
|
||||
if (cachedState === null || now - cachedAtMs >= ANDROID_CACHE_MS || now < cachedAtMs) {
|
||||
cachedState = readPhoneBatteryStateUncached();
|
||||
cachedAtMs = now;
|
||||
}
|
||||
return { ...cachedState };
|
||||
}
|
||||
return readPhoneBatteryStateUncached();
|
||||
}
|
||||
|
||||
function readPhoneBatteryStateUncached(): PhoneBatteryState {
|
||||
if (global.isIOS) {
|
||||
const device = UIDevice.currentDevice
|
||||
const level = device.batteryLevel
|
||||
|
||||
@@ -18,6 +18,7 @@ export type DisplayTarget = Pick<
|
||||
| "setUnderlayDim"
|
||||
| "setScreenBlanked"
|
||||
| "submitSurfaceFrame"
|
||||
| "isSurfaceCurrent"
|
||||
| "submitShellScene"
|
||||
| "waitForFrameFinished"
|
||||
| "getCompositePreview"
|
||||
@@ -109,6 +110,11 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
this.composited();
|
||||
}
|
||||
|
||||
/** Never skips: preview frames are cheap and nothing is transmitted. */
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitShellScene(bytes: Uint8Array, _paintMs = 0, _frameId = 0): Promise<void> {
|
||||
this.compositor.setShellScene(bytes);
|
||||
this.composited();
|
||||
|
||||
@@ -24,6 +24,7 @@ export type DisplayTarget = Pick<
|
||||
| "setUnderlayDim"
|
||||
| "setScreenBlanked"
|
||||
| "submitSurfaceFrame"
|
||||
| "isSurfaceCurrent"
|
||||
| "submitShellScene"
|
||||
| "waitForFrameFinished"
|
||||
| "getCompositePreview"
|
||||
@@ -109,6 +110,11 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
this.compositor.setSurfaceDepth(id, Math.round(depth));
|
||||
}
|
||||
|
||||
/** Never skips: preview frames are cheap and nothing is transmitted. */
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitShellScene(bytes: Uint8Array, paintMs = 0, frameId = 0): Promise<void> {
|
||||
this.compositor.submitShellScene(this.shellSceneBuffer.load(bytes), paintMs, frameId);
|
||||
}
|
||||
|
||||
@@ -8,17 +8,35 @@
|
||||
import { Utils } from "@nativescript/core";
|
||||
|
||||
declare const com: any;
|
||||
declare const android: any;
|
||||
|
||||
let javaInstance: any = null;
|
||||
// The Java-side listener proxy must stay referenced or it gets GC'd.
|
||||
let retainedListenerProxy: any = null;
|
||||
const changeListeners = new Set<(key: string) => void>();
|
||||
|
||||
// Values already read through JNI, which cost a bridge call each and are read
|
||||
// many times per paint (display mode, fonts, clock format). Only used while
|
||||
// this isolate's Java listener is registered on a thread with a Looper: every
|
||||
// write, from any isolate, notifies that listener, which drops the key before
|
||||
// any other change listener runs. A write from another isolate is visible here
|
||||
// once its notification has been dispatched (one message-loop tick), the same
|
||||
// point at which change listeners hear about it.
|
||||
// Strings are cached without a default (null = unset). Booleans are cached per
|
||||
// default, since the Java getter cannot report "unset", except after a write
|
||||
// from this isolate (defaultValue null: stored, so any default reads it).
|
||||
const stringCache = new Map<string, string | null>();
|
||||
const booleanCache = new Map<string, { defaultValue: boolean | null; value: boolean }>();
|
||||
let cachingEnabled: boolean | null = null;
|
||||
|
||||
/** Release this isolate's native observer before its worker is terminated. */
|
||||
export function disposeSettingsStore(): void {
|
||||
changeListeners.clear();
|
||||
if (retainedListenerProxy !== null) getJava().unregisterListener(retainedListenerProxy);
|
||||
retainedListenerProxy = null;
|
||||
cachingEnabled = false;
|
||||
stringCache.clear();
|
||||
booleanCache.clear();
|
||||
}
|
||||
|
||||
function getJava(): any {
|
||||
@@ -31,20 +49,80 @@ function getJava(): any {
|
||||
return javaInstance;
|
||||
}
|
||||
|
||||
function canCache(): boolean {
|
||||
if (cachingEnabled === null) {
|
||||
cachingEnabled = false;
|
||||
try {
|
||||
// FaceclawSettings dispatches notifications through the registering
|
||||
// thread's Looper; without one this isolate would never hear of writes.
|
||||
if (android.os.Looper.myLooper() !== null) {
|
||||
ensureJavaListener();
|
||||
cachingEnabled = true;
|
||||
}
|
||||
} catch {
|
||||
cachingEnabled = false;
|
||||
}
|
||||
}
|
||||
return cachingEnabled;
|
||||
}
|
||||
|
||||
export function getStringSetting(key: string, defaultValue: string): string {
|
||||
return String(getJava().getString(key, defaultValue));
|
||||
if (!canCache()) return String(getJava().getString(key, defaultValue));
|
||||
let value = stringCache.get(key);
|
||||
if (value === undefined) {
|
||||
const raw = getJava().getString(key, null);
|
||||
value = raw === null || raw === undefined ? null : String(raw);
|
||||
stringCache.set(key, value);
|
||||
}
|
||||
return value ?? defaultValue;
|
||||
}
|
||||
|
||||
export function setStringSetting(key: string, value: string): void {
|
||||
getJava().setString(key, value);
|
||||
if (cachingEnabled) stringCache.set(key, value === null || value === undefined ? null : String(value));
|
||||
}
|
||||
|
||||
export function getBooleanSetting(key: string, defaultValue: boolean): boolean {
|
||||
return Boolean(getJava().getBoolean(key, defaultValue));
|
||||
if (!canCache()) return Boolean(getJava().getBoolean(key, defaultValue));
|
||||
const cached = booleanCache.get(key);
|
||||
if (cached !== undefined && (cached.defaultValue === null || cached.defaultValue === defaultValue)) {
|
||||
return cached.value;
|
||||
}
|
||||
const value = Boolean(getJava().getBoolean(key, defaultValue));
|
||||
booleanCache.set(key, { defaultValue, value });
|
||||
return value;
|
||||
}
|
||||
|
||||
export function setBooleanSetting(key: string, value: boolean): void {
|
||||
getJava().setBoolean(key, value);
|
||||
if (cachingEnabled) booleanCache.set(key, { defaultValue: null, value: Boolean(value) });
|
||||
}
|
||||
|
||||
function forgetCachedSetting(key: string | null | undefined): void {
|
||||
if (key === null || key === undefined) {
|
||||
stringCache.clear();
|
||||
booleanCache.clear();
|
||||
return;
|
||||
}
|
||||
stringCache.delete(key);
|
||||
booleanCache.delete(key);
|
||||
}
|
||||
|
||||
function ensureJavaListener(): void {
|
||||
if (retainedListenerProxy !== null) return;
|
||||
retainedListenerProxy = new com.faceclaw.app.FaceclawSettingsListener({
|
||||
onSettingChanged: (key: string) => {
|
||||
forgetCachedSetting(key === null || key === undefined ? key : String(key));
|
||||
for (const registered of Array.from(changeListeners)) {
|
||||
try {
|
||||
registered(String(key));
|
||||
} catch (error) {
|
||||
console.warn("settings change listener failed", error);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
getJava().registerListener(retainedListenerProxy);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,20 +131,7 @@ export function setBooleanSetting(key: string, value: boolean): void {
|
||||
* change.
|
||||
*/
|
||||
export function onSettingsStoreChanged(listener: (key: string) => void): () => void {
|
||||
if (retainedListenerProxy === null) {
|
||||
retainedListenerProxy = new com.faceclaw.app.FaceclawSettingsListener({
|
||||
onSettingChanged: (key: string) => {
|
||||
for (const registered of Array.from(changeListeners)) {
|
||||
try {
|
||||
registered(String(key));
|
||||
} catch (error) {
|
||||
console.warn("settings change listener failed", error);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
getJava().registerListener(retainedListenerProxy);
|
||||
}
|
||||
ensureJavaListener();
|
||||
changeListeners.add(listener);
|
||||
return () => {
|
||||
changeListeners.delete(listener);
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:rc="phone-ui" navigatingTo="navigatingTo" loaded="loaded" unloaded="unloaded">
|
||||
<ActionBar>
|
||||
<!-- Custom titleView: app title on the left; connection status and the
|
||||
warning-triangle indicator right-aligned beside the overflow menu. -->
|
||||
<GridLayout columns="auto,*,auto,auto" width="100%" verticalAlignment="center">
|
||||
<!-- Custom titleView: app title on the left; the foreground EvenHub
|
||||
app's phone-UI button, connection status and the warning-triangle
|
||||
indicator right-aligned beside the overflow menu. -->
|
||||
<GridLayout columns="auto,*,auto,auto,auto" width="100%" verticalAlignment="center">
|
||||
<Label col="0" text="Faceclaw" class="action-bar-title" />
|
||||
<Label col="2" text="{{ connectionStatusLabel }}" tap="{{ onConnectionStatusTap }}" class="action-bar-status" />
|
||||
<Label col="3" text="⚠️" tap="{{ onWarningIconTap }}" visibility="{{ warningIconVisibility }}" class="action-bar-warning" />
|
||||
<Image col="2" src="{{ evenHubPhoneUiIcon }}" tap="{{ onEvenHubPhoneUiTap }}" visibility="{{ evenHubPhoneUiVisibility }}" class="action-bar-app-icon" />
|
||||
<Label col="3" text="{{ connectionStatusLabel }}" tap="{{ onConnectionStatusTap }}" class="action-bar-status" />
|
||||
<Label col="4" text="⚠️" tap="{{ onWarningIconTap }}" visibility="{{ warningIconVisibility }}" class="action-bar-warning" />
|
||||
</GridLayout>
|
||||
<ActionItem text="{{ buttonLabel }}" tap="{{ onTap }}" isEnabled="{{ connectItemEnabled }}" visibility="{{ glassesMenuItemsVisibility }}" android.position="popup" />
|
||||
<ActionItem text="Pair glasses" tap="{{ onPairGlassesTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
||||
|
||||
@@ -25,6 +25,7 @@ import { isAutoReconnectSuppressed, resumeAutoReconnect } from "../g2/reconnect-
|
||||
import { isPreviewOnlyMode } from "./onboarding-state";
|
||||
import { formatErrorMessage } from "../util/format-error";
|
||||
import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../graphics/image";
|
||||
import { type PhoneUiButton } from "../apps/evenhub/manager";
|
||||
|
||||
const LENS_ASPECT_RATIO = G2_LENS_WIDTH / G2_LENS_HEIGHT;
|
||||
|
||||
@@ -63,6 +64,7 @@ export class MainViewModel extends RemoteControlsViewModel {
|
||||
private _alarmReliabilityMessage = "";
|
||||
private _warningsModalVisible = false;
|
||||
private _previewMode = false;
|
||||
private _evenHubPhoneUi: PhoneUiButton | null = null;
|
||||
private _phase: "disconnected" | "connecting" | "connected" | "charging" | "disconnecting" = "disconnected";
|
||||
|
||||
// A new view model is built on every navigation to the main page; these
|
||||
@@ -112,6 +114,7 @@ export class MainViewModel extends RemoteControlsViewModel {
|
||||
this.batteryOptimizationWarningVisible = snapshot.batteryOptimizationWarningVisible;
|
||||
this.fontsMissingWarningVisible = snapshot.fontsMissingWarningVisible;
|
||||
this.alarmReliabilityMessage = snapshot.alarmReliabilityMessage;
|
||||
this.evenHubPhoneUi = snapshot.evenHubPhoneUi;
|
||||
this.refreshPadFocusLine();
|
||||
}));
|
||||
// Brightness / display mode can change from the glasses' Settings app too.
|
||||
@@ -773,6 +776,28 @@ export class MainViewModel extends RemoteControlsViewModel {
|
||||
return this._warningsModalVisible ? "visible" : "collapse";
|
||||
}
|
||||
|
||||
set evenHubPhoneUi(value: PhoneUiButton | null) {
|
||||
const current = this._evenHubPhoneUi;
|
||||
if (current?.windowId === value?.windowId && current?.icon === value?.icon) return;
|
||||
this._evenHubPhoneUi = value;
|
||||
this.notifyPropertyChange("evenHubPhoneUiIcon", this.evenHubPhoneUiIcon);
|
||||
this.notifyPropertyChange("evenHubPhoneUiVisibility", this.evenHubPhoneUiVisibility);
|
||||
}
|
||||
|
||||
/** The foreground EvenHub app's icon, which opens its phone UI when tapped. */
|
||||
get evenHubPhoneUiIcon(): ImageSource | null {
|
||||
return this._evenHubPhoneUi?.icon ?? null;
|
||||
}
|
||||
|
||||
get evenHubPhoneUiVisibility(): "visible" | "collapse" {
|
||||
return this._evenHubPhoneUi?.icon ? "visible" : "collapse";
|
||||
}
|
||||
|
||||
onEvenHubPhoneUiTap(): void {
|
||||
const windowId = this._evenHubPhoneUi?.windowId;
|
||||
if (windowId) dashboardController.showEvenHubPhoneUi(windowId);
|
||||
}
|
||||
|
||||
onWarningIconTap(): void {
|
||||
this.setWarningsModalVisible(true);
|
||||
}
|
||||
|
||||
@@ -3,13 +3,13 @@ import { GESTURE_DOUBLE_CLICK, type InputEvent } from "../gestures";
|
||||
import { Layer, type LayerActions, type LayerContext } from "../layers";
|
||||
import { createInputDialogMenu, paintInputDialog, type InputDialogRow } from "./input-dialog";
|
||||
|
||||
const FOLLOW_UP_ROW = 0;
|
||||
const FOLLOW_UP_ROW = 1;
|
||||
const MENU_ROWS: readonly InputDialogRow[] = [
|
||||
{ label: "Follow-up", dim: false },
|
||||
{ label: "Done", dim: false },
|
||||
{ label: "Follow-up", dim: false },
|
||||
];
|
||||
|
||||
/** thinking: turn running; done/error: finished, showing the Follow-up/Done menu. */
|
||||
/** thinking: turn running; done/error: finished, showing the Done/Follow-up menu. */
|
||||
type AssistantPhase = "thinking" | "done" | "error";
|
||||
|
||||
export type AssistantLayerCallbacks = {
|
||||
@@ -25,7 +25,7 @@ export type AssistantLayerCallbacks = {
|
||||
|
||||
/**
|
||||
* The assistant overlay: streamed reply text with a status line for tool
|
||||
* activity, and a Follow-up / Done menu once the turn ends. Double-click
|
||||
* activity, and a Done / Follow-up menu once the turn ends. Double-click
|
||||
* cancels an in-flight turn. The shell owns the AssistantSession and drives
|
||||
* this layer's state through the on* methods as the turn streams.
|
||||
*/
|
||||
@@ -99,7 +99,7 @@ export class AssistantLayer implements Layer {
|
||||
}
|
||||
return;
|
||||
}
|
||||
// done / error: the Follow-up / Done menu.
|
||||
// done / error: the Done / Follow-up menu.
|
||||
switch (event.type) {
|
||||
case "scroll-up":
|
||||
case "scroll-down":
|
||||
|
||||
@@ -14,8 +14,9 @@ export type PersistedOpenApps = {
|
||||
|
||||
const STATE_VERSION = 1;
|
||||
const FILE_NAME = "open-apps.json";
|
||||
// Coalesces bursts (restore, sidebar scrolling) into one write; short enough
|
||||
// that a build-reinstall kill right after a change rarely loses it.
|
||||
// Coalesces bursts (restore, sidebar scrolling) into one write once they
|
||||
// settle; short enough that a build-reinstall kill right after a change
|
||||
// rarely loses it.
|
||||
const WRITE_DELAY_MS = 1000;
|
||||
|
||||
function openAppsFilePath(): string {
|
||||
@@ -50,7 +51,10 @@ let pendingState: PersistedOpenApps | null = null;
|
||||
/** Save the open-app state (debounced; the latest state wins). */
|
||||
export function savePersistedOpenApps(state: PersistedOpenApps): void {
|
||||
pendingState = state;
|
||||
if (writeTimer !== null) return;
|
||||
// Restarted on every change: scrolling through the switcher changes the
|
||||
// foreground app a few times a second, and each synchronous write costs
|
||||
// several milliseconds of main thread.
|
||||
if (writeTimer !== null) clearTimeout(writeTimer);
|
||||
writeTimer = setTimeout(() => {
|
||||
writeTimer = null;
|
||||
const state = pendingState;
|
||||
|
||||
@@ -646,7 +646,7 @@ class Shell {
|
||||
// The keyboard dialog likewise: typing happens on the phone, not the
|
||||
// ring. An in-flight assistant turn suspends it for the same reason (a
|
||||
// tool loop can run for a while with no input); once the turn ends and
|
||||
// the Follow-up/Done menu is showing, the normal idle timeout resumes.
|
||||
// the Done/Follow-up menu is showing, the normal idle timeout resumes.
|
||||
if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() || this.foregroundWindow()?.isVoiceCapturing?.()) {
|
||||
this.lastInputAtMs = nowMs;
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user