diff --git a/Incido Development Plan.txt b/Incido Development Plan.txt index b7bdeec..cc1d947 100644 --- a/Incido Development Plan.txt +++ b/Incido Development Plan.txt @@ -370,6 +370,7 @@ A short reference for AI assistants: | Version | Date | Notes | |---------|------|-------| +| 0.3.7.1 | 2026-08-30 | **Maintenance release — UI polish + one bug fix.** **1. Editor top bar decluttered.** The Add/Edit `TopAppBar` carried six right-side actions (camera, attach, tag, favourite, save, overflow), which crowded the title on narrow screens. Camera / Attach file / Add tag move to a Keep-style bottom action row (hairline `HorizontalDivider` above it; rides above the nav bar / keyboard via the existing IME insets). The top bar is now back + "New note" / "Edit note" title (`maxLines = 1`, ellipsis) + favourite + save + overflow (Move to Trash when editing) — always fits, and matches the §5.2 spec. **2. Image-viewer false failure fixed.** `ImageViewerScreen` checked `bitmap == null` in a `LaunchedEffect` before the async load finished, so a "Couldn't decode image attachment" toast fired on every persisted image open. Replaced with a `loadFailed` state set only after the byte load / decode genuinely fails; the placeholder switches from "Loading…" to "Couldn't load image" (toast removed). **3. Search QoL.** The list search field auto-focuses on open (`FocusRequester` + `LaunchedEffect(state.isSearchActive)`) and gains a trailing clear (✕) button while the query is non-empty. **4. Drawer tag-list overflow fixed.** The scrollable "Recent tags" column in `IncidoDrawer` had no height cap, so long tag lists could overflow the sheet bottom; it now takes `weight(1f)` and scrolls within the remaining height. Dead `_ignored` workaround val removed. **5. Add-tag sheet autofocus.** The sheet's input field is focused on open so the keyboard is already up. Also small hygiene: unused `persistedBytes` param dropped from `AttachmentStrip`; fully-qualified `Spacer` / `Image` / `Column` / `Dispatchers` references replaced with imports. **6. New flat app icon.** `incido_flat_icon.png` (1024×1024, squircle + shield + pen nib, transparent corners) replaces the v0.3.3.8 artwork: LANCZOS-downscaled into `drawable-{mdpi…xxxhdpi}/ic_launcher_foreground.png` (108/162/216/324/432 px, full 108dp canvas — the artwork's fill colour matches the background layer so the squircle edges blend seamlessly) and legacy `mipmap-{mdpi…xxxhdpi}/ic_launcher{,_round}.png` (48/72/96/144/192 px); `ic_launcher_background` re-tinted `#010435` → `#352999`. versionCode 31→32, versionName "0.3.7.0"→"0.3.7.1", SettingsViewModel.APP_VERSION bumped in lockstep. | | 0.3.7.0 | 2026-08-20 | **Feature release — Trash / soft delete.** Deleting a note (long-press card → ⋮ menu → Delete, or the editor's delete action) now soft-deletes it instead of destroying it: the note is flagged as trashed and hidden from Home, Favorites, Untagged, tag views, and ordinary search. A new **Trash** entry in the nav drawer lists only soft-deleted notes; each Trash card's overflow menu exposes **Restore** (returns the note to its previous views) and **Delete permanently** (destroys the row + attachments for good). `NoteEntity` gains a `trashed` flag (additive schema, auto-migrated); `NoteFilter` gains a `Trash` case; the repository gains `moveToTrash` / `restoreFromTrash` / `deletePermanently`; the drawer, list, and editor ViewModels + screens wire the new actions. Backups round-trip the trashed state. No automatic purge window yet — permanent deletion is immediate (see §6.1 "Trash status" note). versionCode 30→31, versionName "0.3.6.3"→"0.3.7.0", SettingsViewModel.APP_VERSION bumped in lockstep. | | 0.3.6.3 | 2026-08-20 | **Emergency hotfix — actionable missing-keystore failure.** On a fresh clone, `./gradlew assembleRelease` previously died late inside `packageRelease` with the cryptic `SigningConfig "release" is missing required property "storeFile"`. It now fails with a clear `GradleException` quoting the exact `keytool` command from `keystore/README.md` to generate `keystore/release.jks`, implemented as a `validateReleaseKeystore` task whose existence check runs in `doFirst` (so `assembleDebug` still works without a keystore). CI unaffected — `.gitea/workflows/release.yml` mints the dev keystore on release runners before `assembleRelease`. No app/Compose code changes. versionCode 29→30, versionName "0.3.6.2"→"0.3.6.3", SettingsViewModel.APP_VERSION bumped in lockstep. | | 0.3.6.2 | 2026-08-19 | **CI / release-pipeline tag.** v0.3.6.2 is a re-tag of the v0.3.6.1 commit used to exercise the Gitea Actions release workflow (minting the dev keystore on the release runner and attaching the version-stamped debug + release APKs to the Gitea release). No app code or version-string changes landed under this tag — the tagged commit still reads versionName "0.3.6.1" / versionCode 28. | diff --git a/README.md b/README.md index 4b98fe1..32a2307 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Incido is a privacy-first, on-device note-taking application for Android. All data stays on your device by default — no accounts, no cloud, no trackers. -This repository contains the **v0.3.7.0** release: a single-user, offline +This repository contains the **v0.3.7.1** release: a single-user, offline note app with hashtags, favourites, full-text search, colour-coded notes, photo and file attachments, share-into from other apps and the web, Trash (soft delete with Restore / permanent delete), at-rest @@ -16,7 +16,7 @@ device migrations. The architecture is multi-module Android today and is structured so iOS / Desktop ports can happen later without UI rewrites. -**Current release:** v0.3.7.0 (see [Changelog](#changelog) below). +**Current release:** v0.3.7.1 (see [Changelog](#changelog) below). > **Version scheme (from v0.3.0.0 onwards):** `MAJOR.MINOR.MAINTENANCE.EMERGENCY` — > e.g. `0.3.0.0`. `MAJOR.MINOR.MAINTENANCE` are normal release numbers; @@ -27,78 +27,6 @@ rewrites. --- -## Features - -### v0.3.0.0 highlights - -- **Hashtags.** Tag any note with up to 5 hashtags. Tags are always - visible as chips above the editor text field; tap ✕ to remove. Tap - `#` (or `+ add`) to open a sheet with autocomplete suggestions from - your existing tags. Hashtags are searchable from the list (typing - `work` finds notes containing the word *and* notes tagged `#work`). -- **Bolder colour accent on list cards.** Each colour-tagged note now - gets a 14 dp vertical gradient stripe on the left, a subtle 12 % - tinted card background, and a 10 dp solid colour chip in the - top-right — so different-coloured notes are visually distinct at a - glance without you needing to focus on the stripe. -- **Navigation drawer.** Hamburger top-left opens a drawer with - **Home**, **Favorites**, **Untagged**, **Trash**, a divider, then a live - scrollable list of the most-recently-used hashtags. Tap any entry to - filter the list to just those notes. -- **Trash / soft delete.** Deleting a note moves it out of Home, Favorites, - Untagged, tag views, and ordinary search. The Trash view contains only - soft-deleted notes; its overflow menu can restore a note, while permanent - deletion destroys its row and attachments. -- **Centred app-bar title.** Both the list screen (`Incido`) and the - editor (`Edit note` / `New note`) now centre their titles via - Material 3's `CenterAlignedTopAppBar`. -- **New version scheme.** All version bumps from now on follow the - `MAJOR.MINOR.MAINTENANCE.EMERGENCY` pattern; the build refuses anything - that doesn't match. - -### v0.2.0.0 - -- **Favourites.** Tap the star icon on any card to pin it to the top of - the list. -- **Full-text search.** Tap the search icon in the top app bar; the list - filters live as you type. -- **Color-coded notes.** Pick from six preset accent colours in the - editor; each list card gets a 4 dp vertical stripe. -- **Inline checklists.** Lines beginning with `- [ ]` or `- [x]` show - open/done counts on the card preview. -- **Discard-confirm dialog.** Closing the editor with unsaved changes - prompts `Discard changes?` (works for both Back arrow and hardware - back gesture). -- **Release signing** — dev keystore in `keystore/`, `assembleRelease` - produces a v2-signed APK out of the box. - -### v0.2.0.1 (hotfix) - -- **Search icon actually opens the search bar.** v0.2.0.0's - search-active flag was on a separate `StateFlow` the composable never - observed; folded into `uiState` so tapping the icon now lights up the - field. - -### v0.1.1.0 - -- **Editor respects the soft keyboard.** `Scaffold` unions - `WindowInsets.systemBars` with `WindowInsets.ime` so the text field - shrinks above the keyboard. `adjustResize` set as pre-Android-15 - fallback. -- **List cards now show a title + body preview.** First non-empty line - = title; remainder = body preview (max 2 lines, ellipsised). - Empty notes display as "Untitled". - -### v0.1.0.0 - -- Create, edit, and delete plain-text notes -- ObjectBox-backed persistence ([objectbox.io](https://objectbox.io/)) -- Material 3 UI with dynamic color (Android 12+), dark/light follows system -- Fully offline — no `INTERNET` permission -- Multi-module Android project (Android today, iOS/Desktop-ready later) - ---- - ## Roadmap See [`Incido Development Plan.txt`](./Incido%20Development%20Plan.txt) at @@ -110,15 +38,16 @@ cross-platform ports, end-to-end sync, and security features. ## Changelog | Version | Date | Highlights | -| 0.3.7.0 | 2026-08-20 | **Trash / soft delete.** Add a Trash drawer item; deleting a note soft-deletes it, hiding it from every active view and ordinary search. Trash-only cards expose Restore and permanent Delete. | |-----------|------------|------------| +| 0.3.7.1 | 2026-08-30 | **UI polish.** Add/Edit screen tidied up: camera, attach-file, and add-tag moved out of the top bar into a bottom action row, so the title and remaining buttons always fit. Fixed a false "couldn't load image" error that flashed whenever you opened a saved image. Search auto-focuses on open and shows a clear (✕) button. Long tag lists in the drawer now scroll instead of being cut off. The add-tag sheet opens with the keyboard ready. New flat app icon (same shield + pen-nib motif, cleaner squircle design). | +| 0.3.7.0 | 2026-08-20 | **Trash / soft delete.** Add a Trash drawer item; deleting a note soft-deletes it, hiding it from every active view and ordinary search. Trash-only cards expose Restore and permanent Delete. | | 0.3.6.3 | 2026-08-20 | **Missing-keystore failure is now actionable on a fresh clone.** `./gradlew assembleRelease` now fails at configuration time with a clear `GradleException` quoting the exact `keytool` command from `keystore/README.md` if `keystore/release.jks` is missing, instead of dying much later inside `packageRelease` with the cryptic `SigningConfig "release" is missing required property "storeFile"`. CI is unchanged: `.gitea/workflows/release.yml` already mints the dev keystore on the runner before `assembleRelease`. | -| 0.3.6.2 | 2026-08-19 | **CI / release-pipeline tag** — re-tag of v0.3.6.1 used to exercise the Gitea Actions release workflow (keystore minted on the release runner; debug + release APKs attached to the Gitea release). No app changes. | +| 0.3.6.2 | 2026-08-19 | **CI / release-pipeline tag.** — re-tag of v0.3.6.1 used to exercise the Gitea Actions release workflow (keystore minted on the release runner; debug + release APKs attached to the Gitea release). No app changes. | | 0.3.6.1 | 2026-08-19 | **Editor top-bar title is now left-aligned.** On the New / Edit screen the title ("New" / "Edit") now sits next to the back arrow, away from the six action icons that crowd the right edge — it was previously centred via `CenterAlignedTopAppBar` and visually pushed toward the action cluster. **Colour picker is now symmetric between the title bar and the note top.** The picker is flanked by 12dp gaps above and below (was 4dp top + 4dp bottom) so the visual distance to the title bar matches the distance to the `OutlinedTextField`'s top edge, instead of being dwarfed by the field's intrinsic top inset. | | 0.3.6.0 | 2026-08-19 | **Share webpages to Incido.** Sharing a page from your browser (Share → Incido) now creates a note with the page title on the first line and the URL below — fully offline (the title comes from the browser's share data, Incido never touches the network). **Export encryption key.** Settings → Security gains "Export encryption key" — saves the AES-256 key that protects your encrypted notes to a passphrase-protected `.inckey` file for device migrations. **Import encryption key** restores that key on a fresh install, with a clear warning before the current key is replaced. | | 0.3.5.1 | 2026-08-17 | **"Encrypted" badge now appears the moment you flip the switch.** A race in `EncryptionVerifier.checkNow()` could silently drop the post-migration verification, leaving cards without the badge until a second toggle; replaced with a serializing Mutex so every check runs in invocation order. **"Encrypted" indicator is now a single lock icon next to the date** — consistent position on every card instead of a centred "lock + label" group at the bottom. | | 0.3.5.0 | 2026-08-17 | **Real at-rest encryption.** Note text and attachment bytes are now AES-256-GCM encrypted in place the moment you toggle "Encrypt notes at rest" — no restart required; keyed by the Keystore-wrapped 32-byte key. **Verified "Encrypted" badge.** Every encrypted note is trial-decrypted on app open and after each migration; only verified notes get the lock badge. **Block screenshots (default ON).** New toggle in Settings → Security prevents screenshots, screen recording, and app-switcher previews while Incido is open. | -| 0.3.4.0 | 2026-08-17 | **Attachment indicator on note cards** — a paperclip icon now appears on the right edge of every card that carries an attachment. **Light-theme readability over image thumbnails** — cards with a dark photo background now force light text/icon colours over the image so notes stay readable in Light mode. **Auto-Lock "Immediately" no longer locks during file pickers** — attaching a file, taking a photo, viewing an attachment, or exporting/importing a backup no longer destroys your in-progress note. | +| 0.3.4.0 | 2026-08-17 | **Attachment indicator on note cards.** — a paperclip icon now appears on the right edge of every card that carries an attachment. **Light-theme readability over image thumbnails.** — cards with a dark photo background now force light text/icon colours over the image so notes stay readable in Light mode. **Auto-Lock "Immediately" no longer locks during file pickers.** — attaching a file, taking a photo, viewing an attachment, or exporting/importing a backup no longer destroys your in-progress note. | | 0.3.3.8 | 2026-08-17 | **Designed Incido artwork is now the app icon.** The glass shield + fountain-pen nib replaces the placeholder glyph on the home screen, app drawer, and adaptive-icon layers. | | 0.3.3.7 | 2026-08-17 | **Biometric auto-launch.** When Biometric is your active lock method, the fingerprint / face reader now opens automatically when the lock screen appears — no extra tap on "Authenticate" needed. | | 0.3.3.6 | 2026-08-17 | **Card height tuned for real devices.** The fixed card height from v0.3.3.5 proved too tall on real devices; reduced by ~15% (now 143.dp). | @@ -126,22 +55,22 @@ cross-platform ports, end-to-end sync, and security features. | 0.3.3.4 | 2026-08-17 | **Favourite star no longer overlaps the overflow button.** Star is now anchored to the card's bottom-right corner (same column as the top-right ⋮), so the two controls no longer collide. | | 0.3.3.3 | 2026-08-17 | **Importing an encrypted backup no longer crashes.** The passphrase was being wiped between the preview step and the confirm dialog's Import button; now retained across the confirmation step, with proper try/catch around preview/import so failures surface a snackbar ("Import failed. Check the file and passphrase." / "Could not read backup file.") instead of crashing. | | 0.3.3.2 | 2026-08-17 | **White-on-white lock screen in dark mode fixed.** `PinEntryScreen` is now wrapped in a themed Surface so it always paints its own theme-aware background. **Biometric unlock hang fixed.** Authentication is now fully asynchronous (BiometricPrompt callbacks run on the main executor) instead of busy-waiting on the main thread. Device-credential fallback preserved. | -| 0.3.3.1 | 2026-08-17 | **"Encrypt notes at rest" toggle now correctly greyed out** until Security is on and you've chosen either PIN or Biometric — with a subtitle explaining the requirement. **"Enable Security" no longer requires a PIN first.** The master switch just flips on; PIN / Biometric / Encrypt sub-toggles were already gated. **Importing an encrypted backup now opens a dedicated passphrase dialog** (single field, no policy check) — wrong passphrase surfaces "Incorrect passphrase." via snackbar. | +| 0.3.3.1 | 2026-08-17 | **"Encrypt notes at rest" toggle now correctly greyed out.** Until Security is on and you've chosen either PIN or Biometric — with a subtitle explaining the requirement. **"Enable Security" no longer requires a PIN first.** The master switch just flips on; PIN / Biometric / Encrypt sub-toggles were already gated. **Importing an encrypted backup now opens a dedicated passphrase dialog.** (single field, no policy check) — wrong passphrase surfaces "Incorrect passphrase." via snackbar. | | 0.3.3.0 | 2026-08-17 | **Lock mode as a single choice.** Security now exposes two mutually-exclusive toggles (PIN and Biometric) — either alone is enough to lock; Biometric no longer requires PIN first. New "Reset PIN" row appears when PIN is active; lock screen shows only the biometric button when no Incido PIN is set. **Encrypted-import passphrase prompt.** Selecting an encrypted backup opens the passphrase dialog first and surfaces "Incorrect passphrase." on mismatch. **Press-and-hold note card menu.** The inline delete button is gone; long-press a card (or tap the ⋮ button) to open a DropdownMenu with Delete — ready for future actions like Share. | -| 0.3.2.0 | 2026-08-15 | **New Settings screen** (Untagged → Settings in the nav drawer) with Appearance, Security, Backup & Restore, and About sections. **At-rest encryption.** ObjectBox store is opened with a 32-byte AES-256 key wrapped by the Android Keystore; toggling the switch generates / deletes the key and surfaces a "Re-encrypting notes…" dialog. **PIN lock + biometric.** 4–6 digit PIN (PBKDF2-hashed, 100k iters, constant-time compare) with optional fingerprint / face unlock; cold launch + auto-lock timeout gate. **Backup / Import / Export.** JSON codec with Base64 attachment bytes; encrypted variant uses AES-256-GCM + PBKDF2(passphrase, 200k iters) with a Generate button + Copy to clipboard. Passphrase policy: 12–32 chars, ≥1 digit, ≥1 special. **Release notes dialog** — tap the version number on the About card. Adds `USE_BIOMETRIC` + `USE_FINGERPRINT` permissions (still no INTERNET). | -| 0.3.1.2 | 2026-08-15 | Hotfix for three issues found in v0.3.1.1 testing: **card thumbnails are actually visible now** — the v0.3.1.1 layout had the thumbnail Image as a sibling of the Card, so the Card's opaque `containerColor` was drawn on top and the image was completely hidden; the architecture is restructured so the Image + dark scrim live INSIDE the Card, and `containerColor = Color.Transparent` when a thumbnail is present (plain notes still get the existing tinted/surface background). **Camera photos honour EXIF orientation** — `NoteRepositoryImpl.normalizeImageOrientation(bytes)` runs at storage time inside `addAttachment` (guarded `if (mimeType.startsWith("image/"))`); reads EXIF `Orientation`, rotates the bitmap, re-encodes as JPEG quality 92, and stores the corrected bytes so every render path (editor thumbnail, card thumbnail, full-screen viewer) sees the photo the right way up. **Non-image attachments open in the system viewer** — `AttachmentThumbnail.onClick` now branches on `isImage`: image taps still go to the in-app full-screen viewer; non-image taps write the bytes to a `cacheDir` temp file, get a `FileProvider` URI, and launch `Intent.ACTION_VIEW` with `FLAG_GRANT_READ_URI_PERMISSION` (the previous unconditional viewer path silently failed for PDFs/MP3s/etc. with a stuck "Loading…"). `file_paths.xml` already exposes `cacheDir` via ``, so no manifest change was needed. Attaching arbitrary file types from the paperclip icon was already shipped in v0.3.1.1 (the `*/*` intent filters) — no code change here, just called out so it's clear what was already in place. | -| 0.3.1.1 | 2026-08-15 | Hotfix for five issues found in v0.3.1.0 testing: persisted image attachments now render a thumbnail in the editor strip (previously fell through to the file-type placeholder because bytes weren't loaded) — `AttachmentThumbnail` lazy-loads bytes from the DB via `produceState` + `repository.getAttachmentBytes()`. Card thumbnails are more visible — alpha bumped 0.45 → 0.70 and the dark scrim dropped 0.18 → 0.08; also `clipToBounds()` so the image can't bleed past the card's rounded corners. Share-into from webpages now opens a fresh editor — `MainActivity.handleShareIntent()` stashes the share text synchronously before launching the async image-byte I/O, so the Compose tree's `LaunchedEffect(Unit)` always finds a payload on first composition. Share menu now offers Incido for any file type (PDF, MP3, video, archives) — added `` to both `ACTION_SEND` and `ACTION_SEND_MULTIPLE` intent filters. Editor top-bar title shortened to "Edit" / "New" so it fits on one line with the new icon row. | -| 0.3.1.0 | 2026-08-15 | **Context-aware search** — on the Favorites and Untagged pages, the search icon is now visible and a typed query intersects with the active filter (search only favourites on Favorites, only untagged notes on Untagged). On Home, search spans everything. **Photo / File attachments** — the editor now has Camera (camera icon) and Attach File (paperclip icon) buttons. Photos are captured via `MediaStore.ACTION_IMAGE_CAPTURE` (with a transient `FileProvider` outbox; bytes live in the database, the temp file is deleted) and files via `ACTION_OPEN_DOCUMENT`. Attachments are stored as `ByteArray` columns inside ObjectBox — no filesystem paths to manage. Each note's attachments show up as a thumbnail strip in the editor with a in the top-right corner to remove. Tapping a thumbnail opens a full-screen viewer with pinch-to-zoom + pan (`Modifier.transformable`) and a close button. **Card thumbnails** — notes with image attachments show the first image as a (alpha-blended, scrimmed) background on the list card. **Share-into** — the app accepts `ACTION_SEND` (text + image) and `ACTION_SEND_MULTIPLE` (multiple images) from other apps. Inbound bytes are copied into a process-singleton `SharedIntentBuffer` and pre-filled into a new-note editor. Adds the `CAMERA` permission — still no `INTERNET`, still fully offline. | -| 0.3.0.5 | 2026-08-15 | Hotfix: `NoteEditorViewModel.save()` still did upsert + per-tag `addHashtag` in three separate writes, so the drawer's `hashtagUsageSnapshot()` could read a transient empty `xrefBox` between the `tagBox.put` and the `xrefBox.put` and leave `emptyList()` stuck in the StateFlow (toggling the favourite star worked around it because `setFavorite` re-touches `noteBox`). New `NoteRepository.saveNoteWithHashtags()` wraps upsert + hashtag reconciliation in a single ObjectBox transaction via `boxStore.callInTx { ... }`, so the per-box observers fire **once** at commit time with the final state. New hashtags now appear in the drawer's Recent Tags list the moment a note is saved — no workaround required. | -| 0.3.0.4 | 2026-08-14 | Hotfix: `observeHashtagsByRecentUse()` now subscribes to **all three** boxes (`noteBox`, `tagBox`, `xrefBox`) — adding a brand-new hashtag only touches `tagBox` + `xrefBox`, so the previous single-`noteBox` subscription missed those updates and the drawer's Recent Tags list only refreshed when something else touched `noteBox` (e.g. toggling the favourite star). Now the new tag is visible immediately after saving the note. | -| 0.3.0.3 | 2026-08-14 | Hotfix: batched hashtag-usage lookups in `NoteRepositoryImpl.hashtagUsageSnapshot()` (one `Box.get` per distinct noteId and tagId, not per xref) and dropped the manual `trySend(snapshot())` in `observeHashtagsByRecentUse()` — the ObjectBox observer's first fire is now the sole source. The drawer's Recent Tags list fills in well under a second instead of taking minutes. | -| 0.3.0.2 | 2026-08-14 | Hotfix: dropped the redundant leading `#` from the AddTagSheet placeholder (was `#tag-name`, now `hashtag-name` — the leading `#` icon in the field already signals the format). | -| 0.3.0.1 | 2026-08-14 | Urgent UI polish: editor hashtag row moved to the bottom (and hidden when empty), `+ add` chip removed (use `#` icon in top bar), colour picker centred horizontally, list-card dog-ear colour accent replaces the small circle chip, list cards show a hashtag row (with `+N` abbreviation when capped). | -| 0.3.0.0 | 2026-08-14 | Hashtags (visible chips on editor, 5-tag cap, autocomplete) + bolder colour accent + nav drawer (Home / Favorites / Untagged + recent tags) + centred app-bar title + new version scheme | -| 0.2.0.1 | 2026-08-14 | Hotfix: search icon now actually opens the search bar | -| 0.2.0.0 | 2026-08-14 | Polish + favourites, search, colours, checklists, discard dialog, release signing | -| 0.1.1.0 | 2026-08-14 | Editor IME fix + title/body on list cards | -| 0.1.0.0 | 2026-08-14 | First MVP: list + editor, ObjectBox, Material 3 | +| 0.3.2.0 | 2026-08-15 | **New Settings screen.** (Untagged → Settings in the nav drawer) with Appearance, Security, Backup & Restore, and About sections. **At-rest encryption.** ObjectBox store is opened with a 32-byte AES-256 key wrapped by the Android Keystore; toggling the switch generates / deletes the key and surfaces a "Re-encrypting notes…" dialog. **PIN lock + biometric.** 4–6 digit PIN (PBKDF2-hashed, 100k iters, constant-time compare) with optional fingerprint / face unlock; cold launch + auto-lock timeout gate. **Backup / Import / Export.** JSON codec with Base64 attachment bytes; encrypted variant uses AES-256-GCM + PBKDF2(passphrase, 200k iters) with a Generate button + Copy to clipboard. Passphrase policy: 12–32 chars, ≥1 digit, ≥1 special. **Release notes dialog.** — tap the version number on the About card. Adds `USE_BIOMETRIC` + `USE_FINGERPRINT` permissions (still no INTERNET). | +| 0.3.1.2 | 2026-08-15 | **Three v0.3.1.1 issues fixed.** **card thumbnails are actually visible now** — the v0.3.1.1 layout had the thumbnail Image as a sibling of the Card, so the Card's opaque `containerColor` was drawn on top and the image was completely hidden; the architecture is restructured so the Image + dark scrim live INSIDE the Card, and `containerColor = Color.Transparent` when a thumbnail is present (plain notes still get the existing tinted/surface background). **Camera photos honour EXIF orientation** — `NoteRepositoryImpl.normalizeImageOrientation(bytes)` runs at storage time inside `addAttachment` (guarded `if (mimeType.startsWith("image/"))`); reads EXIF `Orientation`, rotates the bitmap, re-encodes as JPEG quality 92, and stores the corrected bytes so every render path (editor thumbnail, card thumbnail, full-screen viewer) sees the photo the right way up. **Non-image attachments open in the system viewer** — `AttachmentThumbnail.onClick` now branches on `isImage`: image taps still go to the in-app full-screen viewer; non-image taps write the bytes to a `cacheDir` temp file, get a `FileProvider` URI, and launch `Intent.ACTION_VIEW` with `FLAG_GRANT_READ_URI_PERMISSION` (the previous unconditional viewer path silently failed for PDFs/MP3s/etc. with a stuck "Loading…"). `file_paths.xml` already exposes `cacheDir` via ``, so no manifest change was needed. Attaching arbitrary file types from the paperclip icon was already shipped in v0.3.1.1 (the `*/*` intent filters) — no code change here, just called out so it's clear what was already in place. | +| 0.3.1.1 | 2026-08-15 | **Five v0.3.1.0 issues fixed.** Persisted image attachments now render a thumbnail in the editor strip (previously fell through to the file-type placeholder because bytes weren't loaded) — `AttachmentThumbnail` lazy-loads bytes from the DB via `produceState` + `repository.getAttachmentBytes()`. Card thumbnails are more visible — alpha bumped 0.45 → 0.70 and the dark scrim dropped 0.18 → 0.08; also `clipToBounds()` so the image can't bleed past the card's rounded corners. Share-into from webpages now opens a fresh editor — `MainActivity.handleShareIntent()` stashes the share text synchronously before launching the async image-byte I/O, so the Compose tree's `LaunchedEffect(Unit)` always finds a payload on first composition. Share menu now offers Incido for any file type (PDF, MP3, video, archives) — added `` to both `ACTION_SEND` and `ACTION_SEND_MULTIPLE` intent filters. Editor top-bar title shortened to "Edit" / "New" so it fits on one line with the new icon row. | +| 0.3.1.0 | 2026-08-15 | **Context-aware search.** — on the Favorites and Untagged pages, the search icon is now visible and a typed query intersects with the active filter (search only favourites on Favorites, only untagged notes on Untagged). On Home, search spans everything. **Photo / File attachments.** — the editor now has Camera (camera icon) and Attach File (paperclip icon) buttons. Photos are captured via `MediaStore.ACTION_IMAGE_CAPTURE` (with a transient `FileProvider` outbox; bytes live in the database, the temp file is deleted) and files via `ACTION_OPEN_DOCUMENT`. Attachments are stored as `ByteArray` columns inside ObjectBox — no filesystem paths to manage. Each note's attachments show up as a thumbnail strip in the editor with a ✕ in the top-right corner to remove. Tapping a thumbnail opens a full-screen viewer with pinch-to-zoom + pan (`Modifier.transformable`) and a close button. **Card thumbnails.** — notes with image attachments show the first image as a (alpha-blended, scrimmed) background on the list card. **Share-into.** — the app accepts `ACTION_SEND` (text + image) and `ACTION_SEND_MULTIPLE` (multiple images) from other apps. Inbound bytes are copied into a process-singleton `SharedIntentBuffer` and pre-filled into a new-note editor. Adds the `CAMERA` permission — still no `INTERNET`, still fully offline. | +| 0.3.0.5 | 2026-08-15 | **Hashtag reconciliation is now a single transaction.** `NoteEditorViewModel.save()` still did upsert + per-tag `addHashtag` in three separate writes, so the drawer's `hashtagUsageSnapshot()` could read a transient empty `xrefBox` between the `tagBox.put` and the `xrefBox.put` and leave `emptyList()` stuck in the StateFlow (toggling the favourite star worked around it because `setFavorite` re-touches `noteBox`). New `NoteRepository.saveNoteWithHashtags()` wraps upsert + hashtag reconciliation in a single ObjectBox transaction via `boxStore.callInTx { ... }`, so the per-box observers fire **once** at commit time with the final state. New hashtags now appear in the drawer's Recent Tags list the moment a note is saved — no workaround required. | +| 0.3.0.4 | 2026-08-14 | **Recent Tags now subscribes to all three boxes.** `observeHashtagsByRecentUse()` now subscribes to **all three** boxes (`noteBox`, `tagBox`, `xrefBox`) — adding a brand-new hashtag only touches `tagBox` + `xrefBox`, so the previous single-`noteBox` subscription missed those updates and the drawer's Recent Tags list only refreshed when something else touched `noteBox` (e.g. toggling the favourite star). Now the new tag is visible immediately after saving the note. | +| 0.3.0.3 | 2026-08-14 | **Batched hashtag-usage lookups.** `NoteRepositoryImpl.hashtagUsageSnapshot()` (one `Box.get` per distinct noteId and tagId, not per xref) and dropped the manual `trySend(snapshot())` in `observeHashtagsByRecentUse()` — the ObjectBox observer's first fire is now the sole source. The drawer's Recent Tags list fills in well under a second instead of taking minutes. | +| 0.3.0.2 | 2026-08-14 | **AddTagSheet placeholder cleaned up.** Dropped the redundant leading `#` from the AddTagSheet placeholder (was `#tag-name`, now `hashtag-name` — the leading `#` icon in the field already signals the format). | +| 0.3.0.1 | 2026-08-14 | **Editor + list-card UI polish.** Editor hashtag row moved to the bottom (and hidden when empty), `+ add` chip removed (use `#` icon in top bar), colour picker centred horizontally, list-card dog-ear colour accent replaces the small circle chip, list cards show a hashtag row (with `+N` abbreviation when capped). | +| 0.3.0.0 | 2026-08-14 | **Hashtags + bolder colour accent + nav drawer + new version scheme.** Hashtags (visible chips on editor, 5-tag cap, autocomplete) + bolder colour accent + nav drawer (Home / Favorites / Untagged + recent tags) + centred app-bar title + new version scheme | +| 0.2.0.1 | 2026-08-14 | **Search icon now opens the search bar.** Search icon now actually opens the search bar | +| 0.2.0.0 | 2026-08-14 | **Polish + favourites, search, colours, checklists, discard dialog, release signing.** | +| 0.1.1.0 | 2026-08-14 | **Editor IME fix + title/body on list cards.** | +| 0.1.0.0 | 2026-08-14 | **First MVP: list + editor, ObjectBox, Material 3.** | --- diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 221c210..0774a42 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,17 +28,19 @@ android { applicationId = "org.incido.app" minSdk = 26 targetSdk = 35 - // v0.3.7.0: Trash / soft delete — deleting a note now flags it - // trashed (hidden from every active view and ordinary search); - // a Trash drawer entry exposes Restore and permanent Delete. - // - NoteEntity gains `trashed` (additive schema, auto-migrated); - // NoteFilter gains a Trash case; the repository gains - // moveToTrash / restoreFromTrash / deletePermanently; drawer, - // list, and editor ViewModels + screens wire the actions; - // backups round-trip the trashed state. - // - versionCode monotonic +1 from v0.3.6.3 (30). - versionCode = 31 - versionName = "0.3.7.0" + // v0.3.7.1: maintenance release — UI polish + one bug fix. + // - Editor top bar decluttered: camera / attach-file / add-tag + // moved into a bottom action row so the title + remaining + // buttons always fit (matches the §5.2 spec). + // - Image viewer: fixed the false "couldn't decode" toast that + // fired on every persisted image open (premature null check). + // - Search auto-focus + clear button; drawer tag list now + // scrolls within the sheet; add-tag sheet auto-focus. + // - New flat app icon (incido_flat_icon.png) replaces the + // v0.3.3.8 artwork; adaptive background re-tinted to match. + // - versionCode monotonic +1 from v0.3.7.0 (31). + versionCode = 32 + versionName = "0.3.7.1" } // --- Signing --- diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png index 5f5430e..09c2ec3 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png index fce405f..65c7907 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png index 621030d..472ea3d 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png index 2741ea0..e0bf283 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png index 0d3b00a..8e6235a 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 870ba7f..7c87852 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,10 +1,11 @@ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index f2f5b5b..cd135c3 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,7 @@ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 3b29b0b..8e9bec6 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index a4a73fa..8e9bec6 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 001d85c..0322b2d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index f292ee0..0322b2d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 3be2154..7c94335 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 59a95fa..7c94335 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 23f0303..37e3c2c 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index b9a7313..37e3c2c 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 56ade02..529a3fe 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 63407ac..529a3fe 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 768357e..f7a6487 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,9 @@ - #010435 + the artwork's edge colour so parallax exposure is seamless. + v0.3.7.1: re-tinted from #010435 to the new flat icon's fill + colour (#352999) so the foreground's squircle edges blend + invisibly into the background layer. --> + #352999 diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt b/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt index bd32a87..5ec7748 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt @@ -25,6 +25,25 @@ object ReleaseNotes { * Append a new entry on top each release. */ val RECENT: List = listOf( + ReleaseNote( + version = "0.3.7.1", + date = "2026-08-30", + bullets = listOf( + "Cleaner Add / Edit screen: camera, attach-file, and " + + "add-tag moved out of the crowded title bar into a " + + "bottom action row — the title and remaining buttons " + + "now fit comfortably on every screen.", + "Fixed a false error message that flashed whenever you " + + "opened a saved image in the full-screen viewer.", + "Search now focuses automatically when opened and shows " + + "a clear (✕) button while you type.", + "Long tag lists in the navigation drawer now scroll " + + "instead of being cut off at the bottom.", + "The add-tag sheet opens with the keyboard already up.", + "New app icon: a flatter, cleaner take on the shield " + + "and pen-nib artwork.", + ), + ), ReleaseNote( version = "0.3.7.0", date = "2026-08-20", @@ -88,22 +107,6 @@ object ReleaseNotes { "while Incido is open.", ), ), - ReleaseNote( - version = "0.3.4.0", - date = "2026-08-17", - bullets = listOf( - "Note cards now show a paperclip icon on the right edge " + - "whenever a note has an attachment — lined up between " + - "the favourite star and the \u22EE menu.", - "Cards with a dark image background are now readable in " + - "Light theme — the title, preview text, timestamp and " + - "icons switch to light colours over the photo.", - "Auto-Lock set to \"Immediately\" no longer locks the app " + - "while you're picking a file to attach (or exporting / " + - "importing a backup), so your in-progress note and the " + - "attachment survive the trip to the file manager.", - ), - ), - // v0.3.7.0 push drops v0.3.3.8 off the "5 most recent" tail. + // v0.3.7.1 push drops v0.3.4.0 off the "5 most recent" tail. ) } diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt index cdaf317..98f92b6 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/drawer/IncidoDrawer.kt @@ -26,7 +26,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -128,6 +127,10 @@ fun IncidoDrawer( Column( modifier = Modifier .fillMaxWidth() + // weight(1f) caps this list at the remaining + // sheet height so long tag lists scroll inside + // the drawer instead of overflowing the bottom. + .weight(1f) .verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(2.dp), ) { @@ -165,6 +168,3 @@ private fun DrawerHashtagEntry( icon = { Icon(Icons.Filled.Tag, contentDescription = null) }, ) } - -@Suppress("unused") -private val _ignored: Color = Color.Unspecified diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt index 944ac70..d265c6e 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/editor/ImageViewerScreen.kt @@ -18,7 +18,6 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.produceState @@ -31,13 +30,11 @@ import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import android.graphics.BitmapFactory -import android.widget.Toast import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.incido.domain.repository.NoteRepository @@ -91,9 +88,11 @@ fun ImageViewerScreen( offsetY += panChange.y } - // Decode the image (or display an error / "unsupported" - // message for non-image attachments). + // Decode the image (or display an error message when the + // bytes can't be loaded / decoded). + var loadFailed by remember { mutableStateOf(false) } val bitmap by produceState(initialValue = null, key1 = attachmentId) { + loadFailed = false val bytes: ByteArray? = when (attachmentId) { is ViewerAttachmentId.Persisted -> withContext(Dispatchers.IO) { repository.getAttachmentBytes(attachmentId.id) @@ -101,22 +100,14 @@ fun ImageViewerScreen( is ViewerAttachmentId.Pending -> pendingBytes } if (bytes == null) { - value = null + loadFailed = true return@produceState } - value = withContext(Dispatchers.IO) { + val decoded = withContext(Dispatchers.IO) { BitmapFactory.decodeByteArray(bytes, 0, bytes.size) } - } - - val ctx = LocalContext.current - LaunchedEffect(attachmentId) { - if (attachmentId is ViewerAttachmentId.Persisted) { - val mime = "image" // we only open the viewer for images; see editor - if (bitmap == null) { - Toast.makeText(ctx, "Couldn't decode $mime attachment", Toast.LENGTH_SHORT).show() - } - } + value = decoded + if (decoded == null) loadFailed = true } if (bitmap != null) { @@ -152,7 +143,7 @@ fun ImageViewerScreen( horizontalAlignment = Alignment.CenterHorizontally, ) { Text( - text = "Loading…", + text = if (loadFailed) "Couldn't load image" else "Loading…", color = Color.White, style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.SemiBold, diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt index 4deebf3..e36ecb7 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/editor/NoteEditorScreen.kt @@ -8,6 +8,7 @@ import android.net.Uri import android.widget.Toast import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -49,6 +50,7 @@ import androidx.compose.material3.AssistChip import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -83,6 +85,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.core.content.FileProvider import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -137,12 +140,6 @@ fun NoteEditorScreen( val scope = rememberCoroutineScope() val ctx = LocalContext.current - // v0.3.1.0: pick up the NoteRepository from the editor's VM (it's not - // on the ViewModel's public surface but we can grab it for the image - // viewer via the app container — see App.kt wiring for the actual - // route through. Fall back to null and disable the viewer.) - val repoForViewer = repository - // v0.3.1.0: camera permission + capture. The camera launcher is // declared FIRST so the permission callback (below) can forward to it // without a Kotlin forward-reference error. @@ -284,49 +281,24 @@ fun NoteEditorScreen( contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime), snackbarHost = { SnackbarHost(hostState = snackbarHost) }, topBar = { - // v0.3.6.1 Emergency Patch: left-anchored title sits against the back arrow - // (CenterAlignedTopAppBar was crowded by the six right-side actions). + // Left-anchored title (v0.3.6.1). Camera / attach-file / add-tag + // now live in the bottom action row below, so the remaining + // actions (favourite, save, overflow) always fit beside the + // title, even on narrow screens. TopAppBar( - title = { Text(if (state.isEditing) "Edit" else "New") }, + title = { + Text( + text = if (state.isEditing) "Edit note" else "New note", + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + }, navigationIcon = { IconButton(onClick = { tryClose() }) { Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") } }, actions = { - // v0.3.1.0: Camera (camera icon) + Attach File (paperclip icon). - IconButton(onClick = { launchCamera() }) { - Icon( - Icons.Filled.CameraAlt, - contentDescription = "Take photo", - tint = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - IconButton(onClick = { - // v0.3.4.0 hotfix: the SAF picker backgrounds - // the app; with Auto-Lock = Immediate the return - // used to lock the app and wipe the unsaved note. - securityManager?.beginExternalActivity() - filePickerLauncher.launch(arrayOf("*/*")) - }) { - Icon( - Icons.Filled.AttachFile, - contentDescription = "Attach file", - tint = MaterialTheme.colorScheme.onSurfaceVariant, - ) - } - IconButton( - onClick = { viewModel.openAddTagSheet() }, - enabled = state.canAddMoreTags, - ) { - Icon( - Icons.Filled.Tag, - contentDescription = "Add tag", - tint = if (state.canAddMoreTags) - MaterialTheme.colorScheme.onSurfaceVariant - else MaterialTheme.colorScheme.outlineVariant, - ) - } IconButton(onClick = { viewModel.toggleFavorite() }) { Icon( imageVector = if (state.isFavorite) Icons.Filled.Star else Icons.Outlined.StarOutline, @@ -376,7 +348,7 @@ fun NoteEditorScreen( // top edge of the note content (previously the row's // `vertical = 4.dp` padding was dwarfed by the OutlinedTextField's // intrinsic top inset, making the lower gap appear far larger). - androidx.compose.foundation.layout.Spacer(Modifier.height(12.dp)) + Spacer(Modifier.height(12.dp)) Row( modifier = Modifier .fillMaxWidth() @@ -394,7 +366,7 @@ fun NoteEditorScreen( ) } } - androidx.compose.foundation.layout.Spacer(Modifier.height(12.dp)) + Spacer(Modifier.height(12.dp)) OutlinedTextField( value = state.content, @@ -419,7 +391,6 @@ fun NoteEditorScreen( if (state.attachments.isNotEmpty() || state.pendingAttachments.isNotEmpty()) { AttachmentStrip( persisted = state.attachments, - persistedBytes = emptyMap(), // resolved lazily in the viewer persistedViewerIds = state.attachments.associate { it.id to ViewerAttachmentId.Persisted(it.id) }, persistedOpen = { id -> viewModel.openFullScreen(id) }, persistedDelete = { id -> viewModel.deletePersistedAttachment(id) }, @@ -441,6 +412,52 @@ fun NoteEditorScreen( tags = state.hashtags, onRemove = { viewModel.removeTag(it) }, ) + + // Camera / attach-file / add-tag moved out of the title bar + // into this bottom action row so the top bar always fits + // (the six-action cluster used to crowd the title on narrow + // screens). Keep-style placement, above the nav bar / + // keyboard. + HorizontalDivider() + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 8.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + IconButton(onClick = { launchCamera() }) { + Icon( + Icons.Filled.CameraAlt, + contentDescription = "Take photo", + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + IconButton(onClick = { + // v0.3.4.0 hotfix: the SAF picker backgrounds + // the app; with Auto-Lock = Immediate the return + // used to lock the app and wipe the unsaved note. + securityManager?.beginExternalActivity() + filePickerLauncher.launch(arrayOf("*/*")) + }) { + Icon( + Icons.Filled.AttachFile, + contentDescription = "Attach file", + tint = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + IconButton( + onClick = { viewModel.openAddTagSheet() }, + enabled = state.canAddMoreTags, + ) { + Icon( + Icons.Filled.Tag, + contentDescription = "Add tag", + tint = if (state.canAddMoreTags) + MaterialTheme.colorScheme.onSurfaceVariant + else MaterialTheme.colorScheme.outlineVariant, + ) + } + } } } @@ -466,14 +483,14 @@ fun NoteEditorScreen( // v0.3.1.0: full-screen image viewer. state.fullScreenAttachmentId?.let { viewerId -> - if (repoForViewer != null) { + if (repository != null) { val pendingBytes: ByteArray? = when (viewerId) { is ViewerAttachmentId.Pending -> state.pendingAttachmentBytes[viewerId.tempId] is ViewerAttachmentId.Persisted -> null // viewer loads from DB } ImageViewerScreen( attachmentId = viewerId, - repository = repoForViewer, + repository = repository, pendingBytes = pendingBytes, onClose = { viewModel.closeFullScreen() }, ) @@ -497,7 +514,6 @@ fun NoteEditorScreen( @Composable private fun AttachmentStrip( persisted: List, - persistedBytes: Map, persistedViewerIds: Map, persistedOpen: (ViewerAttachmentId) -> Unit, persistedDelete: (Long) -> Unit, @@ -515,7 +531,6 @@ private fun AttachmentStrip( .fillMaxWidth() .padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp), - contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 0.dp), ) { items(persisted, key = { it.id }) { att -> AttachmentThumbnail( @@ -581,7 +596,7 @@ private fun AttachmentThumbnail( // handler to bail with a misleading "Loading…" Toast forever. val lazyBytes by produceState(initialValue = null, key1 = attachmentId) { if (pendingBytes == null && attachmentId != null && repository != null) { - value = withContext(kotlinx.coroutines.Dispatchers.IO) { + value = withContext(Dispatchers.IO) { repository.getAttachmentBytes(attachmentId) } } @@ -671,7 +686,7 @@ private fun AttachmentThumbnail( BitmapFactory.decodeByteArray(effectiveBytes, 0, effectiveBytes.size) } if (bitmap != null) { - androidx.compose.foundation.Image( + Image( bitmap = bitmap.asImageBitmap(), contentDescription = displayName, contentScale = ContentScale.Crop, @@ -709,7 +724,7 @@ private fun AttachmentThumbnail( @Composable private fun FileTypePlaceholder(mimeType: String, displayName: String) { - androidx.compose.foundation.layout.Column( + Column( modifier = Modifier.fillMaxSize().padding(6.dp), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, @@ -720,7 +735,7 @@ private fun FileTypePlaceholder(mimeType: String, displayName: String) { tint = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.size(28.dp), ) - androidx.compose.foundation.layout.Spacer(Modifier.size(4.dp)) + Spacer(Modifier.size(4.dp)) Text( text = displayName.take(14) + if (displayName.length > 14) "…" else "", style = MaterialTheme.typography.labelSmall, @@ -791,6 +806,12 @@ private fun AddTagSheet( onDismiss: () -> Unit, ) { val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + // Auto-focus the field so the keyboard is already up by the time + // the sheet settles — one less tap to add a tag. + val tagFocusRequester = remember { FocusRequester() } + LaunchedEffect(Unit) { + runCatching { tagFocusRequester.requestFocus() } + } ModalBottomSheet( onDismissRequest = onDismiss, sheetState = sheetState, @@ -809,7 +830,9 @@ private fun AddTagSheet( singleLine = true, leadingIcon = { Icon(Icons.Filled.Tag, contentDescription = null) }, keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.None), - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .focusRequester(tagFocusRequester), ) if (suggestions.isNotEmpty()) { Text( diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt index 875d661..396236c 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/notelist/NoteListScreen.kt @@ -27,6 +27,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.AttachFile import androidx.compose.material.icons.filled.CheckBox +import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Lock import androidx.compose.material.icons.filled.Menu @@ -58,6 +59,8 @@ import androidx.compose.runtime.remember 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.focus.focusRequester import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap @@ -122,9 +125,18 @@ fun NoteListScreen( ) { val state by viewModel.uiState.collectAsStateWithLifecycle() var localQuery by remember { mutableStateOf("") } + val searchFocusRequester = remember { FocusRequester() } LaunchedEffect(filterMode) { viewModel.setFilter(filterMode) } + // Auto-focus the search field when it opens so typing can start + // immediately. + LaunchedEffect(state.isSearchActive) { + if (state.isSearchActive) { + runCatching { searchFocusRequester.requestFocus() } + } + } + Scaffold( topBar = { CenterAlignedTopAppBar( @@ -171,10 +183,21 @@ fun NoteListScreen( Text(if (filterMode == NoteFilter.Trash) "Search trash…" else "Search notes…") }, leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) }, + trailingIcon = { + if (localQuery.isNotEmpty()) { + IconButton(onClick = { + localQuery = "" + viewModel.onQueryChange("") + }) { + Icon(Icons.Default.Close, contentDescription = "Clear search") + } + } + }, singleLine = true, modifier = Modifier .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 8.dp), + .padding(horizontal = 16.dp, vertical = 8.dp) + .focusRequester(searchFocusRequester), ) } diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt index 0c33e3d..cd9adb9 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt @@ -333,7 +333,7 @@ class SettingsViewModel( /** The version string baked into backup payloads and shown on * the About card. Mirrors `app/build.gradle.kts` `versionName` * — if you bump one, bump both. */ - const val APP_VERSION = "0.3.7.0" + const val APP_VERSION = "0.3.7.1" val Factory: ViewModelProvider.Factory = viewModelFactory { initializer { diff --git a/incido_flat_icon.png b/incido_flat_icon.png new file mode 100644 index 0000000..beb49b6 Binary files /dev/null and b/incido_flat_icon.png differ