Skip to content

Remove ThemeData.dialogBackgroundColor usage #3901

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
auto-submit merged 3 commits into from
Sep 24, 2024
Merged

Remove ThemeData.dialogBackgroundColor usage #3901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62fa283
Remove` themeData.dialogBackgroundColor` usage
TahaTesser Sep 12, 2024
ef75bef
Fix analyzer
TahaTesser Sep 23, 2024
cdae858
Fix analyzer
TahaTesser Sep 23, 2024
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
3 changes: 2 additions & 1 deletion dashboard/lib/build_dashboard_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,11 @@ class BuildDashboardPageState extends State<BuildDashboardPage> {

Widget _settingsDialog(BuildContext context, BuildState buildState) {
final ThemeData theme = Theme.of(context);
final Color backgroundColor = theme.brightness == Brightness.dark ? Colors.grey[800]! : Colors.white;
return Center(
child: Container(
decoration: BoxDecoration(
color: theme.dialogBackgroundColor.withAlpha(0xe0),
color: backgroundColor.withAlpha(0xe0),
borderRadius: BorderRadius.circular(20.0),
),
child: Material(
Expand Down
50 changes: 50 additions & 0 deletions dashboard/test/build_dashboard_page_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,4 +618,54 @@ void main() {

expect(find.byType(dropdownButtonType), findsNWidgets(2));
});

testWidgets('Settings dialog default background color', (WidgetTester tester) async {
configureView(tester.view);
final BuildState fakeBuildState = FakeBuildState()
..isTreeBuilding = true
..authService = fakeAuthService;
const String dialogText = 'Refresh GitHub Commits';
ThemeData theme;
Widget buildDashboard({required Brightness brightness}) {
theme = ThemeData(useMaterial3: false, brightness: brightness);
return MaterialApp(
theme: theme,
home: ValueProvider<BuildState>(
value: fakeBuildState,
child: ValueProvider<GoogleSignInService>(
value: fakeBuildState.authService,
child: const BuildDashboardPage(),
),
),
);
}

// Test dashboard in light mode.
await tester.pumpWidget(buildDashboard(brightness: Brightness.light));
await tester.tap(find.byIcon(Icons.settings));
await tester.pump();

Finder dialogContainer = find.ancestor(
of: find.text(dialogText),
matching: find.byType(Container),
);
expect(
dialogContainer,
paints..rrect(color: Colors.white.withAlpha(0xe0)),
);

// Test dashboard in dark mode.
await tester.pumpWidget(buildDashboard(brightness: Brightness.dark));
await tester.tap(find.byIcon(Icons.settings));
await tester.pump(const Duration(seconds: 1)); // Finish changing theme.

dialogContainer = find.ancestor(
of: find.text(dialogText),
matching: find.byType(Container),
);
expect(
dialogContainer,
paints..rrect(color: Colors.grey[800]!.withAlpha(0xe0)),
);
});
}