{"entries":[{"lastCommit":{"author":{"email":"zach@zdnelson.com","name":"Zach Nelson","when":"2026-02-27T15:48:24.000000-06:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T22:48:24.000000+01:00"},"hash":"050a3bd1b673a206b1b6cb63bb25d94e6eccea5a","message":"fix: ActivityManager tweaks (#1220)\n\n## Summary\n\n**What is the goal of this PR?**\n\nSmall tweaks to #1016:\n- Only Activity and ActivityManager can access activityResultHandler and\nactivityResult\n- `[[maybe_unused]]` in RenderLock constructor\n- Only ActivityManager and RenderLock can access renderingMutex\n- Missing renderUpdate after failed wifi selection\n- Standardize on activities calling finish instead of\nactivityManager.popActivity\n- Hold RenderLock while mutating state in EpubReaderActivity result\nhandlers\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? _**NO**_","tree":"b60cabd4362a4a900ff5a7728bf58081bdcd6317"},"mode":"0100644","name":"CalibreConnectActivity.cpp","size":8355},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"CalibreConnectActivity.h","size":1540},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"CrossPointWebServerActivity.cpp","size":16444},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"CrossPointWebServerActivity.h","size":2285},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"NetworkModeSelectionActivity.cpp","size":3266},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"NetworkModeSelectionActivity.h","size":1069},{"lastCommit":{"author":{"email":"pablohc@users.noreply.github.com","name":"pablohc","when":"2026-04-18T23:12:56.000000+02:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-04-18T16:12:56.000000-05:00"},"hash":"77b2c31635ad6ee8275ed032c4b3645be96ce400","message":"refactor: redesign on-screen keyboard (#1644)\n\n# Refactor: Redesign On-Screen Keyboard\n\n## Summary\n\nComplete redesign of the on-screen keyboard (used for WiFi password,\nKOReader, Calibre URLs) with improved layout, navigation, visual style,\nand new input features: **cursor mode** for text navigation, **password\nmode** with visibility toggle, and **URL mode** with pre-defined\nsnippets.\n\n## Screenshots\n\n### Base Theme\n|**master** | **PR #1644** |\n|----------|-------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/49125857-12d0-4020-b872-05d0ddbf1d94\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/ad16656b-d66e-43dd-8697-2b85f709d7f8\"\n/$ |\n\n### Lyra Theme\n| **master** | **PR #1644** |\n|----------|-------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/d9901251-9154-48d2-83b4-376d3223d132\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/84b45949-ed61-4924-af1b-d570c4c61e13\"\n/$ |\n\n### Keyboard States\n\n| ABC Mode | Symbol Mode | URL Mode |\n|----------|-------------|----------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/6397a82e-50b8-4d03-92e0-f707ed7c9054\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/205d34fe-0413-49e9-9db2-30569c297ba0\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/801ddeab-e082-4a22-a9df-c66adb1afc16\"\n/$ |\n\n| Cursor Mode | Password Toggle |\n|-------------|-----------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/841773e1-7a3c-45e5-aa89-e5787255608c\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/9487a0b3-3f47-41ed-9cd3-b24e56e342a8\"\n/$ |\n\n## Changes\n\n### Layout (10-column uniform grid)\n- Reduced from 13/11/10 columns per row to **10 uniform columns** across\nall rows\n- Keyboard now uses **90% of screen width** (was ~66%)\n- Row 0: Numbers `1-9, 0` with secondary symbols (`!@#$%^&*()`)\n- Rows 1-3: Standard QWERTY letters\n- Bottom row: `shift` | `#@!` | `___` | `←` | `OK`\n\n### New Symbol Mode (#@!)\n- New mode toggle key `#@!` / `abc` switches between letter and symbol\nlayouts\n- Symbol layout: 4 rows (numbers, inverted symbols, paired symbols,\nloose symbols)\n- Covers all 95 printable ASCII characters\n- **No secondary hints, no long-press** in symbol mode (simple and\ndirect)\n- SHIFT key remains visible but **disabled** in symbol mode\n\n### URL Mode\n- In `InputType::Url`, the Space key becomes a **URL toggle** button\n- Activating URL mode replaces the 4 content rows with a **3×3 grid of\nURL snippets**:\n - Col 0 (protocols): `https://`, `http://`, `/opds`\n - Col 1 (hosts/ports): `www.`, `192.168.`, `:8080`\n - Col 2 (domains): `.com`, `.org`, `.net`\n- Snippets are inserted as full strings at the cursor position\n- URL mode **persists** after inserting a snippet (does not\nauto-deactivate)\n- Column alignment: col 0 over ABC, col 1 over URL, col 2 over Del\n- Up/Down navigation maps `bottomCol - 1` / `urlCol + 1`\n- SHIFT disabled in URL mode\n- SpecMode (`abc`) exits URL mode back to ABC\n- SpecSpace (`URL`) toggles URL mode on/off; selection always stays on\nthe URL button\n- Button styled with `KeyboardKeyType::Mode` for consistent outline\n\n### Cursor Mode\n- **Enter**: Long-press Up (500ms) while in keyboard mode\n- **Exit**: Short-press Down while in cursor mode (resets\n`passwordVisible`, clears toggle position)\n- **Navigate**: Left/Right move cursor position within text (one\nposition per press, no continuous repeat)\n- **Visual**:\n - Keyboard mode: underline cursor (2px line + serifs)\n - Cursor mode: inverted block cursor (black fill + white character)\n- Block width adapts to the actual character width under cursor (minimum\n6px for narrow chars like space)\n- Block position includes inter-character kerning offset for correct\nalignment (calculated via string-difference: `getTextWidth(before+char)\n- getTextWidth(before) - getTextWidth(char)`)\n - End-of-text: thin 6px block\n- Password hidden: 3-part drawing (Part 1 + block + Part 3) to prevent\nblock overflow onto `*` characters\n- Toggle position: caret (\"I\") cursor at saved position, `[abc]`/`[***]`\nlabel with inverted selection\n- **Inactive key styling**:\n - BaseTheme: 2px outline rectangle\n - LyraTheme: gray filled rounded rectangle (`Color::LightGray`)\n- **Password toggle position**: in cursor mode (Password only), Hold\nRight (500ms) enters toggle — caret cursor shows saved position,\n`[abc]`/`[***]` label becomes selected. Press Confirm to toggle\n`passwordVisible`. Press Left to restore cursor to saved position. Right\nfrom toggle is a no-op. Down from toggle exits to keyboard.\n- `cursorPos` persists between keyboard and cursor modes\n\n### Password Mode\n- `InputType::Password` enum replaces `bool isPassword` parameter\n- Text is masked with `*` except for one revealed character:\n - Keyboard mode: reveals character at `cursorPos - 1`\n- Cursor mode: no reveal in display text (block cursor draws actual char\ndirectly)\n- **Toggle `[abc]`/`[***]`**: accessible via cursor mode — Hold Right\n(500ms) enters toggle position, Confirm toggles visibility, Left exits\nback to cursor. Caret (\"I\") shown at saved position while in toggle.\n- `passwordVisible` resets to `false` when exiting cursor mode\n- **Long-press Del (1.5s)**: clears all text and resets cursor to 0\n\n### InputType Enum\n- Replaced `bool isPassword` constructor parameter with `enum class\nInputType { Text, Password, Url }`\n- Callers updated: `WifiSelectionActivity`, `KOReaderSettingsActivity`,\n`CalibreSettingsActivity`\n\n### Contextual Tips\n- `\"Tips:\"` header followed by context-sensitive hints, centered between\ntext field underline and keyboard as a block\n- ABC mode: `\"Hold SELECT for UPPERCASE or secondary char\"` (shift ON:\n`\"lowercase\"` variant) + `\"Hold DEL to clear all text\"` (only if text\nnot empty)\n- ABC + `InputType::Url`: same + `\"Press URL for snippets\"`\n- Symbol mode: `\"Hold DEL to clear all text\"` (only if text not empty)\n- URL mode: `\"Press ABC to exit URL mode\"` + `\"Hold DEL to clear all\ntext\"` (only if text not empty)\n- Cursor mode: `\"Press DOWN to return to keyboard\"`\n\n### Hint Phases (cursor mode, Password only)\n- **Phase 1**: `\"Hold UP to edit entry\"` — shown after 2× DEL press,\nauto-hides after 4s, positioned below underline\n- **Phase 2**: `\"Press < or > to move cursor\"` + dynamic password toggle\nhint — shown when entering cursor mode, positioned below underline,\nvisible until exit\n- When `!passwordVisible`: `\"Hold > then press [abc] to show password\"`\n - When `passwordVisible`: `\"Hold > then press [***] to hide password\"`\n - When in toggle position: `\"Press < to return to cursor position\"`\n\n### Long-Press Alternative Character\n- Holding Confirm (>500ms) inserts the **alternative character** instead\nof the primary\n- Letters: long-press inserts opposite case (e.g., `a`→`A`, `A`→`a`)\n- Numbers/symbols (row 0): long-press inserts secondary (e.g., `0`→`)`,\n`)`→`0`)\n- Only active in ABC mode; disabled in Symbol mode and URL mode\n- **`InputType::Url`**: Hold SELECT on ABC rows 1+ (letters) returns\nprimary character only (same as short press). Row 0 (symbols) still\nreturns secondary character on Hold SELECT.\n\n### Shift (2 sticky states)\n- Reduced from 3 states (shift/SHIFT/LOCK) to **2 sticky states**\n(shift/SHIFT)\n- Shift stays active after typing until manually toggled off\n- Label: `shift` (off) / `SHIFT` (on)\n\n### SpecialKeyType Enum\n- `enum class SpecialKeyType { Shift, Mode, Space, Del, Ok }` replaces\nplain `enum` (`SpecShift`, `SpecMode`, etc.) for type safety\n- All switch cases updated to `SpecialKeyType::*` with\n`static_cast()` for array indexing\n- `onExit()` reverted to simple `Activity::onExit()` call (half-refresh\nremoved)\n- **Bottom row column mapping**: navigating up/down between content rows\nand bottom row uses `col/2` and `col*2` formulas for consistent\npositioning (10 cols ↔ 5 cols)\n- **URL mode column mapping**: `bottomCol - 1` / `urlCol + 1` (3 cols ↔\n5 cols)\n- **Wrap-around**: row 0 → up → bottom row and bottom row → down → row 0\nboth apply correct column mapping\n\n### Visual Improvements (both Base and Lyra themes)\n- **Space key**: underscore-style horizontal line (60% of key width, 3px\nthick)\n- **Delete key**: arrow `←` drawn with lines (3px thick) instead of\n\"DEL\" text\n- **Secondary label** (ABC row 0): small hint in top-right corner with\nseparation from primary number\n- **BaseTheme**: selection uses **inverted fill** (black rect + white\ntext) instead of `[bracket]` markers\n- **BaseTheme**: text field brackets drawn as **stretchable lines** that\nadapt to multi-line input (1px normal, 3px cursor mode)\n- **LyraTheme**: text field uses **fixed-width underline** (16px\nmargins, 8px each side) instead of stretchable line (2px normal, 3px\ncursor mode)\n- **Both themes**: special keys (shift, mode, space, del, OK) have\nbordered/bordered-rounded rectangles\n- **Font size**: keyboard uses `UI_12_FONT_ID` in both themes (was\n`UI_10` in Base)\n- **Key height**: 40px in all themes for better proportions\n- **Layout unification**: text and password toggle are left-aligned in\nall themes (`keyboardCenteredText = false` for Lyra/Lyra3Covers)\n- **`primaryOffset` removed**: dead code eliminated from BaseTheme and\nLyraTheme `drawKeyboardKey`\n\n### New Theme Metrics\n- `keyboardVerticalOffset`: per-theme vertical adjustment of keyboard\nposition\n - Base: `-13`, Lyra: `-7`\n- `keyboardBottomKeySpacing`: independent spacing for bottom row keys\n - Base: `5`, Lyra: `5`\n- Bottom-aligned keyboard in both themes for consistent vertical\npositioning\n- Bottom row total width calculated to match content rows width (10-col\nbased, consistent across modes)\n- 4px extra gap between content rows and bottom row when `bkSpacing > 0`\n- `keyboardCenteredText`: `false` for all themes (unified left-aligned\ntext)\n\n### Defensive Improvements\n- **State reset on re-entry**: `onEnter()` resets all mutable state\n(`symMode`, `urlMode`, `cursorMode`, `togglePos`, `passwordVisible`,\n`shiftState`, `selectedRow`, `selectedCol`, `rightHeld`,\n`rightLongHandled`, `savedCursorPos`, `rightStartCursorPos`,\n`delPressCount`, `hintVisible`, `hintShowTime`) — prevents stale state\nwhen re-entering the keyboard\n- **Bounds checking**: `insertChar`/`insertString` clamp `cursorPos` to\n`text.length()` before inserting\n- **Empty string guard**: `insertString` returns early on empty string\n- **`std::string::npos`**: used instead of `SIZE_MAX` for size_t\nsentinel (proper C++ idiom)\n- **`` header**: included for `std::max`\n\n## Files Modified\n\n| File | Changes |\n|------|---------|\n| `src/activities/util/KeyboardEntryActivity.h` | `InputType` enum,\n`KeyDef` struct, 10-col layouts, cursor/password/URL/toggle state, hints\n(`delPressCount`, `hintVisible`, `hintShowTime`), held vars\n(`rightHeld`, `rightLongHandled`, `savedCursorPos`,\n`rightStartCursorPos`), `mapColContentBottom` helper |\n| `src/activities/util/KeyboardEntryActivity.cpp` | Complete rewrite:\nlayout rendering, symbol/cursor/password/URL modes, toggle position,\nlong-press, contextual tips, hint phases, block cursor kerning\nalignment, defensive bounds checks, state reset |\n| `src/components/themes/BaseTheme.h` | `KeyboardKeyType` enum, new\n`drawTextField`/`drawKeyboardKey` signatures, `keyboardVerticalOffset`,\n`keyboardBottomKeySpacing` metrics |\n| `src/components/themes/BaseTheme.cpp` | Redesigned `drawTextField`\n(stretchable brackets), `drawKeyboardKey` (inverted selection,\nspace/delete graphics, secondary label, inactive selection), removed\n`primaryOffset` dead code |\n| `src/components/themes/lyra/LyraTheme.h` | Override signatures,\n`keyboardVerticalOffset`, `keyboardBottomKeySpacing`,\n`keyboardKeyHeight` adjustments |\n| `src/components/themes/lyra/LyraTheme.cpp` | `drawTextField` (fixed\nunderline), `drawKeyboardKey` (rounded rects for special keys,\nspace/delete graphics, secondary label, inactive selection), removed\n`primaryOffset` dead code |\n| `src/components/themes/lyra/Lyra3CoversTheme.h` |\n`keyboardCenteredText = false`, `keyboardVerticalOffset = -7`, inherits\nLyra overrides |\n| `src/activities/network/WifiSelectionActivity.cpp` | `bool isPassword`\n→ `InputType::Password` |\n| `src/activities/settings/KOReaderSettingsActivity.cpp` | `bool\nisPassword` → `InputType::Text`/`InputType::Password`/`InputType::Url` |\n| `src/activities/settings/CalibreSettingsActivity.cpp` | `bool\nisPassword` → `InputType::Text`/`InputType::Password`/`InputType::Url` |\n\n## Backward Compatibility\n\n- **API change**: Constructor parameter changed from `bool isPassword`\nto `InputType inputType` (default `InputType::Text`)\n- **All callers updated**: WiFi, KOReader, and Calibre integrations\nmigrated to new `InputType` enum\n\n## Testing\n\n### Input & Text Handling\n- [x] Empty input → press OK (submit empty string)\n- [x] Back button → cancel (no text returned)\n- [x] Pre-filled initial text (e.g., editing existing WiFi password)\n- [x] Password mode: text masked with `*` characters, one character\nrevealed\n- [x] Delete on empty text (no crash)\n- [x] Very long text near maxLength limit\n- [x] URL with path and port (~60 chars)\n- [x] Multi-line text wrapping in input field\n- [x] Space insert in middle of text (cursor mode)\n- [x] Delete last character repeatedly\n- [ ] Type all 95 printable ASCII characters\n\n### Mode Switching\n- [x] ABC → #@! preserves typed text and cursor position\n- [x] #@! → ABC preserves typed text and cursor position\n- [x] Shift state preserved when switching modes\n- [x] Switch modes multiple times rapidly\n\n### Shift Behavior\n- [x] Shift OFF → type letter → inserts lowercase, shift stays OFF\n- [x] Shift ON → type letter → inserts uppercase, shift stays ON\n- [x] Shift ON → type number → inserts symbol, shift stays ON\n- [x] Shift ON → navigate rows → shift stays ON\n- [x] Shift ON → switch to #@! → shift shows \"shift\" (disabled)\n- [x] Shift ON → switch to ABC → shift state preserved\n- [x] Shift ON → switch to URL → shift shows \"shift\" (disabled)\n- [x] Shift disabled in URL mode: pressing shift does nothing\n\n### Long-Press\n- [x] Long-press letter with shift OFF → inserts uppercase\n- [x] Long-press letter with shift ON → inserts lowercase\n- [x] Long-press number → inserts secondary symbol\n- [x] Long-press symbol (row 0) → inserts opposite (number)\n- [x] Long-press key without secondary (e.g., `-`, `=` in rows 2-3) →\ninserts primary character on release\n- [x] Long-press on special keys (shift, mode, space, del, ok) → no\nalternative inserted\n- [x] Long-press in #@! mode → no effect (disabled)\n- [x] Long-press in URL mode → no effect (disabled)\n- [x] Long-press number in row 0 with InputType::Url → inserts secondary\nsymbol (same as non-URL)\n- [x] Short press after cancelled long-press → normal behavior\n- [x] Long-press at maxLength → no character inserted\n- [x] Long-press Del (1.5s) → clears all text\n\n### Cursor Mode\n- [x] Long-press Up → enters cursor mode\n- [x] Short-press Down → exits cursor mode (resets passwordVisible)\n- [x] Left/Right navigate within text\n- [x] Left at position 0 → no movement\n- [x] Right at end of text → no movement in Text mode, enters toggle in\nPassword mode (Hold Right)\n- [x] Block cursor visual: correct width for character, thin block at\nend\n- [x] Underline cursor visual (keyboard mode): correct position with\nserifs\n- [x] Inactive key styling: outline (Base) or gray fill (Lyra) on\nselected key\n- [x] Typing with cursor mid-text → inserts at cursor position\n- [x] Deleting with cursor mid-text → deletes character before cursor\n- [x] Exit cursor mode → type at cursor position (inserts mid-text, not\nat end)\n- [x] Exit cursor mode from toggle → cursor at saved position (not end\nof text)\n\n### Password Mode\n- [x] Masked text with one revealed character at `cursorPos - 1`\n- [x] Cursor mode: block shows actual character, display text all `*`\n- [x] Toggle `[abc]`/`[***]`: Hold Right (500ms) in cursor mode enters\ntoggle, Confirm toggles visibility, Left exits back to cursor\n- [x] Exiting cursor mode resets `passwordVisible` to false\n- [x] Long-press Del clears all text\n\n### URL Mode\n- [x] URL toggle activates/deactivates URL mode\n- [x] URL button stays selected after toggle (both on and off)\n- [x] Deactivating URL mode returns to ABC (not SYM)\n- [x] 3×3 snippet grid displays correctly\n- [x] Column alignment: col 0 over ABC, col 1 over URL, col 2 over Del\n- [x] Snippet insertion: inserts full string at cursor position\n- [x] URL mode persists after snippet insertion\n- [x] Shift disabled in InputType::Url\n- [x] SpecMode (`abc`) exits URL mode to ABC\n- [x] Up/Down navigation between URL grid and bottom row\n\n### Re-entry State Reset\n- [x] Enter keyboard → activate URL mode → exit → re-enter → URL mode\nOFF\n- [x] Enter keyboard → switch to SYM → exit → re-enter → ABC mode\n- [x] Enter keyboard → enter cursor mode → exit → re-enter → keyboard\nmode\n- [x] Enter keyboard → enter toggle pos → exit → re-enter → togglePos\nOFF\n- [x] Enter keyboard → activate shift → exit → re-enter → shift OFF\n- [x] Enter password keyboard → toggle password visible → exit →\nre-enter → password hidden\n\n### Navigation\n- [x] Left/right wrap-around within content rows\n- [x] Left/right wrap-around within bottom row\n- [x] Up from row 0 → bottom row (correct column mapping)\n- [x] Down from bottom row → row 0 (correct column mapping)\n- [x] Up from bottom row → last content row (correct column)\n- [x] Down from last content row → bottom row (correct column)\n- [x] Navigate horizontally in bottom row, then up → correct content\ncolumn\n- [x] Navigate horizontally in bottom row, then down (wrap) → correct\ncontent column\n\n### Visual (both themes)\n- [x] Secondary hints only on ABC row 0\n- [x] No secondary hints in #@! mode or URL mode\n- [x] No secondary hints on letter rows (1-3)\n- [x] Space bar: horizontal line centered, not touching edges\n- [x] Delete: arrow `←` drawn correctly\n- [x] Selected key: inverted colors (black fill, white text)\n- [x] All special keys have border rectangles\n- [x] Fixed underline in text field (Both themes)\n- [x] Mode key label: `#@!` in ABC mode, `abc` in symbol mode, `abc` in\nURL mode\n- [x] URL key label: `URL` (only in InputType::Url), styled same as\nother bottom keys\n- [x] Shift label: `shift` when OFF, `SHIFT` when ON, `shift` when\ndisabled (SYM/URL)\n- [x] Both themes: bottom row total width matches content rows width\n- [x] URL snippet grid centered over ABC/URL/Del buttons\n\n### Device & Theme Coverage\n- [ ] Base Theme on X3\n- [x] Base Theme on X4\n- [ ] Lyra Theme on X3\n- [x] Lyra Theme on X4\n- [ ] Lyra Extended Theme on X3\n- [x] Lyra Extended Theme on X4\n\n### Toggle Position\n- [x] Hold Right > 500ms in cursor mode (Password) → enters toggle,\ncaret visible at saved position\n- [x] Short-press Right in cursor mode (Password) → advances cursor 1\nposition, does not jump to toggle\n- [x] Short-press Left in cursor mode (Password) → moves cursor left 1\nposition, from toggle returns to saved position\n- [x] Confirm in toggle → toggles `passwordVisible`\n- [x] Left from toggle → returns to saved position, caret disappears,\nblock cursor appears\n- [x] Right from toggle → no-op\n- [x] Down from toggle → exits to keyboard, cursor at saved position\n- [x] Hold Right in cursor mode (InputType::Text) → no effect\n- [x] Hold Right in cursor mode (InputType::Url) → no effect\n- [x] Hold Right < 500ms released in cursor mode (Password) → short\npress, advances cursor 1\n- [x] No continuous repeat when holding Left or Right in cursor mode\n\n### Caret Visual in Toggle\n- [x] In toggle: caret \"I\" visible at saved cursor position\n- [x] Character under cursor visible (no gap) in password not-visible\nmode\n- [x] Character under cursor visible in password visible mode\n- [x] `[abc]`/`[***]` label with inverted selection in toggle\n\n### Contextual Tips\n- [x] `\"Tips:\"` header centered above contextual hints\n- [x] Single tip → `\"Tips:\"` + one line\n- [x] Multiple tips → `\"Tips:\"` + multiple lines, all centered as block\n- [x] No tips shown when not applicable (e.g., ABC with empty text and\nnon-URL)\n- [x] `\"UPPERCASE\"` shown when shift OFF\n- [x] `\"lowercase\"` shown when shift ON\n- [x] `\"secondary char\"` shown for InputType::Url\n\n### Hint Phases\n- [x] 2× DEL → Phase 1 appears (\"Hold UP to edit entry\")\n- [x] Phase 1 auto-hides after 4s\n- [x] Phase 2 appears when entering cursor mode (\"Press < or > to move\ncursor\")\n- [x] Phase 2 shows \"Hold > then press [abc] to show password\" when\n`!passwordVisible`\n- [x] Phase 2 shows \"Hold > then press [***] to hide password\" when\n`passwordVisible`\n- [x] Phase 2 shows \"Press < to return to cursor position\" when in\ntoggle\n- [x] Phase 2 disappears when exiting cursor mode\n\n### Long-Press `InputType::Url` Behavior\n- [x] Hold SELECT on letter rows (rows 1+) with InputType::Url → same\ncharacter as short press\n- [x] Hold SELECT on row 0 with InputType::Url → secondary character\nworks normally\n\n### Number Row Reorder\n- [x] Number row order: 1-9, 0 left to right\n- [x] `(` and `)` are adjacent (positions 8 and 9) via secondary labels\n- [x] Long-press on row 0 returns correct secondary symbols in new order\n- [x] SYM row 1: `(` and `)` also adjacent (positions 8 and 9)\n\n### Block Cursor Alignment\n- [x] Block cursor correctly positioned for consecutive spaces (kerning\noffset applied)\n- [x] Block cursor correctly positioned for mixed characters (letters,\nnumbers, symbols)\n- [x] Block width minimum 6px for narrow characters (space) — visible as\nblock, not thin line\n- [x] Password hidden: 3-part drawing prevents block overflow onto `*`\ncharacters\n- [x] Password visible: block post-loop draws correctly on continuous\ntext (no 3-part needed)\n- [x] End-of-text block: thin 6px block at correct position\n\n### Integration\n- [x] WiFi password entry (connect to network)\n- [ ] KOReader username, password, and sync server URL\n- [ ] Calibre OPDS URL, username, and password\n- [ ] Calibre OPDS URL: empty → opens with \"https://\" prefilled\n- [ ] Calibre OPDS URL: type \"http://\" or \"https://\" only → saved as\nempty\n- [ ] Calibre OPDS URL: type full URL → saved correctly\n- [ ] Calibre OPDS URL: existing URL → opens with existing URL (not\n\"https://\" prefill)","tree":"b89dfd0fce3e992c7e226d41285390d54a020e24"},"mode":"0100644","name":"WifiSelectionActivity.cpp","size":24567},{"lastCommit":{"author":{"email":"son@huggingface.co","name":"Xuan-Son Nguyen","when":"2026-02-27T07:32:40.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-02-27T00:32:40.000000-06:00"},"hash":"c4fc4effbdb8912204f6580fbffbf61769785d04","message":"refactor: implement ActivityManager (#1016)\n\n## Summary\n\nRef comment:\nhttps://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640\n\nThis PR introduces `ActivityManager`, which mirrors the same concept of\nActivity in Android, where an activity represents a single screen of the\nUI. The manager is responsible for launching activities, and ensuring\nthat only one activity is active at a time.\n\nMain differences from Android's ActivityManager:\n- No concept of Bundle or Intent extras\n- No onPause/onResume, since we don't have a concept of background\nactivities\n- onActivityResult is implemented via a callback instead of a separate\nmethod, for simplicity\n\n## Key changes\n\n- Single `renderTask` shared across all activities\n- No more sub-activity, we manage them using a stack; Results can be\npassed via `startActivityForResult` and `setResult`\n- Activity can call `finish()` to destroy themself, but the actual\ndeletion will be handled by `ActivityManager` to avoid `delete this`\npattern\n\nAs a bonus: the manager will automatically call `requestUpdate()` when\nreturning from another activity\n\n## Example usage\n\n**BEFORE**:\n\n```cpp\n// caller\n enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,\n [this](const bool connected) { onWifiSelectionComplete(connected); }));\n\n// subactivity\n onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior)\n``` \n\n**AFTER**: (mirrors the `startActivityForResult` and `setResult` from\nandroid)\n\n```cpp\n// caller\n startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput),\n [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); });\n\n// subactivity\n ActivityResult result;\n result.isCancelled = false;\n result.selectedNetworkMode = mode;\n setResult(result);\n finish(); // signals to ActivityManager to go back to last activity AFTER this function returns\n```\n\nTODO:\n- [x] Reconsider if the `Intent` is really necessary or it should be\nremoved (note: it's inspired by\n[Intent](https://developer.android.com/guide/components/intents-common)\nfrom Android API) ==> I decided to keep this pattern fr clarity\n- [x] Verify if behavior is still correct (i.e. back from sub-activity)\n- [x] Refactor the `ActivityWithSubactivity` to just simple `Activity`\n--> We are using a stack for keeping track of sub-activity now\n- [x] Use single task for rendering --> avoid allocating 8KB stack per\nactivity\n- [x] Implement the idea of [Activity\nresult](https://developer.android.com/training/basics/intents/result)\n--> Allow sub-activity like Wifi to report back the status (connected,\nfailed, etc)\n\n---\n\n### AI Usage\n\nWhile CrossPoint doesn't have restrictions on AI tools in contributing,\nplease be transparent about their usage as it\nhelps set the right context for reviewers.\n\nDid you use AI tools to help write this code? **PARTIALLY**, some\nrepetitive migrations are done by Claude, but I'm the one how ultimately\napprove it\n\n---------\n\nCo-authored-by: Zach Nelson ","tree":"de4457ab8f1f135075d890d1d6483edee304565b"},"mode":"0100644","name":"WifiSelectionActivity.h","size":3404}],"lastCommit":{"author":{"email":"pablohc@users.noreply.github.com","name":"pablohc","when":"2026-04-18T23:12:56.000000+02:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-04-18T16:12:56.000000-05:00"},"hash":"77b2c31635ad6ee8275ed032c4b3645be96ce400","message":"refactor: redesign on-screen keyboard (#1644)\n\n# Refactor: Redesign On-Screen Keyboard\n\n## Summary\n\nComplete redesign of the on-screen keyboard (used for WiFi password,\nKOReader, Calibre URLs) with improved layout, navigation, visual style,\nand new input features: **cursor mode** for text navigation, **password\nmode** with visibility toggle, and **URL mode** with pre-defined\nsnippets.\n\n## Screenshots\n\n### Base Theme\n|**master** | **PR #1644** |\n|----------|-------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/49125857-12d0-4020-b872-05d0ddbf1d94\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/ad16656b-d66e-43dd-8697-2b85f709d7f8\"\n/$ |\n\n### Lyra Theme\n| **master** | **PR #1644** |\n|----------|-------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/d9901251-9154-48d2-83b4-376d3223d132\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/84b45949-ed61-4924-af1b-d570c4c61e13\"\n/$ |\n\n### Keyboard States\n\n| ABC Mode | Symbol Mode | URL Mode |\n|----------|-------------|----------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/6397a82e-50b8-4d03-92e0-f707ed7c9054\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/205d34fe-0413-49e9-9db2-30569c297ba0\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/801ddeab-e082-4a22-a9df-c66adb1afc16\"\n/$ |\n\n| Cursor Mode | Password Toggle |\n|-------------|-----------------|\n| $\"image\"\nsrc=\"https://github.com/user-attachments/assets/841773e1-7a3c-45e5-aa89-e5787255608c\"\n/$ | $\"image\"\nsrc=\"https://github.com/user-attachments/assets/9487a0b3-3f47-41ed-9cd3-b24e56e342a8\"\n/$ |\n\n## Changes\n\n### Layout (10-column uniform grid)\n- Reduced from 13/11/10 columns per row to **10 uniform columns** across\nall rows\n- Keyboard now uses **90% of screen width** (was ~66%)\n- Row 0: Numbers `1-9, 0` with secondary symbols (`!@#$%^&*()`)\n- Rows 1-3: Standard QWERTY letters\n- Bottom row: `shift` | `#@!` | `___` | `←` | `OK`\n\n### New Symbol Mode (#@!)\n- New mode toggle key `#@!` / `abc` switches between letter and symbol\nlayouts\n- Symbol layout: 4 rows (numbers, inverted symbols, paired symbols,\nloose symbols)\n- Covers all 95 printable ASCII characters\n- **No secondary hints, no long-press** in symbol mode (simple and\ndirect)\n- SHIFT key remains visible but **disabled** in symbol mode\n\n### URL Mode\n- In `InputType::Url`, the Space key becomes a **URL toggle** button\n- Activating URL mode replaces the 4 content rows with a **3×3 grid of\nURL snippets**:\n - Col 0 (protocols): `https://`, `http://`, `/opds`\n - Col 1 (hosts/ports): `www.`, `192.168.`, `:8080`\n - Col 2 (domains): `.com`, `.org`, `.net`\n- Snippets are inserted as full strings at the cursor position\n- URL mode **persists** after inserting a snippet (does not\nauto-deactivate)\n- Column alignment: col 0 over ABC, col 1 over URL, col 2 over Del\n- Up/Down navigation maps `bottomCol - 1` / `urlCol + 1`\n- SHIFT disabled in URL mode\n- SpecMode (`abc`) exits URL mode back to ABC\n- SpecSpace (`URL`) toggles URL mode on/off; selection always stays on\nthe URL button\n- Button styled with `KeyboardKeyType::Mode` for consistent outline\n\n### Cursor Mode\n- **Enter**: Long-press Up (500ms) while in keyboard mode\n- **Exit**: Short-press Down while in cursor mode (resets\n`passwordVisible`, clears toggle position)\n- **Navigate**: Left/Right move cursor position within text (one\nposition per press, no continuous repeat)\n- **Visual**:\n - Keyboard mode: underline cursor (2px line + serifs)\n - Cursor mode: inverted block cursor (black fill + white character)\n- Block width adapts to the actual character width under cursor (minimum\n6px for narrow chars like space)\n- Block position includes inter-character kerning offset for correct\nalignment (calculated via string-difference: `getTextWidth(before+char)\n- getTextWidth(before) - getTextWidth(char)`)\n - End-of-text: thin 6px block\n- Password hidden: 3-part drawing (Part 1 + block + Part 3) to prevent\nblock overflow onto `*` characters\n- Toggle position: caret (\"I\") cursor at saved position, `[abc]`/`[***]`\nlabel with inverted selection\n- **Inactive key styling**:\n - BaseTheme: 2px outline rectangle\n - LyraTheme: gray filled rounded rectangle (`Color::LightGray`)\n- **Password toggle position**: in cursor mode (Password only), Hold\nRight (500ms) enters toggle — caret cursor shows saved position,\n`[abc]`/`[***]` label becomes selected. Press Confirm to toggle\n`passwordVisible`. Press Left to restore cursor to saved position. Right\nfrom toggle is a no-op. Down from toggle exits to keyboard.\n- `cursorPos` persists between keyboard and cursor modes\n\n### Password Mode\n- `InputType::Password` enum replaces `bool isPassword` parameter\n- Text is masked with `*` except for one revealed character:\n - Keyboard mode: reveals character at `cursorPos - 1`\n- Cursor mode: no reveal in display text (block cursor draws actual char\ndirectly)\n- **Toggle `[abc]`/`[***]`**: accessible via cursor mode — Hold Right\n(500ms) enters toggle position, Confirm toggles visibility, Left exits\nback to cursor. Caret (\"I\") shown at saved position while in toggle.\n- `passwordVisible` resets to `false` when exiting cursor mode\n- **Long-press Del (1.5s)**: clears all text and resets cursor to 0\n\n### InputType Enum\n- Replaced `bool isPassword` constructor parameter with `enum class\nInputType { Text, Password, Url }`\n- Callers updated: `WifiSelectionActivity`, `KOReaderSettingsActivity`,\n`CalibreSettingsActivity`\n\n### Contextual Tips\n- `\"Tips:\"` header followed by context-sensitive hints, centered between\ntext field underline and keyboard as a block\n- ABC mode: `\"Hold SELECT for UPPERCASE or secondary char\"` (shift ON:\n`\"lowercase\"` variant) + `\"Hold DEL to clear all text\"` (only if text\nnot empty)\n- ABC + `InputType::Url`: same + `\"Press URL for snippets\"`\n- Symbol mode: `\"Hold DEL to clear all text\"` (only if text not empty)\n- URL mode: `\"Press ABC to exit URL mode\"` + `\"Hold DEL to clear all\ntext\"` (only if text not empty)\n- Cursor mode: `\"Press DOWN to return to keyboard\"`\n\n### Hint Phases (cursor mode, Password only)\n- **Phase 1**: `\"Hold UP to edit entry\"` — shown after 2× DEL press,\nauto-hides after 4s, positioned below underline\n- **Phase 2**: `\"Press < or > to move cursor\"` + dynamic password toggle\nhint — shown when entering cursor mode, positioned below underline,\nvisible until exit\n- When `!passwordVisible`: `\"Hold > then press [abc] to show password\"`\n - When `passwordVisible`: `\"Hold > then press [***] to hide password\"`\n - When in toggle position: `\"Press < to return to cursor position\"`\n\n### Long-Press Alternative Character\n- Holding Confirm (>500ms) inserts the **alternative character** instead\nof the primary\n- Letters: long-press inserts opposite case (e.g., `a`→`A`, `A`→`a`)\n- Numbers/symbols (row 0): long-press inserts secondary (e.g., `0`→`)`,\n`)`→`0`)\n- Only active in ABC mode; disabled in Symbol mode and URL mode\n- **`InputType::Url`**: Hold SELECT on ABC rows 1+ (letters) returns\nprimary character only (same as short press). Row 0 (symbols) still\nreturns secondary character on Hold SELECT.\n\n### Shift (2 sticky states)\n- Reduced from 3 states (shift/SHIFT/LOCK) to **2 sticky states**\n(shift/SHIFT)\n- Shift stays active after typing until manually toggled off\n- Label: `shift` (off) / `SHIFT` (on)\n\n### SpecialKeyType Enum\n- `enum class SpecialKeyType { Shift, Mode, Space, Del, Ok }` replaces\nplain `enum` (`SpecShift`, `SpecMode`, etc.) for type safety\n- All switch cases updated to `SpecialKeyType::*` with\n`static_cast()` for array indexing\n- `onExit()` reverted to simple `Activity::onExit()` call (half-refresh\nremoved)\n- **Bottom row column mapping**: navigating up/down between content rows\nand bottom row uses `col/2` and `col*2` formulas for consistent\npositioning (10 cols ↔ 5 cols)\n- **URL mode column mapping**: `bottomCol - 1` / `urlCol + 1` (3 cols ↔\n5 cols)\n- **Wrap-around**: row 0 → up → bottom row and bottom row → down → row 0\nboth apply correct column mapping\n\n### Visual Improvements (both Base and Lyra themes)\n- **Space key**: underscore-style horizontal line (60% of key width, 3px\nthick)\n- **Delete key**: arrow `←` drawn with lines (3px thick) instead of\n\"DEL\" text\n- **Secondary label** (ABC row 0): small hint in top-right corner with\nseparation from primary number\n- **BaseTheme**: selection uses **inverted fill** (black rect + white\ntext) instead of `[bracket]` markers\n- **BaseTheme**: text field brackets drawn as **stretchable lines** that\nadapt to multi-line input (1px normal, 3px cursor mode)\n- **LyraTheme**: text field uses **fixed-width underline** (16px\nmargins, 8px each side) instead of stretchable line (2px normal, 3px\ncursor mode)\n- **Both themes**: special keys (shift, mode, space, del, OK) have\nbordered/bordered-rounded rectangles\n- **Font size**: keyboard uses `UI_12_FONT_ID` in both themes (was\n`UI_10` in Base)\n- **Key height**: 40px in all themes for better proportions\n- **Layout unification**: text and password toggle are left-aligned in\nall themes (`keyboardCenteredText = false` for Lyra/Lyra3Covers)\n- **`primaryOffset` removed**: dead code eliminated from BaseTheme and\nLyraTheme `drawKeyboardKey`\n\n### New Theme Metrics\n- `keyboardVerticalOffset`: per-theme vertical adjustment of keyboard\nposition\n - Base: `-13`, Lyra: `-7`\n- `keyboardBottomKeySpacing`: independent spacing for bottom row keys\n - Base: `5`, Lyra: `5`\n- Bottom-aligned keyboard in both themes for consistent vertical\npositioning\n- Bottom row total width calculated to match content rows width (10-col\nbased, consistent across modes)\n- 4px extra gap between content rows and bottom row when `bkSpacing > 0`\n- `keyboardCenteredText`: `false` for all themes (unified left-aligned\ntext)\n\n### Defensive Improvements\n- **State reset on re-entry**: `onEnter()` resets all mutable state\n(`symMode`, `urlMode`, `cursorMode`, `togglePos`, `passwordVisible`,\n`shiftState`, `selectedRow`, `selectedCol`, `rightHeld`,\n`rightLongHandled`, `savedCursorPos`, `rightStartCursorPos`,\n`delPressCount`, `hintVisible`, `hintShowTime`) — prevents stale state\nwhen re-entering the keyboard\n- **Bounds checking**: `insertChar`/`insertString` clamp `cursorPos` to\n`text.length()` before inserting\n- **Empty string guard**: `insertString` returns early on empty string\n- **`std::string::npos`**: used instead of `SIZE_MAX` for size_t\nsentinel (proper C++ idiom)\n- **`` header**: included for `std::max`\n\n## Files Modified\n\n| File | Changes |\n|------|---------|\n| `src/activities/util/KeyboardEntryActivity.h` | `InputType` enum,\n`KeyDef` struct, 10-col layouts, cursor/password/URL/toggle state, hints\n(`delPressCount`, `hintVisible`, `hintShowTime`), held vars\n(`rightHeld`, `rightLongHandled`, `savedCursorPos`,\n`rightStartCursorPos`), `mapColContentBottom` helper |\n| `src/activities/util/KeyboardEntryActivity.cpp` | Complete rewrite:\nlayout rendering, symbol/cursor/password/URL modes, toggle position,\nlong-press, contextual tips, hint phases, block cursor kerning\nalignment, defensive bounds checks, state reset |\n| `src/components/themes/BaseTheme.h` | `KeyboardKeyType` enum, new\n`drawTextField`/`drawKeyboardKey` signatures, `keyboardVerticalOffset`,\n`keyboardBottomKeySpacing` metrics |\n| `src/components/themes/BaseTheme.cpp` | Redesigned `drawTextField`\n(stretchable brackets), `drawKeyboardKey` (inverted selection,\nspace/delete graphics, secondary label, inactive selection), removed\n`primaryOffset` dead code |\n| `src/components/themes/lyra/LyraTheme.h` | Override signatures,\n`keyboardVerticalOffset`, `keyboardBottomKeySpacing`,\n`keyboardKeyHeight` adjustments |\n| `src/components/themes/lyra/LyraTheme.cpp` | `drawTextField` (fixed\nunderline), `drawKeyboardKey` (rounded rects for special keys,\nspace/delete graphics, secondary label, inactive selection), removed\n`primaryOffset` dead code |\n| `src/components/themes/lyra/Lyra3CoversTheme.h` |\n`keyboardCenteredText = false`, `keyboardVerticalOffset = -7`, inherits\nLyra overrides |\n| `src/activities/network/WifiSelectionActivity.cpp` | `bool isPassword`\n→ `InputType::Password` |\n| `src/activities/settings/KOReaderSettingsActivity.cpp` | `bool\nisPassword` → `InputType::Text`/`InputType::Password`/`InputType::Url` |\n| `src/activities/settings/CalibreSettingsActivity.cpp` | `bool\nisPassword` → `InputType::Text`/`InputType::Password`/`InputType::Url` |\n\n## Backward Compatibility\n\n- **API change**: Constructor parameter changed from `bool isPassword`\nto `InputType inputType` (default `InputType::Text`)\n- **All callers updated**: WiFi, KOReader, and Calibre integrations\nmigrated to new `InputType` enum\n\n## Testing\n\n### Input & Text Handling\n- [x] Empty input → press OK (submit empty string)\n- [x] Back button → cancel (no text returned)\n- [x] Pre-filled initial text (e.g., editing existing WiFi password)\n- [x] Password mode: text masked with `*` characters, one character\nrevealed\n- [x] Delete on empty text (no crash)\n- [x] Very long text near maxLength limit\n- [x] URL with path and port (~60 chars)\n- [x] Multi-line text wrapping in input field\n- [x] Space insert in middle of text (cursor mode)\n- [x] Delete last character repeatedly\n- [ ] Type all 95 printable ASCII characters\n\n### Mode Switching\n- [x] ABC → #@! preserves typed text and cursor position\n- [x] #@! → ABC preserves typed text and cursor position\n- [x] Shift state preserved when switching modes\n- [x] Switch modes multiple times rapidly\n\n### Shift Behavior\n- [x] Shift OFF → type letter → inserts lowercase, shift stays OFF\n- [x] Shift ON → type letter → inserts uppercase, shift stays ON\n- [x] Shift ON → type number → inserts symbol, shift stays ON\n- [x] Shift ON → navigate rows → shift stays ON\n- [x] Shift ON → switch to #@! → shift shows \"shift\" (disabled)\n- [x] Shift ON → switch to ABC → shift state preserved\n- [x] Shift ON → switch to URL → shift shows \"shift\" (disabled)\n- [x] Shift disabled in URL mode: pressing shift does nothing\n\n### Long-Press\n- [x] Long-press letter with shift OFF → inserts uppercase\n- [x] Long-press letter with shift ON → inserts lowercase\n- [x] Long-press number → inserts secondary symbol\n- [x] Long-press symbol (row 0) → inserts opposite (number)\n- [x] Long-press key without secondary (e.g., `-`, `=` in rows 2-3) →\ninserts primary character on release\n- [x] Long-press on special keys (shift, mode, space, del, ok) → no\nalternative inserted\n- [x] Long-press in #@! mode → no effect (disabled)\n- [x] Long-press in URL mode → no effect (disabled)\n- [x] Long-press number in row 0 with InputType::Url → inserts secondary\nsymbol (same as non-URL)\n- [x] Short press after cancelled long-press → normal behavior\n- [x] Long-press at maxLength → no character inserted\n- [x] Long-press Del (1.5s) → clears all text\n\n### Cursor Mode\n- [x] Long-press Up → enters cursor mode\n- [x] Short-press Down → exits cursor mode (resets passwordVisible)\n- [x] Left/Right navigate within text\n- [x] Left at position 0 → no movement\n- [x] Right at end of text → no movement in Text mode, enters toggle in\nPassword mode (Hold Right)\n- [x] Block cursor visual: correct width for character, thin block at\nend\n- [x] Underline cursor visual (keyboard mode): correct position with\nserifs\n- [x] Inactive key styling: outline (Base) or gray fill (Lyra) on\nselected key\n- [x] Typing with cursor mid-text → inserts at cursor position\n- [x] Deleting with cursor mid-text → deletes character before cursor\n- [x] Exit cursor mode → type at cursor position (inserts mid-text, not\nat end)\n- [x] Exit cursor mode from toggle → cursor at saved position (not end\nof text)\n\n### Password Mode\n- [x] Masked text with one revealed character at `cursorPos - 1`\n- [x] Cursor mode: block shows actual character, display text all `*`\n- [x] Toggle `[abc]`/`[***]`: Hold Right (500ms) in cursor mode enters\ntoggle, Confirm toggles visibility, Left exits back to cursor\n- [x] Exiting cursor mode resets `passwordVisible` to false\n- [x] Long-press Del clears all text\n\n### URL Mode\n- [x] URL toggle activates/deactivates URL mode\n- [x] URL button stays selected after toggle (both on and off)\n- [x] Deactivating URL mode returns to ABC (not SYM)\n- [x] 3×3 snippet grid displays correctly\n- [x] Column alignment: col 0 over ABC, col 1 over URL, col 2 over Del\n- [x] Snippet insertion: inserts full string at cursor position\n- [x] URL mode persists after snippet insertion\n- [x] Shift disabled in InputType::Url\n- [x] SpecMode (`abc`) exits URL mode to ABC\n- [x] Up/Down navigation between URL grid and bottom row\n\n### Re-entry State Reset\n- [x] Enter keyboard → activate URL mode → exit → re-enter → URL mode\nOFF\n- [x] Enter keyboard → switch to SYM → exit → re-enter → ABC mode\n- [x] Enter keyboard → enter cursor mode → exit → re-enter → keyboard\nmode\n- [x] Enter keyboard → enter toggle pos → exit → re-enter → togglePos\nOFF\n- [x] Enter keyboard → activate shift → exit → re-enter → shift OFF\n- [x] Enter password keyboard → toggle password visible → exit →\nre-enter → password hidden\n\n### Navigation\n- [x] Left/right wrap-around within content rows\n- [x] Left/right wrap-around within bottom row\n- [x] Up from row 0 → bottom row (correct column mapping)\n- [x] Down from bottom row → row 0 (correct column mapping)\n- [x] Up from bottom row → last content row (correct column)\n- [x] Down from last content row → bottom row (correct column)\n- [x] Navigate horizontally in bottom row, then up → correct content\ncolumn\n- [x] Navigate horizontally in bottom row, then down (wrap) → correct\ncontent column\n\n### Visual (both themes)\n- [x] Secondary hints only on ABC row 0\n- [x] No secondary hints in #@! mode or URL mode\n- [x] No secondary hints on letter rows (1-3)\n- [x] Space bar: horizontal line centered, not touching edges\n- [x] Delete: arrow `←` drawn correctly\n- [x] Selected key: inverted colors (black fill, white text)\n- [x] All special keys have border rectangles\n- [x] Fixed underline in text field (Both themes)\n- [x] Mode key label: `#@!` in ABC mode, `abc` in symbol mode, `abc` in\nURL mode\n- [x] URL key label: `URL` (only in InputType::Url), styled same as\nother bottom keys\n- [x] Shift label: `shift` when OFF, `SHIFT` when ON, `shift` when\ndisabled (SYM/URL)\n- [x] Both themes: bottom row total width matches content rows width\n- [x] URL snippet grid centered over ABC/URL/Del buttons\n\n### Device & Theme Coverage\n- [ ] Base Theme on X3\n- [x] Base Theme on X4\n- [ ] Lyra Theme on X3\n- [x] Lyra Theme on X4\n- [ ] Lyra Extended Theme on X3\n- [x] Lyra Extended Theme on X4\n\n### Toggle Position\n- [x] Hold Right > 500ms in cursor mode (Password) → enters toggle,\ncaret visible at saved position\n- [x] Short-press Right in cursor mode (Password) → advances cursor 1\nposition, does not jump to toggle\n- [x] Short-press Left in cursor mode (Password) → moves cursor left 1\nposition, from toggle returns to saved position\n- [x] Confirm in toggle → toggles `passwordVisible`\n- [x] Left from toggle → returns to saved position, caret disappears,\nblock cursor appears\n- [x] Right from toggle → no-op\n- [x] Down from toggle → exits to keyboard, cursor at saved position\n- [x] Hold Right in cursor mode (InputType::Text) → no effect\n- [x] Hold Right in cursor mode (InputType::Url) → no effect\n- [x] Hold Right < 500ms released in cursor mode (Password) → short\npress, advances cursor 1\n- [x] No continuous repeat when holding Left or Right in cursor mode\n\n### Caret Visual in Toggle\n- [x] In toggle: caret \"I\" visible at saved cursor position\n- [x] Character under cursor visible (no gap) in password not-visible\nmode\n- [x] Character under cursor visible in password visible mode\n- [x] `[abc]`/`[***]` label with inverted selection in toggle\n\n### Contextual Tips\n- [x] `\"Tips:\"` header centered above contextual hints\n- [x] Single tip → `\"Tips:\"` + one line\n- [x] Multiple tips → `\"Tips:\"` + multiple lines, all centered as block\n- [x] No tips shown when not applicable (e.g., ABC with empty text and\nnon-URL)\n- [x] `\"UPPERCASE\"` shown when shift OFF\n- [x] `\"lowercase\"` shown when shift ON\n- [x] `\"secondary char\"` shown for InputType::Url\n\n### Hint Phases\n- [x] 2× DEL → Phase 1 appears (\"Hold UP to edit entry\")\n- [x] Phase 1 auto-hides after 4s\n- [x] Phase 2 appears when entering cursor mode (\"Press < or > to move\ncursor\")\n- [x] Phase 2 shows \"Hold > then press [abc] to show password\" when\n`!passwordVisible`\n- [x] Phase 2 shows \"Hold > then press [***] to hide password\" when\n`passwordVisible`\n- [x] Phase 2 shows \"Press < to return to cursor position\" when in\ntoggle\n- [x] Phase 2 disappears when exiting cursor mode\n\n### Long-Press `InputType::Url` Behavior\n- [x] Hold SELECT on letter rows (rows 1+) with InputType::Url → same\ncharacter as short press\n- [x] Hold SELECT on row 0 with InputType::Url → secondary character\nworks normally\n\n### Number Row Reorder\n- [x] Number row order: 1-9, 0 left to right\n- [x] `(` and `)` are adjacent (positions 8 and 9) via secondary labels\n- [x] Long-press on row 0 returns correct secondary symbols in new order\n- [x] SYM row 1: `(` and `)` also adjacent (positions 8 and 9)\n\n### Block Cursor Alignment\n- [x] Block cursor correctly positioned for consecutive spaces (kerning\noffset applied)\n- [x] Block cursor correctly positioned for mixed characters (letters,\nnumbers, symbols)\n- [x] Block width minimum 6px for narrow characters (space) — visible as\nblock, not thin line\n- [x] Password hidden: 3-part drawing prevents block overflow onto `*`\ncharacters\n- [x] Password visible: block post-loop draws correctly on continuous\ntext (no 3-part needed)\n- [x] End-of-text block: thin 6px block at correct position\n\n### Integration\n- [x] WiFi password entry (connect to network)\n- [ ] KOReader username, password, and sync server URL\n- [ ] Calibre OPDS URL, username, and password\n- [ ] Calibre OPDS URL: empty → opens with \"https://\" prefilled\n- [ ] Calibre OPDS URL: type \"http://\" or \"https://\" only → saved as\nempty\n- [ ] Calibre OPDS URL: type full URL → saved correctly\n- [ ] Calibre OPDS URL: existing URL → opens with existing URL (not\n\"https://\" prefill)","tree":"b89dfd0fce3e992c7e226d41285390d54a020e24"}}