Unverified Commit d435b724 authored by Kate Lovett's avatar Kate Lovett Committed by GitHub

Revert "Re-land text selection theme clean up" (#100564)

parent b95a7ab4
...@@ -963,7 +963,7 @@ class EditableText extends StatefulWidget { ...@@ -963,7 +963,7 @@ class EditableText extends StatefulWidget {
/// ///
/// For [CupertinoTextField]s, the value is set to the ambient /// For [CupertinoTextField]s, the value is set to the ambient
/// [CupertinoThemeData.primaryColor] with 20% opacity. For [TextField]s, the /// [CupertinoThemeData.primaryColor] with 20% opacity. For [TextField]s, the
/// value is set to the ambient [TextSelectionThemeData.selectionColor]. /// value is set to the ambient [ThemeData.textSelectionColor].
final Color? selectionColor; final Color? selectionColor;
/// {@template flutter.widgets.editableText.selectionControls} /// {@template flutter.widgets.editableText.selectionControls}
......
...@@ -752,6 +752,9 @@ void main() { ...@@ -752,6 +752,9 @@ void main() {
buttonTheme: const ButtonThemeData(colorScheme: ColorScheme.dark()), buttonTheme: const ButtonThemeData(colorScheme: ColorScheme.dark()),
toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)), toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)),
secondaryHeaderColor: Colors.black, secondaryHeaderColor: Colors.black,
textSelectionColor: Colors.black,
cursorColor: Colors.black,
textSelectionHandleColor: Colors.black,
backgroundColor: Colors.black, backgroundColor: Colors.black,
dialogBackgroundColor: Colors.black, dialogBackgroundColor: Colors.black,
indicatorColor: Colors.black, indicatorColor: Colors.black,
...@@ -796,6 +799,7 @@ void main() { ...@@ -796,6 +799,7 @@ void main() {
radioTheme: const RadioThemeData(), radioTheme: const RadioThemeData(),
switchTheme: const SwitchThemeData(), switchTheme: const SwitchThemeData(),
progressIndicatorTheme: const ProgressIndicatorThemeData(), progressIndicatorTheme: const ProgressIndicatorThemeData(),
useTextSelectionTheme: false,
); );
ThemeData? themeBeforeSnackBar; ThemeData? themeBeforeSnackBar;
......
...@@ -634,6 +634,9 @@ void main() { ...@@ -634,6 +634,9 @@ void main() {
toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)), toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.black)),
buttonColor: Colors.black, buttonColor: Colors.black,
secondaryHeaderColor: Colors.black, secondaryHeaderColor: Colors.black,
textSelectionColor: Colors.black,
cursorColor: Colors.black,
textSelectionHandleColor: Colors.black,
backgroundColor: Colors.black, backgroundColor: Colors.black,
dialogBackgroundColor: Colors.black, dialogBackgroundColor: Colors.black,
indicatorColor: Colors.black, indicatorColor: Colors.black,
...@@ -687,6 +690,7 @@ void main() { ...@@ -687,6 +690,7 @@ void main() {
drawerTheme: const DrawerThemeData(), drawerTheme: const DrawerThemeData(),
listTileTheme: const ListTileThemeData(), listTileTheme: const ListTileThemeData(),
fixTextFieldOutlineLabel: false, fixTextFieldOutlineLabel: false,
useTextSelectionTheme: false,
androidOverscrollIndicator: null, androidOverscrollIndicator: null,
extensions: const <Object, ThemeExtension<dynamic>>{}, extensions: const <Object, ThemeExtension<dynamic>>{},
); );
...@@ -731,6 +735,9 @@ void main() { ...@@ -731,6 +735,9 @@ void main() {
toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.white)), toggleButtonsTheme: const ToggleButtonsThemeData(textStyle: TextStyle(color: Colors.white)),
buttonColor: Colors.white, buttonColor: Colors.white,
secondaryHeaderColor: Colors.white, secondaryHeaderColor: Colors.white,
textSelectionColor: Colors.white,
cursorColor: Colors.white,
textSelectionHandleColor: Colors.white,
backgroundColor: Colors.white, backgroundColor: Colors.white,
dialogBackgroundColor: Colors.white, dialogBackgroundColor: Colors.white,
indicatorColor: Colors.white, indicatorColor: Colors.white,
...@@ -784,6 +791,7 @@ void main() { ...@@ -784,6 +791,7 @@ void main() {
drawerTheme: const DrawerThemeData(), drawerTheme: const DrawerThemeData(),
listTileTheme: const ListTileThemeData(), listTileTheme: const ListTileThemeData(),
fixTextFieldOutlineLabel: true, fixTextFieldOutlineLabel: true,
useTextSelectionTheme: true,
androidOverscrollIndicator: AndroidOverscrollIndicator.stretch, androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
extensions: const <Object, ThemeExtension<dynamic>>{ extensions: const <Object, ThemeExtension<dynamic>>{
MyThemeExtensionB: MyThemeExtensionB(textStyle: TextStyle()), MyThemeExtensionB: MyThemeExtensionB(textStyle: TextStyle()),
...@@ -814,6 +822,9 @@ void main() { ...@@ -814,6 +822,9 @@ void main() {
toggleButtonsTheme: otherTheme.toggleButtonsTheme, toggleButtonsTheme: otherTheme.toggleButtonsTheme,
buttonColor: otherTheme.buttonColor, buttonColor: otherTheme.buttonColor,
secondaryHeaderColor: otherTheme.secondaryHeaderColor, secondaryHeaderColor: otherTheme.secondaryHeaderColor,
textSelectionColor: otherTheme.textSelectionTheme.selectionColor,
cursorColor: otherTheme.textSelectionTheme.cursorColor,
textSelectionHandleColor: otherTheme.textSelectionTheme.selectionHandleColor,
backgroundColor: otherTheme.backgroundColor, backgroundColor: otherTheme.backgroundColor,
dialogBackgroundColor: otherTheme.dialogBackgroundColor, dialogBackgroundColor: otherTheme.dialogBackgroundColor,
indicatorColor: otherTheme.indicatorColor, indicatorColor: otherTheme.indicatorColor,
...@@ -1065,6 +1076,10 @@ void main() { ...@@ -1065,6 +1076,10 @@ void main() {
'tooltipTheme', 'tooltipTheme',
'expansionTileTheme', 'expansionTileTheme',
// DEPRECATED (newest deprecations at the bottom) // DEPRECATED (newest deprecations at the bottom)
'useTextSelectionTheme',
'textSelectionColor',
'cursorColor',
'textSelectionHandleColor',
'accentColor', 'accentColor',
'accentColorBrightness', 'accentColorBrightness',
'accentTextTheme', 'accentTextTheme',
......
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