diff --git a/App_Resources/Android/app.gradle b/App_Resources/Android/app.gradle index eec79f15..145dd044 100644 --- a/App_Resources/Android/app.gradle +++ b/App_Resources/Android/app.gradle @@ -272,15 +272,21 @@ if (faceclawVersionFile.exists()) { faceclawVersionName = faceclawVersionMatch.group(1) } } +def faceclawBuildRevision = System.getenv("FACECLAW_ANDROID_BUILD_REVISION") ?: "0" +if (!(faceclawBuildRevision ==~ /[0-4]/)) { + throw new GradleException("FACECLAW_ANDROID_BUILD_REVISION must be an integer from 0 to 4") +} def faceclawVersionCode = { // Prerelease labels belong in versionName, not the numeric versionCode. def parts = (faceclawVersionName.split('-')[0].tokenize('.') + ["0", "0"]).take(3)*.toInteger() - return parts[0] * 10000 + parts[1] * 100 + parts[2] + // Last digit: build revision * 2, plus form factor (phone 0, Wear OS 1). + // Play requires distinct version codes even on separate form-factor tracks. + return (parts[0] * 10000 + parts[1] * 100 + parts[2]) * 10 + faceclawBuildRevision.toInteger() * 2 }() android { - compileSdkVersion 35 - buildToolsVersion "35" + compileSdkVersion 36 + buildToolsVersion "36.0.0" // ndkVersion "" sourceSets.main { @@ -290,7 +296,7 @@ android { defaultConfig { minSdkVersion 24 - targetSdkVersion 35 + targetSdkVersion 36 ndk { // The NativeScript platform build.gradle has already added all four // ABIs by the time app.gradle is applied, and abiFilters is additive, diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt index 8fd5929f..ee1c59fa 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt @@ -127,8 +127,6 @@ class FaceclawVoiceController(context: Context) { override fun release() {} } } - - override fun recordingSink(): RecordingSink = RecordingSink { pcmBytes, sampleRate -> saveRecording(pcmBytes, sampleRate) } } private val session = VoiceCaptureSession(host) @@ -146,11 +144,6 @@ class FaceclawVoiceController(context: Context) { session.setUsePhoneMic(usePhoneMic) } - /** When true, the decoded mic PCM for each session is saved as a WAV. */ - fun setSaveRecordings(saveRecordings: Boolean) { - session.setSaveRecordings(saveRecordings) - } - /** * Which on-device model {@link #start}("onboard") should load: "whisper" * selects the second on-device model (sherpa-onnx offline Whisper); any @@ -235,29 +228,6 @@ class FaceclawVoiceController(context: Context) { stop() } - /** Save the session's decoded mic PCM as a 16 kHz mono 16-bit WAV. */ - private fun saveRecording(pcmBytes: ByteArray, sampleRate: Int) { - try { - val dir = File(appContext.getExternalFilesDir(null), "voice-recordings") - if (!dir.exists() && !dir.mkdirs()) { - Log.w(TAG, "could not create voice-recordings dir") - return - } - val stamp = java.text.SimpleDateFormat("yyyyMMdd-HHmmss-SSS", java.util.Locale.US) - .format(java.util.Date()) - val file = File(dir, "voice-$stamp.wav") - java.io.FileOutputStream(file).use { fos -> - fos.write(BinaryEncoding.wavHeader(pcmBytes.size, sampleRate, 1)) - fos.write(pcmBytes) - } - Log.i(TAG, "saved voice recording " + file.absolutePath - + " samples=" + (pcmBytes.size / 2) - + " sec=" + String.format(java.util.Locale.US, "%.2f", pcmBytes.size / 2.0 / sampleRate)) - } catch (t: Throwable) { - Log.w(TAG, "failed to save voice recording", t) - } - } - /** * The on-device model directory for the given kind, populated by the * download flow in asr-model.ts (releases before 0.5.0 copied the diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/PreviewBitmapUtil.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/PreviewBitmapUtil.kt index 75135480..c7a53588 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/PreviewBitmapUtil.kt +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/PreviewBitmapUtil.kt @@ -62,7 +62,7 @@ class PreviewBitmapUtil private constructor() { /** * A white-on-transparent bitmap of an 8bpp glasses icon (gray becomes * alpha; black, which the glasses show as unlit, is transparent), for - * showing glasses artwork on the phone's dark action bar. + * showing glasses artwork in the phone UI, which tints it to suit. */ @JvmStatic fun whiteIconFromGray(gray: ByteBuffer?, width: Int, height: Int): Bitmap { diff --git a/App_Resources/Android/src/main/res/drawable/ic_tab_keyboard.xml b/App_Resources/Android/src/main/res/drawable/ic_control_keyboard.xml similarity index 72% rename from App_Resources/Android/src/main/res/drawable/ic_tab_keyboard.xml rename to App_Resources/Android/src/main/res/drawable/ic_control_keyboard.xml index 4e531df8..95c0470a 100644 --- a/App_Resources/Android/src/main/res/drawable/ic_tab_keyboard.xml +++ b/App_Resources/Android/src/main/res/drawable/ic_control_keyboard.xml @@ -1,7 +1,7 @@ - + - + icon #1368757); base fill is overridden by tint-color in remote-controls.css. --> + + + + diff --git a/App_Resources/iOS/Assets.xcassets/ic_tab_keyboard.imageset/Contents.json b/App_Resources/iOS/Assets.xcassets/ic_control_keyboard.imageset/Contents.json similarity index 74% rename from App_Resources/iOS/Assets.xcassets/ic_tab_keyboard.imageset/Contents.json rename to App_Resources/iOS/Assets.xcassets/ic_control_keyboard.imageset/Contents.json index aae26278..b98be0ae 100644 --- a/App_Resources/iOS/Assets.xcassets/ic_tab_keyboard.imageset/Contents.json +++ b/App_Resources/iOS/Assets.xcassets/ic_control_keyboard.imageset/Contents.json @@ -2,7 +2,7 @@ "images": [ { "idiom": "universal", - "filename": "ic_tab_keyboard@3x.png", + "filename": "ic_control_keyboard@3x.png", "scale": "3x" } ], diff --git a/App_Resources/iOS/Assets.xcassets/ic_tab_keyboard.imageset/ic_tab_keyboard@3x.png b/App_Resources/iOS/Assets.xcassets/ic_control_keyboard.imageset/ic_control_keyboard@3x.png similarity index 100% rename from App_Resources/iOS/Assets.xcassets/ic_tab_keyboard.imageset/ic_tab_keyboard@3x.png rename to App_Resources/iOS/Assets.xcassets/ic_control_keyboard.imageset/ic_control_keyboard@3x.png diff --git a/App_Resources/iOS/Assets.xcassets/ic_tab_mic.imageset/Contents.json b/App_Resources/iOS/Assets.xcassets/ic_control_mic.imageset/Contents.json similarity index 76% rename from App_Resources/iOS/Assets.xcassets/ic_tab_mic.imageset/Contents.json rename to App_Resources/iOS/Assets.xcassets/ic_control_mic.imageset/Contents.json index b5dfb395..43d26907 100644 --- a/App_Resources/iOS/Assets.xcassets/ic_tab_mic.imageset/Contents.json +++ b/App_Resources/iOS/Assets.xcassets/ic_control_mic.imageset/Contents.json @@ -2,7 +2,7 @@ "images": [ { "idiom": "universal", - "filename": "ic_tab_mic@3x.png", + "filename": "ic_control_mic@3x.png", "scale": "3x" } ], diff --git a/App_Resources/iOS/Assets.xcassets/ic_tab_mic.imageset/ic_tab_mic@3x.png b/App_Resources/iOS/Assets.xcassets/ic_control_mic.imageset/ic_control_mic@3x.png similarity index 100% rename from App_Resources/iOS/Assets.xcassets/ic_tab_mic.imageset/ic_tab_mic@3x.png rename to App_Resources/iOS/Assets.xcassets/ic_control_mic.imageset/ic_control_mic@3x.png diff --git a/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/Contents.json b/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/Contents.json new file mode 100644 index 00000000..15ba8958 --- /dev/null +++ b/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/Contents.json @@ -0,0 +1,13 @@ +{ + "images": [ + { + "idiom": "universal", + "filename": "ic_control_settings@3x.png", + "scale": "3x" + } + ], + "info": { + "author": "xcode", + "version": 1 + } +} diff --git a/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/ic_control_settings@3x.png b/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/ic_control_settings@3x.png new file mode 100644 index 00000000..91306b40 Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/ic_control_settings.imageset/ic_control_settings@3x.png differ diff --git a/PRIVACY b/PRIVACY index f906afdf..7b17a895 100644 --- a/PRIVACY +++ b/PRIVACY @@ -5,6 +5,8 @@ collects and shares information when you use an iOS TestFlight build, even when Faceclaw statistics are set to None. Information you voluntarily send us, such as feedback, may also identify you. This policy describes these separate channels and the third-party services you can choose to use. +On Android, Google ML Kit also collects SDK diagnostics separately from +Faceclaw statistics, as described below. ## Usage Statistics @@ -16,7 +18,8 @@ your choice at any time in Settings > Privacy > Faceclaw statistics. Until you choose, it is None. This setting controls only Faceclaw's own statistics. With None, Faceclaw sends and stores none of its own usage statistics. This -does not disable Apple's TestFlight reports or services you choose to use. +does not disable Apple's TestFlight reports, Google ML Kit diagnostics, or +services you choose to use. With Minimal, Faceclaw keeps counts on your phone and sends them about once a day to stats.faceclaw.org, a server run by Faceclaw's developers: @@ -48,6 +51,27 @@ phone, and stops all reports; turning them back on starts a new identifier. The statistics server doesn't record the IP addresses reports come from. +## Android and Google ML Kit + +Android translation and language identification use Google ML Kit. The +developer QR-code scanner uses Google's code scanner. Text and scanner +images are processed on-device, but the SDKs send Google diagnostic and +usage metrics over HTTPS: device/app details, installation identifiers, +timings, errors, feature events, input/output sizes, and detected or +configured languages. Translation also uses Firebase installation and +remote-configuration services. This reporting is separate from the +Faceclaw statistics setting; selecting None does not turn it off. Faceclaw +does not provide a switch to disable these SDK diagnostics. + +These metrics do not include the text being translated or scanned images. +Cloud transcription and assistant providers are separate, as described below. +For Google's handling of SDK metrics, see: + + https://developers.google.com/ml-kit/android-data-disclosure + https://developers.google.com/ml-kit/terms + https://policies.google.com/privacy + + ## iOS and TestFlight For TestFlight builds, Apple automatically collects crash reports and beta diff --git a/README.md b/README.md index 6952f2dc..fc17edc5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The instructions below build the Android app. If you want to customize faceclaw, the best way to do it is to download the source code and using a coding agent such as Codex or Claude Code. -To compile, you will need an Android SDK environment with SDK version 35 +To compile, you will need an Android SDK environment with SDK version 36 installed and licenses accepted, and the ANDROID_HOME pointing to the install. You will need Nativescript installed, and a JDK environment (v21), with the JAVA_HOME environment variable pointed at it. You will also need a reasonably diff --git a/app/analytics/privacy-disclosure.ts b/app/analytics/privacy-disclosure.ts index ede51f26..2ba2d915 100644 --- a/app/analytics/privacy-disclosure.ts +++ b/app/analytics/privacy-disclosure.ts @@ -4,3 +4,6 @@ */ export const IOS_PRIVACY_SUMMARY = "With TestFlight, crash/usage reports continue even with None. See Privacy policy for details."; + +export const ANDROID_PRIVACY_SUMMARY = + "Google ML Kit diagnostics for translation and QR scanning are separate from this setting. See Privacy policy for details."; diff --git a/app/app.css b/app/app.css index 28d6483c..89a15377 100644 --- a/app/app.css +++ b/app/app.css @@ -1,6 +1,7 @@ @import '@nativescript/theme/css/core.css'; @import '@nativescript/theme/css/default.css'; @import './phone-ui/remote-controls.css'; +@import './phone-ui/settings-page.css'; @import './phone-ui/pairing.css'; Page { @@ -17,9 +18,8 @@ ActionItem { color: #ffffff; } -/* The main page's custom titleView: title left; the EvenHub app icon, - * connection status and the warning triangle right-aligned beside the - * overflow menu. */ +/* The main page's custom titleView: title left; connection status and the + * warning triangle right-aligned beside the overflow menu. */ .action-bar-title { color: #ffffff; font-size: 18; @@ -34,16 +34,6 @@ ActionItem { vertical-align: center; } -/* The foreground EvenHub app's icon (opens its phone UI); the padding widens - * the tap target. */ -.action-bar-app-icon { - width: 32; - height: 32; - padding: 5.5; - margin-right: 8; - vertical-align: center; -} - /* The emoji brings its own yellow; the padding widens the tap target. */ .action-bar-warning { font-size: 18; diff --git a/app/app.ios.css b/app/app.ios.css index b3b6f08c..e0eace16 100644 --- a/app/app.ios.css +++ b/app/app.ios.css @@ -1,5 +1,6 @@ @import '@nativescript/theme/css/core.css'; @import './phone-ui/remote-controls.css'; +@import './phone-ui/settings-page.css'; @import './phone-ui/pairing.css'; .body-text { font-size: 18; } @@ -36,8 +37,6 @@ Page.main-page { .main-page .action-bar-title { font-size: 18; font-weight: bold; color: #ffffff; } .main-page .action-bar-status { font-size: 14; color: #ffffff; margin-right: 12; } .main-page .action-bar-warning { font-size: 18; padding: 4 6; } -/* Matches Android's 32x32 padded icon; the Image inside is 21x21. */ -.main-page .action-bar-app-icon { width: 32; height: 32; margin-right: 8; } .main-page .overflow-button { background-color: transparent; color: #ffffff; @@ -47,9 +46,6 @@ Page.main-page { margin: 0; padding: 0; } -/* Match Android's button layout boxes, including the inset around each tile. */ -.main-page Button.tab-button { height: 48; margin-top: 6; margin-bottom: 6; } -.main-page .mode-button { background-color: #e2e2e2; color: #333333; border-radius: 6; } .main-page .ble-bandwidth-indicator { color: #777777; font-size: 12; padding: 2 8; } .main-page .system-name-modal { diff --git a/app/apps/ai-chat/ai-chat-app.ts b/app/apps/ai-chat/ai-chat-app.ts index 2c897fd6..95e9ac02 100644 --- a/app/apps/ai-chat/ai-chat-app.ts +++ b/app/apps/ai-chat/ai-chat-app.ts @@ -13,6 +13,10 @@ import { createInProcessWindow, type InProcessAppOptions, type InProcessWindow } import { shell } from "../../ui/shell/shell"; import { VoiceDraft } from "./voice-draft"; +/** The transcript's scrollbar, hugging the window's right padding, and the gap the text keeps from it. */ +const SCROLLBAR_WIDTH = 2; +const SCROLLBAR_GAP = 11; + class AiChatLayer implements Layer { readonly acceptsDirectional = true; private firstLine: number | null = null; // null follows the streaming tail @@ -38,24 +42,30 @@ class AiChatLayer implements Layer { } paint(ctx: LayerContext): GrayImage { const size = ctx.stack.getBaseSize(); + const { padding } = size; const image = new GrayImage(size.width, size.height); const font = getDefaultSmallFont(); const step = font.lineHeight + 3; - const left = 12; - const width = size.width - 28; + // The title, and the footer under the transcript, stay put inside the + // padding suggested for the window's edges; the transcript scrolls + // between them. Text runs from the left padding to the gutter kept for + // the scrollbar. + const left = padding.left; + const scrollbarX = size.width - padding.right - SCROLLBAR_WIDTH; + const width = Math.max(0, scrollbarX - SCROLLBAR_GAP - left); const record = this.conversations.current(); if (this.selectedId !== record.id) { this.selectedId = record.id; this.firstLine = null; } const transcript = record.session?.transcript ?? record.history?.transcript ?? []; const title = this.conversations.title(); - image.drawText(font, left, 6, truncateText(font, title, width), 180); + image.drawText(font, left, padding.top, truncateText(font, title, width), 180); const label = assistantBackendSetting.get() === "external" ? "External agent" : `${assistantModelLabel(record.model)} · ${record.reasoning === "default" ? "default reasoning" : record.reasoning}`; const footer = wrapText(font, `${label} ${gestureHints([ [GESTURE_CLICK, "menu"], [GESTURE_DOUBLE_CLICK, "back"], [GESTURE_LONG_PRESS, "hold to talk"], ])}`, width); - const footerY = size.height - step * footer.length; + const footerY = size.height - padding.bottom - font.lineHeight - step * (footer.length - 1); const footerTop = footerY - step * 3 - 12; - const historyTop = step + 16; + const historyTop = padding.top + step + 10; const visible = Math.max(1, Math.floor((footerTop - historyTop - 8) / step)); const lines: { text: string; color: number }[] = []; for (const entry of transcript) { @@ -82,7 +92,7 @@ class AiChatLayer implements Layer { if (this.maxFirstLine > 0) { const track = visible * step; const thumb = Math.max(8, Math.floor(track * visible / lines.length)); - image.fillRect(size.width - 5, historyTop + Math.floor((track - thumb) * first / this.maxFirstLine), 2, thumb, 110); + image.fillRect(scrollbarX, historyTop + Math.floor((track - thumb) * first / this.maxFirstLine), SCROLLBAR_WIDTH, thumb, 110); } image.fillRect(left, footerTop, width, 1, 65); const state = this.draft.active ? this.draft.status : record.session?.status || this.draft.status; diff --git a/app/apps/blocks/blocks-app.worker.ts b/app/apps/blocks/blocks-app.worker.ts index 7ab33372..3580bee9 100644 --- a/app/apps/blocks/blocks-app.worker.ts +++ b/app/apps/blocks/blocks-app.worker.ts @@ -25,6 +25,7 @@ import { loadSoundEnabled, saveSoundEnabled } from "../../ui/sound-setting"; import { type MenuItem } from "../../ui/menu"; import { WindowMenu } from "../../ui/window-menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import { directionalFallback, GESTURE_CLICK, @@ -155,6 +156,13 @@ type BlocksWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there. The window menu's layers + * lay out by it; the game's own layout is fixed art that keeps its place + * (see LAYOUT_HEIGHT). + */ + viewport: Viewport; foreground: boolean; /** Whether this window is the shell's input target (pushed with each message). */ focused: boolean; @@ -207,6 +215,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -295,7 +304,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.menu?.resize({ width: window.viewportWidth, height: window.viewportHeight }); + window.viewport = message.viewport; + window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; if (window.foreground) renderAndSubmit(window, 0); break; @@ -357,7 +367,7 @@ function windowMenu(window: BlocksWindow): WindowMenu { title: () => window.title, items: () => (window.phase === "playing" ? [] : windowMenuItems(window)), claimsLongPress: () => window.phase === "playing", - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: window.viewport, paintBase: () => paintContent(window), isFocused: () => window.focused, }); diff --git a/app/apps/calculator/calculator-graph.ts b/app/apps/calculator/calculator-graph.ts index 62c73362..f0a14e6d 100644 --- a/app/apps/calculator/calculator-graph.ts +++ b/app/apps/calculator/calculator-graph.ts @@ -35,25 +35,27 @@ export function drawGraph( const clampX = (x: number): number => Math.max(rect.x, Math.min(rect.x + rect.width - 1, x)); const clampY = (y: number): number => Math.max(rect.y, Math.min(rect.y + rect.height - 1, y)); - // Tick grid first so the curve and axes draw over it. + // Tick grid first so the curve and axes draw over it. A tick or axis at + // the viewport's far limit lands on the frame's last column or row, not + // past it: the caller may have run the rect to the window's edge. for (const tick of graph.xAxis.ticks) { if (tick < viewport.xMin || tick > viewport.xMax) continue; - const x = Math.round(px(tick)); + const x = Math.round(clampX(px(tick))); image.drawLine(x, rect.y, x, rect.y + rect.height - 1, GRID_VALUE); } for (const tick of graph.yAxis.ticks) { if (tick < viewport.yMin || tick > viewport.yMax) continue; - const y = Math.round(py(tick)); + const y = Math.round(clampY(py(tick))); image.drawLine(rect.x, y, rect.x + rect.width - 1, y, GRID_VALUE); } // Axes. if (viewport.yMin <= 0 && viewport.yMax >= 0) { - const y = Math.round(py(0)); + const y = Math.round(clampY(py(0))); image.drawLine(rect.x, y, rect.x + rect.width - 1, y, AXIS_VALUE); } if (viewport.xMin <= 0 && viewport.xMax >= 0) { - const x = Math.round(px(0)); + const x = Math.round(clampX(px(0))); image.drawLine(x, rect.y, x, rect.y + rect.height - 1, AXIS_VALUE); } diff --git a/app/apps/calculator/calculator.ts b/app/apps/calculator/calculator.ts index 6c7b3263..b6da988a 100644 --- a/app/apps/calculator/calculator.ts +++ b/app/apps/calculator/calculator.ts @@ -62,6 +62,24 @@ export const calculatorDegreesSetting = new ConfigSettingBoolean({ const CONTINUOUS_CLIENT = "calculator"; const DICTATION_HOLDER = "calculator-dictation"; +// --------------------------------------------------------------------------- +// Layout + +/** + * The column the view is laid out in: the window's width inside the padding + * suggested for its side edges (viewport.ts). Tabs, text, the plot and the + * footer all start at its left; centred text is centred in it. + */ +type Column = { x: number; width: number }; + +/** Below the tabs' text top: their underline, and where the body starts. */ +const TAB_UNDERLINE_OFFSET = 20; +const BODY_TOP_OFFSET = 31; +/** Indent, on both sides, of wrapped body text (a failure's reason, a step's detail, an answer). */ +const BODY_INDENT = 8; +/** The same for the prompt of an empty view, which keeps well clear of the sides. */ +const PROMPT_INDENT = 24; + // --------------------------------------------------------------------------- // Layer @@ -380,14 +398,17 @@ export class CalculatorLayer implements Layer { // Paint paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const small = getDefaultSmallFont(); + const column: Column = { x: padding.left, width: Math.max(0, width - padding.left - padding.right) }; - this.paintTabs(image, small, width); + // The tabs sit at the top edge's padding and the footer at the bottom's; + // the body is what lies between. + this.paintTabs(image, small, column, padding.top); - const footerY = height - small.lineHeight - 6; - const bodyTop = 46; + const footerY = height - padding.bottom - small.lineHeight; + const bodyTop = padding.top + BODY_TOP_OFFSET; let bodyBottom = footerY - 4; // A standing offer or a running deep pass takes the rows just above the @@ -395,35 +416,36 @@ export class CalculatorLayer implements Layer { const offer = this.coordinator.pendingLongRun; const progress = this.coordinator.longRunProgress; if (offer || progress) { - bodyBottom = this.paintLongRunPanel(image, small, width, bodyBottom, offer, progress); + bodyBottom = this.paintLongRunPanel(image, small, column, bodyBottom, offer, progress); } if (this.working) { - this.drawCentered(image, small, Math.round((bodyTop + bodyBottom) / 2) - 8, "Working…", 180); + this.drawCentered(image, small, column, Math.round((bodyTop + bodyBottom) / 2) - 8, "Working…", 180); } else if (this.lastFailure !== null) { - this.paintFailure(image, small, width, bodyTop, bodyBottom); + this.paintFailure(image, small, column, bodyTop, bodyBottom); } else if (this.mode === "explain" && this.coordinator.stepPosition !== null) { - this.paintExplain(image, width, bodyTop, bodyBottom); + this.paintExplain(image, column, bodyTop, bodyBottom); } else if (this.mode === "graph" && this.coordinator.lastGraph) { - this.paintGraph(image, small, width, bodyTop, bodyBottom); + this.paintGraph(image, small, column, bodyTop, bodyBottom); } else if (this.lastAnswer) { - this.paintAnswer(image, width, bodyTop, bodyBottom); + this.paintAnswer(image, column, bodyTop, bodyBottom); } else { - this.paintEmpty(image, small, width, bodyTop, bodyBottom); + this.paintEmpty(image, small, column, bodyTop, bodyBottom); } - image.drawText(small, 24, footerY, this.footerHints(), 110); + image.drawText(small, column.x, footerY, this.footerHints(), 110); return image; } - /** The three modes as tabs, plus the deg/listening status chips. */ - private paintTabs(image: GrayImage, font: UiFont, width: number): void { - let x = 24; + /** The three modes as tabs from `y` down, plus the deg/listening status chips. */ + private paintTabs(image: GrayImage, font: UiFont, column: Column, y: number): void { + let x = column.x; + const underlineY = y + TAB_UNDERLINE_OFFSET; for (const mode of CALCULATOR_MODES) { const label = modeLabel(mode); const active = mode === this.mode; - image.drawText(font, x, 15, label, active ? 245 : 105); - image.drawLine(x, 35, x + font.measureText(label), 35, active ? 200 : 30); + image.drawText(font, x, y, label, active ? 245 : 105); + image.drawLine(x, underlineY, x + font.measureText(label), underlineY, active ? 200 : 30); x += font.measureText(label) + 18; } @@ -433,28 +455,28 @@ export class CalculatorLayer implements Layer { else if (this.continuousActive && this.foreground) chips.push("mic on"); if (chips.length > 0) { const text = chips.join(" · "); - image.drawText(font, width - 24 - font.measureText(text), 15, text, this.dictating ? 220 : 110); + image.drawText(font, column.x + column.width - font.measureText(text), y, text, this.dictating ? 220 : 110); } } private paintFailure( image: GrayImage, font: UiFont, - width: number, + column: Column, bodyTop: number, bodyBottom: number, ): void { - this.paintHeardLine(image, font, width, bodyTop); + this.paintHeardLine(image, font, column, bodyTop); const top = this.lastInput ? bodyTop + lineStep(font) + 6 : bodyTop + 8; - const lines = wrapText(font, this.lastFailure ?? "", width - 64); + const lines = wrapText(font, this.lastFailure ?? "", column.width - 2 * BODY_INDENT); const step = lineStep(font); const maxLines = Math.max(1, Math.floor((bodyBottom - top) / step)); for (let index = 0; index < Math.min(lines.length, maxLines); index++) { - image.drawText(font, 32, top + index * step, lines[index]!, 200); + image.drawText(font, column.x + BODY_INDENT, top + index * step, lines[index]!, 200); } } - private paintExplain(image: GrayImage, width: number, bodyTop: number, bodyBottom: number): void { + private paintExplain(image: GrayImage, column: Column, bodyTop: number, bodyBottom: number): void { const small = getDefaultSmallFont(); const medium = getDefaultMediumFont(); const position = this.coordinator.stepPosition; @@ -463,63 +485,65 @@ export class CalculatorLayer implements Layer { if (!position || !step) return; let y = bodyTop + 2; - image.drawText(small, 24, y, `Step ${position.index + 1} of ${position.total}`, 130); + image.drawText(small, column.x, y, `Step ${position.index + 1} of ${position.total}`, 130); y += lineStep(small) + 2; - image.drawText(medium, 24, y, truncateText(medium, step.title, width - 48), 245); + image.drawText(medium, column.x, y, truncateText(medium, step.title, column.width), 245); y += lineStep(medium) + 2; - image.drawText(medium, 24, y, truncateText(medium, plain(step.expression), width - 48), 220); + image.drawText(medium, column.x, y, truncateText(medium, plain(step.expression), column.width), 220); y += lineStep(medium) + 6; - const detailLines = wrapText(small, step.detail, width - 64); + const detailLines = wrapText(small, step.detail, column.width - 2 * BODY_INDENT); const stepPitch = lineStep(small); const maxLines = Math.max(0, Math.floor((bodyBottom - y) / stepPitch)); for (let index = 0; index < Math.min(detailLines.length, maxLines); index++) { - image.drawText(small, 32, y + index * stepPitch, detailLines[index]!, 150); + image.drawText(small, column.x + BODY_INDENT, y + index * stepPitch, detailLines[index]!, 150); } } private paintGraph( image: GrayImage, font: UiFont, - width: number, + column: Column, bodyTop: number, bodyBottom: number, ): void { const graph = this.coordinator.lastGraph; if (!graph) return; const headline = this.lastAnswer.split("\n")[0] ?? ""; - image.drawText(font, 24, bodyTop, truncateText(font, headline, width - 48), 200); + image.drawText(font, column.x, bodyTop, truncateText(font, headline, column.width), 200); + // The plot's frame spans the column, so it meets the side padding itself. const plotTop = bodyTop + lineStep(font) + 4; drawGraph(image, graph, { - x: 18, + x: column.x, y: plotTop, - width: width - 36, + width: column.width, height: Math.max(2, bodyBottom - plotTop), }); } - private paintAnswer(image: GrayImage, width: number, bodyTop: number, bodyBottom: number): void { + private paintAnswer(image: GrayImage, column: Column, bodyTop: number, bodyBottom: number): void { const small = getDefaultSmallFont(); - this.paintHeardLine(image, small, width, bodyTop); + this.paintHeardLine(image, small, column, bodyTop); const top = this.lastInput ? bodyTop + lineStep(small) + 4 : bodyTop; // A short single-line answer earns the large font; anything longer drops // to the medium font and wraps. const lines = this.lastAnswer.split("\n"); const large = getDefaultLargeFont(); - if (lines.length === 1 && large.measureText(lines[0]!) <= width - 64) { + const maxWidth = column.width - 2 * BODY_INDENT; + if (lines.length === 1 && large.measureText(lines[0]!) <= maxWidth) { const y = Math.round((top + bodyBottom - large.lineHeight) / 2); - this.drawCentered(image, large, y, lines[0]!, 245); + this.drawCentered(image, large, column, y, lines[0]!, 245); return; } const medium = getDefaultMediumFont(); - const wrapped = lines.flatMap((line) => wrapText(medium, line, width - 64)); + const wrapped = lines.flatMap((line) => wrapText(medium, line, maxWidth)); const step = lineStep(medium); const maxLines = Math.max(1, Math.floor((bodyBottom - top) / step)); const shown = wrapped.slice(0, maxLines); let y = Math.max(top, Math.round((top + bodyBottom - shown.length * step) / 2)); for (const line of shown) { - this.drawCentered(image, medium, y, line, 235); + this.drawCentered(image, medium, column, y, line, 235); y += step; } } @@ -527,7 +551,7 @@ export class CalculatorLayer implements Layer { private paintEmpty( image: GrayImage, font: UiFont, - width: number, + column: Column, bodyTop: number, bodyBottom: number, ): void { @@ -536,31 +560,32 @@ export class CalculatorLayer implements Layer { : this.listening === "continuous" ? `Say a problem, then "${modeLabel(this.mode).toLowerCase()} it"` : "Tap to say a problem — or use Voice input to type one"; - const lines = wrapText(font, prompt, width - 96); + const lines = wrapText(font, prompt, column.width - 2 * PROMPT_INDENT); const step = lineStep(font); let y = Math.round((bodyTop + bodyBottom - lines.length * step) / 2); for (const line of lines) { - this.drawCentered(image, font, y, line, 150); + this.drawCentered(image, font, column, y, line, 150); y += step; } } - private paintHeardLine(image: GrayImage, font: UiFont, width: number, y: number): void { + private paintHeardLine(image: GrayImage, font: UiFont, column: Column, y: number): void { if (!this.lastInput) return; const label = this.textInput ? "Entered" : "Heard"; - image.drawText(font, 24, y, label, 110); - const x = 24 + font.measureText(label) + 10; - image.drawText(font, x, y, truncateText(font, this.lastInput, width - x - 24), 160); + image.drawText(font, column.x, y, label, 110); + const x = column.x + font.measureText(label) + 10; + image.drawText(font, x, y, truncateText(font, this.lastInput, column.x + column.width - x), 160); } /** * The standing offer, or the live progress of an accepted run, in the two - * rows above the footer. Returns the new body bottom. + * rows above the footer, under a rule across the column. Returns the new + * body bottom. */ private paintLongRunPanel( image: GrayImage, font: UiFont, - width: number, + column: Column, bodyBottom: number, offer: LongRunOffer | null, progress: LongRunProgress | null, @@ -572,9 +597,9 @@ export class CalculatorLayer implements Layer { ? offerGlassesPrompt(offer).split("\n") : []; const panelTop = bodyBottom - lines.length * step - 6; - image.drawLine(16, panelTop, width - 16, panelTop, 40); + if (column.width > 0) image.drawLine(column.x, panelTop, column.x + column.width - 1, panelTop, 40); for (let index = 0; index < lines.length; index++) { - image.drawText(font, 24, panelTop + 4 + index * step, truncateText(font, lines[index]!, width - 48), 190); + image.drawText(font, column.x, panelTop + 4 + index * step, truncateText(font, lines[index]!, column.width), 190); } return panelTop - 2; } @@ -604,8 +629,8 @@ export class CalculatorLayer implements Layer { ]); } - private drawCentered(image: GrayImage, font: UiFont, y: number, text: string, value: number): void { - const x = Math.max(0, Math.round((image.width - font.measureText(text)) / 2)); + private drawCentered(image: GrayImage, font: UiFont, column: Column, y: number, text: string, value: number): void { + const x = column.x + Math.max(0, Math.round((column.width - font.measureText(text)) / 2)); image.drawText(font, x, y, text, value); } } diff --git a/app/apps/calendar/calendar.ts b/app/apps/calendar/calendar.ts index 4272cd97..5d112ab4 100644 --- a/app/apps/calendar/calendar.ts +++ b/app/apps/calendar/calendar.ts @@ -8,14 +8,25 @@ import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures"; import { hasCalendarPermission } from "../../native/calendar-permissions"; import { type Layer, type LayerContext } from "../../ui/layers"; import { lineStep } from "../../ui/metrics"; +import type { Viewport } from "../../ui/viewport"; -// Title position, shared with the other list apps (terminal, notifications). -const TITLE_X = 18; -const TITLE_Y = 10; -const LIST_TOP = 38; -const ROW_X = 16; +/** How far a row's text sits inside its selection box; the title lines up with it. */ +const ROW_TEXT_INSET = 10; +/** + * The title's drop below the window's top padding (the position shared with + * the other list apps: terminal, notifications), and the distance from its + * top to the first row. + */ +const TITLE_OFFSET_Y = 2; +const TITLE_BAND = 28; const ROW_GAP = 4; const MAX_EVENTS = 50; +/** + * The message shown in place of the list (no permission, nothing to show): + * its indent from the title, and its drop below the window's top padding. + */ +const MESSAGE_INDENT = 6; +const MESSAGE_OFFSET_Y = 64; /** Height of the day header band above a row that starts a new day. */ function dayHeaderHeight(font: UiFont): number { @@ -46,20 +57,25 @@ export class CalendarLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const viewport = ctx.stack.getBaseSize(); + const { width, height, padding } = viewport; const image = new GrayImage(width, height, 0); + // Rows' selection boxes sit at the padding suggested for the window's + // side edges; the title lines up with their text. + const titleX = padding.left + ROW_TEXT_INSET; + const titleY = padding.top + TITLE_OFFSET_Y; if (!hasCalendarPermission()) { - image.drawText(font, TITLE_X, TITLE_Y, "Calendar", 220); - this.paintPermissionPrompt(image, font, width, height); + image.drawText(font, titleX, titleY, "Calendar", 220); + this.paintPermissionPrompt(image, font, viewport); return image; } const events = readUpcomingEvents(MAX_EVENTS); if (!events.length) { - image.drawText(font, TITLE_X, TITLE_Y, "Calendar", 220); + image.drawText(font, titleX, titleY, "Calendar", 220); const state = getCalendarReadState(); - image.drawText(font, 24, 72, state === "loading" ? "Loading calendar..." + image.drawText(font, titleX + MESSAGE_INDENT, padding.top + MESSAGE_OFFSET_Y, state === "loading" ? "Loading calendar..." : state === "error" ? "Calendar unavailable. Try again shortly." : "No upcoming events.", 190); return image; } @@ -67,22 +83,26 @@ export class CalendarLayer implements Layer { const rows = buildEventRows(font, events); this.selectedIndex = clamp(this.selectedIndex, 0, rows.length - 1); - const listBottom = height; - const scrollY = scrollForSelected(rows, this.selectedIndex, listBottom - LIST_TOP); + // The agenda scrolls, so it runs to the window's top and bottom edges + // and rows scrolled past an end are cut off right at the edge. The + // padding suggested for those edges is inside the scrolled content + // instead: above the title and below the last row. + const listTop = titleY + TITLE_BAND; + const scrollY = scrollForSelected(rows, this.selectedIndex, height - listTop, padding.bottom); // The title scrolls away with the list; row text is deferred glyphs // (composited above raster fills), so a fixed title would show through // rows scrolled over it. - if (TITLE_Y - scrollY + font.lineHeight > 0) { - image.drawText(font, TITLE_X, TITLE_Y - scrollY, "Calendar", 220); + if (titleY - scrollY + font.lineHeight > 0) { + image.drawText(font, titleX, titleY - scrollY, "Calendar", 220); } - let cursorY = LIST_TOP - scrollY; - for (let index = 0; index < rows.length; index++) { + const rowWidth = width - padding.left - padding.right; + let cursorY = listTop - scrollY; + for (let index = 0; index < rows.length && cursorY < height; index++) { const row = rows[index]!; - if (cursorY + row.height >= LIST_TOP && cursorY <= listBottom) { - drawEventRow(image, font, row, ROW_X, cursorY, width, index === this.selectedIndex); + if (cursorY + row.height > 0) { + drawEventRow(image, font, row, padding.left, cursorY, rowWidth, index === this.selectedIndex); } cursorY += row.height + ROW_GAP; - if (cursorY > listBottom + 80) break; } return image; } @@ -102,13 +122,21 @@ export class CalendarLayer implements Layer { } } - private paintPermissionPrompt(image: GrayImage, font: UiFont, width: number, height: number): void { + private paintPermissionPrompt(image: GrayImage, font: UiFont, viewport: Viewport): void { + const { width, height, padding } = viewport; const message = "Grant calendar permission on your phone to see your events on the glasses."; - const lines = wrapText(font, message, width - 48); - for (let index = 0; index < lines.length; index++) { - image.drawText(font, 24, 72 + index * lineStep(font), lines[index]!, 190); + // Indented under the title, and as far short of the right padding. + const indent = ROW_TEXT_INSET + MESSAGE_INDENT; + const x = padding.left + indent; + const lines = wrapText(font, message, width - padding.left - padding.right - 2 * indent); + // The hint rests on the bottom padding; the message keeps to the lines that fit above it. + const hintY = height - padding.bottom - font.lineHeight; + const top = padding.top + MESSAGE_OFFSET_Y; + const maxLines = Math.max(1, Math.floor((hintY - top) / lineStep(font))); + for (let index = 0; index < Math.min(lines.length, maxLines); index++) { + image.drawText(font, x, top + index * lineStep(font), lines[index]!, 190); } - image.drawText(font, 24, height - 36, `${GESTURE_CLICK} request`, 110); + image.drawText(font, x, hintY, `${GESTURE_CLICK} request`, 110); } } @@ -137,6 +165,7 @@ function buildEventRows(font: UiFont, events: CalendarEvent[]): EventRow[] { return rows; } +/** Draw a row whose selection box spans `width` from `x`; its day header and text sit ROW_TEXT_INSET inside that. */ function drawEventRow( image: GrayImage, font: UiFont, @@ -146,30 +175,38 @@ function drawEventRow( width: number, selected: boolean, ): void { + const textX = x + ROW_TEXT_INSET; let cursorY = y; if (row.dayHeader) { - image.drawText(font, x, cursorY + 2, row.dayHeader, 150); + image.drawText(font, textX, cursorY + 2, row.dayHeader, 150); cursorY += dayHeaderHeight(font); } const bodyHeight = row.lines.length * lineStep(font) + 4; if (selected) { - image.fillRoundedRect(x - 6, cursorY, width - 2 * (x - 6), bodyHeight, 15, 6); - image.drawRoundedRect(x - 6, cursorY, width - 2 * (x - 6), bodyHeight, 90, 6); + image.fillRoundedRect(x, cursorY, width, bodyHeight, 15, 6); + image.drawRoundedRect(x, cursorY, width, bodyHeight, 90, 6); } - const maxTextWidth = width - 2 * x; + const maxTextWidth = width - 2 * ROW_TEXT_INSET; for (let index = 0; index < row.lines.length; index++) { const value = index === 0 ? (selected ? 235 : 205) : 160; - image.drawText(font, x, cursorY + 3 + index * lineStep(font), truncateText(font, row.lines[index]!, maxTextWidth), value); + image.drawText(font, textX, cursorY + 3 + index * lineStep(font), truncateText(font, row.lines[index]!, maxTextWidth), value); } } -function scrollForSelected(rows: EventRow[], selectedIndex: number, viewportHeight: number): number { +/** + * The scroll offset that centers the selected row in `viewportHeight`, the + * room below the title's resting place, within the ends of what scrolls + * there: the rows, then `padBottom` after the last of them. So the first + * row rests with the title and the padding above it in view, and the last + * with the padding below it. + */ +function scrollForSelected(rows: EventRow[], selectedIndex: number, viewportHeight: number, padBottom: number): number { let selectedTop = 0; for (let index = 0; index < selectedIndex; index++) { selectedTop += rows[index]!.height + ROW_GAP; } const selectedBottom = selectedTop + rows[selectedIndex]!.height; - const contentHeight = rows.reduce((sum, row) => sum + row.height + ROW_GAP, 0); + const contentHeight = rows.reduce((sum, row) => sum + row.height + ROW_GAP, -ROW_GAP) + padBottom; const maxScroll = Math.max(0, contentHeight - viewportHeight); const centered = selectedTop - Math.max(0, (viewportHeight - (selectedBottom - selectedTop)) / 2); return clamp(centered | 0, 0, maxScroll); diff --git a/app/apps/compass/calibration-layer.ts b/app/apps/compass/calibration-layer.ts index 772fccef..f9af9b36 100644 --- a/app/apps/compass/calibration-layer.ts +++ b/app/apps/compass/calibration-layer.ts @@ -25,10 +25,6 @@ const INSTRUCTIONS_BY_FRAME: Record = { magnetic: "magnetic compass heading (as read by another compass), then adjust the calibration offset below", }; -/** Margins around the instruction paragraph. */ -const TEXT_PADDING_X = 16; -const TEXT_PADDING_TOP = 10; - export class CompassCalibrationLayer implements Layer { constructor( /** Current uncorrected magnetometer heading, or null before the first reading. */ @@ -36,7 +32,7 @@ export class CompassCalibrationLayer implements Layer { ) {} paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const small = getDefaultSmallFont(); const medium = getDefaultMediumFont(); @@ -47,14 +43,17 @@ export class CompassCalibrationLayer implements Layer { // Before the first reading there is no frame to name yet; the true-mode // wording is the default and the readout will correct it once data arrives. const frame = resolved?.frame ?? "true"; - const lines = wrapText(small, INSTRUCTIONS_PREAMBLE + INSTRUCTIONS_BY_FRAME[frame], width - TEXT_PADDING_X * 2); + // The instructions fill the width inside the padding suggested for the + // window's edges, from the top's down. + const lines = wrapText(small, INSTRUCTIONS_PREAMBLE + INSTRUCTIONS_BY_FRAME[frame], Math.max(0, width - padding.left - padding.right)); for (let i = 0; i < lines.length; i++) { - image.drawText(small, TEXT_PADDING_X, TEXT_PADDING_TOP + i * smallStep, lines[i]!, 190); + image.drawText(small, padding.left, padding.top + i * smallStep, lines[i]!, 190); } - const textBottom = TEXT_PADDING_TOP + lines.length * smallStep; + const textBottom = padding.top + lines.length * smallStep; - // Readouts along the bottom: dim label over a bright value, in thirds. - const valueTop = height - medium.lineHeight; + // Readouts along the bottom, above its padding: dim label over a bright + // value, in equal columns. + const valueTop = height - padding.bottom - medium.lineHeight; const labelTop = valueTop - small.lineHeight; const columns: Array<[string, string]> = [ ["Raw", raw === null ? "--°" : `${Math.round(raw)}°`], diff --git a/app/apps/compass/compass-app.ts b/app/apps/compass/compass-app.ts index 8c01ff0f..714515ce 100644 --- a/app/apps/compass/compass-app.ts +++ b/app/apps/compass/compass-app.ts @@ -41,18 +41,9 @@ export const COMPASS_SURFACE_ID = "window:compass"; const RECONCILE_INTERVAL_MS = 400; /** Vertical breathing room between the readout, the status line and the rose. */ const STACK_GAP = 8; -/** Padding above the readout and below the rose's near edge. */ -const TOP_PAD = 2; -const BOTTOM_PAD = 4; -/** Clearance between the rose's widest point and the viewport edge. */ -const EDGE_PAD = 8; -/** Inset of the top-right magnetometer calibration readout from the window edges. */ -const ACCURACY_TOP_PAD = TOP_PAD + 4; -const ACCURACY_RIGHT_PAD = EDGE_PAD + 4; /** Cap on the rose's radius, so a tall window doesn't get a comical one. */ const MAX_ROSE_RADIUS = 98; - class CompassLayer implements Layer { private rawHeading: number | null = null; private diagnostics: CompassDiagnostics | null = null; @@ -161,35 +152,41 @@ class CompassLayer implements Layer { } paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const small = getDefaultSmallFont(); const large = getDefaultLargeFont(); const heading = this.rawHeading === null ? null : resolveHeading(this.rawHeading).displayDegrees; const headingText = heading === null ? "--°" : `${Math.round(heading)}° ${cardinalDirection(heading)}`; - const statusLines = wrapText(small, this.statusText(), width - STACK_GAP * 2); + // Text and the rose keep inside the padding suggested for the window's edges. + const textWidth = Math.max(0, width - padding.left - padding.right); + const statusLines = wrapText(small, this.statusText(), textWidth); const smallStep = lineStep(small); - const headingFont = large.measureText(headingText) <= width - EDGE_PAD * 2 ? large : small; + const headingFont = large.measureText(headingText) <= textWidth ? large : small; const readoutWidth = headingFont.measureText(headingText); const readoutHeight = headingFont.lineHeight; // One column centred on the display's true centre, so the rose sits where // the wearer is looking rather than 32px beside it (with a side strip). const cx = screenCenterInViewportX(); + // A line of that column: centred there, short of leaving the padded width. + const lineX = (lineWidth: number) => + Math.round(Math.max(padding.left, Math.min(width - padding.right - lineWidth, cx - lineWidth / 2))); // The rose is sized and placed first — it hangs off the bottom edge — and - // the readout then floats in whatever room is left above it. + // the readout then floats in whatever room is left above it. Its far + // edges land on the last row and column inside the padding. const textHeight = readoutHeight + 4 + statusLines.length * smallStep; const { cy, radius, ringTop } = layoutCompassRose({ width, height, cx, - topClearance: TOP_PAD + textHeight + STACK_GAP, - bottomPad: BOTTOM_PAD, - edgePad: EDGE_PAD, + topClearance: padding.top + textHeight + STACK_GAP, + bottomPad: padding.bottom + 1, + edgePad: { left: padding.left, right: padding.right + 1 }, maxRadius: MAX_ROSE_RADIUS, }); - let y = Math.max(TOP_PAD, Math.round((ringTop - TICK_HEIGHT - textHeight) / 2)); + let y = Math.max(padding.top, Math.round((ringTop - TICK_HEIGHT - textHeight) / 2)); const fade = heading === null ? 0.45 : 1; const clipY = y + textHeight + 6; const backgroundKey = [width, height, cx, cy, radius, clipY, fade].join(","); @@ -201,16 +198,16 @@ class CompassLayer implements Layer { } const image = this.background.image.clone(); drawCompassRose(image, cx, cy, radius, heading); - const readoutX = Math.round(Math.max(EDGE_PAD, Math.min(width - EDGE_PAD - readoutWidth, cx - readoutWidth / 2))); - image.drawText(headingFont, readoutX, y, headingText, heading === null ? 150 : 255); + image.drawText(headingFont, lineX(readoutWidth), y, headingText, heading === null ? 150 : 255); y += readoutHeight + 4; for (const line of statusLines) { - image.drawText(small, Math.round(cx - small.measureText(line) / 2), y, line, 125); + image.drawText(small, lineX(small.measureText(line)), y, line, 125); y += smallStep; } if (glassesHaveCompass()) { + // The magnetometer calibration readout sits in the window's top-right corner. const accuracyText = magneticAccuracyText(this.diagnostics); - image.drawText(small, width - ACCURACY_RIGHT_PAD - small.measureText(accuracyText), ACCURACY_TOP_PAD, accuracyText, 175); + image.drawText(small, width - padding.right - small.measureText(accuracyText), padding.top, accuracyText, 175); } return image; diff --git a/app/apps/compass/compass-rose.ts b/app/apps/compass/compass-rose.ts index f32be49f..0e266530 100644 --- a/app/apps/compass/compass-rose.ts +++ b/app/apps/compass/compass-rose.ts @@ -78,17 +78,19 @@ export function layoutCompassRose(options: { /** Lowest y already used above the rose (readout text, its gap). */ topClearance: number; bottomPad: number; - edgePad: number; + /** Clearance between the rose's widest point and the box's sides: one figure for both, or each side's. */ + edgePad: number | { left: number; right: number }; maxRadius: number; minRadius?: number; }): { cx: number; cy: number; radius: number; ringTop: number } { const { width, height, cx } = options; + const sidePad = typeof options.edgePad === "number" ? { left: options.edgePad, right: options.edgePad } : options.edgePad; const radius = Math.max( options.minRadius ?? 24, Math.min( options.maxRadius, Math.floor((height - options.bottomPad - options.topClearance - TICK_HEIGHT) / (RING_HEIGHT_PER_RADIUS + DISC_DEPTH)), - Math.floor((Math.min(cx, width - cx) - options.edgePad) / RING_HALF_WIDTH_PER_RADIUS), + Math.floor(Math.min(cx - sidePad.left, width - cx - sidePad.right) / RING_HALF_WIDTH_PER_RADIUS), ), ); // The wall hangs below the rim, so the near rim sits a wall's depth up diff --git a/app/apps/developer/accelerometer-demo.ts b/app/apps/developer/accelerometer-demo.ts index bdc88c0a..2e39c14d 100644 --- a/app/apps/developer/accelerometer-demo.ts +++ b/app/apps/developer/accelerometer-demo.ts @@ -13,6 +13,12 @@ import { shell } from "../../ui/shell/shell"; const IMU_REPORT_PACE = 200; // How often to reconcile the IMU on/off state with window visibility. const RECONCILE_INTERVAL_MS = 400; +/** The readout under the title sits this far in from the title's left edge. */ +const BODY_INDENT = 2; +/** An axis row, from the readout's left edge: its value, then its bar, which stops this short of the right edge's padding. */ +const VALUE_OFFSET_X = 22; +const BAR_OFFSET_X = 96; +const BAR_RIGHT_INSET = 4; /** * Accelerometer demo: turns the IMU stream on while this page is visible (the @@ -77,12 +83,17 @@ export class AccelerometerDemoLayer implements Layer { paint(ctx: LayerContext): GrayImage { const small = getDefaultSmallFont(); const medium = getDefaultMediumFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + // The title line sits at the padding suggested for the top, left and + // right edges; everything under it is placed from there. + const top = padding.top; + const right = width - padding.right; + const bodyX = padding.left + BODY_INDENT; - image.drawText(small, 20, 8, "Accelerometer", 220); + image.drawText(small, padding.left, top, "Accelerometer", 220); const status = this.enabled ? "IMU on" : "IMU off"; - image.drawText(small, width - 20 - small.measureText(status), 8, status, 150); + image.drawText(small, right - small.measureText(status), top, status, 150); if (this.reading) { const axes: Array<[string, number]> = [ @@ -90,19 +101,19 @@ export class AccelerometerDemoLayer implements Layer { ["Y", this.reading.y], ["Z", this.reading.z], ]; - const barX = 118; - const barW = width - barX - 24; + const barX = bodyX + BAR_OFFSET_X; + const barW = Math.max(0, right - BAR_RIGHT_INSET - barX); const scale = Math.max(this.peak, 1e-6); - let y = 40; + let y = top + 32; for (const [label, value] of axes) { - image.drawText(medium, 22, y, label, 210); - image.drawText(medium, 44, y, value.toFixed(3), 235); + image.drawText(medium, bodyX, y, label, 210); + image.drawText(medium, bodyX + VALUE_OFFSET_X, y, value.toFixed(3), 235); drawCenteredBar(image, barX, y + 2, barW, 12, clamp(value / scale, -1, 1)); y += 30; } image.drawText( small, - 22, + bodyX, y + 6, `source: ${imuSourceLabel(this.reading.source)} samples: ${this.sampleCount}`, 130, @@ -111,9 +122,9 @@ export class AccelerometerDemoLayer implements Layer { const message = this.enabled ? "Waiting for IMU data…" : "Paused (page not visible)."; - image.drawText(small, 22, 44, message, 190); - image.drawText(small, 22, 66, "The firmware may not report the", 120); - image.drawText(small, 22, 82, "accelerometer at all — experimental.", 120); + image.drawText(small, bodyX, top + 36, message, 190); + image.drawText(small, bodyX, top + 58, "The firmware may not report the", 120); + image.drawText(small, bodyX, top + 74, "accelerometer at all — experimental.", 120); } return image; diff --git a/app/apps/developer/bandwidth-benchmark.ts b/app/apps/developer/bandwidth-benchmark.ts index 73310aa6..3237ab6e 100644 --- a/app/apps/developer/bandwidth-benchmark.ts +++ b/app/apps/developer/bandwidth-benchmark.ts @@ -27,9 +27,12 @@ const POLL_INTERVAL_MS = 500; // timeout drain + slack). const POLL_DEADLINE_MS = DURATION_MS + 15_000; -const HEADER_HEIGHT = 30; -const LIST_X = 20; -const VALUE_X = 150; +/** The title band: the rows and the run's text start this far below the top edge's padding. */ +const HEADER_HEIGHT = 22; +/** Horizontal inset of a row's text from its highlight box; the title and the text under the rows line up with it. */ +const ROW_TEXT_INSET = 6; +/** A row's value column, from its label's left edge. */ +const VALUE_OFFSET_X = 130; type Phase = "config" | "arming" | "running" | "done"; type ConfigRow = "size" | "window" | "link" | "start"; @@ -126,36 +129,43 @@ export class BandwidthBenchmarkLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + // The rows' highlight boxes span the window inside the padding suggested + // for its side edges, and the title sits at the top edge's; the page's + // text shares the rows' text column. + const textX = padding.left + ROW_TEXT_INSET; + const bodyTop = padding.top + HEADER_HEIGHT; - image.drawText(font, 20, 8, "BLE bandwidth", 220); + image.drawText(font, textX, padding.top, "BLE bandwidth", 220); if (this.phase === "arming" || this.phase === "running") { - image.drawText(font, LIST_X, HEADER_HEIGHT + 8, "Running: streaming no-op packets for 15 s...", 200); + image.drawText(font, textX, bodyTop + 8, "Running: streaming no-op packets for 15 s...", 200); image.drawText( font, - LIST_X, - HEADER_HEIGHT + 30, + textX, + bodyTop + 30, `${MESSAGE_SIZES[this.sizeIndex]} B, window ${WINDOW_SIZES[this.windowIndex]}` + (LINK_REQUESTS_SUPPORTED ? `, ${LINK_MODES[this.linkModeIndex]}` : ""), 150, ); - image.drawText(font, LIST_X, HEADER_HEIGHT + 52, "Display updates pause until the run finishes.", 110); + image.drawText(font, textX, bodyTop + 52, "Display updates pause until the run finishes.", 110); return image; } + // The rows all fit their box, so it is a fixed block under the title + // rather than a scroller that would run to the window's bottom edge. const rowH = tightRowHeight(font) + 4; const rowCount = this.menu.items.length; this.menu.paint( image, - { x: LIST_X - 6, y: HEADER_HEIGHT - 1, width: width - 2 * LIST_X + 12, height: rowCount * rowH }, + { x: padding.left, y: bodyTop - 1, width: Math.max(0, width - padding.left - padding.right), height: rowCount * rowH }, ctx.stack.isFocused(), ); - let y = HEADER_HEIGHT + rowCount * rowH + 10; + let y = bodyTop + rowCount * rowH + 10; if (this.error) { - image.drawText(font, LIST_X, y, this.error, 180); + image.drawText(font, textX, y, this.error, 180); } else if (this.result) { const r = this.result; const seconds = r.elapsedMs / 1000; @@ -171,7 +181,9 @@ export class BandwidthBenchmarkLayer implements Layer { lines.push(`Link request: ${LINK_MODES[r.linkMode] ?? "Current"}${phy}`); } for (const line of lines) { - image.drawText(font, LIST_X, y, line, 190); + // A window too short for every line (the RayNeo iO's) shows the first ones. + if (y + font.lineHeight > height) break; + image.drawText(font, textX, y, line, 190); y += 20; } } @@ -187,10 +199,9 @@ export class BandwidthBenchmarkLayer implements Layer { : item === "link" ? ["Link request", LINK_MODES[this.linkModeIndex]!] : [this.phase === "done" ? "Run again" : "Start", ""]; const textY = centeredTextY(font, y, height); - // Text sits 6px in from the row box (LIST_X), values at VALUE_X. - image.drawText(font, x + 6, textY, label, selected ? 255 : 200); + image.drawText(font, x + ROW_TEXT_INSET, textY, label, selected ? 255 : 200); if (value) { - image.drawText(font, x + 6 + VALUE_X - LIST_X, textY, value, selected ? 235 : 160); + image.drawText(font, x + ROW_TEXT_INSET + VALUE_OFFSET_X, textY, value, selected ? 235 : 160); } } diff --git a/app/apps/developer/buzzer-demo.ts b/app/apps/developer/buzzer-demo.ts index 258ace7c..e10ce694 100644 --- a/app/apps/developer/buzzer-demo.ts +++ b/app/apps/developer/buzzer-demo.ts @@ -13,9 +13,12 @@ import { type SoundEffect, } from "../../ui/sound-effects"; -const HEADER_HEIGHT = 30; -const LIST_X = 20; -const FOOTER_HEIGHT = 0; +/** The title band: the list starts this far below the top edge's padding. */ +const HEADER_HEIGHT = 22; +/** Horizontal inset of a row's text from its highlight box; the title lines up with it. */ +const ROW_TEXT_INSET = 6; +/** The status text ends this far short of the rows' right edge. */ +const STATUS_INSET = 10; function sleep(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); @@ -39,19 +42,26 @@ export class BuzzerDemoLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - image.drawText(font, 20, 8, "Buzzer demo", 220); + image.drawText(font, padding.left + ROW_TEXT_INSET, padding.top, "Buzzer demo", 220); const status = this.playing ? `Playing: ${this.playing}` : `${GESTURE_CLICK} play`; - image.drawText(font, width - 24 - font.measureText(status), 8, status, 140); + image.drawText(font, width - padding.right - STATUS_INSET - font.measureText(status), padding.top, status, 140); - const listHeight = height - HEADER_HEIGHT - FOOTER_HEIGHT; - this.menu.paint( - image, - { x: LIST_X - 6, y: HEADER_HEIGHT - 1, width: width - 2 * LIST_X + 12, height: listHeight }, - ctx.stack.isFocused(), - ); + // The title line stays put, so the list starts right under it with no + // padding of its own there. It scrolls, so it runs to the window's + // bottom edge with the padding suggested for that edge inside it, after + // the last row. + const listTop = padding.top + HEADER_HEIGHT - 1; + if (height > listTop) { + this.menu.paint( + image, + { x: padding.left, y: listTop, width: Math.max(0, width - padding.left - padding.right), height: height - listTop, + padTop: 0, padBottom: padding.bottom }, + ctx.stack.isFocused(), + ); + } return image; } @@ -104,6 +114,6 @@ export class BuzzerDemoLayer implements Layer { function drawEffectRow({ image, item: effect, x, y, height, selected }: MenuDrawArgs): void { const font = getDefaultSmallFont(); const textY = centeredTextY(font, y, height); - image.drawText(font, x + 6, textY, effect.name, selected ? 255 : 200); - image.drawText(font, x + 6 + 110, textY, effect.desc, selected ? 180 : 120); + image.drawText(font, x + ROW_TEXT_INSET, textY, effect.name, selected ? 255 : 200); + image.drawText(font, x + ROW_TEXT_INSET + 110, textY, effect.desc, selected ? 180 : 120); } diff --git a/app/apps/developer/developer-app.ts b/app/apps/developer/developer-app.ts index a7faf8cd..276990b3 100644 --- a/app/apps/developer/developer-app.ts +++ b/app/apps/developer/developer-app.ts @@ -12,7 +12,6 @@ import { RingStatusLayer } from "./ring-status"; import { LoadAppFromQrLayer, LoadAppFromUrlLayer } from "./load-app"; import { unicodeTestMenu } from "./unicode-test"; import { type AppContext } from "../app-definition"; -import { appViewportSize } from "../../ui/shell/geometry"; import { createInProcessWindow, YieldAtRootLayer, @@ -23,17 +22,9 @@ import { export const DEVELOPER_WINDOW_ID = "developer"; export const DEVELOPER_SURFACE_ID = "window:developer"; -const MENU_LAYOUT = { - x: 8, - y: 8, - width: 272, - showBorder: false, - minHeight: 0, - maxHeight: appViewportSize("min").height - 16, - // These menus are pages, not popups: "Debug tests" replaces the root menu - // visually instead of letting the taller root show through beneath it. - opaque: true, -}; +// These menus are pages, not popups: "Debug tests" replaces the root menu +// visually instead of letting the taller root show through beneath it. +const MENU_LAYOUT = { page: true, width: 248 } as const; type OpenPage = (ctx: Parameters[0]) => void; diff --git a/app/apps/developer/input-events.ts b/app/apps/developer/input-events.ts index a779d5a9..e3da7375 100644 --- a/app/apps/developer/input-events.ts +++ b/app/apps/developer/input-events.ts @@ -6,6 +6,14 @@ import { addInputListener, InputEventLog, inputTimestamp } from "../../ui/input- import type { Layer, LayerContext } from "../../ui/layers"; import { drawListScrollbar, type MenuItem } from "../../ui/menu"; +/** Room the log's rows keep free on the right for the scrollbar, and the bar's own width. */ +const SCROLLBAR_GUTTER = 6; +const SCROLLBAR_WIDTH = 3; +/** A row's second (raw report) line is indented this far, and stops as far short of the row's end. */ +const DETAIL_INDENT = 12; +/** Gap between the log and the hint line under it. */ +const FOOTER_GAP = 6; + /** Gestures are samples here; back/clear/pause live in the tap-then-hold menu. */ export class InputEventsLayer implements Layer { readonly acceptsDirectional = true; @@ -48,30 +56,41 @@ export class InputEventsLayer implements Layer { } paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const font = getDefaultSmallFont(); - image.drawText(font, 12, 8, "Input events", 230); + // The title and column-heading lines stay put at the top and the hint + // line at the bottom, each inside the padding suggested for its edge. + // The log scrolls between them, so it needs no padding of its own. + const left = padding.left; + const top = padding.top; + const right = width - padding.right; + const footerY = height - padding.bottom - font.lineHeight; + const listTop = top + 42; + const listBottom = footerY - FOOTER_GAP; + // The rows stop short of the scrollbar, which keeps inside the padding. + const rowsRight = right - SCROLLBAR_GUTTER; + image.drawText(font, left, top, "Input events", 230); const status = `${this.log.paused ? "Paused" : "Live"} ${this.log.count} events`; - image.drawText(font, width - 12 - font.measureText(status), 8, status, 180); - image.drawText(font, 12, 28, this.phoneTime ? "Phone receive time | gap ms | source | event" : "Time (R=ring tick) | gap | source | event", 140); + image.drawText(font, right - font.measureText(status), top, status, 180); + image.drawText(font, left, top + 20, this.phoneTime ? "Phone receive time | gap ms | source | event" : "Time (R=ring tick) | gap | source | event", 140); const lineHeight = Math.max(18, font.lineHeight + 2); const rowHeight = lineHeight * 2 + 4; - this.visibleRows = Math.max(1, Math.floor((height - 76) / rowHeight)); + this.visibleRows = Math.max(1, Math.floor((listBottom - listTop) / rowHeight)); this.scrollRow = Math.min(this.scrollRow, Math.max(0, this.log.entries.length - this.visibleRows)); - const timeX = 12; + const timeX = left; const gapX = timeX + font.measureText("00:00:00.000") + 12; const sourceX = gapX + font.measureText("+99999") + 12; const eventX = sourceX + font.measureText("right-arm") + 12; if (!this.log.entries.length) { - image.drawText(font, 12, 62, "Touch, tap, double-tap, hold, or swipe the ring.", 210); - image.drawText(font, 12, 82, "Press arrives before an interpreted gesture.", 150); + image.drawText(font, left, listTop + 12, "Touch, tap, double-tap, hold, or swipe the ring.", 210); + image.drawText(font, left, listTop + 32, "Press arrives before an interpreted gesture.", 150); } for (const [index, entry] of this.log.entries.slice(this.scrollRow, this.scrollRow + this.visibleRows).entries()) { const { event } = entry; const ringTime = !this.phoneTime && event.ringInput; const gapMs = ringTime ? entry.ringGapTicks : entry.gapMs; - const y = 50 + index * rowHeight; + const y = listTop + index * rowHeight; const gap = gapMs === null ? "-" : `${gapMs >= 0 ? "+" : ""}${gapMs}`; const source = "source" in event ? event.source ?? "-" : "-"; const label = (entry.filtered ? "*" : "") + (event.type === "unknown" @@ -80,18 +99,20 @@ export class InputEventsLayer implements Layer { image.drawText(font, timeX, y, ringTime ? `R${ringTime.tick}` : inputTimestamp(event.timestampMs), 170); image.drawText(font, gapX, y, truncateText(font, gap, sourceX - gapX - 4), 160); image.drawText(font, sourceX, y, source, 180); - image.drawText(font, eventX, y, truncateText(font, label, width - eventX - 12), event.type === "ring-press" ? 255 : 200); + image.drawText(font, eventX, y, truncateText(font, label, rowsRight - eventX), event.type === "ring-press" ? 255 : 200); if (event.ringInput) { const { type, aux, speed } = event.ringInput; // These are the original report bytes, not physical distance/speed units. const details = `Raw ring: type ${type} AUX ${aux} speed ${speed}`; - image.drawText(font, timeX + 12, y + lineHeight, - truncateText(font, details, width - timeX - 36), 170); + image.drawText(font, timeX + DETAIL_INDENT, y + lineHeight, + truncateText(font, details, rowsRight - timeX - 2 * DETAIL_INDENT), 170); } } - if (this.log.paused) drawListScrollbar(image, width - 5, 50, height - 78, - this.scrollRow, this.visibleRows, this.log.entries.length); - image.drawText(font, 12, height - 20, + if (this.log.paused && listBottom > listTop) { + drawListScrollbar(image, right - SCROLLBAR_WIDTH, listTop, listBottom - listTop, + this.scrollRow, this.visibleRows, this.log.entries.length); + } + image.drawText(font, left, footerY, this.log.paused ? "Scroll: history Tap-hold: controls" : "Unfiltered (*=dedup) Tap-hold: controls", 140); return image; } diff --git a/app/apps/developer/light-sensor-demo.ts b/app/apps/developer/light-sensor-demo.ts index 8f713f8d..9182b20c 100644 --- a/app/apps/developer/light-sensor-demo.ts +++ b/app/apps/developer/light-sensor-demo.ts @@ -22,6 +22,10 @@ const RECONCILE_INTERVAL_MS = 400; // Length of the on-screen trace. const HISTORY_MS = 30_000; const MAX_SAMPLES = Math.ceil(HISTORY_MS / 100) + 2; +/** The readout under the title sits this far in from the title's left edge. */ +const BODY_INDENT = 2; +/** Gap between the trace's box and the footer line under it. */ +const CHART_FOOTER_GAP = 18; type Sample = { atMs: number; value: number; peak: number }; @@ -102,39 +106,47 @@ export class LightSensorDemoLayer implements Layer { paint(ctx: LayerContext): GrayImage { const small = getDefaultSmallFont(); const medium = getDefaultMediumFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + // The title line, the trace's box and the footer line sit at the padding + // suggested for the edges they reach; the rest is placed from them. + const left = padding.left; + const top = padding.top; + const right = width - padding.right; + const bodyX = left + BODY_INDENT; + const footerY = height - padding.bottom - small.lineHeight; - image.drawText(small, 20, 8, "Light sensor", 220); + image.drawText(small, left, top, "Light sensor", 220); const status = this.enabled ? "polling" : "paused"; - image.drawText(small, width - 20 - small.measureText(status), 8, status, 150); + image.drawText(small, right - small.measureText(status), top, status, 150); const report = this.report; if (!report) { const message = this.enabled ? "Waiting for a report…" : "Paused (page not visible)."; - image.drawText(small, 22, 44, message, 190); - image.drawText(small, 22, 66, "Needs Faceclaw's custom firmware.", 120); - image.drawText(small, 20, height - 16, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(small, bodyX, top + 36, message, 190); + image.drawText(small, bodyX, top + 58, "Needs Faceclaw's custom firmware.", 120); + image.drawText(small, left, footerY, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; } // Headline reading. The stock driver's unit is roughly a tenth of a lux. const lux = (report.alsValue / 10).toFixed(1); - image.drawText(medium, 22, 30, `${lux} lux`, 245); + image.drawText(medium, bodyX, top + 22, `${lux} lux`, 245); const peakText = `peak ${(report.peak / 10).toFixed(1)}`; - image.drawText(small, 22 + medium.measureText(`${lux} lux`) + 14, 36, peakText, 170); + image.drawText(small, bodyX + medium.measureText(`${lux} lux`) + 14, top + 28, peakText, 170); const flags: string[] = []; if (!report.opened) flags.push("sensor closed"); if (report.passive) flags.push("passive"); if (report.autoBrightness) flags.push("auto on"); if (report.passive && !report.readOk) flags.push("read failed"); - image.drawText(small, 22, 58, flags.join(" ") || "stock polling", 150); + image.drawText(small, bodyX, top + 50, flags.join(" ") || "stock polling", 150); + const statsY = top + 68; image.drawText( small, - 22, - 76, + bodyX, + statsY, `brightness ${report.brightness} stock target ${report.stockTarget} gear ${report.gear} scale ${(report.scaleQ10 / 1024).toFixed(2)}`, 170, ); @@ -142,16 +154,17 @@ export class LightSensorDemoLayer implements Layer { // 30 s trace of the reading (bright) and the driver's 5-sample peak (dim). // The axis label sits between the stats line and the chart, so the chart // starts a full text line lower than the stats. - const chartTop = 76 + small.lineHeight * 2 + 4; - const bounds = { x: 20, y: chartTop, width: width - 40, height: height - chartTop - 34 }; + const chartTop = statsY + small.lineHeight * 2 + 4; + const bounds = { x: left, y: chartTop, width: right - left, height: footerY - CHART_FOOTER_GAP - chartTop }; const maxValue = Math.max(...this.samples.map((sample) => Math.max(sample.value, sample.peak)), 10); const scale = roundUpScale(maxValue * 1.08); image.drawText(small, bounds.x, bounds.y - small.lineHeight - 2, `0–${(scale / 10).toFixed(0)} lux, last 30 s`, 120); - drawTrace(image, this.samples, Date.now(), bounds, scale); + // A window too short for the trace (a large font on the RayNeo iO) goes without. + if (bounds.width > 1 && bounds.height > 1) drawTrace(image, this.samples, Date.now(), bounds, scale); - image.drawText(small, 20, height - 16, `reports: ${this.reportCount}`, 110); + image.drawText(small, left, footerY, `reports: ${this.reportCount}`, 110); const back = `${GESTURE_DOUBLE_CLICK} back`; - image.drawText(small, width - 20 - small.measureText(back), height - 16, back, 110); + image.drawText(small, right - small.measureText(back), footerY, back, 110); return image; } diff --git a/app/apps/developer/load-app.ts b/app/apps/developer/load-app.ts index ba6c9555..15532e3f 100644 --- a/app/apps/developer/load-app.ts +++ b/app/apps/developer/load-app.ts @@ -9,8 +9,6 @@ import { lineStep } from "../../ui/metrics"; import { developerAppUrlSetting } from "../../ui/dashboard-settings"; import { cancelQrScan, isQrScannerAvailable, scanQrCode } from "../../native/qr-scan"; -const MARGIN = 20; - /** * "Load app from URL": the glasses side of the phone text editor. Entering the * page opens the editor on developerAppUrlSetting, the typed URL echoes here @@ -44,27 +42,30 @@ export class LoadAppFromUrlLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + // The page's text fills the window inside the padding suggested for its + // edges: the title at the top, the hint line at the bottom. + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const step = lineStep(font); - const textWidth = width - 2 * MARGIN; + const left = padding.left; + const textWidth = Math.max(0, width - padding.left - padding.right); - image.drawText(font, MARGIN, 8, "Load app from URL", 220); - let y = 8 + step + 6; - image.drawText(font, MARGIN, y, "Type the app's URL in the phone app", 150); + image.drawText(font, left, padding.top, "Load app from URL", 220); + let y = padding.top + step + 6; + image.drawText(font, left, y, "Type the app's URL in the phone app", 150); y += step; - image.drawText(font, MARGIN, y, "(or use voice input from the menu).", 150); + image.drawText(font, left, y, "(or use voice input from the menu).", 150); y += step + 8; const url = developerAppUrlSetting.get(); for (const line of wrapText(font, url || "(empty)", textWidth).slice(0, 3)) { - image.drawText(font, MARGIN, y, line, url ? 230 : 110); + image.drawText(font, left, y, line, url ? 230 : 110); y += step; } if (this.error) { y += 4; for (const line of wrapText(font, this.error, textWidth).slice(0, 2)) { - image.drawText(font, MARGIN, y, line, 150); + image.drawText(font, left, y, line, 150); y += step; } } @@ -72,7 +73,7 @@ export class LoadAppFromUrlLayer implements Layer { const footer = this.launching ? "Loading..." : `${GESTURE_CLICK} load ${GESTURE_DOUBLE_CLICK} cancel`; - image.drawText(font, MARGIN, height - font.lineHeight - 12, footer, 110); + image.drawText(font, left, height - padding.bottom - font.lineHeight, footer, 110); return image; } @@ -145,19 +146,22 @@ export class LoadAppFromQrLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + // Laid out like the URL page: text inside the padding suggested for the + // window's edges, the hint line at the bottom. + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const step = lineStep(font); + const left = padding.left; - image.drawText(font, MARGIN, 8, "Load app from QR code", 220); - let y = 8 + step + 6; - for (const line of wrapText(font, this.status, width - 2 * MARGIN).slice(0, 5)) { - image.drawText(font, MARGIN, y, line, 170); + image.drawText(font, left, padding.top, "Load app from QR code", 220); + let y = padding.top + step + 6; + for (const line of wrapText(font, this.status, Math.max(0, width - padding.left - padding.right)).slice(0, 5)) { + image.drawText(font, left, y, line, 170); y += step; } const footer = this.busy ? `${GESTURE_DOUBLE_CLICK} back` : `${GESTURE_CLICK} scan again ${GESTURE_DOUBLE_CLICK} back`; - image.drawText(font, MARGIN, height - font.lineHeight - 12, footer, 110); + image.drawText(font, left, height - padding.bottom - font.lineHeight, footer, 110); return image; } diff --git a/app/apps/developer/microphones-monitor.ts b/app/apps/developer/microphones-monitor.ts index 513bc8db..5c29d11d 100644 --- a/app/apps/developer/microphones-monitor.ts +++ b/app/apps/developer/microphones-monitor.ts @@ -37,6 +37,8 @@ const STOCK_COUNTER_OFFSET = 204; // Counter gaps at or beyond this are late/duplicate copies, not losses. const STOCK_LATE_GAP = 128; const LEVEL_FLOOR_DB = -90; +/** Gap between the two temples' columns. */ +const COLUMN_GAP = 16; // wallMs (JS receipt time) windows the rates; arrivalMs (the session core's // elapsed-realtime stamp, taken on the BLE thread) measures gaps without the @@ -229,39 +231,45 @@ export class MicrophonesMonitorLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); const line = font.lineHeight; - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const nowMs = Date.now(); + // The title line, the two columns and the footer line span the window + // inside the padding suggested for its edges. + const left = padding.left; + const titleY = padding.top; + const right = width - padding.right; + const footerY = height - padding.bottom - line; - image.drawText(font, 16, 5, "Microphones (passive)", 230); + image.drawText(font, left, titleY, "Microphones (passive)", 230); const capture = isFaceclawAudioCaptureActive() ? "Faceclaw capture: on" : "Faceclaw capture: off"; - image.drawText(font, width - 16 - font.measureText(capture), 5, capture, 170); + image.drawText(font, right - font.measureText(capture), titleY, capture, 170); if (!this.communicator) { - image.drawText(font, 16, 5 + line * 2, "Glasses not connected.", 190); - image.drawText(font, 16, height - 16, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, left, titleY + line * 2, "Glasses not connected.", 190); + image.drawText(font, left, footerY, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; } - const gutter = 16; - const columnWidth = Math.floor((width - gutter * 3) / 2); + const columnWidth = Math.max(0, Math.floor((right - left - COLUMN_GAP) / 2)); + const rightColumnX = left + columnWidth + COLUMN_GAP; const stripHeight = 22; - const top = 5 + line + 6; - const bottom = height - 16 - stripHeight - 8; - this.paintArm(image, "L", "Left", gutter, top, columnWidth, bottom, nowMs); - this.paintArm(image, "R", "Right", gutter * 2 + columnWidth, top, columnWidth, bottom, nowMs); + const top = titleY + line + 6; + const bottom = footerY - stripHeight - 8; + this.paintArm(image, "L", "Left", left, top, columnWidth, bottom, nowMs); + this.paintArm(image, "R", "Right", rightColumnX, top, columnWidth, bottom, nowMs); - const stripY = height - 16 - stripHeight - 4; + const stripY = footerY - stripHeight - 4; const stripMax = Math.max(1, ...this.stats.L.buckets, ...this.stats.R.buckets); - drawStrip(image, this.stats.L.buckets, gutter, stripY, columnWidth, stripHeight, stripMax); - drawStrip(image, this.stats.R.buckets, gutter * 2 + columnWidth, stripY, columnWidth, stripHeight, stripMax); + drawStrip(image, this.stats.L.buckets, left, stripY, columnWidth, stripHeight, stripMax); + drawStrip(image, this.stats.R.buckets, rightColumnX, stripY, columnWidth, stripHeight, stripMax); const footer = this.unknownArmPackets > 0 ? `last ${HISTORY_MS / 1000} s unattributed packets ${this.unknownArmPackets}` : `packets per ${BUCKET_MS} ms, last ${HISTORY_MS / 1000} s`; - image.drawText(font, gutter, height - 16, footer, 110); + image.drawText(font, left, footerY, footer, 110); const back = `${GESTURE_DOUBLE_CLICK} back tap reset`; - image.drawText(font, width - gutter - font.measureText(back), height - 16, back, 110); + image.drawText(font, right - font.measureText(back), footerY, back, 110); return image; } diff --git a/app/apps/developer/resource-usage.ts b/app/apps/developer/resource-usage.ts index 70f0c8f8..525880ad 100644 --- a/app/apps/developer/resource-usage.ts +++ b/app/apps/developer/resource-usage.ts @@ -16,6 +16,14 @@ const HISTORY_MS = 60_000; const MAX_SAMPLES = Math.ceil(HISTORY_MS / SAMPLE_INTERVAL_MS) + 2; /** Line brightness per memory series, headline first. */ const MEMORY_SHADES = [240, 155, 80]; +/** The charts' heights where the window has room for them. */ +const MEMORY_CHART_HEIGHT = 70; +const CPU_CHART_HEIGHT = 60; +/** Between the charts: a gap, then the CPU chart's label line. */ +const CHART_GAP = 10; +const CHART_LABEL_HEIGHT = 16; +/** Least gap between the CPU chart and the footer line. */ +const CHART_FOOTER_GAP = 4; type ChartSample = ResourceSample & { cpuPercent: number }; @@ -56,20 +64,26 @@ export class ResourceUsageLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const latest = this.samples[this.samples.length - 1]; + // The title line, the charts and the footer line span the window inside + // the padding suggested for its edges; the rest is placed from the top. + const left = padding.left; + const top = padding.top; + const right = width - padding.right; + const footerY = height - padding.bottom - font.lineHeight; - image.drawText(font, 16, 5, "Resource usage — last minute", 230); + image.drawText(font, left, top, "Resource usage — last minute", 230); if (!latest) { - image.drawText(font, 16, 30, this.sampleError || "Waiting for first sample…", 170); - image.drawText(font, 16, height - 16, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, left, top + 25, this.sampleError || "Waiting for first sample…", 170); + image.drawText(font, left, footerY, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; } const cpuText = `CPU ${formatPercent(latest.cpuPercent)} ${latest.threads} threads`; - image.drawText(font, width - 16 - font.measureText(cpuText), 5, cpuText, 200); - image.drawText(font, 16, 21, this.sampleError || latest.status, this.sampleError ? 170 : 140); + image.drawText(font, right - font.measureText(cpuText), top, cpuText, 200); + image.drawText(font, left, top + 16, this.sampleError || latest.status, this.sampleError ? 170 : 140); const memorySeries = MEMORY_SERIES.map((label, index) => ({ label, @@ -78,34 +92,44 @@ export class ResourceUsageLayer implements Layer { })); const memoryPeak = Math.max(...this.samples.flatMap((sample) => sample.memoryMb), 64); const memoryScale = roundUp(memoryPeak * 1.08, 64); + const legendY = top + 43; const legendLeft = drawLegend( image, font, - width, - 48, + right, + legendY, memorySeries.map((series) => [`${series.label} ${formatMb(series.value(latest))}`, series.shade] as const), ); const scaleLabel = `Memory 0–${formatMb(memoryScale)}`; const shortScaleLabel = `0–${formatMb(memoryScale)}`; image.drawText( font, - 16, - 48, - 16 + font.measureText(scaleLabel) + 8 <= legendLeft ? scaleLabel : shortScaleLabel, + left, + legendY, + left + font.measureText(scaleLabel) + 8 <= legendLeft ? scaleLabel : shortScaleLabel, 140, ); - drawChart(image, this.samples, latest.atMs, { x: 16, y: 64, width: width - 32, height: 70 }, memoryScale, memorySeries); + // The charts shrink together where the window is too short for both + // above the footer line (the RayNeo iO's). + const chartsTop = legendY + CHART_LABEL_HEIGHT; + const room = footerY - CHART_FOOTER_GAP - chartsTop - CHART_GAP - CHART_LABEL_HEIGHT; + const fit = clamp(room / (MEMORY_CHART_HEIGHT + CPU_CHART_HEIGHT), 0, 1); + const memoryHeight = Math.floor(MEMORY_CHART_HEIGHT * fit); + const chartWidth = Math.max(0, right - left); + drawChart(image, this.samples, latest.atMs, { x: left, y: chartsTop, width: chartWidth, height: memoryHeight }, memoryScale, memorySeries); const cpuPeak = Math.max(...this.samples.map((sample) => sample.cpuPercent), 100); const cpuScale = roundUp(cpuPeak * 1.08, 25); - image.drawText(font, 16, 144, `CPU 0–${Math.round(cpuScale)}% (one core)`, 140); - drawChart(image, this.samples, latest.atMs, { x: 16, y: 160, width: width - 32, height: 60 }, cpuScale, [ - { value: (sample) => sample.cpuPercent, shade: 220 }, - ]); + const cpuLabelY = chartsTop + memoryHeight + CHART_GAP; + image.drawText(font, left, cpuLabelY, `CPU 0–${Math.round(cpuScale)}% (one core)`, 140); + drawChart(image, this.samples, latest.atMs, + { x: left, y: cpuLabelY + CHART_LABEL_HEIGHT, width: chartWidth, height: Math.floor(CPU_CHART_HEIGHT * fit) }, cpuScale, [ + { value: (sample) => sample.cpuPercent, shade: 220 }, + ]); - image.drawText(font, 16, height - 16, `-60s`, 80); + image.drawText(font, left, footerY, `-60s`, 80); const nowLabel = `now`; - image.drawText(font, width - 16 - font.measureText(nowLabel), height - 16, nowLabel, 110); + image.drawText(font, right - font.measureText(nowLabel), footerY, nowLabel, 110); return image; } @@ -148,6 +172,7 @@ function drawChart( scale: number, series: readonly Series[], ): void { + if (bounds.width < 2 || bounds.height < 2) return; image.drawRect(bounds.x, bounds.y, bounds.width, bounds.height, 45); const midY = bounds.y + Math.round((bounds.height - 1) / 2); image.drawLine(bounds.x + 1, midY, bounds.x + bounds.width - 2, midY, 24); @@ -167,16 +192,16 @@ function drawChart( } } -/** Right-aligned legend of line swatches and labels; returns its left edge. */ +/** Legend of line swatches and labels, right-aligned to end at `right`; returns its left edge. */ function drawLegend( image: GrayImage, font: ReturnType, - width: number, + right: number, y: number, entries: ReadonlyArray, ): number { const totalWidth = entries.reduce((sum, [label]) => sum + font.measureText(label) + 14, 0); - const left = width - 16 - totalWidth; + const left = right - totalWidth; let x = left; for (const [label, shade] of entries) { image.drawLine(x, y + 6, x + 8, y + 6, shade); diff --git a/app/apps/developer/ring-status.ts b/app/apps/developer/ring-status.ts index a680a3dc..de86f81a 100644 --- a/app/apps/developer/ring-status.ts +++ b/app/apps/developer/ring-status.ts @@ -18,8 +18,10 @@ import { } from "../../native/ring-status"; const POLL_INTERVAL_MS = 1_000; -const LEFT_X = 16; -const VALUE_X = 130; +/** The title sits this far in from the left edge of the rows and buttons under it. */ +const TITLE_INDENT = 2; +/** A row's value column, from its label's left edge. */ +const VALUE_OFFSET_X = 114; const BUTTON_GAP = 8; type Row = { label: string; value: string; dim?: boolean }; @@ -102,26 +104,31 @@ export class RingStatusLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const lineStep = font.lineHeight + 2; const buttonHeight = font.lineHeight + 8; - const buttonTop = height - buttonHeight - 6; + // The rows and the button strip span the window inside the padding + // suggested for its side edges; the title sits at the top edge's and the + // buttons' outlines at the bottom edge's. + const left = padding.left; + const buttonTop = height - padding.bottom - buttonHeight; - image.drawText(font, 18, 10, "Ring status", 230); - let y = 10 + lineStep + 4; + image.drawText(font, left + TITLE_INDENT, padding.top, "Ring status", 230); + let y = padding.top + lineStep + 4; const rows = this.rows(); if (this.notice) rows.push({ label: "", value: this.notice }); for (const row of rows) { if (y + font.lineHeight > buttonTop - 4) break; - image.drawText(font, LEFT_X, y, row.label, row.dim ? 100 : 150); - image.drawText(font, VALUE_X, y, row.value, row.dim ? 120 : 220); + image.drawText(font, left, y, row.label, row.dim ? 100 : 150); + image.drawText(font, left + VALUE_OFFSET_X, y, row.value, row.dim ? 120 : 220); y += lineStep; } - const buttonWidth = Math.floor((width - 2 * LEFT_X - BUTTON_GAP * (BUTTONS.length - 1)) / BUTTONS.length); + const buttonWidth = Math.max(0, + Math.floor((width - padding.left - padding.right - BUTTON_GAP * (BUTTONS.length - 1)) / BUTTONS.length)); BUTTONS.forEach((button, index) => { - const x = LEFT_X + index * (buttonWidth + BUTTON_GAP); + const x = left + index * (buttonWidth + BUTTON_GAP); const selected = index === this.selected; if (selected) image.fillRoundedRect(x, buttonTop, buttonWidth, buttonHeight, 40, 4); image.drawRoundedRect(x, buttonTop, buttonWidth, buttonHeight, selected ? 200 : 70, 4); diff --git a/app/apps/developer/unicode-test.ts b/app/apps/developer/unicode-test.ts index 200c86d7..1330bfc1 100644 --- a/app/apps/developer/unicode-test.ts +++ b/app/apps/developer/unicode-test.ts @@ -3,7 +3,7 @@ import { fontSelectionLabel, getDefaultSmallFont, getUiFontSelection } from "../ import { GrayImage, type UiFont } from "../../graphics/image"; import { type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; -import { MenuLayer, type MenuLayout } from "../../ui/menu"; +import { MenuLayer, type MenuPageLayout } from "../../ui/menu"; /** * Unicode test: sample texts chosen to exercise text-rendering features that @@ -175,9 +175,6 @@ export const UNICODE_SAMPLES: readonly UnicodeSample[] = [ }, ]; -const MARGIN_X = 18; -const TITLE_Y = 8; -const FOOTER_MARGIN = 20; const BODY_GAP = 6; /** @@ -196,32 +193,36 @@ export class UnicodeSampleLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + // The title and note stay put at the top and the footer line at the + // bottom, inside the padding suggested for the window's edges; the text + // pages between them, so it needs no padding of its own. + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - const textWidth = width - 2 * MARGIN_X; + const left = padding.left; + const textWidth = Math.max(0, width - padding.left - padding.right); - image.drawText(font, MARGIN_X, TITLE_Y, truncateText(font, this.sample.label, textWidth), 220); - const noteY = TITLE_Y + font.lineHeight; + image.drawText(font, left, padding.top, truncateText(font, this.sample.label, textWidth), 220); + const noteY = padding.top + font.lineHeight; const noteLines = wrapText(font, this.sample.exercises, textWidth); for (let i = 0; i < noteLines.length; i++) { - image.drawText(font, MARGIN_X, noteY + i * font.lineHeight, noteLines[i]!, 120); + image.drawText(font, left, noteY + i * font.lineHeight, noteLines[i]!, 120); } const bodyY = noteY + noteLines.length * font.lineHeight + BODY_GAP; - const footerY = height - FOOTER_MARGIN; + const footerY = height - padding.bottom - font.lineHeight; this.bodyLineCount = Math.max(1, Math.floor((footerY - bodyY) / font.lineHeight)); const lines = this.getLines(font, textWidth); this.clampScroll(lines.length); const visible = lines.slice(this.firstLine, this.firstLine + this.bodyLineCount); for (let i = 0; i < visible.length; i++) { - image.drawText(font, MARGIN_X, bodyY + i * font.lineHeight, visible[i]!, 235); + image.drawText(font, left, bodyY + i * font.lineHeight, visible[i]!, 235); } const page = Math.floor(this.firstLine / this.pageStep()) + 1; - image.drawText(font, MARGIN_X, footerY, `Page ${page}/${this.pageCount(lines.length)}`, 110); + image.drawText(font, left, footerY, `Page ${page}/${this.pageCount(lines.length)}`, 110); const fontLabel = fontSelectionLabel(getUiFontSelection()); - image.drawText(font, width - MARGIN_X - font.measureText(fontLabel), footerY, fontLabel, 110); + image.drawText(font, width - padding.right - font.measureText(fontLabel), footerY, fontLabel, 110); return image; } @@ -271,7 +272,7 @@ export class UnicodeSampleLayer implements Layer { } /** The language list; selecting a row opens its sample. */ -export function unicodeTestMenu(layout: MenuLayout): MenuLayer { +export function unicodeTestMenu(layout: MenuPageLayout): MenuLayer { return new MenuLayer( "Unicode test", UNICODE_SAMPLES.map((sample) => ({ diff --git a/app/apps/evenhub/manager.ts b/app/apps/evenhub/manager.ts index 14b9382f..8b2acb7c 100644 --- a/app/apps/evenhub/manager.ts +++ b/app/apps/evenhub/manager.ts @@ -6,8 +6,8 @@ * * Glasses-first: launching does NOT take over the phone screen. The phone * stays on the Faceclaw dashboard; an app's phone UI is shown on demand - * (window menu -> "Show phone UI", or the app-icon button in the phone's - * action bar while the app is foreground on the glasses), overlaying the + * (window menu -> "Show phone UI", or the app-icon button in the bar under the + * phone's mirror while the app is foreground on the glasses), overlaying the * dashboard, and the Back button or the overlay's close button returns to it. * Apps are kept alive until explicitly closed (no memory eviction yet). */ @@ -40,14 +40,14 @@ type RunningApp = { packageId: string; session: EvenHubSession; webView: EvenHubWebView; - /** The app's icon for the phone action bar, rendered on first use. */ + /** The app's icon for the phone's button bar, rendered on first use. */ phoneIcon?: ImageSource | null; }; -/** The phone action bar's button for opening the foreground app's phone UI. */ +/** The button under the phone's mirror that opens the foreground app's phone UI. */ export type PhoneUiButton = { windowId: string; title: string; icon: ImageSource | null }; -/** Pixel size the action-bar icon is rendered at (~21dp at xxhdpi). */ +/** Pixel size the button's icon is rendered at (~21dp at xxhdpi; shown at 20dp). */ const PHONE_ICON_SIZE = 63; const running = new Map(); @@ -244,7 +244,7 @@ export function hidePhone(): void { /** * The foreground glasses window, when it is an EvenHub app whose phone UI - * isn't showing: the phone action bar then offers a button to show it. + * isn't showing: the bar under the phone's mirror then offers a button to show it. */ export function phoneUiButton(): PhoneUiButton | null { const window = shell.foregroundWindow(); @@ -252,7 +252,7 @@ export function phoneUiButton(): PhoneUiButton | null { if (!window || !app || phoneShownWindowId === app.windowId) return null; if (app.phoneIcon === undefined) { // The same artwork as the glasses sidebar (installed icon, else the - // generic package icon), drawn white. + // generic package icon), drawn white; the button's stylesheet tints it. const image = new GrayImage(PHONE_ICON_SIZE, PHONE_ICON_SIZE, 0); window.drawIcon(image, 0, 0, PHONE_ICON_SIZE); app.phoneIcon = grayImageToWhiteIconSource(image); diff --git a/app/apps/evenhub/store-detail-layer.ts b/app/apps/evenhub/store-detail-layer.ts index ba179d86..34b86704 100644 --- a/app/apps/evenhub/store-detail-layer.ts +++ b/app/apps/evenhub/store-detail-layer.ts @@ -16,7 +16,11 @@ import { cleanError, installStoreApp } from "./store-install"; import { describeUpdate } from "./updates"; import { lineStep, listRowHeight } from "../../ui/metrics"; -const X = 18; +/** How far an action row's highlight box overhangs the column of text it belongs to, on each side. */ +const ACTION_BOX_OVERHANG = 5; +/** The side-by-side layout: the action menu's label column, and the gap between the details and its box. */ +const SIDE_MENU_WIDTH = 150; +const SIDE_MENU_GAP = 9; type DetailAction = "about" | "whats-new" | "primary"; const ACTIONS: readonly DetailAction[] = ["about", "whats-new", "primary"]; @@ -60,10 +64,15 @@ export class EvenHubStoreDetailLayer implements Layer { paint(ctx: LayerContext): GrayImage { if (!this.detailPromise) void this.ensureDetail(ctx); const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const step = lineStep(font); const actionRowH = listRowHeight(font) + 4; + // The action rows' highlight boxes are the outermost thing drawn toward + // the edges they reach, so they sit at the padding suggested for those + // edges; the details keep to the text column inside the boxes' overhang. + const textX = padding.left + ACTION_BOX_OVERHANG; + const fullTextWidth = Math.max(0, width - padding.left - padding.right - 2 * ACTION_BOX_OVERHANG); const installed = getInstalledEvenHubApp(this.app.packageId); this.primaryLabel = this.working ? "Installing..." : this.primaryActionLabel(installed); @@ -109,26 +118,22 @@ export class EvenHubStoreDetailLayer implements Layer { // Stacked layout (details full-width, actions at the bottom) when it // fits; otherwise the actions become a narrow top-right menu and the // details flow down a left column beside it. - const stackedActionTop = height - 6 - ACTIONS.length * actionRowH; - const stacked = 8 + linesHeight(buildLines(width - X * 2)) + 6 <= stackedActionTop; - const menuW = 150; - const menuX = width - menuW - 12; - const textWidth = stacked ? width - X * 2 : menuX - X - 14; + const stackedActionTop = height - padding.bottom - ACTIONS.length * actionRowH; + const stacked = padding.top + linesHeight(buildLines(fullTextWidth)) + 6 <= stackedActionTop; + const sideBoxWidth = SIDE_MENU_WIDTH + 2 * ACTION_BOX_OVERHANG; + const sideBoxX = width - padding.right - sideBoxWidth; + const textWidth = stacked ? fullTextWidth : Math.max(0, sideBoxX - SIDE_MENU_GAP - textX); - let y = 8; + let y = padding.top; for (const line of buildLines(textWidth)) { - image.drawText(font, X, y, line.text, line.value); + image.drawText(font, textX, y, line.text, line.value); y += step + line.gapAfter; } - const actionX = stacked ? X : menuX; - const actionW = stacked ? textWidth : menuW; - const actionTop = stacked ? stackedActionTop : 8; - this.actions.paint( - image, - { x: actionX - 5, y: actionTop, width: actionW + 10, height: ACTIONS.length * actionRowH - 1 }, - ctx.stack.isFocused(), - ); + const actionBox = stacked + ? { x: padding.left, y: stackedActionTop, width: fullTextWidth + 2 * ACTION_BOX_OVERHANG } + : { x: sideBoxX, y: padding.top, width: sideBoxWidth }; + this.actions.paint(image, { ...actionBox, height: ACTIONS.length * actionRowH - 1 }, ctx.stack.isFocused()); return image; } diff --git a/app/apps/evenhub/store-layer.ts b/app/apps/evenhub/store-layer.ts index 8df5be91..994f7979 100644 --- a/app/apps/evenhub/store-layer.ts +++ b/app/apps/evenhub/store-layer.ts @@ -14,15 +14,37 @@ import { EvenHubStoreDetailLayer, type EvenHubStoreDetailOptions } from "./store import { cleanError, installStoreApp } from "./store-install"; import { checkForEvenHubUpdates, describeUpdate, type EvenHubAppUpdate } from "./updates"; import { lineStep } from "../../ui/metrics"; +import type { Viewport } from "../../ui/viewport"; import { isEvenHubStoreAvailable } from "./glasses-compat"; -const LIST_X = 18; +/** Horizontal inset of a row's text from its highlight box; the header's text lines up with it. */ +const ROW_TEXT_INSET = 6; /** Horizontal gap between tab labels. */ const TAB_GAP = 18; +/** How far a focused tab's highlight box reaches past its label, sideways and above/below. */ +const TAB_HIGHLIGHT_PAD_X = 6; +const TAB_HIGHLIGHT_PAD_Y = 3; +/** Room kept right of the rows for the scrollbar, and the bar's own width. */ +const SCROLLBAR_GUTTER = 6; +const SCROLLBAR_WIDTH = 3; -/** Header: title + tabs line, then the status/subtitle line, then a small gap. */ -function headerHeight(font: UiFont): number { - return 8 + lineStep(font) + font.lineHeight + 6; +/** + * Where the header sits in a viewport. Its text shares a column with the + * rows' text, whose highlight boxes start at the left edge's padding. The + * outermost thing it draws toward the top is a focused tab's highlight box, + * so that box sits at the top edge's padding and the title line follows + * from it. `bottom` is where the header ends: title + tabs line, then the + * status/subtitle line, then a small gap. + */ +function headerLayout(viewport: Viewport, font: UiFont): { textX: number; textWidth: number; titleY: number; bottom: number } { + const { width, padding } = viewport; + const titleY = padding.top + TAB_HIGHLIGHT_PAD_Y; + return { + textX: padding.left + ROW_TEXT_INSET, + textWidth: Math.max(0, width - padding.left - padding.right - 2 * ROW_TEXT_INSET), + titleY, + bottom: titleY + lineStep(font) + font.lineHeight + 6, + }; } /** Row pitch of the two-line app list (title + detail), including the 2px gap between highlights. */ @@ -119,8 +141,8 @@ function emptyTab(): TabState { draw: ({ image, item, x, y, width }) => { const font = getDefaultSmallFont(); const { title, detail, titleValue } = rowText(item); - const textX = x + 6; - const textW = width - 12; + const textX = x + ROW_TEXT_INSET; + const textW = width - 2 * ROW_TEXT_INSET; image.drawText(font, textX, y + 2, truncateText(font, title, textW), titleValue); image.drawText(font, textX, y + 2 + lineStep(font), truncateText(font, detail, textW), 115); }, @@ -198,83 +220,93 @@ export class EvenHubStoreLayer implements Layer { } const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const viewport = ctx.stack.getBaseSize(); + const { width, height, padding } = viewport; const image = new GrayImage(width, height, 0); - const headerH = headerHeight(font); - image.drawText(font, LIST_X, 8, "EvenHub", 220); + const { textX, textWidth, titleY, bottom: headerBottom } = headerLayout(viewport, font); + image.drawText(font, textX, titleY, "EvenHub", 220); if (this.showingLogin) { - image.drawText(font, LIST_X, 8 + lineStep(font), truncateText(font, this.loginStatus, width - LIST_X * 2), 125); + image.drawText(font, textX, titleY + lineStep(font), truncateText(font, this.loginStatus, textWidth), 125); const message = this.loginBusy ? "Signing in..." : "Enter your Even account email and password in the phone app."; - for (const [index, line] of wrapText(font, message, width - LIST_X * 2).entries()) { - image.drawText(font, LIST_X, headerH + 16 + index * lineStep(font), line, 190); + for (const [index, line] of wrapText(font, message, textWidth).entries()) { + image.drawText(font, textX, headerBottom + 16 + index * lineStep(font), line, 190); } - image.drawText(font, LIST_X, height - font.lineHeight - 4, `${GESTURE_CLICK} log in`, 105); + image.drawText(font, textX, height - padding.bottom - font.lineHeight, `${GESTURE_CLICK} log in`, 105); return image; } - this.paintTabs(image, font, ctx); + this.paintTabs(image, font, ctx, textX, titleY); const tab = this.tabs[this.activeTab]; const subtitle = tab.status || this.subtitle(this.activeTab, tab); - image.drawText(font, LIST_X, 8 + lineStep(font), truncateText(font, subtitle, width - LIST_X * 2), 125); + image.drawText(font, textX, titleY + lineStep(font), truncateText(font, subtitle, textWidth), 125); if (tab.rows.length === 0) { const message = tab.loading ? "Loading..." : this.emptyMessage(this.activeTab, tab); - for (const [index, line] of wrapText(font, message, width - LIST_X * 2).slice(0, 3).entries()) { - image.drawText(font, LIST_X, headerH + 22 + index * lineStep(font), line, 190); + for (const [index, line] of wrapText(font, message, textWidth).slice(0, 3).entries()) { + image.drawText(font, textX, headerBottom + 22 + index * lineStep(font), line, 190); } return image; } + if (height <= headerBottom) return image; - const rowH = storeRowHeight(font); - const visibleRows = Math.max(1, Math.floor((height - headerH - 4) / rowH)); + // The header stays put, so the list starts right under it with no + // padding of its own there. It scrolls, so it runs to the window's + // bottom edge, the padding suggested for that edge inside it: the last + // row keeps clear of a border there, and a row cut off for scrolling + // meets the edge rather than a blank strip. The scrollbar keeps inside + // the padding, in a gutter the rows leave free. const listFocused = ctx.stack.isFocused() && this.focus === "list"; const menu = tabMenu(tab); + const rowsWidth = Math.max(0, width - padding.left - padding.right - SCROLLBAR_GUTTER); menu.paint( image, - { x: LIST_X - 6, y: headerH, width: width - LIST_X * 2 + 12, height: visibleRows * rowH - 2 }, + { x: padding.left, y: headerBottom, width: rowsWidth, height: height - headerBottom, padTop: 0, padBottom: padding.bottom }, listFocused, ); - menu.drawScrollbar(image, width - 5, headerH, visibleRows * rowH - 3); + menu.drawScrollbar(image, width - padding.right - SCROLLBAR_WIDTH, headerBottom, + Math.max(0, height - padding.bottom - headerBottom)); return image; } /** The notice that replaces the store when the paired glasses can't use it. */ private paintUnavailable(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); - const image = new GrayImage(width, height, 0); - image.drawText(font, LIST_X, 8, "EvenHub", 220); + const viewport = ctx.stack.getBaseSize(); + const image = new GrayImage(viewport.width, viewport.height, 0); + const { textX, textWidth, titleY, bottom: headerBottom } = headerLayout(viewport, font); + image.drawText(font, textX, titleY, "EvenHub", 220); if (this.unavailablePackageName) { const status = `${this.unavailablePackageName}'s package is missing.`; - image.drawText(font, LIST_X, 8 + lineStep(font), truncateText(font, status, width - LIST_X * 2), 125); + image.drawText(font, textX, titleY + lineStep(font), truncateText(font, status, textWidth), 125); } const message = "Using the Even Realities app store requires Even Realities glasses."; - for (const [index, line] of wrapText(font, message, width - LIST_X * 2).entries()) { - image.drawText(font, LIST_X, headerHeight(font) + 16 + index * lineStep(font), line, 190); + for (const [index, line] of wrapText(font, message, textWidth).entries()) { + image.drawText(font, textX, headerBottom + 16 + index * lineStep(font), line, 190); } return image; } - /** Tab labels to the right of the title; the active one is bright and underlined. */ - private paintTabs(image: GrayImage, font: UiFont, ctx: LayerContext): void { + /** Tab labels to the right of the title (at titleX, titleY); the active one is bright and underlined. */ + private paintTabs(image: GrayImage, font: UiFont, ctx: LayerContext, titleX: number, titleY: number): void { const tabsFocused = ctx.stack.isFocused() && this.focus === "tabs"; - let x = LIST_X + font.measureText("EvenHub") + 28; + let x = titleX + font.measureText("EvenHub") + 28; for (const tab of TABS) { const label = this.tabLabel(tab.id); const w = font.measureText(label); const active = tab.id === this.activeTab; if (active) { if (tabsFocused) { - drawSelectionHighlight(image, x - 6, 5, w + 12, font.lineHeight + 6, true, 4); + drawSelectionHighlight(image, x - TAB_HIGHLIGHT_PAD_X, titleY - TAB_HIGHLIGHT_PAD_Y, + w + 2 * TAB_HIGHLIGHT_PAD_X, font.lineHeight + 2 * TAB_HIGHLIGHT_PAD_Y, true, 4); } else { - image.fillRect(x, 8 + font.lineHeight + 1, w, 1, 150); + image.fillRect(x, titleY + font.lineHeight + 1, w, 1, 150); } } - image.drawText(font, x, 8, label, active ? 235 : 120); + image.drawText(font, x, titleY, label, active ? 235 : 120); x += w + TAB_GAP; } } diff --git a/app/apps/files/file-browser.ts b/app/apps/files/file-browser.ts index a9470f4d..4657d06c 100644 --- a/app/apps/files/file-browser.ts +++ b/app/apps/files/file-browser.ts @@ -19,13 +19,21 @@ import { import { directionalFallback, type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; -const LIST_X = 20; /** List view: the selection box extends this far left and right of the row text. */ const LIST_HIGHLIGHT_PAD = 6; +/** Header text: how far in from the rows' sides, which lines it up with list-row text. */ +const HEADER_INSET_X = LIST_HIGHLIGHT_PAD; +/** Between the header's title and the path after it. */ +const HEADER_PATH_GAP = 14; +/** Under the header's line, before the rows. */ +const HEADER_GAP = 2; -/** Header: one line holding both the title and the current path. */ -function headerHeight(font: UiFont): number { - return 10 + font.lineHeight; +/** + * Bottom of the header: one line holding both the title and the current + * path, below the padding suggested for the window's top edge. + */ +function headerBottom(font: UiFont, paddingTop: number): number { + return paddingTop + font.lineHeight + HEADER_GAP; } export type FilesViewMode = "icons" | "list"; @@ -147,35 +155,37 @@ export class FileBrowserLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + // The rows (grid bands, list selection boxes) span the window inside the + // padding suggested for its sides. + const rowsX = padding.left; + const rowsWidth = Math.max(0, width - padding.left - padding.right); - image.drawText(font, 20, 8, "Files", 220); + const titleX = rowsX + HEADER_INSET_X; + image.drawText(font, titleX, padding.top, "Files", 220); const pathLabel = this.location === null ? "Places" : this.location; - const pathX = 20 + font.measureText("Files") + 14; - image.drawText(font, pathX, 8, truncateLeft(font, pathLabel, width - pathX - 20), 130); + const pathX = titleX + font.measureText("Files") + HEADER_PATH_GAP; + image.drawText(font, pathX, padding.top, truncateLeft(font, pathLabel, rowsX + rowsWidth - HEADER_INSET_X - pathX), 130); - if (filesViewModeSetting.get() === "list") { - this.paintList(image, font, ctx); + // The header stays put and the rows scroll under it, as far as the + // window's bottom edge: the padding suggested for that edge goes inside + // the scrolled content, so the last row keeps clear of a border there + // and a row cut off for scrolling meets it rather than a blank strip. + const listView = filesViewModeSetting.get() === "list"; + const headerEnd = headerBottom(font, padding.top); + // List row boxes start one pixel above the header's bottom edge. + const top = listView ? headerEnd - 1 : headerEnd; + const box = { x: rowsX, y: top, width: rowsWidth, height: Math.max(0, height - top), padTop: 0, padBottom: padding.bottom }; + if (listView) { + this.listMenu.setItems(this.flatRows()); + this.listMenu.paint(image, box, ctx.stack.isFocused()); } else { - const headerH = headerHeight(font); - this.grid.paint(image, { x: 0, y: headerH, width, height: height - headerH - 6 }, ctx.stack.isFocused()); + this.grid.paint(image, box, ctx.stack.isFocused()); } return image; } - private paintList(image: GrayImage, font: UiFont, ctx: LayerContext): void { - const { width, height } = ctx.stack.getBaseSize(); - const headerH = headerHeight(font); - this.listMenu.setItems(this.flatRows()); - // Row boxes start one pixel above the header's bottom edge. - this.listMenu.paint( - image, - { x: LIST_X - LIST_HIGHLIGHT_PAD, y: headerH - 1, width: width - 2 * LIST_X + 2 * LIST_HIGHLIGHT_PAD, height: height - headerH - 4 }, - ctx.stack.isFocused(), - ); - } - private drawListRow({ image, item, x, y, width, height, selected }: MenuDrawArgs): void { const font = getDefaultSmallFont(); const label = truncateText(font, item.label, width - 2 * LIST_HIGHLIGHT_PAD); diff --git a/app/apps/files/font-previewer.ts b/app/apps/files/font-previewer.ts index a486497a..6af93ee9 100644 --- a/app/apps/files/font-previewer.ts +++ b/app/apps/files/font-previewer.ts @@ -5,10 +5,8 @@ import { canLoadFontFile, fontFileDisplayName, fontFileMetrics, renderFontFileTe import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_SCROLL, gestureHints, type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; -const MARGIN_X = 18; -const TITLE_Y = 8; -const BODY_TOP = 26; -const FOOTER_MARGIN = 20; +/** From the title's top to the first sample's. */ +const TITLE_BAND = 18; const SAMPLE_GAP = 4; const SIZES = [8,9,10,11, 12, 13, 14, 16, 18, 20, 24, 28, 32, 40, 48] as const; @@ -48,36 +46,41 @@ export class FontPreviewerLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const out = new GrayImage(width, height, 0); const size = SIZES[this.sizeIndex]!; const gamma = GAMMAS[this.gammaIndex]!; + // Everything keeps inside the padding suggested for the window's edges: + // the title line at the top, the samples across the width, the hint + // line at the bottom. + const left = padding.left; + const bodyWidth = Math.max(0, width - padding.left - padding.right); + const bodyTop = padding.top + TITLE_BAND; const status = `${size}px γ ${gamma.toFixed(1)}`; const statusWidth = font.measureText(status); - const title = truncateText(font, this.getDisplayName(), width - 2 * MARGIN_X - statusWidth - 12); - out.drawText(font, MARGIN_X, TITLE_Y, title, 220); - out.drawText(font, width - MARGIN_X - statusWidth, TITLE_Y, status, 150); + const title = truncateText(font, this.getDisplayName(), bodyWidth - statusWidth - 12); + out.drawText(font, left, padding.top, title, 220); + out.drawText(font, left + bodyWidth - statusWidth, padding.top, status, 150); if (this.loadable === null) { this.loadable = canLoadFontFile(this.path); } - const footerY = height - FOOTER_MARGIN; + const footerY = height - padding.bottom - font.lineHeight; if (!this.loadable) { - out.drawText(font, MARGIN_X, BODY_TOP + 16, "(could not load font)", 160); - out.drawText(font, MARGIN_X, footerY, gestureHints([[GESTURE_DOUBLE_CLICK, "back"]]), 110); + out.drawText(font, left, bodyTop + 16, "(could not load font)", 160); + out.drawText(font, left, footerY, gestureHints([[GESTURE_DOUBLE_CLICK, "back"]]), 110); return out; } - const bodyWidth = width - 2 * MARGIN_X; - let y = BODY_TOP; + let y = bodyTop; for (const [id, text] of [ ["pangram", PANGRAM], ["charset", CHARSET], ] as const) { const line = this.getCached(id, () => renderFontFileText(this.path, text, size, gamma)); if (!line) continue; - out.bitBlt(line, MARGIN_X, y, { width: bodyWidth }); + out.bitBlt(line, left, y, { width: bodyWidth }); y += line.height + SAMPLE_GAP; } @@ -97,13 +100,13 @@ export class FontPreviewerLayer implements Layer { }), ); if (paragraph) { - out.bitBlt(paragraph, MARGIN_X, y + SAMPLE_GAP); + out.bitBlt(paragraph, left, y + SAMPLE_GAP); } } out.drawText( font, - MARGIN_X, + left, footerY, gestureHints([ [GESTURE_SCROLL, "size"], diff --git a/app/apps/files/image-viewer.ts b/app/apps/files/image-viewer.ts index a6bf3456..f500026f 100644 --- a/app/apps/files/image-viewer.ts +++ b/app/apps/files/image-viewer.ts @@ -5,9 +5,9 @@ import { loadImageFileAsGray, PHOTO_TONE } from "../../native/image-files"; import { GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; -const MARGIN_X = 18; -const TITLE_Y = 8; -const BODY_TOP = 24; +/** From the title's top to the image area's. */ +const TITLE_BAND = 16; +/** How far the image area keeps from the window's sides and bottom. */ const BODY_MARGIN = 2; /** @@ -19,7 +19,8 @@ const BODY_MARGIN = 2; */ export class ImageViewerLayer implements Layer { private image: GrayImage | null = null; - private loadAttempted = false; + /** The image area ("WxH") the file was last decoded to fit; null before the first load. */ + private fittedTo: string | null = null; constructor( private readonly path: string, @@ -28,24 +29,31 @@ export class ImageViewerLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const out = new GrayImage(width, height, 0); - out.drawText(font, MARGIN_X, TITLE_Y, truncateText(font, this.title, width - 2 * MARGIN_X), 220); + // The title line keeps inside the padding suggested for the window's + // edges; the image fills the rest of the window whatever its edges touch. + out.drawText(font, padding.left, padding.top, truncateText(font, this.title, width - padding.left - padding.right), 220); - const bodyHeight = height - BODY_TOP - BODY_MARGIN; - if (!this.loadAttempted) { - this.loadAttempted = true; - this.image = loadImageFileAsGray(this.path, width - 2 * BODY_MARGIN, bodyHeight, PHOTO_TONE); + const bodyTop = padding.top + TITLE_BAND; + const bodyWidth = width - 2 * BODY_MARGIN; + const bodyHeight = height - bodyTop - BODY_MARGIN; + // The area moves with the window's size and its top padding, so the + // file is decoded again whenever it changes rather than once. + const fit = `${bodyWidth}x${bodyHeight}`; + if (this.fittedTo !== fit) { + this.fittedTo = fit; + this.image = loadImageFileAsGray(this.path, bodyWidth, bodyHeight, PHOTO_TONE); } if (!this.image) { - out.drawText(font, MARGIN_X, BODY_TOP + 16, "(could not load image)", 160); - out.drawText(font, MARGIN_X, height - 16, `${GESTURE_DOUBLE_CLICK} back`, 110); + out.drawText(font, padding.left, bodyTop + 16, "(could not load image)", 160); + out.drawText(font, padding.left, height - padding.bottom - font.lineHeight, `${GESTURE_DOUBLE_CLICK} back`, 110); return out; } out.bitBlt( this.image, Math.round((width - this.image.width) / 2), - BODY_TOP + Math.round((bodyHeight - this.image.height) / 2), + bodyTop + Math.round((bodyHeight - this.image.height) / 2), ); return out; } diff --git a/app/apps/files/text-viewer.ts b/app/apps/files/text-viewer.ts index 323cd138..906a87d9 100644 --- a/app/apps/files/text-viewer.ts +++ b/app/apps/files/text-viewer.ts @@ -5,11 +5,9 @@ import { GrayImage, type UiFont } from "../../graphics/image"; import { type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; -const MARGIN_X = 18; -const TITLE_Y = 16; -const BODY_X = 18; -const BODY_Y = 44; -const FOOTER_MARGIN = 36; +/** The title: how far right of the body's column, and from its top to the first body line's. */ +const TITLE_INSET_X = 4; +const TITLE_BAND = 28; /** Line step for a bitmap face (the 12px font plus leading, as before). */ const BDF_LINE_STEP = 14; @@ -24,8 +22,11 @@ function lineStepOf(font: UiFont): number { } /** - * Paged text viewer for a document. Sized to its hosting stack (a Files - * document window, or pushed over the file browser for view-in-place). + * Paged text viewer for a document: a title line, the page's lines, and a + * page-number line, all inside the padding suggested for the window's edges + * (the title and page number stay put, so the lines page between them). + * Sized to its hosting stack (a Files document window, or pushed over the + * file browser for view-in-place). */ export class TextViewerLayer implements Layer { private lines: string[] | null = null; @@ -42,20 +43,23 @@ export class TextViewerLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getViewerFont(); const lineStep = lineStepOf(font); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - const footerY = height - FOOTER_MARGIN; - this.bodyLineCount = Math.max(1, Math.floor((footerY - BODY_Y) / lineStep)); - image.drawText(font, MARGIN_X + 4, TITLE_Y, truncateText(font, this.title, width - 2 * MARGIN_X - 8), 220); + const bodyX = padding.left; + const bodyWidth = Math.max(0, width - padding.left - padding.right); + const bodyY = padding.top + TITLE_BAND; + const footerY = height - padding.bottom - font.lineHeight; + this.bodyLineCount = Math.max(1, Math.floor((footerY - bodyY) / lineStep)); + image.drawText(font, bodyX + TITLE_INSET_X, padding.top, truncateText(font, this.title, bodyWidth - 2 * TITLE_INSET_X), 220); - const lines = this.getLines(font, width); + const lines = this.getLines(font, bodyWidth); const visibleLines = lines.slice(this.firstLine, this.firstLine + this.bodyLineCount); for (let index = 0; index < visibleLines.length; index++) { - image.drawText(font, BODY_X, BODY_Y + index * lineStep, visibleLines[index]!, 230); + image.drawText(font, bodyX, bodyY + index * lineStep, visibleLines[index]!, 230); } const currentPage = Math.floor(this.firstLine / this.pageStep()) + 1; - image.drawText(font, BODY_X, footerY, `Page ${currentPage}/${this.totalPageCount(lines.length)}`, 110); + image.drawText(font, bodyX, footerY, `Page ${currentPage}/${this.totalPageCount(lines.length)}`, 110); return image; } @@ -89,14 +93,15 @@ export class TextViewerLayer implements Layer { this.firstLine = Math.max(0, Math.min(maxFirstLine, this.firstLine + delta)); } - private getLines(font: UiFont, width: number): string[] { - if (this.lines === null || this.wrappedForWidth !== width || this.wrappedWithFont !== font.fingerprintId) { + /** The document wrapped to the body column's width; cached per width and font. */ + private getLines(font: UiFont, bodyWidth: number): string[] { + if (this.lines === null || this.wrappedForWidth !== bodyWidth || this.wrappedWithFont !== font.fingerprintId) { const normalized = this.documentText.replace(/\t/g, " ").replace(/\r/g, ""); - this.lines = wrapText(font, normalized, width - BODY_X - 12, { + this.lines = wrapText(font, normalized, bodyWidth, { preserveLeadingWhitespace: true, breakLongWords: true, }); - this.wrappedForWidth = width; + this.wrappedForWidth = bodyWidth; this.wrappedWithFont = font.fingerprintId; } return this.lines; diff --git a/app/apps/files/video-window.ts b/app/apps/files/video-window.ts index 2310e117..7b1d8d09 100644 --- a/app/apps/files/video-window.ts +++ b/app/apps/files/video-window.ts @@ -53,9 +53,11 @@ export const videoMonochromeSetting = new ConfigSettingBoolean({ /** How far one ring scroll seeks. */ const SEEK_STEP_MS = 10_000; -const MARGIN_X = 18; -const TITLE_Y = 10; +/** The settings panel's rows: at most this wide, their text this far inside their selection box. */ const PANEL_WIDTH = 340; +const PANEL_ROW_TEXT_INSET = 10; +/** The panel's title: how far below the window's top padding. */ +const TITLE_OFFSET_Y = 2; /** * One opened video: its probe result, the native player, and the window @@ -202,7 +204,9 @@ type PanelRow = { kind: "size" } | { kind: "audio" } | { kind: "monochrome" } | /** * The pre-play settings panel (the window's root): picture size, audio and * monochrome, all remembered for the next video, then Play (or Resume plus - * Play from start once a position is kept). + * Play from start once a position is kept). The rows' selection boxes start + * at the padding suggested for the window's left edge, and the title and + * the lines under it line up with the rows' text. */ class VideoSettingsLayer implements Layer { private readonly menu = new Menu({ @@ -224,11 +228,16 @@ class VideoSettingsLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - image.drawText(font, MARGIN_X, TITLE_Y, truncateText(font, this.session.title, width - 2 * MARGIN_X), 220); + const rowsX = padding.left; + const available = Math.max(0, width - padding.left - padding.right); + const textX = rowsX + PANEL_ROW_TEXT_INSET; + const textWidth = available - 2 * PANEL_ROW_TEXT_INSET; + const titleY = padding.top + TITLE_OFFSET_Y; + image.drawText(font, textX, titleY, truncateText(font, this.session.title, textWidth), 220); const step = lineStep(font); - let y = TITLE_Y + step; + let y = titleY + step; const info = this.session.info; const errors: string[] = []; @@ -236,12 +245,12 @@ class VideoSettingsLayer implements Layer { if (this.session.error) errors.push(`Playback stopped: ${this.session.error}`); if (info) { const facts = [`${info.width}x${info.height}`, formatMediaTime(info.durationMs), info.hasAudio ? "sound" : "no sound"]; - image.drawText(font, MARGIN_X, y, facts.join(" · "), 130); + image.drawText(font, textX, y, facts.join(" · "), 130); y += step; } for (const error of errors) { - for (const line of wrapText(font, error, width - 2 * MARGIN_X, { breakLongWords: true }).slice(0, 3)) { - image.drawText(font, MARGIN_X, y, line, 200); + for (const line of wrapText(font, error, textWidth, { breakLongWords: true }).slice(0, 3)) { + image.drawText(font, textX, y, line, 200); y += step; } } @@ -253,9 +262,10 @@ class VideoSettingsLayer implements Layer { // Land on Resume/Play by default: the settings usually stay as they were. const playIndex = rows.findIndex((row) => row.kind === "play"); this.menu.setItems(rows, index >= 0 ? index : playIndex >= 0 ? playIndex : undefined); - const panelWidth = Math.min(PANEL_WIDTH, width - 2 * (MARGIN_X - 6)); - this.menu.paint(image, { x: MARGIN_X - 6, y, width: panelWidth, height: Math.max(0, height - y - 4) }, - ctx.stack.isFocused()); + // The rows scroll under the fixed lines above, as far as the window's + // bottom edge, with the padding suggested for that edge inside the list. + this.menu.paint(image, { x: rowsX, y, width: Math.min(PANEL_WIDTH, available), height: Math.max(0, height - y), + padTop: 0, padBottom: padding.bottom }, ctx.stack.isFocused()); return image; } @@ -294,8 +304,8 @@ class VideoSettingsLayer implements Layer { private drawRow({ image, item, x, y, width, selected }: MenuDrawArgs): void { const font = getDefaultSmallFont(); - const textX = x + 10; - const textWidth = width - 20; + const textX = x + PANEL_ROW_TEXT_INSET; + const textWidth = width - 2 * PANEL_ROW_TEXT_INSET; switch (item.kind) { case "size": { const size = videoSizeSetting.get(); diff --git a/app/apps/flappy/flappy-app.worker.ts b/app/apps/flappy/flappy-app.worker.ts index 27fae1c7..5f95d777 100644 --- a/app/apps/flappy/flappy-app.worker.ts +++ b/app/apps/flappy/flappy-app.worker.ts @@ -41,6 +41,7 @@ import { loadSoundEnabled, saveSoundEnabled } from "../../ui/sound-setting"; import { type MenuItem } from "../../ui/menu"; import { WindowMenu } from "../../ui/window-menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import { directionalFallback, GESTURE_CLICK, @@ -95,6 +96,12 @@ const RENDER_TICK_MS = 30; /** Physics steps per wing frame while flying. */ const WING_STEPS_PER_FRAME = 6; +// --- HUD (pixels below the top line's y) -------------------------------------- +/** The title: a shorter font than the score's, centered on the same line. */ +const HUD_TITLE_DROP = 4; +/** The best score, under the title. */ +const HUD_BEST_DROP = 34; + const SFX_FLAP: Step[] = [{ freq: 880, duty: 40, ms: 20 }, { freq: 1175, duty: 40, ms: 25 }]; const SFX_SCORE: Step[] = [{ freq: 1568, duty: 40, ms: 40 }, { freq: 2093, duty: 40, ms: 60 }]; const SFX_HIT: Step[] = [{ freq: 220, duty: 55, ms: 80 }, { freq: 165, duty: 55, ms: 120 }]; @@ -135,6 +142,13 @@ type FlappyWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there. The playfield fills the + * window whatever its edges touch; only the HUD's top line keeps the + * padding (see paintHud). + */ + viewport: Viewport; foreground: boolean; /** Whether this window is the shell's input target (pushed with each message). */ focused: boolean; @@ -198,6 +212,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -225,7 +240,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.menu?.resize({ width: window.viewportWidth, height: window.viewportHeight }); + window.viewport = message.viewport; + window.menu?.resize(message.viewport); if (window.foreground) renderAndSubmit(window, 0); break; } @@ -372,7 +388,7 @@ function windowMenu(window: FlappyWindow): WindowMenu { post, title: () => window.title, items: () => windowMenuItems(window), - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: window.viewport, paintBase: () => paintContent(window), isFocused: () => window.focused, }); @@ -712,14 +728,18 @@ function birdWingFrame(window: FlappyWindow): number { function paintHud(image: GrayImage, window: FlappyWindow): void { const width = window.viewportWidth; + // The top line (the score, or the title before the first flap) is the + // only thing here placed from a window edge: it keeps the padding + // suggested for the top, and the best score hangs under it. + const top = window.viewport.padding.top; if (window.phase !== "ready") { - drawCenteredIn(image, largeFont, 0, width, 10, String(window.score), 245); + drawCenteredIn(image, largeFont, 0, width, top, String(window.score), 245); } switch (window.phase) { case "ready": - drawCenteredIn(image, mediumFont, 0, width, 14, "FLAPPY", 245); + drawCenteredIn(image, mediumFont, 0, width, top + HUD_TITLE_DROP, "FLAPPY", 245); if (window.highScore > 0) { - drawCenteredIn(image, smallFont, 0, width, 44, `best ${window.highScore}`, 150); + drawCenteredIn(image, smallFont, 0, width, top + HUD_BEST_DROP, `best ${window.highScore}`, 150); } drawCenteredIn(image, smallFont, 0, width, groundTop(window) - 26, "Touch ring / swipe to flap", 150); break; diff --git a/app/apps/freecell/freecell-app.worker.ts b/app/apps/freecell/freecell-app.worker.ts index bd611a44..1bdee5a8 100644 --- a/app/apps/freecell/freecell-app.worker.ts +++ b/app/apps/freecell/freecell-app.worker.ts @@ -33,6 +33,7 @@ import { loadSoundEnabled, saveSoundEnabled } from "../../ui/sound-setting"; import { WindowMenu } from "../../ui/window-menu"; import type { MenuItem } from "../../ui/menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import { directionalFallback, GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_LONG_PRESS, type InputEvent } from "../../ui/gestures"; declare const global: any; @@ -61,8 +62,16 @@ function isRed(card: number): boolean { const CARD_W = 60; const CARD_H = 36; -const TOP_Y = 4; -const CASCADE_Y = 48; +/** How far outside the card or cascade it marks the cursor's outline is drawn. */ +const CURSOR_OUTSET = 3; +/** Gap between the top row (free cells and foundations) and the cascades. */ +const ROW_GAP = 8; +/** The most of a buried cascade card left showing: enough for its label. */ +const MAX_STRIP = 16; +/** Least column pitch that keeps the cursor's outline round one column off the next column's cards. */ +const MIN_PITCH = CARD_W + CURSOR_OUTSET; +/** Height of the longest cascade of a fresh deal (7 cards) fanned at MAX_STRIP. */ +const DEALT_CASCADE_H = 6 * MAX_STRIP + CARD_H; /** * Cursor locations, in scroll order: free cells 0-3, foundations 0-3 (the @@ -106,6 +115,12 @@ type FreecellWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there, which the board is laid + * out inside (see layoutFor). + */ + viewport: Viewport; foreground: boolean; /** Whether this window is the shell's input target (pushed with each message). */ focused: boolean; @@ -155,6 +170,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -210,7 +226,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.menu?.resize({ width: window.viewportWidth, height: window.viewportHeight }); + window.viewport = message.viewport; + window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; if (window.foreground) renderAndSubmit(window, 0); break; @@ -286,7 +303,7 @@ function windowMenu(window: FreecellWindow): WindowMenu { post, title: () => window.title, items: () => windowMenuItems(window), - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: window.viewport, paintBase: () => paintContent(window), isFocused: () => window.focused, }); @@ -706,21 +723,67 @@ function checkWin(window: FreecellWindow): void { // Painting type Layout = { + /** Distance between the left edges of neighboring columns. */ pitch: number; + /** Left edge of the first column's cards. */ marginX: number; + /** Top of the free cells and foundations. */ + topY: number; + /** Top of the cascades. */ + cascadeY: number; /** Vertical pixels per buried cascade card (its visible label strip). */ strip: (cascadeLength: number) => number; }; +/** + * The eight columns across a window of the given width, keeping the given + * padding at its left and right edges: spread as far apart as a whole-pixel + * pitch allows, with what is left over split between the two sides. + */ +function columnLayout(width: number, padLeft: number, padRight: number): Pick { + const left = padLeft + CURSOR_OUTSET; + const slack = width - padRight - CURSOR_OUTSET - left - CARD_W; + const pitch = Math.floor(slack / 7); + return { pitch, marginX: left + Math.floor((slack - pitch * 7) / 2) }; +} + +/** + * The two rows down a window of the given height, keeping the given padding + * at its top and bottom edges, and the height that leaves a cascade to fan + * out in. + */ +function rowLayout( + height: number, + padTop: number, + padBottom: number, +): Pick & { cascadeH: number } { + const topY = padTop + CURSOR_OUTSET; + const cascadeY = topY + CARD_H + ROW_GAP; + return { topY, cascadeY, cascadeH: height - padBottom - CURSOR_OUTSET - cascadeY }; +} + +/** + * Lay the board out in the window. The cursor's outline is the outermost + * thing drawn toward every edge (CURSOR_OUTSET outside whatever it marks), so + * it is what sits at the padding suggested for the edge; the columns spread + * across the width inside it, and the cascades fan down the height. A + * window too small for that (the RayNeo iO's) is short of room for the cards + * as it is, so along the axis where they would crowd, they take the + * padding's room too. + */ function layoutFor(window: FreecellWindow): Layout { - const pitch = Math.floor((window.viewportWidth - 12) / 8); - const marginX = Math.floor((window.viewportWidth - (pitch * 8 - (pitch - CARD_W))) / 2); - const available = window.viewportHeight - CASCADE_Y - 2; + const { padding } = window.viewport; + let columns = columnLayout(window.viewportWidth, padding.left, padding.right); + if (columns.pitch < MIN_PITCH) columns = columnLayout(window.viewportWidth, 0, 0); + let rows = rowLayout(window.viewportHeight, padding.top, padding.bottom); + if (rows.cascadeH < DEALT_CASCADE_H) rows = rowLayout(window.viewportHeight, 0, 0); + const { topY, cascadeY, cascadeH } = rows; return { - pitch, - marginX, + ...columns, + topY, + cascadeY, strip: (cascadeLength: number) => - cascadeLength <= 1 ? 0 : Math.min(16, Math.floor((available - CARD_H) / (cascadeLength - 1))), + cascadeLength <= 1 ? 0 : Math.min(MAX_STRIP, Math.floor((cascadeH - CARD_H) / (cascadeLength - 1))), }; } @@ -743,25 +806,26 @@ function paintContent(window: FreecellWindow): GrayImage { const image = new GrayImage(window.viewportWidth, window.viewportHeight, 0); const layout = layoutFor(window); const colX = (i: number) => layout.marginX + i * layout.pitch; + const { topY } = layout; // Top row: free cells then foundations, with a divider between the groups. for (let i = 0; i < 4; i++) { const card = window.cells[i]!; if (card === null) { - image.drawRoundedRect(colX(i), TOP_Y, CARD_W, CARD_H, 70, 4); + image.drawRoundedRect(colX(i), topY, CARD_W, CARD_H, 70, 4); } else { - paintCard(image, colX(i), TOP_Y, card, window.selected === LOC_CELL0 + i, true); + paintCard(image, colX(i), topY, card, window.selected === LOC_CELL0 + i, true); } } - image.drawLine(colX(4) - 4, TOP_Y + 4, colX(4) - 4, TOP_Y + CARD_H - 4, 70); + image.drawLine(colX(4) - 4, topY + 4, colX(4) - 4, topY + CARD_H - 4, 70); for (let i = 0; i < 4; i++) { const x = colX(4 + i); const card = window.foundations[i]!; if (card === null) { - image.drawRoundedRect(x, TOP_Y, CARD_W, CARD_H, 70, 4); - image.drawText(labelFont, x + Math.round((CARD_W - labelFont.measureText("A")) / 2), TOP_Y + 10, "A", 70); + image.drawRoundedRect(x, topY, CARD_W, CARD_H, 70, 4); + image.drawText(labelFont, x + Math.round((CARD_W - labelFont.measureText("A")) / 2), topY + 10, "A", 70); } else { - paintCard(image, x, TOP_Y, card, window.selected === LOC_FOUNDATION0 + i, true); + paintCard(image, x, topY, card, window.selected === LOC_FOUNDATION0 + i, true); } } @@ -777,7 +841,7 @@ function paintCascade(image: GrayImage, window: FreecellWindow, layout: Layout, const x = layout.marginX + index * layout.pitch; const cascade = window.cascades[index]!; if (cascade.length === 0) { - image.drawRoundedRect(x, CASCADE_Y, CARD_W, CARD_H, 45, 4); + image.drawRoundedRect(x, layout.cascadeY, CARD_W, CARD_H, 45, 4); return; } const strip = layout.strip(cascade.length); @@ -788,7 +852,7 @@ function paintCascade(image: GrayImage, window: FreecellWindow, layout: Layout, highlightFrom = cascade.length - run; } for (let i = 0; i < cascade.length; i++) { - paintCard(image, x, CASCADE_Y + i * strip, cascade[i]!, i >= highlightFrom, i === cascade.length - 1); + paintCard(image, x, layout.cascadeY + i * strip, cascade[i]!, i >= highlightFrom, i === cascade.length - 1); } } @@ -831,17 +895,18 @@ function paintCursor(image: GrayImage, window: FreecellWindow, layout: Layout): let height: number; if (window.cursor < LOC_CASCADE0) { x = layout.marginX + (window.cursor % 8) * layout.pitch; - y = TOP_Y; + y = layout.topY; height = CARD_H; } else { const index = window.cursor - LOC_CASCADE0; const cascade = window.cascades[index]!; x = layout.marginX + index * layout.pitch; - y = CASCADE_Y; + y = layout.cascadeY; height = cascade.length === 0 ? CARD_H : (cascade.length - 1) * layout.strip(cascade.length) + CARD_H; } - image.drawRect(x - 3, y - 3, CARD_W + 6, height + 6, 255); - image.drawRect(x - 2, y - 2, CARD_W + 4, height + 4, 255); + for (const outset of [CURSOR_OUTSET, CURSOR_OUTSET - 1]) { + image.drawRect(x - outset, y - outset, CARD_W + 2 * outset, height + 2 * outset, 255); + } } function paintWinOverlay(image: GrayImage, window: FreecellWindow): void { diff --git a/app/apps/glanceboard/glanceboard-app.ts b/app/apps/glanceboard/glanceboard-app.ts index 8afaf474..9151d416 100644 --- a/app/apps/glanceboard/glanceboard-app.ts +++ b/app/apps/glanceboard/glanceboard-app.ts @@ -10,6 +10,7 @@ import { Menu } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, lineStep, listRowHeight } from "../../ui/metrics"; import { createInProcessWindow, type InProcessAppOptions, type InProcessWindow } from "../../ui/shell/in-process-window"; import { shell } from "../../ui/shell/shell"; +import type { Viewport } from "../../ui/viewport"; import { GlanceBoard } from "./board"; import { glanceFont } from "./glance-font"; import { @@ -33,17 +34,20 @@ import { findGlanceWidget, glanceWidgetSpans } from "./widgets"; export const GLANCEBOARD_WINDOW_ID = "glanceboard"; export const GLANCEBOARD_SURFACE_ID = "window:glanceboard"; -const TITLE_X = 18; -const TITLE_Y = 10; -const PARAGRAPH_X = 24; -/** The entry page splits at the middle: menu left, slot preview right. */ +/** The entry page's title: its drop below the top padding. It lines up with the menu rows' text. */ +const TITLE_OFFSET_Y = 2; +/** Indent of the intro paragraph under the title, and how far short of the middle it wraps. */ +const PARAGRAPH_INDENT = 6; +const PARAGRAPH_RIGHT_GAP = 12; +/** The entry page splits at the middle: menu left, slot preview right, this far from the split. */ const PREVIEW_MARGIN = 8; +/** The preview's outline, drawn just outside the scaled board. */ +const PREVIEW_OUTLINE = 1; const PREVIEW_MIN_LINE_VALUE = 20; const PREVIEW_LINE_VALUE = 100; -/** The entry menu's row boxes: left inset, gap below the paragraph, and inset from the page's bottom. */ -const HOME_MENU_X = 20; +/** The entry menu's row boxes: gap below the paragraph, and how far short of the middle they end. */ const HOME_MENU_TOP_GAP = 12; -const HOME_MENU_BOTTOM_MARGIN = 8; +const HOME_MENU_RIGHT_GAP = 20; /** Horizontal inset of row text (and custom row content) from its selection box. */ const HOME_ROW_TEXT_X = 10; // A throwaway menu to satisfy MenuItem.onSelect's second parameter; the @@ -56,9 +60,7 @@ const INTRO = "long-press-and-hold. It will close automatically."; /** Full-page list layout shared by the sub-screens. */ -function pageMenuLayout(width: number) { - return { x: 8, y: 8, width: width - 16, opaque: true, showBorder: false } as const; -} +const PAGE_MENU_LAYOUT = { page: true } as const; /** * The Glanceboard app's entry page. Left half: title, a short description @@ -67,6 +69,10 @@ function pageMenuLayout(width: number) { * name of the widget in each. "Select Contents" moves focus into that * preview, where scroll picks a slot and a tap opens the picker for it; * a double-tap returns focus to the menu. + * + * The menu's row boxes and the preview's outline sit at the padding + * suggested for the window's edges (viewport.ts). The menu scrolls, so it + * runs to the bottom edge itself, with that edge's padding after its last row. */ class GlanceboardHomeLayer implements Layer { private readonly menu: Menu; @@ -125,17 +131,23 @@ class GlanceboardHomeLayer implements Layer { }); } - /** Where the scaled board sits: the right half, board aspect, vertically centred. */ - private previewRect(width: number, height: number): { x: number; y: number; width: number; height: number } { - const half = (width / 2) | 0; - const availableWidth = width - half - 2 * PREVIEW_MARGIN; + /** + * Where the scaled board sits: board aspect, centred in the right half's + * room inside the window's padding, which its outline may reach. + */ + private previewRect(viewport: Viewport): { x: number; y: number; width: number; height: number } { + const { width, height, padding } = viewport; + const left = ((width / 2) | 0) + PREVIEW_MARGIN; + const top = padding.top + PREVIEW_OUTLINE; + const availableWidth = Math.max(0, width - padding.right - PREVIEW_OUTLINE - left); + const availableHeight = Math.max(0, height - padding.bottom - PREVIEW_OUTLINE - top); const layout = glanceLayout(); - const scale = Math.min(availableWidth / layout.width, (height - 2 * PREVIEW_MARGIN) / layout.height); + const scale = Math.min(availableWidth / layout.width, availableHeight / layout.height); const previewWidth = Math.round(layout.width * scale); const previewHeight = Math.round(layout.height * scale); return { - x: half + PREVIEW_MARGIN + (((availableWidth - previewWidth) / 2) | 0), - y: ((height - previewHeight) / 2) | 0, + x: left + (((availableWidth - previewWidth) / 2) | 0), + y: top + (((availableHeight - previewHeight) / 2) | 0), width: previewWidth, height: previewHeight, }; @@ -143,32 +155,37 @@ class GlanceboardHomeLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const viewport = ctx.stack.getBaseSize(); + const { width, height, padding } = viewport; const image = new GrayImage(width, height, 0); const half = (width / 2) | 0; - image.drawText(font, TITLE_X, TITLE_Y, "Glanceboard", 220); + const menuX = padding.left; + const titleX = menuX + HOME_ROW_TEXT_X; + const titleY = padding.top + TITLE_OFFSET_Y; + image.drawText(font, titleX, titleY, "Glanceboard", 220); const step = lineStep(font); - let y = TITLE_Y + step + 6; - for (const line of wrapText(font, INTRO, half - PARAGRAPH_X - 12)) { - image.drawText(font, PARAGRAPH_X, y, line, 160); + const paragraphX = titleX + PARAGRAPH_INDENT; + let y = titleY + step + 6; + for (const line of wrapText(font, INTRO, half - PARAGRAPH_RIGHT_GAP - paragraphX)) { + image.drawText(font, paragraphX, y, line, 160); y += step; } // The menu sits below the paragraph in the left half. While the preview // has focus the menu keeps its outline-only selection. const menuTop = y + HOME_MENU_TOP_GAP; - const menuWidth = half - 2 * HOME_MENU_X; - const menuHeight = Math.max(0, height - menuTop - HOME_MENU_BOTTOM_MARGIN); + const menuWidth = Math.max(0, half - HOME_MENU_RIGHT_GAP - menuX); + const menuHeight = Math.max(0, height - menuTop); this.paintCtx = ctx; try { - this.menu.paint(image, { x: HOME_MENU_X, y: menuTop, width: menuWidth, height: menuHeight }, + this.menu.paint(image, { x: menuX, y: menuTop, width: menuWidth, height: menuHeight, padBottom: padding.bottom }, ctx.stack.isFocused() && this.focus === "menu"); } finally { this.paintCtx = null; } - this.menu.drawScrollbar(image, HOME_MENU_X + menuWidth + 5, menuTop, menuHeight - 4); + this.menu.drawScrollbar(image, menuX + menuWidth + 5, menuTop, Math.max(0, menuHeight - padding.bottom - 4)); this.selectedSlot = Math.min(this.selectedSlot, glanceLayout().slots.length - 1); - const preview = this.previewRect(width, height); + const preview = this.previewRect(viewport); drawSlotPreview(image, preview, { selectedSlot: this.selectedSlot, selectionFocused: ctx.stack.isFocused() && this.focus === "preview", @@ -238,7 +255,7 @@ function drawSlotPreview( height: Math.round(r.height * sy), }); - image.drawRect(rect.x - 1, rect.y - 1, rect.width + 2, rect.height + 2, 72); + image.drawRect(rect.x - PREVIEW_OUTLINE, rect.y - PREVIEW_OUTLINE, rect.width + 2 * PREVIEW_OUTLINE, rect.height + 2 * PREVIEW_OUTLINE, 72); const selected = scaled(layout.slots[options.selectedSlot]!.rect); drawSelectionHighlight(image, selected.x + 1, selected.y + 1, selected.width - 2, selected.height - 2, options.selectionFocused, 4); @@ -321,7 +338,7 @@ function openGlanceSettings(ctx: LayerContext): void { enumSettingMenuItem(glanceDepthSetting), ...widgetSettingsMenuItems(), ]; - const layer = new MenuLayer("Glanceboard settings", items(), pageMenuLayout(ctx.stack.getBaseSize().width)); + const layer = new MenuLayer("Glanceboard settings", items(), PAGE_MENU_LAYOUT); ctx.stack.push(layer); } @@ -341,7 +358,7 @@ function widgetSettingsMenuItems(): MenuItem[] { return { label: widget.label, description: `${widget.label} has no settings.`, disabled: true, onSelect: () => {} }; } return submenuItem(widget.label, (ctx) => { - ctx.stack.push(new MenuLayer(`${widget.label} settings`, settingsMenuItems(), pageMenuLayout(ctx.stack.getBaseSize().width))); + ctx.stack.push(new MenuLayer(`${widget.label} settings`, settingsMenuItems(), PAGE_MENU_LAYOUT)); }, { description: `Settings for the ${widget.label} widget.` }); }); } diff --git a/app/apps/glanceboard/widgets/system-card.ts b/app/apps/glanceboard/widgets/system-card.ts index 90fb5056..95cb103a 100644 --- a/app/apps/glanceboard/widgets/system-card.ts +++ b/app/apps/glanceboard/widgets/system-card.ts @@ -11,6 +11,7 @@ import { ensureLocationPermission, hasLocationPermission } from "../../../native import { onAndroidNotificationsChanged, readActiveNotificationIcons } from "../../../native/notification-icons"; import { NOTIFICATION_ICON_SIZE } from "../../../native/notification-types"; import { readPhoneBatteryState } from "../../../native/phone-battery"; +import { voiceControlBridge } from "../../../native/voice-control"; import { weatherBridge } from "../../../native/weather"; import { formatClockDate, formatClockTime } from "../../../ui/clock-format"; import { @@ -26,6 +27,7 @@ import { watchBatteryVisibilitySetting, type BatteryIndicatorVisibility, } from "../../../ui/dashboard-settings"; +import { RECORDING_ICON } from "../../../ui/listening-header"; import { type MenuItem } from "../../../ui/menu"; import { shell } from "../../../ui/shell/shell"; import { noteStaleDataUsed, renderPassAllowsStaleData } from "../../../util/render-freshness"; @@ -149,13 +151,16 @@ function requestWeatherLocationAccess(): void { * off, and the layout mirrored either way, in the card's submenu of * Glanceboard > Settings. Battery style and per-device visibility follow * Settings > Customization > Battery indicators, so the card agrees with - * the bar. Countdowns tick once a second only while one is running. + * the bar. Countdowns tick once a second only while one is running. While + * Transcribe or Translate is saving the mic's audio (their Save Recording), + * the recording circle sits under the batteries and weather. */ export class SystemCardWidget implements GlanceWidget { private requestRender: (() => void) | null = null; private minuteTimer: ReturnType | null = null; private secondTimer: ReturnType | null = null; private unsubscribeNotifications: (() => void) | null = null; + private unsubscribeRecording: (() => void) | null = null; private unsubscribeSettings: (() => void) | null = null; private unsubscribeTimers: (() => void) | null = null; private unsubscribeWeather: (() => void) | null = null; @@ -164,6 +169,7 @@ export class SystemCardWidget implements GlanceWidget { this.requestRender = requestRender; this.scheduleMinuteTick(); this.unsubscribeNotifications = onAndroidNotificationsChanged(() => this.requestRender?.()); + this.unsubscribeRecording = voiceControlBridge.onRecordingChange(() => this.requestRender?.()); this.unsubscribeSettings = onAnySettingChanged(() => this.requestRender?.()); this.unsubscribeTimers = timerEngine.onChange(() => { this.syncSecondTick(); @@ -182,6 +188,8 @@ export class SystemCardWidget implements GlanceWidget { this.secondTimer = null; this.unsubscribeNotifications?.(); this.unsubscribeNotifications = null; + this.unsubscribeRecording?.(); + this.unsubscribeRecording = null; this.unsubscribeSettings?.(); this.unsubscribeSettings = null; this.unsubscribeTimers?.(); @@ -237,6 +245,8 @@ export class SystemCardWidget implements GlanceWidget { if (batteryItems.length) sideBlocks.push(batteryBlock(small, batteryItems)); const weather = weatherShowOnSystemCardSetting.get() ? weatherBlock(medium, now.getTime()) : null; if (weather) sideBlocks.push(weather); + // Last, so it comes and goes without moving the others. + if (voiceControlBridge.recording) sideBlocks.push(RECORDING_BLOCK); const side: Rect[] = []; let sideOffset = PAD; for (const block of sideBlocks) { @@ -382,6 +392,13 @@ function batteryBlock(font: UiFont, items: readonly BatteryItem[]): SideBlock { }; } +/** The recording circle: the mic's audio is being saved (see RECORDING_ICON). */ +const RECORDING_BLOCK: SideBlock = { + width: RECORDING_ICON.width, + height: RECORDING_ICON.height, + draw: (image, left, top) => image.drawImage(RECORDING_ICON, left, top), +}; + /** The current weather's condition icon and temperature, or null without a fresh reading. */ function weatherBlock(font: UiFont, nowMs: number): SideBlock | null { const reading = weatherReading(weatherBridge.snapshot(), nowMs); diff --git a/app/apps/health/health-app.ts b/app/apps/health/health-app.ts index cfea5e21..f8c076f9 100644 --- a/app/apps/health/health-app.ts +++ b/app/apps/health/health-app.ts @@ -123,11 +123,12 @@ class HealthLayer implements Layer { } paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + // The pages lay out inside the padding suggested for the window's edges. + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); drawGlancePage( image, - { width, height }, + { width, height, padding }, { small: getDefaultSmallFont(), large: getDefaultLargeFont() }, GLANCE_PAGES[this.pageIndex] ?? GLANCE_PAGES[0]!, { diff --git a/app/apps/launcher/launcher-app.ts b/app/apps/launcher/launcher-app.ts index 01cf4589..647de6de 100644 --- a/app/apps/launcher/launcher-app.ts +++ b/app/apps/launcher/launcher-app.ts @@ -4,7 +4,7 @@ import { GrayImage } from "../../graphics/image"; import { type Plane } from "../../graphics/plane"; import { renderIcon, type IconName } from "../../graphics/icons"; import { InputEvent } from "../../ui/gestures"; -import { IconGrid, ICON_GRID_BAND_INSET_X, ICON_GRID_HIGHLIGHT_INSET_Y, ICON_GRID_ICON_SIZE } from "../../ui/icon-grid"; +import { IconGrid, ICON_GRID_ICON_SIZE } from "../../ui/icon-grid"; import { Layer, LayerActions, LayerContext } from "../../ui/layers"; import { MenuLayer, type MenuItem } from "../../ui/menu"; import { WINDOW_MENU_LAYOUT } from "../../ui/window-menu"; @@ -48,12 +48,9 @@ export type LauncherOptions = { export const LAUNCHER_WINDOW_ID = "launcher"; export const LAUNCHER_SURFACE_ID = "window:launcher"; -const GRID_TOP = 6; -/** - * The root grid's top: its first row's highlight band then sits as far - * below the window's top edge as it is from the side edges. - */ -const ROOT_GRID_TOP = ICON_GRID_BAND_INSET_X - ICON_GRID_HIGHLIGHT_INSET_Y; +/** A folder's name, above its grid: how far in from the grid's side, and the gap under it. */ +const FOLDER_NAME_INSET_X = 4; +const FOLDER_NAME_GAP = 6; /** One cell of the grid: an app, or a folder holding some of the apps. */ type LauncherGridEntry = @@ -362,24 +359,32 @@ class LauncherGridLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - // The folder-name header band scales with the font. const entries = this.entries(); if (this.moving && (launcherLayoutSetting.get() !== "custom" || this.moving.folder !== this.currentFolder || !entries.some(entry => entryKey(entry) === this.moving!.key))) this.moving = null; - const gridTop = this.moving ? GRID_TOP + 2 * (font.lineHeight + 2) - : this.currentFolder !== null ? GRID_TOP + font.lineHeight + 4 : ROOT_GRID_TOP; + const gridX = padding.left; + const gridWidth = width - padding.left - padding.right; + // Scrolling rows reach the window edges, with the suggested padding + // inside the grid. Folder and move headers stay fixed above it. + let gridTop = 0; + let padTop = padding.top; + const nameX = gridX + FOLDER_NAME_INSET_X; + const nameWidth = gridWidth - 2 * FOLDER_NAME_INSET_X; if (this.moving) { - image.drawText(font, 8, GRID_TOP - 2, truncateText(font, `Move ${this.moving.label}`, width - 16), 220); - image.drawText(font, 8, GRID_TOP + font.lineHeight, "Select position; double tap cancels", 160); + image.drawText(font, nameX, padding.top, truncateText(font, `Move ${this.moving.label}`, nameWidth), 220); + image.drawText(font, nameX, padding.top + font.lineHeight + 2, + truncateText(font, "Select position; double tap cancels", nameWidth), 160); + gridTop = padding.top + 2 * (font.lineHeight + 2) + FOLDER_NAME_GAP; + padTop = 0; + } else if (this.currentFolder !== null) { + image.drawText(font, nameX, padding.top, truncateText(font, this.currentFolder, nameWidth), 160); + gridTop = padding.top + font.lineHeight + FOLDER_NAME_GAP; + padTop = 0; } - if (this.currentFolder !== null && !this.moving) { - image.drawText(font, 8, GRID_TOP - 2, truncateText(font, this.currentFolder, width - 16), 160); - } - // The grid runs to the window's bottom edge, so a row cut off there for - // scrolling meets the window's border rather than a blank strip. - this.grid.paint(image, { x: 0, y: gridTop, width, height: height - gridTop }, ctx.stack.isFocused()); + this.grid.paint(image, { x: gridX, y: gridTop, width: gridWidth, height: height - gridTop, padTop, padBottom: padding.bottom }, + ctx.stack.isFocused()); return image; } diff --git a/app/apps/microphones/captions-layer.ts b/app/apps/microphones/captions-layer.ts index 01d87f54..e4a2e8e2 100644 --- a/app/apps/microphones/captions-layer.ts +++ b/app/apps/microphones/captions-layer.ts @@ -5,11 +5,19 @@ import { GESTURE_DOUBLE_CLICK, GESTURE_SCROLL, type InputEvent } from "../../ui/ import { Layer, type LayerContext } from "../../ui/layers"; import { micSession, type CaptionLine, type MicSessionState } from "./mic-session"; +/** From the title's top to the first caption row. */ +const BODY_TOP_OFFSET = 20; +/** Indent of the caption rows under the title. */ +const ROW_INDENT = 4; + /** * On-glasses captions: each line is prefixed with the speaker's name (their * id until tagged); foreign-language lines show the translation directly * beneath the recognized original. Scroll reviews recent lines; the view * snaps back to live on new speech. + * + * The title and the hint line stay put, at the padding suggested for the + * window's top and bottom edges; the caption rows scroll between the two. */ export class CaptionsLayer implements Layer { private state: MicSessionState = micSession.getState(); @@ -33,19 +41,21 @@ export class CaptionsLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const state = this.state; + const left = padding.left; + const rowX = left + ROW_INDENT; + const bodyTop = padding.top + BODY_TOP_OFFSET; - image.drawText(font, 12, 4, "Captions", 220); + image.drawText(font, left, padding.top, "Captions", 220); if (!state.captionsActive) { - image.drawText(font, 12, 26, state.captionsNote, 130); + image.drawText(font, left, bodyTop + 2, state.captionsNote, 130); } - const rows = this.buildRows(font, width - 36, state.captionLines); + const rows = this.buildRows(font, Math.max(0, width - padding.right - rowX), state.captionLines); const step = lineStep(font) + 1; - const bodyTop = 24; - const footerY = height - font.lineHeight - 4; + const footerY = height - padding.bottom - font.lineHeight; const visibleRows = Math.max(1, Math.floor((footerY - bodyTop) / step)); const maxScrollback = Math.max(0, rows.length - visibleRows); this.scrollback = Math.min(this.scrollback, maxScrollback); @@ -54,16 +64,16 @@ export class CaptionsLayer implements Layer { const row = rows[index]!; const y = bodyTop + (index - firstRow) * step; if (row.prefix) { - image.drawText(font, 16, y, row.prefix, row.prefixValue); - image.drawText(font, 16 + font.measureText(row.prefix), y, row.text, row.value); + image.drawText(font, rowX, y, row.prefix, row.prefixValue); + image.drawText(font, rowX + font.measureText(row.prefix), y, row.text, row.value); } else { - image.drawText(font, 16 + row.indent, y, row.text, row.value); + image.drawText(font, rowX + row.indent, y, row.text, row.value); } } image.drawText( font, - 12, + left, footerY, `${GESTURE_SCROLL} history ${GESTURE_DOUBLE_CLICK} back` + (this.scrollback > 0 ? ` (${this.scrollback} back)` : ""), diff --git a/app/apps/microphones/levels-layer.ts b/app/apps/microphones/levels-layer.ts index 5f37c974..c35caca8 100644 --- a/app/apps/microphones/levels-layer.ts +++ b/app/apps/microphones/levels-layer.ts @@ -4,6 +4,12 @@ import { GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures"; import { Layer, type LayerContext } from "../../ui/layers"; import { micSession, type MicSessionState } from "./mic-session"; +/** From the title's top to the status line, and to the first meter row. */ +const STATUS_OFFSET_Y = 18; +const METERS_OFFSET_Y = 42; +/** Width of the mic-name column left of the meters. */ +const LABEL_COLUMN_WIDTH = 118; + /** * Live level meters, one per active microphone (a single mixed channel on * stock firmware; up to four mics with the mic-control firmware), plus the @@ -22,24 +28,27 @@ export class LevelsLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const state = this.state; + // Text starts at the padding suggested for the window's left edge, and + // the meters run to the right edge's. + const left = padding.left; - image.drawText(font, 12, 6, "Microphone Levels", 220); - image.drawText(font, 12, 24, state.statusText, 110); + image.drawText(font, left, padding.top, "Microphone Levels", 220); + image.drawText(font, left, padding.top + STATUS_OFFSET_Y, state.statusText, 110); - const barX = 130; - const barWidth = width - barX - 40; + const barX = left + LABEL_COLUMN_WIDTH; + const barWidth = Math.max(0, width - padding.right - barX); const rowHeight = 26; - let y = 48; + let y = padding.top + METERS_OFFSET_Y; const labels = state.levelLabels.length ? state.levelLabels : ["Glasses mic"]; labels.forEach((label, index) => { const level = state.levels[index] ?? 0; const enabled = state.levelsEnabled[index] ?? true; - image.drawText(font, 12, y + 3, enabled ? label : `${label} (off)`, enabled ? 190 : 90); + image.drawText(font, left, y + 3, enabled ? label : `${label} (off)`, enabled ? 190 : 90); image.drawRect(barX, y, barWidth, 16, enabled ? 70 : 40); - const fill = Math.round((barWidth - 4) * level); + const fill = Math.round(Math.max(0, barWidth - 4) * level); if (fill > 0) { // A disabled mic still meters (dimly) so its signal can be checked // before switching it back on. @@ -55,15 +64,15 @@ export class LevelsLayer implements Layer { y += 6; if (state.doaDeviceDeg !== null) { - image.drawText(font, 12, y, `Direction of arrival: ${Math.round(state.doaDeviceDeg)}°`, 160); + image.drawText(font, left, y, `Direction of arrival: ${Math.round(state.doaDeviceDeg)}°`, 160); y += 18; } - image.drawText(font, 12, y, `Signal-strength ratio: ${state.ssr}`, 130); + image.drawText(font, left, y, `Signal-strength ratio: ${state.ssr}`, 130); y += 18; const ancText = state.ancOn && state.ancEngine ? `on — ${state.ancEngine}` : "off"; - image.drawText(font, 12, y, `Noise cancellation: ${ancText}`, 130); + image.drawText(font, left, y, `Noise cancellation: ${ancText}`, 130); - image.drawText(font, 12, height - font.lineHeight - 4, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, left, height - padding.bottom - font.lineHeight, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; } diff --git a/app/apps/microphones/microphones-app.ts b/app/apps/microphones/microphones-app.ts index a520da1d..8accbefb 100644 --- a/app/apps/microphones/microphones-app.ts +++ b/app/apps/microphones/microphones-app.ts @@ -1,6 +1,5 @@ import { imageFromAsciiArt } from "../../graphics/image"; import { getDefaultSmallFont } from "../../graphics/ui-fonts"; -import { appViewportSize } from "../../ui/shell/geometry"; import { MenuLayer, TextPageLayer, @@ -62,15 +61,7 @@ const TRAY_ICON = imageFromAsciiArt( { "#": 220 }, ); -const MENU_LAYOUT = { - x: 8, - y: 8, - width: 292, - showBorder: false, - minHeight: 0, - maxHeight: appViewportSize("min").height - 16, - opaque: true, -}; +const MENU_LAYOUT = { page: true, width: 268 } as const; /** Persist a config change; the running session applies it live. */ function updateMicConfig(mutate: (config: MicConfig) => MicConfig): void { diff --git a/app/apps/microphones/radar-layer.ts b/app/apps/microphones/radar-layer.ts index ff986c51..34527ae2 100644 --- a/app/apps/microphones/radar-layer.ts +++ b/app/apps/microphones/radar-layer.ts @@ -5,6 +5,16 @@ import { Layer, type LayerContext } from "../../ui/layers"; import { micSession, type MicSessionState } from "./mic-session"; import { dotBrightness } from "./radar-dots"; +/** Room above the plot's ring for its "front" label. */ +const FRONT_LABEL_BAND = 14; +/** Gap between the ring and the hint line under it. */ +const RING_FOOTER_GAP = 10; +/** The least the ring keeps clear of the window's sides, which leaves the readout panel its corner. */ +const RING_SIDE_CLEARANCE = 90; +/** The readout panel: the least its column is wide, and its drop below the title's top. */ +const PANEL_MIN_WIDTH = 104; +const PANEL_OFFSET_Y = 20; + /** * The Sonic Radar: a top-down view around the wearer's head. The shaded * wedge is the listening beam (scroll rotates it, click locks it onto the @@ -14,6 +24,10 @@ import { dotBrightness } from "./radar-dots"; * scene is world-anchored (an N tick marks north and dots stay put as the * head turns); dots glow full-bright while their speaker is talking and fade * with the time since they last spoke. + * + * The plot is centred on the window, between the title row and the hint + * line; those and the readout panel keep to the padding suggested for the + * window's edges. */ export class RadarLayer implements Layer { private state: MicSessionState = micSession.getState(); @@ -28,17 +42,20 @@ export class RadarLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const state = this.state; + const footerY = height - padding.bottom - font.lineHeight; + const ringTop = padding.top + FRONT_LABEL_BAND; + const ringBottom = footerY - RING_FOOTER_GAP; const centerX = (width / 2) | 0; - const centerY = ((height - 24) / 2 + 6) | 0; - const radius = Math.min(centerX - 90, ((height - 40) / 2) | 0); + const centerY = ((ringTop + ringBottom) / 2) | 0; + const radius = Math.max(0, Math.min(centerX - RING_SIDE_CLEARANCE, ((ringBottom - ringTop) / 2) | 0)); - image.drawText(font, 12, 6, "Sonic Radar", 220); + image.drawText(font, padding.left, padding.top, "Sonic Radar", 220); const modeText = state.mode === "extended" ? "4-mic array" : "firmware DoA"; - image.drawText(font, width - font.measureText(modeText) - 12, 6, modeText, 110); + image.drawText(font, width - padding.right - font.measureText(modeText), padding.top, modeText, 110); // Beam wedge (device frame; the head is the reference for display). const beamDeviceDeg = this.deviceBeamDeg(state); @@ -70,7 +87,7 @@ export class RadarLayer implements Layer { // Radar rings. drawCircle(image, centerX, centerY, radius, 60); drawCircle(image, centerX, centerY, (radius / 2) | 0, 30); - image.drawText(font, centerX - (font.measureText("front") / 2) | 0, centerY - radius - 14, "front", 90); + image.drawText(font, centerX - (font.measureText("front") / 2) | 0, centerY - radius - FRONT_LABEL_BAND, "front", 90); // Compass north tick: anchors the world frame visually as the head turns. if (state.headingDeg !== null) { @@ -127,37 +144,31 @@ export class RadarLayer implements Layer { } const label = dot.name; const labelValue = Math.max(90, value - 50); - const labelX = dotX + 8 + font.measureText(label) > width ? dotX - font.measureText(label) - 8 : dotX + 8; + const labelX = dotX + 8 + font.measureText(label) > width - padding.right ? dotX - font.measureText(label) - 8 : dotX + 8; image.drawText(font, labelX, dotY - 6, label, labelValue); } - // Side panel: beam + level readouts. - const panelX = width - 116; - let panelY = 26; - image.drawText( - font, - panelX, - panelY, - state.headingDeg !== null ? `Heading ${Math.round(state.headingDeg)}°` : "No compass", - state.headingDeg !== null ? 150 : 90, - ); - panelY += 16; - image.drawText(font, panelX, panelY, `Beam ${Math.round(state.beamWorldDeg)}°`, 170); - panelY += 16; - image.drawText(font, panelX, panelY, `Width ${Math.round(state.beamWidthDeg)}°`, 130); - panelY += 16; - image.drawText(font, panelX, panelY, state.beamLocked ? "Locked on talker" : "Manual aim", 130); - panelY += 16; - if (state.doaDeviceDeg !== null) { - image.drawText(font, panelX, panelY, `Heard ${Math.round(state.doaDeviceDeg)}°`, 200); + // Side panel: beam + level readouts, in a column that ends at the right + // edge's padding and is wide enough for its longest line. + const panelLines: Array<[text: string, value: number]> = [ + state.headingDeg !== null ? [`Heading ${Math.round(state.headingDeg)}°`, 150] : ["No compass", 90], + [`Beam ${Math.round(state.beamWorldDeg)}°`, 170], + [`Width ${Math.round(state.beamWidthDeg)}°`, 130], + [state.beamLocked ? "Locked on talker" : "Manual aim", 130], + ]; + if (state.doaDeviceDeg !== null) panelLines.push([`Heard ${Math.round(state.doaDeviceDeg)}°`, 200]); + panelLines.push([state.beamFilterOn ? "Filter: beam only" : "Filter: off", 130]); + const panelWidth = Math.max(PANEL_MIN_WIDTH, ...panelLines.map(([text]) => Math.ceil(font.measureText(text)))); + const panelX = width - padding.right - panelWidth; + let panelY = padding.top + PANEL_OFFSET_Y; + for (const [text, value] of panelLines) { + image.drawText(font, panelX, panelY, text, value); panelY += 16; } - image.drawText(font, panelX, panelY, state.beamFilterOn ? "Filter: beam only" : "Filter: off", 130); - const footerY = height - font.lineHeight - 4; image.drawText( font, - 12, + padding.left, footerY, `${GESTURE_SCROLL} aim ${GESTURE_CLICK} lock ${GESTURE_DOUBLE_CLICK} back`, 110, diff --git a/app/apps/minesweeper/minesweeper-app.worker.ts b/app/apps/minesweeper/minesweeper-app.worker.ts index 3cd49ee9..739b71a1 100644 --- a/app/apps/minesweeper/minesweeper-app.worker.ts +++ b/app/apps/minesweeper/minesweeper-app.worker.ts @@ -33,6 +33,7 @@ import { loadSoundEnabled, saveSoundEnabled } from "../../ui/sound-setting"; import { type MenuItem } from "../../ui/menu"; import { WindowMenu } from "../../ui/window-menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import { directionalFallback, GESTURE_CLICK, @@ -53,9 +54,10 @@ const smallFont = getDefaultSmallFont(); const COLS = 12; const ROWS = 9; const CELL = 26; -const BOARD_X = 14; -const BOARD_Y = 14; -const PANEL_X = BOARD_X + COLS * CELL + 28; +/** How far outside its cells the board's frame is drawn. */ +const BOARD_FRAME = 2; +/** Gap between the board's cells and the panel to their right. */ +const PANEL_GAP = 28; const DIFFICULTIES = [ { name: "Easy", mines: 14 }, @@ -107,6 +109,12 @@ type MinesweeperWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there, which places the board + * (see boardOrigin). + */ + viewport: Viewport; foreground: boolean; /** Whether this window is the shell's input target (pushed with each message). */ focused: boolean; @@ -166,6 +174,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -255,7 +264,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.menu?.resize({ width: window.viewportWidth, height: window.viewportHeight }); + window.viewport = message.viewport; + window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; if (window.foreground) renderAndSubmit(window, 0); break; @@ -352,7 +362,7 @@ function windowMenu(window: MinesweeperWindow): WindowMenu { title: () => window.title, items: () => windowMenuItems(window), claimsLongPress: () => window.phase === "playing", - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: window.viewport, paintBase: () => paintContent(window), isFocused: () => window.focused, }); @@ -666,46 +676,67 @@ function paint(window: MinesweeperWindow): Plane[] { return windowMenu(window).paint(); } +/** Top-left corner of the board's cells, in viewport coordinates. */ +type BoardOrigin = { x: number; y: number }; + +/** + * Where the board goes: its frame, the outermost thing drawn toward the + * window's top and left edges, sits at the padding suggested for them. The + * board is a fixed size and the panel hangs off its right side, so the whole + * layout moves with it and nothing is placed from the other two edges. + */ +function boardOrigin(window: MinesweeperWindow): BoardOrigin { + const { padding } = window.viewport; + return { x: padding.left + BOARD_FRAME, y: padding.top + BOARD_FRAME }; +} + function paintContent(window: MinesweeperWindow): GrayImage { const image = new GrayImage(window.viewportWidth, window.viewportHeight, 0); - image.drawRect(BOARD_X - 2, BOARD_Y - 2, COLS * CELL + 4, ROWS * CELL + 4, 120); + const board = boardOrigin(window); + image.drawRect( + board.x - BOARD_FRAME, + board.y - BOARD_FRAME, + COLS * CELL + 2 * BOARD_FRAME, + ROWS * CELL + 2 * BOARD_FRAME, + 120, + ); if (window.phase === "paused") { // Hide the board so pausing can't be used to study it off the clock. - drawCenteredIn(image, mediumFont, BOARD_X, COLS * CELL, BOARD_Y + 80, "PAUSED", 230); - drawCenteredIn(image, smallFont, BOARD_X, COLS * CELL, BOARD_Y + 120, `${GESTURE_CLICK} resume`, 150); - drawCenteredIn(image, smallFont, BOARD_X, COLS * CELL, BOARD_Y + 140, `${GESTURE_DOUBLE_CLICK} leave`, 150); + drawCenteredIn(image, mediumFont, board.x, COLS * CELL, board.y + 80, "PAUSED", 230); + drawCenteredIn(image, smallFont, board.x, COLS * CELL, board.y + 120, `${GESTURE_CLICK} resume`, 150); + drawCenteredIn(image, smallFont, board.x, COLS * CELL, board.y + 140, `${GESTURE_DOUBLE_CLICK} leave`, 150); } else { - paintBoard(image, window); + paintBoard(image, window, board); } - paintPanel(image, window); + paintPanel(image, window, board); return image; } -function paintBoard(image: GrayImage, window: MinesweeperWindow): void { +function paintBoard(image: GrayImage, window: MinesweeperWindow, board: BoardOrigin): void { for (let y = 0; y < ROWS; y++) { for (let x = 0; x < COLS; x++) { - paintCell(image, window, x, y); + paintCell(image, window, board, x, y); } } // Cursor: a double bright outline so it stays visible over any cell. In // row-select it spans the whole selected row; in column-select it marks the // cell (games over show neither). if (window.phase !== "playing") return; - const cx = BOARD_X + window.cursorX * CELL; - const cy = BOARD_Y + window.cursorY * CELL; + const cx = board.x + window.cursorX * CELL; + const cy = board.y + window.cursorY * CELL; if (window.selectMode === "row") { - image.drawRect(BOARD_X - 1, cy - 1, COLS * CELL + 1, CELL + 1, 255); - image.drawRect(BOARD_X, cy, COLS * CELL - 1, CELL - 1, 255); + image.drawRect(board.x - 1, cy - 1, COLS * CELL + 1, CELL + 1, 255); + image.drawRect(board.x, cy, COLS * CELL - 1, CELL - 1, 255); } else { image.drawRect(cx - 1, cy - 1, CELL + 1, CELL + 1, 255); image.drawRect(cx, cy, CELL - 1, CELL - 1, 255); } } -function paintCell(image: GrayImage, window: MinesweeperWindow, x: number, y: number): void { +function paintCell(image: GrayImage, window: MinesweeperWindow, board: BoardOrigin, x: number, y: number): void { const index = y * COLS + x; - const cx = BOARD_X + x * CELL; - const cy = BOARD_Y + y * CELL; + const cx = board.x + x * CELL; + const cy = board.y + y * CELL; const state = window.cellState[index]!; const isMine = window.mines[index] === 1; const gameOver = window.phase === "lost"; @@ -757,21 +788,23 @@ function drawMine(image: GrayImage, cx: number, cy: number, shade: number): void image.drawLine(centerX - 7, centerY + 7, centerX + 7, centerY - 7, shade); } -function paintPanel(image: GrayImage, window: MinesweeperWindow): void { - drawStat(image, PANEL_X, BOARD_Y, "Mines", String(mineCount(window) - window.flagCount)); - drawStat(image, PANEL_X, BOARD_Y + 62, "Time", formatElapsed(elapsedMs(window))); - image.drawText(smallFont, PANEL_X, BOARD_Y + 126, DIFFICULTIES[window.difficultyIndex]!.name, 140); +/** The stats and gesture hints beside the board, laid out down from its top. */ +function paintPanel(image: GrayImage, window: MinesweeperWindow, board: BoardOrigin): void { + const x = board.x + COLS * CELL + PANEL_GAP; + drawStat(image, x, board.y, "Mines", String(mineCount(window) - window.flagCount)); + drawStat(image, x, board.y + 62, "Time", formatElapsed(elapsedMs(window))); + image.drawText(smallFont, x, board.y + 126, DIFFICULTIES[window.difficultyIndex]!.name, 140); if (window.phase === "won" || window.phase === "lost") { - image.drawText(mediumFont, PANEL_X, BOARD_Y + 152, window.phase === "won" ? "CLEARED!" : "BOOM!", 250); - image.drawText(smallFont, PANEL_X, BOARD_Y + 178, `${GESTURE_CLICK} new game`, 150); - image.drawText(smallFont, PANEL_X, BOARD_Y + 198, `${GESTURE_LONG_PRESS} menu`, 150); + image.drawText(mediumFont, x, board.y + 152, window.phase === "won" ? "CLEARED!" : "BOOM!", 250); + image.drawText(smallFont, x, board.y + 178, `${GESTURE_CLICK} new game`, 150); + image.drawText(smallFont, x, board.y + 198, `${GESTURE_LONG_PRESS} menu`, 150); } else if (window.selectMode === "row") { - image.drawText(smallFont, PANEL_X, 200, `${GESTURE_SCROLL} row ${GESTURE_CLICK} pick`, 115); - image.drawText(smallFont, PANEL_X, 222, `${GESTURE_DOUBLE_CLICK} pause`, 115); + image.drawText(smallFont, x, board.y + 186, `${GESTURE_SCROLL} row ${GESTURE_CLICK} pick`, 115); + image.drawText(smallFont, x, board.y + 208, `${GESTURE_DOUBLE_CLICK} pause`, 115); } else { - image.drawText(smallFont, PANEL_X, 200, `${GESTURE_SCROLL} cell ${GESTURE_CLICK} dig`, 115); - image.drawText(smallFont, PANEL_X, 222, `${GESTURE_LONG_PRESS} flag ${GESTURE_DOUBLE_CLICK} rows`, 115); + image.drawText(smallFont, x, board.y + 186, `${GESTURE_SCROLL} cell ${GESTURE_CLICK} dig`, 115); + image.drawText(smallFont, x, board.y + 208, `${GESTURE_LONG_PRESS} flag ${GESTURE_DOUBLE_CLICK} rows`, 115); } } diff --git a/app/apps/music/media-browse.ts b/app/apps/music/media-browse.ts index 3876c67e..da949966 100644 --- a/app/apps/music/media-browse.ts +++ b/app/apps/music/media-browse.ts @@ -11,13 +11,24 @@ import { } from "../../native/media-browser"; import { Layer, type LayerContext } from "../../ui/layers"; -/** Header: title line + path line (34px at the 12px bitmap default). */ +/** Header: title line + path line (26px at the 12px bitmap default), below the window's top padding. */ function headerHeight(font: UiFont): number { - return 8 + lineStep(font) + font.lineHeight; + return lineStep(font) + font.lineHeight; } -const LIST_X = 20; -/** The selection box extends this far left and right of the row text. */ +/** + * The selection box extends this far left and right of the row text. The + * boxes start at the window's left padding, so the title, path and hint + * line, which line up with the row text, start this far in from it. + */ const LIST_HIGHLIGHT_PAD = 6; +/** Status messages (connecting, errors, empty) are indented this far from the title, and sit this far under the header. */ +const MESSAGE_INDENT = 4; +const MESSAGE_GAP = 8; +/** Clear rows between the list and the hint line under it. */ +const FOOTER_GAP = 7; +/** Width of the bar Menu.drawScrollbar draws, and the room kept for it right of the rows. */ +const SCROLLBAR_WIDTH = 3; +const SCROLLBAR_GUTTER = 6; export type MediaBrowseOptions = { app: MediaBrowserApp; @@ -59,55 +70,68 @@ export class MediaBrowseLayer implements Layer { this.startConnect(ctx); } const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + // The list's selection boxes span the window's side padding, less the + // scrollbar's gutter. The header and the hint line are fixed, inside the + // top and bottom padding, with the list scrolling between them. + const listX = padding.left; + const textX = listX + LIST_HIGHLIGHT_PAD; + const textWidth = width - padding.left - padding.right - 2 * LIST_HIGHLIGHT_PAD; + const headerBottom = padding.top + headerHeight(font); + const messageX = textX + MESSAGE_INDENT; + const messageY = headerBottom + MESSAGE_GAP; + const footerY = height - padding.bottom - font.lineHeight; - image.drawText(font, 20, 8, `Library: ${this.options.app.appName}`, 220); + image.drawText(font, textX, padding.top, `Library: ${this.options.app.appName}`, 220); if (this.phase === "connecting" || this.phase === "idle") { - image.drawText(font, 24, headerHeight(font) + 8, `Starting ${this.options.app.appName}...`, 150); - image.drawText(font, 20, height - font.lineHeight - 4, `${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, messageX, messageY, `Starting ${this.options.app.appName}...`, 150); + image.drawText(font, textX, footerY, `${GESTURE_DOUBLE_CLICK} back`, 110); return image; } if (this.phase === "failed") { - image.drawText(font, 24, headerHeight(font) + 8, "Could not connect:", 180); - image.drawText(font, 24, headerHeight(font) + 8 + lineStep(font), truncateRight(font, this.connectError, width - 48), 140); - image.drawText(font, 20, height - font.lineHeight - 4, `${GESTURE_CLICK} retry ${GESTURE_DOUBLE_CLICK} back`, 110); + image.drawText(font, messageX, messageY, "Could not connect:", 180); + image.drawText(font, messageX, messageY + lineStep(font), truncateRight(font, this.connectError, textWidth - 2 * MESSAGE_INDENT), 140); + image.drawText(font, textX, footerY, `${GESTURE_CLICK} retry ${GESTURE_DOUBLE_CLICK} back`, 110); return image; } const level = this.currentLevel(); const path = this.levels.map((entry) => entry.title).join(" / "); - image.drawText(font, 20, 8 + lineStep(font), truncateLeft(font, path, width - 40), 130); + image.drawText(font, textX, padding.top + lineStep(font), truncateLeft(font, path, textWidth), 130); if (!level || level.items === null) { - image.drawText(font, 24, headerHeight(font) + 8, level?.error ? level.error : "Loading...", level?.error ? 140 : 150); - image.drawText(font, 20, height - font.lineHeight - 4, `${GESTURE_DOUBLE_CLICK} up / back`, 110); + image.drawText(font, messageX, messageY, level?.error ? level.error : "Loading...", level?.error ? 140 : 150); + image.drawText(font, textX, footerY, `${GESTURE_DOUBLE_CLICK} up / back`, 110); return image; } const items = level.items; if (!items.length) { - image.drawText(font, 24, headerHeight(font) + 8, "(empty)", 120); - image.drawText(font, 20, height - font.lineHeight - 4, `${GESTURE_DOUBLE_CLICK} up / back`, 110); + image.drawText(font, messageX, messageY, "(empty)", 120); + image.drawText(font, textX, footerY, `${GESTURE_DOUBLE_CLICK} up / back`, 110); return image; } - const listTop = headerHeight(font); - const listHeight = height - listTop - font.lineHeight - 10; - const visibleRows = Math.max(1, (listHeight / tightRowHeight(font)) | 0); // Row boxes start one pixel above the header's bottom edge. - level.menu.paint( - image, - { x: LIST_X - LIST_HIGHLIGHT_PAD, y: listTop - 1, width: width - 2 * LIST_X + 2 * LIST_HIGHLIGHT_PAD, height: listHeight }, - ctx.stack.isFocused(), - ); - level.menu.drawScrollbar(image, width - 12, listTop, visibleRows * tightRowHeight(font) - 4); + const listTop = headerBottom - 1; + const listBottom = footerY - FOOTER_GAP; + if (listBottom > listTop) { + level.menu.paint( + image, + { x: listX, y: listTop, width: width - padding.left - padding.right - SCROLLBAR_GUTTER, height: listBottom - listTop }, + ctx.stack.isFocused(), + ); + // The bar hugs the window's right padding, a little short of the list's ends. + const trackHeight = listBottom - listTop - 4; + if (trackHeight > 0) level.menu.drawScrollbar(image, width - padding.right - SCROLLBAR_WIDTH, headerBottom, trackHeight); + } image.drawText( font, - 20, - height - 16, + textX, + footerY, `${GESTURE_SCROLL} select ${GESTURE_CLICK} open/play ${GESTURE_DOUBLE_CLICK} up / back`, 110, ); diff --git a/app/apps/music/music-app.ts b/app/apps/music/music-app.ts index 4a32c2db..117178e1 100644 --- a/app/apps/music/music-app.ts +++ b/app/apps/music/music-app.ts @@ -14,26 +14,41 @@ import { MusicSettingsLayer } from "./music-settings"; import { spotifyMenuItem } from "./spotify-menu"; import { Layer, type LayerContext, type PaintBelow } from "../../ui/layers"; import { createInProcessWindow, YieldAtRootLayer, type InProcessAppOptions, type InProcessWindow } from "../../ui/shell/in-process-window"; +import type { Viewport } from "../../ui/viewport"; export const MUSIC_WINDOW_ID = "music"; export const MUSIC_SURFACE_ID = "window:music"; const ART_SIZE = 112; -const ART_X = 8; // left margin matches the top margin -const ART_Y = 8; -const META_X = ART_X + ART_SIZE + 14; -const PROGRESS_BAR_Y = ART_Y + 116; +/** + * The outline hugging the album art. It is the outermost thing the + * now-playing page draws toward the window's top and left edges, so it sits + * at the padding suggested for them and the art just inside it. + */ +const ART_FRAME = 1; +/** Gap between the art and the metadata column. */ +const META_GAP = 14; +/** The metadata's first line, the progress bar and the lists, down from the art's top. */ +const META_OFFSET_Y = 2; +const PROGRESS_BAR_OFFSET_Y = 116; +const LIST_OFFSET_Y = 128; /** Clear rows between the time labels' baseline (digits have no descenders) and the bar. */ const PROGRESS_TIME_GAP = 3; -const LIST_TOP = 136; -/** Gap between the menus' last row band and the viewport bottom. */ -const LIST_BOTTOM_MARGIN = 4; -const ACTION_X = 22; const ACTION_WIDTH = 154; -const COLUMN_DIVIDER_X = 190; -const QUEUE_X = 204; /** Horizontal inset of row text from its selection box. */ const LIST_TEXT_INSET = 6; +/** The actions column's selection boxes, which start at the window's left padding. */ +const ACTION_BOX_WIDTH = ACTION_WIDTH + 2 * LIST_TEXT_INSET - 4; +/** The column divider and the queue's selection boxes, right of the actions column's left edge. */ +const COLUMN_DIVIDER_OFFSET_X = 174; +const QUEUE_OFFSET_X = 182; +/** Width of the bar Menu.drawScrollbar draws, and the room kept for it right of a list's rows. */ +const SCROLLBAR_WIDTH = 3; +const SCROLLBAR_GUTTER = 6; +/** How far the setup prompt's text is indented from its hint line. */ +const PROMPT_INDENT = 4; +/** Gap between the no-session page's status line, its prompt and its list. */ +const SECTION_GAP = 6; const PLAYLIST_ACTION_INDEX = 1; /** Minimum room for the dim artist after a queue row's title; less and it is left off. */ const QUEUE_SUBTITLE_MIN_WIDTH = 40; @@ -102,107 +117,111 @@ class MusicAppLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); + const viewport = ctx.stack.getBaseSize(); + const { width, height, padding } = viewport; const image = new GrayImage(width, height, 0); const media = mediaControllerBridge.snapshot(); if (!media.accessEnabled) { - const lines = wrapText(font, mediaControllerBridge.accessPrompt, width - 48); + // The hint line sits at the window's left and bottom padding; the + // prompt is indented from it, as far from the right padding as the left. + const lines = wrapText(font, mediaControllerBridge.accessPrompt, width - padding.left - padding.right - 2 * PROMPT_INDENT); for (let index = 0; index < lines.length; index++) { - image.drawText(font, 24, 16 + index * lineStep(font), lines[index]!, 180); + image.drawText(font, padding.left + PROMPT_INDENT, padding.top + index * lineStep(font), lines[index]!, 180); } - image.drawText(font, 20, height - 16, `${GESTURE_CLICK} ${mediaControllerBridge.accessAction}`, 110); + image.drawText(font, padding.left, height - padding.bottom - font.lineHeight, `${GESTURE_CLICK} ${mediaControllerBridge.accessAction}`, 110); return image; } + // Lists' selection boxes start at the window's left padding and stop + // short of the scrollbar, which hugs the right padding. + const listX = padding.left; + const rowsRight = width - padding.right - SCROLLBAR_GUTTER; + const focused = ctx.stack.isFocused(); + if (!media.available) { const apps = mediaBrowserBridge.listBrowsableApps(!this.libraryAppsFresh); this.libraryAppsFresh = true; this.libraryMenu.setItems(apps); - image.drawText(font, 24, 16, global.isIOS ? media.status || "Nothing is playing." : "No active media session.", 180); + // The text lines up with the picker's row text. + const textX = listX + LIST_TEXT_INSET; + const textWidth = rowsRight - listX - 2 * LIST_TEXT_INSET; + image.drawText(font, textX, padding.top, global.isIOS ? media.status || "Nothing is playing." : "No active media session.", 180); const prompt = global.isIOS ? "Browse your library, or start playback on the phone." : apps.length ? "Browse a music app's library, or start playback on the phone." : "Start playback in another app on the phone."; - let y = 22 + lineStep(font); - for (const line of wrapText(font, prompt, width - 48)) { - image.drawText(font, 24, y, line, 150); + let y = padding.top + lineStep(font) + SECTION_GAP; + for (const line of wrapText(font, prompt, textWidth)) { + image.drawText(font, textX, y, line, 150); y += lineStep(font); } // Why the last command failed (e.g. playing from the Spotify library with no device open). - for (const line of media.notice ? wrapText(font, media.notice, width - 48) : []) { - image.drawText(font, 24, y, line, 200); + for (const line of media.notice ? wrapText(font, media.notice, textWidth) : []) { + image.drawText(font, textX, y, line, 200); y += lineStep(font); } if (apps.length) { - const listTop = y + 6; - const listHeight = height - listTop - LIST_BOTTOM_MARGIN; - this.libraryMenu.paint( - image, - { x: 24 - LIST_TEXT_INSET, y: listTop - 1, width: width - 48 + 2 * LIST_TEXT_INSET - 4, height: listHeight }, - ctx.stack.isFocused(), - ); - this.libraryMenu.drawScrollbar(image, width - 12, listTop, listHeight - 4); + paintListToBottomEdge(image, this.libraryMenu, { x: listX, top: y + SECTION_GAP, width: rowsRight - listX }, viewport, focused, true); } return image; } this.libraryAppsFresh = false; - this.drawArt(image, media); + const artX = padding.left + ART_FRAME; + const artY = padding.top + ART_FRAME; + this.drawArt(image, media, artX, artY); - const metaWidth = width - META_X - 24; + // The metadata column and the progress bar end at the window's right padding. + const metaX = artX + ART_SIZE + META_GAP; + const metaWidth = width - padding.right - metaX; const metaStep = lineStep(font) + 1; - const metaTop = ART_Y + 2; + const metaTop = artY + META_OFFSET_Y; + const progressBarY = artY + PROGRESS_BAR_OFFSET_Y; // Line budget above the progress-bar time line: the layout is five slots // (title, second title line, artist, album, player app); when the font is // too large for all five, the title gets one truncated line instead of // wrapping to two, and the rest shift up a slot. - const maxLines = Math.floor((progressTimeY(font) - metaTop - 4 - font.lineHeight) / metaStep) + 1; + const maxLines = Math.floor((progressTimeY(font, progressBarY) - metaTop - 4 - font.lineHeight) / metaStep) + 1; const titleSlots = maxLines >= 5 ? 2 : 1; const title = media.title || "Unknown title"; const titleLines = titleSlots === 2 ? wrapText(font, title, metaWidth).slice(0, 2) : [truncateText(font, title, metaWidth)]; for (let index = 0; index < titleLines.length; index++) { - image.drawText(font, META_X, metaTop + index * metaStep, titleLines[index]!, 230); + image.drawText(font, metaX, metaTop + index * metaStep, titleLines[index]!, 230); } - image.drawText(font, META_X, metaTop + 4 + titleSlots * metaStep, media.artist || "Unknown artist", 180); + image.drawText(font, metaX, metaTop + 4 + titleSlots * metaStep, media.artist || "Unknown artist", 180); if (media.album) { - image.drawText(font, META_X, metaTop + 4 + (titleSlots + 1) * metaStep, truncateText(font, media.album, metaWidth), 150); + image.drawText(font, metaX, metaTop + 4 + (titleSlots + 1) * metaStep, truncateText(font, media.album, metaWidth), 150); } // The player line, or for a few seconds why a command failed. image.drawText( font, - META_X, + metaX, metaTop + 4 + (titleSlots + 2) * metaStep, truncateText(font, media.notice || media.appName || media.packageName, metaWidth), media.notice ? 200 : 110, ); - this.drawProgress(image, media, metaWidth); + this.drawProgress(image, media, metaX, progressBarY, metaWidth); const queue = mediaControllerBridge.getQueue(); const actions = this.buildActions(media, queue); this.reconcileSelection(actions, queue); - const listHeight = height - LIST_TOP - LIST_BOTTOM_MARGIN; - const focused = ctx.stack.isFocused(); - // Row boxes start one pixel above LIST_TOP, level with the column divider. - this.actionsMenu.paint( - image, - { x: ACTION_X - LIST_TEXT_INSET, y: LIST_TOP - 1, width: ACTION_WIDTH + 2 * LIST_TEXT_INSET - 4, height: listHeight }, - focused && this.focusColumn === "actions", - ); + const listTop = artY + LIST_OFFSET_Y; + paintListToBottomEdge(image, this.actionsMenu, { x: listX, top: listTop, width: ACTION_BOX_WIDTH }, viewport, + focused && this.focusColumn === "actions"); - image.drawLine(COLUMN_DIVIDER_X, LIST_TOP - 3, COLUMN_DIVIDER_X, height - LIST_BOTTOM_MARGIN - 3, 45); + // The divider is fixed, so it stops at the window's bottom padding. + const dividerX = listX + COLUMN_DIVIDER_OFFSET_X; + const dividerBottom = height - padding.bottom - 1; + if (dividerBottom > listTop) image.drawLine(dividerX, listTop - 3, dividerX, dividerBottom, 45); + const queueX = listX + QUEUE_OFFSET_X; if (!queue.length) { - image.drawText(font, QUEUE_X, LIST_TOP + 1, "Playlist unavailable", 90); + image.drawText(font, queueX + LIST_TEXT_INSET, listTop + 1, "Playlist unavailable", 90); } else { - const queueWidth = width - QUEUE_X - 20; - this.queueMenu.paint( - image, - { x: QUEUE_X - LIST_TEXT_INSET, y: LIST_TOP - 1, width: queueWidth + 2 * LIST_TEXT_INSET - 4, height: listHeight }, - focused && this.focusColumn === "playlist", - ); - this.queueMenu.drawScrollbar(image, width - 12, LIST_TOP, listHeight - 4); + paintListToBottomEdge(image, this.queueMenu, { x: queueX, top: listTop, width: rowsRight - queueX }, viewport, + focused && this.focusColumn === "playlist", true); } return image; @@ -386,22 +405,23 @@ class MusicAppLayer implements Layer { } } - private drawProgress(image: GrayImage, media: MediaControllerState, width: number): void { + /** The elapsed/duration labels and, under them, the bar at (x, barY), `width` wide. */ + private drawProgress(image: GrayImage, media: MediaControllerState, x: number, barY: number, width: number): void { if (media.durationMs <= 0 || media.positionMs < 0) return; const font = getDefaultSmallFont(); const elapsed = formatMediaTime(media.positionMs); const duration = formatMediaTime(media.durationMs); - const timeY = progressTimeY(font); - image.drawText(font, META_X, timeY, elapsed, 140); - image.drawText(font, META_X + width - font.measureText(duration), timeY, duration, 140); + const timeY = progressTimeY(font, barY); + image.drawText(font, x, timeY, elapsed, 140); + image.drawText(font, x + width - font.measureText(duration), timeY, duration, 140); - const barY = PROGRESS_BAR_Y; - image.drawRect(META_X, barY, width, 5, 55); + image.drawRect(x, barY, width, 5, 55); const progress = clamp(media.positionMs / media.durationMs, 0, 1); - image.fillRect(META_X + 1, barY + 1, Math.round((width - 2) * progress), 3, 170); + image.fillRect(x + 1, barY + 1, Math.round((width - 2) * progress), 3, 170); } - private drawArt(image: GrayImage, media: MediaControllerState): void { + /** The album art, or a placeholder, in the ART_SIZE box at (artX, artY), with its outline around it. */ + private drawArt(image: GrayImage, media: MediaControllerState, artX: number, artY: number): void { // Keyed on artVersion, not the strings: players (e.g. Spotify) publish // metadata before the art bitmap is downloaded, or with the previous // track's bitmap after a quick double skip, then re-emit the same @@ -412,17 +432,18 @@ class MusicAppLayer implements Layer { } if (this.art) { // Center within the art box. - const dx = ART_X + Math.max(0, ((ART_SIZE - this.art.width) / 2) | 0); - const dy = ART_Y + Math.max(0, ((ART_SIZE - this.art.height) / 2) | 0); + const dx = artX + Math.max(0, ((ART_SIZE - this.art.width) / 2) | 0); + const dy = artY + Math.max(0, ((ART_SIZE - this.art.height) / 2) | 0); image.bitBlt(this.art, dx, dy); - image.drawRect(dx - 1, dy - 1, this.art.width + 2, this.art.height + 2, 60); + image.drawRect(dx - ART_FRAME, dy - ART_FRAME, this.art.width + 2 * ART_FRAME, this.art.height + 2 * ART_FRAME, 60); } else { - image.drawRect(ART_X, ART_Y, ART_SIZE, ART_SIZE, 60); + // The placeholder's outline is where a full-size cover's would be. + image.drawRect(artX - ART_FRAME, artY - ART_FRAME, ART_SIZE + 2 * ART_FRAME, ART_SIZE + 2 * ART_FRAME, 60); const font = getDefaultSmallFont(); image.drawText( font, - ART_X + Math.round((ART_SIZE - font.measureText("no art")) / 2), - ART_Y + Math.round((ART_SIZE - font.lineHeight) / 2), + artX + Math.round((ART_SIZE - font.measureText("no art")) / 2), + artY + Math.round((ART_SIZE - font.lineHeight) / 2), "no art", 90, ); @@ -567,12 +588,37 @@ export function createMusicAppWindow(options: InProcessAppOptions): InProcessWin } /** - * Line top of the elapsed/duration labels: their baseline sits a fixed gap - * above the progress bar, so the labels hug the bar whatever the font's - * height (a taller face grows upward into the metadata's line budget). + * Paint a list that scrolls under fixed content: from `top` down to the + * window's bottom edge, where a row cut off for scrolling meets the edge, + * with that edge's padding inside the list after its last row. Selection + * boxes start one pixel above `top`. The scrollbar, when asked for, stays + * inside the window's right and bottom padding. */ -function progressTimeY(font: UiFont): number { - return PROGRESS_BAR_Y - PROGRESS_TIME_GAP - font.ascent; +function paintListToBottomEdge( + image: GrayImage, + menu: Menu, + rows: { x: number; top: number; width: number }, + viewport: Viewport, + focused: boolean, + scrollbar = false, +): void { + const { width, height, padding } = viewport; + const boxTop = rows.top - 1; + if (boxTop >= height || rows.width <= 0) return; + menu.paint(image, { x: rows.x, y: boxTop, width: rows.width, height: height - boxTop, padBottom: padding.bottom }, focused); + const trackHeight = height - padding.bottom - rows.top; + if (scrollbar && trackHeight > 0) { + menu.drawScrollbar(image, width - padding.right - SCROLLBAR_WIDTH, rows.top, trackHeight); + } +} + +/** + * Line top of the elapsed/duration labels: their baseline sits a fixed gap + * above the progress bar (at barY), so the labels hug the bar whatever the + * font's height (a taller face grows upward into the metadata's line budget). + */ +function progressTimeY(font: UiFont, barY: number): number { + return barY - PROGRESS_TIME_GAP - font.ascent; } function formatMediaTime(milliseconds: number): string { diff --git a/app/apps/music/music-settings.ts b/app/apps/music/music-settings.ts index c4c45207..e04c8f48 100644 --- a/app/apps/music/music-settings.ts +++ b/app/apps/music/music-settings.ts @@ -10,7 +10,6 @@ import { drawToggleMenuItem, MenuLayer, type MenuItem } from "../../ui/menu"; /** Discovered apps stay visible even when ignored or no longer publishing a session. */ export class MusicSettingsLayer implements Layer { private menu: MenuLayer | null = null; - private menuWidth = 0; /** The package behind each current row, parallel to the menu's items. */ private packages: string[] = []; @@ -20,7 +19,7 @@ export class MusicSettingsLayer implements Layer { } /** Refresh the rows from the remembered apps, keeping the selection on the same package. */ - private currentMenu(ctx: LayerContext): MenuLayer { + private currentMenu(): MenuLayer { const apps = readMediaApps().sort((a, b) => a.appName.localeCompare(b.appName) || a.packageName.localeCompare(b.packageName)); const items: MenuItem[] = apps.map((app) => ({ @@ -39,14 +38,8 @@ export class MusicSettingsLayer implements Layer { const index = apps.findIndex((app) => app.packageName === selectedPackage); this.packages = apps.map((app) => app.packageName); - const width = ctx.stack.getBaseSize().width; - if (!this.menu || width !== this.menuWidth) { - this.menuWidth = width; - this.menu = new MenuLayer("Music settings", items, { - x: 8, y: 8, width: width - 16, - opaque: true, showBorder: false, - footer: "On = enabled Off = ignored", - }).selectItem(Math.max(0, index)); + if (!this.menu) { + this.menu = new MenuLayer("Music settings", items, { page: true, footer: "On = enabled Off = ignored" }).selectItem(Math.max(0, index)); } else { this.menu.setItems(items, index >= 0 ? index : undefined); } @@ -54,10 +47,10 @@ export class MusicSettingsLayer implements Layer { } paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage { - return this.currentMenu(ctx).paint(ctx, paintBelow); + return this.currentMenu().paint(ctx, paintBelow); } async handleInput(event: InputEvent, ctx: LayerContext): Promise { - await this.currentMenu(ctx).handleInput(event, ctx); + await this.currentMenu().handleInput(event, ctx); } } diff --git a/app/apps/navigate/navigate-app.worker.ts b/app/apps/navigate/navigate-app.worker.ts index 142cef5e..9bd37f2d 100644 --- a/app/apps/navigate/navigate-app.worker.ts +++ b/app/apps/navigate/navigate-app.worker.ts @@ -59,6 +59,7 @@ import { type SavedDestination, } from "./destinations"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import { sameViewport, type Viewport } from "../../ui/viewport"; import type { ToolSpec, ToolResult } from "../../assistant/tool-registry"; import { GESTURE_CLICK, @@ -95,7 +96,11 @@ import { drawManeuverGlyph } from "./maneuver-icons"; declare const global: any; const MAP_SIZE = 260; +/** The guidance panel's region beside the map pane, and how far in its content starts. */ const PANEL_X = MAP_SIZE + 10; +const PANEL_INSET = 8; +/** Clear space between the footer hint line and what ends above it (the idle list, the map-mode map). */ +const FOOTER_GAP = 8; /** Map refetch policy knobs (design doc: never per-fix, only when stale). */ const BEARING_BUCKET_DEG = 15; const MOVE_REFRESH_FRACTION = 0.15; @@ -132,6 +137,13 @@ type NavWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there. The maps fill their panes + * whatever the edges touch; text, the idle list and the footer hints keep + * the padding. + */ + viewport: Viewport; foreground: boolean; focused: boolean; menu: WindowMenu | null; @@ -306,6 +318,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -313,19 +326,29 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { }; post({ type: "set-tools", windowId: message.windowId, tools: NAVIGATE_TOOLS }); break; - case "resize-window": + case "resize-window": { if (!window || window.windowId !== message.windowId) break; - if (window.viewportWidth === message.viewport.width && window.viewportHeight === message.viewport.height) break; + // The layout follows the padding as well as the size, so a change to + // what the edges touch alone is laid out and painted again too. + if (sameViewport(window.viewport, message.viewport)) break; + const mapSize = phase === "map" ? mapDimensions() : null; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; + window.viewport = message.viewport; window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; - if (phase === "map") { - resetMapState(); - maybeRefreshMap(); + // The map is fetched at the size it is shown at: only a change to that + // needs a new one. + if (mapSize) { + const resized = mapDimensions(); + if (resized.width !== mapSize.width || resized.height !== mapSize.height) { + resetMapState(); + maybeRefreshMap(); + } } render(); break; + } case "close-window": if (editing) { // Window closed mid-edit: shut the phone editor down. @@ -826,9 +849,13 @@ function maybeRefreshMap(): void { }); } +/** + * The map's size: the pane beside the guidance panel, or in map mode the + * whole window down to the footer hint. + */ function mapDimensions(): { width: number; height: number } { return phase === "map" && window - ? { width: window.viewportWidth, height: Math.max(1, window.viewportHeight - 30) } + ? { width: window.viewportWidth, height: Math.max(1, footerY(window.viewport) - FOOTER_GAP) } : { width: MAP_SIZE, height: MAP_SIZE }; } @@ -1212,10 +1239,11 @@ function idleEntries(): IdleEntry[] { return entries; } -/** Horizontal inset of the idle list's selection boxes. */ -const IDLE_LIST_X = 20; /** Pixels between consecutive idle rows' selection boxes. */ const IDLE_ROW_GAP = 2; +/** The idle list's scrollbar, and the gap its rows leave before it. */ +const IDLE_SCROLLBAR_WIDTH = 3; +const IDLE_SCROLLBAR_GAP = 4; function idleList(): Menu { idleMenu ??= new Menu({ @@ -1260,7 +1288,7 @@ function windowMenu(win: NavWindow): WindowMenu { post, title: () => win.title, items: () => windowMenuItems(), - size: { width: win.viewportWidth, height: win.viewportHeight }, + size: win.viewport, paintBase: () => paintContent(win), isFocused: () => win.focused, }); @@ -1342,12 +1370,28 @@ function paint(win: NavWindow): Plane[] { return windowMenu(win).paint(); } +/** + * Page text (a title, hints, status messages) starts this far inside the + * padding suggested for the window's sides, which is where the idle list's + * selection boxes and the footer hints start. + */ +const TEXT_INSET = 4; +/** How far below a page's title (at the top padding) its text starts: the idle page's hint, the edit screen's message. */ +const IDLE_HINT_DROP = 36; +const EDIT_MESSAGE_DROP = 48; + +/** Where a page's text starts and how wide it may run. */ +function pageText(viewport: Viewport): { x: number; width: number } { + const { width, padding } = viewport; + return { x: padding.left + TEXT_INSET, width: width - padding.left - padding.right - 2 * TEXT_INSET }; +} + function paintContent(win: NavWindow): GrayImage { const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); if (editing) { - paintEdit(image, editing); + paintEdit(image, win, editing); } else if (phase === "map") { - paintMap(image); + paintMap(image, win); } else if (phase === "idle" || phase === "acquiring" || phase === "routing") { paintIdle(image, win); } else { @@ -1357,27 +1401,31 @@ function paintContent(win: NavWindow): GrayImage { } /** The "type on the phone" screen for a destination name/address edit. */ -function paintEdit(image: GrayImage, edit: DestinationEdit): void { +function paintEdit(image: GrayImage, win: NavWindow, edit: DestinationEdit): void { + const { padding } = win.viewport; + const text = pageText(win.viewport); const step = smallFont.lineHeight + 2; - image.drawText(mediumFont, 24, 16, edit.title, 245); - const messageY = 64; - const lines = wrapText(smallFont, "Type the value in the phone app, or use voice input.", image.width - 48); + image.drawText(mediumFont, text.x, padding.top, edit.title, 245); + const messageY = padding.top + EDIT_MESSAGE_DROP; + const lines = wrapText(smallFont, "Type the value in the phone app, or use voice input.", text.width); for (let index = 0; index < lines.length; index++) { - image.drawText(smallFont, 24, messageY + index * step, lines[index]!, 190); + image.drawText(smallFont, text.x, messageY + index * step, lines[index]!, 190); } const value = edit.setting.get(); image.drawText( smallFont, - 24, + text.x, messageY + (lines.length + 1) * step, - truncateText(smallFont, value || "(empty)", image.width - 48), + truncateText(smallFont, value || "(empty)", text.width), value ? 225 : 130, ); - drawFooter(image, `${GESTURE_CLICK} done ${GESTURE_DOUBLE_CLICK} cancel`); + drawFooter(image, win.viewport, `${GESTURE_CLICK} done ${GESTURE_DOUBLE_CLICK} cancel`); } function paintIdle(image: GrayImage, win: NavWindow): void { - image.drawText(mediumFont, 24, 16, "Navigate", 245); + const { padding } = win.viewport; + const text = pageText(win.viewport); + image.drawText(mediumFont, text.x, padding.top, "Navigate", 245); const busy = phase !== "idle"; const entries = busy ? [] : idleEntries(); const configured = isMapboxConfigured(); @@ -1386,16 +1434,17 @@ function paintIdle(image: GrayImage, win: NavWindow): void { : entries.length ? "View the map or pick a destination below. Use Voice input (system menu, long-press) to say a destination." : "Ask the voice assistant to navigate somewhere, or pick Voice input from the system menu (long-press) to say a destination. Save Home, Work and other places from the app menu."; - const hintLines = wrapText(smallFont, hint, image.width - 48); + const hintLines = wrapText(smallFont, hint, text.width); const hintStep = smallFont.lineHeight + 2; + const hintY = padding.top + IDLE_HINT_DROP; for (let index = 0; index < hintLines.length; index++) { - image.drawText(smallFont, 24, 52 + index * hintStep, hintLines[index]!, 170); + image.drawText(smallFont, text.x, hintY + index * hintStep, hintLines[index]!, 170); } - let y = 52 + hintLines.length * hintStep + 6; + let y = hintY + hintLines.length * hintStep + 6; if (statusMessage) { - const statusLines = wrapText(smallFont, statusMessage, image.width - 48); + const statusLines = wrapText(smallFont, statusMessage, text.width); for (let index = 0; index < statusLines.length; index++) { - image.drawText(smallFont, 24, y + index * hintStep, statusLines[index]!, busy ? 220 : 190); + image.drawText(smallFont, text.x, y + index * hintStep, statusLines[index]!, busy ? 220 : 190); } y += statusLines.length * hintStep + 6; } @@ -1403,23 +1452,34 @@ function paintIdle(image: GrayImage, win: NavWindow): void { paintIdleList(image, win, entries, y); drawFooter( image, + win.viewport, `${GESTURE_SCROLL} select ${GESTURE_CLICK} ${configured ? "go" : "choose"} ${GESTURE_SHORT_THEN_LONG_PRESS} app menu ${GESTURE_DOUBLE_CLICK} back`, ); } else { - drawFooter(image, `${GESTURE_SHORT_THEN_LONG_PRESS} app menu ${GESTURE_DOUBLE_CLICK} back`); + drawFooter(image, win.viewport, `${GESTURE_SHORT_THEN_LONG_PRESS} app menu ${GESTURE_DOUBLE_CLICK} back`); } } -/** Map action, saved destinations, then recent places, one selectable row each. */ +/** + * Map action, saved destinations, then recent places, one selectable row + * each. The list scrolls between the page's text above it and the footer + * hint, both of which stay put, so it needs no padding of its own at its + * top and bottom; its selection boxes span the window between the padding + * suggested for the sides. + */ function paintIdleList(image: GrayImage, win: NavWindow, entries: IdleEntry[], top: number): void { + const { width, padding } = win.viewport; const rowHeight = listRowHeight(smallFont); - const listBottom = image.height - 30; + const listBottom = footerY(win.viewport) - FOOTER_GAP; const visibleRows = Math.max(1, Math.floor((listBottom - top) / rowHeight)); - const rowWidth = image.width - 40 - (entries.length > visibleRows ? 10 : 0); + const listHeight = visibleRows * rowHeight - IDLE_ROW_GAP; + // The scrollbar hugs the right padding; the rows give way to it only when there is one. + const right = width - padding.right; + const scrollbar = entries.length > visibleRows ? IDLE_SCROLLBAR_GAP + IDLE_SCROLLBAR_WIDTH : 0; const list = idleList(); list.setItems(entries); - list.paint(image, { x: IDLE_LIST_X, y: top, width: rowWidth, height: visibleRows * rowHeight - IDLE_ROW_GAP }, win.focused); - list.drawScrollbar(image, IDLE_LIST_X + rowWidth + 4, top, visibleRows * rowHeight - 2); + list.paint(image, { x: padding.left, y: top, width: right - scrollbar - padding.left, height: listHeight }, win.focused); + list.drawScrollbar(image, right - IDLE_SCROLLBAR_WIDTH, top, listHeight); } /** Two columns: the entry's name, then its detail (action hint, address or place). */ @@ -1444,6 +1504,22 @@ function drawIdleRow({ image, item: entry, x, y, width, selected }: MenuDrawArgs image.drawText(smallFont, detailX, textY, truncateText(smallFont, detail, x + width - 6 - detailX), selected ? 170 : 130); } +// The guidance panel's head, measured from the maneuver glyph's top-left +// corner (the panel's content x, at the window's top padding). +const GLYPH_SIZE = 56; +/** Text beside the glyph: the distance to the maneuver, or "Arrived". */ +const GLYPH_CAPTION_X = 68; +const DISTANCE_Y = 10; +const ARRIVED_Y = 12; +/** A roundabout's exit number, inside its glyph. */ +const EXIT_NUMBER_X = 22; +const EXIT_NUMBER_Y = 32; +/** The instruction (or the destination's name) under the glyph. */ +const INSTRUCTION_Y = 70; +/** Clear space under the panel's status line (above the footer hint) and under its ETA line (above the status). */ +const PANEL_STATUS_GAP = 10; +const PANEL_ETA_GAP = 6; + function paintNavigating(image: GrayImage, win: NavWindow): void { // Map pane (left). if (mapImage) { @@ -1460,72 +1536,87 @@ function paintNavigating(image: GrayImage, win: NavWindow): void { image.drawText(smallFont, 24, MAP_SIZE / 2 - 8, text, 120); } - // Guidance panel (right) — its own region so text deltas never overlap the map's. - const panelWidth = win.viewportWidth - PANEL_X; + // Guidance panel (right) — its own region so text deltas never overlap the + // map's. Its left side is placed from the map pane; its top, right and + // bottom keep the padding suggested for the window's edges. + const { padding } = win.viewport; + const x = PANEL_X + PANEL_INSET; + const top = padding.top; + const textWidth = win.viewportWidth - padding.right - x; if (phase === "arrived") { - drawManeuverGlyph(image, PANEL_X + 8, 14, 56, "arrive", "", 245); - image.drawText(mediumFont, PANEL_X + 76, 26, "Arrived", 245); + drawManeuverGlyph(image, x, top, GLYPH_SIZE, "arrive", "", 245); + image.drawText(mediumFont, x + GLYPH_CAPTION_X, top + ARRIVED_Y, "Arrived", 245); image.drawTextWrapped({ font: smallFont, - x: PANEL_X + 8, - y: 84, - width: panelWidth - 16, + x, + y: top + INSTRUCTION_Y, + width: textWidth, text: destinationName, value: 200, }); - drawFooter(image, `${GESTURE_CLICK} done ${GESTURE_DOUBLE_CLICK} back`); + drawFooter(image, win.viewport, `${GESTURE_CLICK} done ${GESTURE_DOUBLE_CLICK} back`); return; } + // The status and ETA lines stack above the footer hint. + const statusY = footerY(win.viewport) - smallFont.lineHeight - PANEL_STATUS_GAP; const step = follower && progress ? follower.route.steps[progress.nextStepIndex] : null; if (step && progress) { - drawManeuverGlyph(image, PANEL_X + 8, 14, 56, step.maneuverType, step.maneuverModifier, 245); + drawManeuverGlyph(image, x, top, GLYPH_SIZE, step.maneuverType, step.maneuverModifier, 245); if (step.exit !== null && (step.maneuverType === "roundabout" || step.maneuverType === "rotary")) { - image.drawText(smallFont, PANEL_X + 30, 46, String(step.exit), 245); + image.drawText(smallFont, x + EXIT_NUMBER_X, top + EXIT_NUMBER_Y, String(step.exit), 245); } - image.drawText(largeFont, PANEL_X + 76, 24, formatDistanceShort(progress.metersToNextManeuver), 250); + image.drawText(largeFont, x + GLYPH_CAPTION_X, top + DISTANCE_Y, formatDistanceShort(progress.metersToNextManeuver), 250); image.drawTextWrapped({ font: mediumFont, - x: PANEL_X + 8, - y: 84, - width: panelWidth - 16, + x, + y: top + INSTRUCTION_Y, + width: textWidth, text: step.instruction || step.name || step.maneuverType, value: 220, }); const eta = `${formatDistance(progress.remainingMeters)} · ${formatDurationShort(progress.remainingSec)} · ${formatClock( Date.now() + progress.remainingSec * 1000, )}`; - image.drawText(smallFont, PANEL_X + 8, win.viewportHeight - 62, eta, 170); + image.drawText(smallFont, x, statusY - smallFont.lineHeight - PANEL_ETA_GAP, eta, 170); } else { image.drawTextWrapped({ font: mediumFont, - x: PANEL_X + 8, - y: 24, - width: panelWidth - 16, + x, + y: top, + width: textWidth, text: `Waiting for GPS...`, value: 200, }); } if (statusMessage) { - image.drawText(smallFont, PANEL_X + 8, win.viewportHeight - 44, statusMessage, 200); + image.drawText(smallFont, x, statusY, truncateText(smallFont, statusMessage, textWidth), 200); } const modeHint = mapMode === "follow" ? "overview" : "follow"; - drawFooter(image, `${GESTURE_SCROLL} zoom ${GESTURE_CLICK} ${modeHint} ${GESTURE_DOUBLE_CLICK} back`, PANEL_X + 8); + drawFooter(image, win.viewport, `${GESTURE_SCROLL} zoom ${GESTURE_CLICK} ${modeHint} ${GESTURE_DOUBLE_CLICK} back`, x); } -function paintMap(image: GrayImage): void { +/** Clear space under the text of the map-mode status banner. */ +const STATUS_BANNER_GAP = 4; + +function paintMap(image: GrayImage, win: NavWindow): void { + const { padding } = win.viewport; const { width, height } = mapDimensions(); if (mapImage) { image.bitBlt(mapImage, 0, 0); drawChevron(image, width / 2, height / 2, headHeadingDeg ?? 0); } else { - image.drawText(smallFont, 24, height / 2 - 8, mapLastError ? "Map unavailable; retrying..." : "Loading map...", 170); + const text = mapLastError ? "Map unavailable; retrying..." : "Loading map..."; + image.drawText(smallFont, pageText(win.viewport).x, height / 2 - 8, text, 170); } if (statusMessage) { - image.fillRect(0, 0, width, smallFont.lineHeight + 8, 0); - image.drawText(smallFont, 16, 4, truncateText(smallFont, statusMessage, width - 32), 200); + // A banner across the map's top: the strip runs edge to edge, and its + // text keeps the padding suggested for the edges it lies along. + image.fillRect(0, 0, width, padding.top + smallFont.lineHeight + STATUS_BANNER_GAP, 0); + image.drawText(smallFont, padding.left, padding.top, + truncateText(smallFont, statusMessage, width - padding.left - padding.right), 200); } - drawFooter(image, `${GESTURE_SCROLL} zoom ${GESTURE_CLICK} destinations ${GESTURE_DOUBLE_CLICK} back`); + drawFooter(image, win.viewport, `${GESTURE_SCROLL} zoom ${GESTURE_CLICK} destinations ${GESTURE_DOUBLE_CLICK} back`); } /** @@ -1575,8 +1666,15 @@ function fillTriangle(image: GrayImage, x0: number, y0: number, x1: number, y1: } } -function drawFooter(image: GrayImage, text: string, x = 16): void { - image.drawText(smallFont, x, image.height - 22, text, 115); +/** Top of the footer hint line, which rests on the padding suggested for the window's bottom edge. */ +function footerY(viewport: Viewport): number { + return viewport.height - viewport.padding.bottom - smallFont.lineHeight; +} + +/** Draw the footer hint line from `x` (default: the left padding), cut short at the right padding. */ +function drawFooter(image: GrayImage, viewport: Viewport, text: string, x = viewport.padding.left): void { + const maxWidth = viewport.width - viewport.padding.right - x; + image.drawText(smallFont, x, footerY(viewport), truncateText(smallFont, text, maxWidth), 115); } // --------------------------------------------------------------------------- diff --git a/app/apps/nightscout/missed-bolus-notification.ts b/app/apps/nightscout/missed-bolus-notification.ts index 3b09ecf0..660f771f 100644 --- a/app/apps/nightscout/missed-bolus-notification.ts +++ b/app/apps/nightscout/missed-bolus-notification.ts @@ -8,11 +8,9 @@ import { type InputEvent } from "../../ui/gestures"; import { type Layer, type LayerContext } from "../../ui/layers"; import { lineStep } from "../../ui/metrics"; import { - NOTIFICATION_CONTENT_X, createNotificationActionMenu, drawNotificationHeader, - notificationActionMenuBox, - notificationContentWidth, + notificationDetailLayout, } from "../../ui/notifications"; import { type GlucoseRise } from "./missed-bolus-detector"; import { @@ -25,7 +23,6 @@ import { const ICON_SIZE = 24; const GRAPH_GAP = 6; -const GRAPH_BOTTOM_MARGIN = 12; const MIN_GRAPH_HEIGHT = 32; type ActionItem = { label: string; run: () => void }; @@ -56,13 +53,15 @@ export class MissedBolusNotificationLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); const step = lineStep(font); - const { width, height } = ctx.stack.getBaseSize(); - const image = new GrayImage(width, height, 0); - const contentX = NOTIFICATION_CONTENT_X; - const contentWidth = notificationContentWidth(width); + const viewport = ctx.stack.getBaseSize(); + const image = new GrayImage(viewport.width, viewport.height, 0); + // The same columns as a notification's detail view, inside the padding + // suggested for the edges of whatever hosts this (the shell's modal). + const layout = notificationDetailLayout(viewport); + const { contentX, contentWidth } = layout; const nowMs = Date.now(); - let y = drawNotificationHeader(image, font, renderIcon("nightscout", ICON_SIZE), `Nightscout ${formatRelativeTime(this.postedAtMs)}`); + let y = drawNotificationHeader(image, font, renderIcon("nightscout", ICON_SIZE), `Nightscout ${formatRelativeTime(this.postedAtMs)}`, layout); image.drawText(font, contentX, y, "Missed bolus?", 230); y += step; const minutes = Math.round((this.rise.latestMs - this.rise.onsetMs) / 60_000); @@ -90,12 +89,12 @@ export class MissedBolusNotificationLayer implements Layer { y += step; } const graphTop = y + GRAPH_GAP; - const graphHeight = height - GRAPH_BOTTOM_MARGIN - graphTop; + const graphHeight = layout.bottom - graphTop; if (graphHeight >= MIN_GRAPH_HEIGHT) { drawNightscoutGraph(image, { x: contentX, y: graphTop, width: contentWidth, height: graphHeight }, nightscout, nowMs, font); } - this.menu.paint(image, notificationActionMenuBox(width, height), ctx.stack.isFocused()); + this.menu.paint(image, layout.menuBox, ctx.stack.isFocused()); return image; } diff --git a/app/apps/nightscout/nightscout.ts b/app/apps/nightscout/nightscout.ts index 8266a31d..5ebcc902 100644 --- a/app/apps/nightscout/nightscout.ts +++ b/app/apps/nightscout/nightscout.ts @@ -30,6 +30,19 @@ export const NIGHTSCOUT_STALE_MS = 15 * 60 * 1000; const NIGHTSCOUT_GRAPH_WINDOW_MS = 2 * 60 * 60 * 1000; const NIGHTSCOUT_GRAPH_TIME_QUANTUM_MS = 60 * 1000; +/** + * The app page's fixed parts, placed from the title at the window's top and + * left padding: a status message and the graph, down from the title's top, + * and the status lines' column, right of the readout's left edge. + */ +const PAGE_MESSAGE_OFFSET_Y = 28; +const PAGE_GRAPH_OFFSET_Y = 112; +const PAGE_STATUS_OFFSET_X = 148; +/** Gap between the page's graph and the caption under it. */ +const PAGE_CAPTION_GAP = 6; +/** The shortest graph the page draws above its caption; with less room the graph takes the caption's. */ +const PAGE_MIN_GRAPH_HEIGHT = 40; + /** Draws the trend indicator; returns its width. */ export function drawDirectionIndicator( image: GrayImage, @@ -298,36 +311,44 @@ function drawNightscoutReferenceLine( export class NightscoutLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - // Sized to the hosting stack (the Nightscout app viewport). - const { width, height } = ctx.stack.getBaseSize(); + // Sized to the hosting stack (the Nightscout app viewport). Nothing here + // scrolls, so the page keeps inside the padding suggested for each of + // the viewport's edges: the title, the readout and the graph start at + // the left padding, and the graph and its caption end at the bottom's. + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); const nightscout = nightscoutBridge.snapshot(); const nowMs = Date.now(); const step = lineStep(font); - image.drawText(font, 22, 16, "Nightscout", 220); + const left = padding.left; + const top = padding.top; + const right = width - padding.right; + const bottom = height - padding.bottom; + image.drawText(font, left, top, "Nightscout", 220); + const messageY = top + PAGE_MESSAGE_OFFSET_Y; if (!isNightscoutSettingsConfigured() || nightscout.configurationMissing) { - image.drawText(font, 22, 44, "Nightscout needs configuration.", 180); - image.drawText(font, 22, 44 + step, "Long-press for the menu, then pick Settings to set", 140); - image.drawText(font, 22, 44 + 2 * step, "the site URL and API token.", 140); + image.drawText(font, left, messageY, "Nightscout needs configuration.", 180); + image.drawText(font, left, messageY + step, "Long-press for the menu, then pick Settings to set", 140); + image.drawText(font, left, messageY + 2 * step, "the site URL and API token.", 140); return image; } if (!nightscout.available || !nightscout.latest) { - image.drawText(font, 22, 44, "No Nightscout data available.", 180); - image.drawText(font, 22, 44 + step, truncateLine(nightscout.status, 60), 140); + image.drawText(font, left, messageY, "No Nightscout data available.", 180); + image.drawText(font, left, messageY + step, truncateLine(nightscout.status, 60), 140); return image; } // Two-column header above the graph: title + current glucose on the // left, the status lines bottom-aligned on the right. - const graphTop = 128; + const graphTop = top + PAGE_GRAPH_OFFSET_Y; const latest = nightscout.latest; const glucoseText = `${latest.sgv}`; - const glucoseX = 22; + const glucoseX = left; const glucoseWidth = nightscoutLargeFont.measureText(glucoseText); // Glucose value vertically centered between the title and the graph. - const titleBottom = 16 + font.lineHeight; + const titleBottom = top + font.lineHeight; const glucoseY = Math.round((titleBottom + graphTop - nightscoutLargeFont.lineHeight) / 2); image.drawText(nightscoutLargeFont, glucoseX, glucoseY, glucoseText, 230); if (isNightscoutPointStale(latest, nowMs)) { @@ -335,8 +356,8 @@ export class NightscoutLayer implements Layer { } image.drawText(font, glucoseX + glucoseWidth + 8, glucoseY + nightscoutLargeFont.lineHeight - font.lineHeight, nightscout.units, 140); - const statusX = 170; - const statusWidth = width - 22 - statusX; + const statusX = left + PAGE_STATUS_OFFSET_X; + const statusWidth = right - statusX; const alerts = evaluateNightscoutAlerts(nightscout, loadNightscoutThresholds(), nowMs); const statusLines: { text: string; shade: number; direction?: string; fields?: { text: string; warning?: boolean }[] }[] = [ { text: `Delta ${formatDelta(nightscout.delta)} Trend `, shade: 180, direction: nightscout.direction }, @@ -382,10 +403,14 @@ export class NightscoutLayer implements Layer { statusY += step; } - const captionY = height - font.lineHeight - 6; - const graphHeight = Math.max(40, captionY - 6 - graphTop); - drawNightscoutGraph(image, { x: 22, y: graphTop, width: width - 44, height: graphHeight }, nightscout, nowMs, font); - image.drawText(font, 22, captionY, "2-hour glucose history with basal / carbs / boluses", 130); + // The graph spans the padded width, down to the caption on the last + // line above the bottom padding. A window too short for both gives the + // caption's room to the graph. + const captionY = bottom - font.lineHeight; + const captioned = captionY - PAGE_CAPTION_GAP - graphTop >= PAGE_MIN_GRAPH_HEIGHT; + const graphBottom = captioned ? captionY - PAGE_CAPTION_GAP : bottom; + drawNightscoutGraph(image, { x: left, y: graphTop, width: right - left, height: graphBottom - graphTop }, nightscout, nowMs, font); + if (captioned) image.drawText(font, left, captionY, "2-hour glucose history with basal / carbs / boluses", 130); return image; } diff --git a/app/apps/onboarding/data-collection-page.ts b/app/apps/onboarding/data-collection-page.ts index ad52e32b..2dbbc352 100644 --- a/app/apps/onboarding/data-collection-page.ts +++ b/app/apps/onboarding/data-collection-page.ts @@ -4,11 +4,11 @@ import { dataCollectionSetting, dataCollectionSummary, type DataCollectionLevel import type { InputEvent } from "../../ui/gestures"; import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, listRowHeight } from "../../ui/metrics"; +import type { Edges } from "../../ui/viewport"; import { onboardingFont } from "./onboarding-fonts"; -import { drawPageHeading, PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { drawPageHeading, PAGE_TEXT_INSET, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const CONTENT_GAP = 10; -const BOTTOM_MARGIN = 8; const LABEL_GAP = 24; /** None / Minimal / Full, each with a one-line summary; a tap saves the selected level. */ @@ -29,21 +29,27 @@ export class DataCollectionPage implements OnboardingPage { this.menu.select(dataCollectionSetting.values.indexOf(dataCollectionSetting.get())); } - paint(image: GrayImage, focused: boolean): void { + paint(image: GrayImage, focused: boolean, padding: Edges): void { const top = drawPageHeading( image, - "Data Sharing", - (global.isIOS ? "If using TestFlight, crash/usage reports cannot be disabled here. " : "") + - "Choose how much data you want to share. Change later in Settings > Privacy.", + padding, + "Faceclaw Statistics", + (global.isIOS ? "TestFlight reports are separate. " : "Google ML Kit diagnostics are separate. ") + + "Choose Faceclaw statistics below. Details and controls: Settings > Privacy.", 3, ) + CONTENT_GAP; const body = onboardingFont("body"); this.labelColumnWidth = Math.max(...dataCollectionSetting.values.map((level) => body.measureText(dataCollectionSetting.displayValue(level)))) + LABEL_GAP; + // The list scrolls, so it runs to the window's bottom edge, with that + // edge's padding after its last row. this.menu.paint( image, - { x: PAGE_X - 10, y: top, width: image.width - 2 * (PAGE_X - 10), height: image.height - top - BOTTOM_MARGIN }, + { + x: padding.left, y: top, width: Math.max(0, image.width - padding.left - padding.right), height: Math.max(0, image.height - top), + padBottom: padding.bottom, + }, focused, ); } @@ -68,9 +74,9 @@ export class DataCollectionPage implements OnboardingPage { private drawRow({ image, item: level, x, y, width, height, selected }: MenuDrawArgs): void { const body = onboardingFont("body"); const detail = onboardingFont("detail"); - image.drawText(body, x + 10, y + LIST_ROW_TEXT_INSET, dataCollectionSetting.displayValue(level), selected ? 255 : 200); - const summaryX = x + 10 + this.labelColumnWidth; - const summary = truncateText(detail, dataCollectionSummary(level), x + width - 10 - summaryX); + image.drawText(body, x + PAGE_TEXT_INSET, y + LIST_ROW_TEXT_INSET, dataCollectionSetting.displayValue(level), selected ? 255 : 200); + const summaryX = x + PAGE_TEXT_INSET + this.labelColumnWidth; + const summary = truncateText(detail, dataCollectionSummary(level), x + width - PAGE_TEXT_INSET - summaryX); image.drawText(detail, summaryX, y + Math.round((height - detail.lineHeight) / 2), summary, selected ? 210 : 150); } } diff --git a/app/apps/onboarding/depth-page.ts b/app/apps/onboarding/depth-page.ts index ad3b1c1d..29625240 100644 --- a/app/apps/onboarding/depth-page.ts +++ b/app/apps/onboarding/depth-page.ts @@ -3,12 +3,12 @@ import { appSwitcherPositionSetting, uiDepthSetting, type UiDepth } from "../../ import type { InputEvent } from "../../ui/gestures"; import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, listRowHeight } from "../../ui/metrics"; +import type { Edges } from "../../ui/viewport"; import { layoutHasDepth } from "./layout-page"; import { onboardingFont } from "./onboarding-fonts"; -import { drawPageHeading, PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { drawPageHeading, PAGE_TEXT_INSET, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const CONTENT_GAP = 10; -const BOTTOM_MARGIN = 8; const COLUMN_WIDTH = 220; /** @@ -35,15 +35,21 @@ export class DepthPage implements OnboardingPage { this.menu.select(uiDepthSetting.values.indexOf(uiDepthSetting.get())); } - paint(image: GrayImage, focused: boolean): void { + paint(image: GrayImage, focused: boolean, padding: Edges): void { const top = drawPageHeading( image, + padding, "Depth", "Swipe to move the display nearer or farther away, then tap to continue. Change later in Settings > Customization.", ) + CONTENT_GAP; + // The list scrolls, so it runs to the window's bottom edge, with that + // edge's padding after its last row. this.menu.paint( image, - { x: PAGE_X - 10, y: top, width: COLUMN_WIDTH, height: image.height - top - BOTTOM_MARGIN }, + { + x: padding.left, y: top, width: Math.min(COLUMN_WIDTH, Math.max(0, image.width - padding.left - padding.right)), + height: Math.max(0, image.height - top), padBottom: padding.bottom, + }, focused, ); } @@ -66,6 +72,6 @@ export class DepthPage implements OnboardingPage { } private drawRow({ image, item: depth, x, y, selected }: MenuDrawArgs): void { - image.drawText(onboardingFont("body"), x + 10, y + LIST_ROW_TEXT_INSET, uiDepthSetting.displayValue(depth), selected ? 255 : 190); + image.drawText(onboardingFont("body"), x + PAGE_TEXT_INSET, y + LIST_ROW_TEXT_INSET, uiDepthSetting.displayValue(depth), selected ? 255 : 190); } } diff --git a/app/apps/onboarding/display-mode-page.ts b/app/apps/onboarding/display-mode-page.ts index 5f449478..464433fb 100644 --- a/app/apps/onboarding/display-mode-page.ts +++ b/app/apps/onboarding/display-mode-page.ts @@ -4,11 +4,11 @@ import { displayLayoutSetting, type DisplayLayout } from "../../ui/dashboard-set import type { InputEvent } from "../../ui/gestures"; import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, listRowHeight } from "../../ui/metrics"; +import type { Edges } from "../../ui/viewport"; import { onboardingFont } from "./onboarding-fonts"; -import { drawPageHeading, PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { drawPageHeading, PAGE_TEXT_INSET, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const CONTENT_GAP = 10; -const BOTTOM_MARGIN = 8; const COLUMN_GAP = 16; const DESCRIPTIONS = { @@ -41,24 +41,29 @@ export class DisplayModePage implements OnboardingPage { this.menu.setItems(values, index >= 0 ? index : values.indexOf("tall")); } - paint(image: GrayImage, focused: boolean): void { + paint(image: GrayImage, focused: boolean, padding: Edges): void { const top = drawPageHeading( image, + padding, "Display mode", "Swipe to choose how much of the display windows use; it changes as you go. Tap to continue.", ) + CONTENT_GAP; const body = onboardingFont("body"); // TTF widths are fractional; the menu's row images need whole pixels. - const columnWidth = Math.ceil(20 + Math.max(...this.menu.items.map((value) => body.measureText(displayLayoutSetting.displayValue(value))))); - const menuBox = { x: PAGE_X - 10, y: top, width: columnWidth, height: image.height - top - BOTTOM_MARGIN }; + const columnWidth = Math.ceil(2 * PAGE_TEXT_INSET + + Math.max(...this.menu.items.map((value) => body.measureText(displayLayoutSetting.displayValue(value))))); + // The list scrolls, so it runs to the window's bottom edge, with that + // edge's padding after its last row. + const menuBox = { x: padding.left, y: top, width: columnWidth, height: Math.max(0, image.height - top), padBottom: padding.bottom }; this.menu.paint(image, menuBox, focused); const layout = this.menu.selectedItem; if (layout === null) return; + // The description stays put beside the list, inside the right and bottom padding. const detail = onboardingFont("detail"); const left = menuBox.x + columnWidth + COLUMN_GAP; let y = top + LIST_ROW_TEXT_INSET; - for (const line of wrapText(detail, description(layout), image.width - PAGE_X - left)) { - if (y + detail.lineHeight > image.height - BOTTOM_MARGIN) break; + for (const line of wrapText(detail, description(layout), image.width - padding.right - PAGE_TEXT_INSET - left)) { + if (y + detail.lineHeight > image.height - padding.bottom) break; image.drawText(detail, left, y, line, 170); y += detail.lineHeight; } @@ -86,7 +91,7 @@ export class DisplayModePage implements OnboardingPage { } private drawRow({ image, item: layout, x, y, selected }: MenuDrawArgs): void { - image.drawText(onboardingFont("body"), x + 10, y + LIST_ROW_TEXT_INSET, displayLayoutSetting.displayValue(layout), selected ? 255 : 190); + image.drawText(onboardingFont("body"), x + PAGE_TEXT_INSET, y + LIST_ROW_TEXT_INSET, displayLayoutSetting.displayValue(layout), selected ? 255 : 190); } } diff --git a/app/apps/onboarding/layout-page.ts b/app/apps/onboarding/layout-page.ts index 50411469..59cbbac0 100644 --- a/app/apps/onboarding/layout-page.ts +++ b/app/apps/onboarding/layout-page.ts @@ -3,12 +3,12 @@ import { appSwitcherPositionSetting, glassesTypeSetting, type AppSwitcherPositio import type { InputEvent } from "../../ui/gestures"; import { MENU_HIGHLIGHT_FILL, MENU_HIGHLIGHT_STROKE } from "../../ui/menu-core"; import { screenWidth } from "../../ui/shell/geometry"; +import type { Edges } from "../../ui/viewport"; import { AREA_OUTLINE, Diagram, diagramBandHeight, drawLayout, layoutAreaHeight } from "./layout-diagram"; import { onboardingFont } from "./onboarding-fonts"; -import { drawPageHeading, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { centredX, drawPageHeading, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const CONTENT_GAP = 10; -const BOTTOM_MARGIN = 8; /** Diagram width as a fraction of the display's: the most a diagram is drawn at. */ const DIAGRAM_SCALE = 0.4; /** Padding inside a cell's selection box, round the diagram and its caption. */ @@ -37,35 +37,39 @@ export function layoutHasDepth(position: AppSwitcherPosition): boolean { * layout, Bottom and Popup on top, the recommended one selected at first; * swipes move through them in reading order, a tap saves the selected one. * The page is immersive, so the diagrams get 40% of the display's width - * each. Choosing a layout reflows open windows (the dashboard controller - * watches the setting). + * each. The grid is centred in the window, its cells' selection boxes + * keeping inside the padding of the window's edges. Choosing a layout + * reflows open windows (the dashboard controller watches the setting). */ export class LayoutPage implements OnboardingPage { readonly immersive = true; /** Kept across visits, so going back returns to the last choice. */ private selected = LAYOUT_ORDER.indexOf(recommendedLayout()); - paint(image: GrayImage, focused: boolean): void { + paint(image: GrayImage, focused: boolean, padding: Edges): void { const top = drawPageHeading( image, + padding, "Layout", "Swipe to choose where the app switcher goes, then tap to continue.", ) + CONTENT_GAP; const title = onboardingFont("body"); const subtitle = onboardingFont("detail"); const captionHeight = CAPTION_GAP + title.lineHeight + subtitle.lineHeight; - const available = image.height - top - BOTTOM_MARGIN; + const available = image.height - top - padding.bottom; + const availableWidth = image.width - padding.left - padding.right; + // The most a diagram can take for two rows and two columns of cells to + // fit, in whole pixels, so rounding its size can't push the grid past + // the window's padding. + const maxDiagramHeight = Math.floor((available - ROW_GAP) / 2 - 2 * CELL_PADDING - captionHeight); + const maxDiagramWidth = Math.floor((availableWidth - COLUMN_GAP) / 2 - 2 * CELL_PADDING); // Short of DIAGRAM_SCALE only where two rows of cells wouldn't fit. - const scale = Math.min( - DIAGRAM_SCALE, - ((available - ROW_GAP) / 2 - 2 * CELL_PADDING - captionHeight) / layoutAreaHeight(), - ((image.width - COLUMN_GAP) / 2 - 2 * CELL_PADDING) / screenWidth(), - ); + const scale = Math.max(0, Math.min(DIAGRAM_SCALE, maxDiagramHeight / layoutAreaHeight(), maxDiagramWidth / screenWidth())); const diagramWidth = Math.round(screenWidth() * scale); const diagramHeight = Math.round(layoutAreaHeight() * scale); const cellWidth = diagramWidth + 2 * CELL_PADDING; const cellHeight = diagramHeight + 2 * CELL_PADDING + captionHeight; - const left = Math.round((image.width - 2 * cellWidth - COLUMN_GAP) / 2); + const left = centredX(image, padding, 2 * cellWidth + COLUMN_GAP); const gridTop = top + Math.max(0, Math.round((available - 2 * cellHeight - ROW_GAP) / 2)); LAYOUT_ORDER.forEach((position, index) => { const x = left + (index % 2) * (cellWidth + COLUMN_GAP); diff --git a/app/apps/onboarding/onboarding-app.ts b/app/apps/onboarding/onboarding-app.ts index fb799dc8..4a6e713f 100644 --- a/app/apps/onboarding/onboarding-app.ts +++ b/app/apps/onboarding/onboarding-app.ts @@ -84,9 +84,9 @@ export class OnboardingLayer implements Layer { } paint(ctx: LayerContext): GrayImage { - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); - this.pages[this.index]!.paint(image, ctx.stack.isFocused()); + this.pages[this.index]!.paint(image, ctx.stack.isFocused(), padding); return image; } diff --git a/app/apps/onboarding/onboarding-page.ts b/app/apps/onboarding/onboarding-page.ts index 5081854d..460b3f19 100644 --- a/app/apps/onboarding/onboarding-page.ts +++ b/app/apps/onboarding/onboarding-page.ts @@ -1,6 +1,7 @@ import type { GrayImage } from "../../graphics/image"; import { wrapText } from "../../graphics/textwrap"; import type { InputEvent } from "../../ui/gestures"; +import type { Edges } from "../../ui/viewport"; import { onboardingFont } from "./onboarding-fonts"; /** Page-to-flow navigation, handed to a page's input handler. */ @@ -25,13 +26,31 @@ export interface OnboardingPage { applies?(): boolean; /** The page became current, going forward or back. */ enter?(): void; - paint(image: GrayImage, focused: boolean): void; + /** + * Paint the page over the whole image, the window's viewport. `padding` + * is the padding suggested for each of its edges (viewport.ts): none on an + * immersive page, whose edges are the screen's. + */ + paint(image: GrayImage, focused: boolean, padding: Edges): void; handleInput(event: InputEvent, nav: OnboardingNav): void | Promise; } -/** Left margin and title position shared by the pages (the UI-wide (18, 10) title spot). */ -export const PAGE_X = 18; -export const TITLE_Y = 10; +/** + * How far a page's text (its title and explanation, a list row's label) + * sits inside the side padding. A list's selection boxes start at the + * padding itself, so the title lines up with the rows' text. + */ +export const PAGE_TEXT_INSET = 10; +/** The title's drop below the top padding. */ +const TITLE_OFFSET_Y = 2; + +/** + * The x that centres something `width` wide in the window, short of + * entering either side's padding. + */ +export function centredX(image: GrayImage, padding: Edges, width: number): number { + return Math.max(padding.left, Math.min(image.width - padding.right - width, Math.round((image.width - width) / 2))); +} /** * Draw a page's title and its wrapped explanation (at most `maxLines` @@ -39,17 +58,21 @@ export const TITLE_Y = 10; */ export function drawPageHeading( image: GrayImage, + padding: Edges, title: string, explanation: string, maxLines = 2, ): number { const titleFont = onboardingFont("title"); const detailFont = onboardingFont("detail"); - image.drawText(titleFont, PAGE_X, TITLE_Y, title, 230); - let y = TITLE_Y + titleFont.lineHeight + 2; - const lines = wrapText(detailFont, explanation, image.width - 2 * PAGE_X).slice(0, maxLines); + const x = padding.left + PAGE_TEXT_INSET; + const textWidth = Math.max(0, image.width - padding.left - padding.right - 2 * PAGE_TEXT_INSET); + const titleY = padding.top + TITLE_OFFSET_Y; + image.drawText(titleFont, x, titleY, title, 230); + let y = titleY + titleFont.lineHeight + 2; + const lines = wrapText(detailFont, explanation, textWidth).slice(0, maxLines); for (const line of lines) { - image.drawText(detailFont, PAGE_X, y, line, 160); + image.drawText(detailFont, x, y, line, 160); y += detailFont.lineHeight; } return y; diff --git a/app/apps/onboarding/text-size-page.ts b/app/apps/onboarding/text-size-page.ts index 485691b7..69ff4f2b 100644 --- a/app/apps/onboarding/text-size-page.ts +++ b/app/apps/onboarding/text-size-page.ts @@ -14,11 +14,11 @@ import { FONT_SIZE_CHOICES } from "../../ui/font-picker"; import type { InputEvent } from "../../ui/gestures"; import { Menu, type MenuBox, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, listRowHeight } from "../../ui/metrics"; +import type { Edges } from "../../ui/viewport"; import { onboardingFont } from "./onboarding-fonts"; -import { drawPageHeading, PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { drawPageHeading, PAGE_TEXT_INSET, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const CONTENT_GAP = 10; -const BOTTOM_MARGIN = 8; const COLUMN_GAP = 12; const PREVIEW_PADDING = 10; const ROW_GAP = 2; @@ -75,39 +75,40 @@ export class TextSizePage implements OnboardingPage { this.face = { kind: "fixed", label: selection.kind === "bitmap" ? fontSelectionLabel(selection) : "Terminus" }; } - paint(image: GrayImage, focused: boolean): void { + paint(image: GrayImage, focused: boolean, padding: Edges): void { + // The preview's frame keeps inside the padding of the window's edges. + const right = image.width - padding.right; + const bottom = image.height - padding.bottom; if (this.face.kind === "fixed") { const top = drawPageHeading( image, + padding, "Text size", `Your UI font, ${this.face.label}, comes in one size. To choose a size, pick a different font in ` + "Settings > Customization. Tap to continue.", 3, ) + CONTENT_GAP; - drawPreview(image, getDefaultSmallFont(), { - x: PAGE_X - 10, - y: top, - width: image.width - 2 * (PAGE_X - 10), - height: image.height - top - BOTTOM_MARGIN, - }); + drawPreview(image, getDefaultSmallFont(), { x: padding.left, y: top, width: right - padding.left, height: bottom - top }); return; } const top = drawPageHeading( image, + padding, "Text size", "Swipe to choose a size, then tap to continue. The typeface and weight can be changed in Settings.", ) + CONTENT_GAP; - const height = image.height - top - BOTTOM_MARGIN; const body = onboardingFont("body"); // TTF widths are fractional; the menu's row images need whole pixels. - const columnWidth = Math.ceil(20 + Math.max(...this.face.sizes.map((size) => body.measureText(sizeLabel(size)))) + + const columnWidth = Math.ceil(2 * PAGE_TEXT_INSET + Math.max(...this.face.sizes.map((size) => body.measureText(sizeLabel(size)))) + NOTE_GAP + onboardingFont("detail").measureText(RECOMMENDED_NOTE)); - const menuBox = { x: PAGE_X - 10, y: top, width: columnWidth, height }; + // The list scrolls, so it runs to the window's bottom edge, with that + // edge's padding after its last row. + const menuBox = { x: padding.left, y: top, width: columnWidth, height: Math.max(0, image.height - top), padBottom: padding.bottom }; this.sizeMenu.paint(image, menuBox, focused); const previewX = menuBox.x + menuBox.width + COLUMN_GAP; const size = this.sizeMenu.selectedItem; const font = (size !== null ? TtfFont.load(this.face.path, size) : null) ?? getDefaultSmallFont(); - drawPreview(image, font, { x: previewX, y: top, width: image.width - (PAGE_X - 10) - previewX, height }); + drawPreview(image, font, { x: previewX, y: top, width: right - previewX, height: bottom - top }); } handleInput(event: InputEvent, nav: OnboardingNav): void { @@ -136,11 +137,11 @@ export class TextSizePage implements OnboardingPage { private drawSizeRow({ image, item: size, x, y, height, selected }: MenuDrawArgs): void { const body = onboardingFont("body"); const label = sizeLabel(size); - image.drawText(body, x + 10, y + LIST_ROW_TEXT_INSET, label, selected ? 255 : 190); + image.drawText(body, x + PAGE_TEXT_INSET, y + LIST_ROW_TEXT_INSET, label, selected ? 255 : 190); if (size !== defaultUiFontSize()) return; const detail = onboardingFont("detail"); const noteY = y + Math.round((height - detail.lineHeight) / 2); - image.drawText(detail, x + 10 + body.measureText(label) + NOTE_GAP, noteY, RECOMMENDED_NOTE, selected ? 210 : 150); + image.drawText(detail, x + PAGE_TEXT_INSET + body.measureText(label) + NOTE_GAP, noteY, RECOMMENDED_NOTE, selected ? 210 : 150); } } diff --git a/app/apps/onboarding/welcome-page.ts b/app/apps/onboarding/welcome-page.ts index 4d9c62b4..bfec82dd 100644 --- a/app/apps/onboarding/welcome-page.ts +++ b/app/apps/onboarding/welcome-page.ts @@ -2,31 +2,35 @@ import type { GrayImage, UiFont } from "../../graphics/image"; import { getFullLogo } from "../../graphics/logo"; import { wrapText } from "../../graphics/textwrap"; import type { InputEvent } from "../../ui/gestures"; +import type { Edges } from "../../ui/viewport"; import { FACECLAW_VERSION } from "../../version"; import { onboardingFont } from "./onboarding-fonts"; -import { PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; +import { centredX, type OnboardingNav, type OnboardingPage } from "./onboarding-page"; const LOGO_MAX_HEIGHT = 180; -const LOGO_MARGIN = 12; const LOGO_TEXT_GAP = 28; const PROMPT_GAP = 22; const PROMPT = "Tap the ring or touchpad to continue"; type TextLine = { font: UiFont; text: string; value: number; spaceBefore: number }; -/** The splash: logo beside the name, version and how to go on, centred as one group. */ +/** + * The splash: logo beside the name, version and how to go on, centred in + * the window as one group, which keeps inside the padding of its edges. + */ export class WelcomePage implements OnboardingPage { readonly immersive = true; - paint(image: GrayImage): void { + paint(image: GrayImage, _focused: boolean, padding: Edges): void { const { width, height } = image; - const logo = getFullLogo(Math.min(LOGO_MAX_HEIGHT, height - 2 * LOGO_MARGIN)); + const availableWidth = Math.max(0, width - padding.left - padding.right); + const logo = getFullLogo(Math.min(LOGO_MAX_HEIGHT, height - padding.top - padding.bottom)); const logoWidth = logo ? logo.width + LOGO_TEXT_GAP : 0; const body = onboardingFont("body"); const lines: TextLine[] = [ { font: onboardingFont("hero"), text: "Faceclaw", value: 240, spaceBefore: 0 }, { font: body, text: `Version ${FACECLAW_VERSION}`, value: 150, spaceBefore: 0 }, - ...wrapText(body, PROMPT, width - 2 * PAGE_X - logoWidth).map((text, index) => ({ + ...wrapText(body, PROMPT, availableWidth - logoWidth).map((text, index) => ({ font: body, text, value: 215, @@ -35,7 +39,7 @@ export class WelcomePage implements OnboardingPage { ]; const textWidth = Math.max(...lines.map((line) => line.font.measureText(line.text))); const textHeight = lines.reduce((total, line) => total + line.spaceBefore + line.font.lineHeight, 0); - const left = Math.max(PAGE_X, Math.round((width - logoWidth - textWidth) / 2)); + const left = centredX(image, padding, logoWidth + textWidth); if (logo) { image.bitBlt(logo, left, Math.round((height - logo.height) / 2), { transparentZero: true }); } diff --git a/app/apps/pinball/pinball-app.worker.ts b/app/apps/pinball/pinball-app.worker.ts index 8ff5a1bb..3a844d17 100644 --- a/app/apps/pinball/pinball-app.worker.ts +++ b/app/apps/pinball/pinball-app.worker.ts @@ -37,6 +37,7 @@ import { loadSoundEnabled, saveSoundEnabled } from "../../ui/sound-setting"; import { type MenuItem } from "../../ui/menu"; import { WindowMenu } from "../../ui/window-menu"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import { directionalFallback, GESTURE_CLICK, @@ -250,6 +251,13 @@ type PinballWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there. The window menu's layers + * lay out by it; the table and its panel are fixed art, drawn at the + * coordinates the physics runs in (see LAYOUT_HEIGHT). + */ + viewport: Viewport; foreground: boolean; /** Whether this window is the shell's input target (pushed with each message). */ focused: boolean; @@ -314,6 +322,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -416,7 +425,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.menu?.resize({ width: window.viewportWidth, height: window.viewportHeight }); + window.viewport = message.viewport; + window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; if (window.foreground) renderAndSubmit(window, 0); break; @@ -507,7 +517,7 @@ function windowMenu(window: PinballWindow): WindowMenu { post, title: () => window.title, items: () => (window.phase === "playing" ? [] : windowMenuItems(window)), - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: window.viewport, paintBase: () => paintContent(window), isFocused: () => window.focused, }); diff --git a/app/apps/roam/roam-app.worker.ts b/app/apps/roam/roam-app.worker.ts index a06be8bc..b348fba6 100644 --- a/app/apps/roam/roam-app.worker.ts +++ b/app/apps/roam/roam-app.worker.ts @@ -22,6 +22,7 @@ import type { MenuItem } from "../../ui/menu"; import { WindowMenu } from "../../ui/window-menu"; import { DatePickerLayer } from "../../ui/date-picker"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; +import type { Viewport } from "../../ui/viewport"; import type { ToolResult, ToolSpec } from "../../assistant/tool-registry"; import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures"; import { @@ -29,7 +30,7 @@ import { roamGraphNameSetting, type ConfigSettingString, } from "../../ui/dashboard-settings"; -import { DocumentView } from "../../ui/document/document-view"; +import { DocumentView, type DocumentViewSize } from "../../ui/document/document-view"; import { docNodePageLink, type DocNode } from "../../ui/document/document-model"; import { createBlock, @@ -56,9 +57,18 @@ import { declare const global: any; -const HEADER_HEIGHT = 30; -const BOTTOM_MARGIN = 6; -const DOC_MARGIN = 6; +/** + * The fixed header, measured down from the padding suggested for the + * window's top edge: the rule under its title line, and its bottom, where + * the page's body starts. + */ +const HEADER_RULE_Y = 20; +const HEADER_HEIGHT = 24; +/** The header's title starts this far right of the rule's left end. */ +const TITLE_INSET = 2; +/** Message text (the body messages, the setting-edit screen): its indent from the padding at each side, and its drop below the header. */ +const MESSAGE_INSET = 12; +const MESSAGE_DROP = 16; /** Reload the shown page when it is foregrounded and older than this. */ const STALE_AFTER_MS = 60_000; @@ -70,6 +80,12 @@ type RoamWindow = { title: string; viewportWidth: number; viewportHeight: number; + /** + * The viewport as the shell last sent it: besides the size above, what each + * edge touches and the padding suggested there, which the header and the + * document are placed by (see documentBox). + */ + viewport: Viewport; foreground: boolean; focused: boolean; menu: WindowMenu | null; @@ -181,13 +197,11 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { title: message.title, viewportWidth: message.viewport.width, viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, - view: new DocumentView( - message.viewport.width - DOC_MARGIN * 2, - message.viewport.height - HEADER_HEIGHT - BOTTOM_MARGIN, - ), + view: new DocumentView(documentBox(message.viewport)), lastSubmittedFingerprint: "", }; post({ type: "set-tools", windowId: message.windowId, tools: ROAM_TOOLS }); @@ -258,7 +272,8 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { if (!window || window.windowId !== message.windowId) break; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; - window.view.resize(message.viewport.width - DOC_MARGIN * 2, message.viewport.height - HEADER_HEIGHT - BOTTOM_MARGIN); + window.viewport = message.viewport; + window.view.resize(documentBox(message.viewport)); window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; render(); @@ -357,7 +372,7 @@ function windowMenu(win: RoamWindow): WindowMenu { post, title: () => win.title, items: () => menuItems(), - size: { width: win.viewportWidth, height: win.viewportHeight }, + size: win.viewport, paintBase: () => paintContent(win), isFocused: () => win.focused, }); @@ -631,65 +646,97 @@ function paint(win: RoamWindow): Plane[] { ); } +/** Bottom of the fixed header, where the page's body starts. */ +function headerBottom(viewport: Viewport): number { + return viewport.padding.top + HEADER_HEIGHT; +} + +/** + * The document's region: from the header down to the window's bottom edge, + * between the padding suggested for its sides. The document scrolls, so the + * bottom edge's padding goes inside it, after its last line, and lines + * scrolled past use the room right up to the edge. + */ +function documentBox(viewport: Viewport): DocumentViewSize & { x: number; y: number } { + const { width, height, padding } = viewport; + const y = headerBottom(viewport); + return { + x: padding.left, + y, + width: Math.max(0, width - padding.left - padding.right), + height: Math.max(0, height - y), + padBottom: padding.bottom, + }; +} + +/** Where message text starts and how wide it may run. */ +function messageText(viewport: Viewport): { x: number; width: number } { + const { width, padding } = viewport; + return { x: padding.left + MESSAGE_INSET, width: width - padding.left - padding.right - 2 * MESSAGE_INSET }; +} + +/** + * The header's title, at the padding suggested for the window's top edge, + * and the rule under it, which spans the window between the side padding. + */ +function drawHeader(image: GrayImage, viewport: Viewport, title: string): void { + const { width, padding } = viewport; + image.drawText(smallFont, padding.left + TITLE_INSET, padding.top, title, 225); + const ruleY = padding.top + HEADER_RULE_Y; + image.drawLine(padding.left, ruleY, width - padding.right - 1, ruleY, 40); +} + /** The "type on the phone" screen shown while a Roam setting is being edited. */ function paintSettingEdit(win: RoamWindow, setting: ConfigSettingString): GrayImage { + const { height, padding } = win.viewport; const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); const step = smallFont.lineHeight + 2; - image.drawText(smallFont, DOC_MARGIN + 2, 6, setting.glassesEditTitle, 225); - image.drawLine(DOC_MARGIN, HEADER_HEIGHT - 4, win.viewportWidth - DOC_MARGIN, HEADER_HEIGHT - 4, 40); - const messageY = HEADER_HEIGHT + 16; - const lines = wrapText(smallFont, "Type the value in the phone app, or use voice input.", win.viewportWidth - DOC_MARGIN * 2 - 24); + drawHeader(image, win.viewport, setting.glassesEditTitle); + const text = messageText(win.viewport); + const messageY = headerBottom(win.viewport) + MESSAGE_DROP; + const lines = wrapText(smallFont, "Type the value in the phone app, or use voice input.", text.width); for (let index = 0; index < lines.length; index++) { - image.drawText(smallFont, DOC_MARGIN + 12, messageY + index * step, lines[index]!, 190); + image.drawText(smallFont, text.x, messageY + index * step, lines[index]!, 190); } // The live value, unmasked so the user can check what they typed. const value = setting.get(); const valueY = messageY + (lines.length + 1) * step; - image.drawText( - smallFont, - DOC_MARGIN + 12, - valueY, - truncateText(smallFont, value || "(empty)", win.viewportWidth - DOC_MARGIN * 2 - 24), - value ? 225 : 130, - ); - image.drawText(smallFont, DOC_MARGIN + 12, win.viewportHeight - smallFont.lineHeight - 12, `${GESTURE_CLICK} done`, 110); + image.drawText(smallFont, text.x, valueY, truncateText(smallFont, value || "(empty)", text.width), value ? 225 : 130); + // The hint line rests on the padding suggested for the window's bottom edge. + image.drawText(smallFont, text.x, height - padding.bottom - smallFont.lineHeight, `${GESTURE_CLICK} done`, 110); return image; } function paintContent(win: RoamWindow): GrayImage { + const { width, padding } = win.viewport; const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); const title = currentRef?.title ?? "Roam"; const status = loading ? "Loading..." : pageMissing ? "(new page)" : ""; const statusWidth = status ? smallFont.measureText(status) + 12 : 0; - image.drawText( - smallFont, - DOC_MARGIN + 2, - 6, - truncateText(smallFont, title, win.viewportWidth - DOC_MARGIN * 2 - statusWidth - 4), - 225, - ); + const titleWidth = width - padding.left - padding.right - statusWidth - 2 * TITLE_INSET; + drawHeader(image, win.viewport, truncateText(smallFont, title, titleWidth)); if (status) { - image.drawText(smallFont, win.viewportWidth - DOC_MARGIN - smallFont.measureText(status), 6, status, 130); + image.drawText(smallFont, width - padding.right - smallFont.measureText(status), padding.top, status, 130); } - image.drawLine(DOC_MARGIN, HEADER_HEIGHT - 4, win.viewportWidth - DOC_MARGIN, HEADER_HEIGHT - 4, 40); if (!isRoamConfigured()) { - drawBodyMessage(image, win, "Set the Roam graph name and API token: tap, then hold, for the menu; pick Set graph name and Set API token."); + drawBodyMessage(image, win.viewport, "Set the Roam graph name and API token: tap, then hold, for the menu; pick Set graph name and Set API token."); } else if (errorMessage) { - drawBodyMessage(image, win, `${errorMessage}\n\n${GESTURE_CLICK} retry`); + drawBodyMessage(image, win.viewport, `${errorMessage}\n\n${GESTURE_CLICK} retry`); } else if (currentPage && currentPage.children.length === 0 && !loading) { - drawBodyMessage(image, win, "Nothing here yet. Use voice input to add a todo."); + drawBodyMessage(image, win.viewport, "Nothing here yet. Use voice input to add a todo."); } else { - win.view.paint(image, DOC_MARGIN, HEADER_HEIGHT, win.focused); + const box = documentBox(win.viewport); + win.view.paint(image, box.x, box.y, win.focused); } return image; } -function drawBodyMessage(image: GrayImage, win: RoamWindow, message: string): void { - const lines = wrapText(smallFont, message, win.viewportWidth - DOC_MARGIN * 2 - 24); - let y = HEADER_HEIGHT + 16; - for (const line of lines) { - image.drawText(smallFont, DOC_MARGIN + 12, y, line, 190); +function drawBodyMessage(image: GrayImage, viewport: Viewport, message: string): void { + const text = messageText(viewport); + let y = headerBottom(viewport) + MESSAGE_DROP; + for (const line of wrapText(smallFont, message, text.width)) { + image.drawText(smallFont, text.x, y, line, 190); y += smallFont.lineHeight + 2; } } diff --git a/app/apps/t3code/t3code-app.worker.ts b/app/apps/t3code/t3code-app.worker.ts index ec2697fc..a0f998d3 100644 --- a/app/apps/t3code/t3code-app.worker.ts +++ b/app/apps/t3code/t3code-app.worker.ts @@ -43,6 +43,7 @@ import { drawSubmenuIndicator, submenuItem, type MenuItem } from "../../ui/menu" import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, lineStep, listRowHeight } from "../../ui/metrics"; import { WindowMenu, WindowMenuLayer } from "../../ui/window-menu"; +import type { Viewport } from "../../ui/viewport"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; import type { ToolResult, ToolSpec } from "../../assistant/tool-registry"; import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, type InputEvent } from "../../ui/gestures"; @@ -131,12 +132,27 @@ const VISIT_THROTTLE_MS = 10_000; /** How long a transient status ("Sent", an error) stays in a footer. */ const NOTICE_MS = 6_000; const SETTLED_SHOWN = 25; -const LIST_LEFT = 12; -const LIST_RIGHT = 20; -const TITLE_X = 18; -const TITLE_Y = 10; -const BODY_LEFT = 14; -const BODY_RIGHT = 18; +// Every screen lays out inside the padding suggested for its window's edges +// (viewport.ts); these are offsets from it. +/** + * A list screen's title: how far right of the rows' selection boxes, which + * start at the left padding (so it lines up with their text), and how far + * below the top padding. + */ +const LIST_TITLE_INSET_X = 6; +const LIST_TITLE_OFFSET_Y = 2; +/** Between a title and a status that shares its row. */ +const TITLE_STATUS_GAP = 16; +/** Below a title's line: the gap before the list's first text line, and how far above that line its selection box starts. */ +const LIST_TITLE_GAP = 8; +const LIST_LEAD = 2; +/** A list's scrollbar (Menu.drawScrollbar's bar), hugging the right padding, and the gap the rows keep from it. */ +const LIST_SCROLLBAR_WIDTH = 3; +const LIST_SCROLLBAR_GAP = 10; +/** How far a list's scrollbar track stops short of the rows' span at each end. */ +const LIST_SCROLLBAR_INSET = 2; +/** Between a list and lines of text pinned under it. */ +const LIST_FOOTER_GAP = 6; function font(): UiFont { return getDefaultSmallFont(); @@ -155,8 +171,8 @@ type Screen = type AppWindow = { windowId: string; surfaceId: string; - viewportWidth: number; - viewportHeight: number; + /** The window's size, what its edges touch and their padding, as of the last open or resize message. */ + viewport: Viewport; foreground: boolean; focused: boolean; menu: WindowMenu | null; @@ -365,8 +381,7 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { window = { windowId: message.windowId, surfaceId: message.surfaceId, - viewportWidth: message.viewport.width, - viewportHeight: message.viewport.height, + viewport: message.viewport, foreground: false, focused: false, menu: null, @@ -379,8 +394,9 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { break; case "resize-window": if (!window || window.windowId !== message.windowId) break; - window.viewportWidth = message.viewport.width; - window.viewportHeight = message.viewport.height; + // A new size, or the same size with different edges (so padding): + // either way every screen lays out again. + window.viewport = message.viewport; window.menu?.resize(message.viewport); window.lastSubmittedFingerprint = ""; render(); @@ -760,7 +776,7 @@ function windowMenu(win: AppWindow): WindowMenu { post, title: () => (screen.kind === "thread" ? threadTitle() : APP_TITLE), items: () => menuItems(), - size: { width: win.viewportWidth, height: win.viewportHeight }, + size: win.viewport, paintBase: () => paintContent(win), isFocused: () => win.focused, }); @@ -1886,49 +1902,110 @@ function listStatusLine(): string { return glanceSummary({ needsYou: needs, working }); } +/** + * Paint a list screen's title, and a dim status beside it, inside the + * window's top padding. Returns the title's x (other text on the screen + * lines up with it) and the y of the first text line below it. + */ +function paintListTitle(image: GrayImage, viewport: Viewport, title: string, status: string): { x: number; listTop: number } { + const f = font(); + const { width, padding } = viewport; + const x = padding.left + LIST_TITLE_INSET_X; + const y = padding.top + LIST_TITLE_OFFSET_Y; + image.drawText(f, x, y, title, 220); + if (status) { + const statusX = x + f.measureText(title) + TITLE_STATUS_GAP; + image.drawText(f, statusX, y, truncateText(f, status, width - padding.right - statusX), 150); + } + return { x, listTop: y + lineStep(f) + LIST_TITLE_GAP }; +} + +/** Where a list's scrollbar starts: it hugs the window's right padding. */ +function listScrollbarX(viewport: Viewport): number { + return viewport.width - viewport.padding.right - LIST_SCROLLBAR_WIDTH; +} + +/** Width of a list's rows, from the window's left padding to the scrollbar's gutter. */ +function listRowsWidth(viewport: Viewport): number { + return Math.max(0, listScrollbarX(viewport) - LIST_SCROLLBAR_GAP - viewport.padding.left); +} + +/** + * Paint the list from just above the text line at `listTop` down to the + * window's bottom edge, or to above the text pinned under it at `footerTop`. + * The list scrolls, so at the window's edge it takes that edge's padding + * inside it, after its last row: the row rests clear of a border there, and + * rows scrolled past the end are cut off at the edge itself. + */ +function paintListRows(win: AppWindow, image: GrayImage, menu: Menu, listTop: number, footerTop?: number): void { + const { height, padding } = win.viewport; + const toEdge = footerTop === undefined; + const boxTop = listTop - LIST_LEAD; + const boxBottom = toEdge ? height : footerTop - LIST_FOOTER_GAP; + // Where the last row ends once scrolled to it. + const rowsBottom = toEdge ? height - padding.bottom : boxBottom; + menu.paint( + image, + { x: padding.left, y: boxTop, width: listRowsWidth(win.viewport), height: Math.max(0, boxBottom - boxTop), padBottom: toEdge ? padding.bottom : 0 }, + win.focused, + ); + const trackTop = boxTop + LIST_SCROLLBAR_INSET; + menu.drawScrollbar(image, listScrollbarX(win.viewport), trackTop, Math.max(0, rowsBottom - LIST_SCROLLBAR_INSET - trackTop)); +} + function paintList(win: AppWindow, mode: "list" | "environments"): GrayImage { - const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); + const { width, height, padding } = win.viewport; + const image = new GrayImage(width, height, 0); const f = font(); const step = lineStep(f); const title = mode === "environments" ? "T3 Code - Environments" : APP_TITLE; - image.drawText(f, TITLE_X, TITLE_Y, title, 220); const status = mode === "list" ? listStatusLine() : notice?.text ?? ""; - if (status) { - const statusX = TITLE_X + f.measureText(title) + 16; - image.drawText(f, statusX, TITLE_Y, truncateText(f, status, win.viewportWidth - statusX - 14), 150); - } - let listTop = TITLE_Y + step + 8; + const header = paintListTitle(image, win.viewport, title, status); + let listTop = header.listTop; if (mode === "list" && clients.size === 0) { const help = wrapText( f, "Run `t3 pair` on the computer running T3 Code (serve it on your network with `t3 serve --host 0.0.0.0`, or use Tailscale), then pick Pair below and paste the link into the phone app.", - win.viewportWidth - TITLE_X * 2, + width - padding.right - header.x, ); - help.forEach((line, index) => image.drawText(f, TITLE_X, listTop + index * step, line, 160)); + help.forEach((line, index) => image.drawText(f, header.x, listTop + index * step, line, 160)); listTop += help.length * step + 8; } const items = mode === "environments" ? environmentItems() : listItems(); const menu = list(); menu.setItems(items, selectionIndex(items)); listSelectionKey = menu.selectedItem?.key ?? listSelectionKey; - const listHeight = win.viewportHeight - 6 - listTop; - menu.paint(image, { x: LIST_LEFT, y: listTop - 2, width: win.viewportWidth - LIST_LEFT - LIST_RIGHT, height: listHeight }, win.focused); - menu.drawScrollbar(image, win.viewportWidth - 10, listTop, listHeight - 4); + paintListRows(win, image, menu, listTop); return image; } -const THREAD_HEADER_HEIGHT = 28; +/** The thread screen's header, below its title's top: the rule under the title, and the transcript's first line. */ +const THREAD_RULE_OFFSET = 18; +const THREAD_BODY_OFFSET = 26; +/** How far the thread screen's text sits inside the ends of its header rule. */ +const THREAD_TEXT_INSET = 2; +/** The transcript's scrollbar, hugging the window's right padding, and the gap the header rule keeps from it. */ +const THREAD_SCROLLBAR_WIDTH = 2; +const THREAD_SCROLLBAR_GAP = 8; +/** Between the transcript and the footer under it. */ +const THREAD_FOOTER_GAP = 4; +/** The transcript's top: its header stays put above it, inside the window's top padding. */ function threadBodyTop(): number { - return THREAD_HEADER_HEIGHT + 4; + return (window?.viewport.padding.top ?? 0) + THREAD_BODY_OFFSET; } -/** Body height above the footer (hint line, plus a plan line when there is one). */ +/** + * Body height above the footer (hint line, plus a plan line when there is + * one), whose last line rests on the window's bottom padding. + */ function threadBodyHeight(): number { if (!window) return 0; - const step = lineStep(font()); + const f = font(); + const { height, padding } = window.viewport; const footerLines = threadView?.handle.model.todoList() && currentShellThread() && threadStatus(currentShellThread()!) === "working" ? 2 : 1; - return window.viewportHeight - threadBodyTop() - footerLines * step - 8; + const footerTop = height - padding.bottom - f.lineHeight - (footerLines - 1) * lineStep(f); + return footerTop - THREAD_FOOTER_GAP - threadBodyTop(); } function threadFooterHint(): { text: string; value: number } { @@ -1948,18 +2025,28 @@ function threadFooterHint(): { text: string; value: number } { } function paintThread(win: AppWindow): GrayImage { - const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); + const { width: windowWidth, height, padding } = win.viewport; + const image = new GrayImage(windowWidth, height, 0); const view = threadView; const f = font(); const step = lineStep(f); - const width = win.viewportWidth - BODY_LEFT - BODY_RIGHT; + // The header rule runs from the window's left padding to the gutter kept + // for the scrollbar, which hugs the right padding; text sits just inside + // the rule's ends. + const scrollbarX = windowWidth - padding.right - THREAD_SCROLLBAR_WIDTH; + const ruleLeft = padding.left; + const ruleRight = scrollbarX - THREAD_SCROLLBAR_GAP; + const left = ruleLeft + THREAD_TEXT_INSET; + const right = ruleRight - THREAD_TEXT_INSET; + const width = Math.max(0, right - left); if (!view) return image; const shell = currentShellThread(); const status = shell ? threadStatusLabel(threadStatus(shell)) : ""; const statusWidth = status ? f.measureText(status) + 12 : 0; - image.drawText(f, BODY_LEFT, 6, truncateText(f, threadTitle(), width - statusWidth), 225); - if (status) image.drawText(f, win.viewportWidth - BODY_RIGHT - f.measureText(status), 6, status, 150); - image.drawLine(BODY_LEFT - 2, THREAD_HEADER_HEIGHT - 4, win.viewportWidth - BODY_RIGHT + 2, THREAD_HEADER_HEIGHT - 4, 40); + const titleY = padding.top; + image.drawText(f, left, titleY, truncateText(f, threadTitle(), width - statusWidth), 225); + if (status) image.drawText(f, right - f.measureText(status), titleY, status, 150); + image.drawLine(ruleLeft, titleY + THREAD_RULE_OFFSET, ruleRight, titleY + THREAD_RULE_OFFSET, 40); const model = view.handle.model; const bodyTop = threadBodyTop(); @@ -1967,9 +2054,9 @@ function paintThread(win: AppWindow): GrayImage { const visible = Math.max(1, Math.floor(bodyHeight / step)); if (model.sequence === null) { const client = clients.get(view.envId); - image.drawText(f, BODY_LEFT, bodyTop, client?.ready ? "Loading…" : client?.status || "Not connected", 150); + image.drawText(f, left, bodyTop, client?.ready ? "Loading…" : client?.status || "Not connected", 150); } else if (model.deleted) { - image.drawText(f, BODY_LEFT, bodyTop, "This thread was deleted.", 150); + image.drawText(f, left, bodyTop, "This thread was deleted.", 150); } else { const lines = view.layout.layout(timelineEntries(model), f, width); if (model.hasMoreHistory) lines.unshift({ text: "(earlier messages on the computer)", value: 90, indent: 0 }, { text: "", value: 0, indent: 0 }); @@ -1978,21 +2065,22 @@ function paintThread(win: AppWindow): GrayImage { const first = view.firstLine ?? view.maxFirstLine; for (let row = 0; row < visible; row++) { const line = lines[first + row]; - if (line?.text) image.drawText(f, BODY_LEFT + line.indent, bodyTop + row * step, line.text, line.value); + if (line?.text) image.drawText(f, left + line.indent, bodyTop + row * step, line.text, line.value); } if (view.maxFirstLine > 0) { const track = visible * step; const thumb = Math.max(8, Math.floor((track * visible) / lines.length)); - image.fillRect(win.viewportWidth - 8, bodyTop + Math.floor(((track - thumb) * first) / view.maxFirstLine), 2, thumb, 110); + image.fillRect(scrollbarX, bodyTop + Math.floor(((track - thumb) * first) / view.maxFirstLine), THREAD_SCROLLBAR_WIDTH, thumb, 110); } } - // Footer: the agent's plan progress while it works, then the hint/status line. - let footerY = win.viewportHeight - step - 4; + // Footer: the agent's plan progress while it works, then the hint/status + // line, resting on the window's bottom padding. + let footerY = height - padding.bottom - f.lineHeight; const hint = threadFooterHint(); if (hint.text) { const text = truncateText(f, hint.text, width); - image.drawText(f, win.viewportWidth - BODY_RIGHT - f.measureText(text), footerY, text, hint.value); + image.drawText(f, right - f.measureText(text), footerY, text, hint.value); } const todo = model.todoList(); if (todo && shell && threadStatus(shell) === "working") { @@ -2001,28 +2089,38 @@ function paintThread(win: AppWindow): GrayImage { const done = steps.filter((entry) => entry.status === "completed").length; const current = steps.find((entry) => entry.status === "running") ?? steps.find((entry) => entry.status === "pending"); const text = `Plan ${done}/${steps.length}${current ? ` · ${plainMarkdown(current.text)}` : ""}`; - image.drawText(f, BODY_LEFT, footerY, truncateText(f, text, width), 160); + image.drawText(f, left, footerY, truncateText(f, text, width), 160); } return image; } +/** + * A screen of text: a title, paragraphs wrapped to the window, and a hint + * line. With no rows to line up with, the text sits right at the window's + * padding on every side. + */ function paintMessageScreen(win: AppWindow, title: string, paragraphs: Array<{ text: string; value: number }>, footer: string): GrayImage { - const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); + const { width: windowWidth, height, padding } = win.viewport; + const image = new GrayImage(windowWidth, height, 0); const f = font(); const step = lineStep(f); - const width = win.viewportWidth - TITLE_X * 2; - image.drawText(f, TITLE_X, TITLE_Y, title, 220); - let y = TITLE_Y + step + 10; + const x = padding.left; + const width = windowWidth - padding.left - padding.right; + image.drawText(f, x, padding.top, title, 220); + let y = padding.top + step + 10; + const footerY = height - padding.bottom - f.lineHeight; + // Paragraph lines stop above the hint line, or at the bottom padding when there is none. + const bodyBottom = footer ? footerY : height - padding.bottom; for (const paragraph of paragraphs) { if (!paragraph.text) continue; for (const line of wrapText(f, paragraph.text, width)) { - if (y > win.viewportHeight - 2 * step) break; - image.drawText(f, TITLE_X, y, line, paragraph.value); + if (y + f.lineHeight > bodyBottom) break; + image.drawText(f, x, y, line, paragraph.value); y += step; } y += 6; } - if (footer) image.drawText(f, TITLE_X, win.viewportHeight - step - 6, footer, 110); + if (footer) image.drawText(f, x, footerY, footer, 110); return image; } @@ -2050,32 +2148,26 @@ function paintPair(win: AppWindow): GrayImage { function paintCompose(win: AppWindow): GrayImage { const target = composeTarget(); if (!target) return paintMessageScreen(win, "New thread", [{ text: "That project is no longer available.", value: 170 }], ""); - const image = new GrayImage(win.viewportWidth, win.viewportHeight, 0); + const { width, height, padding } = win.viewport; + const image = new GrayImage(width, height, 0); const f = font(); const step = lineStep(f); - const title = "New thread"; - image.drawText(f, TITLE_X, TITLE_Y, title, 220); - const status = busyText || notice?.text || ""; - if (status) { - const statusX = TITLE_X + f.measureText(title) + 16; - image.drawText(f, statusX, TITLE_Y, truncateText(f, status, win.viewportWidth - statusX - 14), 150); - } - // Below the list: an error, or why nothing can start here. + const header = paintListTitle(image, win.viewport, "New thread", busyText || notice?.text || ""); + // Below the list: an error, or why nothing can start here. Its lines stay + // put, the last resting on the window's bottom padding, and the list ends + // above them. const resolved = composeResolved(target); const problem = screenError || (resolved.model ? "" : (resolved.blocker ?? "")); - const problemLines = problem ? wrapText(f, problem, win.viewportWidth - TITLE_X * 2).slice(0, 3) : []; - const listTop = TITLE_Y + step + 8; - const listWidth = win.viewportWidth - LIST_LEFT - LIST_RIGHT; - const listHeight = win.viewportHeight - 6 - listTop - (problemLines.length ? problemLines.length * step + 6 : 0); + const problemLines = problem ? wrapText(f, problem, width - padding.right - header.x).slice(0, 3) : []; + const problemTop = height - padding.bottom - f.lineHeight - (problemLines.length - 1) * step; const items = composeItems(); const widest = Math.max(0, ...items.filter((item) => item.kind === "field").map((item) => f.measureText(item.label))); - composeValueColumn = Math.min(widest + 16, Math.floor(listWidth * 0.4)); + composeValueColumn = Math.min(widest + 16, Math.floor(listRowsWidth(win.viewport) * 0.4)); const menu = list(); menu.setItems(items, selectionIndex(items)); composeSelectionKey = menu.selectedItem?.key ?? composeSelectionKey; - menu.paint(image, { x: LIST_LEFT, y: listTop - 2, width: listWidth, height: listHeight }, win.focused); - menu.drawScrollbar(image, win.viewportWidth - 10, listTop, listHeight - 4); - problemLines.forEach((line, index) => image.drawText(f, TITLE_X, listTop + listHeight + 4 + index * step, line, 230)); + paintListRows(win, image, menu, header.listTop, problemLines.length ? problemTop : undefined); + problemLines.forEach((line, index) => image.drawText(f, header.x, problemTop + index * step, line, 230)); return image; } diff --git a/app/apps/teleprompter/reader.ts b/app/apps/teleprompter/reader.ts index a3c39205..3c20da16 100644 --- a/app/apps/teleprompter/reader.ts +++ b/app/apps/teleprompter/reader.ts @@ -9,8 +9,6 @@ import { lineStep } from "../../ui/metrics"; import { clamp } from "../../util/numeric-util"; import { ScriptTracker, tokenizeScript, type TokenizedScript } from "./script-tracker"; -const MARGIN_X = 18; -const BODY_TOP = 6; /** Gap between the last body line and the footer. */ const FOOTER_GAP = 4; /** Lines per ring scroll tick. */ @@ -41,6 +39,11 @@ export type ReaderHooks = { * and re-anchor the tracker to what is now at the anchor row, so scrolling * doubles as "I'm here now". Click pauses/resumes tracking; double-click * goes back to the file list. + * + * The script's column and the footer line keep inside the padding suggested + * for the window's edges. The lines scroll, so they run from the window's + * top edge itself: only the script's first line keeps that edge's padding + * above it. */ export class TeleprompterReaderLayer implements Layer { private readonly script: TokenizedScript; @@ -116,13 +119,18 @@ export class TeleprompterReaderLayer implements Layer { const font = getDefaultMediumFont(); const smallFont = getDefaultSmallFont(); const step = lineStep(font); - const { width, height } = ctx.stack.getBaseSize(); + const { width, height, padding } = ctx.stack.getBaseSize(); const image = new GrayImage(width, height, 0); + const bodyX = padding.left; + const bodyWidth = Math.max(0, width - padding.left - padding.right); - const footerY = height - smallFont.lineHeight - 4; - this.visibleRows = Math.max(1, Math.floor((footerY - FOOTER_GAP - BODY_TOP) / step)); + const footerY = height - padding.bottom - smallFont.lineHeight; + const bodyBottom = footerY - FOOTER_GAP; + // Rows that fit wherever the script is scrolled to, which is what + // scrolling and the anchor row go by. + this.visibleRows = Math.max(1, Math.floor((bodyBottom - padding.top) / step)); this.anchorRow = Math.floor(this.visibleRows / 3); - const lines = this.layout(font, width - 2 * MARGIN_X); + const lines = this.layout(font, bodyWidth); if (this.autoScrollPending) { this.autoScrollPending = false; @@ -133,20 +141,24 @@ export class TeleprompterReaderLayer implements Layer { const position = this.tracker.position; const nextToken = position < this.script.words.length ? this.script.wordTokens[position]! : this.script.tokens.length; - const lastLine = Math.min(lines.length, this.firstLine + this.visibleRows); + // Scrolled past the script's start, the lines begin at the window's top + // edge and the top padding's room may hold one more of them. + const bodyTop = this.firstLine === 0 ? padding.top : 0; + const shownRows = Math.max(1, Math.floor((bodyBottom - bodyTop) / step)); + const lastLine = Math.min(lines.length, this.firstLine + shownRows); for (let lineIndex = this.firstLine; lineIndex < lastLine; lineIndex++) { - const y = BODY_TOP + (lineIndex - this.firstLine) * step; + const y = bodyTop + (lineIndex - this.firstLine) * step; for (const span of lines[lineIndex]!.spans) { const isNext = span.tokenIndex === nextToken; const value = isNext ? NEXT_VALUE : span.tokenIndex < nextToken ? PAST_VALUE : UPCOMING_VALUE; - image.drawText(font, MARGIN_X + span.x, y, span.text, value); + image.drawText(font, bodyX + span.x, y, span.text, value); if (isNext) { - image.fillRect(MARGIN_X + span.x, y + font.lineHeight - 2, span.width, 2, NEXT_VALUE); + image.fillRect(bodyX + span.x, y + font.lineHeight - 2, span.width, 2, NEXT_VALUE); } } } - this.paintFooter(image, smallFont, width, footerY); + this.paintFooter(image, smallFont, bodyX, bodyWidth, footerY); return image; } @@ -169,15 +181,16 @@ export class TeleprompterReaderLayer implements Layer { } } - private paintFooter(image: GrayImage, font: UiFont, width: number, y: number): void { + /** The footer line across [x, x + width): the script's name at its left, status and progress at its right. */ + private paintFooter(image: GrayImage, font: UiFont, x: number, width: number, y: number): void { const total = this.script.words.length; const percent = total === 0 ? 0 : Math.round((100 * this.tracker.position) / total); const right = `${this.tracking ? this.status || "Listening" : "Paused"} ${percent}%`; const rightWidth = font.measureText(right); - image.drawText(font, width - MARGIN_X - rightWidth, y, right, 110); - const titleMax = width - 2 * MARGIN_X - rightWidth - 12; + image.drawText(font, x + width - rightWidth, y, right, 110); + const titleMax = width - rightWidth - 12; if (titleMax > 20) { - image.drawText(font, MARGIN_X, y, truncateText(font, this.title, titleMax), 110); + image.drawText(font, x, y, truncateText(font, this.title, titleMax), 110); } } diff --git a/app/apps/teleprompter/teleprompter-app.ts b/app/apps/teleprompter/teleprompter-app.ts index c615297b..ee9f8150 100644 --- a/app/apps/teleprompter/teleprompter-app.ts +++ b/app/apps/teleprompter/teleprompter-app.ts @@ -4,7 +4,6 @@ import { readTextFile, type DirectoryEntry } from "../../native/file-access"; import { LIST_ROW_TEXT_INSET } from "../../ui/metrics"; import { MenuLayer, type MenuItem } from "../../ui/menu"; import { type Layer, type LayerContext } from "../../ui/layers"; -import { appViewportSize } from "../../ui/shell/geometry"; import { createInProcessWindow, YieldAtRootLayer, @@ -28,15 +27,7 @@ export const TELEPROMPTER_SURFACE_ID = "window:teleprompter"; const SCRIPT_FILE = /\.(txt|md|markdown|text|log)$/i; -const HOME_LAYOUT = { - x: 8, - y: 8, - width: 272, - showBorder: false, - minHeight: 0, - maxHeight: appViewportSize("min").height - 16, - opaque: true, -}; +const HOME_LAYOUT = { page: true, width: 248 } as const; export type TeleprompterAppOptions = InProcessAppOptions & { /** Hold continuous mic capture while a script is being tracked. */ diff --git a/app/apps/terminal/hub-header.ts b/app/apps/terminal/hub-header.ts index c3fbbe7a..b3eefd3f 100644 --- a/app/apps/terminal/hub-header.ts +++ b/app/apps/terminal/hub-header.ts @@ -1,14 +1,41 @@ import { wrapText, type WrapFont } from '../../graphics/textwrap'; +import type { Edges } from '../../ui/viewport'; -/** Left edge of the hub's title line (and of a wrapped status block under it). */ -export const HUB_TITLE_X = 12; +/** + * Where the hub's title line (and a wrapped status block under it) starts, + * right of the window's left padding: the list's selection boxes start at + * the padding and unindented row text sits this far inside its box, so the + * title lines up with it. + */ +export const HUB_TITLE_INSET_X = 6; +/** The title line's top, below the window's top padding. */ +const HUB_TITLE_OFFSET_Y = 2; +/** Between the title and a status that shares its row. */ +const HUB_STATUS_GAP = 16; +/** Between the header's last line and the list's first text line. */ +const HUB_LIST_GAP = 6; -/** Keep short status on the title row; give long errors their full width. */ -export function layoutHubHeader(font: WrapFont, title: string, status: string, width: number, step: number) { - const inlineX = HUB_TITLE_X + font.measureText(title) + 16; - const inline = !/[\r\n]/.test(status) && font.measureText(status) <= Math.max(0, width - inlineX - 12); - const lines = inline ? [status] : wrapText(font, status, Math.max(1, width - HUB_TITLE_X - 12)); - const x = inline ? inlineX : HUB_TITLE_X; - const y = inline ? 10 : 10 + step; - return { x, y, lines, listTop: inline ? 16 + step : 16 + step * (1 + lines.length) }; +/** + * Lay the hub's header out in a window `width` wide with the suggested + * `padding` (viewport.ts): the title inside the top and left padding, the + * status ending at the right padding. Keep short status on the title row; + * give long errors their full width. + */ +export function layoutHubHeader( + font: WrapFont, + title: string, + status: string, + viewport: { width: number; padding: Edges }, + step: number, +) { + const { width, padding } = viewport; + const titleX = padding.left + HUB_TITLE_INSET_X; + const titleY = padding.top + HUB_TITLE_OFFSET_Y; + const right = width - padding.right; + const inlineX = titleX + font.measureText(title) + HUB_STATUS_GAP; + const inline = !/[\r\n]/.test(status) && font.measureText(status) <= Math.max(0, right - inlineX); + const lines = inline ? [status] : wrapText(font, status, Math.max(1, right - titleX)); + const x = inline ? inlineX : titleX; + const y = inline ? titleY : titleY + step; + return { titleX, titleY, x, y, lines, listTop: titleY + HUB_LIST_GAP + step * (inline ? 1 : 1 + lines.length) }; } diff --git a/app/apps/terminal/terminal-app.worker.ts b/app/apps/terminal/terminal-app.worker.ts index 0f32c5d3..622c3aea 100644 --- a/app/apps/terminal/terminal-app.worker.ts +++ b/app/apps/terminal/terminal-app.worker.ts @@ -45,7 +45,7 @@ import { GrayImage, type UiFont } from "../../graphics/image"; import { flattenPlanesWithDraws, planesFingerprint, type Plane } from "../../graphics/plane"; import { prepareFrameDraws } from "../../graphics/glyph-wire"; import { getDefaultSmallFont, getTerminalFontConfig } from "../../graphics/ui-fonts"; -import { HUB_TITLE_X, layoutHubHeader } from "./hub-header"; +import { HUB_TITLE_INSET_X, layoutHubHeader } from "./hub-header"; import { TERMINAL_ICON_GLYPHS, type IconActivity } from "../../graphics/icons"; import { drawSessionRow, @@ -76,6 +76,7 @@ import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { centeredTextY, lineStep, listRowHeight, textInkHeight } from "../../ui/metrics"; import { WindowMenu, WindowMenuLayer } from "../../ui/window-menu"; import { appViewportSize, type WindowHeightMode } from "../../ui/shell/geometry"; +import type { EdgeKind, Edges, Viewport } from "../../ui/viewport"; import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window"; import type { ToolResult, ToolSpec } from "../../assistant/tool-registry"; @@ -123,6 +124,13 @@ type BaseWindow = { /** Content viewport from the shell's open-window message; grid = viewport / cell. */ viewportWidth: number; viewportHeight: number; + /** + * What the viewport's edges touch and the padding suggested for them + * (viewport.ts), as of the last open or resize message. The hub's pages lay + * out inside the padding; a session's grid fills the window regardless. + */ + edges: Edges; + padding: Edges; gridCols: number; gridRows: number; foreground: boolean; @@ -216,8 +224,6 @@ type PendingView = { options: G2MirrorClientOptions; }; -type Viewport = { width: number; height: number }; - const windows = new Map(); const pendingViews = new Map(); // Windows waiting on the shell's answer to a set-height-mode, by window id: @@ -364,11 +370,22 @@ global.onmessage = (event: { data: WorkerAppMessage }) => { break; } const window = windows.get(message.windowId); - if (!window || (window.viewportWidth === message.viewport.width && window.viewportHeight === message.viewport.height)) break; + if (!window) break; + const resized = window.viewportWidth !== message.viewport.width || window.viewportHeight !== message.viewport.height; window.viewportWidth = message.viewport.width; window.viewportHeight = message.viewport.height; + window.edges = message.viewport.edges; + window.padding = message.viewport.padding; window.menu?.resize(message.viewport); - window.lastSubmittedFingerprint = ""; + // A resize at the same size says what the window's edges touch has + // changed. The hub's pages move with their padding; a session's grid + // does not, so it keeps its connection, and only a menu page open over + // it (which lays out in the padding) has anything to repaint. + if (window.kind === "view" && !resized) { + if (window.menu?.isOpen()) scheduleRender(window); + break; + } + if (resized) window.lastSubmittedFingerprint = ""; if (window.kind === "view") { window.gridCols = Math.floor(window.viewportWidth / window.cellWidth); window.gridRows = Math.floor(window.viewportHeight / window.cellHeight); @@ -531,7 +548,7 @@ function cancelPendingReconnects(): void { } } -function openWindow(windowId: string, surfaceId: string, title: string, viewport: { width: number; height: number }): void { +function openWindow(windowId: string, surfaceId: string, title: string, viewport: Viewport): void { const pendingView = pendingViews.get(windowId); if (pendingView) { pendingViews.delete(windowId); @@ -548,6 +565,8 @@ function openWindow(windowId: string, surfaceId: string, title: string, viewport title, viewportWidth: viewport.width, viewportHeight: viewport.height, + edges: viewport.edges, + padding: viewport.padding, gridCols: Math.floor(viewport.width / hubCell.cellWidth), gridRows: Math.floor(viewport.height / hubCell.cellHeight), foreground: false, @@ -914,7 +933,7 @@ function createViewWindow( windowId: string, surfaceId: string, title: string, - viewport: { width: number; height: number }, + viewport: Viewport, view: PendingView, ): ViewWindow { const { connectionId, socket, label, glyph } = view; @@ -933,6 +952,8 @@ function createViewWindow( title, viewportWidth: viewport.width, viewportHeight: viewport.height, + edges: viewport.edges, + padding: viewport.padding, gridCols, gridRows, font: cell.font, @@ -1067,7 +1088,7 @@ function windowMenu(window: TerminalWindow): WindowMenu { post, title: () => window.title, items: () => windowMenuItems(window), - size: { width: window.viewportWidth, height: window.viewportHeight }, + size: { width: window.viewportWidth, height: window.viewportHeight, edges: window.edges, padding: window.padding }, paintBase: () => paintContent(window), isFocused: () => window.focused, }); @@ -1308,12 +1329,20 @@ type HubItem = { /** Vertical offset of a row's text line from the top of its selection box. */ const HUB_ROW_TEXT_INSET = 4; -/** Left edge of the list's selection boxes. */ -const HUB_LIST_LEFT = 12; -/** Right inset of the selection boxes, clear of the scrollbar. */ -const HUB_LIST_RIGHT = 20; -/** Left padding of unindented (heading and top-level) row text inside its selection box. */ -const HUB_TOP_LEVEL_TEXT_X = 6; +/** How far the first selection box starts above the list's first text line. */ +const HUB_LIST_LEAD = 2; +/** The list's scrollbar (Menu.drawScrollbar's bar), and the gap the selection boxes keep from it. */ +const HUB_SCROLLBAR_WIDTH = 3; +const HUB_SCROLLBAR_GAP = 10; +/** How far the scrollbar's track stops short of the rows' span at each end. */ +const HUB_SCROLLBAR_INSET = 2; +/** + * Left padding of unindented (heading and top-level) row text inside its + * selection box; the hub's title starts in the same column. + */ +const HUB_TOP_LEVEL_TEXT_X = HUB_TITLE_INSET_X; +/** A page of text's body, indented under its title. */ +const PAGE_BODY_INDENT = 6; /** The hub window's list, created on first use so openWindow stays free of paint dependencies. */ function hubMenu(window: HubWindow): Menu { @@ -1725,6 +1754,8 @@ function returnToHub(view: ViewWindow, then?: () => void): void { if (activeViewId === view.windowId) activeViewId = null; hub.viewportWidth = viewport.width; hub.viewportHeight = viewport.height; + hub.edges = viewport.edges; + hub.padding = viewport.padding; hub.menu?.resize(viewport); const items = hubItems(hub); const row = items.findIndex( @@ -1833,54 +1864,71 @@ function paintHub(window: HubWindow): GrayImage { if (window.mode === "add") { return paintAddConnection(window); } - const image = new GrayImage(window.viewportWidth, window.viewportHeight, 0); + const { viewportWidth: width, viewportHeight: height, padding } = window; + const image = new GrayImage(width, height, 0); const font = chromeFont(); const step = lineStep(font); - // No border box: the shell chrome (top bar + sidebar) already frames the app. - // Long statuses get a wrapped block and move the list below it. + // The header stays put inside the window's top padding, its title in line + // with the rows' text. Long statuses get a wrapped block and move the list + // below it. const title = window.mode === "connections" ? "Terminal - Connections" : "Terminal"; - image.drawText(font, HUB_TITLE_X, 10, title, 220); - const header = layoutHubHeader(font, title, hubStatusLine(window), window.viewportWidth, step); + const header = layoutHubHeader(font, title, hubStatusLine(window), { width, padding }, step); + image.drawText(font, header.titleX, header.titleY, title, 220); header.lines.forEach((line, index) => image.drawText(font, header.x, header.y + index * step, line, 170)); let listTop = header.listTop; if (window.mode === "sessions" && controls.size === 0) { - image.drawText(font, HUB_TITLE_X + 6, listTop, "Add a g2mirror:// connection to get started, see:", 150); - image.drawText(font, HUB_TITLE_X + 6, listTop + step, "https://github.com/jimrandomh/g2mirror", 190); + image.drawText(font, header.titleX, listTop, "Add a g2mirror:// connection to get started, see:", 150); + image.drawText(font, header.titleX, listTop + step, "https://github.com/jimrandomh/g2mirror", 190); listTop += 2 * step + 6; } const list = hubMenu(window); list.setItems(hubItems(window)); - // Selection boxes start above the text line; the menu fills the selected - // box only while this window has focus (an outline alone means the sidebar - // owns input), matching the shell convention. - const listHeight = window.viewportHeight - 6 - listTop; + // Selection boxes start at the left padding, above the text line; the menu + // fills the selected box only while this window has focus (an outline alone + // means the sidebar owns input), matching the shell convention. The list + // scrolls, so under the header it runs to the window's bottom edge with + // that edge's padding inside it, after the last row: rows scrolled past the + // end are cut off at the edge itself. The scrollbar hugs the right padding. + const boxTop = listTop - HUB_LIST_LEAD; + const scrollbarX = width - padding.right - HUB_SCROLLBAR_WIDTH; list.paint( image, - { x: HUB_LIST_LEFT, y: listTop - 2, width: window.viewportWidth - HUB_LIST_LEFT - HUB_LIST_RIGHT, height: listHeight }, + { + x: padding.left, + y: boxTop, + width: Math.max(0, scrollbarX - HUB_SCROLLBAR_GAP - padding.left), + height: Math.max(0, height - boxTop), + padBottom: padding.bottom, + }, window.focused, ); - list.drawScrollbar(image, window.viewportWidth - 10, listTop, listHeight - 4); + const trackTop = boxTop + HUB_SCROLLBAR_INSET; + list.drawScrollbar(image, scrollbarX, trackTop, Math.max(0, height - padding.bottom - HUB_SCROLLBAR_INSET - trackTop)); return image; } function paintAddConnection(window: HubWindow): GrayImage { - const image = new GrayImage(window.viewportWidth, window.viewportHeight, 0); + const { viewportWidth: width, viewportHeight: height, padding } = window; + const image = new GrayImage(width, height, 0); const font = chromeFont(); const step = lineStep(font); - image.drawText(font, 18, 10, "Add connection", 220); - const instructionsY = 20 + step; - image.drawText(font, 24, instructionsY, "Type the g2mirror://token@host string in the", 170); - image.drawText(font, 24, instructionsY + step, "phone app (or use voice input from the menu).", 170); + // A page of text: its title sits at the window's top and left padding, the + // body indented under it, and the hint line on the bottom padding. + image.drawText(font, padding.left, padding.top, "Add connection", 220); + const bodyX = padding.left + PAGE_BODY_INDENT; + const instructionsY = padding.top + 10 + step; + image.drawText(font, bodyX, instructionsY, "Type the g2mirror://token@host string in the", 170); + image.drawText(font, bodyX, instructionsY + step, "phone app (or use voice input from the menu).", 170); const draftY = instructionsY + 3 * step; const draft = terminalNewConnectionSetting.get(); - image.drawText(font, 24, draftY, truncateLabel(draft || "(empty)", 52), 220); + image.drawText(font, bodyX, draftY, truncateLabel(draft || "(empty)", 52), 220); if (window.addError) { - image.drawText(font, 24, draftY + step + 6, window.addError, 150); + image.drawText(font, bodyX, draftY + step + 6, window.addError, 150); } - image.drawText(font, 24, window.viewportHeight - font.lineHeight - 12, `click save ${GESTURE_DOUBLE_CLICK} cancel`, 110); + image.drawText(font, bodyX, height - padding.bottom - font.lineHeight, `click save ${GESTURE_DOUBLE_CLICK} cancel`, 110); return image; } diff --git a/app/apps/timer/timer-app.ts b/app/apps/timer/timer-app.ts index bd9f0293..94729fa5 100644 --- a/app/apps/timer/timer-app.ts +++ b/app/apps/timer/timer-app.ts @@ -40,6 +40,7 @@ import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { LIST_ROW_TEXT_INSET, lineStep, listRowHeight } from "../../ui/metrics"; import { createInProcessWindow, type InProcessAppOptions, type InProcessWindow } from "../../ui/shell/in-process-window"; import { shell, type TrayWidget } from "../../ui/shell/shell"; +import type { Viewport } from "../../ui/viewport"; import { WindowMenuLayer } from "../../ui/window-menu"; import { clamp } from "../../util/numeric-util"; import { @@ -85,16 +86,27 @@ import { export const TIMER_WINDOW_ID = "timer"; export const TIMER_SURFACE_ID = "window:timer"; -/** Width of the list column, as a share of the viewport, and its bounds. */ +/** + * Width of the list column (its rows and the scrollbar's gutter), as a share + * of the viewport's width inside its side padding, and its bounds. + */ const LIST_SHARE = 0.4; const LIST_MIN_WIDTH = 190; const LIST_MAX_WIDTH = 240; -const LIST_TOP = 6; /** Pixels between consecutive list rows' selection boxes. */ const LIST_ROW_GAP = 1; -const STAGE_X = 10; +/** + * Room the list column keeps right of its rows for the scrollbar, which + * hugs the column's right edge: the gap before it, and its own 3 columns. + */ +const LIST_SCROLLBAR_GAP = 5; +const LIST_SCROLLBAR_GUTTER = LIST_SCROLLBAR_GAP + 3; +/** Gap between the list's divider and its rows. */ +const LIST_DIVIDER_GAP = 7; /** Gap between the stage's right edge and the list's divider. */ -const STAGE_LIST_GAP = 14; +const STAGE_LIST_GAP = 18; +/** How far the stage's small-font content is indented from its title, and ends short of the stage's right edge. */ +const STAGE_BODY_INSET = 2; /** Brightness factor for the list while a picker owns the stage. */ const LIST_DIM = 0.4; /** Big-digit sizes tried largest first until the text fits the stage. */ @@ -198,8 +210,8 @@ export class TimersLayer implements Layer { isSelectable: (row) => row.kind !== "header", draw: (args) => this.drawListRow(args), }); - /** Per-paint inputs to drawListRow. */ - private listPaint = { dim: 1, now: 0 }; + /** Per-paint inputs to drawListRow, and the padding the last paint put above the list's first row. */ + private listPaint = { dim: 1, now: 0, padTop: 0 }; private mode: Mode = { kind: "list" }; /** Which of the ringing stage's two buttons is highlighted. */ private ringButton = 0; @@ -247,7 +259,9 @@ export class TimersLayer implements Layer { let index = rows.findIndex((row) => row.key === this.selectionKey); if (index < 0) { // The row went away (a dismissed timer, a deleted alarm): stay in place. - const firstVisibleRow = Math.floor(this.list.scrollTop / listRowHeight(smallFont())); + // Rows start below the list's top padding, which scrolls with them. + const rowsScrolled = Math.max(0, this.list.scrollTop - this.listPaint.padTop) / listRowHeight(smallFont()); + const firstVisibleRow = Math.floor(rowsScrolled); index = clamp(firstVisibleRow, 0, rows.length - 1); while (index < rows.length && rows[index]!.kind === "header") index++; if (index >= rows.length) index = rows.findIndex((row) => row.kind !== "header"); @@ -579,9 +593,7 @@ export class TimersLayer implements Layer { /** A mirror touch: on the list, select the row under it. */ hitTest(x: number, y: number, ctx: LayerContext): boolean { if (this.mode.kind !== "list") return false; - const { width } = ctx.stack.getBaseSize(); - const listX = width - listWidthFor(width); - if (x < listX) return false; + if (x < columnsFor(ctx.stack.getBaseSize()).listX) return false; const rows = this.buildRows(Date.now()); this.syncList(rows); const index = this.list.indexAt(y); @@ -874,18 +886,17 @@ export class TimersLayer implements Layer { paint(ctx: LayerContext): GrayImage { timerEngine.check(); const now = Date.now(); - const { width, height } = ctx.stack.getBaseSize(); + const viewport = ctx.stack.getBaseSize(); + const { width, height, padding } = viewport; const image = new GrayImage(width, height, 0); const rows = this.buildRows(now); const selectedIndex = this.reconcileSelection(rows); - const listWidth = listWidthFor(width); - const listX = width - listWidth; + const { dividerX, stage } = columnsFor(viewport); const picking = this.mode.kind !== "list"; - this.paintList(image, rows, selectedIndex, listX, listWidth, height, ctx.stack.isFocused(), picking ? LIST_DIM : 1, now); - image.drawLine(listX - 7, 8, listX - 7, height - 8, picking ? 20 : 40); + this.paintList(image, rows, selectedIndex, viewport, ctx.stack.isFocused(), picking ? LIST_DIM : 1, now); + image.drawLine(dividerX, padding.top, dividerX, height - padding.bottom, picking ? 20 : 40); - const stage = { x: STAGE_X, y: 0, width: listX - 7 - STAGE_LIST_GAP - STAGE_X, height }; switch (this.mode.kind) { case "dial": this.paintDial(image, stage, this.mode, now); @@ -906,21 +917,23 @@ export class TimersLayer implements Layer { image: GrayImage, rows: Row[], selectedIndex: number, - listX: number, - listWidth: number, - height: number, + viewport: Viewport, focused: boolean, dim: number, now: number, ): void { - const rowHeight = listRowHeight(smallFont()); - const visible = Math.max(1, Math.floor((height - 2 * LIST_TOP) / rowHeight)); - this.listPaint = { dim, now }; + const { height, padding } = viewport; + const { listX, rowsWidth, scrollbarX } = columnsFor(viewport); + this.listPaint = { dim, now, padTop: padding.top }; // While a picker owns the stage the list has no live selection, so no // highlight; drawListRow still brightens the selected row by key. this.list.setItems(rows, dim === 1 ? selectedIndex : null); - this.list.paint(image, { x: listX, y: LIST_TOP, width: listWidth - 12, height: visible * rowHeight - LIST_ROW_GAP }, focused); - this.list.drawScrollbar(image, listX + listWidth - 7, LIST_TOP, visible * rowHeight - 4); + // The list scrolls, so it runs to the window's top and bottom edges, + // with the padding suggested for them inside it (before the first row, + // after the last): rows scrolled past an end are cut off at the edge. + // The scrollbar stays put, so it keeps inside that padding. + this.list.paint(image, { x: listX, y: 0, width: rowsWidth, height, padTop: padding.top, padBottom: padding.bottom }, focused); + this.list.drawScrollbar(image, scrollbarX, padding.top, Math.max(0, height - padding.top - padding.bottom)); } private drawListRow({ image, item: row, x, y, width, height }: MenuDrawArgs): void { @@ -1137,7 +1150,13 @@ export class TimersLayer implements Layer { // --------------------------------------------------------------------------- // Stage layout helpers -type StageRect = { x: number; y: number; width: number; height: number }; +/** + * The stage's box: its title's left edge and top, and the bottom of its + * hints. `centerX` is what its centred content (the big digits, the picker + * fields) centres on: the middle of the stage's column, from the window's + * left edge to the divider, whatever padding the box keeps inside that. + */ +type StageRect = { x: number; y: number; width: number; height: number; centerX: number }; /** * Lays the stage out top to bottom: a title line, the big digits, then @@ -1149,13 +1168,28 @@ class StageBlock { private readonly hintsTop: number; constructor(private readonly rect: StageRect) { - this.cursorY = rect.y + 12; - this.hintsTop = rect.y + rect.height - 10 - lineStep(smallFont()); + this.cursorY = rect.y; + this.hintsTop = rect.y + rect.height - smallFont().lineHeight; + } + + /** The stage's small-font content: its left edge and width. */ + private get bodyX(): number { + return this.rect.x + STAGE_BODY_INSET; + } + + private get bodyWidth(): number { + return this.rect.width - 2 * STAGE_BODY_INSET; + } + + /** Where content `width` wide sits to be centred on the stage's column, kept inside the stage. */ + private centeredX(width: number): number { + const { x, width: stageWidth, centerX } = this.rect; + return clamp(Math.floor(centerX - width / 2), x, Math.max(x, x + stageWidth - width)); } title(image: GrayImage, text: string, value: number): void { const font = mediumFont(); - image.drawText(font, this.rect.x + 4, this.cursorY, truncateText(font, text, this.rect.width - 8), value); + image.drawText(font, this.rect.x, this.cursorY, truncateText(font, text, this.rect.width), value); this.cursorY += font.lineHeight + 10; } @@ -1163,9 +1197,9 @@ class StageBlock { digits(image: GrayImage, text: string, value: number, suffix = ""): void { const suffixFont = mediumFont(); const suffixWidth = suffix ? suffixFont.measureText(suffix) + 10 : 0; - const font = fittingDigitFont(text, this.rect.width - 8 - suffixWidth); + const font = fittingDigitFont(text, this.rect.width - suffixWidth); const textWidth = font.measureText(text); - const x = this.rect.x + Math.max(0, Math.floor((this.rect.width - textWidth - suffixWidth) / 2)); + const x = this.centeredX(textWidth + suffixWidth); image.drawText(font, x, this.cursorY, text, value); if (suffix) { image.drawText(suffixFont, x + textWidth + 10, this.cursorY + font.ascent - suffixFont.ascent, suffix, Math.round(value * 0.8)); @@ -1174,8 +1208,8 @@ class StageBlock { } progress(image: GrayImage, fraction: number, value: number): void { - const x = this.rect.x + 6; - const width = this.rect.width - 12; + const x = this.bodyX; + const width = this.bodyWidth; image.fillRoundedRect(x, this.cursorY, width, 6, 40, 3); const filled = Math.round(width * clamp(fraction, 0, 1)); if (filled > 0) image.fillRoundedRect(x, this.cursorY, Math.max(6, filled), 6, value, 3); @@ -1185,7 +1219,7 @@ class StageBlock { line(image: GrayImage, text: string, value: number): void { if (!text) return; const font = smallFont(); - image.drawText(font, this.rect.x + 6, this.cursorY, truncateText(font, text, this.rect.width - 12), value); + image.drawText(font, this.bodyX, this.cursorY, truncateText(font, text, this.bodyWidth), value); this.cursorY += lineStep(font); } @@ -1197,8 +1231,8 @@ class StageBlock { /** A three-column row (lap table). */ columns(image: GrayImage, font: UiFont, cells: string[], value: number): void { if (this.cursorY + font.lineHeight > this.hintsTop - 4) return; - const x = this.rect.x + 6; - const width = this.rect.width - 12; + const x = this.bodyX; + const width = this.bodyWidth; const columnWidth = Math.floor(width / cells.length); for (let index = 0; index < cells.length; index++) { const text = cells[index]!; @@ -1215,8 +1249,8 @@ class StageBlock { this.line(image, "Once", Math.round(value * 0.7)); return; } - const step = Math.min(26, Math.floor((this.rect.width - 12) / 7)); - const x = this.rect.x + 6; + const step = Math.min(26, Math.floor(this.bodyWidth / 7)); + const x = this.bodyX; for (let index = 0; index < 7; index++) { const on = (mask & DAY_BITS[index]!) !== 0; const letter = DAY_LETTERS[index]!; @@ -1236,7 +1270,7 @@ class StageBlock { const widths = values.map((value) => font.measureText(value) + 2 * padX); const sepWidths = separators.map((separator) => (separator ? sepFont.measureText(separator) + 8 : 6)); const total = widths.reduce((sum, width) => sum + width, 0) + sepWidths.reduce((sum, width) => sum + width, 0); - let x = this.rect.x + Math.max(0, Math.floor((this.rect.width - total) / 2)); + let x = this.centeredX(total); const boxHeight = font.lineHeight + 4; for (let index = 0; index < values.length; index++) { const width = widths[index]!; @@ -1267,10 +1301,10 @@ class StageBlock { const font = smallFont(); const gap = 12; const height = font.lineHeight + 14; - const width = Math.floor((this.rect.width - 12 - gap * (labels.length - 1)) / labels.length); + const width = Math.floor((this.bodyWidth - gap * (labels.length - 1)) / labels.length); const y = Math.max(this.cursorY + 4, this.hintsTop - 10 - height); for (let index = 0; index < labels.length; index++) { - const x = this.rect.x + 6 + index * (width + gap); + const x = this.bodyX + index * (width + gap); const active = index === selected; if (active) { image.fillRoundedRect(x, y, width, height, focused ? 40 : 15, 8); @@ -1285,12 +1319,35 @@ class StageBlock { } hints(image: GrayImage, pairs: Array<[string, string]>): void { - image.drawText(smallFont(), this.rect.x + 6, this.hintsTop, gestureHints(pairs), 110); + image.drawText(smallFont(), this.bodyX, this.hintsTop, gestureHints(pairs), 110); } } -function listWidthFor(viewportWidth: number): number { - return clamp(Math.round(viewportWidth * LIST_SHARE), LIST_MIN_WIDTH, LIST_MAX_WIDTH); +/** + * The screen's columns in a viewport. Fixed content keeps the padding + * suggested for the window's edges: the stage's box sits inside it on the + * left, top and bottom, and the list column (rows, then the scrollbar's + * gutter) ends at it on the right. The divider stands between the two. + */ +function columnsFor(viewport: Viewport): { listX: number; rowsWidth: number; scrollbarX: number; dividerX: number; stage: StageRect } { + const { width, height, padding } = viewport; + const listRight = width - padding.right; + const listWidth = clamp(Math.round((listRight - padding.left) * LIST_SHARE), LIST_MIN_WIDTH, LIST_MAX_WIDTH); + const listX = listRight - listWidth; + const dividerX = listX - LIST_DIVIDER_GAP; + return { + listX, + rowsWidth: listWidth - LIST_SCROLLBAR_GUTTER, + scrollbarX: listRight - LIST_SCROLLBAR_GUTTER + LIST_SCROLLBAR_GAP, + dividerX, + stage: { + x: padding.left, + y: padding.top, + width: Math.max(0, dividerX - STAGE_LIST_GAP - padding.left), + height: Math.max(0, height - padding.top - padding.bottom), + centerX: dividerX / 2, + }, + }; } function drawPauseMark(image: GrayImage, x: number, y: number, value: number): void { diff --git a/app/apps/transcribe/transcribe-app.ts b/app/apps/transcribe/transcribe-app.ts index 900af357..f175e818 100644 --- a/app/apps/transcribe/transcribe-app.ts +++ b/app/apps/transcribe/transcribe-app.ts @@ -1,4 +1,7 @@ -import { imageFromAsciiArt } from "../../graphics/image"; +import { imageFromAsciiArt, type GrayImage } from "../../graphics/image"; +import { voiceControlBridge } from "../../native/voice-control"; +import { saveRecordingSetting, toggleSettingMenuItem } from "../../ui/dashboard-settings"; +import { withRecordingIcon } from "../../ui/listening-header"; import { TranscribeLayer, transcriptTimestamp } from "./transcribe"; import { createInProcessWindow, @@ -13,8 +16,8 @@ export const TRANSCRIBE_SURFACE_ID = "window:transcribe"; const TRAY_ICON_ID = "transcribe"; -// 16x18 microphone glyph for the top-bar tray (also Translate's). -export const MIC_ICON = imageFromAsciiArt( +// 14x15 microphone glyph for the top-bar tray (also Translate's). +const MIC_ICON = imageFromAsciiArt( [ " #### ", " ###### ", @@ -34,6 +37,12 @@ export const MIC_ICON = imageFromAsciiArt( ], { "#": 220 }, ); +const MIC_RECORDING_ICON = withRecordingIcon(MIC_ICON); + +/** The listening apps' tray icon: a microphone, with the recording circle while their audio is saved. */ +export function micTrayIcon(recording: boolean): GrayImage { + return recording ? MIC_RECORDING_ICON : MIC_ICON; +} export type TranscribeAppOptions = InProcessAppOptions & { /** Begin continuous mic capture (kept on while the window is open). */ @@ -59,18 +68,23 @@ export function createTranscribeAppWindow(options: TranscribeAppOptions): InProc closeable: true, actions: options.actions, baseLayer: new YieldAtRootLayer(layer), - menuItems: () => [{ - label: "Save", - onSelect: (ctx) => { - ctx.stack.pop(); - layer.saveTranscript(); + menuItems: () => [ + { + label: "Save", + onSelect: (ctx) => { + ctx.stack.pop(); + layer.saveTranscript(); + }, }, - }], + // The controller starts and stops the recording as the setting changes. + toggleSettingMenuItem(saveRecordingSetting), + ], submitFrame: options.submitFrame, setSurfaceVisible: options.setSurfaceVisible, removeSurface: options.removeSurface, onClosed: () => { layer.onRemoved(); + unsubscribeRecording(); options.stopContinuousVoiceCapture(); shell.setTrayIcon(TRAY_ICON_ID, null); options.onClosed(); @@ -79,7 +93,11 @@ export function createTranscribeAppWindow(options: TranscribeAppOptions): InProc // Wire async state changes to this window's renderer, rather than the // controller action from which the window-specific actions were derived. layer.start(app.requestRender, () => shell.isWindowVisible(TRANSCRIBE_WINDOW_ID)); + const unsubscribeRecording = voiceControlBridge.onRecordingChange(() => { + shell.setTrayIcon(TRAY_ICON_ID, micTrayIcon(voiceControlBridge.recording)); + app.requestRender(); + }); options.startContinuousVoiceCapture({ recordAs: `transcribe-${stamp}` }); - shell.setTrayIcon(TRAY_ICON_ID, MIC_ICON); + shell.setTrayIcon(TRAY_ICON_ID, micTrayIcon(voiceControlBridge.recording)); return app; } diff --git a/app/apps/transcribe/transcribe.ts b/app/apps/transcribe/transcribe.ts index 2fd35a6c..05e1fef7 100644 --- a/app/apps/transcribe/transcribe.ts +++ b/app/apps/transcribe/transcribe.ts @@ -1,12 +1,12 @@ import { GrayImage } from "../../graphics/image"; import { getDefaultSmallFont } from "../../graphics/ui-fonts"; import { lineStep } from "../../ui/metrics"; -import { MicLevelMeter, paintListeningHeader } from "../../ui/listening-header"; +import { MicLevelMeter, paintListeningHeader, RECORDING_FAILED_NOTICE } from "../../ui/listening-header"; import { writeTextToDownloads } from "../../native/file-access"; import { voiceControlBridge } from "../../native/voice-control"; import { Layer, type LayerContext } from "../../ui/layers"; import { type InputEvent } from "../../ui/gestures"; -import { TranscriptModel, TranscriptScroll, wrapTranscribeText } from "./transcript-model"; +import { TranscriptModel, TranscriptScroll, transcriptLayout, wrapTranscribeText } from "./transcript-model"; /** * Live transcription view. Continuous mic capture is owned by the app wrapper @@ -47,26 +47,31 @@ export class TranscribeLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); - const image = new GrayImage(width, height, 0); - const text = this.transcript.text || (this.listening ? "Listening..." : this.detail); - const wrapped = wrapTranscribeText((line) => font.measureText(line), text, width - 64); + const viewport = ctx.stack.getBaseSize(); + const image = new GrayImage(viewport.width, viewport.height, 0); - const bodyTop = paintListeningHeader(image, font, "Transcribe", this.saveNotice || this.status, this.listening ? this.meter : null); + const status = voiceControlBridge.recordingFailed ? RECORDING_FAILED_NOTICE : this.status; + const bodyTop = paintListeningHeader( + image, font, "Transcribe", this.saveNotice || status, this.listening ? this.meter : null, viewport.padding, + voiceControlBridge.recording, + ); const step = lineStep(font) + 2; - const bodyLines = Math.max(1, Math.floor((height - 6 - bodyTop - font.lineHeight) / step) + 1); - const firstLine = this.scroll.layout(wrapped.length, bodyLines); - for (let index = firstLine; index < Math.min(wrapped.length, firstLine + bodyLines); index++) { + const layout = transcriptLayout(viewport, bodyTop, font.lineHeight, step); + const text = this.transcript.text || (this.listening ? "Listening..." : this.detail); + const wrapped = wrapTranscribeText((line) => font.measureText(line), text, layout.textWidth); + + const firstLine = this.scroll.layout(wrapped.length, layout.pageLines); + for (let index = firstLine; index < Math.min(wrapped.length, firstLine + layout.drawnLines); index++) { const y = bodyTop + (index - firstLine) * step; - image.drawText(font, 32, y, wrapped[index]!, 230); + image.drawText(font, layout.textX, y, wrapped[index]!, 230); } - if (wrapped.length > bodyLines) { - const trackHeight = height - bodyTop - 6; - const thumbHeight = Math.max(8, Math.round(trackHeight * bodyLines / wrapped.length)); - const thumbY = bodyTop + Math.round((trackHeight - thumbHeight) * firstLine / (wrapped.length - bodyLines)); - image.fillRect(width - 14, bodyTop, 2, trackHeight, 45); - image.fillRect(width - 14, thumbY, 2, thumbHeight, 140); + if (wrapped.length > layout.pageLines) { + const track = layout.scrollbar; + const thumbHeight = Math.max(8, Math.round(track.height * layout.pageLines / wrapped.length)); + const thumbY = track.y + Math.round((track.height - thumbHeight) * firstLine / (wrapped.length - layout.pageLines)); + image.fillRect(track.x, track.y, track.width, track.height, 45); + image.fillRect(track.x, thumbY, track.width, thumbHeight, 140); } return image; } diff --git a/app/apps/transcribe/transcript-model.ts b/app/apps/transcribe/transcript-model.ts index 8b0e811a..af950a70 100644 --- a/app/apps/transcribe/transcript-model.ts +++ b/app/apps/transcribe/transcript-model.ts @@ -1,3 +1,5 @@ +import type { Viewport } from "../../ui/viewport"; + type TranscriptEvent = { text: string; isFinal: boolean; @@ -54,6 +56,50 @@ export class TranscriptScroll { } } +/** The scrollbar, and the room the transcript's lines leave for it at their right. */ +const SCROLLBAR_WIDTH = 2; +const SCROLLBAR_GUTTER = 8; + +export type TranscriptLayout = { + /** The text column: its left, and the width its lines wrap to. */ + textX: number; + textWidth: number; + /** Lines the view scrolls by: as many as fit above the bottom padding. */ + pageLines: number; + /** Lines to draw from the first one shown: as many as fit above the window's bottom edge. */ + drawnLines: number; + /** The scrollbar's track, for a transcript longer than a page. */ + scrollbar: { x: number; y: number; width: number; height: number }; +}; + +/** + * Where a listening view (Transcribe, Translate) puts its transcript, under + * a fixed header that ends at `top`. The text column starts at the padding + * suggested for the window's left edge (viewport.ts), in line with the + * header's title, and stops short of the right edge's by the scrollbar's + * gutter; the scrollbar stands in that, against the padding. The lines + * scroll, so they run to the window's bottom edge: the view scrolls by the + * lines that fit above that edge's padding, which rests the transcript's + * last line clear of a border there, and while more lines follow it draws + * as many as fit above the edge itself. + */ +export function transcriptLayout(viewport: Viewport, top: number, lineHeight: number, step: number): TranscriptLayout { + const { width, height, padding } = viewport; + const linesAbove = (bottom: number) => Math.max(1, Math.floor((bottom - top - lineHeight) / step) + 1); + return { + textX: padding.left, + textWidth: Math.max(0, width - padding.left - padding.right - SCROLLBAR_GUTTER), + pageLines: linesAbove(height - padding.bottom), + drawnLines: linesAbove(height), + scrollbar: { + x: width - padding.right - SCROLLBAR_WIDTH, + y: top, + width: SCROLLBAR_WIDTH, + height: Math.max(0, height - padding.bottom - top), + }, + }; +} + export function wrapTranscribeText(measure: (text: string) => number, text: string, maxWidth: number): string[] { const lines: string[] = []; for (const paragraph of text.split("\n")) { diff --git a/app/apps/translate/translate-app.ts b/app/apps/translate/translate-app.ts index e57c1af0..5a62698b 100644 --- a/app/apps/translate/translate-app.ts +++ b/app/apps/translate/translate-app.ts @@ -9,11 +9,12 @@ import { translateProviderSetting, translateShowOriginalSetting, } from "./translate-settings"; -import { MIC_ICON } from "../transcribe/transcribe-app"; +import { micTrayIcon } from "../transcribe/transcribe-app"; import { transcriptTimestamp } from "../transcribe/transcribe"; +import { voiceControlBridge } from "../../native/voice-control"; import { type ContinuousCaptureOptions } from "../../ui/layers"; import { openSettingsSubMenu } from "../../ui/dashboard/settings-panel"; -import { enumSettingMenuItem, textSettingMenuItem, toggleSettingMenuItem } from "../../ui/dashboard-settings"; +import { enumSettingMenuItem, saveRecordingSetting, textSettingMenuItem, toggleSettingMenuItem } from "../../ui/dashboard-settings"; import { createInProcessWindow, YieldAtRootLayer, @@ -46,6 +47,11 @@ export type TranslateAppOptions = InProcessAppOptions & { * provider (Translate settings), which a shared capture switches to. */ export function createTranslateAppWindow(options: TranslateAppOptions): InProcessWindow { + // One timestamp per session names both the audio recording and a saved transcript. + const stamp = transcriptTimestamp(); + // Whether the mic tray icon is up (capture was asked for). + let trayIconShown = false; + const syncTrayIcon = () => shell.setTrayIcon(TRAY_ICON_ID, trayIconShown ? micTrayIcon(voiceControlBridge.recording) : null); // Checks the setup and (re)starts capture with the chosen provider and // language: at launch, when either setting changes, and on a tap after a // problem. @@ -53,15 +59,18 @@ export function createTranslateAppWindow(options: TranslateAppOptions): InProces const provider = resolveTranslateProvider(); const problem = !provider ? NO_PROVIDER_PROBLEM : !resolveTranslationModel() ? NO_MODEL_PROBLEM : null; layer.setProblem(problem); - if (!provider || problem) { + trayIconShown = Boolean(provider) && !problem; + if (provider && !problem) { + options.startContinuousVoiceCapture({ + recordAs: `translate-${stamp}`, + transcription: { provider, language: resolveTranslateLanguage() }, + }); + } else { options.stopContinuousVoiceCapture(); - shell.setTrayIcon(TRAY_ICON_ID, null); - return; } - options.startContinuousVoiceCapture({ transcription: { provider, language: resolveTranslateLanguage() } }); - shell.setTrayIcon(TRAY_ICON_ID, MIC_ICON); + syncTrayIcon(); }; - const layer = new TranslateLayer(transcriptTimestamp(), startCapture); + const layer = new TranslateLayer(stamp, startCapture); const app = createInProcessWindow({ appId: "translate", windowId: TRANSLATE_WINDOW_ID, @@ -79,6 +88,8 @@ export function createTranslateAppWindow(options: TranslateAppOptions): InProces layer.saveTranscript(); }, }, + // The controller starts and stops the recording as the setting changes. + toggleSettingMenuItem(saveRecordingSetting), { label: "Translate settings", onSelect: (ctx) => { @@ -98,6 +109,7 @@ export function createTranslateAppWindow(options: TranslateAppOptions): InProces removeSurface: options.removeSurface, onClosed: () => { layer.onRemoved(); + unsubscribeRecording(); options.stopContinuousVoiceCapture(); shell.setTrayIcon(TRAY_ICON_ID, null); options.onClosed(); @@ -106,6 +118,10 @@ export function createTranslateAppWindow(options: TranslateAppOptions): InProces // Wire async state changes to this window's renderer, rather than the // controller action from which the window-specific actions were derived. layer.start(app.requestRender, () => shell.isWindowVisible(TRANSLATE_WINDOW_ID)); + const unsubscribeRecording = voiceControlBridge.onRecordingChange(() => { + syncTrayIcon(); + app.requestRender(); + }); startCapture(); return app; } diff --git a/app/apps/translate/translate.ts b/app/apps/translate/translate.ts index 68fb8334..793e56b9 100644 --- a/app/apps/translate/translate.ts +++ b/app/apps/translate/translate.ts @@ -1,13 +1,13 @@ import { GrayImage } from "../../graphics/image"; import { getDefaultSmallFont } from "../../graphics/ui-fonts"; import { lineStep } from "../../ui/metrics"; -import { MicLevelMeter, paintListeningHeader } from "../../ui/listening-header"; +import { MicLevelMeter, paintListeningHeader, RECORDING_FAILED_NOTICE } from "../../ui/listening-header"; import { writeTextToDownloads } from "../../native/file-access"; import { voiceControlBridge } from "../../native/voice-control"; import { Layer, type LayerContext } from "../../ui/layers"; import { type InputEvent } from "../../ui/gestures"; import { type LlmStreamHandle } from "../../assistant/llm-protocol"; -import { TranscriptScroll, wrapTranscribeText } from "../transcribe/transcript-model"; +import { TranscriptScroll, transcriptLayout, wrapTranscribeText } from "../transcribe/transcript-model"; import { TranslationModel, type TranslationJob, type TranslationLine } from "./translation-model"; import { resolveTranslationModel, streamTranslation } from "./translate-llm"; import { resolveTranslateLanguage, spokenLanguageName, translateShowOriginalSetting } from "./translate-settings"; @@ -72,14 +72,20 @@ export class TranslateLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); - const image = new GrayImage(width, height, 0); + const viewport = ctx.stack.getBaseSize(); + const image = new GrayImage(viewport.width, viewport.height, 0); const measure = (line: string) => font.measureText(line); - const maxWidth = width - 64; - const status = this.problem ? "Setup needed" : this.translationError || this.status; + const status = this.problem + ? "Setup needed" + : voiceControlBridge.recordingFailed ? RECORDING_FAILED_NOTICE : this.translationError || this.status; const meter = this.listening && !this.problem ? this.meter : null; - const bodyTop = paintListeningHeader(image, font, "Translate", this.saveNotice || status, meter); + const bodyTop = paintListeningHeader( + image, font, "Translate", this.saveNotice || status, meter, viewport.padding, voiceControlBridge.recording, + ); + const step = lineStep(font) + 2; + const layout = transcriptLayout(viewport, bodyTop, font.lineHeight, step); + const maxWidth = layout.textWidth; let lines: TranslationLine[]; if (this.problem) { @@ -92,20 +98,18 @@ export class TranslateLayer implements Layer { } } - const step = lineStep(font) + 2; - const bodyLines = Math.max(1, Math.floor((height - 6 - bodyTop - font.lineHeight) / step) + 1); - const firstLine = this.scroll.layout(lines.length, bodyLines); - for (let index = firstLine; index < Math.min(lines.length, firstLine + bodyLines); index++) { + const firstLine = this.scroll.layout(lines.length, layout.pageLines); + for (let index = firstLine; index < Math.min(lines.length, firstLine + layout.drawnLines); index++) { const y = bodyTop + (index - firstLine) * step; - image.drawText(font, 32, y, lines[index]!.text, lines[index]!.gray); + image.drawText(font, layout.textX, y, lines[index]!.text, lines[index]!.gray); } - if (lines.length > bodyLines) { - const trackHeight = height - bodyTop - 6; - const thumbHeight = Math.max(8, Math.round(trackHeight * bodyLines / lines.length)); - const thumbY = bodyTop + Math.round((trackHeight - thumbHeight) * firstLine / (lines.length - bodyLines)); - image.fillRect(width - 14, bodyTop, 2, trackHeight, 45); - image.fillRect(width - 14, thumbY, 2, thumbHeight, 140); + if (lines.length > layout.pageLines) { + const track = layout.scrollbar; + const thumbHeight = Math.max(8, Math.round(track.height * layout.pageLines / lines.length)); + const thumbY = track.y + Math.round((track.height - thumbHeight) * firstLine / (lines.length - layout.pageLines)); + image.fillRect(track.x, track.y, track.width, track.height, 45); + image.fillRect(track.x, thumbY, track.width, thumbHeight, 140); } return image; } diff --git a/app/apps/weather/weather.ts b/app/apps/weather/weather.ts index 156bcb55..78ed84ce 100644 --- a/app/apps/weather/weather.ts +++ b/app/apps/weather/weather.ts @@ -7,29 +7,75 @@ import { type Layer, type LayerContext } from "../../ui/layers"; import { Menu, type MenuDrawArgs } from "../../ui/menu-core"; import { centeredTextY, lineStep, tightRowHeight } from "../../ui/metrics"; import { distanceUnitSetting } from "../../ui/dashboard-settings"; +import type { Viewport } from "../../ui/viewport"; import { renderWeatherIcon } from "./weather-icons"; import { formatTemperature, widestTemperatureSample } from "./temperature-format"; -const PAGE_X = 18; -const HEADER_Y = 8; -const CURRENT_TOP = 34; -/** Minimum x of the description column right of the temperature. */ -const CURRENT_TEXT_X = 112; +/** + * How far the page's text (title, current conditions, forecast names) starts + * right of the forecast rows' selection boxes, which span the padding + * suggested for the window's side edges. + */ +const PAGE_TEXT_INSET = 7; +/** + * The page's fixed parts, down from the title line at the window's top + * padding: the temperature, the description column's first line, the rule + * above the forecast, the forecast's column headings, and its first row's text. + */ +const TEMPERATURE_OFFSET_Y = 34; +const CURRENT_TEXT_OFFSET_Y = 22; +const FORECAST_RULE_OFFSET_Y = 90; +const FORECAST_HEADER_OFFSET_Y = 97; +const FORECAST_OFFSET_Y = 116; +/** Minimum distance of the description column from the page text's left edge. */ +const CURRENT_TEXT_MIN_OFFSET_X = 94; /** The current-conditions icon, left of the temperature. */ const CURRENT_ICON_SIZE = 40; const CURRENT_ICON_GAP = 10; /** Gap between the temperature and the description column. */ const CURRENT_TEXT_GAP = 16; -const FORECAST_HEADER_Y = 105; -const FORECAST_TOP = 124; /** Forecast rows hold a 20px icon; grow with the font past that. */ const FORECAST_MIN_ROW_HEIGHT = 23; /** Gap between forecast columns. */ const FORECAST_COL_GAP = 14; -/** Left edge of the forecast rows' selection boxes. */ -const FORECAST_BOX_X = PAGE_X - 7; /** Pixels between consecutive forecast rows' selection boxes. */ const FORECAST_ROW_GAP = 2; +/** A full-page message: its indent from the page text, and the least it sits below the title line. */ +const MESSAGE_INDENT = 6; +const MESSAGE_MIN_OFFSET_Y = 44; + +/** + * Where the page's parts go in a viewport. The forecast rows' selection + * boxes are the outermost thing toward the window's sides, so they sit at + * the padding suggested there, and the page's text is placed from them. + */ +type PageLayout = { + width: number; + height: number; + /** The forecast rows' selection boxes. */ + boxX: number; + boxWidth: number; + /** The span of the page's text: the title starts at textX, the location name ends at textRight. */ + textX: number; + textRight: number; + /** The title line's top, at the window's top padding. */ + top: number; + /** The window's bottom padding, kept under a footer line and inside the forecast list. */ + padBottom: number; +}; + +function pageLayout({ width, height, padding }: Viewport): PageLayout { + return { + width, + height, + boxX: padding.left, + boxWidth: width - padding.left - padding.right, + textX: padding.left + PAGE_TEXT_INSET, + textRight: width - padding.right - PAGE_TEXT_INSET, + top: padding.top, + padBottom: padding.bottom, + }; +} /** Forecast column x offsets from the row box's left edge. */ type ForecastColumns = { name: number; temp: number; precip: number; summary: number }; @@ -54,26 +100,20 @@ export class WeatherLayer implements Layer { paint(ctx: LayerContext): GrayImage { const font = getDefaultSmallFont(); - const { width, height } = ctx.stack.getBaseSize(); - const image = new GrayImage(width, height, 0); + const page = pageLayout(ctx.stack.getBaseSize()); + const image = new GrayImage(page.width, page.height, 0); const weather = this.state(); - image.drawText(font, PAGE_X, HEADER_Y, "Weather", 225); + image.drawText(font, page.textX, page.top, "Weather", 225); if (weather.locationName) { - image.drawText( - font, - width - PAGE_X - font.measureText(truncateText(font, weather.locationName, 220)), - HEADER_Y, - truncateText(font, weather.locationName, 220), - 150, - ); + const locationName = truncateText(font, weather.locationName, 220); + image.drawText(font, page.textRight - font.measureText(locationName), page.top, locationName, 150); } if (weather.phase === "permission-required") { this.drawMessage( image, font, - width, - height, + page, "Allow approximate location on your phone to get local weather.", `${GESTURE_CLICK} request`, ); @@ -81,16 +121,16 @@ export class WeatherLayer implements Layer { } // A refresh with earlier data in hand keeps showing that data. if ((weather.phase === "locating" || weather.phase === "loading") && !weather.current) { - this.drawMessage(image, font, width, height, weather.status); + this.drawMessage(image, font, page, weather.status); return image; } if (weather.phase === "error") { - this.drawMessage(image, font, width, height, weather.status, `${GESTURE_CLICK} retry`); + this.drawMessage(image, font, page, weather.status, `${GESTURE_CLICK} retry`); return image; } - this.drawCurrent(image, weather, width); - this.drawForecast(image, weather.forecast, ctx, width, height); + this.drawCurrent(image, weather, page); + this.drawForecast(image, weather.forecast, ctx, page); return image; } @@ -111,31 +151,34 @@ export class WeatherLayer implements Layer { } } - private drawCurrent(image: GrayImage, weather: WeatherState, width: number): void { + private drawCurrent(image: GrayImage, weather: WeatherState, page: PageLayout): void { const current = weather.current; if (!current) return; const large = getDefaultLargeFont(); const medium = getDefaultMediumFont(); const small = getDefaultSmallFont(); const temperature = current.temperatureF === null ? "--°" : formatTemperature(current.temperatureF); - const temperatureY = CURRENT_TOP + 8; - let temperatureX = PAGE_X; + const temperatureY = page.top + TEMPERATURE_OFFSET_Y; + let temperatureX = page.textX; if (current.condition) { const icon = renderWeatherIcon(current.condition, current.isDaytime, CURRENT_ICON_SIZE); - if (icon) image.drawImage(icon, PAGE_X, temperatureY + (((large.lineHeight - icon.height) / 2) | 0)); + if (icon) image.drawImage(icon, page.textX, temperatureY + (((large.lineHeight - icon.height) / 2) | 0)); temperatureX += CURRENT_ICON_SIZE + CURRENT_ICON_GAP; } image.drawText(large, temperatureX, temperatureY, temperature, 245); - const textX = Math.max(CURRENT_TEXT_X, temperatureX + Math.ceil(large.measureText(temperature)) + CURRENT_TEXT_GAP); + const textX = Math.max( + page.textX + CURRENT_TEXT_MIN_OFFSET_X, + temperatureX + Math.ceil(large.measureText(temperature)) + CURRENT_TEXT_GAP, + ); // Description / details / source stack compactly from just below the // header line, so at large font sizes they stay clear of the forecast // table instead of running into it. - let cy = 30; + let cy = page.top + CURRENT_TEXT_OFFSET_Y; image.drawText( medium, textX, cy, - truncateText(medium, current.description || "Current conditions", width - textX - PAGE_X), + truncateText(medium, current.description || "Current conditions", page.textRight - textX), 220, ); cy += medium.lineHeight + 2; @@ -153,29 +196,22 @@ export class WeatherLayer implements Layer { const age = current.timestampMs ? formatAge(Date.now() - current.timestampMs) : ""; const updating = weather.phase === "locating" || weather.phase === "loading" ? " · updating" : ""; image.drawText(small, textX, cy, `${source}${age ? ` ${age}` : ""}${updating}`, 105); - image.drawLine(PAGE_X, FORECAST_HEADER_Y - 7, width - PAGE_X, FORECAST_HEADER_Y - 7, 40); + const ruleY = page.top + FORECAST_RULE_OFFSET_Y; + image.drawLine(page.textX, ruleY, page.textRight - 1, ruleY, 40); } private drawForecast( image: GrayImage, forecast: ForecastPeriod[], ctx: LayerContext, - width: number, - height: number, + page: PageLayout, ): void { const font = getDefaultSmallFont(); + const forecastTop = page.top + FORECAST_OFFSET_Y; if (!forecast.length) { - image.drawText(font, PAGE_X, FORECAST_TOP, "No upcoming forecast periods.", 160); + image.drawText(font, page.textX, forecastTop, "No upcoming forecast periods.", 160); return; } - const rowH = forecastRowHeight(font); - // The last row only needs its text line (not a full row pitch of - // clearance below), which usually fits one more row before the bottom. - // The menu only draws rows whose whole selection box fits, so the box - // holds that many rows, cut at the image's bottom edge. - const visibleRows = Math.max(1, 1 + Math.floor((height - FORECAST_TOP - (font.lineHeight + 4)) / rowH)); - const boxTop = FORECAST_TOP - 2; - const boxHeight = Math.min(visibleRows * rowH - FORECAST_ROW_GAP, height - boxTop); // Columns are sized to the widest period name so names ("Wednesday // Night") never truncate; the summary column absorbs what's left. @@ -183,24 +219,30 @@ export class WeatherLayer implements Layer { font.measureText("Upcoming"), ...forecast.map((period) => font.measureText(period.name)), ); - const tempX = PAGE_X + nameWidth + FORECAST_COL_GAP; + const tempX = page.textX + nameWidth + FORECAST_COL_GAP; const precipX = tempX + Math.max(font.measureText("Temp"), font.measureText(widestTemperatureSample())) + FORECAST_COL_GAP; const summaryX = precipX + Math.max(font.measureText("Rain"), font.measureText("100%")) + FORECAST_COL_GAP; - image.drawText(font, PAGE_X, FORECAST_HEADER_Y, "Upcoming", 150); - image.drawText(font, tempX, FORECAST_HEADER_Y, "Temp", 105); - image.drawText(font, precipX, FORECAST_HEADER_Y, "Rain", 105); + const headerY = page.top + FORECAST_HEADER_OFFSET_Y; + image.drawText(font, page.textX, headerY, "Upcoming", 150); + image.drawText(font, tempX, headerY, "Temp", 105); + image.drawText(font, precipX, headerY, "Rain", 105); this.columns = { - name: PAGE_X - FORECAST_BOX_X, - temp: tempX - FORECAST_BOX_X, - precip: precipX - FORECAST_BOX_X, - summary: summaryX - FORECAST_BOX_X, + name: page.textX - page.boxX, + temp: tempX - page.boxX, + precip: precipX - page.boxX, + summary: summaryX - page.boxX, }; this.forecastMenu.setItems(forecast); + // The rows scroll under the fixed column headings, down to the window's + // bottom edge, where a row cut off for scrolling meets the edge; that + // edge's padding goes inside the list, after its last row. + const boxTop = forecastTop - 2; + if (boxTop >= page.height) return; this.forecastMenu.paint( image, - { x: FORECAST_BOX_X, y: boxTop, width: width - 2 * FORECAST_BOX_X, height: boxHeight }, + { x: page.boxX, y: boxTop, width: page.boxWidth, height: page.height - boxTop, padBottom: page.padBottom }, ctx.stack.isFocused(), ); } @@ -213,7 +255,7 @@ export class WeatherLayer implements Layer { image.drawText(font, x + columns.name, textY, period.name, shade); image.drawText(font, x + columns.temp, textY, period.temperatureF === null ? "--" : formatTemperature(period.temperatureF), shade); image.drawText(font, x + columns.precip, textY, period.precipitationPercent === null ? "--" : `${Math.round(period.precipitationPercent)}%`, selected ? 220 : 155); - // The summary stops PAGE_X short of the viewport's right edge, as the name starts PAGE_X in from the left. + // The summary stops as far short of the selection box's right edge as the name starts in from its left. const summaryWidth = width - columns.summary - columns.name; image.drawText(font, x + columns.summary, textY, truncateText(font, period.shortForecast, summaryWidth), selected ? 220 : 165); } @@ -221,18 +263,18 @@ export class WeatherLayer implements Layer { private drawMessage( image: GrayImage, font: UiFont, - width: number, - height: number, + page: PageLayout, message: string, footer?: string, ): void { - const lines = wrapText(font, message, width - 2 * (PAGE_X + 6)); - const top = Math.max(52, Math.round((height - lines.length * 15) / 2) - 8); + const lines = wrapText(font, message, page.textRight - page.textX - 2 * MESSAGE_INDENT); + // Centered in the window, but never up into the title line. + const top = Math.max(page.top + MESSAGE_MIN_OFFSET_Y, Math.round((page.height - lines.length * 15) / 2) - 8); for (let index = 0; index < lines.length; index++) { - image.drawText(font, PAGE_X + 6, top + index * 15, lines[index]!, 185); + image.drawText(font, page.textX + MESSAGE_INDENT, top + index * 15, lines[index]!, 185); } if (footer) { - image.drawText(font, PAGE_X, height - 20, footer, 110); + image.drawText(font, page.textX, page.height - page.padBottom - font.lineHeight, footer, 110); } } } diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts index 729a7200..934be105 100644 --- a/app/g2/dashboard-controller.ts +++ b/app/g2/dashboard-controller.ts @@ -75,10 +75,11 @@ import { ALL_APPS } from "../apps/all-apps"; import { type AppContext, type AppDefinition, type AppLaunchParams, type TextEditorHost } from "../apps/app-definition"; import { type InProcessAppOptions, type InProcessWindow } from "../ui/shell/in-process-window"; import { loadPersistedOpenApps, savePersistedOpenApps } from "../ui/shell/open-apps-persistence"; -import { appViewportRect, isOnSwitcherEdge, screenHeight, screenWidth, sidebarStripVisible, type ScreenRect, type WindowHeightMode } from "../ui/shell/geometry"; +import { appViewportRect, isOnSwitcherEdge, screenHeight, screenWidth, sidebarStripVisible, windowEdges, type ScreenRect, type WindowHeightMode } from "../ui/shell/geometry"; +import { sameEdges } from "../ui/viewport"; import { type ContinuousCaptureOptions, type LayerActions, type TextSettingsEditToggle, type TranscriptionChoice } from "../ui/layers"; import { type KeyboardInputSession } from "../ui/shell/keyboard-input"; -import { appSwitcherPositionSetting, glassesModelName, glassesTypeSetting, statusBarPositionSetting, statusBarVisibilitySetting, windowBorderSetting, assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, getBrightnessPreferences, getHeadUpPreferences, displayLayoutSetting, navigateDisplayLayoutSetting, terminalDisplayLayoutSetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, openAiTranscriptionModelSetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, whisperServerApiKeySetting, getVoiceTranscriptionLanguage, whisperServerModelSetting, whisperServerUrlSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, effectiveRingConnectionMode, type RingConnectionMode, saveVoiceRecordingsSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, shouldPopUpNewNotification, suspendEvenHubWhenScreenOffSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings"; +import { appSwitcherPositionSetting, glassesModelName, glassesTypeSetting, statusBarPositionSetting, statusBarVisibilitySetting, windowBorderSetting, assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, getBrightnessPreferences, getHeadUpPreferences, displayLayoutSetting, navigateDisplayLayoutSetting, terminalDisplayLayoutSetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, openAiTranscriptionModelSetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, whisperServerApiKeySetting, getVoiceTranscriptionLanguage, whisperServerModelSetting, whisperServerUrlSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, effectiveRingConnectionMode, type RingConnectionMode, saveRecordingSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, shouldPopUpNewNotification, suspendEvenHubWhenScreenOffSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings"; import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } from "../native/battery-optimization"; import { getInstalledEvenHubAppById, @@ -111,8 +112,6 @@ type ConnectionPhase = "disconnected" | "connecting" | "connected" | "charging" export type DashboardSnapshot = { phase: ConnectionPhase; - /** Last-known battery levels: the glasses, their charging case, the R1 ring and a Wear OS watch. */ - batteries: ReturnType; status: string; displayPreview: ImageSource | null; /** @@ -156,7 +155,7 @@ export type DashboardSnapshot = { previewMode: boolean; /** * The foreground glasses window's EvenHub phone UI, when it can be opened - * (the action bar's app-icon button); null otherwise. + * (the app-icon button under the mirror); null otherwise. */ evenHubPhoneUi: PhoneUiButton | null; }; @@ -204,14 +203,16 @@ const launchableApps = () => ALL_APPS.filter((app) => app.showInLauncher !== fal * screen, the display mode's size (a band's position only moves windows), whether the app switcher * takes width beside windows, height below them or neither (a popup), and * the chrome rows each window loses to it: below them, whether the status - * bar joins the row (dropping the top bar); with a popup, whether the - * status bar keeps rows of its own and the window frame (where the status - * bar goes only moves windows). + * bar joins the row (dropping the top bar, for the window frame's top row + * if it has a frame); with a popup, whether the status bar keeps rows of its + * own and the window frame (where the status bar goes only moves windows). */ function viewportSizesKey(): string { const position = appSwitcherPositionSetting.get(); - const switcher = position === "bottom" ? `row|${statusBarPositionSetting.get()}` - : position === "popup" ? `popup|${statusBarVisibilitySetting.get()}|${windowBorderSetting.get()}` + const statusBar = statusBarPositionSetting.get(); + const framed = windowBorderSetting.get() === "all"; + const switcher = position === "bottom" ? `row|${statusBar}|${statusBar === "bottom" && framed}` + : position === "popup" ? `popup|${statusBarVisibilitySetting.get()}|${framed}` : "strip"; const layout = displayLayoutSetting.get(); return `${screenWidth()}x${screenHeight()}|${layout.startsWith("band-") ? "band" : layout}|${switcher}`; @@ -431,7 +432,7 @@ class DashboardController { launchApp: (appId) => this.launchApp(appId), requestShellRender: () => this.requestShellRender(), }); - // The action bar's EvenHub phone-UI button hides while that UI is showing. + // The main page's EvenHub phone-UI button hides while that UI is showing. onPhoneShownChanged(() => this.emit()); shell.configure({ actions: { @@ -489,12 +490,15 @@ class DashboardController { this.syncVoiceWake(); // Display mode size first: a reflow repositions every surface too, so // the band-position check after it then has nothing left to do. - this.applyDisplayModeIfChanged(); + const resized = this.applyDisplayModeIfChanged(); this.applyVerticalPositionIfChanged(); - this.applyAppLayoutsIfChanged(); + const appsResized = this.applyAppLayoutsIfChanged(); + // Either reflow hands windows their new edges along with their size. + if (!resized && !appsResized) this.applyWindowEdgesIfChanged(); this.syncAssistantBridgeIfChanged(); this.retargetContinuousCapture(); this.syncLockScreenSettingIfChanged(); + this.syncContinuousRecording(); // A Preview color or scaling change should show on the mirror at once, // not at the next composited frame (cheap: floor-limited, dedup'd on // the Java side). @@ -586,9 +590,9 @@ class DashboardController { * that support resizing receive the new viewport. Other worker windows are * closed and launched again at the new size. */ - private applyDisplayModeIfChanged(): void { + private applyDisplayModeIfChanged(): boolean { const sizes = viewportSizesKey(); - if (sizes === this.lastViewportSizes) return; + if (sizes === this.lastViewportSizes) return false; this.lastViewportSizes = sizes; // The reflow below reconfigures every surface, covering any move too. this.lastWindowPlacement = windowPlacementKey(); @@ -620,6 +624,22 @@ class DashboardController { })().catch((error) => { this.appendLog(`display mode change failed: ${this.formatError(error)}`); }); + return true; + } + + /** + * A setting changed what some windows' edges touch (geometry.ts + * windowEdges: a border line, or blank space) without resizing them, as + * the Border setting does under a top status bar: those windows lay out + * again with the padding their new edges suggest. Their surfaces stay as + * they are. + */ + private applyWindowEdgesIfChanged(): void { + for (const window of Array.from(shell.getWindows())) { + const laidOut = window.layoutSize?.(); + if (!laidOut || !window.relayout || sameEdges(laidOut.edges, windowEdges(window.appId))) continue; + window.relayout(); + } } /** @@ -668,10 +688,10 @@ class DashboardController { }; } - private applyAppLayoutsIfChanged(): void { + private applyAppLayoutsIfChanged(): boolean { const layouts = this.appLayouts(); const changed = Object.keys(layouts).filter((appId) => layouts[appId] !== this.lastAppLayouts[appId]); - if (!changed.length) return; + if (!changed.length) return false; this.lastAppLayouts = layouts; void (async () => { for (const window of Array.from(shell.getWindows())) { @@ -682,6 +702,7 @@ class DashboardController { shell.foregroundWindow()?.requestRender(); this.requestShellRender(); })().catch((error) => this.appendLog(`app layout change failed: ${this.formatError(error)}`)); + return true; } private applyVerticalPositionIfChanged(): void { @@ -1224,11 +1245,10 @@ class DashboardController { alarmReliabilityMessage: this.alarmReliabilityMessage, previewMode: this.isPreviewDisplayActive(), evenHubPhoneUi: phoneUiButton(), - batteries: shell.getBatteryLevels(), }; } - /** Overlay an EvenHub app's phone UI (the action bar's app-icon button). */ + /** Overlay an EvenHub app's phone UI (the app-icon button under the mirror). */ showEvenHubPhoneUi(windowId: string): void { showEvenHubPhoneUi(windowId); } @@ -2236,12 +2256,14 @@ class DashboardController { private startContinuousVoiceCapture(client: string, options: ContinuousCaptureOptions = {}): void { this.continuousClients.set(client, options); + this.syncContinuousRecording(); this.retargetContinuousCapture(); this.ensureContinuousCapture(true); } private stopContinuousVoiceCapture(client: string): void { if (!this.continuousClients.delete(client)) return; + this.syncContinuousRecording(); if (this.continuousClients.size > 0) { // The window that needed its own provider may be the one that left. this.retargetContinuousCapture(); @@ -2267,6 +2289,18 @@ class DashboardController { void this.beginVoiceCapture("continuous").finally(() => this.syncContinuousClaim()); } + /** + * Record to the first client's requested name while Save Recording is on + * (it is toggled from those windows' menus, so this also runs when a + * setting changes). + */ + private syncContinuousRecording(): void { + const name = saveRecordingSetting.get() + ? Array.from(this.continuousClients.values(), (options) => options.recordAs).find(Boolean) ?? "" + : ""; + voiceControlBridge.recordTo(name); + } + /** Move a running continuous capture onto the provider its windows now call for. */ private retargetContinuousCapture(): void { voiceControlBridge.retargetContinuousCapture(this.voiceCaptureOptions(this.communicator)); @@ -2316,7 +2350,6 @@ class DashboardController { whisperServerUrl: whisperServerUrlSetting.get(), whisperServerModel: whisperServerModelSetting.get(), whisperServerApiKey: whisperServerApiKeySetting.get(), - saveRecording: saveVoiceRecordingsSetting.get(), // "My voice only" (Microphones app): verify command utterances // against the enrolled wearer voice-print; non-matching speakers' // finals are suppressed by the bridge. diff --git a/app/g2/glasses-display-state.ts b/app/g2/glasses-display-state.ts index ab1e673e..869a154a 100644 --- a/app/g2/glasses-display-state.ts +++ b/app/g2/glasses-display-state.ts @@ -80,7 +80,7 @@ export type BatteryLevels = { }; /** - * The phone Settings tab's battery row: each device whose level is known, + * The phone settings page's battery row: each device whose level is known, * e.g. "G2 100% · Case 98% ⚡ · R1 72%" (⚡ = charging), or "" when none * is. Levels are the last known ones (the case only reports while the glasses * are docked), so ⚡ appears only while it is live: the glasses and Case only diff --git a/app/g2/ios-preview-controller.ts b/app/g2/ios-preview-controller.ts index b95b6835..e7b996f0 100644 --- a/app/g2/ios-preview-controller.ts +++ b/app/g2/ios-preview-controller.ts @@ -47,13 +47,13 @@ import { makeInputEvent, type InputEvent, type InputEventPayload } from '../ui/g import { noopLayerActions, type ContinuousCaptureOptions, type LayerActions } from '../ui/layers' import { TextViewerLayer } from '../apps/files/text-viewer' import { shell, rawInputEventToInputEvent, type ShellWindow } from '../ui/shell/shell' -import { appViewportRect, isOnSwitcherEdge, sidebarStripVisible, type ScreenRect } from '../ui/shell/geometry' +import { appViewportRect, isOnSwitcherEdge, sidebarStripVisible, windowEdges, type ScreenRect } from '../ui/shell/geometry' import { mirrorToPanelFraction, phonePreviewCrop } from './phone-preview-crop' import { onAnySettingChanged, previewColorSetting, lockScreenEnabledSetting, getBrightnessPreferences, getStringSettingById, nightscoutSiteUrlSetting, nightscoutApiTokenSetting, voiceProviderSetting, elevenLabsApiKeySetting, openAiApiKeySetting, openAiTranscriptionModelSetting, sonioxApiKeySetting, whisperServerApiKeySetting, getVoiceTranscriptionLanguage, - whisperServerModelSetting, whisperServerUrlSetting, ringConnectionModeSetting, saveTranscribeAudioSetting, glassesTypeSetting, shouldPopUpNewNotification } from '../ui/dashboard-settings' + whisperServerModelSetting, whisperServerUrlSetting, ringConnectionModeSetting, saveRecordingSetting, glassesTypeSetting, shouldPopUpNewNotification } from '../ui/dashboard-settings' import { transcriptionKey, type VoiceProviderSelection } from '../native/cloud-stt-provider' import type { PhoneGesture } from '../phone-ui/phone-gestures' import { claimGlassesOnboardingAutoLaunch, ONBOARDING_APP_ID } from '../apps/onboarding/onboarding-progress' @@ -366,7 +366,7 @@ export class IosPreviewController { this.logBluetooth(`Phone background; glasses ${this.state.phase}`) this.flushBluetoothLog() } - /** Overlay an EvenHub app's phone UI (the header's app-icon button). */ + /** Overlay an EvenHub app's phone UI (the app-icon button under the mirror). */ showEvenHubPhoneUi(windowId: string): void { showOnPhone(windowId) } @@ -425,6 +425,7 @@ export class IosPreviewController { this.offSettings = onAnySettingChanged(() => { this.syncContinuousCapture() this.syncLockSetting() + this.syncContinuousRecording() this.pushBrightness() this.relayout() shell.foregroundWindow()?.requestRender() @@ -511,7 +512,9 @@ export class IosPreviewController { await target.setSurfaceVisible(window.surfaceId, shell.foregroundWindow()?.windowId === window.windowId) } private relayout(): void { - const layout = shell.getWindows().map(window => JSON.stringify(appViewportRect(window.heightMode, window.appId))).join(";") + // Each window's rect, and what its edges touch (which sets its padding). + const layout = shell.getWindows().map(window => + JSON.stringify([appViewportRect(window.heightMode, window.appId), windowEdges(window.appId)])).join(";") if (layout === this.lastLayout) return this.lastLayout = layout for (const window of shell.getWindows()) { @@ -1116,7 +1119,7 @@ export class IosPreviewController { * Continuous capture on behalf of `client` (one id per window: Transcribe, * Translate, Teleprompter, Calculator); it runs while any client wants it, as * on Android. `recordAs` names a WAV of the audio in Downloads when Save - * Transcribe audio is on. + * Recording is on. */ private startContinuousVoiceCapture(client: string, options: ContinuousCaptureOptions = {}): void { this.continuousClients.set(client, options) @@ -1205,9 +1208,12 @@ export class IosPreviewController { private syncContinuousClaim(): void { voiceActivity.setActive(this.continuousClients.size > 0 && iosVoiceInput.continuousActive, CONTINUOUS_CAPTURE_HOLDER) } - /** Record to the first client's requested name while Save Transcribe audio is on. */ + /** + * Record to the first client's requested name while Save Recording is on (it is + * toggled from those windows' menus, so this also runs when a setting changes). + */ private syncContinuousRecording(): void { - const name = saveTranscribeAudioSetting.get() ? [...this.continuousClients.values()].map(options => options.recordAs).find(Boolean) ?? '' : '' + const name = saveRecordingSetting.get() ? [...this.continuousClients.values()].map(options => options.recordAs).find(Boolean) ?? '' : '' iosVoiceInput.recordTo(name) } /** diff --git a/app/health/health-glance.ts b/app/health/health-glance.ts index 7b690331..337b7888 100644 --- a/app/health/health-glance.ts +++ b/app/health/health-glance.ts @@ -23,6 +23,7 @@ import { GrayImage, type UiFont } from "../graphics/image"; import { lineStep } from "../ui/metrics"; import { GESTURE_SCROLL } from "../ui/gestures"; +import type { Edges } from "../ui/viewport"; import { drawSleepLanes, drawMetricChart, @@ -47,10 +48,11 @@ import { } from "./health-types"; import { stageLabel, type SleepStageName } from "./sleep-stages"; -const MARGIN = 10; const GUTTER = 14; -/** Below this the two columns stack instead. */ -const TWO_COLUMN_MIN_WIDTH = 380; +/** Below this content width the two columns stack instead. */ +const TWO_COLUMN_MIN_WIDTH = 360; +/** Clear space between a page's content and its footer hint. */ +const FOOTER_GAP = 16; export type GlanceFonts = { small: UiFont; large: UiFont }; @@ -108,7 +110,30 @@ export type GlanceData = { fixture: boolean; }; -export type GlanceSize = { width: number; height: number }; +/** + * The window a page is painted for: its size, and the padding suggested for + * each of its edges (`ui/viewport.ts`), which is how far in the page's + * outermost content sits. A size with no padding is a window nothing borders. + */ +export type GlanceSize = { width: number; height: number; padding?: Edges }; + +/** The rect a page lays out in: the window inside its edge padding. */ +type Frame = { left: number; top: number; right: number; bottom: number }; + +function frameOf(size: GlanceSize): Frame { + const { padding } = size; + return { + left: padding?.left ?? 0, + top: padding?.top ?? 0, + right: size.width - (padding?.right ?? 0), + bottom: size.height - (padding?.bottom ?? 0), + }; +} + +/** Height the footer hint takes off the bottom of a page's content: its line and the gap above it. */ +function footerHeight(fonts: GlanceFonts): number { + return fonts.small.lineHeight + FOOTER_GAP; +} /** Paint whichever page the cursor is on. */ export function drawGlancePage( @@ -165,10 +190,11 @@ function drawHeader( right: string, ): number { const { small } = fonts; - image.drawText(small, MARGIN, MARGIN, title, INK.title); - drawTextRight(image, small, size.width - MARGIN, MARGIN, right, INK.label); - const bottom = MARGIN + small.lineHeight + 3; - image.drawLine(MARGIN, bottom, size.width - MARGIN, bottom, INK.axis); + const frame = frameOf(size); + image.drawText(small, frame.left, frame.top, title, INK.title); + drawTextRight(image, small, frame.right, frame.top, right, INK.label); + const bottom = frame.top + small.lineHeight + 3; + image.drawLine(frame.left, bottom, frame.right - 1, bottom, INK.axis); return bottom; } @@ -186,8 +212,8 @@ function drawFooter( hint: string, ): void { const { small } = fonts; - const y = size.height - small.lineHeight - 2; - image.drawText(small, MARGIN, y, hint, INK.faint); + const frame = frameOf(size); + image.drawText(small, frame.left, frame.bottom - small.lineHeight, hint, INK.faint); } // =========================================================================== @@ -220,24 +246,24 @@ function drawOverview( ): void { const { small, large } = fonts; const step = lineStep(small); + const frame = frameOf(size); const headerBottom = drawHeader(image, size, fonts, "HEALTH", shortDate(data.nowMs)); const summary = data.summary; if (!summary) { - image.drawText(small, MARGIN, headerBottom + step, "Waiting for ring data...", INK.dim); + image.drawText(small, frame.left, headerBottom + step, "Waiting for ring data...", INK.dim); drawFooter(image, size, fonts, ""); return; } - const twoColumn = size.width >= TWO_COLUMN_MIN_WIDTH; - const columnWidth = twoColumn - ? Math.floor((size.width - MARGIN * 2 - GUTTER) / 2) - : size.width - MARGIN * 2; - const rightX = twoColumn ? MARGIN + columnWidth + GUTTER : MARGIN; + const contentWidth = frame.right - frame.left; + const twoColumn = contentWidth >= TWO_COLUMN_MIN_WIDTH; + const columnWidth = twoColumn ? Math.floor((contentWidth - GUTTER) / 2) : contentWidth; + const rightX = twoColumn ? frame.left + columnWidth + GUTTER : frame.left; const top = headerBottom + 6; const todayBottom = drawTodayColumn(image, summary, { - x: MARGIN, + x: frame.left, y: top, width: columnWidth, fonts, @@ -259,7 +285,7 @@ function drawOverview( // artefact instead of as structure. It also matters more than it looks: on // the glasses an unlit pixel is TRANSPARENT, so every line drawn past the // content is one more thing between the wearer and the world. - const divider = MARGIN + columnWidth + Math.floor(GUTTER / 2); + const divider = frame.left + columnWidth + Math.floor(GUTTER / 2); image.drawLine(divider, top, divider, Math.max(todayBottom, nightBottom), INK.faint); } @@ -371,6 +397,7 @@ function drawMetricDetail( ): void { const { small, large } = fonts; const step = lineStep(small); + const frame = frameOf(size); const headerBottom = drawHeader( image, size, @@ -388,12 +415,12 @@ function drawMetricDetail( // headline is the day's total rather than a range. const total = metric === "steps" ? data.summary?.steps ?? 0 : data.summary?.calories ?? 0; const text = total > 0 ? total.toLocaleString() : "--"; - image.drawText(large, MARGIN, y, text, INK.title); + image.drawText(large, frame.left, y, text, INK.title); const width = large.measureText(text); if (unit) { image.drawText( small, - MARGIN + width + 6, + frame.left + width + 6, y + large.lineHeight - small.lineHeight - 1, unit, INK.label, @@ -401,17 +428,16 @@ function drawMetricDetail( } y += large.lineHeight + 6; } else { - image.drawText(small, MARGIN, y, rangeAverageText(summary, unit), INK.line); + image.drawText(small, frame.left, y, rangeAverageText(summary, unit), INK.line); y += step + 4; } const points = data.hourly[metric] ?? []; - const footerHeight = small.lineHeight + 8; - const chartHeight = size.height - y - MARGIN - footerHeight; + const chartHeight = frame.bottom - footerHeight(fonts) - y; if (chartHeight >= 40) { drawMetricChart( image, - { x: MARGIN, y, width: size.width - MARGIN * 2, height: chartHeight }, + { x: frame.left, y, width: frame.right - frame.left, height: chartHeight }, { metric, points, @@ -482,35 +508,35 @@ function drawSleepDetail( const { small, large } = fonts; const step = lineStep(small); const sleep = data.summary?.sleep ?? null; + const frame = frameOf(size); const headerBottom = drawHeader(image, size, fonts, "SLEEP", "last night"); let y = headerBottom + 6; if (!sleep) { - image.drawText(small, MARGIN, y, "No sleep record", INK.dim); + image.drawText(small, frame.left, y, "No sleep record", INK.dim); drawFooter(image, size, fonts, `${GESTURE_SCROLL} Calories · Summary`); return; } // Total and efficiency on one line, so the lanes get the height. const totalText = formatDuration(sleep.totalSec); - image.drawText(large, MARGIN, y, totalText, INK.title); + image.drawText(large, frame.left, y, totalText, INK.title); drawTextRight( image, small, - size.width - MARGIN, + frame.right, y + large.lineHeight - small.lineHeight - 1, `${Math.round(sleep.efficiencyPercent)}% efficiency`, INK.label, ); y += large.lineHeight + 6; - const footerHeight = small.lineHeight + 8; const captionHeight = step; - const laneHeight = size.height - y - MARGIN - footerHeight - captionHeight; + const laneHeight = frame.bottom - footerHeight(fonts) - captionHeight - y; if (laneHeight >= 40) { drawSleepLanes( image, - { x: MARGIN, y, width: size.width - MARGIN * 2, height: laneHeight }, + { x: frame.left, y, width: frame.right - frame.left, height: laneHeight }, { bands: data.stageBands, font: small, @@ -523,6 +549,6 @@ function drawSleepDetail( y += laneHeight; } - image.drawText(small, MARGIN, y, hypnogramCaptionShort(), INK.faint); + image.drawText(small, frame.left, y, hypnogramCaptionShort(), INK.faint); drawFooter(image, size, fonts, `${GESTURE_SCROLL} Calories · Summary`); } diff --git a/app/native/gray-image-preview.ios.ts b/app/native/gray-image-preview.ios.ts index da6c89d6..4d2e83c6 100644 --- a/app/native/gray-image-preview.ios.ts +++ b/app/native/gray-image-preview.ios.ts @@ -11,7 +11,7 @@ export function grayImageToPreviewSource(image: GrayImage): ImageSource | null { /** * A glasses icon as a white-on-transparent phone image (gray becomes alpha), - * for the dark header. + * which the phone UI tints to suit its background. */ export function grayImageToWhiteIconSource(image: GrayImage): ImageSource | null { const baked = image.withDrawsBaked() diff --git a/app/native/gray-image-preview.ts b/app/native/gray-image-preview.ts index e59c2655..58ee723f 100644 --- a/app/native/gray-image-preview.ts +++ b/app/native/gray-image-preview.ts @@ -30,7 +30,7 @@ export function grayImageToPreviewSource(image: GrayImage): ImageSource | null { /** * A glasses icon as a white-on-transparent phone image (gray becomes alpha), - * for the dark action bar. + * which the phone UI tints to suit its background. */ export function grayImageToWhiteIconSource(image: GrayImage): ImageSource | null { if (!global.isAndroid) { diff --git a/app/native/voice-control.ios.ts b/app/native/voice-control.ios.ts index 407ab3cd..9d8f3864 100644 --- a/app/native/voice-control.ios.ts +++ b/app/native/voice-control.ios.ts @@ -62,6 +62,9 @@ export class IosVoiceControlBridge { // and it is created by the first audio, so a failed start leaves no file. private recordingName = '' private recorder: WavRecorder | null = null + // The file could not be created: one attempt per recording, not one per packet. + private recordingFailure = false + private readonly recordingListeners = new Set<() => void>() // Raw-PCM tap (EvenHub mic apps): decode-only glasses audio, broadcast to // rawListeners while any owner wants it, from the session setRawSession // bound. It shares the one glasses mic with speech capture, which preempts @@ -212,16 +215,28 @@ export class IosVoiceControlBridge { recordTo(name: string): void { if (name === this.recordingName) return this.recorder?.close(); this.recorder = null - this.recordingName = name + this.setRecording(name, false) + } + /** Whether continuous captures' audio is being saved (see recordTo). */ + get recording(): boolean { return this.recordingName !== '' && !this.recordingFailure } + /** Whether the recording asked for could not be saved (its file could not be created). */ + get recordingFailed(): boolean { return this.recordingFailure } + /** `recording` or `recordingFailed` changed. */ + onRecordingChange(listener: () => void): () => void { this.recordingListeners.add(listener); return () => { this.recordingListeners.delete(listener) } } + private setRecording(name: string, failed: boolean): void { + const wasRecording = this.recording, hadFailed = this.recordingFailure + this.recordingName = name; this.recordingFailure = failed + if (wasRecording === this.recording && hadFailed === failed) return + for (const fn of [...this.recordingListeners]) fn() } private record(pcm: Uint8Array): void { - if (!this.recorder && this.recordingName) { + if (!this.recording) return + if (!this.recorder) { this.recorder = WavRecorder.open(this.recordingName) this.log(this.recorder ? `Voice: recording audio to ${this.recorder.path}` : 'Voice: could not create the audio recording') - // One attempt per recording, not one per packet. - if (!this.recorder) this.recordingName = '' + if (!this.recorder) { this.setRecording(this.recordingName, true); return } } - this.recorder?.append(pcm) + this.recorder.append(pcm) } /** End continuous capture, transcribing the audio since the last pause. */ stopContinuousCapture(): Promise { diff --git a/app/native/voice-control.ts b/app/native/voice-control.ts index 22864a78..75e4fa52 100644 --- a/app/native/voice-control.ts +++ b/app/native/voice-control.ts @@ -4,6 +4,7 @@ import { Utils } from "@nativescript/core"; import { type CloudSttTranscriptEvent, CloudSttClient } from "./cloud-stt"; import { createCloudSttClient, transcriptionKey } from "./cloud-stt-provider"; import { SpeechPauseDetector } from "./speech-pause"; +import { WavRecorder } from "./wav-recorder"; import { toUint8Array } from "../util/array-util"; import { pcmLevel } from "../util/audio-level"; @@ -62,7 +63,6 @@ export type PushToTalkOptions = { whisperServerApiKey?: string; /** Spoken language for cloud providers and on-device Whisper; empty detects, absent keeps local English. */ language?: string; - saveRecording: boolean; /** * Watch the mic and fire onSpeechEnd when the speaker stops. For hands-free * ("Hey Even") capture, which has no button release to end the utterance. @@ -152,6 +152,14 @@ export class FaceclawVoiceControlBridge { // the bridge swallow it. private verificationActive = false; private verificationRejected = false; + // Continuous captures' audio goes to Downloads/.wav while it is + // set. The file outlives a capture, so a restarted one keeps appending to it, + // and it is created by the first audio, so a failed start leaves no file. + private recordingName = ""; + private recorder: WavRecorder | null = null; + // The file could not be created: one attempt per recording, not one per packet. + private recordingFailure = false; + private readonly recordingListeners = new Set<() => void>(); onStatus(listener: (state: VoiceControlState) => void): () => void { this.statusListeners.add(listener); @@ -244,6 +252,56 @@ export class FaceclawVoiceControlBridge { this.acquireCapture("continuous", options); } + /** + * Record continuous captures' audio to Downloads/.wav, across restarts, + * until called with another name or "". + */ + recordTo(name: string): void { + if (name === this.recordingName) return; + this.recorder?.close(); + this.recorder = null; + this.setRecording(name, false); + } + + /** Whether continuous captures' audio is being saved (see recordTo). */ + get recording(): boolean { + return this.recordingName !== "" && !this.recordingFailure; + } + + /** Whether the recording asked for could not be saved (its file could not be created). */ + get recordingFailed(): boolean { + return this.recordingFailure; + } + + /** `recording` or `recordingFailed` changed. */ + onRecordingChange(listener: () => void): () => void { + this.recordingListeners.add(listener); + return () => this.recordingListeners.delete(listener); + } + + private setRecording(name: string, failed: boolean): void { + const wasRecording = this.recording; + const hadFailed = this.recordingFailure; + this.recordingName = name; + this.recordingFailure = failed; + if (wasRecording === this.recording && hadFailed === failed) return; + for (const listener of Array.from(this.recordingListeners)) listener(); + } + + /** `pcm` is the controller's Java byte[], handed to the recorder as it came. */ + private record(pcm: any): void { + if (!this.recording) return; + if (!this.recorder) { + this.recorder = WavRecorder.open(this.recordingName); + if (!this.recorder) { + this.setRecording(this.recordingName, true); + return; + } + console.log(`Voice: recording audio to ${this.recorder.path}`); + } + this.recorder.append(pcm); + } + /** Subscribe to decoded raw mic PCM (16 kHz mono S16LE). */ onRawPcm(listener: RawPcmListener): () => void { this.rawPcmListeners.add(listener); @@ -307,7 +365,6 @@ export class FaceclawVoiceControlBridge { // The raw tap is strictly the G2 stream; clear any phone-mic flag a // preview-mode capture may have left on the shared controller. this.controller?.setUsePhoneMic(false); - this.controller?.setSaveRecordings(false); this.controller?.setEndpointing(false); // Raw means raw: the Microphones session (and EvenHub apps) get the // unprocessed stream and run their own beam/suppression processing. @@ -356,7 +413,6 @@ export class FaceclawVoiceControlBridge { this.ensureController(); this.controller?.setCommunicator(options.communicator); this.controller?.setUsePhoneMic(Boolean(options.usePhoneMic)); - this.controller?.setSaveRecordings(options.saveRecording); this.controller?.setEndpointing(Boolean(options.endpointing)); this.captureEndpointing = Boolean(options.endpointing); this.controller?.setNoiseSuppression(Boolean(options.noiseSuppression)); @@ -559,6 +615,8 @@ export class FaceclawVoiceControlBridge { onPcm: (pcm: any) => { const bytes = toUint8Array(pcm); this.cloudClient?.acceptPcm(bytes); + // Push-to-talk on a capture of its own is not recorded. + if (this.captureHolders.has("continuous")) this.record(pcm); if (!this.cloudClient && this.captureHolders.has("continuous") && this.speechPause.accept(bytes)) { for (const listener of this.speechPauseListeners) listener(); } diff --git a/app/native/wav-recorder.ts b/app/native/wav-recorder.ts new file mode 100644 index 00000000..cec96f3f --- /dev/null +++ b/app/native/wav-recorder.ts @@ -0,0 +1,42 @@ +declare const android: any; +declare const java: any; +declare const com: any; + +const SAMPLE_RATE = 16000; + +/** + * Appends 16 kHz mono PCM16 to a WAV file in the public Downloads directory + * while it is captured (Android; wav-recorder.ios.ts is the iOS one). The + * native recorder keeps the header's sizes current, so a crash leaves a + * playable file of everything up to the last second. + */ +export class WavRecorder { + private constructor(private recorder: any, readonly path: string) {} + + /** A recorder for Downloads/.wav (a -2, -3... suffix if taken), or null. */ + static open(name: string): WavRecorder | null { + try { + const downloads = android.os.Environment.getExternalStoragePublicDirectory( + android.os.Environment.DIRECTORY_DOWNLOADS, + ); + downloads.mkdirs(); + let file = new java.io.File(downloads, `${name}.wav`); + for (let n = 2; file.exists(); n++) file = new java.io.File(downloads, `${name}-${n}.wav`); + const path = String(file.getAbsolutePath()); + return new WavRecorder(new com.faceclaw.app.FaceclawWavRecorder(path, SAMPLE_RATE, 1), path); + } catch (error) { + console.warn(`WavRecorder: could not create ${name}.wav in Downloads: ${error}`); + return null; + } + } + + /** `pcm` is the Java byte[] the voice controller delivered, passed back as it came. */ + append(pcm: any): void { + this.recorder?.append(pcm); + } + + close(): void { + this.recorder?.finish(); + this.recorder = null; + } +} diff --git a/app/phone-ui/README.md b/app/phone-ui/README.md index c8d13a6c..efcf0d54 100644 --- a/app/phone-ui/README.md +++ b/app/phone-ui/README.md @@ -1,10 +1,17 @@ # Main-screen UI Android and iOS share `remote-controls.xml`, `remote-controls.css`, and -`RemoteControlsViewModel`: tab order and selection, screen-size choices, -brightness/Auto settings, watch labels, ring markings, and microphone/keyboard -buttons. Import the stylesheet at the top of each platform's application CSS -(before any rules), so the NativeScript CSS pipeline includes it. +`RemoteControlsViewModel`: the bar of icon buttons under the mirror (the +foreground EvenHub app's phone UI, microphone, keyboard, settings) and the +touchpad below it, which is the simulated watch face or the ring pad according +to the Phone input style setting. The settings button opens `settings-page.xml` +(`SettingsViewModel`, `settings-page.css`), also shared: display mode, +brightness/Auto, Phone input style and battery levels. That page needs no host: +it reads the settings store, the shell's battery levels and +`g2/glasses-presence`, which both platforms' controllers feed. Import the +stylesheets at the top of each platform's application CSS (before any rules), +so the NativeScript CSS pipeline includes them; iOS also has to register each +shared page in `onboarding-register.ios.ts`. Android's `MainViewModel` extends that shared model and connects it to `dashboardController`. iOS loads the same XML with `Builder.load` and connects @@ -28,6 +35,8 @@ audio input in preview mode. The phone path requires both Speech Recognition and Microphone permissions and stops when Faceclaw leaves the foreground; connected-glasses capture retains its existing background behavior. -The iOS microphone and keyboard image assets are 3x rasterizations of the -Android vector drawables with the same names; regenerate them from those -vectors if the icon designs change. +The iOS microphone, keyboard and settings image assets (`ic_control_*`) are 3x +rasterizations of the Android vector drawables with the same names; regenerate +them from those vectors if the icon designs change. The EvenHub button's icon +is the app's own, rendered white on transparent; `.control-icon` tints all four +alike. diff --git a/app/phone-ui/main-page.ios.ts b/app/phone-ui/main-page.ios.ts index f42f9181..2054fad6 100644 --- a/app/phone-ui/main-page.ios.ts +++ b/app/phone-ui/main-page.ios.ts @@ -7,11 +7,9 @@ import { IosPreviewController } from '../g2/ios-preview-controller' import { PhoneGestureRecognizer } from './phone-gestures' import { BleBandwidthMeter } from './ble-bandwidth-meter' import { sampleBleTraffic } from '../native/ble-traffic' -import { glassesModelName, onAnySettingChanged, mirrorTouchSetting, showBleBandwidthSetting } from '../ui/dashboard-settings' +import { onAnySettingChanged, mirrorTouchSetting, showBleBandwidthSetting } from '../ui/dashboard-settings' import { loadDeviceAddresses } from '../g2/device-addresses' import { deviceAddressError } from '../g2/ios-peripheral-identity' -import { formatBatteryLine } from '../g2/glasses-display-state' -import { shell } from '../ui/shell/shell' export function createMainPage(): Page { const page = new Page() @@ -22,37 +20,26 @@ export function createMainPage(): Page { root.rows = 'auto,*' page.content = root const header = new GridLayout() - header.columns = '*,auto,auto,auto,auto'; header.className = 'main-header' + header.columns = '*,auto,auto,auto'; header.className = 'main-header' const title = new Label() title.text = 'Faceclaw'; title.className = 'action-bar-title' header.addChild(title) - // The foreground EvenHub app's icon, which opens its phone UI. UIImageView - // ignores padding, so a wrapper supplies Android's wider tap target. - const appIconButton = new GridLayout() - appIconButton.className = 'action-bar-app-icon'; appIconButton.verticalAlignment = 'middle' - appIconButton.visibility = 'collapse'; appIconButton.accessible = true - const appIcon = new Image() - appIcon.width = 21; appIcon.height = 21 - appIconButton.addChild(appIcon) - let phoneUiWindowId: string | null = null - appIconButton.on('tap', () => { if (phoneUiWindowId) controller.showEvenHubPhoneUi(phoneUiWindowId) }) - GridLayout.setColumn(appIconButton, 1); header.addChild(appIconButton) const state = new Label() state.text = 'Preview'; state.className = 'action-bar-status' state.verticalAlignment = 'middle' state.on('tap', () => { void openDevices() }) - GridLayout.setColumn(state, 2); header.addChild(state) + GridLayout.setColumn(state, 1); header.addChild(state) // Android's warning triangle: shown while the glasses report firmware Faceclaw can't run. const warning = new Label() warning.text = '\u26A0\uFE0F'; warning.className = 'action-bar-warning' warning.accessibilityLabel = 'Attention needed'; warning.verticalAlignment = 'middle' warning.visibility = 'collapse' warning.on('tap', () => { void showFirmwareWarning() }) - GridLayout.setColumn(warning, 3); header.addChild(warning) + GridLayout.setColumn(warning, 2); header.addChild(warning) const overflow = new Button() overflow.text = '⋮'; overflow.accessibilityLabel = 'More options'; overflow.className = 'overflow-button' overflow.on('tap', () => openMenu()) - GridLayout.setColumn(overflow, 4); header.addChild(overflow); root.addChild(header) + GridLayout.setColumn(overflow, 3); header.addChild(overflow); root.addChild(header) const body = new GridLayout() GridLayout.setRow(body, 1); root.addChild(body) const mirror = new Image() @@ -72,10 +59,6 @@ export function createMainPage(): Page { keyboardPanel.bindingContext = keyboardModel GridLayout.setRow(keyboardPanel, 1); root.addChild(keyboardPanel) let focusTimer: ReturnType | null = null - // The Settings tab's battery row. iOS reports charging sessions as - // connected, so "connected" is the whole live-link condition here. - let glassesLinked = false - const refreshBatteryLine = () => { model.batteryLine = formatBatteryLine(shell.getBatteryLevels(), glassesLinked, glassesModelName()) } const keyboardField = () => keyboardPanel.getViewById('keyboardInputField') const controller = new IosPreviewController((image, label) => { mirror.imageSource = image; model.set('padFocusLine', label) @@ -85,7 +68,6 @@ export function createMainPage(): Page { state.text = ({ connected: 'Connected', disconnected: 'Preview', connecting: 'Connecting', retrying: 'Reconnecting', disconnecting: 'Disconnecting', error: 'Failed' })[connection.phase] warning.visibility = connection.firmwareWarning ? 'visible' : 'collapse' - glassesLinked = connection.phase === 'connected'; refreshBatteryLine() }, session => { keyboardModel.setSession(session) controls.visibility = session ? 'collapse' : 'visible' @@ -95,11 +77,10 @@ export function createMainPage(): Page { focusTimer = setTimeout(() => { focusTimer = null; keyboardField()?.focus() }, 0) } else keyboardField()?.dismissSoftInput() }, button => { - phoneUiWindowId = button?.icon ? button.windowId : null - appIcon.imageSource = button?.icon ?? null - appIconButton.visibility = phoneUiWindowId ? 'visible' : 'collapse' - appIconButton.accessibilityLabel = button ? `Open ${button.title} on phone` : '' + // The foreground EvenHub app's button in the bar under the mirror. + model.evenHubPhoneUi = button }) + model.showEvenHubPhoneUi = windowId => controller.showEvenHubPhoneUi(windowId) async function navigateDevicePage(moduleName: string, context?: object): Promise { suppressAutoReconnect() await controller.disconnect() @@ -190,7 +171,8 @@ export function createMainPage(): Page { mirror.on('touch', touch(mirrorInput)) const cancelGestures = () => { watchInput.cancel(); ringInput.cancel(); mirrorInput.cancel() } model.on('propertyChange', (args: PropertyChangeData) => { - if (args.propertyName === 'watchTabVisibility') cancelGestures() + // The other pad took this one's place (Settings > Phone input style). + if (args.propertyName === 'watchPadVisibility') cancelGestures() }) let controlsLayoutTimer: ReturnType | null = null model.set('onControlsContentLayoutChanged', (args: { object: View }) => { @@ -263,7 +245,6 @@ export function createMainPage(): Page { const resume = () => { foreground = true; controller.resume(); syncBandwidth() } let keyboardObserver: any = null let offSettings: (() => void) | null = null - let offBattery: (() => void) | null = null page.on('loaded', () => { if (!keyboardObserver) keyboardObserver = NSNotificationCenter.defaultCenter.addObserverForNameObjectQueueUsingBlock( UIKeyboardWillChangeFrameNotification, null, NSOperationQueue.mainQueue, notification => { @@ -273,16 +254,15 @@ export function createMainPage(): Page { root.paddingBottom = Math.max(0, view.bounds.size.height - local.origin.y - view.safeAreaInsets.bottom) }) Application.on(Application.suspendEvent, pause); Application.on(Application.resumeEvent, resume) - offSettings?.(); offSettings = onAnySettingChanged(() => { model.refreshDisplayControls(); syncBandwidth() }) - offBattery?.(); offBattery = shell.onBatteryLevelsChanged(refreshBatteryLine) - model.refreshDisplayControls(); refreshBatteryLine(); resume() + offSettings?.(); offSettings = onAnySettingChanged(() => { model.refreshInputStyle(); syncBandwidth() }) + model.refreshInputStyle(); resume() if (!isPreviewOnlyMode() && !isAutoReconnectSuppressed() && !deviceAddressError(loadDeviceAddresses())) void controller.connect() }) page.on('unloaded', () => { if (keyboardObserver) NSNotificationCenter.defaultCenter.removeObserver(keyboardObserver) keyboardObserver = null root.paddingBottom = 0 - pause(); offSettings?.(); offSettings = null; offBattery?.(); offBattery = null + pause(); offSettings?.(); offSettings = null Application.off(Application.suspendEvent, pause); Application.off(Application.resumeEvent, resume) }) return page diff --git a/app/phone-ui/main-page.xml b/app/phone-ui/main-page.xml index 12a0ba05..10833a6a 100644 --- a/app/phone-ui/main-page.xml +++ b/app/phone-ui/main-page.xml @@ -1,13 +1,12 @@ - - + + @@ -32,8 +31,8 @@ visibility="{{ displayPreviewMessageVisibility }}"> - +