Prepare 1.0.0 release

FredApps · FredApps · commit 26f9c1992e29 · 2026-05-24T21:29:30.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,6 +62,9 @@ jobs:
       - name: Assemble debug APK
         run: ./gradlew --no-daemon assembleDebug
 
+      - name: Build release artifacts
+        run: ./gradlew --no-daemon :app:assembleRelease :companion:assembleRelease :app:bundleRelease :companion:bundleRelease
+
       - name: Upload debug APK (watch)
         uses: actions/upload-artifact@v4
         with:
@@ -77,3 +80,35 @@ jobs:
           path: companion/build/outputs/apk/debug/companion-debug.apk
           if-no-files-found: error
           retention-days: 3
+
+      - name: Upload release APK (watch)
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release-apk
+          path: app/build/outputs/apk/release/app-release.apk
+          if-no-files-found: error
+          retention-days: 3
+
+      - name: Upload release APK (companion)
+        uses: actions/upload-artifact@v4
+        with:
+          name: companion-release-apk
+          path: companion/build/outputs/apk/release/companion-release.apk
+          if-no-files-found: error
+          retention-days: 3
+
+      - name: Upload release AAB (watch)
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release-aab
+          path: app/build/outputs/bundle/release/app-release.aab
+          if-no-files-found: error
+          retention-days: 3
+
+      - name: Upload release AAB (companion)
+        uses: actions/upload-artifact@v4
+        with:
+          name: companion-release-aab
+          path: companion/build/outputs/bundle/release/companion-release.aab
+          if-no-files-found: error
+          retention-days: 3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,17 +4,25 @@ All notable changes to wBooks are documented in this file.
 
 ## [Unreleased]
 
-## [0.9.0] - 2026-05-24
+## [1.0.0] - 2026-05-24
 
 - Reduced watch reader memory pressure: embedded images now decode at display size, and stale parsed-document cache writes are cancelled when switching or closing books.
 - Improved Time left behavior: normal/sentence scrolling now feeds the pace estimate more reliably, and speed-reading mode gets immediate WPM-based ETA.
 - Polished watch Project Gutenberg search: keyboard search submits directly, voice/text controls match, and downloaded entries look like existing library books.
+- Watch Project Gutenberg downloads now show inline progress, flip to Added when complete, and remain tracked after renamed or moved.
 - Book lists now show file size beside format, and bundled seed books use Gutenberg-compatible titles on fresh installs.
+- Web interface and Utility now show watch reading statistics from the same watch-authoritative source.
 - Web and Utility storage summaries now show library usage and free space only, not total device storage.
 - Utility Root layout is adjustable by dragging and leaves more space when folders exist.
+- Utility watch requests now time out instead of hanging forever, and any lost watch connection opens the reconnect screen, including mid-session Gutenberg adds.
 - Web same-folder drag-and-drop now updates order directly instead of treating the drop as a move.
 - Hardened Wear/web transfer cleanup and reduced temporary disk use during web uploads.
 - GitHub Actions artifact/caching retention was tightened to reduce repository Actions storage usage.
+- CI now builds signed release APKs and AABs for GitHub/direct install and Play Console testing.
+
+## [0.9.0] - 2026-05-24
+
+- Release-candidate build used for final watch, Utility, webserver, Gutenberg, storage, and Actions cleanup testing.
 
 ## [0.8.0] — 2026-05-24
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -78,8 +78,8 @@ android {
         applicationId = requireLocalProperty("wbooks.applicationId")
         minSdk = 30
         targetSdk = 35
-        versionCode = 12
-        versionName = "0.9.0"
+        versionCode = 13
+        versionName = "1.0.0"
 
         manifestPlaceholders["sentryDsn"] = localProperty("sentry.dsn")
     }
@@ -133,7 +133,8 @@ android {
 // Only enable Sentry symbol/source upload when an auth token is available.
 // CI builds debug only and has no token; without this gate the Sentry Gradle
 // plugin tries to bundle+upload source context during assembleDebug and fails.
-val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank()
+val skipSentryUpload = providers.gradleProperty("wbooks.skipSentryUpload").orNull == "true"
+val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank() && !skipSentryUpload
 
 sentry {
     org.set("fredapps")
diff --git a/app/src/main/kotlin/com/fredapp/wbooks/data/changelog/Changelog.kt b/app/src/main/kotlin/com/fredapp/wbooks/data/changelog/Changelog.kt
@@ -12,19 +12,26 @@ data class ChangelogEntry(
  */
 val CHANGELOG: List<ChangelogEntry> = listOf(
     ChangelogEntry(
-        version = "0.9.0",
+        version = "1.0.0",
         date = "2026-05-24",
         notes = listOf(
             "Reader memory pressure reduced: embedded images are decoded at watch-display size, and stale parsed-document cache writes are cancelled when switching or closing books.",
             "Time left estimates now learn from sustained normal/sentence scrolling and speed-reading mode shows an immediate WPM-based estimate.",
             "The web interface now includes read-only reading statistics from the watch.",
-            "Watch Project Gutenberg search controls were tightened: keyboard search submits directly, voice/text controls match visually, and downloaded entries look like existing library books.",
+            "Watch Project Gutenberg search controls were tightened: keyboard search submits directly, voice/text controls match visually, downloads show inline progress, and completed entries stay marked as Added after rename or move.",
             "Book lists now show file size beside format, and bundled seed books use Gutenberg-compatible titles on fresh installs.",
             "Web and Utility library storage summaries now show only library usage and free space, not the device's total storage volume.",
             "Web same-folder drag-and-drop now updates book order directly instead of treating the drop as a move.",
             "Wear and web uploads clean up interrupted transfers more aggressively and avoid extra temporary disk use where possible.",
         ),
     ),
+    ChangelogEntry(
+        version = "0.9.0",
+        date = "2026-05-24",
+        notes = listOf(
+            "Release-candidate build used for final watch, Utility, webserver, Gutenberg, storage, and Actions cleanup testing.",
+        ),
+    ),
     ChangelogEntry(
         version = "0.8.0",
         date = "2026-05-24",
diff --git a/companion/build.gradle.kts b/companion/build.gradle.kts
@@ -72,8 +72,8 @@ android {
         applicationId = requireLocalProperty("wbooks.applicationId")
         minSdk = 24
         targetSdk = 35
-        versionCode = 12
-        versionName = "0.9.0"
+        versionCode = 13
+        versionName = "1.0.0"
 
         manifestPlaceholders["sentryDsn"] = localProperty("sentry.dsn")
     }
@@ -117,7 +117,8 @@ android {
     }
 }
 
-val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank()
+val skipSentryUpload = providers.gradleProperty("wbooks.skipSentryUpload").orNull == "true"
+val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank() && !skipSentryUpload
 
 sentry {
     org.set("fredapps")
diff --git a/companion/proguard-rules.pro b/companion/proguard-rules.pro
@@ -4,6 +4,10 @@
 -keep class org.jsoup.** { *; }
 -dontwarn org.jsoup.**
 
+# --- PDFBox treats JPEG-2000 support as optional; the converter still works
+# for normal text PDFs when the JP2 decoder artifact is absent.
+-dontwarn com.gemalto.jp2.JP2Decoder
+
 # --- Sentry auto-init reflection (see app/proguard-rules.pro for context).
 -keep class io.sentry.android.core.SentryAndroidOptions { *; }
 -keep class io.sentry.android.core.SentryInitProvider { *; }
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/CompanionChangelog.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/CompanionChangelog.kt
@@ -14,9 +14,10 @@ data class CompanionChangelogEntry(
 object CompanionChangelog {
     val ENTRIES: List<CompanionChangelogEntry> = listOf(
         CompanionChangelogEntry(
-            version = "0.9.0",
+            version = "1.0.0",
             date = "2026-05-24",
             notes = listOf(
+                "Utility watch requests now time out instead of hanging forever, and any lost watch connection opens the Reconnect screen, including mid-session Gutenberg adds.",
                 "Utility root layout is easier to manage: Root sits lower when folders exist and its position can be adjusted by dragging.",
                 "Reading stats keep refreshing from the watch while the Utility stats screen is open.",
                 "Storage summary now shows library usage and free space only, matching the watch web interface.",
@@ -25,6 +26,13 @@ object CompanionChangelog {
                 "Shared upload and watch-sync behavior benefits from the watch-side transfer cleanup in this release.",
             ),
         ),
+        CompanionChangelogEntry(
+            version = "0.9.0",
+            date = "2026-05-24",
+            notes = listOf(
+                "Release-candidate build used for final Utility, library sync, settings, stats, and Project Gutenberg testing.",
+            ),
+        ),
         CompanionChangelogEntry(
             version = "0.8.0",
             date = "2026-05-24",
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/GutenbergScreen.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/GutenbergScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -51,44 +52,19 @@ fun GutenbergScreen(vm: GutenbergViewModel, onBack: () -> Unit) {
         snackbarHost = { GutenbergSnackbarHost(state, snackbarState, onCancelDownload = vm::cancelDownload) },
     ) { padding ->
         Column(modifier = Modifier.padding(padding).fillMaxSize()) {
-            SearchBar(
-                value = state.query,
-                onValueChange = vm::onQueryChange,
-                onSubmit = vm::submitSearch,
-            )
             when {
-                state.loading && state.visibleBooks.isEmpty() -> CenteredProgress()
-                state.showingSearch && state.searchResults.isEmpty() -> CenteredText("No results.")
-                state.showingSearch -> ResultsList(
-                    results = state.searchResults,
-                    downloadingId = state.downloadingId,
-                    loadingMore = state.loadingMore,
-                    hasMore = state.searchHasMore,
-                    onLoadMore = { vm.loadMore(GutenbergListTarget.SEARCH) },
-                    isPresentOnDevice = vm::isPresentOnDevice,
-                    onAdd = vm::sendToWatch,
-                )
-                state.popularBooks.isEmpty() && state.recentReleases.isEmpty() -> CenteredText("No books.")
-                else -> HomeSections(
-                    popularBooks = state.popularBooks,
-                    recentReleases = state.recentReleases,
-                    selectedSection = homeSection,
-                    onSectionChange = { homeSection = it },
-                    downloadingId = state.downloadingId,
-                    loadingMore = state.loadingMore,
-                    popularHasMore = state.popularHasMore,
-                    recentHasMore = state.recentHasMore,
-                    onLoadMore = { section ->
-                        vm.loadMore(
-                            when (section) {
-                                GutenbergHomeSection.POPULAR -> GutenbergListTarget.POPULAR
-                                GutenbergHomeSection.RECENT -> GutenbergListTarget.RECENT
-                            },
-                        )
-                    },
-                    isPresentOnDevice = vm::isPresentOnDevice,
-                    onAdd = vm::sendToWatch,
+                state.noWatch -> WatchReconnectPrompt(
+                    text = stringResource(R.string.no_watch),
+                    onReconnect = vm::reconnect,
                 )
+                else -> {
+                    SearchBar(
+                        value = state.query,
+                        onValueChange = vm::onQueryChange,
+                        onSubmit = vm::submitSearch,
+                    )
+                    GutenbergContent(state, homeSection, { homeSection = it }, vm)
+                }
             }
         }
     }
@@ -104,6 +80,49 @@ fun GutenbergScreen(vm: GutenbergViewModel, onBack: () -> Unit) {
     }
 }
 
+@Composable
+private fun GutenbergContent(
+    state: GutenbergViewModel.UiState,
+    homeSection: GutenbergHomeSection,
+    onHomeSectionChange: (GutenbergHomeSection) -> Unit,
+    vm: GutenbergViewModel,
+) {
+    when {
+        state.loading && state.visibleBooks.isEmpty() -> CenteredProgress()
+        state.showingSearch && state.searchResults.isEmpty() -> CenteredText("No results.")
+        state.showingSearch -> ResultsList(
+            results = state.searchResults,
+            downloadingId = state.downloadingId,
+            loadingMore = state.loadingMore,
+            hasMore = state.searchHasMore,
+            onLoadMore = { vm.loadMore(GutenbergListTarget.SEARCH) },
+            isPresentOnDevice = vm::isPresentOnDevice,
+            onAdd = vm::sendToWatch,
+        )
+        state.popularBooks.isEmpty() && state.recentReleases.isEmpty() -> CenteredText("No books.")
+        else -> HomeSections(
+            popularBooks = state.popularBooks,
+            recentReleases = state.recentReleases,
+            selectedSection = homeSection,
+            onSectionChange = onHomeSectionChange,
+            downloadingId = state.downloadingId,
+            loadingMore = state.loadingMore,
+            popularHasMore = state.popularHasMore,
+            recentHasMore = state.recentHasMore,
+            onLoadMore = { section ->
+                vm.loadMore(
+                    when (section) {
+                        GutenbergHomeSection.POPULAR -> GutenbergListTarget.POPULAR
+                        GutenbergHomeSection.RECENT -> GutenbergListTarget.RECENT
+                    },
+                )
+            },
+            isPresentOnDevice = vm::isPresentOnDevice,
+            onAdd = vm::sendToWatch,
+        )
+    }
+}
+
 @Composable
 private fun GutenbergSnackbarHost(
     state: GutenbergViewModel.UiState,
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/GutenbergViewModel.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/GutenbergViewModel.kt
@@ -37,6 +37,7 @@ class GutenbergViewModel(application: Application) : AndroidViewModel(applicatio
         val errorMessage: String? = null,
         val lastSentTitle: String? = null,
         val lastStatusMessage: String? = null,
+        val noWatch: Boolean = false,
     ) {
         val showingSearch: Boolean
             get() = query.trim().isNotEmpty()
@@ -86,6 +87,12 @@ class GutenbergViewModel(application: Application) : AndroidViewModel(applicatio
         }
     }
 
+    fun reconnect() {
+        _state.value = _state.value.copy(noWatch = false, errorMessage = null)
+        loadHomeSections()
+        refreshDeviceBooks()
+    }
+
     fun onQueryChange(value: String) {
         val previous = _state.value
         _state.value = previous.copy(
@@ -256,13 +263,7 @@ class GutenbergViewModel(application: Application) : AndroidViewModel(applicatio
                         lastSentTitle = book.title,
                     )
                 result is WatchRepository.Result.NoWatch ->
-                    _state.value.copy(
-                        downloadingId = null,
-                        downloadingTitle = null,
-                        downloadProgressBytes = 0L,
-                        downloadProgressTotal = -1L,
-                        errorMessage = "No watch connected",
-                    )
+                    _state.value.disconnectedCopy()
                 result is WatchRepository.Result.Error ->
                     _state.value.copy(
                         downloadingId = null,
@@ -333,12 +334,26 @@ class GutenbergViewModel(application: Application) : AndroidViewModel(applicatio
                     deviceBookTitleKeys = result.value.books.mapTo(mutableSetOf()) {
                         it.title.normalizedTitleKey()
                     },
+                    noWatch = false,
                 )
             }
-            else -> Unit
+            is WatchRepository.Result.NoWatch -> _state.value = _state.value.disconnectedCopy()
+            is WatchRepository.Result.Error -> Unit
         }
     }
 
+    private fun UiState.disconnectedCopy(): UiState = copy(
+        downloadingId = null,
+        downloadingTitle = null,
+        downloadProgressBytes = 0L,
+        downloadProgressTotal = -1L,
+        noWatch = true,
+        loading = false,
+        loadingMore = false,
+        errorMessage = null,
+        lastStatusMessage = null,
+    )
+
     private fun mergeBooks(current: List<GutenbergBook>, incoming: List<GutenbergBook>): List<GutenbergBook> {
         val seen = current.mapTo(mutableSetOf()) { it.id.ifEmpty { it.downloadUrl } }
         val merged = current + incoming.filter { seen.add(it.id.ifEmpty { it.downloadUrl }) }
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/SettingsScreen.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/SettingsScreen.kt
@@ -83,8 +83,9 @@ fun SettingsScreen(vm: SettingsViewModel, onBack: () -> Unit) {
             when (val s = state) {
                 is SettingsViewModel.SyncState.Idle,
                 SettingsViewModel.SyncState.Loading -> CenteredProgress()
-                SettingsViewModel.SyncState.NoWatch -> CenteredText(
-                    "No watch connected. Connect your watch to view and edit settings.",
+                SettingsViewModel.SyncState.NoWatch -> WatchReconnectPrompt(
+                    text = "No watch connected. Connect your watch to view and edit settings.",
+                    onReconnect = vm::refresh,
                 )
                 is SettingsViewModel.SyncState.Error -> CenteredText("Couldn't reach watch: ${s.message}")
                 is SettingsViewModel.SyncState.Refreshing -> Column(Modifier.fillMaxSize()) {
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/StatsScreen.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/StatsScreen.kt
@@ -48,7 +48,10 @@ fun StatsScreen(vm: StatsViewModel, onBack: () -> Unit) {
         Box(modifier = Modifier.padding(padding).fillMaxSize()) {
             when {
                 state.loading && state.stats == null -> CenteredProgress()
-                state.noWatch -> CenteredText("No watch connected.")
+                state.noWatch -> WatchReconnectPrompt(
+                    text = "No watch connected.",
+                    onReconnect = vm::refresh,
+                )
                 state.stats == null -> CenteredText("No stats yet.")
                 else -> StatsContent(state.stats!!)
             }
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/WatchReconnectPrompt.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/WatchReconnectPrompt.kt
diff --git a/companion/src/main/kotlin/com/fredapp/wbooksutil/WatchRepository.kt b/companion/src/main/kotlin/com/fredapp/wbooksutil/WatchRepository.kt

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ android {`
`72`	`72`	`applicationId = requireLocalProperty("wbooks.applicationId")`
`73`	`73`	`minSdk = 24`
`74`	`74`	`targetSdk = 35`
`75`		`- versionCode = 12`
`76`		`- versionName = "0.9.0"`
	`75`	`+ versionCode = 13`
	`76`	`+ versionName = "1.0.0"`
`77`	`77`
`78`	`78`	`manifestPlaceholders["sentryDsn"] = localProperty("sentry.dsn")`
`79`	`79`	`}`
`@@ -117,7 +117,8 @@ android {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`-val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank()`
	`120`	`+val skipSentryUpload = providers.gradleProperty("wbooks.skipSentryUpload").orNull == "true"`
	`121`	`+val hasSentryAuthToken = localProperty("sentry.auth.token").isNotBlank() && !skipSentryUpload`
`121`	`122`
`122`	`123`	`sentry {`
`123`	`124`	`org.set("fredapps")`