fix(ui): one rule for value rows, one meaning for Hold Enter

Three interaction inconsistencies found while auditing the favourites work, all of the same shape: the same gesture meaning different things depending on which screen you were on. Value rows in popup menus. Rows like "Notif: ON" or "Sort: Dist" show a value the user steps through with LEFT/RIGHT, but Enter treated them as ordinary menu picks and closed the popup, so changing two of them meant reopening the menu in between. Trail's settings submenu was the lone exception, working around it by rebuilding and re-selecting after each Enter. PopupMenu now knows the difference: addValueItem() marks a row, and Enter on it returns the new VALUE_NEXT instead of SELECTED, leaving the menu open. Only Back closes a menu now. Applied to the Messages contact/room/channel menus, Nodes, the Ringtone editor and Trail, which drops its reopenSettingsAt() workaround. The LEFT/RIGHT cycling bodies moved into one helper per menu, since Enter and RIGHT now share them. Nodes' Fav row was the worst case: LEFT/RIGHT did nothing there at all, so the only way to toggle a favourite was an Enter that dismissed the menu on every flip. Its label moved to a member buffer (as the Pin row already had) so it can be retitled in place. Settings rows Auto-off, Low battery, GPS pwr and Battery ignored Enter, though their options wrap exactly like the melody/keyboard/clock rows beside them, where Enter has always stepped forward. They accept it now. Rows that ramp between fixed ends (Brightness, Volume, TX Pwr, Timezone, SF/BW/CR) stay LEFT/RIGHT-only -- there is nothing to wrap to. Hold Enter no longer doubles as Back. It quietly meant "go back" on Tools, Locator, Live Share, Repeater, Bot, Auto-Advert, GPIO, Compass, the Dashboard config and the Messages navigate view, while elsewhere the same long press opens a context menu. It now only ever opens a menu, or does nothing where there is none. Same for dismissing an open popup, which it used to do. Checked that this strands nobody: every board that can reach these screens has a real Back key (back_btn on joystick boards, Esc on CardKB/TCA8418/T-Deck). Single-button boards produce no KEY_ENTER at all, so they never leave the home pages in the first place.
2026-09-14 15:16:40 +00:00 · 2026-08-31 15:43:10 +02:00
parent 57851627cf
commit 6d1e71cd3f
19 changed files with 259 additions and 178 deletions
@@ -102,6 +102,8 @@ Selecting the row opens a read-only list of the resolved hops — each shown as

 **Hold Enter** on a contact entry opens a context menu:

+> Rows that show a value (`Notif:`, `Melody:`, `Fav:`) are changed in place — **LEFT/RIGHT** steps the value and **Enter** advances it, with the menu staying open. Only **Back** closes the menu. The same rule holds in every context menu on the device.
+
 |           OLED            |           E-Ink           |
 | :-----------------------: | :-----------------------: |
 | ![](./ctx_contact_oled.png) | ![](./ctx_contact_eink.png) |
@@ -109,9 +111,9 @@ Selecting the row opens a read-only list of the resolved hops — each shown as
 | Item                         | Action                                                                         |
 | ---------------------------- | ------------------------------------------------------------------------------ |
 | Mark as read                 | Clears unread counter for this contact                                         |
-| Notif: Default / OFF / ON    | Per-contact notification override — **LEFT/RIGHT** to cycle                    |
-| Melody: Global / M1 / M2     | Per-contact melody override — **LEFT/RIGHT** to cycle                          |
-| Fav: ON / OFF                | Mark this contact as a favourite — **LEFT/RIGHT** to toggle                    |
+| Notif: Default / OFF / ON    | Per-contact notification override — **LEFT/RIGHT** or **Enter** to cycle                    |
+| Melody: Global / M1 / M2     | Per-contact melody override — **LEFT/RIGHT** or **Enter** to cycle                          |
+| Fav: ON / OFF                | Mark this contact as a favourite — **LEFT/RIGHT** or **Enter** to toggle                    |
 | Pin to dial / Unpin (slot N) | Pin this contact to a Favourites Dial slot; if already pinned shows which slot |

 **Fav** and **Pin to dial** are separate. **Fav** is the starred flag shared with the companion app: it marks the row with a ★, sorts it above the rest of the list (unless **Settings › Contacts › Favs top** is off), and drives the `DMs = Fav` list filter. **Pin to dial** puts the contact on the [Favourites Dial](../favourites_dial/favourites_dial.md) page and changes nothing about the list.
@@ -124,7 +126,7 @@ In the **Rooms** list the context menu instead offers:
 | ------------- | ---------------------------------------------------------------------------- |
 | Login…        | Opens the password prompt to (re-)log in to this room (see Rooms — logging in) |
 | Logout        | Only shown once logged in. Forgets the saved password so the next open prompts for one again |
-| Fav: ON / OFF | Mark this room as a favourite — **LEFT/RIGHT** to toggle; drives the **Rooms = Fav** list filter |
+| Fav: ON / OFF | Mark this room as a favourite — **LEFT/RIGHT** or **Enter** to toggle; drives the **Rooms = Fav** list filter |
 | Pin to dial / Unpin (slot N) | Pin this room to a [Favourites Dial](../favourites_dial/favourites_dial.md) slot |

 ---
@@ -140,9 +142,9 @@ In the **Rooms** list the context menu instead offers:
 | Item                      | Action                                                                |
 | ------------------------- | --------------------------------------------------------------------- |
 | Mark all read             | Clears all unread for this channel                                    |
-| Notif: Default / OFF / ON | Per-channel notification override — **LEFT/RIGHT** to cycle           |
-| Melody: Global / M1 / M2  | Per-channel melody override — **LEFT/RIGHT** to cycle                 |
-| Fav: ON / OFF             | Add or remove this channel from favourites — **LEFT/RIGHT** to toggle |
+| Notif: Default / OFF / ON | Per-channel notification override — **LEFT/RIGHT** or **Enter** to cycle           |
+| Melody: Global / M1 / M2  | Per-channel melody override — **LEFT/RIGHT** or **Enter** to cycle                 |
+| Fav: ON / OFF             | Add or remove this channel from favourites — **LEFT/RIGHT** or **Enter** to toggle |
 | Pin to dial / Unpin (slot N) | Pin this channel to a [Favourites Dial](../favourites_dial/favourites_dial.md) slot |
 | Edit                      | Opens the Add/Edit form below, pre-filled with the channel's name    |
 | Delete                    | Removes the channel immediately (no confirm prompt)                   |
@@ -8,7 +8,7 @@
 | :-----------------------: | :-----------------------: |
 | ![](./overview_oled.png) | ![](./overview_eink.png) |

-All settings are saved to flash and restored on next boot. Settings are organised into collapsible sections. Press **Enter** on a section header to expand or collapse it — all sections start collapsed for faster navigation. Press **LEFT/RIGHT** to change a value, or **Enter** for toggle items.
+All settings are saved to flash and restored on next boot. Settings are organised into collapsible sections. Press **Enter** on a section header to expand or collapse it — all sections start collapsed for faster navigation. Press **LEFT/RIGHT** to change a value. **Enter** advances any row whose options wrap around — toggles, melodies, and option lists like Auto-off. Rows that ramp between fixed ends (Brightness, Volume, TX Pwr, Timezone, SF / BW / CR) are LEFT/RIGHT only, since there is nothing to wrap to.

 Press **Cancel/Back** to save and return to the home screen.

@@ -19,7 +19,7 @@ Press **Cancel/Back** to save and return to the home screen.
 | Setting                              | Options                          | Notes                                                                                                 |
 | ------------------------------------ | -------------------------------- | ----------------------------------------------------------------------------------------------------- |
 | Brightness                           | 1–5                              | LEFT/RIGHT; preview applies immediately                                                               |
-| Auto-off                             | 5 s / 15 s / 30 s / 60 s / never | LEFT/RIGHT                                                                                            |
+| Auto-off                             | 5 s / 15 s / 30 s / 60 s / never | LEFT/RIGHT, or **Enter** to advance                                                                   |
 | Auto-lock                            | ON / OFF                         | Locks device when display turns off                                                                   |
 | Battery                              | icon / % / V                     | Display mode for the top-bar battery indicator                                                        |
 | Clock seconds                        | show / hide                      | Hiding reduces OLED refresh from 1 s to 60 s                                                          |
@@ -41,10 +41,10 @@ Select a node to see its coordinates, distance, bearing with cardinal direction,
 | Ping                   | a public key is known for the node                                                     |
 | Save waypoint          | selected node has GPS                                                                   |
 | Set as target          | selected node has GPS **and** a public key — pins it as the active **Locator/Nav target** right away (see **Locator**) |
-| Fav: ON / OFF          | selected node is a saved contact — the same starred flag the Messages lists use, shared with the companion app |
+| Fav: ON / OFF          | selected node is a saved contact — **LEFT/RIGHT** or **Enter** toggles it in place, as in the Messages menus; the same starred flag those lists use, shared with the companion app |
 | Pin to dial / Unpin (slot N) | selected node is a saved contact — puts it on the [Favourites Dial](../favourites_dial/favourites_dial.md), taking the first free slot |
 | Admin                  | selected node is a saved **repeater or room server** contact — opens **Tools › Admin** for it directly (see **Admin**) |
-| Sort: Dist/Recent      | browsing stored nodes — **LEFT/RIGHT** on the row flips distance ↔ last-heard in place |
+| Sort: Dist/Recent      | browsing stored nodes — **LEFT/RIGHT** or **Enter** flips distance ↔ last-heard in place |
 | Discover scan / Rescan | always (live `NODE_DISCOVER_REQ` scan)                                                  |

 Filtering stays on the list itself (**LEFT/RIGHT** cycles the type), so there is no separate Filter action in the menu. **Sort** is adjusted in place: highlight the **Sort** row and tap **LEFT/RIGHT** to flip the list (and its right-hand column) between **distance** and **last-heard** without closing the menu — the same in-popup pattern as Trail's settings. The row appears only while browsing stored nodes (live-scan rows carry signal, not distance). Filter and sort are independent and **persist** across re-entry to the screen.
@@ -350,8 +350,8 @@ Each melody supports up to 32 notes:
 | ------------ | ----------- | -------------------------------------- |
 | Play / Stop  | Enter       | Preview the melody                     |
 | Melody 1 / 2 | Enter       | Switch to the other slot               |
-| Duration     | LEFT/RIGHT  | Cycle duration for selected note       |
-| BPM          | LEFT/RIGHT  | Cycle tempo                            |
+| Duration     | LEFT/RIGHT or Enter | Cycle duration for selected note |
+| BPM          | LEFT/RIGHT or Enter | Step tempo (stops at each end)  |
 | Insert       | Enter       | Insert a new note after the cursor     |
 | Delete       | Enter       | Delete the note at cursor              |
 | Save & Exit  | Enter       | Persist the melody and return to Tools |