mirror of
https://git.undefined-dev.fr/Blendman974/faceclaw.git
synced 2026-11-20 05:03:09 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bac1c8a239
|
No files matched your search
@@ -1,3 +0,0 @@
|
||||
watch_file devenv.nix devenv.yaml devenv.lock
|
||||
eval "$(devenv direnvrc)"
|
||||
use devenv
|
||||
@@ -49,11 +49,6 @@ faceclaw_settings.xml
|
||||
faceclaw_settings*.json
|
||||
|
||||
# Developer configs
|
||||
.devenv*
|
||||
.direnv/
|
||||
.android/
|
||||
devenv.local.nix
|
||||
local.properties
|
||||
build_paths.sh
|
||||
**/xcuserdata/
|
||||
|
||||
|
||||
@@ -162,14 +162,6 @@ tasks.register("prepareFaceclawNativeLibs") {
|
||||
def faceclawLlamaCppTag = "b10333"
|
||||
|
||||
def faceclawFindSdkCmakeDir = {
|
||||
// NixOS and other managed environments can provide patched host tools.
|
||||
def explicitCmake = System.getenv("ANDROID_CMAKE_HOME")
|
||||
if (explicitCmake != null) {
|
||||
def explicitDir = file(explicitCmake)
|
||||
if (faceclawHostExecutable(file("$explicitDir/bin"), "cmake").exists()
|
||||
&& faceclawHostExecutable(file("$explicitDir/bin"), "ninja").exists()) return explicitDir
|
||||
throw new GradleException("ANDROID_CMAKE_HOME must contain bin/cmake and bin/ninja: $explicitDir")
|
||||
}
|
||||
def sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
|
||||
if (sdkRoot == null) return null
|
||||
def cmakeRoot = file("$sdkRoot/cmake")
|
||||
|
||||
@@ -601,6 +601,14 @@ export function getBrightnessPreferences() {
|
||||
curve: autoBrightnessCurveSetting.getValidValue(), fadeMs: scaleAnimationDuration(SCREEN_FADE_MS, screenFadeSetting.get()) };
|
||||
}
|
||||
|
||||
export const swapMenuGesturesSetting = new ConfigSettingBoolean({
|
||||
id: "swap-menu-gestures",
|
||||
label: "Long press for app menu",
|
||||
storageKey: "input.swapMenuGestures",
|
||||
defaultValue: false,
|
||||
description: "Use long press for the app menu and tap then hold for the system menu. Apps using long press for a game action or voice capture keep their gestures. The app switcher keeps its system menu gestures.",
|
||||
});
|
||||
|
||||
export const wakeToLastAppSetting = new ConfigSettingBoolean({
|
||||
id: "wake-to-last-app",
|
||||
label: "Wake into last app",
|
||||
|
||||
@@ -89,6 +89,7 @@ import {
|
||||
voiceProviderSetting,
|
||||
screenTimeoutSetting,
|
||||
wakeToLastAppSetting,
|
||||
swapMenuGesturesSetting,
|
||||
wakeWordActionSetting,
|
||||
watchCanUnlockSetting,
|
||||
watchCrownClockwiseNextSetting,
|
||||
@@ -125,6 +126,7 @@ function settingsSections(): SettingsSection[] {
|
||||
}),
|
||||
toggleSettingMenuItem(lockScreenEnabledSetting),
|
||||
toggleSettingMenuItem(wakeToLastAppSetting),
|
||||
toggleSettingMenuItem(swapMenuGesturesSetting),
|
||||
// A band (at one of five heights) / Tall / Full Screen; the
|
||||
// dashboard controller moves or reflows windows on change.
|
||||
enumSettingMenuItem(displayLayoutSetting),
|
||||
|
||||
+17
-6
@@ -9,6 +9,7 @@ import {
|
||||
directionalFallback,
|
||||
type DirectionalInputEvent,
|
||||
GESTURE_SHORT_THEN_LONG_PRESS,
|
||||
GESTURE_LONG_PRESS,
|
||||
gestureHints,
|
||||
InputEvent,
|
||||
type InputEventPayload,
|
||||
@@ -52,6 +53,7 @@ import {
|
||||
timeFormatSetting,
|
||||
wakeWordActionSetting,
|
||||
wakeToLastAppSetting,
|
||||
swapMenuGesturesSetting,
|
||||
windowBorderSetting,
|
||||
} from "../dashboard-settings";
|
||||
import { onAmbientCardsChanged } from "./ambient-cards";
|
||||
@@ -1061,7 +1063,15 @@ class Shell {
|
||||
return { shell: false, window: false };
|
||||
}
|
||||
|
||||
// Long-press is the shell's own gesture: it opens the system menu
|
||||
// Remap menu intent only. Apps still receive the canonical context-menu
|
||||
// event, while owned holds (games / voice) retain their raw input.
|
||||
const menuWindow = this.foregroundWindow();
|
||||
const swapMenus = this.focus === "window" && swapMenuGesturesSetting.get() &&
|
||||
!menuWindow?.holdToTalk && !menuWindow?.claimsLongPress?.();
|
||||
const systemMenuGesture = swapMenus ? "short-then-long-press" : "long-press";
|
||||
const appMenuGesture = swapMenus ? "long-press" : "short-then-long-press";
|
||||
|
||||
// The resolved system gesture opens the shell's own menu
|
||||
// directly, never reaching the app — over the app's own context menu
|
||||
// too (the window closes that on system-menu-opened), while an already
|
||||
// open system menu just stays. Its later generic release is consumed
|
||||
@@ -1069,7 +1079,7 @@ class Shell {
|
||||
// app. The exception is a window that claims long-press for a move of
|
||||
// its own: it gets the press forwarded, with the escape timer running
|
||||
// so that holding the press long enough still opens the system menu.
|
||||
if (event.type === "long-press") {
|
||||
if (event.type === systemMenuGesture) {
|
||||
if (this.activeVoiceLayer || !this.stack.isAtBase()) {
|
||||
return { shell: true, window: false };
|
||||
}
|
||||
@@ -1091,11 +1101,11 @@ class Shell {
|
||||
return { shell: true, window: true };
|
||||
}
|
||||
|
||||
// The 2.2.9 tap-then-hold gesture is the app's context-menu gesture: it
|
||||
// The resolved app-menu gesture is delivered as tap-then-hold: it
|
||||
// goes to the foreground window (from the sidebar it focuses the window
|
||||
// first), which answers with its own menu or asks for the system menu
|
||||
// when it has none.
|
||||
if (event.type === "short-then-long-press") {
|
||||
if (event.type === appMenuGesture) {
|
||||
const window = this.foregroundWindow();
|
||||
if (window?.holdToTalk) {
|
||||
this.openEscapeMenu();
|
||||
@@ -1123,7 +1133,7 @@ class Shell {
|
||||
window.onFocus?.(this.lastInput);
|
||||
}
|
||||
// The window owns frameId from here (render or explicit finish).
|
||||
await window.handleInput(event, frameId);
|
||||
await window.handleInput(swapMenus ? { ...event, type: "short-then-long-press" } : event, frameId);
|
||||
return { shell: true, window: true };
|
||||
}
|
||||
if (event.type === "long-press-release") {
|
||||
@@ -1980,7 +1990,8 @@ class Shell {
|
||||
// when the app has one (otherwise it opens this very menu, not worth a
|
||||
// hint).
|
||||
const footer = foreground.hasAppMenu?.()
|
||||
? (foreground.holdToTalk ? undefined : gestureHints([[GESTURE_SHORT_THEN_LONG_PRESS, "app menu"]]))
|
||||
? (foreground.holdToTalk ? undefined : gestureHints([[this.focus === "window" && swapMenuGesturesSetting.get() && !foreground.claimsLongPress?.()
|
||||
? GESTURE_LONG_PRESS : GESTURE_SHORT_THEN_LONG_PRESS, "app menu"]]))
|
||||
: undefined;
|
||||
const layer = new ShellOverlayMenuLayer(items, footer, () => this.yieldFocusToSidebar());
|
||||
layer.selectItem(initialSelection);
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { swapMenuGesturesSetting } from "./dashboard-settings";
|
||||
import { GrayImage } from "../graphics/image";
|
||||
import { singlePlane, type Plane } from "../graphics/plane";
|
||||
import { GESTURE_LONG_PRESS, GESTURE_SHORT_THEN_LONG_PRESS, gestureHints, type InputEvent } from "./gestures";
|
||||
@@ -6,8 +7,9 @@ import { CONTEXT_MENU_DIM, MenuLayer, type MenuItem, type MenuLayout } from "./m
|
||||
import type { WorkerAppReply } from "./shell/worker-window";
|
||||
|
||||
/**
|
||||
* 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)
|
||||
* The window context menu, opened by tap-then-hold by default: an app's own menu,
|
||||
* holding its app-specific actions. The menu gesture preference can swap
|
||||
* these bindings unless the app owns long-press. The shell's system menu
|
||||
* 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
|
||||
* its own: tap-then-hold then opens the system menu in its place, so both
|
||||
@@ -28,8 +30,8 @@ export const WINDOW_MENU_LAYOUT: MenuLayout = {
|
||||
};
|
||||
|
||||
export class WindowMenuLayer extends MenuLayer {
|
||||
constructor(title: string | null, items: MenuItem[], holdToTalk = false) {
|
||||
super(title, items, holdToTalk
|
||||
constructor(title: string | null, items: MenuItem[], holdToTalk = false, claimsLongPress = false) {
|
||||
super(title, items, (holdToTalk || (swapMenuGesturesSetting.get() && !claimsLongPress))
|
||||
? { ...WINDOW_MENU_LAYOUT, footer: gestureHints([[GESTURE_SHORT_THEN_LONG_PRESS, "system menu"]]) }
|
||||
: WINDOW_MENU_LAYOUT);
|
||||
}
|
||||
@@ -123,7 +125,7 @@ export class WindowMenu {
|
||||
handleInput: () => {},
|
||||
};
|
||||
const stack = new LayerStack(base, this.layerActions(), this.options.size, this.options.isFocused);
|
||||
const layer = new WindowMenuLayer(title, items);
|
||||
const layer = new WindowMenuLayer(title, items, false, this.options.claimsLongPress?.() ?? false);
|
||||
if (selectedIndex !== undefined) layer.selectItem(selectedIndex);
|
||||
stack.push(layer);
|
||||
this.stack = stack;
|
||||
|
||||
-65
@@ -1,65 +0,0 @@
|
||||
{
|
||||
"nodes": {
|
||||
"devenv": {
|
||||
"locked": {
|
||||
"dir": "src/modules",
|
||||
"lastModified": 1793731702,
|
||||
"narHash": "sha256-WlVNaWXVTYaGBNey2Z+20sY1lT7BvzJEECb+VlDDdk0=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "9655d320b8f9df74dbecf681f52a7334574606c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "src/modules",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"inputs": {
|
||||
"nixpkgs-src": "nixpkgs-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1793043970,
|
||||
"narHash": "sha256-m14odYTdkBUEkJOiEYs2zjGjn8fcjvdCJsm45+k084U=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv-nixpkgs",
|
||||
"rev": "d97234e58d4e90e3bf77c082fc3b546e51200938",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"ref": "rolling",
|
||||
"repo": "devenv-nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1792812153,
|
||||
"narHash": "sha256-T2+XBfNbf9pecLUWS4+RtuVNZ3W8K5taG5QdV71mWlk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "674a2028661e550a97400c1cc992b9cca9a668a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"devenv": "devenv",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
-42
@@ -1,42 +0,0 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
languages.javascript = {
|
||||
enable = true;
|
||||
package = pkgs.nodejs_22;
|
||||
};
|
||||
languages.java = {
|
||||
enable = true;
|
||||
jdk.package = pkgs.jdk21;
|
||||
lsp.enable = false;
|
||||
};
|
||||
android = {
|
||||
enable = true;
|
||||
platforms.version = [ "35" ];
|
||||
buildTools.version = [ "34.0.0" "35.0.0" "35.0.1" ];
|
||||
ndk.enable = true;
|
||||
ndk.version = [ "27.2.12479018" ];
|
||||
cmake.version = [ ];
|
||||
emulator.enable = false;
|
||||
systemImages.enable = false;
|
||||
sources.enable = false;
|
||||
};
|
||||
packages = with pkgs; [ git gh curl jq ripgrep python3 pkg-config gnumake gcc unzip zip ];
|
||||
# Gradle's downloaded aapt2 cannot run directly on NixOS.
|
||||
# Keep API 35 aapt2 for phone builds even with Wear's older tools installed.
|
||||
env.GRADLE_OPTS = lib.mkForce "-Dorg.gradle.project.android.aapt2FromMavenOverride=${config.env.ANDROID_HOME}/build-tools/35.0.0/aapt2";
|
||||
# NativeScript's doctor rejects a valid build-only SDK without an emulator.
|
||||
# enterTest below checks the actual tools used by our local builds.
|
||||
env.NS_SKIP_ENV_CHECK = "1";
|
||||
env.ANDROID_CMAKE_HOME = "${pkgs.symlinkJoin {
|
||||
name = "faceclaw-cmake";
|
||||
paths = [ pkgs.cmake pkgs.ninja ];
|
||||
}}";
|
||||
scripts.faceclaw-setup.exec = "npm ci";
|
||||
scripts.faceclaw-test.exec = "npm test";
|
||||
enterShell = ''
|
||||
export PATH="$DEVENV_ROOT/node_modules/.bin:$PATH"
|
||||
'';
|
||||
enterTest = ''
|
||||
bash "$DEVENV_ROOT/scripts/check-devenv.sh"
|
||||
'';
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
inputs:
|
||||
nixpkgs:
|
||||
url: github:cachix/devenv-nixpkgs/rolling
|
||||
nixpkgs:
|
||||
allow_unfree: true
|
||||
android_sdk:
|
||||
accept_license: true
|
||||
@@ -1,29 +0,0 @@
|
||||
# Nix development environment
|
||||
|
||||
Install Nix with flakes and devenv, then run `devenv shell` in this directory
|
||||
(or `nix run nixpkgs#devenv -- shell`). With direnv, `direnv allow` loads `.envrc`.
|
||||
The committed `devenv.lock` pins the environment inputs.
|
||||
|
||||
The environment provides Node 22/npm, Java 21, Android SDK/platform 35,
|
||||
build-tools 34.0.0 (Wear OS) and 35.0.0/35.0.1 (phone and NativeScript plugins), NDK 27, CMake,
|
||||
Git/GitHub CLI, Python and build utilities. `ANDROID_CMAKE_HOME` selects the
|
||||
Nix-patched CMake/Ninja pair for the native Android libraries (the SDK's bundled
|
||||
Ninja can crash on NixOS). Other environments keep using the SDK's CMake.
|
||||
Android SDK licenses are accepted through `devenv.yaml`. Gradle uses the
|
||||
Nix-patched SDK aapt2. Gradle itself comes from the repository's wrapper.
|
||||
The emulator and system images are omitted. `NS_SKIP_ENV_CHECK=1` bypasses
|
||||
NativeScript doctor's mandatory emulator check; `devenv test` checks the actual
|
||||
SDK/JDK build prerequisites instead.
|
||||
|
||||
Run `faceclaw-setup` (`npm ci`) once, then `faceclaw-test` (`npm test`),
|
||||
`npm run lint` and `npm run test:kotlin`. `devenv test` checks the environment.
|
||||
`bash build.sh` builds the Android app; it does not install it. On NixOS, any
|
||||
additional downloaded native executables may require the host's nix-ld support.
|
||||
iOS builds still require macOS/Xcode and are outside this Linux environment.
|
||||
|
||||
Keep machine-specific signing/device settings in the ignored `build_paths.sh`.
|
||||
Use `gh auth login` separately if GitHub CLI is not already authenticated.
|
||||
|
||||
Software tests do not validate Bluetooth behavior on physical glasses. Record
|
||||
device/firmware versions and manual results separately for hardware checks.
|
||||
Do not flash firmware during development without explicit permission.
|
||||
@@ -0,0 +1,9 @@
|
||||
# Configurable menu gestures
|
||||
|
||||
Settings > Display > Long press for app menu is off by default, preserving existing installations. When enabled with an app focused, long press opens its context menu and tap then hold opens the system menu. The preference uses the existing ConfigSettingBoolean/settings store and takes effect on subsequent input without restarting.
|
||||
|
||||
Windows claiming long press retain that input, their existing tap-then-hold app menu and the extended-hold system escape. Hold-to-talk windows retain voice capture and tap-then-hold for the system menu. The app switcher retains its existing bindings. Empty app menus continue to fall back to the system menu. The shell delivers the canonical tap-then-hold context-menu event to apps, so worker and EvenHub input contracts do not change. Menu gesture hints follow the preference and exceptions.
|
||||
|
||||
Software validation: TypeScript and changed-source lint; full JavaScript suite (1072 passed, 2 skipped on the independent branch). Routing tests cover both mappings, overlay switching, input metadata, dynamic hold ownership, switcher behavior and screen-off input. Persistence tests cover default, enabled and disabled values after store reload. App-menu hint tests cover owned holds and voice capture.
|
||||
|
||||
Hardware validation remains pending: test both bindings on the glasses/ring, app-specific holds, voice release, extended-hold escape, switching menus, app switcher, and restart. No firmware was flashed.
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
node --version
|
||||
java -version
|
||||
test -f "$ANDROID_HOME/platforms/android-35/android.jar"
|
||||
for version in 34.0.0 35.0.0 35.0.1; do
|
||||
"$ANDROID_HOME/build-tools/$version/aapt2" version
|
||||
done
|
||||
"$ANDROID_HOME/platform-tools/adb" version
|
||||
"$ANDROID_CMAKE_HOME/bin/cmake" --version
|
||||
"$ANDROID_CMAKE_HOME/bin/ninja" --version
|
||||
case "$(uname -s)" in
|
||||
Darwin) ndk_host=darwin-x86_64 ;;
|
||||
*) ndk_host=linux-x86_64 ;;
|
||||
esac
|
||||
test -x "$ANDROID_HOME/ndk/27.2.12479018/toolchains/llvm/prebuilt/$ndk_host/bin/clang"
|
||||
echo "Faceclaw development tools verified."
|
||||
@@ -266,7 +266,7 @@ function shellEnv({ wakeAction = 'voice-input', skipConfirmation = false } = {})
|
||||
handleInput(event, ctx) { if (event.type === 'double-click') ctx.stack.pop(); }
|
||||
}
|
||||
const voiceDialogs = [];
|
||||
const settings = { wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' },
|
||||
const settings = { swapMenuGesturesSetting: { get: () => false }, wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' },
|
||||
assistantSkipConfirmationSetting: { get: () => skipConfirmation } };
|
||||
const { shell, rawInputEventToInputEvent } = load('app/ui/shell/shell.ts', {
|
||||
'../../graphics/shell-scene': { encodeShellScene: () => new Uint8Array([0, 0]) },
|
||||
|
||||
@@ -59,3 +59,14 @@ test('curve drafts preview exactly while brightness keeps the previous valid sav
|
||||
assert.equal(curve.validationError(), null);
|
||||
assert.equal(api.getBrightnessPreferences().curve, '0:0,2:50,6:100');
|
||||
});
|
||||
|
||||
test('menu gesture preference preserves defaults and survives restart in either state', () => {
|
||||
const store = new Map();
|
||||
let api = settingsFixture(store);
|
||||
assert.equal(api.swapMenuGesturesSetting.get(), false);
|
||||
api.swapMenuGesturesSetting.set(true);
|
||||
api = settingsFixture(store);
|
||||
assert.equal(api.swapMenuGesturesSetting.get(), true);
|
||||
api.swapMenuGesturesSetting.set(false);
|
||||
assert.equal(settingsFixture(store).swapMenuGesturesSetting.get(), false);
|
||||
});
|
||||
@@ -39,6 +39,7 @@ const menu = load('app/ui/menu.ts', {
|
||||
function fixture(initial = '50', viewport = { x: 64, y: 124, width: 576, height: 260 }) {
|
||||
let value = initial, writes = 0, closed = 0;
|
||||
const settings = {
|
||||
swapMenuGesturesSetting: { get: () => false },
|
||||
brightnessSetting: { get: () => value, set: (next) => { value = next; writes++; } },
|
||||
brightnessSettingToLevel: (value) => value === 'auto' ? null : Number(value),
|
||||
};
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
const vm = require('node:vm');
|
||||
const ts = require('typescript');
|
||||
|
||||
function fixture(swap = false, app = {}) {
|
||||
const source = ts.createSourceFile('shell.ts', fs.readFileSync('app/ui/shell/shell.ts', 'utf8'), ts.ScriptTarget.Latest, true);
|
||||
const cls = source.statements.find(n => ts.isClassDeclaration(n) && n.name.text === 'Shell');
|
||||
const route = cls.members.find(n => n.name?.getText(source) === 'routeInput');
|
||||
class Overlay {}
|
||||
const context = { exports: {}, ShellOverlayMenuLayer: Overlay,
|
||||
swapMenuGesturesSetting: { get: () => swap }, isWatchInput: () => false };
|
||||
vm.runInNewContext(ts.transpileModule(`export class Shell { ${route.getText(source)} }`, {
|
||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
|
||||
}).outputText, context);
|
||||
const s = new context.exports.Shell();
|
||||
const delivered = [];
|
||||
const window = { handleInput: async e => delivered.push(e), hasAppMenu: () => true, ...app };
|
||||
let overlay = false, escapes = 0;
|
||||
Object.assign(s, { focus: 'window', screenOn: true, lastInput: null,
|
||||
foregroundWindow: () => window, cancelEscapeMenuTimer() {},
|
||||
startEscapeMenuTimer() { escapes++; }, config: { requestShellRender() {} },
|
||||
openEscapeMenu() { overlay = true; },
|
||||
stack: { isAtBase: () => !overlay, popIfTop(fn) { if (overlay && fn(new Overlay())) { overlay = false; return true; } return false; } },
|
||||
});
|
||||
return { s, delivered, setSwap: value => { swap = value; }, overlay: () => overlay, escapes: () => escapes,
|
||||
input: type => s.routeInput({ type, source: 'ring', timestampMs: 42 }, 17) };
|
||||
}
|
||||
|
||||
for (const swap of [false, true]) {
|
||||
test(`menu routing, overlay switching and metadata with inversion ${swap}`, async () => {
|
||||
const h = fixture(swap);
|
||||
const system = swap ? 'short-then-long-press' : 'long-press';
|
||||
const app = swap ? 'long-press' : 'short-then-long-press';
|
||||
await h.input(app);
|
||||
assert.equal(h.delivered.at(-1).type, 'short-then-long-press');
|
||||
assert.equal(h.delivered.at(-1).source, 'ring');
|
||||
assert.equal(h.delivered.at(-1).timestampMs, 42);
|
||||
await h.input(system);
|
||||
assert.equal(h.overlay(), true);
|
||||
await h.input(app);
|
||||
assert.equal(h.overlay(), false);
|
||||
assert.equal(h.delivered.length, 2);
|
||||
});
|
||||
for (const app of [{ claimsLongPress: () => true }, { holdToTalk: true }]) {
|
||||
test(`owned long press remains intact with inversion ${swap}: ${JSON.stringify(Object.keys(app))}`, async () => {
|
||||
const h = fixture(swap, app);
|
||||
await h.input('long-press');
|
||||
assert.equal(h.delivered[0].type, 'long-press');
|
||||
assert.equal(h.escapes(), app.holdToTalk ? 0 : 1);
|
||||
await h.input('short-then-long-press');
|
||||
if (app.holdToTalk) assert.equal(h.overlay(), true);
|
||||
else assert.equal(h.delivered[1].type, 'short-then-long-press');
|
||||
});
|
||||
}
|
||||
}
|
||||
test('gesture inversion never wakes a sleeping screen', async () => {
|
||||
const h = fixture(true); h.s.screenOn = false;
|
||||
await h.input('long-press'); await h.input('short-then-long-press');
|
||||
assert.equal(h.delivered.length, 0); assert.equal(h.overlay(), false);
|
||||
});
|
||||
|
||||
test('the switcher retains its existing gestures when inversion is enabled', async () => {
|
||||
for (const type of ['long-press', 'short-then-long-press']) {
|
||||
const snapshots = [];
|
||||
for (const swap of [false, true]) {
|
||||
const h = fixture(swap); h.s.focus = 'sidebar';
|
||||
await h.input(type);
|
||||
snapshots.push({ overlay: h.overlay(), delivered: h.delivered.map(e => e.type) });
|
||||
}
|
||||
assert.deepEqual(snapshots[0], snapshots[1]);
|
||||
}
|
||||
});
|
||||
|
||||
test('the setting applies immediately and follows changing app hold ownership', async () => {
|
||||
let claims = false;
|
||||
const h = fixture(false, { claimsLongPress: () => claims });
|
||||
h.setSwap(true);
|
||||
await h.input('long-press');
|
||||
assert.equal(h.delivered.at(-1).type, 'short-then-long-press');
|
||||
claims = true;
|
||||
await h.input('long-press');
|
||||
assert.equal(h.delivered.at(-1).type, 'long-press');
|
||||
claims = false;
|
||||
await h.input('long-press');
|
||||
assert.equal(h.delivered.at(-1).type, 'short-then-long-press');
|
||||
});
|
||||
|
||||
test('app menu hints reflect inversion, voice capture and owned holds', () => {
|
||||
const source = ts.createSourceFile('window-menu.ts', fs.readFileSync('app/ui/window-menu.ts', 'utf8'), ts.ScriptTarget.Latest, true);
|
||||
const cls = source.statements.find(n => ts.isClassDeclaration(n) && n.name.text === 'WindowMenuLayer');
|
||||
let swap = false;
|
||||
const context = { exports: {}, MenuLayer: class { constructor(_title, _items, layout) { this.layout = layout; } },
|
||||
WINDOW_MENU_LAYOUT: { footer: 'long-press' }, GESTURE_SHORT_THEN_LONG_PRESS: 'tap-hold',
|
||||
swapMenuGesturesSetting: { get: () => swap }, gestureHints: hints => hints[0][0] };
|
||||
vm.runInNewContext(ts.transpileModule(cls.getText(source), {
|
||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
|
||||
}).outputText, context);
|
||||
const hint = (voice = false, claims = false) => new context.exports.WindowMenuLayer('App', [], voice, claims).layout.footer;
|
||||
assert.equal(hint(), 'long-press');
|
||||
swap = true;
|
||||
assert.equal(hint(), 'tap-hold');
|
||||
assert.equal(hint(false, true), 'long-press');
|
||||
assert.equal(hint(true), 'tap-hold');
|
||||
});
|
||||
Reference in new issue
Block a user