forked from Blendman974/faceclaw
Add Wear OS companion app and remote controls
Add a Wearable Data Layer bridge for syncing dashboard state and commands. Introduce a standalone watch app with assistant, app launcher, touchpad remote, settings, and connectivity UI.
This commit is contained in:
85 files changed
+5813
-102
No files matched your search
@@ -1,4 +1,4 @@
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" loaded="loaded" unloaded="unloaded">
|
||||
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:rc="phone-ui" navigatingTo="navigatingTo" loaded="loaded" unloaded="unloaded">
|
||||
<ActionBar title="Faceclaw">
|
||||
<ActionItem text="{{ buttonLabel }}" tap="{{ onTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
||||
<ActionItem text="Configure devices" tap="{{ onConfigureTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
||||
@@ -11,7 +11,8 @@
|
||||
<GridLayout>
|
||||
<GridLayout rows="auto,*" visibility="{{ portraitLayoutVisibility }}">
|
||||
<StackLayout row="0" visibility="{{ displayPreviewVisibility }}">
|
||||
<Image src="{{ displayPreview }}" stretch="fill" height="{{ displayPreviewHeight }}" />
|
||||
<Image src="{{ displayPreview }}" stretch="fill" height="{{ displayPreviewHeight }}"
|
||||
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
||||
</StackLayout>
|
||||
<GridLayout
|
||||
row="0"
|
||||
@@ -36,14 +37,7 @@
|
||||
</StackLayout>
|
||||
</StackLayout>
|
||||
<StackLayout row="1">
|
||||
<GridLayout rows="auto,auto,auto" columns="*,*,*" class="m-t-8">
|
||||
<Button row="0" col="1" text="Swipe up" tap="{{ onSyntheticUpTap }}" />
|
||||
<Button row="1" col="0" text="Double-click" tap="{{ onSyntheticLeftTap }}" />
|
||||
<Button row="1" col="1" text="Long press" tap="{{ onSyntheticLongPressTap }}" />
|
||||
<Button row="1" col="2" text="Click" tap="{{ onSyntheticRightTap }}" />
|
||||
<Button row="0" col="2" text="Microphone" tap="{{ onSyntheticMicTap }}" />
|
||||
<Button row="2" col="1" text="Swipe down" tap="{{ onSyntheticDownTap }}" />
|
||||
</GridLayout>
|
||||
<rc:remote-controls />
|
||||
<Button text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
||||
</StackLayout>
|
||||
<Label row="2" text="{{ status }}" class="m-t-16" textWrap="true" />
|
||||
@@ -65,13 +59,14 @@
|
||||
<Button text="Allow unrestricted background usage" tap="{{ onAllowBackgroundUsageTap }}" class="-primary" />
|
||||
</StackLayout>
|
||||
</StackLayout>
|
||||
<GridLayout row="1" rows="auto,auto,*" columns="*,260">
|
||||
<GridLayout row="1" rows="auto,auto,*" columns="*,360">
|
||||
<StackLayout row="0" col="0" visibility="{{ displayPreviewVisibility }}" horizontalAlignment="left">
|
||||
<Image
|
||||
src="{{ displayPreview }}"
|
||||
stretch="fill"
|
||||
width="{{ landscapeDisplayPreviewWidth }}"
|
||||
height="{{ landscapeDisplayPreviewHeight }}" />
|
||||
height="{{ landscapeDisplayPreviewHeight }}"
|
||||
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
||||
</StackLayout>
|
||||
<GridLayout
|
||||
row="0"
|
||||
@@ -84,14 +79,7 @@
|
||||
<Label text="{{ displayPreviewMessage }}" textWrap="true" horizontalAlignment="center" verticalAlignment="center" />
|
||||
</GridLayout>
|
||||
<StackLayout row="0" col="1" class="m-l-16">
|
||||
<GridLayout rows="auto,auto,auto" columns="*,*,*">
|
||||
<Button row="0" col="1" text="Swipe up" tap="{{ onSyntheticUpTap }}" />
|
||||
<Button row="1" col="0" text="Double-click" tap="{{ onSyntheticLeftTap }}" />
|
||||
<Button row="1" col="1" text="Long press" tap="{{ onSyntheticLongPressTap }}" />
|
||||
<Button row="1" col="2" text="Click" tap="{{ onSyntheticRightTap }}" />
|
||||
<Button row="0" col="2" text="Microphone" tap="{{ onSyntheticMicTap }}" />
|
||||
<Button row="2" col="1" text="Swipe down" tap="{{ onSyntheticDownTap }}" />
|
||||
</GridLayout>
|
||||
<rc:remote-controls />
|
||||
<Button text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
||||
</StackLayout>
|
||||
<Label row="1" col="0" colSpan="2" text="{{ status }}" class="m-t-16" textWrap="true" />
|
||||
|
||||
@@ -1,5 +1,28 @@
|
||||
import { Application, Frame, ImageSource, Observable, Screen } from "@nativescript/core";
|
||||
import { dashboardController } from "../g2/dashboard-controller";
|
||||
import {
|
||||
Application,
|
||||
Dialogs,
|
||||
Frame,
|
||||
ImageSource,
|
||||
Observable,
|
||||
Screen,
|
||||
SwipeDirection,
|
||||
type GestureEventData,
|
||||
type SwipeGestureEventData,
|
||||
type TouchGestureEventData,
|
||||
type View,
|
||||
} from "@nativescript/core";
|
||||
import { dashboardController, type MirrorTouchKind } from "../g2/dashboard-controller";
|
||||
import { shell } from "../ui/shell/shell";
|
||||
import {
|
||||
brightnessSetting,
|
||||
DISPLAY_MODE_VALUES,
|
||||
displayModeLabel,
|
||||
displayModeSetting,
|
||||
onAnySettingChanged,
|
||||
type BrightnessSetting,
|
||||
type DisplayModeSetting,
|
||||
} from "../ui/dashboard-settings";
|
||||
import { getBooleanSetting, setBooleanSetting } from "../native/settings-store";
|
||||
import { isValidMacAddress, loadDeviceAddresses } from "../g2/device-addresses";
|
||||
import { isAutoReconnectSuppressed } from "../g2/reconnect-policy";
|
||||
import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../graphics/image";
|
||||
@@ -55,7 +78,10 @@ export class MainViewModel extends Observable {
|
||||
this.firmwareWarningVisible = snapshot.firmwareWarningVisible;
|
||||
this.screenRecordingActive = snapshot.screenRecordingActive;
|
||||
this.batteryOptimizationWarningVisible = snapshot.batteryOptimizationWarningVisible;
|
||||
this.refreshPadFocusLine();
|
||||
});
|
||||
// Brightness / display mode can change from the glasses' Settings app too.
|
||||
onAnySettingChanged(() => this.refreshDisplayControls());
|
||||
}
|
||||
|
||||
get status(): string {
|
||||
@@ -601,6 +627,220 @@ export class MainViewModel extends Observable {
|
||||
await dashboardController.injectSyntheticRingInput("wakeword");
|
||||
}
|
||||
|
||||
// ---- the phone's own controller: touchpad, d-pad, mirror touch ----
|
||||
//
|
||||
// Everything here is the watch scheme (origin "watch"): spatial swipes,
|
||||
// tap = select, double-tap / two fingers = back, hold = menu. The ring row
|
||||
// above stays on the ring's own scheme.
|
||||
|
||||
private padPointers = 0;
|
||||
private padTwoFingerDown = false;
|
||||
|
||||
/** What the next gesture lands on, as the watch pad shows it. */
|
||||
get padFocusLine(): string {
|
||||
if (this.phase !== "connected" && this.phase !== "charging") return "Glasses disconnected";
|
||||
if (!shell.isScreenOn()) return "Display off";
|
||||
const foreground = shell.getForegroundApp();
|
||||
return foreground ? foreground.title : "Launcher";
|
||||
}
|
||||
|
||||
private refreshPadFocusLine(): void {
|
||||
this.notifyPropertyChange("padFocusLine", this.padFocusLine);
|
||||
}
|
||||
|
||||
async onPadTap(): Promise<void> {
|
||||
if (this.padTwoFingerDown) return;
|
||||
await dashboardController.injectSyntheticRingInput("click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onPadDoubleTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("double-click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onPadLongPress(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("long-press", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onPadSwipe(args: SwipeGestureEventData): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput(swipeKind(args.direction), "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
/** Two fingers down and up without moving: back (the watch's two-finger tap). */
|
||||
async onPadTouch(args: TouchGestureEventData): Promise<void> {
|
||||
const count = args.getPointerCount();
|
||||
if (args.action === "down" || args.action === "move") {
|
||||
this.padPointers = Math.max(this.padPointers, count);
|
||||
if (count >= 2) this.padTwoFingerDown = true;
|
||||
return;
|
||||
}
|
||||
if (args.action === "up" || args.action === "cancel") {
|
||||
const twoFinger = this.padTwoFingerDown;
|
||||
this.padPointers = 0;
|
||||
if (twoFinger) {
|
||||
// Let the single-tap recognizer's delayed tap see the flag first.
|
||||
setTimeout(() => {
|
||||
this.padTwoFingerDown = false;
|
||||
}, 400);
|
||||
if (args.action === "up") {
|
||||
await dashboardController.injectSyntheticRingInput("double-click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async onDpadUp(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-up", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadDown(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-down", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadLeft(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-left", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadRight(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-right", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadSelect(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onBackTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("double-click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onMenuTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("long-press", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
// ---- touching the mirror itself ----
|
||||
|
||||
get mirrorTouchEnabled(): boolean {
|
||||
return getBooleanSetting(MIRROR_TOUCH_KEY, true);
|
||||
}
|
||||
|
||||
onMirrorTouchChange(args: { value?: boolean; object?: { checked?: boolean } }): void {
|
||||
const on = typeof args.value === "boolean" ? args.value : Boolean(args.object?.checked);
|
||||
setBooleanSetting(MIRROR_TOUCH_KEY, on);
|
||||
this.notifyPropertyChange("mirrorTouchEnabled", on);
|
||||
}
|
||||
|
||||
private mirrorFraction(args: GestureEventData & { getX?: () => number; getY?: () => number }): { nx: number; ny: number } | null {
|
||||
const view = args.object as View | undefined;
|
||||
const size = view?.getActualSize?.();
|
||||
if (!view || !size || !size.width || !size.height || !args.getX || !args.getY) return null;
|
||||
// On Android the gesture's getX/getY are screen-absolute (in DIPs), not
|
||||
// view-local; the view's own screen position makes them local.
|
||||
const origin = view.getLocationOnScreen?.() ?? { x: 0, y: 0 };
|
||||
const localX = args.getX() - origin.x;
|
||||
const localY = args.getY() - origin.y;
|
||||
return { nx: localX / size.width, ny: localY / size.height };
|
||||
}
|
||||
|
||||
private async mirrorGesture(kind: MirrorTouchKind, args: GestureEventData): Promise<void> {
|
||||
if (!this.mirrorTouchEnabled) return;
|
||||
const at = this.mirrorFraction(args) ?? { nx: 0.5, ny: 0.5 };
|
||||
await dashboardController.handleMirrorTouch(kind, at.nx, at.ny);
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
onMirrorTap(args: GestureEventData): Promise<void> {
|
||||
return this.mirrorGesture("tap", args);
|
||||
}
|
||||
|
||||
onMirrorDoubleTap(args: GestureEventData): Promise<void> {
|
||||
return this.mirrorGesture("double-tap", args);
|
||||
}
|
||||
|
||||
onMirrorLongPress(args: GestureEventData): Promise<void> {
|
||||
return this.mirrorGesture("long-press", args);
|
||||
}
|
||||
|
||||
onMirrorSwipe(args: SwipeGestureEventData): Promise<void> {
|
||||
return this.mirrorGesture(swipeKind(args.direction), args);
|
||||
}
|
||||
|
||||
// ---- display mode and brightness, beside the mirror ----
|
||||
|
||||
get displayModeLabel(): string {
|
||||
return displayModeLabel(displayModeSetting.get()) + " ▾";
|
||||
}
|
||||
|
||||
async onDisplayModeTap(): Promise<void> {
|
||||
const current = displayModeSetting.get();
|
||||
const options = DISPLAY_MODE_VALUES.map((value) => displayModeLabel(value) + (value === current ? " ✓" : ""));
|
||||
const picked = await Dialogs.action({ title: "Display mode", cancelButtonText: "Cancel", actions: options });
|
||||
const index = options.indexOf(picked);
|
||||
if (index < 0) return;
|
||||
const value = DISPLAY_MODE_VALUES[index] as DisplayModeSetting;
|
||||
if (value !== current) displayModeSetting.set(value);
|
||||
this.notifyPropertyChange("displayModeLabel", this.displayModeLabel);
|
||||
}
|
||||
|
||||
get brightnessAuto(): boolean {
|
||||
return brightnessSetting.get() === "auto";
|
||||
}
|
||||
|
||||
get brightnessSliderEnabled(): boolean {
|
||||
return !this.brightnessAuto;
|
||||
}
|
||||
|
||||
/** The slider's position; while Auto, the last manual level (or 50). */
|
||||
get brightnessPercent(): number {
|
||||
const value = brightnessSetting.get();
|
||||
if (value === "auto") return this.lastManualBrightness;
|
||||
const numeric = parseInt(value, 10);
|
||||
return Number.isFinite(numeric) ? numeric : 50;
|
||||
}
|
||||
|
||||
private lastManualBrightness = 50;
|
||||
|
||||
onBrightnessChange(args: { value?: number; object?: { value?: number } }): void {
|
||||
if (this.brightnessAuto) return;
|
||||
const raw = typeof args.value === "number" ? args.value : Number(args.object?.value ?? NaN);
|
||||
if (!Number.isFinite(raw)) return;
|
||||
// The setting only has every tenth level; snap to the nearest.
|
||||
const level = Math.min(100, Math.max(0, Math.round(raw / 10) * 10));
|
||||
this.lastManualBrightness = level;
|
||||
const value = String(level) as BrightnessSetting;
|
||||
if (brightnessSetting.get() !== value) brightnessSetting.set(value);
|
||||
}
|
||||
|
||||
onBrightnessAutoChange(args: { value?: boolean; object?: { checked?: boolean } }): void {
|
||||
const on = typeof args.value === "boolean" ? args.value : Boolean(args.object?.checked);
|
||||
if (on) {
|
||||
if (brightnessSetting.get() !== "auto") {
|
||||
this.lastManualBrightness = this.brightnessPercent;
|
||||
brightnessSetting.set("auto");
|
||||
}
|
||||
} else if (brightnessSetting.get() === "auto") {
|
||||
brightnessSetting.set(String(this.lastManualBrightness) as BrightnessSetting);
|
||||
}
|
||||
this.refreshDisplayControls();
|
||||
}
|
||||
|
||||
private refreshDisplayControls(): void {
|
||||
this.notifyPropertyChange("brightnessAuto", this.brightnessAuto);
|
||||
this.notifyPropertyChange("brightnessSliderEnabled", this.brightnessSliderEnabled);
|
||||
this.notifyPropertyChange("brightnessPercent", this.brightnessPercent);
|
||||
this.notifyPropertyChange("displayModeLabel", this.displayModeLabel);
|
||||
}
|
||||
|
||||
private appendLog(line: string): void {
|
||||
const stamp = new Date().toISOString().slice(11, 19);
|
||||
this.log = this.log ? `${this.log}\n[${stamp}] ${line}` : `[${stamp}] ${line}`;
|
||||
@@ -621,3 +861,19 @@ export class MainViewModel extends Observable {
|
||||
return `${sanitized.slice(0, 237)}...`;
|
||||
}
|
||||
}
|
||||
|
||||
const MIRROR_TOUCH_KEY = "phone.mirrorTouch";
|
||||
|
||||
/** NativeScript swipe direction -> the watch-scheme directional gesture. */
|
||||
function swipeKind(direction: SwipeDirection): "swipe-up" | "swipe-down" | "swipe-left" | "swipe-right" {
|
||||
switch (direction) {
|
||||
case SwipeDirection.up:
|
||||
return "swipe-up";
|
||||
case SwipeDirection.down:
|
||||
return "swipe-down";
|
||||
case SwipeDirection.left:
|
||||
return "swipe-left";
|
||||
default:
|
||||
return "swipe-right";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
<!--
|
||||
The phone's controller for the glasses: the same scheme as the watch pad
|
||||
(tap = select, double-tap or two fingers = back, hold = menu, swipes
|
||||
navigate), a d-pad for the same four directions, the display-mode picker
|
||||
and brightness beside the mirror, and a compact ring simulator for the R1's
|
||||
own scheme. Used by main-page.xml in both orientations; binds to the page's
|
||||
MainViewModel.
|
||||
-->
|
||||
<StackLayout xmlns="http://schemas.nativescript.org/tns.xsd" class="remote-controls">
|
||||
<GridLayout columns="auto,*,auto" class="display-controls">
|
||||
<Button col="0" text="{{ displayModeLabel }}" tap="{{ onDisplayModeTap }}" class="mode-button" />
|
||||
<GridLayout col="1" columns="auto,*" verticalAlignment="center" class="brightness">
|
||||
<Label col="0" text="☀" class="brightness-icon" verticalAlignment="center" />
|
||||
<Slider col="1" width="100%" minValue="0" maxValue="100" value="{{ brightnessPercent }}" valueChange="{{ onBrightnessChange }}" isEnabled="{{ brightnessSliderEnabled }}" />
|
||||
</GridLayout>
|
||||
<StackLayout col="2" orientation="horizontal" verticalAlignment="center" class="auto-toggle">
|
||||
<Label text="Auto" verticalAlignment="center" />
|
||||
<Switch checked="{{ brightnessAuto }}" checkedChange="{{ onBrightnessAutoChange }}" />
|
||||
</StackLayout>
|
||||
</GridLayout>
|
||||
|
||||
<GridLayout class="touchpad" tap="{{ onPadTap }}" doubleTap="{{ onPadDoubleTap }}" longPress="{{ onPadLongPress }}" swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
|
||||
<Label text="{{ padFocusLine }}" class="pad-focus" horizontalAlignment="center" verticalAlignment="center" />
|
||||
<Label text="● select ●● back ‒ menu" class="pad-legend" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
<Button text="▲" tap="{{ onDpadUp }}" class="pad-dpad-button" horizontalAlignment="center" verticalAlignment="top" />
|
||||
<Button text="▼" tap="{{ onDpadDown }}" class="pad-dpad-button pad-dpad-down" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
<Button text="◀" tap="{{ onDpadLeft }}" class="pad-dpad-button" horizontalAlignment="left" verticalAlignment="center" />
|
||||
<Button text="▶" tap="{{ onDpadRight }}" class="pad-dpad-button" horizontalAlignment="right" verticalAlignment="center" />
|
||||
</GridLayout>
|
||||
|
||||
<GridLayout columns="*,*,*" class="action-row">
|
||||
<Button col="0" text="Back" tap="{{ onBackTap }}" class="action-button" />
|
||||
<Button col="1" text="Menu" tap="{{ onMenuTap }}" class="action-button" />
|
||||
<Button col="2" text="Hey Even" tap="{{ onSyntheticMicTap }}" class="action-button" />
|
||||
</GridLayout>
|
||||
|
||||
<GridLayout columns="auto,*,*,*,*,*,auto,auto" class="ring-row">
|
||||
<Label col="0" text="Ring" class="ring-label" verticalAlignment="center" />
|
||||
<Button col="1" text="▲" tap="{{ onSyntheticUpTap }}" class="ring-button" />
|
||||
<Button col="2" text="▼" tap="{{ onSyntheticDownTap }}" class="ring-button" />
|
||||
<Button col="3" text="●" tap="{{ onSyntheticRightTap }}" class="ring-button" />
|
||||
<Button col="4" text="●●" tap="{{ onSyntheticLeftTap }}" class="ring-button" />
|
||||
<Button col="5" text="‒" tap="{{ onSyntheticLongPressTap }}" class="ring-button" />
|
||||
<Label col="6" text="Touch mirror" class="ring-label" verticalAlignment="center" />
|
||||
<Switch col="7" checked="{{ mirrorTouchEnabled }}" checkedChange="{{ onMirrorTouchChange }}" />
|
||||
</GridLayout>
|
||||
</StackLayout>
|
||||
Reference in new issue
Block a user