Compare commits

..
25 changed files with 579 additions and 408 deletions

No files matched your search

@@ -54,8 +54,7 @@ class FaceclawCalendarProvider private constructor() {
* boundaries the provider stores them as. * boundaries the provider stores them as.
*/ */
@JvmStatic @JvmStatic
@JvmOverloads fun getUpcomingEventsJson(context: Context?, maxEvents: Int, windowMs: Long): String {
fun getUpcomingEventsJson(context: Context?, maxEvents: Int, windowMs: Long, selectedCalendarIdsJson: String = "null"): String {
if (context == null || maxEvents <= 0) { if (context == null || maxEvents <= 0) {
return "[]" return "[]"
} }
@@ -74,21 +73,11 @@ class FaceclawCalendarProvider private constructor() {
val events = ArrayList<Event>() val events = ArrayList<Event>()
var cursor: Cursor? = null var cursor: Cursor? = null
try { try {
// Filter instances before the cutoff/limit so excluded calendars
// cannot crowd out selected calendars, including recurrences.
val ids = if (selectedCalendarIdsJson == "null") null else JSONArray(selectedCalendarIdsJson)
if (ids != null && ids.length() == 0) return "[]"
val args = ids?.let { values -> Array(values.length()) { index ->
values.getString(index).also { require(it.matches(Regex("[0-9]+"))) }
} }
val selection = args?.let {
CalendarContract.Instances.CALENDAR_ID + " IN (" + it.joinToString(",") { "?" } + ")"
}
cursor = context.contentResolver.query( cursor = context.contentResolver.query(
uri, uri,
PROJECTION, PROJECTION,
selection, null,
args, null,
CalendarContract.Instances.BEGIN + " ASC") CalendarContract.Instances.BEGIN + " ASC")
if (cursor != null) { if (cursor != null) {
val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC")) val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
@@ -129,33 +118,6 @@ class FaceclawCalendarProvider private constructor() {
return out.toString() return out.toString()
} }
@JvmStatic
fun getCalendarsJson(context: Context?): String {
if (context == null) return "[]"
val out = JSONArray()
try {
context.contentResolver.query(
CalendarContract.Calendars.CONTENT_URI,
arrayOf(CalendarContract.Calendars._ID, CalendarContract.Calendars.CALENDAR_DISPLAY_NAME,
CalendarContract.Calendars.ACCOUNT_NAME, CalendarContract.Calendars.ACCOUNT_TYPE),
null, null, CalendarContract.Calendars.CALENDAR_DISPLAY_NAME + " ASC",
)?.use { cursor ->
while (cursor.moveToNext()) {
out.put(JSONObject().apply {
put("id", cursor.getLong(0).toString())
put("name", cursor.getString(1) ?: "")
put("accountName", cursor.getString(2) ?: "")
put("accountType", cursor.getString(3) ?: "")
})
}
}
} catch (t: Throwable) {
Log.w(TAG, "failed to read calendars", t)
return "[]"
}
return out.toString()
}
private fun readEvent(cursor: Cursor, utc: Calendar, local: Calendar): Event { private fun readEvent(cursor: Cursor, utc: Calendar, local: Calendar): Event {
val allDay = cursor.getInt(4) != 0 val allDay = cursor.getInt(4) != 0
var startMs = cursor.getLong(2) var startMs = cursor.getLong(2)
-5
View File
@@ -3,7 +3,6 @@ import { invalidateCalendarCache, onCalendarChanged } from "../../native/calenda
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer"; import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
import { CalendarLayer } from "./calendar"; import { CalendarLayer } from "./calendar";
import { renderCalendarDateIcon } from "./calendar-icon"; import { renderCalendarDateIcon } from "./calendar-icon";
import { calendarSelectionMenuItems } from "./calendar-filter";
import { import {
createInProcessWindow, createInProcessWindow,
YieldAtRootLayer, YieldAtRootLayer,
@@ -45,10 +44,6 @@ export function createCalendarAppWindow(options: InProcessAppOptions): InProcess
icon: "calendar", icon: "calendar",
drawIcon: makeImageWindowIcon(renderCalendarDateIcon, windowIcon("calendar", "Ca")), drawIcon: makeImageWindowIcon(renderCalendarDateIcon, windowIcon("calendar", "Ca")),
closeable: true, closeable: true,
menuItems: () => calendarSelectionMenuItems().map(item => ({ ...item, onSelect: (ctx, menu) => {
ctx.stack.pop();
return item.onSelect(ctx, menu);
} })),
actions: options.actions, actions: options.actions,
baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)), baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)),
submitFrame: options.submitFrame, submitFrame: options.submitFrame,
-94
View File
@@ -1,94 +0,0 @@
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
import { type GrayImage } from "../../graphics/image";
import { truncateText } from "../../graphics/textwrap";
import { readCalendarSelection, setCalendarSelection } from "../../native/calendar-selection";
import { readAvailableCalendars } from "../../native/calendar-sources";
import { hasCalendarPermission } from "../../native/calendar-permissions";
import { type InputEvent } from "../../ui/gestures";
import { type Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
import { drawToggleMenuItem, MenuLayer, type MenuItem } from "../../ui/menu";
/** Shared preference for every Android calendar reader. */
export class CalendarFilterLayer implements Layer {
private menu: MenuLayer | null = null;
private width = 0;
private keys: string[] = [];
private currentMenu(ctx: LayerContext): MenuLayer {
const calendars = readAvailableCalendars().sort((a, b) =>
a.name.localeCompare(b.name) || a.accountName.localeCompare(b.accountName) || a.id.localeCompare(b.id));
const selection = readCalendarSelection();
const known = new Set(calendars.map(calendar => calendar.id));
const keys = ["all", "none"];
const toggle = (id: string) => {
// Leaving all mode snapshots the current calendars. Newly added calendars
// then stay excluded until selected individually or all mode is restored.
const ids = new Set(readCalendarSelection() ?? calendars.map(calendar => calendar.id));
if (ids.has(id)) ids.delete(id); else ids.add(id);
setCalendarSelection(Array.from(ids));
};
const items: MenuItem[] = [{
label: "All calendars",
description: "Include all calendars, including calendars added later.",
onSelect: () => setCalendarSelection(null),
render: ({ image, x, y, width, selected }) => drawToggleMenuItem(image, getDefaultSmallFont(), x, y, width,
"All calendars", readCalendarSelection() === null, selected),
}, {
label: "No calendars",
onSelect: () => setCalendarSelection([]),
render: ({ image, x, y, width, selected }) => drawToggleMenuItem(image, getDefaultSmallFont(), x, y, width,
"No calendars", readCalendarSelection()?.length === 0, selected),
}];
const rows = [
...calendars.map(calendar => ({ id: calendar.id,
label: `${calendar.name || "(unnamed)"} / ${calendar.accountName || "Local"} (${calendar.accountType || "local"}) #${calendar.id}` })),
...(selection ?? []).filter(id => !known.has(id)).map(id => ({ id, label: `Unavailable calendar #${id}` })),
];
for (const row of rows) {
keys.push(`calendar:${row.id}`);
items.push({
label: row.label,
description: row.label,
onSelect: () => toggle(row.id),
render: ({ image, x, y, width, selected }) => {
const font = getDefaultSmallFont();
const ids = readCalendarSelection();
drawToggleMenuItem(image, font, x, y, width, truncateText(font, row.label, width - 48),
ids === null || ids.includes(row.id), selected);
},
});
}
if (!calendars.length) items.push({
label: hasCalendarPermission() ? "No calendars available" : "Grant calendar permission on your phone",
disabled: true, onSelect: () => {},
});
const key = this.menu?.selectedIndex != null ? this.keys[this.menu.selectedIndex] : "all";
const index = Math.max(0, keys.indexOf(key ?? "all"));
this.keys = keys;
const width = ctx.stack.getBaseSize().width;
if (!this.menu || this.width !== width) {
this.width = width;
this.menu = new MenuLayer("Calendars displayed", items, {
x: 8, y: 8, width: width - 16, opaque: true, showBorder: false,
footer: "Shared by Calendar and Glanceboard",
}).selectItem(index);
} else this.menu.setItems(items, index);
return this.menu;
}
paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
return this.currentMenu(ctx).paint(ctx, paintBelow);
}
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
await this.currentMenu(ctx).handleInput(event, ctx);
}
}
export function calendarSelectionMenuItems(): MenuItem[] {
return global.isAndroid ? [{
label: "Calendars displayed",
description: "Choose the calendars used by Calendar, Glanceboard and other calendar views.",
onSelect: ctx => ctx.stack.push(new CalendarFilterLayer()),
}] : [];
}
+22 -13
View File
@@ -4,7 +4,7 @@
* makes the content area exactly the 576x288 surface EvenHub apps expect. * makes the content area exactly the 576x288 surface EvenHub apps expect.
*/ */
import { GrayImage } from "../../graphics/image"; import { GrayImage } from "../../graphics/image";
import { EVENHUB_SCREEN_WIDTH } from "./compositor"; import { EVENHUB_SCREEN_WIDTH, EVENHUB_SCREEN_HEIGHT } from "./compositor";
import { directionalFallback, isDirectionalInput, type InputEvent } from "../../ui/gestures"; import { directionalFallback, isDirectionalInput, type InputEvent } from "../../ui/gestures";
import { type Layer, type LayerContext } from "../../ui/layers"; import { type Layer, type LayerContext } from "../../ui/layers";
import { import {
@@ -24,21 +24,26 @@ class EvenHubAppLayer implements Layer {
* extension's source field should see that they came from the watch. * extension's source field should see that they came from the watch.
*/ */
readonly acceptsDirectional = true; readonly acceptsDirectional = true;
private tallCanvas = false;
constructor(private readonly session: EvenHubSession) {} constructor(private readonly session: EvenHubSession) {}
setTallCanvas(tall: boolean): void {
this.tallCanvas = tall;
}
paint(ctx: LayerContext): GrayImage { paint(ctx: LayerContext): GrayImage {
const size = ctx.stack.getBaseSize(); const size = ctx.stack.getBaseSize();
// EvenHub apps lay out for the stock 576-wide surface. In the Full // Host full screen hides chrome; it does not enlarge the stock app canvas.
// Screen display mode the window is 640 wide; paint at stock width and // Only the app's explicit Faceclaw extended-layout request opts into height.
// centre it rather than leaving all the slack on the right. const canvas = { width: EVENHUB_SCREEN_WIDTH, height: this.tallCanvas ? size.height : EVENHUB_SCREEN_HEIGHT };
if (size.width > EVENHUB_SCREEN_WIDTH) { const content = this.session.paint(canvas, ctx.stack.isFocused());
const content = this.session.paint({ width: EVENHUB_SCREEN_WIDTH, height: size.height }, ctx.stack.isFocused()); if (size.width === canvas.width && size.height === canvas.height) return content;
const image = new GrayImage(size.width, size.height, 0); const image = new GrayImage(size.width, size.height, 0);
content.composeInto(image, Math.floor((size.width - EVENHUB_SCREEN_WIDTH) / 2), 0); // Clip text to its logical canvas before placing it in the larger host window.
return image; image.bitBlt(content.withDrawsBaked(), Math.max(0, Math.floor((size.width - canvas.width) / 2)),
} Math.max(0, Math.floor((size.height - canvas.height) / 2)));
return this.session.paint(size, ctx.stack.isFocused()); return image;
} }
handleInput(event: InputEvent): void { handleInput(event: InputEvent): void {
@@ -60,6 +65,7 @@ export function createEvenHubWindow(
requestShellRender: () => void, requestShellRender: () => void,
): InProcessWindow { ): InProcessWindow {
const fallbackIcon = windowIcon("package", session.manifest.name.charAt(0).toUpperCase() || "E"); const fallbackIcon = windowIcon("package", session.manifest.name.charAt(0).toUpperCase() || "E");
const appLayer = new EvenHubAppLayer(session);
const created = createInProcessWindow({ const created = createInProcessWindow({
appId, appId,
windowId, windowId,
@@ -91,7 +97,7 @@ export function createEvenHubWindow(
{ label: "Show phone UI", onSelect: (ctx: LayerContext) => { ctx.stack.pop(); onShowPhone(); } }, { label: "Show phone UI", onSelect: (ctx: LayerContext) => { ctx.stack.pop(); onShowPhone(); } },
], ],
actions: options.actions, actions: options.actions,
baseLayer: new EvenHubAppLayer(session), baseLayer: appLayer,
submitFrame: options.submitFrame, submitFrame: options.submitFrame,
setSurfaceVisible: options.setSurfaceVisible, setSurfaceVisible: options.setSurfaceVisible,
removeSurface: options.removeSurface, removeSurface: options.removeSurface,
@@ -109,7 +115,10 @@ export function createEvenHubWindow(
pushOverlay: (layer) => created.stack.push(layer), pushOverlay: (layer) => created.stack.push(layer),
// The extended layout uses the full 576x452 app area ("max"); stock apps // The extended layout uses the full 576x452 app area ("max"); stock apps
// stay in the 576x288 band ("medium"). // stay in the 576x288 band ("medium").
setTallCanvas: (tall) => created.setHeightMode(tall ? "max" : "medium"), setTallCanvas: (tall) => {
appLayer.setTallCanvas(tall);
created.setHeightMode(tall ? "max" : "medium");
},
setAttention: (attention) => shell.setWindowAttention(windowId, attention), setAttention: (attention) => shell.setWindowAttention(windowId, attention),
// Only while the app listens for text: otherwise the shell's Type Into App // Only while the app listens for text: otherwise the shell's Type Into App
// destinations (voice dialog, phone keyboard, watch) would send into a void. // destinations (voice dialog, phone keyboard, watch) would send into a void.
+1 -2
View File
@@ -1,6 +1,5 @@
import { type GlanceWidgetDefinition, type GlanceWidgetId } from "../widget"; import { type GlanceWidgetDefinition, type GlanceWidgetId } from "../widget";
import { CalendarWidget } from "./calendar-widget"; import { CalendarWidget } from "./calendar-widget";
import { calendarSelectionMenuItems } from "../../calendar/calendar-filter";
import { CompassWidget } from "./compass-widget"; import { CompassWidget } from "./compass-widget";
import { MusicWidget, musicSettingsMenuItems } from "./music-widget"; import { MusicWidget, musicSettingsMenuItems } from "./music-widget";
import { NightscoutWidget } from "./nightscout-widget"; import { NightscoutWidget } from "./nightscout-widget";
@@ -12,7 +11,7 @@ import { HealthWidget } from "./health-widget";
/** Every widget a board slot can hold. */ /** Every widget a board slot can hold. */
export const GLANCE_WIDGETS: readonly GlanceWidgetDefinition[] = [ export const GLANCE_WIDGETS: readonly GlanceWidgetDefinition[] = [
{ id: "system-card", label: "System card", settingsMenuItems: systemCardSettingsMenuItems, create: () => new SystemCardWidget() }, { id: "system-card", label: "System card", settingsMenuItems: systemCardSettingsMenuItems, create: () => new SystemCardWidget() },
{ id: "calendar", label: "Calendar", tall: true, settingsMenuItems: calendarSelectionMenuItems, create: () => new CalendarWidget() }, { id: "calendar", label: "Calendar", tall: true, create: () => new CalendarWidget() },
{ id: "terminal", label: "Terminal", tall: true, create: () => new TerminalWidget() }, { id: "terminal", label: "Terminal", tall: true, create: () => new TerminalWidget() },
{ id: "t3code", label: "T3 Code", tall: true, create: () => new T3CodeWidget() }, { id: "t3code", label: "T3 Code", tall: true, create: () => new T3CodeWidget() },
{ id: "nightscout", label: "Nightscout", create: () => new NightscoutWidget() }, { id: "nightscout", label: "Nightscout", create: () => new NightscoutWidget() },
+2
View File
@@ -451,6 +451,8 @@ class DashboardController {
openNotificationsWindow: () => openNotificationsWindow: () =>
this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow), this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow),
onSwitcherBarHeightChanged: () => this.applySwitcherBarHeight(), onSwitcherBarHeightChanged: () => this.applySwitcherBarHeight(),
onWindowLayoutChanged: () => this.applySwitcherBarHeight(),
isLocked: () => this.glassesLocked,
onScreenStateChanged: (on) => { onScreenStateChanged: (on) => {
// Any wake of the regular UI replaces a showing Glanceboard. // Any wake of the regular UI replaces a showing Glanceboard.
if (on) this.glance.dismiss(); if (on) this.glance.dismiss();
+6
View File
@@ -221,6 +221,12 @@ export class IosPreviewController {
shell.foregroundWindow()?.requestRender() shell.foregroundWindow()?.requestRender()
this.requestShellRender() this.requestShellRender()
}, },
onWindowLayoutChanged: () => {
this.relayout()
shell.foregroundWindow()?.requestRender()
this.requestShellRender()
},
isLocked: () => this.glassesLocked,
onScreenStateChanged: on => { onScreenStateChanged: on => {
if (on) this.glance.dismiss() if (on) this.glance.dismiss()
// A wake unblanks only once the next shell render has staged an awake // A wake unblanks only once the next shell render has staged an awake
-19
View File
@@ -1,19 +0,0 @@
import { getStringSetting, setStringSetting } from "./settings-store";
export const CALENDAR_SELECTION_KEY = "calendar.selectedIds";
/** null means all calendars (including future ones); [] explicitly means none. */
export function readCalendarSelection(): string[] | null {
try {
const value = JSON.parse(getStringSetting(CALENDAR_SELECTION_KEY, "null"));
if (value === null) return null;
if (!Array.isArray(value) || !value.every(id => typeof id === "string" && /^\d+$/.test(id))) return null;
return Array.from(new Set<string>(value));
} catch {
return null;
}
}
export function setCalendarSelection(ids: readonly string[] | null): void {
if (ids !== null && !ids.every(id => /^\d+$/.test(id))) throw new Error("Invalid calendar ID");
setStringSetting(CALENDAR_SELECTION_KEY, JSON.stringify(ids === null ? null : Array.from(new Set(ids))));
}
-22
View File
@@ -1,22 +0,0 @@
import { Utils } from "@nativescript/core";
import { hasCalendarPermission } from "./calendar-permissions";
declare const com: any;
export type CalendarSource = { id: string; name: string; accountName: string; accountType: string };
/** Android calendar IDs survive renames and distinguish equal display names. */
export function readAvailableCalendars(): CalendarSource[] {
if (!global.isAndroid || !hasCalendarPermission()) return [];
try {
const context = Utils.android.getApplicationContext();
if (!context) return [];
const parsed = JSON.parse(String(com.faceclaw.app.FaceclawCalendarProvider.getCalendarsJson(context)));
if (!Array.isArray(parsed)) return [];
return parsed.filter(row => row && typeof row.id === "string" && /^\d+$/.test(row.id))
.map(row => ({ id: row.id, name: String(row.name ?? ""),
accountName: String(row.accountName ?? ""), accountType: String(row.accountType ?? "") }));
} catch {
return [];
}
}
+3 -15
View File
@@ -2,8 +2,6 @@ import { Utils } from "@nativescript/core";
import { hasCalendarPermission } from "../g2/android-permissions"; import { hasCalendarPermission } from "../g2/android-permissions";
import { spanCurrent } from "./frame-timings"; import { spanCurrent } from "./frame-timings";
import { type CalendarEvent, type CalendarReadState } from "./calendar-types"; import { type CalendarEvent, type CalendarReadState } from "./calendar-types";
import { CALENDAR_SELECTION_KEY, readCalendarSelection } from "./calendar-selection";
import { onSettingsStoreChanged } from "./settings-store";
export type { CalendarEvent } from "./calendar-types"; export type { CalendarEvent } from "./calendar-types";
declare const com: any; declare const com: any;
@@ -15,21 +13,14 @@ declare const com: any;
*/ */
// Android reads synchronously; iOS notifies subscribers after background reads. // Android reads synchronously; iOS notifies subscribers after background reads.
export function onCalendarChanged(listener: () => void): () => void { export function onCalendarChanged(_listener: () => void): () => void { return () => {}; }
return onSettingsStoreChanged(key => {
if (key === CALENDAR_SELECTION_KEY || key == null) {
invalidateCalendarCache();
listener();
}
});
}
export function getCalendarReadState(): CalendarReadState { return "ready"; } export function getCalendarReadState(): CalendarReadState { return "ready"; }
const DEFAULT_MAX_EVENTS = 50; const DEFAULT_MAX_EVENTS = 50;
const DEFAULT_WINDOW_MS = 14 * 24 * 60 * 60 * 1000; const DEFAULT_WINDOW_MS = 14 * 24 * 60 * 60 * 1000;
const CACHE_MS = 30_000; const CACHE_MS = 30_000;
let cache: { events: CalendarEvent[]; atMs: number; maxEvents: number; windowMs: number; selection: string } | null = null; let cache: { events: CalendarEvent[]; atMs: number; maxEvents: number; windowMs: number } | null = null;
/** /**
* Upcoming events from now through the given window, ordered by start time. * Upcoming events from now through the given window, ordered by start time.
@@ -44,11 +35,9 @@ export function readUpcomingEvents(
if (!global.isAndroid || !hasCalendarPermission()) return []; if (!global.isAndroid || !hasCalendarPermission()) return [];
const now = Date.now(); const now = Date.now();
const selection = JSON.stringify(readCalendarSelection());
if ( if (
!forceRefresh && !forceRefresh &&
cache && cache &&
cache.selection === selection &&
cache.maxEvents === maxEvents && cache.maxEvents === maxEvents &&
cache.windowMs === windowMs && cache.windowMs === windowMs &&
now - cache.atMs < CACHE_MS now - cache.atMs < CACHE_MS
@@ -66,7 +55,6 @@ export function readUpcomingEvents(
context, context,
Math.max(0, Math.round(maxEvents)), Math.max(0, Math.round(maxEvents)),
Math.max(0, Math.round(windowMs)), Math.max(0, Math.round(windowMs)),
selection,
), ),
), ),
); );
@@ -74,7 +62,7 @@ export function readUpcomingEvents(
const events = Array.isArray(parsed) const events = Array.isArray(parsed)
? parsed.map(normalizeEvent).filter((event): event is CalendarEvent => Boolean(event)) ? parsed.map(normalizeEvent).filter((event): event is CalendarEvent => Boolean(event))
: []; : [];
cache = { events, atMs: now, maxEvents, windowMs, selection }; cache = { events, atMs: now, maxEvents, windowMs };
return events; return events;
} catch { } catch {
return []; return [];
+33
View File
@@ -148,6 +148,39 @@ export class ConfigSettingBoolean<TId extends string = string> extends ConfigSet
} }
} }
const appFullscreenSettings = new Map<string, ConfigSettingBoolean>();
/** A user choice independent of an app's own temporary immersive mode. */
export function appFullscreenSetting(appId: string): ConfigSettingBoolean {
let setting = appFullscreenSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-fullscreen-${appId}`, label: "Full screen",
storageKey: `display.fullscreen.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appFullscreenSettings.set(appId, setting);
}
return setting;
}
const appKeepAwakeSettings = new Map<string, ConfigSettingBoolean>();
/** Independent of full screen; applies only while this app is visible. */
export function appKeepAwakeSetting(appId: string): ConfigSettingBoolean {
let setting = appKeepAwakeSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-keep-awake-${appId}`, label: "Keep screen awake",
description: "Prevent automatic sleep while this app is visible, in any display mode.",
storageKey: `display.keepAwake.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appKeepAwakeSettings.set(appId, setting);
}
return setting;
}
type ConfigSettingEnumOptions<TValue extends string, TId extends string> = ConfigSettingOptions<TValue, TId> & { type ConfigSettingEnumOptions<TValue extends string, TId extends string> = ConfigSettingOptions<TValue, TId> & {
values: readonly TValue[]; values: readonly TValue[];
normalize?: (value: string | null | undefined) => TValue; normalize?: (value: string | null | undefined) => TValue;
+2 -1
View File
@@ -1,6 +1,7 @@
import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image"; import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image";
import { import {
appSwitcherPositionSetting, appSwitcherPositionSetting,
appFullscreenSetting,
type AppSwitcherPosition, type AppSwitcherPosition,
displayLayoutSetting, displayLayoutSetting,
type DisplayLayout, type DisplayLayout,
@@ -118,7 +119,7 @@ export function setAppImmersive(appId: string, immersive: boolean): boolean {
} }
export function isImmersive(appId?: string): boolean { export function isImmersive(appId?: string): boolean {
return appId !== undefined && immersiveApps.has(appId); return appId !== undefined && (immersiveApps.has(appId) || appFullscreenSetting(appId).get());
} }
/** Whether an app's windows span the panel's whole width: Full Screen, or immersive. */ /** Whether an app's windows span the panel's whole width: Full Screen, or immersive. */
+66 -13
View File
@@ -31,6 +31,9 @@ import type { AssistantContext } from "../../assistant/types";
import { SingleNotificationLayer } from "../notifications"; import { SingleNotificationLayer } from "../notifications";
import { import {
anthropicApiKeySetting, anthropicApiKeySetting,
appFullscreenSetting,
appKeepAwakeSetting,
toggleSettingMenuItem,
assistantHermesKeySetting, assistantHermesKeySetting,
assistantHermesUrlSetting, assistantHermesUrlSetting,
assistantBackendSetting, assistantBackendSetting,
@@ -94,7 +97,8 @@ import type { AppSwitcherPosition } from "../dashboard-settings";
* Input flow: every event enters via receiveInput. The shell consumes * Input flow: every event enters via receiveInput. The shell consumes
* everything while the sidebar or a shell overlay has focus and forwards the * everything while the sidebar or a shell overlay has focus and forwards the
* rest to the focused window. Long-press opens the shell-owned system menu * rest to the focused window. Long-press opens the shell-owned system menu
* (Focus app switcher, Voice input, Brightness, Close window, Debug) without reaching the * (Focus app switcher, Voice input, Brightness, Close current app, Close all apps,
* Debug) without reaching the
* app, so the shell keeps working when a window's handler hangs; a window * app, so the shell keeps working when a window's handler hangs; a window
* that claims long-press for a move of its own gets it forwarded instead, and * that claims long-press for a move of its own gets it forwarded instead, and
* holding the press past the escape threshold still opens the system menu. * holding the press past the escape threshold still opens the system menu.
@@ -109,7 +113,7 @@ export type ShellWindow = {
title: string; title: string;
/** Compositor surface this window renders to; configured at connect / launch. */ /** Compositor surface this window renders to; configured at connect / launch. */
surfaceId: string; surfaceId: string;
/** Whether the system menu offers Close window (the launcher is pinned). */ /** Whether the system menu can close this window (the launcher is pinned). */
closeable: boolean; closeable: boolean;
/** /**
* True when tap-then-hold currently opens the window's own context menu * True when tap-then-hold currently opens the window's own context menu
@@ -222,6 +226,10 @@ export type ShellConfig = {
* after the shell paint that found it. * after the shell paint that found it.
*/ */
onSwitcherBarHeightChanged?: () => void; onSwitcherBarHeightChanged?: () => void;
/** A per-app full-screen choice changed the viewport and compositor geometry. */
onWindowLayoutChanged?: () => void;
/** An app's keep-awake preference must not keep the lock screen awake. */
isLocked?: () => boolean;
/** /**
* The Notifications app's window, opened in the background (neither * The Notifications app's window, opened in the background (neither
* foregrounded nor focused) unless it is open already, for the switcher * foregrounded nor focused) unless it is open already, for the switcher
@@ -655,6 +663,12 @@ class Shell {
if (window) this.closeWindow(window.windowId); if (window) this.closeWindow(window.windowId);
} }
/** Snapshot ids: close callbacks may remove themselves or other windows. */
closeAllWindows(): void {
const ids = this.windows.filter(window => window.closeable).map(window => window.windowId);
for (const id of ids) this.closeWindow(id);
}
getWindows(): readonly ShellWindow[] { getWindows(): readonly ShellWindow[] {
return this.windows; return this.windows;
} }
@@ -866,7 +880,9 @@ class Shell {
// A foreground window that is playing video holds it off the same way. // A foreground window that is playing video holds it off the same way.
const foreground = this.foregroundWindow(); const foreground = this.foregroundWindow();
if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() || if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() ||
foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.()) { foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.() ||
(foreground?.closeable && !this.config.isLocked?.() &&
appKeepAwakeSetting(foreground.appId).get())) {
this.lastInputAtMs = nowMs; this.lastInputAtMs = nowMs;
return false; return false;
} }
@@ -1073,6 +1089,12 @@ class Shell {
if (this.activeVoiceLayer || !this.stack.isAtBase()) { if (this.activeVoiceLayer || !this.stack.isAtBase()) {
return { shell: true, window: false }; return { shell: true, window: false };
} }
// The switcher owns its menu even when the selected app uses a hold
// for a game move or voice capture.
if (this.focus === "sidebar") {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow(); const window = this.foregroundWindow();
if (!window) { if (!window) {
return { shell: true, window: false }; return { shell: true, window: false };
@@ -1082,10 +1104,6 @@ class Shell {
return { shell: true, window: false }; return { shell: true, window: false };
} }
if (!window.holdToTalk) this.startEscapeMenuTimer(); if (!window.holdToTalk) this.startEscapeMenuTimer();
if (this.focus === "sidebar") {
this.focus = "window";
window.onFocus?.(this.lastInput);
}
// The window owns frameId from here (render or explicit finish). // The window owns frameId from here (render or explicit finish).
await window.handleInput(event, frameId); await window.handleInput(event, frameId);
return { shell: true, window: true }; return { shell: true, window: true };
@@ -1096,6 +1114,10 @@ class Shell {
// first), which answers with its own menu or asks for the system menu // first), which answers with its own menu or asks for the system menu
// when it has none. // when it has none.
if (event.type === "short-then-long-press") { if (event.type === "short-then-long-press") {
if (this.focus === "sidebar" && !this.activeVoiceLayer && this.stack.isAtBase()) {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow(); const window = this.foregroundWindow();
if (window?.holdToTalk) { if (window?.holdToTalk) {
this.openEscapeMenu(); this.openEscapeMenu();
@@ -1913,7 +1935,7 @@ class Shell {
/** /**
* The system/escape menu: the entries every window shares (Focus app * The system/escape menu: the entries every window shares (Focus app
* switcher, Voice input, Brightness, Close window) plus Debug. Shell-owned and * switcher, Voice input, Brightness, Close current app, Close all apps) plus Debug. Shell-owned and
* shell-drawn (never the app's), so an unresponsive app can always be * shell-drawn (never the app's), so an unresponsive app can always be
* closed. It opens for long-press (over the app's own menu too), after an * closed. It opens for long-press (over the app's own menu too), after an
* extended hold in a window that claims long-press, and on a window's * extended hold in a window that claims long-press, and on a window's
@@ -1926,18 +1948,17 @@ class Shell {
const items: MenuItem[] = []; const items: MenuItem[] = [];
if (foreground.closeable) { if (foreground.closeable) {
items.push({ items.push({
label: "Close window", label: "Close current app",
onSelect: (ctx) => { onSelect: (ctx) => {
// Pop the menu first (its onRemoved returns focus to the sidebar), // Pop the menu first (its onRemoved returns focus to the sidebar),
// then close the window the menu was opened over. // then close the window the menu was opened over.
ctx.stack.pop(); ctx.stack.pop();
this.closeForegroundWindow(); this.closeWindow(foreground.windowId);
}, },
}); });
} }
// Close window sits first but the menu opens on Focus app switcher, so a // Prefer closing the current app; pinned windows fall back to the switcher.
// reflexive tap never closes the window. const initialSelection = 0;
const initialSelection = items.length;
items.push( items.push(
{ {
// Defocus the app (hand focus to the sidebar) without closing it: the // Defocus the app (hand focus to the sidebar) without closing it: the
@@ -1959,6 +1980,38 @@ class Shell {
}, },
}]), }]),
); );
items.push({
label: "Close all apps",
disabled: () => !this.windows.some(window => window.closeable),
onSelect: (ctx) => {
ctx.stack.pop();
this.closeAllWindows();
},
});
if (foreground.closeable) {
const fullscreen = appFullscreenSetting(foreground.appId);
items.push({
label: fullscreen.get() ? "Exit full screen" : "Enter full screen",
description: "Use the whole display for this app.",
onSelect: (ctx) => {
ctx.stack.pop();
if (!this.windows.some(window => window.windowId === foreground.windowId)) return;
fullscreen.set(!fullscreen.get());
this.noteUserActivity();
this.config.onWindowLayoutChanged?.();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
});
items.push(toggleSettingMenuItem(appKeepAwakeSetting(foreground.appId), {
onChange: (ctx) => {
ctx.stack.pop();
this.noteUserActivity();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
}));
}
if (brightnessSetting.get() !== "auto") { if (brightnessSetting.get() !== "auto") {
items.push({ items.push({
label: "Brightness", label: "Brightness",
+1 -1
View File
@@ -9,7 +9,7 @@ import type { WorkerAppReply } from "./shell/worker-window";
* The window context menu, opened by tap-then-hold: an app's own menu, * The window context menu, opened by tap-then-hold: an app's own menu,
* holding its app-specific actions. The shell's system menu (long-press) * holding its app-specific actions. The shell's system menu (long-press)
* carries the entries every window shares — Focus app switcher, Voice input, * carries the entries every window shares — Focus app switcher, Voice input,
* Close window — so an app with nothing of its own to offer has no menu of * Close current app, Close all apps — so an app with nothing of its own to offer has no menu of
* its own: tap-then-hold then opens the system menu in its place, so both * its own: tap-then-hold then opens the system menu in its place, so both
* gestures land on the same menu. The system menu is also the safety net: * gestures land on the same menu. The system menu is also the safety net:
* shell-owned, so an unresponsive app can always be closed (a window that * shell-owned, so an unresponsive app can always be closed (a window that
+36
View File
@@ -0,0 +1,36 @@
# Per-app full screen and keep awake
Long-press opens the system menu. Closeable apps offer Enter full screen / Exit
full screen. The choice persists per app through the existing settings store,
independently of global display layout and app-controlled immersive mode.
Full screen fills the 640x480 panel, hides chrome while the app has focus, and
resizes existing in-process and worker windows without restarting the app.
The switcher remains accessible through the system menu.
Stock EvenHub apps retain their logical 576x288 canvas in every host display
mode, including full screen. Content is centered at native pixel scale and
clipped to that canvas; extra space does not change wrapping or layout.
Only an app's explicit Faceclaw extended-layout request enables a taller canvas.
Regression tests compare the complete stock raster against its centered
full-screen placement, including text crossing the logical canvas boundary.
Keep screen awake is a separate On/Off switch immediately after the full-screen
action in the system menu. It defaults off and persists per app independently
of full screen. Existing full-screen preferences remain unchanged and do not
implicitly enable keep awake.
Automatic idle sleep is suspended only while an app with Keep screen awake
enabled is in the foreground, in any display mode. A background app does not
hold the display awake. Full screen alone does not suppress idle sleep.
The lock screen and explicit sleep still work. The inactivity countdown starts
fresh after disabling keep awake or leaving a kept-awake app. Existing automatic
holds for voice capture, assistant turns and video playback remain in effect.
Software regressions cover geometry with every switcher position, preserving
other display settings and persistence after reload, captured menu targets,
exit, independent keep-awake persistence, foreground/background idle behavior,
lock timeout and manual sleep.
On glasses, verify entry/exit from both in-process apps and worker apps,
reflow, state retention, idle timeout, app switching, lock/off-head behavior,
and reconnection. These hardware checks remain pending. No firmware change.
+34
View File
@@ -0,0 +1,34 @@
# App switcher close menu
Feature branch: `feat/app-controls`, based on `main` so it can be
reviewed independently. The combined build lives on `build/all-features`.
With the app switcher focused, long-press or tap-then-hold opens the existing
shell-owned System menu. “Close current app” closes the selected window when it
is closeable. It is absent for the pinned launcher (the large application grid).
“Close all apps” closes every closeable window, including background windows and
multiple windows belonging to one app. Pinned windows remain available.
Both actions reuse the shell's normal close/cleanup path. The menu closes before
the windows do, and focus returns to the switcher. It selects “Close current app” by default when available, otherwise “Focus app switcher”. With no closeable windows, “Close all apps” is disabled.
No new preferences or persistence format are introduced.
Software: `tests/app-switcher-menu.test.cjs` covers both gestures, apps claiming
holds/hold-to-talk, launcher exclusion, captured close targets, cancellation,
default selection, multiple windows, reentrant removal, callback errors and
screen-off behavior. Existing in-app gesture routing remains unchanged.
Manual validation on glasses remains pending:
1. Open several apps, focus the app switcher, and open the menu with both gestures.
2. Close the selected app; verify its surface disappears and other apps remain.
3. Select the large application grid; verify “Close current app” is absent.
4. Use “Close all apps”; verify the launcher remains usable and apps can reopen.
5. Repeat for left/right/bottom/popup switcher positions and with a running game,
a hold-to-talk app and an app exposing multiple windows.
6. Check cancel/back closes nothing; confirming the initial selection closes the current app when available. Check both
menu gestures still work normally when focus is inside an app.
Closing windows retains each app's existing lifecycle semantics; it does not
uninstall apps or reset their preferences. Existing app-specific shutdown behavior
(such as a remote terminal connection) is the same as closing its window normally.
-29
View File
@@ -1,29 +0,0 @@
# Android calendar selection validation
Software: `npm test` and `bash lint.sh` for changed TypeScript files.
`tests/calendar-selection.test.cjs` covers preference reloads, all versus none,
duplicate names/accounts, selection changes with cached readers, deleted IDs,
recurrence occurrences and forwarding the selection to the provider before its
limit. Provider SQL structure is checked statically; the mocked bridge does not
replace an Android CalendarContract integration test.
On an Android device (pending):
1. With no saved preference, compare events with the current release.
2. Open Calendar's window menu > Calendars displayed (also available through
Glanceboard's Calendar widget settings). Select between two equal-named
calendars belonging to different accounts. Check ID/account labels.
3. Create more than 50 early events in an excluded calendar and later recurring
events in a selected calendar. Check those later occurrences still appear.
4. Select “No calendars”: Calendar, Glanceboard and any other readers must be
empty immediately. Restart and confirm the selection persists.
5. Select individual calendars, rename one, then delete one. Remaining selections
must stay unchanged. A missing selected ID is shown as unavailable and may be
removed; it never causes a fallback to all calendars.
6. Select “All calendars”, add a calendar, and check it is included. In individual
mode, newly added calendars stay excluded. Check all-day and timed recurring
events in both Calendar and Glanceboard, including timezone/DST boundaries.
IDs are Android CalendarContract IDs, stable across display-name changes within
an installation. Removing/re-adding an account can create new calendar IDs.
The iOS calendar reader and its behavior are unchanged; iOS selection is deferred.
+4
View File
@@ -267,6 +267,9 @@ function shellEnv({ wakeAction = 'voice-input', skipConfirmation = false } = {})
} }
const voiceDialogs = []; const voiceDialogs = [];
const settings = { wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' }, const settings = { wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' },
appFullscreenSetting: () => ({ get: () => false }),
appKeepAwakeSetting: () => ({ label: 'Keep screen awake', get: () => false }),
toggleSettingMenuItem: setting => ({ label: setting.label }),
assistantSkipConfirmationSetting: { get: () => skipConfirmation } }; assistantSkipConfirmationSetting: { get: () => skipConfirmation } };
const { shell, rawInputEventToInputEvent } = load('app/ui/shell/shell.ts', { const { shell, rawInputEventToInputEvent } = load('app/ui/shell/shell.ts', {
'../../graphics/shell-scene': { encodeShellScene: () => new Uint8Array([0, 0]) }, '../../graphics/shell-scene': { encodeShellScene: () => new Uint8Array([0, 0]) },
@@ -370,6 +373,7 @@ test('ordinary apps retain long-press system menu and games retain the escape ti
assert.deepEqual(env.input, []); assert.deepEqual(env.input, []);
env.shell.stack.clearToBase(); env.shell.stack.clearToBase();
env.app.window.claimsLongPress = () => true; env.app.window.claimsLongPress = () => true;
env.shell.focusWindow('ai-chat');
await env.shell.receiveInput(env.event('long-press')); await env.shell.receiveInput(env.event('long-press'));
assert.notEqual(env.shell.escapeMenuTimer, null); assert.notEqual(env.shell.escapeMenuTimer, null);
await env.shell.receiveInput(env.event('long-press-release')); await env.shell.receiveInput(env.event('long-press-release'));
+21
View File
@@ -15,6 +15,8 @@ function geometry() {
appSwitcherPositionSetting: 'left', uiDepthSetting: '0', statusBarPositionSetting: 'top', appSwitcherPositionSetting: 'left', uiDepthSetting: '0', statusBarPositionSetting: 'top',
statusBarVisibilitySetting: 'always', windowBorderSetting: true, statusBarVisibilitySetting: 'always', windowBorderSetting: true,
}).map(([name, value]) => [name, { value, get() { return this.value; } }])); }).map(([name, value]) => [name, { value, get() { return this.value; } }]));
const fullscreen = new Map();
settings.appFullscreenSetting = id => ({ get: () => fullscreen.get(id) ?? false, set: value => fullscreen.set(id, value) });
const context = { exports: {}, require: (name) => { const context = { exports: {}, require: (name) => {
if (name === '../../graphics/image') return { G2_LENS_WIDTH: 640, G2_LENS_HEIGHT: 480 }; if (name === '../../graphics/image') return { G2_LENS_WIDTH: 640, G2_LENS_HEIGHT: 480 };
assert.equal(name, '../dashboard-settings'); assert.equal(name, '../dashboard-settings');
@@ -27,6 +29,25 @@ function geometry() {
const LAYOUTS = ['band-top', 'band-high', 'band-middle', 'band-low', 'band-bottom', 'tall', 'fullscreen']; const LAYOUTS = ['band-top', 'band-high', 'band-middle', 'band-low', 'band-bottom', 'tall', 'fullscreen'];
test('user full screen spans the panel with any switcher and survives app immersive cleanup', () => {
const g = geometry();
const previous = g.rect('min', 'test');
for (const position of ['left', 'right', 'bottom', 'popup']) {
g.settings.appSwitcherPositionSetting.value = position;
g.settings.appFullscreenSetting('test').set(true);
assert.deepEqual(g.rect('min', 'test'), { x: 0, y: 0, width: 640, height: 480 });
assert.equal(g.sidebarStripVisible('window', 'test'), false);
assert.equal(g.sidebarStripVisible('sidebar', 'test'), true);
g.setAppImmersive('test', true);
g.setAppImmersive('test', false);
assert.equal(g.isImmersive('test'), true);
assert.equal(g.isImmersive('other'), false);
}
g.settings.appSwitcherPositionSetting.value = 'left';
g.settings.appFullscreenSetting('test').set(false);
assert.deepEqual(g.rect('min', 'test'), previous);
});
test('defaults preserve normal windows, EvenHub height and tall terminal sessions', () => { test('defaults preserve normal windows, EvenHub height and tall terminal sessions', () => {
const g = geometry(); const g = geometry();
assert.deepEqual(g.rect('min', 'navigate'), { x: 64, y: 124, width: 576, height: 260 }); assert.deepEqual(g.rect('min', 'navigate'), { x: 64, y: 124, width: 576, height: 260 });
+227
View File
@@ -0,0 +1,227 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const ts = require('typescript');
function fixture(options = {}) {
const source = ts.createSourceFile('shell.ts', fs.readFileSync(path.join(__dirname, '../app/ui/shell/shell.ts'), 'utf8'), ts.ScriptTarget.Latest, true);
const shellClass = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'Shell');
const names = new Set(['routeInput', 'openEscapeMenu', 'closeAllWindows', 'closeWindow', 'removeWindow',
'foregroundWindow', 'noteWindowVisible', 'mostRecentWindowIndex', 'yieldFocusToSidebar', 'applyScreenTimeout']);
const methods = shellClass.members.filter(node => names.has(node.name?.getText(source)));
assert.equal(methods.length, names.size);
const overlay = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'ShellOverlayMenuLayer');
class MenuLayer {
constructor(title, items) { this.title = title; this.items = items; }
selectItem(index) { this.selectedIndex = index; }
}
const fullscreen = new Map();
const keepAwake = new Map();
const context = {
exports: {}, MenuLayer, console: { warn: () => {} },
appViewportRect: () => ({ x: 0, y: 0, width: 576 }), CONTEXT_MENU_DIM: 0.5,
brightnessSetting: { get: () => 'auto' }, gestureHints: () => 'App menu',
GESTURE_SHORT_THEN_LONG_PRESS: 'tap-hold', makeInputEvent: event => event,
isWatchInput: event => event.source === 'watch', isDirectionalInput: () => false,
appFullscreenSetting: id => ({ get: () => fullscreen.get(id) ?? false, set: value => fullscreen.set(id, value) }),
appKeepAwakeSetting: id => ({ label: 'Keep screen awake', get: () => keepAwake.get(id) ?? false, set: value => keepAwake.set(id, value) }),
toggleSettingMenuItem: (setting, options) => ({ label: setting.label, onSelect(ctx) {
setting.set(!setting.get()); options.onChange(ctx);
} }),
};
vm.runInNewContext(ts.transpileModule(`${overlay.getText(source)}\nexport class Shell { ${methods.map(node => node.getText(source)).join('\n')} }`, {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
}).outputText, context);
const s = new context.exports.Shell();
const closed = [], delivered = [], warnings = [], renders = [];
context.console.warn = message => warnings.push(message);
const window = (id, closeable = true, extra = {}) => ({
appId: id, windowId: id, closeable,
handleInput: async event => delivered.push([id, event.type]),
requestRender: () => renders.push(id),
close: () => closed.push(id),
...extra,
});
const launcher = window('launcher', false);
const app = window('current', true, options.app);
const background = window('background');
const layers = [];
s.stack = {
isAtBase: () => !layers.length,
push: layer => layers.push(layer),
pop: () => layers.pop()?.onRemoved?.(),
popIfTop: predicate => { if (!layers.length || !predicate(layers.at(-1))) return false; s.stack.pop(); return true; },
handleInput: async event => { if (event.type === 'double-click') s.stack.pop(); },
};
Object.assign(s, {
windows: [launcher, app, background], selectedIndex: 1, focus: 'sidebar', screenOn: true,
mruWindowIds: ['current', 'background', 'launcher'], attention: new Map(),
config: { voiceInputEnabled: false, requestShellRender() {}, onWindowsChanged() {} },
cancelEscapeMenuTimer() {}, startEscapeMenuTimer() { s.escapeStarted = true; },
lastInput: null,
lastInputAtMs: 0,
noteUserActivity() { this.lastInputAtMs = 100; },
focusWindow(id) { this.selectedIndex = this.windows.findIndex(w => w.windowId === id); this.focus = 'window'; },
sleep() { this.screenOn = false; },
});
const input = type => s.routeInput({ type, source: 'ring', timestampMs: 100 }, 1);
const menu = () => layers.at(-1);
const choose = label => {
const item = menu().items.find(item => item.label === label);
assert.ok(item, label);
item.onSelect({ stack: s.stack });
};
return { s, input, menu, choose, closed, delivered, warnings, renders, launcher, app, background, window, fullscreen, keepAwake };
}
test('full screen targets the captured app without inhibiting idle sleep', async () => {
const h = fixture();
h.s.config.getScreenTimeoutMs = () => 1000;
let relayouts = 0;
h.s.config.onWindowLayoutChanged = () => relayouts++;
await h.input('long-press');
h.s.selectedIndex = 2;
h.choose('Enter full screen');
assert.equal(h.fullscreen.get('current'), true);
assert.equal(h.s.foregroundWindow().windowId, 'current');
assert.equal(h.s.focus, 'window');
assert.equal(relayouts, 1);
assert.equal(h.s.applyScreenTimeout(5000), true);
h.s.screenOn = true;
h.s.focusWindow('current');
await h.input('long-press');
h.choose('Exit full screen');
assert.equal(h.fullscreen.get('current'), false);
assert.equal(relayouts, 2);
assert.equal(h.s.applyScreenTimeout(7000), true);
});
test('keep awake is independent of full screen and applies only to the visible app', async () => {
const h = fixture();
h.s.config.getScreenTimeoutMs = () => 1000;
await h.input('long-press');
const labels = h.menu().items.map(item => item.label);
assert.equal(labels.indexOf('Keep screen awake'), labels.indexOf('Enter full screen') + 1);
h.s.selectedIndex = 2;
h.choose('Keep screen awake');
assert.equal(h.keepAwake.get('current'), true);
assert.equal(h.fullscreen.get('current'), undefined);
assert.equal(h.s.foregroundWindow().windowId, 'current');
assert.equal(h.s.applyScreenTimeout(5000), false);
h.s.focusWindow('background');
assert.equal(h.s.applyScreenTimeout(5500), false);
assert.equal(h.s.applyScreenTimeout(6000), true);
h.s.screenOn = true;
h.s.focusWindow('current');
await h.input('long-press'); h.choose('Enter full screen');
assert.equal(h.s.applyScreenTimeout(7000), false);
await h.input('long-press'); h.choose('Exit full screen');
assert.equal(h.keepAwake.get('current'), true);
assert.equal(h.s.applyScreenTimeout(8000), false);
await h.input('long-press'); h.choose('Keep screen awake');
assert.equal(h.keepAwake.get('current'), false);
assert.equal(h.s.applyScreenTimeout(9000), true);
});
test('keep awake does not suppress lock timeout or manual sleep, and options are absent for the launcher', async () => {
const h = fixture();
h.fullscreen.set('current', true);
h.keepAwake.set('current', true);
h.s.config.getScreenTimeoutMs = () => 1000;
h.s.config.isLocked = () => true;
assert.equal(h.s.applyScreenTimeout(5000), true);
h.s.screenOn = true;
h.s.config.isLocked = () => false;
h.s.sleep();
assert.equal(h.s.screenOn, false);
h.s.screenOn = true;
h.s.selectedIndex = 0;
await h.input('long-press');
assert.ok(!h.menu().items.some(item => /full screen/.test(item.label)));
assert.ok(!h.menu().items.some(item => item.label === 'Keep screen awake'));
});
test('switcher opens its menu on hold or tap-hold even for an app claiming holds or hold-to-talk', async () => {
for (const type of ['long-press', 'short-then-long-press']) {
for (const app of [{}, { claimsLongPress: () => true }, { holdToTalk: true }]) {
const h = fixture({ app });
await h.input(type);
assert.ok(h.menu());
assert.ok(h.menu().items.some(item => item.label === 'Close current app'));
assert.ok(h.menu().items.some(item => item.label === 'Close all apps'));
assert.equal(h.menu().items[h.menu().selectedIndex].label, 'Close current app');
assert.deepEqual(h.delivered, [['current', 'system-menu-opened']]);
assert.equal(h.s.escapeStarted, undefined);
assert.equal(h.s.focus, 'sidebar');
}
}
});
test('close current app closes the captured window and preserves the launcher and background windows', async () => {
const h = fixture();
await h.input('long-press');
h.s.selectedIndex = 2; // An asynchronous focus change must not redirect the close action.
h.menu().items[h.menu().selectedIndex].onSelect({ stack: h.s.stack });
assert.deepEqual(h.closed, ['current']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher', 'background']);
assert.equal(h.s.focus, 'sidebar');
assert.equal(h.menu(), undefined);
});
test('launcher offers close all but never close current; close all leaves only the launcher', async () => {
const h = fixture();
h.s.selectedIndex = 0;
await h.input('short-then-long-press');
assert.ok(!h.menu().items.some(item => item.label === 'Close current app'));
assert.equal(h.menu().items[h.menu().selectedIndex].label, 'Focus app switcher');
h.choose('Close all apps');
assert.deepEqual(h.closed, ['current', 'background']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher']);
assert.equal(h.s.selectedIndex, 0);
assert.equal(h.s.focus, 'sidebar');
await h.input('long-press');
assert.equal(h.menu().items.find(item => item.label === 'Close all apps').disabled(), true);
});
test('close all uses normal cleanup despite reentrant removal, multiple windows per app and throwing callbacks', () => {
const h = fixture();
h.s.windows.push(h.window('another', true, { appId: 'current' }), h.window('pinned', false));
h.app.close = () => { h.closed.push('current'); h.s.removeWindow('current'); };
h.background.close = () => { h.closed.push('background'); throw new Error('failed cleanup'); };
h.s.closeAllWindows();
assert.deepEqual(h.closed, ['current', 'background', 'another']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher', 'pinned']);
assert.equal(h.warnings.length, 1);
assert.equal(h.s.foregroundWindow().windowId, 'launcher');
});
test('focusing switcher and cancelling do not close apps; an open overlay never receives a second menu', async () => {
const h = fixture();
await h.input('long-press');
h.choose('Focus app switcher');
assert.deepEqual(h.closed, []);
await h.input('long-press');
const menu = h.menu();
await h.input('long-press');
assert.equal(h.menu(), menu);
await h.input('double-click');
assert.equal(h.menu(), undefined);
assert.deepEqual(h.closed, []);
});
test('in-app hold actions and app menus keep their existing routing; asleep switcher stays asleep', async () => {
for (const [app, type] of [[{ claimsLongPress: () => true }, 'long-press'], [{ holdToTalk: true }, 'long-press'], [{}, 'short-then-long-press']]) {
const h = fixture({ app });
h.s.focus = 'window';
await h.input(type);
assert.deepEqual(h.delivered, [['current', type]]);
assert.equal(h.menu(), undefined);
}
const h = fixture();
h.s.screenOn = false;
await h.input('long-press');
assert.equal(h.menu(), undefined);
assert.deepEqual(h.closed, []);
});
+8 -2
View File
@@ -39,6 +39,9 @@ const menu = load('app/ui/menu.ts', {
function fixture(initial = '50', viewport = { x: 64, y: 124, width: 576, height: 260 }) { function fixture(initial = '50', viewport = { x: 64, y: 124, width: 576, height: 260 }) {
let value = initial, writes = 0, closed = 0; let value = initial, writes = 0, closed = 0;
const settings = { const settings = {
appFullscreenSetting: () => ({ get: () => false }),
appKeepAwakeSetting: () => ({ label: 'Keep screen awake', get: () => false }),
toggleSettingMenuItem: setting => ({ label: setting.label }),
brightnessSetting: { get: () => value, set: (next) => { value = next; writes++; } }, brightnessSetting: { get: () => value, set: (next) => { value = next; writes++; } },
brightnessSettingToLevel: (value) => value === 'auto' ? null : Number(value), brightnessSettingToLevel: (value) => value === 'auto' ? null : Number(value),
}; };
@@ -120,13 +123,16 @@ test('system menu hides brightness in Auto and opens its picker between Voice in
shell.openSystemMenu('test'); shell.openSystemMenu('test');
let opened = shell.stack.layers.at(-1); let opened = shell.stack.layers.at(-1);
assert.deepEqual(Array.from(opened.items, (item) => item.label), assert.deepEqual(Array.from(opened.items, (item) => item.label),
['Close window', 'Focus app switcher', 'Voice input', 'Debug']); ['Close current app', 'Focus app switcher', 'Voice input', 'Close all apps', 'Enter full screen', 'Keep screen awake', 'Debug']);
shell.stack.clearToBase(); shell.stack.clearToBase();
f.settings.brightnessSetting.set('40'); f.settings.brightnessSetting.set('40');
shell.openSystemMenu('test'); shell.openSystemMenu('test');
opened = shell.stack.layers.at(-1); opened = shell.stack.layers.at(-1);
assert.deepEqual(Array.from(opened.items, (item) => item.label), assert.deepEqual(Array.from(opened.items, (item) => item.label),
['Close window', 'Focus app switcher', 'Voice input', 'Brightness', 'Debug']); ['Close current app', 'Focus app switcher', 'Voice input', 'Close all apps', 'Enter full screen', 'Keep screen awake', 'Brightness', 'Debug']);
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'click', source: 'ring' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'click', source: 'ring' }));
-150
View File
@@ -1,150 +0,0 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const ts = require('typescript');
const source = file => fs.readFileSync(path.join(__dirname, '..', file), 'utf8');
function load(file, modules, globals = {}) {
const context = { exports: {}, require: name => {
assert.ok(name in modules, `Unexpected import ${name}`);
return modules[name];
}, ...globals };
vm.runInNewContext(ts.transpileModule(source(file), {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
}).outputText, context);
return context.exports;
}
function fixture(settings = new Map()) {
const listeners = new Set();
const storage = {
getStringSetting: (key, fallback) => settings.get(key) ?? fallback,
setStringSetting: (key, value) => { settings.set(key, value); for (const fn of listeners) fn(key); },
onSettingsStoreChanged: fn => { listeners.add(fn); return () => listeners.delete(fn); },
};
const prefs = load('app/native/calendar-selection.ts', { './settings-store': storage });
let permitted = true;
const calls = [];
const calendars = [
{ id: '1', name: 'Work', accountName: 'one@example.com', accountType: 'google' },
{ id: '2', name: 'Work', accountName: 'two@example.com', accountType: 'google' },
];
const events = [
{ id: 1, calendarId: '1', startMs: 10000, endMs: 20000, title: 'Excluded early' },
{ id: 9, calendarId: '2', startMs: 30000, endMs: 40000, title: 'Recurrence one' },
{ id: 9, calendarId: '2', startMs: 50000, endMs: 60000, title: 'Recurrence two' },
];
const modules = {
'@nativescript/core': { Utils: { android: { getApplicationContext: () => ({}) } } },
'../g2/android-permissions': { hasCalendarPermission: () => permitted },
'./calendar-permissions': { hasCalendarPermission: () => permitted },
'./frame-timings': { spanCurrent: (_name, fn) => fn() },
'./calendar-selection': prefs,
'./settings-store': storage,
};
const globals = { global: { isAndroid: true }, com: { faceclaw: { app: { FaceclawCalendarProvider: {
getCalendarsJson: () => JSON.stringify(calendars),
getUpcomingEventsJson: (_ctx, max, window, selection) => {
calls.push({ max, window, selection });
const ids = JSON.parse(selection);
return JSON.stringify(events.filter(event => ids === null || ids.includes(event.calendarId)).slice(0, max));
},
} } } } };
const api = load('app/native/calendar.ts', modules, globals);
const sources = load('app/native/calendar-sources.ts', modules, globals);
return { api, prefs, sources, modules, globals, settings, calls, calendars,
permissions: value => { permitted = value; } };
}
test('calendar selection distinguishes all and none, survives restart and rejects invalid data', () => {
const f = fixture();
assert.equal(f.prefs.readCalendarSelection(), null);
f.prefs.setCalendarSelection([]);
assert.deepEqual(Array.from(fixture(f.settings).prefs.readCalendarSelection()), []);
f.prefs.setCalendarSelection(['2', '2', '1']);
assert.deepEqual(Array.from(fixture(f.settings).prefs.readCalendarSelection()), ['2', '1']);
f.prefs.setCalendarSelection(null);
assert.equal(fixture(f.settings).prefs.readCalendarSelection(), null);
assert.throws(() => f.prefs.setCalendarSelection(['1 OR 1=1']));
for (const value of ['oops', '{}', '[false]', '["bad"]']) {
f.settings.set(f.prefs.CALENDAR_SELECTION_KEY, value);
assert.equal(f.prefs.readCalendarSelection(), null);
}
});
test('shared reader forwards IDs before limiting, preserves recurrence occurrences and invalidates all cached query variants', async () => {
const f = fixture();
assert.equal(f.api.readUpcomingEvents(1)[0].title, 'Excluded early');
f.api.readUpcomingEvents(1);
assert.equal(f.calls.length, 1);
let notifications = 0;
const off = f.api.onCalendarChanged(() => notifications++);
f.prefs.setCalendarSelection(['2']);
const rows = f.api.readUpcomingEvents(2);
assert.deepEqual(Array.from(rows, event => event.id), [9, 9]);
assert.equal(f.calls.at(-1).selection, '["2"]');
assert.equal(notifications, 1);
assert.equal((await f.api.readUpcomingEventsAsync(1))[0].title, 'Recurrence one');
off();
f.prefs.setCalendarSelection([]);
assert.equal(notifications, 1);
assert.equal(f.api.readUpcomingEvents(1).length, 0, 'selection cache key works even without subscriptions');
assert.equal(fixture(f.settings).api.readUpcomingEvents().length, 0);
f.prefs.setCalendarSelection(['999']);
assert.equal(f.api.readUpcomingEvents().length, 0, 'deleted calendar does not revert to all');
f.permissions(false);
assert.equal(f.api.readUpcomingEvents().length, 0);
assert.equal(f.sources.readAvailableCalendars().length, 0);
});
test('calendar menu distinguishes equal names by account and ID; all, none, deleted and individual selections share preferences', () => {
const f = fixture();
const { CalendarFilterLayer } = load('app/apps/calendar/calendar-filter.ts', {
'../../graphics/ui-fonts': { getDefaultSmallFont: () => ({}) },
'../../graphics/textwrap': { truncateText: (_font, text) => text },
'../../native/calendar-selection': f.prefs,
'../../native/calendar-sources': f.sources,
'../../native/calendar-permissions': { hasCalendarPermission: () => true },
'../../ui/menu': {
drawToggleMenuItem: () => {},
MenuLayer: class {
constructor(_title, items) { this.items = items; this.selectedIndex = 0; }
selectItem(index) { this.selectedIndex = index; return this; }
setItems(items, index) { this.items = items; this.selectedIndex = index; }
paint() { return this.items; }
},
},
}, f.globals);
const layer = new CalendarFilterLayer();
const ctx = { stack: { getBaseSize: () => ({ width: 576 }) } };
const rows = () => layer.paint(ctx, () => {});
assert.ok(rows()[2].label.includes('one@example.com'));
assert.ok(rows()[3].label.includes('two@example.com'));
rows()[2].onSelect();
assert.deepEqual(Array.from(f.prefs.readCalendarSelection()), ['2']);
rows()[1].onSelect();
assert.equal(f.api.readUpcomingEvents().length, 0);
rows()[3].onSelect();
assert.deepEqual(Array.from(f.prefs.readCalendarSelection()), ['2']);
f.calendars.pop();
const missing = rows().find(row => row.label === 'Unavailable calendar #2');
assert.ok(missing);
missing.onSelect();
assert.equal(f.prefs.readCalendarSelection().length, 0);
rows()[0].onSelect();
assert.equal(f.prefs.readCalendarSelection(), null);
});
test('Android provider restricts Instances with bound calendar IDs before cutoff and limit', () => {
const kotlin = source('App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawCalendarProvider.kt');
assert.match(kotlin, /Instances\.CALENDAR_ID/);
assert.match(kotlin, /if \(ids != null && ids.length\(\) == 0\) return "\[\]"/);
assert.match(kotlin, /PROJECTION,\s+selection,\s+args,/);
assert.ok(kotlin.indexOf('selection,\n args,') < kotlin.indexOf('events.take(limit)'));
assert.match(kotlin, /CalendarContract\.Calendars\._ID/);
assert.match(kotlin, /CalendarContract\.Calendars\.ACCOUNT_NAME/);
for (const file of ['app/apps/calendar/calendar.ts', 'app/apps/glanceboard/widgets/calendar-widget.ts']) {
assert.match(source(file), /readUpcomingEvents/);
assert.match(source(file), /native\/calendar"/);
}
});
+29
View File
@@ -64,3 +64,32 @@ test('Full Screen is offered only with a bottom or popup app switcher', () => {
assert.deepEqual(Array.from(api.DISPLAY_LAYOUT_VALUES, (value) => api.displayLayoutLabel(value)), assert.deepEqual(Array.from(api.DISPLAY_LAYOUT_VALUES, (value) => api.displayLayoutLabel(value)),
['Band · Top', 'Band · High', 'Band · Middle', 'Band · Low', 'Band · Bottom', 'Tall', 'Full Screen']); ['Band · Top', 'Band · High', 'Band · Middle', 'Band · Low', 'Band · Bottom', 'Tall', 'Full Screen']);
}); });
test('per-app full screen defaults off, persists across restart and preserves display preferences', () => {
const store = new Map([['display.layout', 'band-low'], ['terminal.displayLayout', 'tall']]);
const prefs = settingsFixture(store);
assert.equal(prefs.appFullscreenSetting('terminal').get(), false);
prefs.appFullscreenSetting('terminal').set(true);
const restarted = settingsFixture(store);
assert.equal(restarted.appFullscreenSetting('terminal').get(), true);
assert.equal(restarted.appFullscreenSetting('other').get(), false);
restarted.appFullscreenSetting('terminal').set(false);
assert.equal(restarted.displayLayoutSetting.get(), 'band-low');
assert.equal(store.get('terminal.displayLayout'), 'tall');
});
test('keep awake persists per app independently of full screen, including existing full-screen choices', () => {
const store = new Map([['display.fullscreen.terminal', true]]);
let prefs = settingsFixture(store);
assert.equal(prefs.appFullscreenSetting('terminal').get(), true);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), false);
prefs.appKeepAwakeSetting('terminal').set(true);
prefs = settingsFixture(store);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), true);
assert.equal(prefs.appKeepAwakeSetting('other').get(), false);
prefs.appFullscreenSetting('terminal').set(false);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), true);
prefs.appKeepAwakeSetting('terminal').set(false);
prefs = settingsFixture(store);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), false);
});
+81
View File
@@ -0,0 +1,81 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const { loader } = require('./helpers/load-typescript.cjs');
const { GrayImage } = require('../.test-build/app/graphics/image.js');
function fixture() {
let options, hooks;
const paints = [], heights = [];
const session = {
manifest: { name: 'Test', packageId: 'test.app' },
renderWindowIcon() {}, contextMenuItems: () => [], keepsScreenOn: () => false,
attachWindow(value) { hooks = value; },
paint(size, focused) {
paints.push({ ...size, focused });
const image = new GrayImage(size.width, size.height);
image.setPixel(0, 0, 255);
image.setPixel(size.width - 1, size.height - 1, 120);
// Deliberately overflow a deferred text run: stock clips it at 576x288.
image.drawFwText({ bakeFwTextRun(target, run, dx, dy) {
target.fillRect(run.x + dx, run.y + dy, 20, 20, run.value);
} }, 570, 280, 200, [{}]);
return image;
},
};
const load = loader({}, {
'../../graphics/image': { GrayImage },
'./compositor': { EVENHUB_SCREEN_WIDTH: 576, EVENHUB_SCREEN_HEIGHT: 288 },
'../../ui/gestures': {}, '../../ui/shell/shell': { shell: {} }, './session': {},
'../../ui/shell/chrome-layer': { windowIcon: () => () => null, makeImageWindowIcon: () => () => null },
'./installed-apps': {},
'../../ui/shell/in-process-window': { createInProcessWindow(value) {
options = value;
return { window: {}, stack: {}, requestRender() {}, setHeightMode(mode) { heights.push(mode); } };
} },
});
load('app/apps/evenhub/evenhub-window.ts').createEvenHubWindow('test', 'test', session, {}, () => {}, () => {});
return { paints, heights, hooks: () => hooks,
paint(width, height, focused = true) {
return options.baseLayer.paint({ stack: { getBaseSize: () => ({ width, height }), isFocused: () => focused } });
},
};
}
test('stock EvenHub canvas remains 576x288 through full-screen entry, resize and exit', () => {
const f = fixture();
for (const [width, height] of [[576, 288], [640, 480], [576, 452], [640, 480], [576, 288]]) {
const image = f.paint(width, height);
assert.deepEqual(f.paints.at(-1), { width: 576, height: 288, focused: true });
assert.equal(image.width, width);
assert.equal(image.height, height);
}
});
test('full screen centers stock pixels at native scale and clips overflowing text to the stock canvas', () => {
const f = fixture();
const stock = f.paint(576, 288).withDrawsBaked();
const full = f.paint(640, 480).withDrawsBaked();
for (let y = 0; y < 480; y++) {
for (let x = 0; x < 640; x++) {
const expected = x >= 32 && x < 608 && y >= 96 && y < 384 ? stock.getPixel(x - 32, y - 96) : 0;
assert.equal(full.getPixel(x, y), expected);
}
}
});
test('only an explicit extended-layout request opts into the taller canvas', () => {
const f = fixture();
f.paint(640, 480, false);
assert.deepEqual(f.paints.at(-1), { width: 576, height: 288, focused: false });
f.hooks().setTallCanvas(true);
assert.deepEqual(f.heights, ['max']);
f.paint(576, 452);
assert.equal(f.paints.at(-1).height, 452);
f.paint(640, 480);
assert.equal(f.paints.at(-1).width, 576);
assert.equal(f.paints.at(-1).height, 480);
f.hooks().setTallCanvas(false);
f.paint(640, 480);
assert.deepEqual(f.heights, ['max', 'medium']);
assert.equal(f.paints.at(-1).height, 288);
});
-1
View File
@@ -199,7 +199,6 @@ test('Calendar window subscribes, refreshes periodically, and cleans up on close
'../../native/calendar': { onCalendarChanged: fn => { listener = fn; return () => unsubscribed++; } }, '../../native/calendar': { onCalendarChanged: fn => { listener = fn; return () => unsubscribed++; } },
'../../ui/shell/chrome-layer': { makeImageWindowIcon() {}, windowIcon() {} }, '../../ui/shell/chrome-layer': { makeImageWindowIcon() {}, windowIcon() {} },
'./calendar': { CalendarLayer: class {} }, './calendar-icon': {}, './calendar': { CalendarLayer: class {} }, './calendar-icon': {},
'./calendar-filter': { calendarSelectionMenuItems: () => [] },
'../../ui/shell/in-process-window': { YieldAtRootLayer: class {}, createInProcessWindow: value => { options = value; return app; } }, '../../ui/shell/in-process-window': { YieldAtRootLayer: class {}, createInProcessWindow: value => { options = value; return app; } },
}, { setInterval: fn => { tick = fn; return 1; }, clearInterval: () => cleared++ }); }, { setInterval: fn => { tick = fn; return 1; }, clearInterval: () => cleared++ });
createCalendarAppWindow({ onClosed: () => closed++ }); createCalendarAppWindow({ onClosed: () => closed++ });