Default toggleableActiveColor to accentColor if not set (#17848)

66b50ed0 · Collin Jackson · GitHub · 41fb069c · 66b50ed0
Unverified Commit 66b50ed0 authored May 23, 2018 by Collin Jackson Committed by GitHub May 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

theme_data.dart packages/flutter/lib/src/material/theme_data.dart +1 -1

No files found.
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -114,8 +114,8 @@ class ThemeData extends Diagnosticable {
    primaryColorLight ??= isDark ? Colors.grey[500] : primarySwatch[100];
    primaryColorDark ??= isDark ? Colors.black : primarySwatch[700];
    final bool primaryIsDark = primaryColorBrightness == Brightness.dark;
+    toggleableActiveColor ??= isDark ? Colors.tealAccent[200] : (accentColor ?? primarySwatch[600]);
    accentColor ??= isDark ? Colors.tealAccent[200] : primarySwatch[500];
-    toggleableActiveColor ??= isDark ? Colors.tealAccent[200] : primarySwatch[600];
    accentColorBrightness ??= estimateBrightnessForColor(accentColor);
    final bool accentIsDark = accentColorBrightness == Brightness.dark;
    canvasColor ??= isDark ? Colors.grey[850] : Colors.grey[50];