diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts index 705dda29..2ce9de76 100644 --- a/app/g2/dashboard-controller.ts +++ b/app/g2/dashboard-controller.ts @@ -58,7 +58,7 @@ import { type InProcessAppOptions, type InProcessWindow } from "../ui/shell/in-p import { loadPersistedOpenApps, savePersistedOpenApps } from "../ui/shell/open-apps-persistence"; import { appViewportRect, SIDEBAR_WIDTH, sidebarStripVisible, type WindowHeightMode } from "../ui/shell/geometry"; import { type LayerActions } from "../ui/layers"; -import { assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, brightnessSetting, brightnessSettingToLevel, displayModeSetting, watchWakesDisplaySetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, saveVoiceRecordingsSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, suspendEvenHubWhenScreenOffSetting, verticalPositionSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings"; +import { assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, brightnessSetting, brightnessSettingToLevel, displayModeSetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, saveVoiceRecordingsSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, suspendEvenHubWhenScreenOffSetting, verticalPositionSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings"; import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } from "../native/battery-optimization"; import { getInstalledEvenHubAppById, @@ -1409,22 +1409,17 @@ class DashboardController { * finger-down/finger-up (the watch) hold for as long as the user does. */ async injectSyntheticRingInput(kind: WearRemoteInputKind, origin: SyntheticInputOrigin = "ring"): Promise { - // Watch-scheme input (the Wear app, the phone's pad/d-pad, mirror touches) - // wakes a dark display and then lands normally, resuming the previous - // focus. The ring's own scheme keeps its double-tap-only wake. + // Match the ring while the display is dark: only a double-click wakes it, + // and that wake is handled by Shell.receiveInput. This check also protects + // against a watch acting on a stale state snapshot. if ( origin === "watch" && !shell.isScreenOn() && - !this.glassesLocked && - (this.phase === "connected" || this.phase === "charging") && - watchWakesDisplaySetting.get() && kind !== "double-click" && - kind !== "wakeword" && kind !== "long-press-release" ) { - shell.wake(shell.getFocus()); - this.requestShellRender(); - this.appendLog(`${kind} (watch scheme) woke the display`); + this.appendLog(`${kind} (watch scheme) ignored while display is off`); + return; } if (kind === "long-press") { // Hardware delivers a press event and then a release when the finger @@ -1452,15 +1447,8 @@ class DashboardController { return; } if (!shell.isScreenOn()) { - // The same wake policy as the rest of the watch scheme: honour the - // "input wakes display" setting; with it off, only a double-tap (a - // normal double-click) reaches the dark display. - if (!watchWakesDisplaySetting.get()) { - if (kind === "double-tap") await this.injectSyntheticRingInput("double-click", "watch"); - return; - } - shell.wake(shell.getFocus()); - this.requestShellRender(); + if (kind === "double-tap") await this.injectSyntheticRingInput("double-click", "watch"); + return; } if (kind !== "tap") { await this.injectSyntheticRingInput(MIRROR_TOUCH_GESTURES[kind], "watch"); diff --git a/app/g2/wear-remote.ts b/app/g2/wear-remote.ts index bfc69543..99af5c67 100644 --- a/app/g2/wear-remote.ts +++ b/app/g2/wear-remote.ts @@ -25,6 +25,7 @@ import { displayModeSetting, onAnySettingChanged, watchCanUnlockSetting, + watchCrownClockwiseNextSetting, watchMirrorAssistantSetting, watchRemoteEnabledSetting, } from "../ui/dashboard-settings"; @@ -209,6 +210,7 @@ export class WearRemote { apps: this.listApps(), displayMode: displayModeSetting.get(), remoteEnabled: watchRemoteEnabledSetting.get(), + crownClockwiseNext: watchCrownClockwiseNextSetting.get(), canUnlock: watchCanUnlockSetting.get(), mirrorAssistant: watchMirrorAssistantSetting.get(), assistantAvailable: shell.isAssistantAvailable(), @@ -294,10 +296,8 @@ export class WearRemote { ack(false, "The glasses are not connected."); return; } - // The lock only yields to a double-click, exactly as the ring's does - // (handled inside the controller); a dark display wakes on any watch- - // scheme gesture (injectSyntheticRingInput, shared with the phone's own - // pad and d-pad). + // The lock and a dark display only yield to a double-click, exactly as + // the ring does (handled inside the controller). const repeatable = kind === "scroll-up" || kind === "scroll-down" || kind === "swipe-up" || kind === "swipe-down"; const steps = repeatable ? Math.min(MAX_SCROLL_STEPS, Math.max(1, Math.round(readNumber(payload.steps, 1)))) : 1; for (let i = 0; i < steps; i++) { @@ -339,6 +339,10 @@ export class WearRemote { ack(false, "The glasses are not connected."); return; } + if (payload.source === "gesture" && !shell.isScreenOn()) { + ack(true); + return; + } if (state.glassesLocked && command !== "unlock" && command !== "lock") { ack(false, "The glasses are locked."); return; diff --git a/app/ui/dashboard-settings.ts b/app/ui/dashboard-settings.ts index 55f1094f..6a723296 100644 --- a/app/ui/dashboard-settings.ts +++ b/app/ui/dashboard-settings.ts @@ -328,13 +328,13 @@ export const watchCanUnlockSetting = new ConfigSettingBoolean({ "Let the watch unlock the glasses' lock screen (which otherwise waits for the phone to be unlocked). Your watch is on your wrist; turn this off if you would rather it stay a phone-only unlock.", }); -export const watchWakesDisplaySetting = new ConfigSettingBoolean({ - id: "watch-wakes-display", - label: "Watch input wakes display", - storageKey: "watch.wakesDisplay", - defaultValue: true, +export const watchCrownClockwiseNextSetting = new ConfigSettingBoolean({ + id: "watch-crown-clockwise-next", + label: "Clockwise crown = next", + storageKey: "watch.crownClockwiseNext", + defaultValue: false, description: - "Any gesture from the watch turns the glasses display on (the ring only wakes it with a double-tap). Off: watch input is ignored while the display is off, as ring input is.", + "Choose which crown direction moves to the next item. Off: clockwise moves to the previous item. On: clockwise moves to the next item.", }); export const watchMirrorAssistantSetting = new ConfigSettingBoolean({ diff --git a/app/ui/dashboard/settings-menus.ts b/app/ui/dashboard/settings-menus.ts index 59988a2a..45464c61 100644 --- a/app/ui/dashboard/settings-menus.ts +++ b/app/ui/dashboard/settings-menus.ts @@ -60,9 +60,9 @@ import { screenTimeoutSetting, wakeWordActionSetting, watchCanUnlockSetting, + watchCrownClockwiseNextSetting, watchMirrorAssistantSetting, watchRemoteEnabledSetting, - watchWakesDisplaySetting, } from "../dashboard-settings"; import { wearBridge } from "../../native/wear-bridge"; import { SettingsPanelLayer, type SettingsSection } from "./settings-panel"; @@ -167,7 +167,7 @@ function settingsSections(): SettingsSection[] { // a watch running the companion app is currently reachable. items: [ toggleSettingMenuItem(watchRemoteEnabledSetting), - toggleSettingMenuItem(watchWakesDisplaySetting), + toggleSettingMenuItem(watchCrownClockwiseNextSetting), toggleSettingMenuItem(watchCanUnlockSetting), toggleSettingMenuItem(watchMirrorAssistantSetting), ], diff --git a/wear/PROTOCOL.md b/wear/PROTOCOL.md index b3bc0b46..485c5c9b 100644 --- a/wear/PROTOCOL.md +++ b/wear/PROTOCOL.md @@ -18,7 +18,7 @@ answered on `/faceclaw/ack`. | Path | Payload | Effect | | --- | --- | --- | -| `/faceclaw/input` | `{gesture, steps?}` | A ring gesture through the same path as the phone UI's test buttons. `gesture` ∈ `click`, `double-click`, `scroll-up`, `scroll-down`, `long-press` (complete short hold), `long-press-start`, `long-press-release`, `wakeword` ("Hey Even"), `swipe-up`, `swipe-down`, `swipe-left`, `swipe-right` (spatial input only a watch can produce: delivered to the glasses UI as `swipe-*` events for components that navigate spatially — launcher grid, settings columns, sidebar, Music — with a scroll / click / double-click fallback elsewhere). `steps` (1–12) repeats a scroll. Refused while the glasses are disconnected. The lock screen is honoured exactly as for the ring (only a double-click reaches it, toggling the locked display). | +| `/faceclaw/input` | `{gesture, steps?}` | A ring gesture through the same path as the phone UI's test buttons. `gesture` ∈ `click`, `double-click`, `scroll-up`, `scroll-down`, `long-press` (complete short hold), `long-press-start`, `long-press-release`, `wakeword` ("Hey Even"), `swipe-up`, `swipe-down`, `swipe-left`, `swipe-right` (spatial input only a watch can produce: delivered to the glasses UI as `swipe-*` events for components that navigate spatially — launcher grid, settings columns, sidebar, Music — with a scroll / click / double-click fallback elsewhere). `steps` (1–12) repeats a scroll. Refused while the glasses are disconnected. The lock screen is honoured exactly as for the ring. While the display is off, only a double-click is accepted and it wakes the display. | | `/faceclaw/command` | `{command, …}` | `launch-app {appId}`, `focus-window {windowId}`, `close-window {windowId}`, `sidebar`, `wake`, `sleep`, `lock`, `unlock`, `connect`, `disconnect`, `close-assistant`, `display-mode {value}` (`value` ∈ `576x288`, `576x480`, `640x480`; sets the phone's Display > Display mode). Everything but connect/disconnect needs a connection; everything but lock/unlock is refused while locked; `unlock` also needs the phone's "Watch can unlock glasses" setting. | | `/faceclaw/assistant` | `{text}` | Send a query to the assistant (`shell.sendToAssistant`) — the reply shows on the glasses and streams back to the watch as events. | | `/faceclaw/text` | `{text}` | Type text into the foreground window (`receiveTextInput`, e.g. the terminal). Refused when the window doesn't take text. | @@ -54,14 +54,17 @@ dashboard state, re-sent whenever it changes (and at least every 30 s): "windows": [{"windowId": "…", "title": "…", "appId": "…", "focused": true, "closeable": true, "acceptsText": false}], "apps": [{"appId": "timer", "title": "Timer"}], "displayMode": "576x288", - "remoteEnabled": true, "canUnlock": true, "mirrorAssistant": true, + "remoteEnabled": true, "crownClockwiseNext": false, + "canUnlock": true, "mirrorAssistant": true, "assistantAvailable": true } ``` `protocol` is reserved for incompatible revisions of this format (nothing checks it yet); `displayMode` mirrors the phone's Display > Display mode and -is what the `display-mode` command changes. +is what the `display-mode` command changes. `crownClockwiseNext` mirrors the +on-glasses Settings > Watch toggle; when false (the default), clockwise crown +rotation sends previous/up, and when true it sends next/down. `apps` is the launcher grid plus installed EvenHub packages, i.e. exactly what the assistant's `apps.launch` tool accepts. diff --git a/wear/README.md b/wear/README.md index e525dea4..04697424 100644 --- a/wear/README.md +++ b/wear/README.md @@ -15,7 +15,7 @@ the phone it only tells you to install it. | double-tap, or a two-finger tap | **back**, everywhere: closes menus, leaves a settings column, leaves a folder or the launcher grid, returns to the sidebar (and from the sidebar turns the display off, as the ring does) | | press and hold | the app's context menu (a long press, held until you lift your finger) | | swipe ↑ ↓ ← → | **spatial navigation, with no mode to enter first**: the launcher highlights one app and the swipe moves it by a row or a column; the settings panel moves between its columns and down its lists; the sidebar moves up and down; Music skips to the previous / next track. Right goes *into* things (sidebar → window, section → items) and left comes back *out* (first column → sidebar). Anywhere without a spatial meaning, up/down scroll, right selects and left goes back. One step per swipe (long swipes used to repeat, which overshot lists whenever the display lagged); use repeated flicks, the crown, or a two-finger page swipe to cover distance. "Natural swipe" flips the vertical sense; left/right can be remapped in settings. | -| rotate the crown | up / down (one step per detent-ish, sensitivity adjustable) — in the launcher that is rows, elsewhere scrolling | +| rotate the crown | previous / next (one step per detent-ish, sensitivity adjustable) — clockwise is previous by default; reverse it in the on-glasses Settings > Watch section | | two-finger swipe up / down | scroll a page (3 steps) | | **twist the wrist twice** (two brisk flicks, either direction) | back — from the gyroscope; on by default, sensitivity adjustable | | **tip taps** — tap your index finger against your thumb | select; two quick taps = back. From the accelerometer; **off by default** (experimental): on a wrist, ordinary hand movement produced phantom selects in testing. Turn on in Watch settings; needs ~¼ s of stillness before a tap counts, and both motion gestures are ignored while the watch is off the wrist or buzzing. | @@ -31,7 +31,9 @@ ever seeing a difference. long press; button 2 = back; button 3 = "Hey Even". You can also set the watch's button shortcut to open Faceclaw. -**Bottom row buttons**: Assistant, Type into app, Apps, Status. +**Bottom row buttons**: Assistant, Type into app, Apps, Status. They are hidden +by default; swipe up beginning at the bottom edge to slide them in, then swipe +down beginning in the button tray to hide them. - **Assistant** — ask the assistant using the *watch's* microphone (system speech recognition) or the Wear keyboard, and read the reply on the watch as @@ -53,9 +55,9 @@ wrist dropping and freezes the app, so the remote would need a wake-up tap before every gesture. Phone-side switches live in Faceclaw's Settings > Watch: turn watch control -off entirely, decide whether watch input wakes a dark display (on by default — -the ring only wakes it with a double-tap), forbid unlocking from the watch, -or stop mirroring assistant replies. +off entirely, reverse the crown direction, forbid unlocking from the watch, +or stop mirroring assistant replies. While the glasses display is off, every +watch gesture except a double-tap is ignored; double-tap wakes it. The watch buzzes differently when the phone refuses or doesn't answer a gesture (glasses disconnected, locked, watch control off); the pill at the diff --git a/wear/app/build.gradle.kts b/wear/app/build.gradle.kts index b75b32e9..71cd6049 100644 --- a/wear/app/build.gradle.kts +++ b/wear/app/build.gradle.kts @@ -32,6 +32,14 @@ android { buildConfig = true } + lint { + // androidx.lifecycle 2.9.x ships a NullSafeMutableLiveData lint check + // that crashes under this AGP's lint (Kotlin analysis API mismatch: + // "Found class KaCallableMemberCall, but interface was expected"). + // We don't use LiveData, so nothing is lost by disabling it. + disable += "NullSafeMutableLiveData" + } + compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/MainActivity.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/MainActivity.kt index d1697802..b5c1e6b9 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/MainActivity.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/MainActivity.kt @@ -20,6 +20,7 @@ class MainActivity : ComponentActivity() { private val stemHandler = Handler(Looper.getMainLooper()) private var stemHoldRunnable: Runnable? = null private var stemHoldSent = false + private var stemOneIgnored = false override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -67,10 +68,16 @@ class MainActivity : ComponentActivity() { if (event.repeatCount == 0) { cancelStemHold() stemHoldSent = false + stemOneIgnored = glassesScreenIsOff() + if (stemOneIgnored) return true val runnable = Runnable { - stemHoldSent = true - haptics.heavy() - link.sendGesture(Gesture.LONG_PRESS_START) + if (glassesScreenIsOff()) { + stemOneIgnored = true + } else { + stemHoldSent = true + haptics.heavy() + link.sendGesture(Gesture.LONG_PRESS_START) + } } stemHoldRunnable = runnable stemHandler.postDelayed(runnable, STEM_HOLD_MS) @@ -85,7 +92,7 @@ class MainActivity : ComponentActivity() { return true } KeyEvent.KEYCODE_STEM_3 -> { - if (event.repeatCount == 0) { + if (event.repeatCount == 0 && !glassesScreenIsOff()) { haptics.click() link.sendGesture(Gesture.WAKEWORD) } @@ -98,11 +105,15 @@ class MainActivity : ComponentActivity() { override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { if (keyCode == KeyEvent.KEYCODE_STEM_1) { cancelStemHold() + if (stemOneIgnored) { + stemOneIgnored = false + return true + } if (stemHoldSent) { stemHoldSent = false haptics.click() link.sendGesture(Gesture.LONG_PRESS_RELEASE) - } else { + } else if (!glassesScreenIsOff()) { haptics.click() link.sendGesture(Gesture.CLICK) } @@ -117,6 +128,9 @@ class MainActivity : ComponentActivity() { stemHoldRunnable = null } + private fun glassesScreenIsOff(): Boolean = + link.state.value?.let { it.connected && !it.screenOn } == true + private companion object { const val STEM_HOLD_MS = 450L } diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/Protocol.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/Protocol.kt index 35c6dc3a..7221a2ab 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/Protocol.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/Protocol.kt @@ -107,6 +107,8 @@ data class PhoneState( val windows: List, val apps: List, val remoteEnabled: Boolean, + /** False by default: clockwise moves to the previous item. */ + val crownClockwiseNext: Boolean, val canUnlock: Boolean, val mirrorAssistant: Boolean, val assistantAvailable: Boolean, @@ -151,6 +153,7 @@ data class PhoneState( } } ?: emptyList(), remoteEnabled = o.optBoolean("remoteEnabled", true), + crownClockwiseNext = o.optBoolean("crownClockwiseNext", false), canUnlock = o.optBoolean("canUnlock", true), mirrorAssistant = o.optBoolean("mirrorAssistant", true), assistantAvailable = o.optBoolean("assistantAvailable", false), diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/WatchPrefs.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/WatchPrefs.kt index 734efb13..2cb19e25 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/WatchPrefs.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/WatchPrefs.kt @@ -37,7 +37,7 @@ data class Prefs( * exactly when a remote wants to stay ready. */ val keepScreenOn: Boolean = true, - /** Swipe/crown direction follows the content (touch-scroll style) instead of the ring. */ + /** Swipe direction follows the content (touch-scroll style) instead of the ring. */ val naturalScroll: Boolean = false, /** Tap the top/bottom of the pad to scroll instead of swiping. */ val tapZones: Boolean = false, diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/Common.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/Common.kt index 975f24f7..8dc7b6c9 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/Common.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/Common.kt @@ -64,7 +64,7 @@ fun padLine(state: PhoneState?, link: LinkStatus): StatusLine = when { state.remoteEnabled == false -> StatusLine("Watch control off", StatusTone.PROBLEM) state.connected -> when { state.locked -> StatusLine("Locked", StatusTone.OFF) - !state.screenOn -> StatusLine("Screen off", StatusTone.OFF) + !state.screenOn -> StatusLine("●● Wake", StatusTone.OFF) state.listening -> StatusLine("Listening…", StatusTone.BUSY) else -> StatusLine(state.foreground?.title ?: "Launcher", StatusTone.GOOD) } diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/RemoteScreen.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/RemoteScreen.kt index 66a709e2..f836832f 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/RemoteScreen.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/RemoteScreen.kt @@ -1,15 +1,18 @@ package com.faceclaw.wear.ui -import androidx.compose.foundation.Canvas +import android.text.format.DateFormat +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.focusable @@ -24,18 +27,18 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.rotary.onRotaryScrollEvent import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner @@ -47,7 +50,6 @@ import androidx.wear.compose.material.ButtonDefaults import androidx.wear.compose.material.Icon import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text -import androidx.wear.compose.material.TimeText import com.faceclaw.wear.Command import com.faceclaw.wear.FingerTapDetector import com.faceclaw.wear.Gesture @@ -59,20 +61,15 @@ import com.faceclaw.wear.R import com.faceclaw.wear.SwipeAction import com.faceclaw.wear.WristTwistDetector import kotlinx.coroutines.delay +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale import kotlin.math.abs -private const val MAX_SWIPE_STEPS = 4 /** A two-finger swipe scrolls this many steps: a "page". */ private const val TWO_FINGER_SWIPE_STEPS = 3 -private const val FLASH_MS = 160L -private const val ARROW_LIT_MS = 220L -private const val RING_RADIUS_FRACTION = 0.33f -private const val RING_CENTER_Y_FRACTION = 0.47f -private val ARROW_INSET = 6.dp -private val ARROW_SIZE = 18.dp - -/** The d-pad directions, for lighting the arrow that was just swiped. */ -enum class Arrow { UP, DOWN, LEFT, RIGHT } +private val EDGE_REVEAL_ZONE = 24.dp +private val BUTTON_TRAY_HEIGHT = 62.dp /** * The touchpad. The whole screen is the pad: tap = select, double-tap = @@ -80,8 +77,8 @@ enum class Arrow { UP, DOWN, LEFT, RIGHT } * the hold menu ("right click"), swipes in four directions = spatial * navigation (crown and two-finger vertical swipes = plain scrolling, a page * at a time for the latter). Fingertip pinch-taps from the motion sensors - * select / go back, and two quick wrist twists go back. The small buttons at - * the bottom reach the rest. + * select / go back, and two quick wrist twists go back. An upward swipe that + * begins at the bottom edge reveals the otherwise-hidden action buttons. */ // rememberActiveFocusRequester (rotary focus) is still experimental in Wear Compose 1.4. @OptIn(ExperimentalWearFoundationApi::class) @@ -98,14 +95,13 @@ fun RemoteScreen( val linkStatus by link.link.collectAsStateWithLifecycle() val notice by link.notice.collectAsStateWithLifecycle() val currentPrefs by rememberUpdatedState(prefs) + val currentState by rememberUpdatedState(state) val view = LocalView.current - var holding by remember { mutableStateOf(false) } - // Brief ring highlight acknowledging a sensor (tip-tap) gesture. - var flashUntil by remember { mutableStateOf(0L) } - var flashing by remember { mutableStateOf(false) } - // Which d-pad arrow lights up for the swipe just sent. - var litArrow by remember { mutableStateOf(null) } - var litTick by remember { mutableStateOf(0L) } + val density = LocalDensity.current + val edgeRevealPx = remember(density) { with(density) { EDGE_REVEAL_ZONE.toPx() } } + val buttonTrayHeightPx = remember(density) { with(density) { BUTTON_TRAY_HEIGHT.toPx() } } + var controlsVisible by remember { mutableStateOf(false) } + var longPressSent by remember { mutableStateOf(false) } // Rotary (crown) events are only delivered to a focused node. // rememberActiveFocusRequester requests focus through the hierarchical // focus machinery; the resume observer below takes it back after every @@ -130,17 +126,19 @@ fun RemoteScreen( onUnavailable = { haptics.error() }, ) + fun glassesScreenIsOff(): Boolean = currentState?.connected == true && currentState?.screenOn == false + + fun gestureAllowed(gesture: Gesture): Boolean = + !glassesScreenIsOff() || gesture == Gesture.DOUBLE_CLICK + fun scroll(gesture: Gesture, steps: Int) { + if (!gestureAllowed(gesture)) return haptics.tick() link.sendGesture(gesture, steps) } - fun light(arrow: Arrow) { - litArrow = arrow - litTick = System.currentTimeMillis() - } - fun click() { + if (!gestureAllowed(Gesture.CLICK)) return haptics.click() link.sendGesture(Gesture.CLICK) } @@ -153,12 +151,18 @@ fun RemoteScreen( /** Run a horizontal-swipe action; `left` says which way the finger went. */ fun perform(action: SwipeAction, left: Boolean) { when (action) { - SwipeAction.NAVIGATE -> { haptics.click(); link.sendGesture(if (left) Gesture.SWIPE_LEFT else Gesture.SWIPE_RIGHT) } - SwipeAction.SIDEBAR -> { haptics.click(); link.sendCommand(Command.SIDEBAR) } + SwipeAction.NAVIGATE -> { + val gesture = if (left) Gesture.SWIPE_LEFT else Gesture.SWIPE_RIGHT + if (gestureAllowed(gesture)) { haptics.click(); link.sendGesture(gesture) } + } + SwipeAction.SIDEBAR -> if (!glassesScreenIsOff()) { + haptics.click() + link.sendCommand(Command.SIDEBAR, "source" to "gesture") + } SwipeAction.DOUBLE_CLICK -> doubleClick() SwipeAction.CLICK -> click() - SwipeAction.LONG_PRESS -> { haptics.heavy(); link.sendGesture(Gesture.LONG_PRESS) } - SwipeAction.WAKEWORD -> { haptics.click(); link.sendGesture(Gesture.WAKEWORD) } + SwipeAction.LONG_PRESS -> if (!glassesScreenIsOff()) { haptics.heavy(); link.sendGesture(Gesture.LONG_PRESS) } + SwipeAction.WAKEWORD -> if (!glassesScreenIsOff()) { haptics.click(); link.sendGesture(Gesture.WAKEWORD) } SwipeAction.NONE -> Unit } } @@ -196,28 +200,41 @@ fun RemoteScreen( } }, onLongPressStart = { - holding = true - haptics.heavy() - link.sendGesture(Gesture.LONG_PRESS_START) + longPressSent = !glassesScreenIsOff() + if (longPressSent) { + haptics.heavy() + link.sendGesture(Gesture.LONG_PRESS_START) + } }, onLongPressEnd = { - holding = false - haptics.click() - link.sendGesture(Gesture.LONG_PRESS_RELEASE) + if (longPressSent) { + longPressSent = false + haptics.click() + link.sendGesture(Gesture.LONG_PRESS_RELEASE) + } }, - onSwipe = { dx, dy, _ -> - if (abs(dy) >= abs(dx)) { - // One step per swipe, regardless of length: the glasses - // repaint per step, and multi-step swipes overshot lists - // whenever the display lagged the finger. Fast repeated - // swiping, the crown, or a two-finger page swipe cover - // long distances instead. - val up = swipeIsUp(dy) - light(if (up) Arrow.UP else Arrow.DOWN) - scroll(if (up) Gesture.SWIPE_UP else Gesture.SWIPE_DOWN, 1) - } else { - light(if (dx < 0) Arrow.LEFT else Arrow.RIGHT) - perform(if (dx < 0) currentPrefs.swipeLeft else currentPrefs.swipeRight, left = dx < 0) + onSwipe = { start, dx, dy, _ -> + val vertical = abs(dy) >= abs(dx) + val padBottom = padHeight[0] + when { + vertical && !controlsVisible && dy < 0 && start.y >= padBottom - edgeRevealPx -> { + controlsVisible = true + haptics.click() + } + vertical && controlsVisible && dy > 0 && start.y >= padBottom - buttonTrayHeightPx -> { + controlsVisible = false + haptics.click() + } + vertical -> { + // One step per swipe, regardless of length: the glasses + // repaint per step, and multi-step swipes overshot lists + // whenever the display lagged the finger. Fast repeated + // swiping, the crown, or a two-finger page swipe cover + // long distances instead. + val up = swipeIsUp(dy) + scroll(if (up) Gesture.SWIPE_UP else Gesture.SWIPE_DOWN, 1) + } + else -> perform(if (dx < 0) currentPrefs.swipeLeft else currentPrefs.swipeRight, left = dx < 0) } }, ) @@ -235,8 +252,8 @@ fun RemoteScreen( sensitivity = { currentPrefs.tapSensitivity }, quietUntil = { haptics.quietUntil() }, onBody = { onBody.onBody }, - onTap = { flashUntil = System.currentTimeMillis() + FLASH_MS; click() }, - onDoubleTap = { flashUntil = System.currentTimeMillis() + FLASH_MS; doubleClick() }, + onTap = { click() }, + onDoubleTap = { doubleClick() }, ) } WhileStartedEffect(fingerTapDetector, start = { fingerTapDetector?.start() }, stop = { fingerTapDetector?.stop() }) @@ -248,21 +265,10 @@ fun RemoteScreen( sensitivity = { currentPrefs.twistSensitivity }, quietUntil = { haptics.quietUntil() }, onBody = { onBody.onBody }, - onDoubleTwist = { flashUntil = System.currentTimeMillis() + FLASH_MS; doubleClick() }, + onDoubleTwist = { doubleClick() }, ) } WhileStartedEffect(wristTwistDetector, start = { wristTwistDetector?.start() }, stop = { wristTwistDetector?.stop() }) - LaunchedEffect(litTick) { - if (litTick == 0L) return@LaunchedEffect - delay(ARROW_LIT_MS) - litArrow = null - } - LaunchedEffect(flashUntil) { - if (flashUntil == 0L) return@LaunchedEffect - flashing = true - delay((flashUntil - System.currentTimeMillis()).coerceAtLeast(1L)) - flashing = false - } // A refused or unanswered gesture gets a distinct buzz, so the wrist knows // without looking (the notice pill says why). @@ -275,15 +281,16 @@ fun RemoteScreen( modifier = Modifier .fillMaxSize() .onRotaryScrollEvent { event -> - // Clockwise (positive) scrolls down, as in every Wear list. crownAccumulator += event.verticalScrollPixels val threshold = currentPrefs.crownSensitivity.pixelsPerStep var steps = 0 while (crownAccumulator >= threshold) { crownAccumulator -= threshold; steps++ } while (crownAccumulator <= -threshold) { crownAccumulator += threshold; steps-- } // Capped low: a fast twirl otherwise outruns the display. - if (steps > 0) { light(Arrow.DOWN); scroll(Gesture.SCROLL_DOWN, steps.coerceAtMost(2)) } - if (steps < 0) { light(Arrow.UP); scroll(Gesture.SCROLL_UP, (-steps).coerceAtMost(2)) } + val clockwise = if (currentState?.crownClockwiseNext == true) Gesture.SCROLL_DOWN else Gesture.SCROLL_UP + val counterClockwise = if (currentState?.crownClockwiseNext == true) Gesture.SCROLL_UP else Gesture.SCROLL_DOWN + if (steps > 0) scroll(clockwise, steps.coerceAtMost(2)) + if (steps < 0) scroll(counterClockwise, (-steps).coerceAtMost(2)) true } .focusRequester(focusRequester) @@ -291,68 +298,47 @@ fun RemoteScreen( .onSizeChanged { padHeight[0] = it.height.toFloat() } .pointerInput(callbacks) { detectTouchpadGestures(callbacks) }, ) { - // The pad: a ring with a d-pad arrow at each compass point (the one - // you swiped lights up), the current glasses app in the middle, and - // the tap legend under it. Brightens while a hold is in progress. - BoxWithConstraints(modifier = Modifier.fillMaxSize()) { - val ringRadius = minOf(maxWidth, maxHeight) * RING_RADIUS_FRACTION - val ringCenterY = maxHeight * RING_CENTER_Y_FRACTION - val ringColor = if (holding || flashing) MaterialTheme.colors.primary else Color(0xFF2E2E2E) - Canvas(modifier = Modifier.fillMaxSize()) { - drawCircle( - color = ringColor, - radius = ringRadius.toPx(), - center = Offset(size.width / 2f, ringCenterY.toPx()), - style = Stroke(width = if (holding || flashing) 4f else 2f), - ) - } + StraightTime(modifier = Modifier.align(Alignment.Center)) - TimeText() - - ArrowGlyph("▲", litArrow == Arrow.UP, Modifier.align(Alignment.TopCenter).padding(top = ringCenterY - ringRadius + ARROW_INSET)) - ArrowGlyph("▼", litArrow == Arrow.DOWN, Modifier.align(Alignment.TopCenter).padding(top = ringCenterY + ringRadius - ARROW_INSET - ARROW_SIZE)) - ArrowGlyph("◀", litArrow == Arrow.LEFT, Modifier.align(Alignment.TopStart).padding(start = maxWidth / 2 - ringRadius + ARROW_INSET, top = ringCenterY - ARROW_SIZE / 2)) - ArrowGlyph("▶", litArrow == Arrow.RIGHT, Modifier.align(Alignment.TopEnd).padding(end = maxWidth / 2 - ringRadius + ARROW_INSET, top = ringCenterY - ARROW_SIZE / 2)) - - // The single status indicator: what the next gesture lands on (the - // app on the glasses, or the screen/lock state in the way of it), - // or the connection problem to fix first. Above the centre line; - // the tap legend below it, clear of the side arrows. + AnimatedVisibility( + visible = !controlsVisible, + enter = fadeIn(), + exit = fadeOut(), + modifier = Modifier.align(Alignment.Center).offset(y = 46.dp), + ) { val pad = padLine(state, linkStatus) Text( - text = if (holding) "holding" else pad.text, + text = pad.text, style = MaterialTheme.typography.title3, - color = when { - holding -> MaterialTheme.colors.primary - pad.tone == StatusTone.GOOD -> MaterialTheme.colors.onSurface - else -> pad.tone.color() - }, + color = if (pad.tone == StatusTone.GOOD) MaterialTheme.colors.onSurface else pad.tone.color(), textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier - .align(Alignment.TopCenter) - .padding(top = ringCenterY - 44.dp, start = 60.dp, end = 60.dp), - ) - Text( - text = if (prefs.tapZones) "▲▼ tap zones · ● select" else "● select ●● back ‒ menu", - style = MaterialTheme.typography.caption3, - color = MaterialTheme.colors.onSurfaceVariant, - textAlign = TextAlign.Center, - maxLines = 1, - modifier = Modifier - .align(Alignment.TopCenter) - .padding(top = ringCenterY + 18.dp, start = 56.dp, end = 56.dp), + modifier = Modifier.padding(horizontal = 42.dp), ) + } + AnimatedVisibility( + visible = controlsVisible, + enter = slideInVertically(initialOffsetY = { it }), + exit = slideOutVertically(targetOffsetY = { it }), + modifier = Modifier.align(Alignment.BottomCenter), + ) { Row( // Four 36dp buttons need 144dp; at this height the round // display's chord is ~186dp wide, so 36dp margins keep every // button inside the glass. modifier = Modifier - .align(Alignment.BottomCenter) .fillMaxWidth() - .padding(horizontal = 36.dp, vertical = 26.dp), + .height(BUTTON_TRAY_HEIGHT) + .pointerInput(Unit) { + detectTrayDismiss { + controlsVisible = false + haptics.click() + } + } + .padding(horizontal = 36.dp) + .padding(bottom = 26.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, ) { @@ -393,14 +379,27 @@ private fun WhileStartedEffect(key: Any?, start: () -> Unit, stop: () -> Unit) { } } +/** A large, straight clock fixed on the vertical centre of the touchpad. */ @Composable -private fun ArrowGlyph(glyph: String, lit: Boolean, modifier: Modifier) { +private fun StraightTime(modifier: Modifier = Modifier) { + val context = LocalContext.current + var now by remember { mutableStateOf(System.currentTimeMillis()) } + val pattern = remember(context) { if (DateFormat.is24HourFormat(context)) "HH:mm" else "h:mm" } + val formatter = remember(pattern) { SimpleDateFormat(pattern, Locale.getDefault()) } + LaunchedEffect(Unit) { + while (true) { + val current = System.currentTimeMillis() + now = current + delay(60_000L - current % 60_000L) + } + } Text( - text = glyph, - style = MaterialTheme.typography.caption1, - color = if (lit) MaterialTheme.colors.primary else Color(0xFF6E6E6E), + text = formatter.format(Date(now)), + color = MaterialTheme.colors.onSurface, + fontSize = 42.sp, textAlign = TextAlign.Center, - modifier = modifier.size(ARROW_SIZE), + maxLines = 1, + modifier = modifier, ) } diff --git a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/TouchpadGestures.kt b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/TouchpadGestures.kt index 1dee96cc..3698af99 100644 --- a/wear/app/src/main/kotlin/com/faceclaw/wear/ui/TouchpadGestures.kt +++ b/wear/app/src/main/kotlin/com/faceclaw/wear/ui/TouchpadGestures.kt @@ -4,8 +4,10 @@ import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown import androidx.compose.foundation.gestures.waitForUpOrCancellation import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.input.pointer.PointerEventPass import androidx.compose.ui.input.pointer.PointerInputScope import androidx.compose.ui.input.pointer.positionChanged +import kotlin.math.abs /** What the remote's touch surface can report. */ class TouchpadCallbacks( @@ -17,7 +19,7 @@ class TouchpadCallbacks( val onLongPressStart: () -> Unit, val onLongPressEnd: () -> Unit, /** Finger travelled past touch slop; dx/dy are the total displacement. */ - val onSwipe: (dx: Float, dy: Float, durationMs: Long) -> Unit, + val onSwipe: (start: Offset, dx: Float, dy: Float, durationMs: Long) -> Unit, ) /** @@ -86,7 +88,7 @@ suspend fun PointerInputScope.detectTouchpadGestures(callbacks: TouchpadCallback callbacks.onLongPressEnd() } maxPointers >= 2 -> if (moved) callbacks.onTwoFingerSwipe(displacement.x, displacement.y) else callbacks.onTwoFingerTap() - moved -> callbacks.onSwipe(displacement.x, displacement.y, duration) + moved -> callbacks.onSwipe(down.position, displacement.x, displacement.y, duration) else -> { // A plain tap; give a second tap a chance to make it a double. val second = withTimeoutOrNull(doubleTapTimeout) { awaitFirstDown() } @@ -108,6 +110,30 @@ suspend fun PointerInputScope.detectTouchpadGestures(callbacks: TouchpadCallback } } +/** + * Observe the button tray before its child buttons consume a pointer. A + * downward drag claims the gesture and dismisses the tray; a tap remains + * untouched so the button below receives its normal click. + */ +suspend fun PointerInputScope.detectTrayDismiss(onDismiss: () -> Unit) { + val slop = viewConfiguration.touchSlop + awaitEachGesture { + val down = awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial) + var dismissed = false + while (true) { + val event = awaitPointerEvent(PointerEventPass.Initial) + val primary = event.changes.firstOrNull { it.id == down.id } ?: event.changes.first() + val displacement = primary.position - down.position + if (!dismissed && displacement.y > slop && displacement.y >= abs(displacement.x)) { + dismissed = true + onDismiss() + } + if (dismissed) event.changes.forEach { it.consume() } + if (event.changes.none { it.pressed }) break + } + } +} + /** Poll interval while a hold or drag is in progress (no timeout semantics needed). */ private const val HOLD_POLL_MS = 60_000L