forked from Blendman974/faceclaw
UI refinements to watch app and phone preview
<details> <summary>Prompts Used</summary> Thanks. Next up, let's add a "Phone display" section to the Settings app (above the Watch section). We'll add a "Preview color" setting (options: White, Green; default White), which controls whether the mirror display is white/grayscale (best looking) or green (matches the physical glasses). We'll move the "Touch mirror" toggle setting (currently on the phone main screen) into the phone display settings menu. We'll add a "Show brightness control" toggle setting (default off) and a "Show screen size" toggle setting (default off), which control the visibility of the corresponding elements on the phone main screen. Let's also make it so that double-tapping the watch (or simulated watch on the phone, mirror, etc) while the app-switcher is selected turns off the glasses display, in the same way that double-tappign the R1 ring does. > All four pieces are in and everything builds (webpack, Gradle with the Java changes, and a clean `tsc`). Summary: > > **"Phone display" Settings section** — added between Roam and Watch in the on-glasses Settings app, with four entries: > - **Preview color** (White/Green, default White) — new enum setting `phone.previewColor`. The colorization happens in the Java preview path: `PreviewBitmapUtil.fromGray` gained a `green` variant whose LUT maps luminance to green-on-black instead of grayscale, threaded through `getCompositePreviewBitmap` → `getCompositePreview(green)` → the controller, which reads the setting per refresh. A settings change also schedules an immediate preview refresh, so flipping the color updates the mirror right away instead of waiting for the next composited frame. > - **Touch mirror** — moved from the phone main screen. It's now a proper `ConfigSettingBoolean` reusing the existing `phone.mirrorTouch` storage key, so anyone who already turned it off keeps that choice. The label+switch pair is gone from the ring row in `remote-controls.xml`, and the view model reads the setting per gesture. > - **Show brightness control** and **Show screen size** (both default off) — new booleans controlling visibility of the brightness slider/Auto toggle and the display-mode picker on the phone main screen. The whole display-controls row collapses when both are off; the bindings refresh through the existing `onAnySettingChanged` → `refreshDisplayControls` path, so toggling them from the glasses updates the phone screen live. Note this means the main screen is more minimal out of the box — brightness and screen size remain reachable via the Settings app either way. > > **Watch double-tap at the app switcher** — the watch-scheme special case in `handleSidebarInput` is removed: a double-click from any source (watch, phone pad/d-pad, mirror double-tap — they all arrive as source `"watch"`) now turns the display off when the sidebar is selected, exactly like the ring's. The original code deliberately excluded the watch on the theory that sleeping was a trap since any watch gesture re-wakes; with your "Watch input wakes display" setting now gated (and double-tap waking a dark display regardless), the toggle behavior is symmetric: double-tap at the switcher sleeps, double-tap again wakes. > > Hardware-test notes: the green preview tint and the collapsed-controls layout are worth one visual check on the phone, and the double-tap-to-sleep from the watch is a quick on-device confirm. </details>
This commit is contained in:
1 parent
dc1d4d30a9
commit
1f9f3b35d3
9 files changed
+115
-30
No files matched your search
@@ -282,6 +282,48 @@ export const lockScreenEnabledSetting = new ConfigSettingBoolean({
|
||||
"Lock the glasses after they are taken off while the phone is locked. Unlocking the phone unlocks the glasses.",
|
||||
});
|
||||
|
||||
// Phone display: the phone app's mirror of the glasses screen and the
|
||||
// controls around it on the main page.
|
||||
export type PreviewColor = "white" | "green";
|
||||
|
||||
export const previewColorSetting = new ConfigSettingEnum<PreviewColor>({
|
||||
id: "preview-color",
|
||||
label: "Preview color",
|
||||
storageKey: "phone.previewColor",
|
||||
defaultValue: "white",
|
||||
values: ["white", "green"],
|
||||
formatValue: (value) => (value === "green" ? "Green" : "White"),
|
||||
description:
|
||||
"How the phone's mirror of the glasses display renders: white/grayscale (clearest), or green to match the physical glasses.",
|
||||
});
|
||||
|
||||
export const mirrorTouchSetting = new ConfigSettingBoolean({
|
||||
id: "mirror-touch",
|
||||
label: "Touch mirror",
|
||||
// Key predates this setting object (the toggle used to live on the phone's
|
||||
// main screen); keeping it preserves the user's choice.
|
||||
storageKey: "phone.mirrorTouch",
|
||||
defaultValue: true,
|
||||
description:
|
||||
"Let touches on the phone's mirror act on the glasses UI: tap selects what it lands on, double-tap goes back, a hold opens the menu, swipes navigate.",
|
||||
});
|
||||
|
||||
export const showBrightnessControlSetting = new ConfigSettingBoolean({
|
||||
id: "show-brightness-control",
|
||||
label: "Show brightness control",
|
||||
storageKey: "phone.showBrightnessControl",
|
||||
defaultValue: false,
|
||||
description: "Show the brightness slider above the mirror on the phone's main screen.",
|
||||
});
|
||||
|
||||
export const showScreenSizeSetting = new ConfigSettingBoolean({
|
||||
id: "show-screen-size",
|
||||
label: "Show screen size",
|
||||
storageKey: "phone.showScreenSize",
|
||||
defaultValue: false,
|
||||
description: "Show the screen-size (display mode) picker above the mirror on the phone's main screen.",
|
||||
});
|
||||
|
||||
// Wear OS watch remote (app/g2/wear-remote.ts, wear/). All three are read on
|
||||
// every watch message, so a change applies immediately.
|
||||
export const watchRemoteEnabledSetting = new ConfigSettingBoolean({
|
||||
|
||||
@@ -38,7 +38,9 @@ import {
|
||||
displayModeSetting,
|
||||
elevenLabsApiKeySetting,
|
||||
mapboxApiKeySetting,
|
||||
mirrorTouchSetting,
|
||||
openAiApiKeySetting,
|
||||
previewColorSetting,
|
||||
roamApiTokenSetting,
|
||||
roamGraphNameSetting,
|
||||
sonioxApiKeySetting,
|
||||
@@ -46,6 +48,8 @@ import {
|
||||
firmwareDebugFlagsSetting,
|
||||
lockScreenEnabledSetting,
|
||||
saveVoiceRecordingsSetting,
|
||||
showBrightnessControlSetting,
|
||||
showScreenSizeSetting,
|
||||
suspendEvenHubWhenScreenOffSetting,
|
||||
terminalAutoReconnectSetting,
|
||||
terminalLaunchPresetsSetting,
|
||||
@@ -150,6 +154,17 @@ function settingsSections(): SettingsSection[] {
|
||||
textSettingMenuItem(roamApiTokenSetting),
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "Phone display",
|
||||
// The phone app's mirror of the glasses screen and its controls
|
||||
// (app/phone-ui/): all read live by the main page.
|
||||
items: [
|
||||
enumSettingMenuItem(previewColorSetting),
|
||||
toggleSettingMenuItem(mirrorTouchSetting),
|
||||
toggleSettingMenuItem(showBrightnessControlSetting),
|
||||
toggleSettingMenuItem(showScreenSizeSetting),
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "Watch",
|
||||
// Wear OS remote (wear/); the status line above the items says whether
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
directionalFallback,
|
||||
type InputSource,
|
||||
isDirectionalInput,
|
||||
isWatchInput,
|
||||
Layer,
|
||||
LayerActions,
|
||||
LayerContext,
|
||||
@@ -686,11 +685,9 @@ class Shell {
|
||||
private handleSidebarInput(event: DashboardInputEvent): ShellInputOutcome {
|
||||
switch (event.type) {
|
||||
case "double-click":
|
||||
// The ring's double-tap at the root turns the display off. For the
|
||||
// watch, "back" at the root is simply the end of the road: it wakes
|
||||
// the display on any gesture, so sleeping here would be a trap; the
|
||||
// watch's Status screen turns the display off on purpose.
|
||||
if (isWatchInput(event)) return { shell: false, window: false };
|
||||
// A double-tap at the root (the app switcher selected) turns the
|
||||
// display off — from the ring and the watch scheme alike; watch-scheme
|
||||
// gestures wake it again (or a ring double-tap does).
|
||||
this.sleep();
|
||||
return { shell: true, window: false };
|
||||
case "scroll-up":
|
||||
|
||||
Reference in new issue
Block a user