Unverified Commit cf3fc017 authored by Renzo Olivares's avatar Renzo Olivares Committed by GitHub

remove deprecated accentTextTheme and accentIconTheme from ThemeData (#119360)

Co-authored-by: 's avatarRenzo Olivares <roliv@google.com>
parent 845f7bb4
...@@ -815,8 +815,6 @@ void main() { ...@@ -815,8 +815,6 @@ void main() {
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
accentColor: Colors.black, accentColor: Colors.black,
accentColorBrightness: Brightness.dark, accentColorBrightness: Brightness.dark,
accentTextTheme: ThemeData.dark().textTheme,
accentIconTheme: ThemeData.dark().iconTheme,
fixTextFieldOutlineLabel: false, fixTextFieldOutlineLabel: false,
primaryColorBrightness: Brightness.dark, primaryColorBrightness: Brightness.dark,
androidOverscrollIndicator: AndroidOverscrollIndicator.glow, androidOverscrollIndicator: AndroidOverscrollIndicator.glow,
...@@ -937,8 +935,6 @@ void main() { ...@@ -937,8 +935,6 @@ void main() {
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
accentColor: Colors.white, accentColor: Colors.white,
accentColorBrightness: Brightness.light, accentColorBrightness: Brightness.light,
accentIconTheme: ThemeData.light().iconTheme,
accentTextTheme: ThemeData.light().textTheme,
fixTextFieldOutlineLabel: true, fixTextFieldOutlineLabel: true,
primaryColorBrightness: Brightness.light, primaryColorBrightness: Brightness.light,
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch, androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
...@@ -1042,8 +1038,6 @@ void main() { ...@@ -1042,8 +1038,6 @@ void main() {
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
accentColor: otherTheme.accentColor, accentColor: otherTheme.accentColor,
accentColorBrightness: otherTheme.accentColorBrightness, accentColorBrightness: otherTheme.accentColorBrightness,
accentIconTheme: otherTheme.accentIconTheme,
accentTextTheme: otherTheme.accentTextTheme,
fixTextFieldOutlineLabel: otherTheme.fixTextFieldOutlineLabel, fixTextFieldOutlineLabel: otherTheme.fixTextFieldOutlineLabel,
primaryColorBrightness: otherTheme.primaryColorBrightness, primaryColorBrightness: otherTheme.primaryColorBrightness,
androidOverscrollIndicator: otherTheme.androidOverscrollIndicator, androidOverscrollIndicator: otherTheme.androidOverscrollIndicator,
...@@ -1148,8 +1142,6 @@ void main() { ...@@ -1148,8 +1142,6 @@ void main() {
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
expect(themeDataCopy.accentColor, equals(otherTheme.accentColor)); expect(themeDataCopy.accentColor, equals(otherTheme.accentColor));
expect(themeDataCopy.accentColorBrightness, equals(otherTheme.accentColorBrightness)); expect(themeDataCopy.accentColorBrightness, equals(otherTheme.accentColorBrightness));
expect(themeDataCopy.accentIconTheme, equals(otherTheme.accentIconTheme));
expect(themeDataCopy.accentTextTheme, equals(otherTheme.accentTextTheme));
expect(themeDataCopy.fixTextFieldOutlineLabel, equals(otherTheme.fixTextFieldOutlineLabel)); expect(themeDataCopy.fixTextFieldOutlineLabel, equals(otherTheme.fixTextFieldOutlineLabel));
expect(themeDataCopy.primaryColorBrightness, equals(otherTheme.primaryColorBrightness)); expect(themeDataCopy.primaryColorBrightness, equals(otherTheme.primaryColorBrightness));
expect(themeDataCopy.androidOverscrollIndicator, equals(otherTheme.androidOverscrollIndicator)); expect(themeDataCopy.androidOverscrollIndicator, equals(otherTheme.androidOverscrollIndicator));
...@@ -1286,8 +1278,6 @@ void main() { ...@@ -1286,8 +1278,6 @@ void main() {
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
'accentColor', 'accentColor',
'accentColorBrightness', 'accentColorBrightness',
'accentTextTheme',
'accentIconTheme',
'fixTextFieldOutlineLabel', 'fixTextFieldOutlineLabel',
'primaryColorBrightness', 'primaryColorBrightness',
'androidOverscrollIndicator', 'androidOverscrollIndicator',
......
...@@ -444,7 +444,7 @@ void main() { ...@@ -444,7 +444,7 @@ void main() {
]; ];
} }
for (final TextTheme textTheme in <TextTheme>[theme.textTheme, theme.primaryTextTheme, theme.accentTextTheme]) { for (final TextTheme textTheme in <TextTheme>[theme.textTheme, theme.primaryTextTheme]) {
for (final TextStyle style in extractStyles(textTheme).map<TextStyle>((TextStyle style) => _TextStyleProxy(style))) { for (final TextStyle style in extractStyles(textTheme).map<TextStyle>((TextStyle style) => _TextStyleProxy(style))) {
expect(style.inherit, false); expect(style.inherit, false);
expect(style.color, isNotNull); expect(style.color, isNotNull);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment