From 9291c8ba310b8ce5a2b156e98741f948a038078f Mon Sep 17 00:00:00 2001 From: Kate Lovett Date: Wed, 9 Mar 2022 18:00:08 -0600 Subject: [PATCH] Remove expired ThemeData deprecations (#98578) --- .../flutter/lib/src/material/theme_data.dart | 123 ------------------ .../lib/src/widgets/editable_text.dart | 2 +- .../flutter/test/material/snack_bar_test.dart | 4 - .../test/material/theme_data_test.dart | 15 --- 4 files changed, 1 insertion(+), 143 deletions(-) diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart index 37781665363..f5d2b0085a4 100644 --- a/packages/flutter/lib/src/material/theme_data.dart +++ b/packages/flutter/lib/src/material/theme_data.dart @@ -323,26 +323,6 @@ class ThemeData with Diagnosticable { TooltipThemeData? tooltipTheme, ExpansionTileThemeData? expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - @Deprecated( - 'No longer used by the framework, please remove any reference to it. ' - 'This feature was deprecated after v1.23.0-4.0.pre.', - ) - bool? useTextSelectionTheme, - @Deprecated( - 'Use TextSelectionThemeData.selectionColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? textSelectionColor, - @Deprecated( - 'Use TextSelectionThemeData.cursorColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? cursorColor, - @Deprecated( - 'Use TextSelectionThemeData.selectionHandleColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? textSelectionHandleColor, @Deprecated( 'Use colorScheme.secondary instead. ' 'For more information, consult the migration guide at ' @@ -545,10 +525,6 @@ class ThemeData with Diagnosticable { expansionTileTheme ??= const ExpansionTileThemeData(); // DEPRECATED (newest deprecations at the bottom) - useTextSelectionTheme ??= true; - textSelectionColor ??= isDark ? accentColor : primarySwatch[200]!; - cursorColor = cursorColor ?? const Color.fromRGBO(66, 133, 244, 1.0); - textSelectionHandleColor ??= isDark ? Colors.tealAccent[400]! : primarySwatch[300]!; accentTextTheme = defaultAccentTextTheme.merge(accentTextTheme); accentIconTheme ??= accentIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black); buttonColor ??= isDark ? primarySwatch[600]! : Colors.grey[300]!; @@ -634,10 +610,6 @@ class ThemeData with Diagnosticable { tooltipTheme: tooltipTheme, expansionTileTheme: expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - useTextSelectionTheme: useTextSelectionTheme, - textSelectionColor: textSelectionColor, - cursorColor: cursorColor, - textSelectionHandleColor: textSelectionHandleColor, accentColor: accentColor, accentColorBrightness: accentColorBrightness, accentTextTheme: accentTextTheme, @@ -740,26 +712,6 @@ class ThemeData with Diagnosticable { required this.tooltipTheme, required this.expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - @Deprecated( - 'No longer used by the framework, please remove any reference to it. ' - 'This feature was deprecated after v1.23.0-4.0.pre.', - ) - required this.useTextSelectionTheme, - @Deprecated( - 'Use TextSelectionThemeData.selectionColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - required this.textSelectionColor, - @Deprecated( - 'Use TextSelectionThemeData.cursorColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - required this.cursorColor, - @Deprecated( - 'Use TextSelectionThemeData.selectionHandleColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - required this.textSelectionHandleColor, @Deprecated( 'Use colorScheme.secondary instead. ' 'For more information, consult the migration guide at ' @@ -879,10 +831,6 @@ class ThemeData with Diagnosticable { assert(tooltipTheme != null), assert(expansionTileTheme != null), // DEPRECATED (newest deprecations at the bottom) - assert(useTextSelectionTheme != null), - assert(textSelectionColor != null), - assert(cursorColor != null), - assert(textSelectionHandleColor != null), assert(accentColor != null), assert(accentColorBrightness != null), assert(accentTextTheme != null), @@ -1421,37 +1369,6 @@ class ThemeData with Diagnosticable { // DEPRECATED (newest deprecations at the bottom) - /// A temporary flag that was used to opt-in to the new [TextSelectionTheme] - /// during the migration to this new theme. That migration is now complete - /// and this flag is not longer used by the framework. Please remove any - /// reference to this property, as it will be removed in future releases. - @Deprecated( - 'No longer used by the framework, please remove any reference to it. ' - 'This feature was deprecated after v1.23.0-4.0.pre.', - ) - final bool useTextSelectionTheme; - - /// The color of text selections in text fields, such as [TextField]. - @Deprecated( - 'Use TextSelectionThemeData.selectionColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - final Color textSelectionColor; - - /// The color of cursors in Material-style text fields, such as [TextField]. - @Deprecated( - 'Use TextSelectionThemeData.cursorColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - final Color cursorColor; - - /// The color of the handles used to adjust what part of the text is currently selected. - @Deprecated( - 'Use TextSelectionThemeData.selectionHandleColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - final Color textSelectionHandleColor; - /// Obsolete property that was originally used as the foreground /// color for widgets (knobs, text, overscroll edge effect, etc). /// @@ -1646,26 +1563,6 @@ class ThemeData with Diagnosticable { TooltipThemeData? tooltipTheme, ExpansionTileThemeData? expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - @Deprecated( - 'No longer used by the framework, please remove any reference to it. ' - 'This feature was deprecated after v1.23.0-4.0.pre.', - ) - bool? useTextSelectionTheme, - @Deprecated( - 'Use TextSelectionThemeData.selectionColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? textSelectionColor, - @Deprecated( - 'Use TextSelectionThemeData.cursorColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? cursorColor, - @Deprecated( - 'Use TextSelectionThemeData.selectionHandleColor instead. ' - 'This feature was deprecated after v1.26.0-18.0.pre.', - ) - Color? textSelectionHandleColor, @Deprecated( 'No longer used by the framework, please remove any reference to it. ' 'For more information, consult the migration guide at ' @@ -1790,10 +1687,6 @@ class ThemeData with Diagnosticable { tooltipTheme: tooltipTheme ?? this.tooltipTheme, expansionTileTheme: expansionTileTheme ?? this.expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - useTextSelectionTheme: useTextSelectionTheme ?? this.useTextSelectionTheme, - textSelectionColor: textSelectionColor ?? this.textSelectionColor, - cursorColor: cursorColor ?? this.cursorColor, - textSelectionHandleColor: textSelectionHandleColor ?? this.textSelectionHandleColor, accentColor: accentColor ?? this.accentColor, accentColorBrightness: accentColorBrightness ?? this.accentColorBrightness, accentTextTheme: accentTextTheme ?? this.accentTextTheme, @@ -1960,10 +1853,6 @@ class ThemeData with Diagnosticable { tooltipTheme: TooltipThemeData.lerp(a.tooltipTheme, b.tooltipTheme, t)!, expansionTileTheme: ExpansionTileThemeData.lerp(a.expansionTileTheme, b.expansionTileTheme, t)!, // DEPRECATED (newest deprecations at the bottom) - useTextSelectionTheme: t < 0.5 ? a.useTextSelectionTheme : b.useTextSelectionTheme, - textSelectionColor: Color.lerp(a.textSelectionColor, b.textSelectionColor, t)!, - cursorColor: Color.lerp(a.cursorColor, b.cursorColor, t)!, - textSelectionHandleColor: Color.lerp(a.textSelectionHandleColor, b.textSelectionHandleColor, t)!, accentColor: Color.lerp(a.accentColor, b.accentColor, t)!, accentColorBrightness: t < 0.5 ? a.accentColorBrightness : b.accentColorBrightness, accentTextTheme: TextTheme.lerp(a.accentTextTheme, b.accentTextTheme, t), @@ -2060,10 +1949,6 @@ class ThemeData with Diagnosticable { other.tooltipTheme == tooltipTheme && other.expansionTileTheme == expansionTileTheme && // DEPRECATED (newest deprecations at the bottom) - other.useTextSelectionTheme == useTextSelectionTheme && - other.textSelectionColor == textSelectionColor && - other.cursorColor == cursorColor && - other.textSelectionHandleColor == textSelectionHandleColor && other.accentColor == accentColor && other.accentColorBrightness == accentColorBrightness && other.accentTextTheme == accentTextTheme && @@ -2157,10 +2042,6 @@ class ThemeData with Diagnosticable { tooltipTheme, expansionTileTheme, // DEPRECATED (newest deprecations at the bottom) - useTextSelectionTheme, - textSelectionColor, - cursorColor, - textSelectionHandleColor, accentColor, accentColorBrightness, accentTextTheme, @@ -2254,10 +2135,6 @@ class ThemeData with Diagnosticable { properties.add(DiagnosticsProperty('tooltipTheme', tooltipTheme, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty('expansionTileTheme', expansionTileTheme, level: DiagnosticLevel.debug)); // DEPRECATED (newest deprecations at the bottom) - properties.add(DiagnosticsProperty('useTextSelectionTheme', useTextSelectionTheme, level: DiagnosticLevel.debug)); - properties.add(ColorProperty('textSelectionColor', textSelectionColor, defaultValue: defaultData.textSelectionColor, level: DiagnosticLevel.debug)); - properties.add(ColorProperty('cursorColor', cursorColor, defaultValue: defaultData.cursorColor, level: DiagnosticLevel.debug)); - properties.add(ColorProperty('textSelectionHandleColor', textSelectionHandleColor, defaultValue: defaultData.textSelectionHandleColor, level: DiagnosticLevel.debug)); properties.add(ColorProperty('accentColor', accentColor, defaultValue: defaultData.accentColor, level: DiagnosticLevel.debug)); properties.add(EnumProperty('accentColorBrightness', accentColorBrightness, defaultValue: defaultData.accentColorBrightness, level: DiagnosticLevel.debug)); properties.add(DiagnosticsProperty('accentTextTheme', accentTextTheme, level: DiagnosticLevel.debug)); diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index 9a12a01545e..35082f0e37b 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -963,7 +963,7 @@ class EditableText extends StatefulWidget { /// /// For [CupertinoTextField]s, the value is set to the ambient /// [CupertinoThemeData.primaryColor] with 20% opacity. For [TextField]s, the - /// value is set to the ambient [ThemeData.textSelectionColor]. + /// value is set to the ambient [TextSelectionThemeData.selectionColor]. final Color? selectionColor; /// {@template flutter.widgets.editableText.selectionControls} diff --git a/packages/flutter/test/material/snack_bar_test.dart b/packages/flutter/test/material/snack_bar_test.dart index 2eef94246c8..b54f79d581a 100644 --- a/packages/flutter/test/material/snack_bar_test.dart +++ b/packages/flutter/test/material/snack_bar_test.dart @@ -752,9 +752,6 @@ void main() { buttonTheme: const ButtonThemeData(colorScheme: ColorScheme.dark()), toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)), secondaryHeaderColor: Colors.black, - textSelectionColor: Colors.black, - cursorColor: Colors.black, - textSelectionHandleColor: Colors.black, backgroundColor: Colors.black, dialogBackgroundColor: Colors.black, indicatorColor: Colors.black, @@ -799,7 +796,6 @@ void main() { radioTheme: const RadioThemeData(), switchTheme: const SwitchThemeData(), progressIndicatorTheme: const ProgressIndicatorThemeData(), - useTextSelectionTheme: false, ); ThemeData? themeBeforeSnackBar; diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart index fe20c48446b..afab02c2eae 100644 --- a/packages/flutter/test/material/theme_data_test.dart +++ b/packages/flutter/test/material/theme_data_test.dart @@ -411,9 +411,6 @@ void main() { toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)), buttonColor: Colors.black, secondaryHeaderColor: Colors.black, - textSelectionColor: Colors.black, - cursorColor: Colors.black, - textSelectionHandleColor: Colors.black, backgroundColor: Colors.black, dialogBackgroundColor: Colors.black, indicatorColor: Colors.black, @@ -467,7 +464,6 @@ void main() { drawerTheme: const DrawerThemeData(), listTileTheme: const ListTileThemeData(), fixTextFieldOutlineLabel: false, - useTextSelectionTheme: false, androidOverscrollIndicator: null, ); @@ -511,9 +507,6 @@ void main() { toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.white)), buttonColor: Colors.white, secondaryHeaderColor: Colors.white, - textSelectionColor: Colors.white, - cursorColor: Colors.white, - textSelectionHandleColor: Colors.white, backgroundColor: Colors.white, dialogBackgroundColor: Colors.white, indicatorColor: Colors.white, @@ -567,7 +560,6 @@ void main() { drawerTheme: const DrawerThemeData(), listTileTheme: const ListTileThemeData(), fixTextFieldOutlineLabel: true, - useTextSelectionTheme: true, androidOverscrollIndicator: AndroidOverscrollIndicator.stretch, ); @@ -595,9 +587,6 @@ void main() { toggleButtonsTheme: otherTheme.toggleButtonsTheme, buttonColor: otherTheme.buttonColor, secondaryHeaderColor: otherTheme.secondaryHeaderColor, - textSelectionColor: otherTheme.textSelectionTheme.selectionColor, - cursorColor: otherTheme.textSelectionTheme.cursorColor, - textSelectionHandleColor: otherTheme.textSelectionTheme.selectionHandleColor, backgroundColor: otherTheme.backgroundColor, dialogBackgroundColor: otherTheme.dialogBackgroundColor, indicatorColor: otherTheme.indicatorColor, @@ -845,10 +834,6 @@ void main() { 'tooltipTheme', 'expansionTileTheme', // DEPRECATED (newest deprecations at the bottom) - 'useTextSelectionTheme', - 'textSelectionColor', - 'cursorColor', - 'textSelectionHandleColor', 'accentColor', 'accentColorBrightness', 'accentTextTheme',