Skip to content

feat[NoteEditor]: Edge to edge support - #21596

Merged
david-allison merged 2 commits into
ankidroid:mainfrom
criticalAY:edge-to-edge-note-editor
Aug 30, 2026
Merged

feat[NoteEditor]: Edge to edge support#21596
david-allison merged 2 commits into
ankidroid:mainfrom
criticalAY:edge-to-edge-note-editor

Conversation

@criticalAY

@criticalAY criticalAY commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

Note

Assisted-by: Claude Opus 5

Purpose / Description

Port NoteEditor to support edge to edge

Fixes

Approach

See commits

How Has This Been Tested?

API 36 and API 28:
Screenshot_20260824_180124
Screenshot_20260824_180144
Screenshot_20260824_180556
Screenshot_20260824_180604

Learning (optional, can help others)

NA

Checklist

Please, go through these checks before submitting the PR.

  • You have a descriptive commit message with a short title (first line, max 50 chars).
  • You have commented your code, particularly in hard-to-understand areas
  • You have performed a self-review of your own code
  • UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
  • UI Changes: You have tested your change using the Google Accessibility Scanner

@criticalAY criticalAY added Review High Priority Request for high priority review Needs Review and removed Needs Review labels Aug 24, 2026
@github-actions

github-actions Bot commented Aug 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Snapshot diff report vs main. Open screenshot-diff for diffs.

  • NoteEditorScreenshotTest: 6 changes
All 6 changed screenshots

NoteEditorScreenshotTest

  • gesture_navigation_compare.png
  • keyboard_compare.png
  • landscape_compare.png
  • portrait_compare.png
  • tablet_compare.png
  • tablet_keyboard_compare.png

@criticalAY
criticalAY force-pushed the edge-to-edge-note-editor branch from 26d3e89 to fe7fd53 Compare August 25, 2026 20:55
@criticalAY criticalAY added the Blocked by dependency Currently blocked by some other dependent / related change label Aug 25, 2026
@criticalAY

This comment was marked as resolved.

Sign in to view
david-allison

This comment was marked as resolved.

Sign in to view

@david-allison david-allison added Needs Author Reply Waiting for a reply from the original author and removed Blocked by dependency Currently blocked by some other dependent / related change labels Aug 26, 2026
@criticalAY
criticalAY force-pushed the edge-to-edge-note-editor branch from 3fcc544 to 7ff4f44 Compare August 27, 2026 21:43
@david-allison

This comment was marked as resolved.

Sign in to view
@criticalAY
criticalAY force-pushed the edge-to-edge-note-editor branch from 7ff4f44 to ff8d940 Compare August 27, 2026 22:55
@criticalAY

This comment was marked as resolved.

Sign in to view
@david-allison

david-allison commented Aug 27, 2026

Copy link
Copy Markdown
Member

Looks beautiful, I'll get on with the code review

@david-allison david-allison removed the Needs Author Reply Waiting for a reply from the original author label Aug 27, 2026
david-allison
david-allison requested changes Aug 27, 2026
View reviewed changes

@david-allison david-allison left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!!

A few more screenshot tests would be awesome, especially IME-related but feel free to push these to an issue if they're at all problematic

Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorActivity.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt Resolved
Comment thread AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt Resolved
Comment thread AnkiDroid/src/main/res/layout-sw600dp/activity_note_editor.xml Resolved
Comment thread AnkiDroid/src/main/res/layout/activity_note_editor.xml Resolved
@david-allison david-allison added the Needs Author Reply Waiting for a reply from the original author label Aug 27, 2026
@criticalAY
criticalAY force-pushed the edge-to-edge-note-editor branch from ff8d940 to ddf8ed7 Compare August 27, 2026 23:42
@criticalAY criticalAY removed the Needs Author Reply Waiting for a reply from the original author label Aug 27, 2026
david-allison
david-allison approved these changes Aug 28, 2026
View reviewed changes

@david-allison david-allison left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Cheers!

@criticalAY criticalAY added Needs Second Approval Has one approval, one more approval to merge and removed Needs Review labels Aug 28, 2026
lukstbit
lukstbit approved these changes Aug 30, 2026
View reviewed changes

@lukstbit lukstbit left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@lukstbit lukstbit added Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) and removed Needs Second Approval Has one approval, one more approval to merge labels Aug 30, 2026
@lukstbit
lukstbit added this pull request to the merge queue Aug 30, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 30, 2026
@david-allison

david-allison commented Aug 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Legit error, I'll fix it up. Conflict with my Destination change:

@david-allison david-allison self-assigned this Aug 30, 2026
criticalAY and others added 2 commits August 30, 2026 19:26
@criticalAY @david-allison
feat(note-editor): edge to edge support
850a06f 
The activity insets the app bar and the previewer pane. The editor's
 pane is left full-bleed: the formatting toolbar spans it and draws
 behind the navigation bar, so its colour still reaches the screen
 edges, as it did when the fragment wrote window.navigationBarColor,
 which edge-to-edge ignores. The fields and the toolbar's buttons take
 the insets instead.

The system scrims the navigation bar under button navigation only, so
 that is turned off. Below API 29, where it cannot be, the bar is
 painted the toolbar's colour instead.

The fragment's manual status and navigation bar colour writes are
 removed: they ran after the host's onCreate and painted over the
 edge-to-edge scrims. The host owns the window.

Assisted-by: Claude Fable 5
Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>
@criticalAY @david-allison
test(note-editor): screenshot test
c631f8b 
Assisted-by: Claude Fable 5
Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>
@david-allison
david-allison force-pushed the edge-to-edge-note-editor branch from ddf8ed7 to c631f8b Compare August 30, 2026 18:27
@david-allison
david-allison added this pull request to the merge queue Aug 30, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 30, 2026
@criticalAY
criticalAY added this pull request to the merge queue Aug 30, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 30, 2026
@david-allison
david-allison added this pull request to the merge queue Aug 30, 2026
Merged via the queue into ankidroid:main with commit 5957767 Aug 30, 2026
22 checks passed
@github-actions github-actions Bot removed Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) Review High Priority Request for high priority review labels Aug 30, 2026
@github-actions github-actions Bot added this to the 2.25 release milestone Aug 30, 2026
@david-allison david-allison mentioned this pull request Sep 1, 2026
Merged
3 of 5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lukstbit lukstbit lukstbit approved these changes
@david-allison david-allison david-allison approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.25 release

Development

Successfully merging this pull request may close these issues.

Edge to edge: verify NoteEditorActivity

3 participants

@criticalAY @david-allison @lukstbit