Skip to content

Use Material3 in the 2D viewport tests #128155

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
merged 4 commits into from
Jun 6, 2023
Merged

Use Material3 in the 2D viewport tests #128155

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
8ae64c7
Use Material3 in the 2D viewport tests
HansMuller Jun 3, 2023
09b4ae8
fixed a typo
HansMuller Jun 3, 2023
9938db9
fixed a typo
HansMuller Jun 3, 2023
c5924b4
Updated per review feedback
HansMuller Jun 5, 2023
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
1 change: 1 addition & 0 deletions packages/flutter/test/widgets/two_dimensional_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ Widget simpleListTest({
Clip? clipBehavior,
}) {
return MaterialApp(
theme: ThemeData(useMaterial3: true),
home: Scaffold(
body: SimpleListTableView(
mainAxis: mainAxis,
Expand Down
21 changes: 19 additions & 2 deletions packages/flutter/test/widgets/two_dimensional_viewport_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,27 @@ void main() {
));
await tester.pumpAndSettle();

// In the tests below the number of RepaintBoundary widgets depends on:
// ModalRoute - builds 2
// GlowingOverscrollIndicator - builds 2
Copy link
Contributor

@Piinks Piinks Jun 5, 2023

Choose a reason for hiding this comment

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

If useMaterial 3 is true, then there is no glowing overscroll indicator, it is the stretching one.

Copy link
Contributor Author

@HansMuller HansMuller Jun 5, 2023

Choose a reason for hiding this comment

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

That is correct.

// TwoDimensionalChildListDelegate - builds 1 unless addRepaintBoundaries is false

void expectModalRoute() {
expect(ModalRoute.of(tester.element(find.byType(SimpleListTableViewport))), isA<MaterialPageRoute<void>>());
}

switch (defaultTargetPlatform) {
case TargetPlatform.android:
case TargetPlatform.fuchsia:
expectModalRoute();
expect(find.byType(GlowingOverscrollIndicator), findsNWidgets(2));
expect(find.byType(RepaintBoundary), findsNWidgets(7));

case TargetPlatform.android:
Copy link
Contributor

@Piinks Piinks Jun 5, 2023

Choose a reason for hiding this comment

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

What makes the difference when switching to material 3 on Android here?

Copy link
Contributor Author

@HansMuller HansMuller Jun 5, 2023

Choose a reason for hiding this comment

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

For Material3 a StretchingOverscrollIndicator is used and it does not create a RepaintBoundary.

Copy link
Contributor

@Piinks Piinks Jun 6, 2023

Choose a reason for hiding this comment

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

Gotcha, that accounts for 2 of them, what about the other 2? since it is going from 7 to 3 on android for material 3. Just want to make sure we know what is changing here with material 3.

Copy link
Contributor Author

@HansMuller HansMuller Jun 6, 2023

Choose a reason for hiding this comment

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

7 repaint boundaries:
4 - 2 GlowingOverscrollIndicators (not included in M3)
2 - 1 ModalRoute
1 - the table's cell

3 repaint boundaries:
2 - 1 ModalRoute
1 - the table's cell

case TargetPlatform.iOS:
case TargetPlatform.linux:
case TargetPlatform.macOS:
case TargetPlatform.windows:
expectModalRoute();
expect(find.byType(RepaintBoundary), findsNWidgets(3));
}

Expand All @@ -183,13 +196,17 @@ void main() {
await tester.pumpAndSettle();

switch (defaultTargetPlatform) {
case TargetPlatform.android:
case TargetPlatform.fuchsia:
expectModalRoute();
expect(find.byType(GlowingOverscrollIndicator), findsNWidgets(2));
expect(find.byType(RepaintBoundary), findsNWidgets(6));

case TargetPlatform.android:
case TargetPlatform.iOS:
case TargetPlatform.linux:
case TargetPlatform.macOS:
case TargetPlatform.windows:
expectModalRoute();
expect(find.byType(RepaintBoundary), findsNWidgets(2));
}
}, variant: TargetPlatformVariant.all());
Expand Down