forked from Blendman974/faceclaw
Voice input suspends the screen-off timer; add menu to Nightscout; fix defocused highlight style in Terminal menu
This commit is contained in:
1 parent
026a8ed439
commit
3452945322
5 files changed
+87
-30
No files matched your search
@@ -2,8 +2,15 @@ import { BdfFont, getDefaultLargeFont, getDefaultSmallFont } from "../../graphic
|
||||
import { GrayImage, imageFromAsciiArt } from "../../graphics/image";
|
||||
import { DashboardInputEvent, Layer, LayerContext } from "../layers";
|
||||
import { nightscoutBridge, type NightscoutState } from "../../native/nightscout-bridge";
|
||||
import { isNightscoutSettingsConfigured } from "../dashboard-settings";
|
||||
import {
|
||||
isNightscoutSettingsConfigured,
|
||||
nightscoutApiTokenSetting,
|
||||
nightscoutSiteUrlSetting,
|
||||
textSettingMenuItem,
|
||||
} from "../dashboard-settings";
|
||||
import { formatAgeShortFromTimestamp, formatTimestamp } from "~/util/date-util";
|
||||
import { MenuLayer } from "../menu";
|
||||
import { openSettingsSubMenu } from "../dashboard/settings-panel";
|
||||
|
||||
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK } from "../gestures";
|
||||
const nightscoutLargeFont = getDefaultLargeFont();
|
||||
@@ -299,14 +306,15 @@ export class NightscoutLayer implements Layer {
|
||||
|
||||
if (!isNightscoutSettingsConfigured() || nightscout.configurationMissing) {
|
||||
image.drawText(font, 22, 44, "Nightscout needs configuration.", 180);
|
||||
image.drawText(font, 22, 62, "Use Settings > Integrations > Nightscout.", 140);
|
||||
image.drawText(font, 22, 62, `Set the site URL and API token in ${GESTURE_CLICK} menu > Settings.`, 140);
|
||||
image.drawText(font, 22, footerY, `${GESTURE_CLICK} menu ${GESTURE_DOUBLE_CLICK} back`, 110);
|
||||
return image;
|
||||
}
|
||||
|
||||
if (!nightscout.available || !nightscout.latest) {
|
||||
image.drawText(font, 22, 44, "No Nightscout data available.", 180);
|
||||
image.drawText(font, 22, 58, truncateLine(nightscout.status, 60), 140);
|
||||
image.drawText(font, 22, footerY, `${GESTURE_CLICK} refresh ${GESTURE_DOUBLE_CLICK} back`, 110);
|
||||
image.drawText(font, 22, footerY, `${GESTURE_CLICK} menu ${GESTURE_DOUBLE_CLICK} back`, 110);
|
||||
return image;
|
||||
}
|
||||
|
||||
@@ -340,14 +348,14 @@ export class NightscoutLayer implements Layer {
|
||||
const graphHeight = Math.max(40, height - 128 - 48);
|
||||
drawNightscoutGraph(image, { x: 22, y: 128, width: width - 44, height: graphHeight }, nightscout, nowMs, font);
|
||||
image.drawText(font, 22, height - 42, "2-hour glucose history with basal / carbs / boluses", 130);
|
||||
image.drawText(font, 22, footerY, `${GESTURE_CLICK} refresh ${GESTURE_DOUBLE_CLICK} back`, 110);
|
||||
image.drawText(font, 22, footerY, `${GESTURE_CLICK} menu ${GESTURE_DOUBLE_CLICK} back`, 110);
|
||||
return image;
|
||||
}
|
||||
|
||||
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
|
||||
switch (event.type) {
|
||||
case "click":
|
||||
await nightscoutBridge.refreshNow();
|
||||
ctx.stack.push(createNightscoutMenu());
|
||||
return;
|
||||
case "double-click":
|
||||
ctx.stack.pop();
|
||||
@@ -358,6 +366,35 @@ export class NightscoutLayer implements Layer {
|
||||
}
|
||||
}
|
||||
|
||||
/** The app menu (opened with a click); MenuLayer self-closes on double-click. */
|
||||
function createNightscoutMenu(): MenuLayer {
|
||||
return new MenuLayer(
|
||||
"Nightscout",
|
||||
[
|
||||
{
|
||||
label: "Refresh",
|
||||
onSelect: async (ctx) => {
|
||||
ctx.stack.pop();
|
||||
await nightscoutBridge.refreshNow();
|
||||
},
|
||||
},
|
||||
{
|
||||
label: "Settings",
|
||||
onSelect: (ctx) => {
|
||||
// Pop the menu first so closing the settings modal lands back on
|
||||
// the glucose view, not this menu.
|
||||
ctx.stack.pop();
|
||||
openSettingsSubMenu(ctx, "Nightscout settings", [
|
||||
textSettingMenuItem(nightscoutSiteUrlSetting),
|
||||
textSettingMenuItem(nightscoutApiTokenSetting),
|
||||
]);
|
||||
},
|
||||
},
|
||||
],
|
||||
{ x: 8, y: 8, width: 200, minHeight: 0 },
|
||||
);
|
||||
}
|
||||
|
||||
function isNightscoutPointStale(point: NightscoutState["latest"], nowMs: number): boolean {
|
||||
return point !== null && nowMs - point.timestampMs > NIGHTSCOUT_STALE_MS;
|
||||
}
|
||||
|
||||
@@ -18,12 +18,10 @@ import {
|
||||
toggleSettingMenuItem,
|
||||
uiFontSetting,
|
||||
voiceProviderSetting,
|
||||
nightscoutSiteUrlSetting,
|
||||
nightscoutApiTokenSetting,
|
||||
screenTimeoutSetting,
|
||||
wakeWordActionSetting,
|
||||
} from "../dashboard-settings";
|
||||
import { openSettingsSubMenu, SettingsPanelLayer, type SettingsSection } from "./settings-panel";
|
||||
import { SettingsPanelLayer, type SettingsSection } from "./settings-panel";
|
||||
|
||||
/** The Settings app's master-detail panel (sections on the left, contents on the right). */
|
||||
export function createSettingsPanelLayer(): SettingsPanelLayer {
|
||||
@@ -63,20 +61,6 @@ function settingsSections(): SettingsSection[] {
|
||||
textSettingMenuItem(anthropicApiKeySetting),
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "Integrations",
|
||||
items: [
|
||||
{
|
||||
label: "Nightscout",
|
||||
onSelect: (ctx) => {
|
||||
openSettingsSubMenu(ctx, "Nightscout", [
|
||||
textSettingMenuItem(nightscoutSiteUrlSetting),
|
||||
textSettingMenuItem(nightscoutApiTokenSetting),
|
||||
]);
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: "Terminal",
|
||||
items: [
|
||||
|
||||
@@ -273,6 +273,13 @@ class Shell {
|
||||
applyScreenTimeout(nowMs = Date.now()): boolean {
|
||||
const timeoutMs = this.config.getScreenTimeoutMs();
|
||||
if (timeoutMs === null || !this.screenOn) return false;
|
||||
// An open voice dialog suspends the timeout: a long dictation or refine
|
||||
// has no button presses, but the screen must stay on for it. Sliding
|
||||
// lastInputAtMs forward also restarts the full timeout when it closes.
|
||||
if (this.activeVoiceLayer) {
|
||||
this.lastInputAtMs = nowMs;
|
||||
return false;
|
||||
}
|
||||
if (nowMs - this.lastInputAtMs < timeoutMs) return false;
|
||||
this.sleep();
|
||||
return true;
|
||||
@@ -451,6 +458,8 @@ class Shell {
|
||||
() => {
|
||||
if (this.activeVoiceLayer === layer) {
|
||||
this.activeVoiceLayer = null;
|
||||
// The idle countdown restarts in full once voice input ends.
|
||||
this.noteUserActivity();
|
||||
}
|
||||
},
|
||||
(text) => this.sendTextToForegroundWindow(text),
|
||||
|
||||
@@ -12,10 +12,10 @@ import { shell, type ShellWindow } from "./shell";
|
||||
export type WorkerAppMessage =
|
||||
| { type: "open-window"; windowId: string; surfaceId: string; viewport: { width: number; height: number } }
|
||||
| { type: "close-window"; windowId: string }
|
||||
| { type: "input"; windowId: string; event: unknown; frameId: number }
|
||||
| { type: "input"; windowId: string; event: unknown; frameId: number; focused: boolean }
|
||||
| { type: "text-input"; windowId: string; text: string }
|
||||
| { type: "render"; windowId: string }
|
||||
| { type: "foreground"; windowId: string; foreground: boolean }
|
||||
| { type: "render"; windowId: string; focused: boolean }
|
||||
| { type: "foreground"; windowId: string; foreground: boolean; focused: boolean }
|
||||
| { type: "screen"; on: boolean };
|
||||
|
||||
export type WorkerAppReply =
|
||||
@@ -153,10 +153,16 @@ export class WorkerAppHost {
|
||||
},
|
||||
drawIcon: windowIcon(spec.icon, spec.iconLetter),
|
||||
handleInput: (event, frameId) => {
|
||||
this.post({ type: "input", windowId: spec.windowId, event, frameId });
|
||||
this.post({
|
||||
type: "input",
|
||||
windowId: spec.windowId,
|
||||
event,
|
||||
frameId,
|
||||
focused: shell.isWindowFocused(spec.windowId),
|
||||
});
|
||||
},
|
||||
requestRender: () => {
|
||||
this.post({ type: "render", windowId: spec.windowId });
|
||||
this.post({ type: "render", windowId: spec.windowId, focused: shell.isWindowFocused(spec.windowId) });
|
||||
},
|
||||
receiveTextInput: (text) => {
|
||||
this.post({ type: "text-input", windowId: spec.windowId, text });
|
||||
@@ -166,7 +172,12 @@ export class WorkerAppHost {
|
||||
if (foreground) {
|
||||
shell.setWindowAttention(spec.windowId, false);
|
||||
}
|
||||
this.post({ type: "foreground", windowId: spec.windowId, foreground });
|
||||
this.post({
|
||||
type: "foreground",
|
||||
windowId: spec.windowId,
|
||||
foreground,
|
||||
focused: shell.isWindowFocused(spec.windowId),
|
||||
});
|
||||
},
|
||||
setScreenOn: (on) => {
|
||||
// Screen state is per-app, but sending per-window keeps the protocol
|
||||
|
||||
Reference in new issue
Block a user