diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts index 3666f299..61831feb 100644 --- a/app/g2/dashboard-controller.ts +++ b/app/g2/dashboard-controller.ts @@ -121,6 +121,7 @@ export type DashboardSnapshot = { * glasses, and this says which harmless thing is actually going on. */ displayPreviewMessage: string; + silentModeFeedback: string; activeTextSettingId: string | null; activeTextEditorTitle: string; activeTextSettingTitle: string; @@ -294,6 +295,9 @@ class DashboardController { /** The screen area displayPreview shows (Preview scaling), or null for the whole panel. */ private displayPreviewCrop: ScreenRect | null = null; private silentMode = false; + private silentModeFeedback = ""; + private silentModeFeedbackGeneration = 0; + private silentModeFeedbackTimer: ReturnType | null = null; // Brightness value last pushed to the glasses; see pushBrightness. private lastPushedBrightness: string | null = null; // Last battery level the glasses reported, kept across disconnects so a @@ -1142,6 +1146,7 @@ class DashboardController { status: this.status, displayPreview: this.displayPreview, displayPreviewMessage: this.displayPreviewMessage(), + silentModeFeedback: this.silentModeFeedback, activeTextSettingId: primaryTextSetting?.id ?? null, activeTextEditorTitle: this.activeTextEditorTitle, activeTextSettingTitle: primaryTextSetting?.editorTitle ?? "", @@ -1181,6 +1186,43 @@ class DashboardController { * charging and silent mode both make the display unavailable while BLE stays * up, and a battery that just ran out simply stops answering. */ + private handleSilentMode(silent: boolean): void { + if (this.silentMode === silent) return; + this.silentMode = silent; + const generation = ++this.silentModeFeedbackGeneration; + if (this.silentModeFeedbackTimer !== null) clearTimeout(this.silentModeFeedbackTimer); + this.silentModeFeedbackTimer = null; + this.silentModeFeedback = silent + ? "Silent mode enabled — hold both touchpads to exit" + : "Silent mode disabled"; + if (!silent) { + void this.showSilentModeExit(generation).catch(error => { + this.appendLog(`silent-mode exit feedback failed: ${this.formatError(error)}`); + }); + this.silentModeFeedbackTimer = setTimeout(() => { + this.silentModeFeedbackTimer = null; + this.silentModeFeedback = ""; + this.emit(); + }, 5000); + } + this.emit(); + } + + private async showSilentModeExit(generation: number): Promise { + if (this.phase !== "connected" || this.silentMode || this.glassesLocked) return; + // The firmware powered the lenses down, and Faceclaw may have gone to + // sleep/suspended EvenHub meanwhile. Reusing the ordinary wake barrier is + // essential: rendering an alert into the retained surface alone is invisible. + this.cancelEvenHubSuspendTimer(); + shell.wake("sidebar"); + const ready = await this.ensureEvenHubSessionActive(); + if (!ready || generation !== this.silentModeFeedbackGeneration || this.silentMode || + this.phase !== "connected" || this.glassesLocked) return; + shell.showAlert("Silent mode disabled"); + shell.foregroundWindow()?.requestRender(); + this.requestShellRender(); + } + private displayPreviewMessage(): string { if (this.phase === "charging") { return chargingPreviewMessage(this.glassesDisplayState()); @@ -1604,9 +1646,7 @@ class DashboardController { }); }); this.offSilentMode = communicator.onSilentMode((silent) => { - if (this.silentMode === silent) return; - this.silentMode = silent; - this.emit(); + this.handleSilentMode(silent); }); this.offWearState = communicator.onWearState((wearing) => { this.handleWearState(wearing); @@ -2984,6 +3024,10 @@ class DashboardController { // Kept across "connecting": silent mode blocks app launches, so it can // itself cause the reconnect churn, and Java re-reports it either way. this.silentMode = false; + this.silentModeFeedbackGeneration++; + if (this.silentModeFeedbackTimer !== null) clearTimeout(this.silentModeFeedbackTimer); + this.silentModeFeedbackTimer = null; + this.silentModeFeedback = ""; } this.emit(); } diff --git a/app/phone-ui/main-page.xml b/app/phone-ui/main-page.xml index 846fa253..1a30e76c 100644 --- a/app/phone-ui/main-page.xml +++ b/app/phone-ui/main-page.xml @@ -74,6 +74,9 @@ class="ble-bandwidth-indicator" horizontalAlignment="center" verticalAlignment="bottom" /> +