Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
d435b724
Unverified
Commit
d435b724
authored
Mar 22, 2022
by
Kate Lovett
Committed by
GitHub
Mar 22, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Re-land text selection theme clean up" (#100564)
parent
b95a7ab4
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
143 additions
and
1 deletion
+143
-1
theme_data.dart
packages/flutter/lib/src/material/theme_data.dart
+123
-0
editable_text.dart
packages/flutter/lib/src/widgets/editable_text.dart
+1
-1
snack_bar_test.dart
packages/flutter/test/material/snack_bar_test.dart
+4
-0
theme_data_test.dart
packages/flutter/test/material/theme_data_test.dart
+15
-0
No files found.
packages/flutter/lib/src/material/theme_data.dart
View file @
d435b724
This diff is collapsed.
Click to expand it.
packages/flutter/lib/src/widgets/editable_text.dart
View file @
d435b724
...
@@ -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 [T
extSelectionThemeData.s
electionColor].
/// value is set to the ambient [T
hemeData.textS
electionColor].
final
Color
?
selectionColor
;
final
Color
?
selectionColor
;
/// {@template flutter.widgets.editableText.selectionControls}
/// {@template flutter.widgets.editableText.selectionControls}
...
...
packages/flutter/test/material/snack_bar_test.dart
View file @
d435b724
...
@@ -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
;
...
...
packages/flutter/test/material/theme_data_test.dart
View file @
d435b724
...
@@ -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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment