Skip to content

refactorings and screenshot tests: prep for edge to edge Reviewer #21578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
criticalAY merged 4 commits into from
Aug 23, 2026
Merged

refactorings and screenshot tests: prep for edge to edge Reviewer #21578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67d1ce9
test(reviewer): screenshot test
david-allison Aug 21, 2026
453f114
test(reviewer): fullscreen screenshot scenarios
david-allison Aug 21, 2026
dd3e596
test(reviewer): landscape immersive screenshot
david-allison Aug 22, 2026
8156e1b
refactor(reviewer): wrap the toolbars in a container
david-allison Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions AnkiDroid/src/main/res/layout/activity_reviewer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@
android:id="@+id/front_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/include_toolbar"/>
<!-- The container allows edge-to-edge padding without it being absorbed
by the Toolbar's minHeight, so the app bar keeps its full height -->
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/appBarColor">

<include layout="@layout/include_toolbar"/>
</FrameLayout>

<include
layout="@layout/include_reviewer_topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar" />
android:layout_below="@id/toolbar_container" />

<include
layout="@layout/include_reviewer_mic_tool_bar"
Expand Down
9 changes: 4 additions & 5 deletions AnkiDroid/src/main/res/layout/activity_reviewer_fullscreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ xmlns:android="http://schemas.android.com/apk/res/android">
</RelativeLayout>
<!-- Controls that are overlaid over the main content when the user interrupts immersive mode -->
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<include layout="@layout/include_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"/>

<include layout="@layout/include_toolbar"/>
</FrameLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
11 changes: 9 additions & 2 deletions AnkiDroid/src/main/res/layout/activity_reviewer_fullscreen_noanswers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,18 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<include layout="@layout/include_toolbar"/>
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true">

<include layout="@layout/include_toolbar"/>
</FrameLayout>
<include layout="@layout/include_reviewer_topbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"/>
android:layout_below="@id/toolbar_container"/>
<include
layout="@layout/include_reviewer_whiteboard_editor"
android:layout_width="wrap_content"
Expand Down
1 change: 0 additions & 1 deletion AnkiDroid/src/main/res/layout/include_toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/appBarColor"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ActionBarStyle"
Expand Down
2 changes: 2 additions & 0 deletions AnkiDroid/src/test/java/com/ichi2/anki/AllActivitiesScreenshotTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ class AllActivitiesScreenshotTest : ScreenshotTest() {
MultimediaActivity::class.java,
// PreferencesScreenshotTest
PreferencesActivity::class.java,
// ReviewerScreenshotTest
Reviewer::class.java,
// SharedDecksScreenshotTest
SharedDecksActivity::class.java,
// StudyOptionsScreenshotTest
Expand Down
Loading
Loading