Improve UI layout responsiveness and fix selection state management

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="docs/icon.png" width="112" alt="ReadArea icon"/></p>
+<p align="center"><img src="docs/icon.png" width="96" alt="ReadArea icon"/></p>
 
 # ReadArea
 
@@ -7,158 +7,62 @@
 **[⬇ Download the latest version](https://github.com/EL4CTEO/ReadArea/releases/latest)**
 
 <p>
-<img src="docs/screenshots/home.jpg" width="200"/>
-<img src="docs/screenshots/library.jpg" width="200"/>
-<img src="docs/screenshots/curl.jpg" width="200"/>
-<img src="docs/screenshots/vertical.jpg" width="200"/>
+<img src="docs/screenshots/home.jpg" width="170" alt="Home screen"/>
+<img src="docs/screenshots/library.jpg" width="170" alt="Library"/>
+<img src="docs/screenshots/curl.jpg" width="170" alt="Page curl"/>
+<img src="docs/screenshots/vertical.jpg" width="170" alt="Vertical Japanese text"/>
 </p>
 <p>
-<img src="docs/screenshots/desktop-reader.jpg" width="410"/>
-<img src="docs/screenshots/desktop-curl.jpg" width="410"/>
-<img src="docs/screenshots/desktop-home.jpg" width="410"/>
-<img src="docs/screenshots/desktop-library-dark.jpg" width="410"/>
+<img src="docs/screenshots/desktop-reader.jpg" width="400" alt="Reading on a computer"/>
+<img src="docs/screenshots/desktop-library-dark.jpg" width="400" alt="Library in dark mode on a computer"/>
 </p>
 
 ## Install
 
-Every release on the **[releases page](https://github.com/EL4CTEO/ReadArea/releases/latest)** has a download for each system. Updating is always the same: install the newer version over the old one. Your library, progress and notes are kept.
+Each [release](https://github.com/EL4CTEO/ReadArea/releases/latest) has a download for every system. To update, install the new version over the old one: your library, progress and notes are kept.
 
-### Android
-
-1. On your phone, open the latest release and tap `ReadArea-x.y.z.apk` to download it.
-2. Open the downloaded file. If Android asks, allow your browser or file manager to **install unknown apps**.
-3. Tap **Install**. If Play Protect warns about an unknown app, tap **Scan app**, or **More details → Install anyway**.
-
-Needs Android 8.0 or newer.
-
-### macOS
-
-1. Download `ReadArea-x.y.z-macos-arm64.dmg` for Apple silicon (M1 and later) or `ReadArea-x.y.z-macos-x64.dmg` for Intel Macs.
-2. Open it and drag **ReadArea** into **Applications**.
-3. If macOS says it can't check the app for malicious software, open **System Settings → Privacy & Security** and click **Open Anyway**, or right-click ReadArea in Applications and choose **Open**. You only need to do this once.
-
-### Windows
-
-1. Download `ReadArea-x.y.z-windows-x64.msi` and open it. It installs just for you, without administrator rights, and adds ReadArea to the Start menu.
-2. If Windows shows *Windows protected your PC*, click **More info → Run anyway**.
-
-Prefer not to install? `ReadArea-x.y.z-windows-x64-portable.zip` runs from any folder: unzip it and open `ReadArea.exe`.
-
-### Linux
-
-- **Ubuntu, Debian, Mint:** `sudo apt install ./ReadArea-x.y.z-linux-x64.deb`
-- **Fedora, openSUSE:** `sudo dnf install ./ReadArea-x.y.z-linux-x64.rpm`
-- **Anything else:** unpack `ReadArea-x.y.z-linux-x64.tar.gz` and run `ReadArea/bin/ReadArea`.
-
-On ARM computers (like a Raspberry Pi 5 or an ARM laptop), pick the `linux-arm64` files instead. For read aloud, install `espeak-ng` or `speech-dispatcher` if your system doesn't have one.
+- **Android** (8.0 or newer): download `ReadArea-x.y.z.apk`, open it and tap **Install**. If Android asks, allow your browser or file manager to *install unknown apps*. If Play Protect warns, tap **Scan app**, or **More details → Install anyway**.
+- **macOS:** download the `.dmg` (`arm64` for Apple silicon, `x64` for Intel) and drag ReadArea into Applications. If macOS can't check the app, right-click it and choose **Open** (only the first time).
+- **Windows:** download the `.msi` (installs just for you, no administrator rights) or the `-portable.zip` to run from any folder. If you see *Windows protected your PC*, click **More info → Run anyway**.
+- **Linux:** `sudo apt install ./ReadArea-x.y.z-linux-x64.deb` (Ubuntu, Debian, Mint), `sudo dnf install ./ReadArea-x.y.z-linux-x64.rpm` (Fedora, openSUSE), or unpack the `.tar.gz` and run `ReadArea/bin/ReadArea`. Pick the `linux-arm64` files on ARM computers. For read aloud, install `espeak-ng` or `speech-dispatcher`.
 
 ## Getting started
 
-**On Android**
-
-1. Tap **Find my books** and allow access. ReadArea lists every book on your phone, including downloads and files people sent you, and keeps the list up to date.
-2. Prefer to choose? Tap **Add a folder** or **Open files** instead, or open a book from any file manager with **Open with → ReadArea**.
-3. Tap a book to start reading. Tap the middle of a page to open the menu.
-4. Close the app while reading and it opens straight back to your page next time.
+**On your phone:** tap **Find my books** and allow access (or choose **Add a folder** or **Open files**). Tap a book to read, and tap the middle of a page for the menu. Close the app mid-book and it opens back on your page.
 
-**On a computer**
+**On a computer:** add your book folders in **Settings → Library folders** (subfolders included, new books picked up automatically), or drop books onto the window. Double-click a book to read. Turn pages with the arrow keys, the space bar, a click on either side or by dragging a corner. Click the middle of the page or press **Esc** for the tools.
 
-1. Add the folders where you keep your books in **Settings → Library folders**. ReadArea finds every book in them, subfolders included, and keeps watching them for new ones. You can also drop books or folders onto the window.
-2. Double-click a book to read. E-books (EPUB, MOBI, FB2, comics) also open straight from Finder, Explorer or your file manager.
-3. Turn pages with the arrow keys, the space bar, a click on either side, or by dragging a page corner. Click the middle of the page or press **Esc** for the tools.
-4. Widen the window and the book opens into two pages side by side.
+## What you get
 
-## What it can do
+- **Reads like a book:** page curl (or slide, fade, scroll), themes from Paper to AMOLED black, your font, size and margins, and brightness with a warm light.
+- **Notes and tools:** highlights in five colors, notes, bookmarks, search, footnote pop-ups, read aloud and hands-free page turning.
+- **Your library:** real covers, shelves, favorites, ratings, filters, and reading stats with streaks and a daily goal.
+- **Big screens:** two-page spreads on tablets, foldables and wide windows. On a computer, keyboard shortcuts, several books open at once and your system's voices for read aloud.
+- **Your language:** 17 app languages, right-to-left books, and vertical Japanese and Chinese with furigana.
+- **Light:** under 3 MB on Android.
 
-- **Reads like a book:** a page curl that follows your finger (or slide, fade, scroll), themes from Paper to AMOLED black, your choice of font, size, spacing and margins, and in-book brightness with a warm light.
-- **Notes and tools:** highlights in five colors, notes, bookmarks and export, full-text search, footnote pop-ups, read aloud with the sentence highlighted, and hands-free page turning.
-- **Your library:** real covers from each file, shelves, favorites, ratings and reading status, search and filters, and reading stats with streaks and a daily goal.
-- **Big screens:** two-page spreads on foldables, tablets and wide desktop windows, with text kept out of the fold.
-- **On a computer:** keyboard shortcuts for everything, several books open at once, your system's voices for read aloud, and native look and dark mode.
-- **Any language:** 17 app languages, right-to-left books and a mirrored app for Arabic, and vertical Japanese and Chinese with furigana.
-- **Light:** under 3 MB on Android, nothing to install alongside the desktop app, and nothing redrawn while you read.
-
-## Supported formats
-
-| Books | Documents | Comics |
-| --- | --- | --- |
-| EPUB, MOBI / AZW, FB2 | PDF, Word (DOCX), LibreOffice (ODT), RTF, TXT, Markdown, HTML | CBZ |
+**Formats:** EPUB, MOBI / AZW, FB2, PDF, Word (DOCX), LibreOffice (ODT), RTF, TXT, Markdown, HTML and comics (CBZ).
 
 ## Privacy
 
 ReadArea never connects to the internet. There are no ads, no tracking and no accounts.
 
-- It only reads files: on Android your whole storage if you use **Find my books**, otherwise just the folders you choose.
-- Removing a book from the library never deletes the file unless you tick the box to do so.
-- Your library, progress and notes stay on your device. On Android they're only included in Android's backup when that backup is end-to-end encrypted with your screen lock, and when you move to a new phone with a cable or Quick Share. On a computer they're in a folder only your user account can open:
-  - macOS: `~/Library/Application Support/ReadArea`
-  - Windows: `%LOCALAPPDATA%\ReadArea`
-  - Linux: `~/.local/share/readarea`
-- Books can't reach out: pictures only ever come from the book itself (or, for Markdown and HTML files, from the folder next to them), never from the web, and fonts inside books aren't loaded at all.
-- Links inside books only open web pages and email, and always ask first, showing exactly where they go.
-- Every book is treated as untrusted. A damaged or deliberately malicious file just fails to open; it can't hang or crash the app, or reach anything outside it. See [SECURITY.md](SECURITY.md).
+- It only reads files: on Android your whole storage if you use **Find my books**, otherwise just the folders you choose. Removing a book never deletes its file unless you tick the box.
+- Your library, progress and notes stay on your device. On Android they're backed up only when the backup is end-to-end encrypted with your screen lock, and carried over when you move to a new phone.
+- Books can't reach out: their pictures come only from the book itself, and links ask before they open. A damaged or malicious file just fails to open. See [SECURITY.md](SECURITY.md).
 
 ## Questions
 
-**Is it free?** Yes. It's open source under the MIT license.
-
-**A book won't open.** Books bought from stores like Kindle or Kobo are usually DRM-protected, and no other reader app can open those.
-
-**Where are my notes?** Only on your device. You can export them from the **Notes** tab.
-
-**Can I change the app language?** Yes: **Settings → App language**. By default it follows your phone or computer.
-
-**How do I remove the desktop app completely?** Uninstall it like any other app (drag it to the Trash on macOS, *Settings → Apps* on Windows, your package manager on Linux), then delete the data folder listed under Privacy. **Settings → Data folder** shows it.
-
-<details>
-<summary><b>For developers</b></summary>
-
-### Layout
-
-```
-core/          Pure Kotlin, shared by every platform: the format parsers (EPUB, FB2, MOBI, DOCX, ODT, RTF,
-               Markdown, TXT, HTML), the text and offset model behind progress, search, notes and read aloud,
-               opening books from files, library rules and the reading themes.
-app/           The Android app: Jetpack Compose, Room, a custom page engine and page-curl view.
-desktop/       The macOS, Windows and Linux app: Swing with FlatLaf, a Java2D page engine (hyphenation,
-               justification, bidi, ruby, vertical CJK), page curl, PDFBox and SQLite.
-build-logic/   Gradle plugin that turns the desktop app into native installers.
-```
-
-Both apps read books through the same parsers into the same block model and measure positions in the same text offsets, so a highlight or bookmark means the same thing everywhere.
-
-### Build and run
-
-Needs JDK 21. The Android app also needs the Android SDK with platform 37; without one, the build simply leaves the Android module out.
-
-```bash
-./gradlew :desktop:run                     # the desktop app, with a separate development library
-./gradlew :desktop:packageDesktop          # installers for this system, in desktop/build/package/dist
-./gradlew :app:assembleDebug               # the Android app
-```
-
-Installers are built with the JDK's jpackage on each system: dmg on macOS, msi on Windows (needs WiX 3), deb and rpm on Linux (need `fakeroot` and `rpm`). Each build trims a Java runtime to what the app uses, checks the packaged app with `ReadArea --self-test` through its own launcher, and records a class-data archive for faster start-up (on Linux this needs a display, e.g. `xvfb-run`).
-
-### Tests
-
-```bash
-./gradlew :core:test                                     # parsers, text model, library rules
-xvfb-run -a ./gradlew :desktop:test                      # engine, rendering, UI walkthroughs, security
-./gradlew :app:testDebugUnitTest                         # Android
-READAREA_BENCH=1 ./gradlew :desktop:test --tests '*PerfBench*' -i   # timings, on demand
-```
-
-The desktop UI tests drive the real app on a virtual display, in English and in Arabic, and save screenshots of every screen to `desktop/build/qa-screens` and `qa-screens-rtl`. The security tests attack the parsers with hostile files (decompression bombs, deep nesting, malformed headers) and fuzz every format with thousands of damaged books. Rendering tests write PNGs to `app/build/screens` and `desktop/build/screens`.
+**Is it free?** Yes, and open source under the MIT license.
 
-`READAREA_TRACE_STARTUP=1` makes the desktop app print its start-up timings.
+**A book won't open.** Books bought from stores like Kindle or Kobo are usually DRM-protected, and no other reader can open those either.
 
-### Release
+**Where are my notes?** Only on your device. Export them from the **Notes** tab.
 
-Running the **Release** workflow (Actions → Release → Run workflow) or pushing a tag like `v1.2.0` builds the signed APK and the desktop installers for every system, and publishes them with checksums as a GitHub Release. The Android version code is `major * 10000 + minor * 100 + patch`, so every newer version installs as an update.
+**Can I change the language?** Yes: **Settings → App language**. It follows your phone or computer by default.
 
-Repository secrets (Settings → Secrets and variables → Actions):
+**How do I remove the desktop app completely?** Uninstall it like any other app, then delete the data folder shown in **Settings → Data folder**: `~/Library/Application Support/ReadArea` on macOS, `%LOCALAPPDATA%\ReadArea` on Windows, `~/.local/share/readarea` on Linux.
 
-- Android, required: `KEYSTORE_BASE64` (the keystore, base64-encoded), `KEYSTORE_PASSWORD`, `KEY_ALIAS` and `KEY_PASSWORD`. Keep a backup of the keystore: Android only accepts updates signed with the same key.
-- macOS, optional: with `MACOS_CERTIFICATE` (a Developer ID Application certificate as base64 .p12), `MACOS_CERTIFICATE_PASSWORD`, `MACOS_SIGNING_IDENTITY` (e.g. `Jane Doe (TEAMID)`), `APPLE_ID`, `APPLE_TEAM_ID` and `APPLE_APP_PASSWORD`, the Mac apps are signed and notarized, so they open without warnings.
+## Build it yourself
 
-</details>
+You need JDK 21 (and the Android SDK for the phone app). `./gradlew :desktop:run` starts the desktop app, `./gradlew :desktop:packageDesktop` builds an installer for your system and `./gradlew :app:assembleDebug` builds the Android app. More in [docs/DEVELOPING.md](docs/DEVELOPING.md).

app/src/main/java/com/readarea/MainActivity.kt

@@ -33,7 +33,8 @@ class MainActivity : ComponentActivity() {
         splash.setKeepOnScreenCondition { vm.allBooks.value == null || !decided }
         if (!decided) {
             lifecycleScope.launch {
-                vm.resumeTarget()?.let { id -> startActivity(ReaderActivity.intent(this@MainActivity, id)) }
+                // If it can't be worked out, start on the library: the splash must never wait on this forever.
+                runCatching { vm.resumeTarget() }.getOrNull()?.let { id -> startActivity(ReaderActivity.intent(this@MainActivity, id)) }
                 decided = true
             }
         }

app/src/main/java/com/readarea/data/LibraryRepository.kt

@@ -80,18 +80,25 @@ class LibraryRepository(
         scope.launch {
             settings.updateApp { s -> s.copy(folders = s.folders - tree) }
             runCatching { context.contentResolver.releasePersistableUriPermission(tree.toUri(), Intent.FLAG_GRANT_READ_URI_PERMISSION) }
-            if (removeBooks) db.books().deleteFolder(tree)
+            if (removeBooks) removeFolderBooks(tree)
         }
     }
 
+    /** Deletes the books of one library folder along with their cover images, which nothing else would ever clean up. */
+    private suspend fun removeFolderBooks(folder: String) {
+        val covers = db.books().all().filter { it.folderUri == folder }.mapNotNull { it.coverPath }
+        db.books().deleteFolder(folder)
+        covers.forEach { path -> File(path).takeIf { SafeFiles.inside(coverDir, it) }?.delete() }
+    }
+
     fun rescan() {
         scope.launch { scanAll() }
     }
 
     fun setDeviceScan(enabled: Boolean, removeBooks: Boolean = false) {
         scope.launch {
             settings.updateApp { it.copy(deviceScan = enabled, askedDeviceScan = true, deviceScanOff = !enabled) }
-            if (enabled) scanAll() else if (removeBooks) db.books().deleteFolder(DeviceStorage.DEVICE)
+            if (enabled) scanAll() else if (removeBooks) removeFolderBooks(DeviceStorage.DEVICE)
         }
     }
 
@@ -388,7 +395,7 @@ class LibraryRepository(
                     is ReflowableBook -> {
                         if (format == BookFormat.CBZ) pages = 0
                         opened.book.coverBytes()?.let { bytes ->
-                            ImageUtil.decodeSampled(bytes, 360, 540)?.let { bmp -> coverPath = saveCover(book.id, bmp) }
+                            ImageUtil.decodeSampled(bytes, 360, 540)?.let { bmp -> coverPath = saveCover(book.id, bmp, book.coverPath) }
                         }
                     }
                     is FixedBook -> {
@@ -398,7 +405,7 @@ class LibraryRepository(
                             val w = 360
                             val bmp = Bitmap.createBitmap(w, (w / aspect).toInt(), Bitmap.Config.ARGB_8888)
                             opened.source.render(0, bmp, null)
-                            coverPath = saveCover(book.id, bmp)
+                            coverPath = saveCover(book.id, bmp, book.coverPath)
                         }
                     }
                 }
@@ -433,9 +440,11 @@ class LibraryRepository(
         )
     }
 
-    private fun saveCover(id: Long, bmp: Bitmap): String? {
+    private fun saveCover(id: Long, bmp: Bitmap, previous: String?): String? {
+        // Replace the book's old cover by its recorded path; listing the folder for every book would make scanning
+        // a large library quadratic.
+        previous?.let { File(it) }?.takeIf { SafeFiles.inside(coverDir, it) }?.delete()
         val file = File(coverDir, "cover_${id}_${System.currentTimeMillis() % 100000}.jpg")
-        coverDir.listFiles()?.filter { it.name.startsWith("cover_${id}_") }?.forEach { it.delete() }
         return runCatching {
             file.outputStream().use { bmp.compress(Bitmap.CompressFormat.JPEG, 88, it) }
             bmp.recycle()