Reader: Apply theme to post detail and improve preferences dialog by nbradbury · Pull Request #22723 · wordpress-mobile/WordPress-Android

nbradbury · 2026-03-20T19:49:58Z

Description

This PR started with a simple task: ensure that after choosing a theme from the Reader Preferences, that theme is applied when returning to the post detail. Previously the theme wouldn't be applied until you returned to the post list and re-opened the post.

Unfortunately, the existing Reader Preferences screen suffered from a number of problems, mostly related to using a bottom sheet instead of a standard dialog, and was implemented very differently than the iOS version. So I chose to redo this screen as a standard dialog, similar to iOS, and add icons to the toolbar to save or discard changes (previously there was just an "X" icon).

This was a much bigger task than expected, but I think the end result is quite an improvement over the existing reader preferences.

Testing instructions

Theme applies to open post:

Open a Reader post
Tap the reading preferences icon
Change the theme (e.g., to Sepia or OLED)
Tap the checkmark to save

Verify the post detail immediately reflects the new theme colors (background, text, toolbar, nav bar)

Save/discard behavior:

Open reading preferences dialog
Change the theme

Verify the checkmark icon appears in the toolbar

Tap the X to close without saving
Reopen the dialog

Verify the theme reverted to the previous selection

Change the theme again and tap the checkmark

Verify the change is saved and applied

Landscape scrolling:

Rotate the device to landscape
Open the reading preferences dialog

Verify the entire dialog content is scrollable and nothing is cut off

reader.mp4

Three issues prevented theme changes from being reflected in an already-open post: 1. SharedFlow event dropped: UpdatePostDetails was emitted via launch(bgDispatcher) but the collector was bound to the dialog's viewLifecycleOwner, which was already destroyed by onDismiss time. Fix: call postDetailViewModel directly from onDismiss(). 2. detach/reattach doesn't work with ViewPager2: FragmentStateAdapter manages its own fragments, so manual detach/attach was ignored. Fix: re-render WebView content and update native view colors in place. 3. Repository cache race: the save coroutine on ioDispatcher may not have executed by the time the fragment re-reads preferences. Fix: synchronously update the in-memory cache before the UI reads it. Also explicitly set header text colors from ThemeValues since the ContextThemeWrapper used at inflation time becomes stale, and update the activity status bar color on theme change. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The status bar area on API 35+ is transparent (edge-to-edge), so the visible color comes from the AppBarLayout and its CollapsingToolbarLayout content scrim drawn behind it. Update both when reading preferences theme changes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

- Update footer bar background color when reading preferences theme changes so the area behind the transparent navigation bar matches - Remove dead setWindowStatusBarColor call (no-op on SDK 35+) - Inline isDirty() into hasUnsavedChanges property Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Instead of manually updating colors on each view (root, appBar, collapsingToolbar, footer, chips, header text) when reading preferences change, the ViewPager2 adapter now destroys and recreates the current fragment. The new fragment is inflated with a fresh ContextThemeWrapper so all views get correct theme colors automatically. Also removes the Experimental badge from the reading preferences screen and adds chip color support via ColorStateList. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Remove dead initNavigationBar() method, simplify ReaderExpandableTagsView and ReaderPostDetailHeaderView, and add setDialogWindowStatusBarColor() for dialog windows that aren't subject to edge-to-edge enforcement. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

On SDK 35+, Window.setStatusBarColor() is ignored because the status bar is always transparent. Enable edge-to-edge on the dialog window so the TopAppBar's background color shows through the status bar. Add navigationBarsPadding to the bottom preferences section. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Instead of trying to set the status bar color (which is ignored on SDK 35+), hide the status and navigation bars on the dialog window to match the post detail screen behavior. This removes all status bar color management from the dialog. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The edge-to-edge setup was causing a gap at the top of the dialog where the activity's toolbar was visible. Just hiding the system bars is sufficient. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The BottomSheetDialog's internal container, coordinator, and bottom sheet views all have fitsSystemWindows=true, which adds top padding for the status bar. Clear fitsSystemWindows and padding on these views in onStart() so the dialog content fills the entire screen, matching the post detail screen's full-screen layout. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The various approaches to fix the dialog's status bar color on SDK 35+ (setDialogWindowStatusBarColor, edge-to-edge, hiding system bars) did not work correctly. Revert to the original dialog state before those changes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…discard UX Replace fullscreen bottom sheet with a non-fullscreen one to avoid SDK 35+ status bar color issues. X (close) discards changes, checkmark saves. Remove all status bar color management logic. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Remove updateCache/updateCachedPreferences which became dead code after the ViewModel's syncCachedPreferences was removed. Also remove the nestedScroll modifier from the reading preferences screen since it is no longer a fullscreen draggable bottom sheet. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…s exist Move STATE_EXPANDED/skipCollapsed into setOnShowListener to avoid the scroll-up-then-down animation on open. Add hasUnsavedChanges StateFlow to conditionally show the save checkmark only when preferences differ from the original values. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The SlideDialogFragmentAnimation was designed for fullscreen dialogs and conflicts with the BottomSheetDialog's built-in entrance animation, causing the sheet to slide to the top of the screen then settle back down. Removing it lets the bottom sheet animate smoothly. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Replace BottomSheetDialogFragment with DialogFragment to eliminate animation conflicts between the window-level slide animation and the BottomSheetBehavior entrance animation. Add rounded corners to the Compose content and use a Material dialog theme overlay. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

dangermattic · 2026-03-20T19:50:51Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.kt

WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt

wpmobilebot · 2026-03-20T20:13:38Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22723-1eb34f4
	Build Number	`1488`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`1eb34f4`
	Installation URL	0urhs63ghu0s0

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-03-20T20:20:04Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22723-1eb34f4
	Build Number	`1488`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`1eb34f4`
	Installation URL	0pjjsp8s9g4m0

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

codecov · 2026-03-21T10:15:52Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 37.35%. Comparing base (0c9a9a3) to head (1eb34f4).
⚠️ Report is 2 commits behind head on trunk.

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22723      +/-   ##
==========================================
- Coverage   37.35%   37.35%   -0.01%     
==========================================
  Files        2316     2316              
  Lines      123272   123264       -8     
  Branches    16712    16711       -1     
==========================================
- Hits        46053    46046       -7     
+ Misses      73520    73519       -1     
  Partials     3699     3699

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

adalpari · 2026-03-23T10:33:57Z

Landscape scrolling:

If I rotate the device with the dialog opened, it disappears. But since this is not contemplated in tests, I assume it's expected.

adalpari

🚢 it!

nbradbury · 2026-03-23T10:39:41Z

If I rotate the device with the dialog opened, it disappears.

Hmm, that shouldn't be happening, even when "Don't keep activities" is enabled. I'm not able to reproduce this, either. Do you see this on multiple devices?

adalpari · 2026-03-23T10:44:35Z

If I rotate the device with the dialog opened, it disappears.

Hmm, that shouldn't be happening, even when "Don't keep activities" is enabled. I'm not able to reproduce this, either. Do you see this on multiple devices?

Interesting, it does not always happen. I have been able to reproduce it only with a Pixel 6 physical device.

adalpari · 2026-03-23T10:46:38Z

See: following the same steps, but only happens once

Screen_recording_20260323_114529.mp4

The reading preferences dialog disappeared on rotation after changing the reader theme because the adapter's generation counter reset to 0, causing FragmentStateAdapter to discard the restored fragments. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sonarqubecloud · 2026-03-23T11:13:17Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

nbradbury · 2026-03-23T11:14:29Z

@adalpari Ah! I was able to reproduce this by changing and saving the theme, then re-opening the dialog and rotating the device. Claude identified the problem and I pushed the fix in Persist pager generation across config changes to fix dialog loss.

Root cause: The generation counter in PostPagerAdapter was a local field that reset to 0 every time the activity was recreated (on rotation). After changing the reader theme, recreateFragments() bumped generation to 1, so all fragments got IDs based on generation 1. On rotation, the new adapter started with generation = 0, causing containsItem() to return false for all the saved generation-1 fragments. FragmentStateAdapter then discarded them — including the child dialog fragment — and created new ones.

Fix: Moved generation from the adapter to the activity as pagerGeneration, and save/restore it via onSaveInstanceState/onCreate. This way the generation counter survives configuration changes, and FragmentStateAdapter correctly recognizes the existing fragments after rotation.

nbradbury and others added 18 commits March 20, 2026 10:52

Fixed back arrow color

d8afa39

Remove setDecorFitsSystemWindows from reading preferences dialog

3d71b33

The edge-to-edge setup was causing a gap at the top of the dialog where the activity's toolbar was visible. Just hiding the system bars is sufficient. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Remove rounded corners from reading preferences dialog

927057d

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Make reading preferences dialog scrollable for landscape

4418569

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury added the unit-tests-exemption label Mar 20, 2026

github-advanced-security bot found potential problems Mar 20, 2026

View reviewed changes

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.kt Fixed Show fixed Hide fixed

WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt Fixed Show fixed Hide fixed

Remove unused OpenWebView event and redundant modifiers

4f90880

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury added the Reader: Post Detail label Mar 20, 2026

nbradbury and others added 5 commits March 20, 2026 18:51

Fix detekt, checkstyle, and lint issues in reader files

f6c8b12

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Simplify reader code: remove dead code and reduce duplication

4fa760a

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Rename recreateCurrentPage to recreatePages for accuracy

a3bec70

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge trunk into issue/CMM-1972-reader-apply-theme

9d2c177

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Suppress NotifyDataSetChanged lint warning in recreateFragments

d74dad1

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Restore experimental_badge string to fix ExtraTranslation lint error

ba850ac

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Inline single-use method and extract duplicate chip styling

4e4c2a5

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury requested review from adalpari and dcalhoun March 21, 2026 16:09

nbradbury marked this pull request as ready for review March 21, 2026 16:09

adalpari approved these changes Mar 23, 2026

View reviewed changes

nbradbury enabled auto-merge (squash) March 23, 2026 11:35

nbradbury merged commit 5b9c4cf into trunk Mar 23, 2026
21 of 22 checks passed

nbradbury deleted the issue/CMM-1972-reader-apply-theme branch March 23, 2026 11:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reader: Apply theme to post detail and improve preferences dialog#22723

Reader: Apply theme to post detail and improve preferences dialog#22723
nbradbury merged 27 commits intotrunkfrom
issue/CMM-1972-reader-apply-theme

nbradbury commented Mar 20, 2026 •

edited by adalpari

Loading

Uh oh!

dangermattic commented Mar 20, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

wpmobilebot commented Mar 20, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 20, 2026 •

edited

Loading

Uh oh!

codecov bot commented Mar 21, 2026 •

edited

Loading

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

adalpari left a comment

Uh oh!

nbradbury commented Mar 23, 2026

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

sonarqubecloud bot commented Mar 23, 2026

Uh oh!

nbradbury commented Mar 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

nbradbury commented Mar 20, 2026 • edited by adalpari Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Uh oh!

dangermattic commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wpmobilebot commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

nbradbury commented Mar 23, 2026

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

adalpari commented Mar 23, 2026

Uh oh!

sonarqubecloud bot commented Mar 23, 2026

Quality Gate passed

Uh oh!

nbradbury commented Mar 23, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nbradbury commented Mar 20, 2026 •

edited by adalpari

Loading

dangermattic commented Mar 20, 2026 •

edited

Loading

wpmobilebot commented Mar 20, 2026 •

edited

Loading

wpmobilebot commented Mar 20, 2026 •

edited

Loading

codecov bot commented Mar 21, 2026 •

edited

Loading