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
8c44c162
Unverified
Commit
8c44c162
authored
Aug 09, 2022
by
Kate Lovett
Committed by
GitHub
Aug 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deprecate ThemeData.selectedRowColor (#109070)
parent
543dac2f
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
89 additions
and
26 deletions
+89
-26
fix_data.yaml
packages/flutter/lib/fix_data.yaml
+33
-0
theme_data.dart
packages/flutter/lib/src/material/theme_data.dart
+37
-20
snack_bar_test.dart
packages/flutter/test/material/snack_bar_test.dart
+0
-1
theme_data_test.dart
packages/flutter/test/material/theme_data_test.dart
+5
-5
material.dart
packages/flutter/test_fixes/material.dart
+7
-0
material.dart.expect
packages/flutter/test_fixes/material.dart.expect
+7
-0
No files found.
packages/flutter/lib/fix_data.yaml
View file @
8c44c162
...
...
@@ -17,6 +17,39 @@
version
:
1
transforms
:
# Changes made in https://github.com/flutter/flutter/pull/109070
-
title
:
"
Remove
'selectedRowColor'"
date
:
2022-08-05
element
:
uris
:
[
'
material.dart'
]
method
:
'
copyWith'
inClass
:
'
ThemeData'
changes
:
-
kind
:
'
removeParameter'
name
:
'
selectedRowColor'
# Changes made in https://github.com/flutter/flutter/pull/109070
-
title
:
"
Remove
'selectedRowColor'"
date
:
2022-08-05
element
:
uris
:
[
'
material.dart'
]
constructor
:
'
raw'
inClass
:
'
ThemeData'
changes
:
-
kind
:
'
removeParameter'
name
:
'
selectedRowColor'
# Changes made in https://github.com/flutter/flutter/pull/109070
-
title
:
"
Remove
'selectedRowColor'"
date
:
2022-08-05
element
:
uris
:
[
'
material.dart'
]
constructor
:
'
'
inClass
:
'
ThemeData'
changes
:
-
kind
:
'
removeParameter'
name
:
'
selectedRowColor'
# Changes made in https://github.com/flutter/flutter/pull/97972/
-
title
:
"
Migrate
'ThemeData.toggleableActiveColor'
to
individual
themes"
date
:
2022-05-18
...
...
packages/flutter/lib/src/material/theme_data.dart
View file @
8c44c162
This diff is collapsed.
Click to expand it.
packages/flutter/test/material/snack_bar_test.dart
View file @
8c44c162
...
...
@@ -458,7 +458,6 @@ void main() {
highlightColor:
Colors
.
black
,
splashColor:
Colors
.
black
,
splashFactory:
InkRipple
.
splashFactory
,
selectedRowColor:
Colors
.
black
,
unselectedWidgetColor:
Colors
.
black
,
disabledColor:
Colors
.
black
,
buttonTheme:
const
ButtonThemeData
(
colorScheme:
ColorScheme
.
dark
()),
...
...
packages/flutter/test/material/theme_data_test.dart
View file @
8c44c162
...
...
@@ -669,7 +669,6 @@ void main() {
primaryColorLight:
Colors
.
black
,
scaffoldBackgroundColor:
Colors
.
black
,
secondaryHeaderColor:
Colors
.
black
,
selectedRowColor:
Colors
.
black
,
shadowColor:
Colors
.
black
,
splashColor:
Colors
.
black
,
unselectedWidgetColor:
Colors
.
black
,
...
...
@@ -724,6 +723,7 @@ void main() {
primaryColorBrightness:
Brightness
.
dark
,
androidOverscrollIndicator:
AndroidOverscrollIndicator
.
glow
,
toggleableActiveColor:
Colors
.
black
,
selectedRowColor:
Colors
.
black
,
);
final
SliderThemeData
otherSliderTheme
=
SliderThemeData
.
fromPrimaryColors
(
...
...
@@ -780,7 +780,6 @@ void main() {
primaryColorLight:
Colors
.
white
,
scaffoldBackgroundColor:
Colors
.
white
,
secondaryHeaderColor:
Colors
.
white
,
selectedRowColor:
Colors
.
white
,
shadowColor:
Colors
.
white
,
splashColor:
Colors
.
white
,
unselectedWidgetColor:
Colors
.
white
,
...
...
@@ -838,6 +837,7 @@ void main() {
primaryColorBrightness:
Brightness
.
light
,
androidOverscrollIndicator:
AndroidOverscrollIndicator
.
stretch
,
toggleableActiveColor:
Colors
.
white
,
selectedRowColor:
Colors
.
white
,
);
final
ThemeData
themeDataCopy
=
theme
.
copyWith
(
...
...
@@ -879,7 +879,6 @@ void main() {
primaryColorLight:
otherTheme
.
primaryColorLight
,
scaffoldBackgroundColor:
otherTheme
.
scaffoldBackgroundColor
,
secondaryHeaderColor:
otherTheme
.
secondaryHeaderColor
,
selectedRowColor:
otherTheme
.
selectedRowColor
,
shadowColor:
otherTheme
.
shadowColor
,
splashColor:
otherTheme
.
splashColor
,
unselectedWidgetColor:
otherTheme
.
unselectedWidgetColor
,
...
...
@@ -937,6 +936,7 @@ void main() {
primaryColorBrightness:
otherTheme
.
primaryColorBrightness
,
androidOverscrollIndicator:
otherTheme
.
androidOverscrollIndicator
,
toggleableActiveColor:
otherTheme
.
toggleableActiveColor
,
selectedRowColor:
otherTheme
.
selectedRowColor
,
);
// For the sanity of the reader, make sure these properties are in the same
...
...
@@ -977,7 +977,6 @@ void main() {
expect
(
themeDataCopy
.
primaryColorLight
,
equals
(
otherTheme
.
primaryColorLight
));
expect
(
themeDataCopy
.
scaffoldBackgroundColor
,
equals
(
otherTheme
.
scaffoldBackgroundColor
));
expect
(
themeDataCopy
.
secondaryHeaderColor
,
equals
(
otherTheme
.
secondaryHeaderColor
));
expect
(
themeDataCopy
.
selectedRowColor
,
equals
(
otherTheme
.
selectedRowColor
));
expect
(
themeDataCopy
.
shadowColor
,
equals
(
otherTheme
.
shadowColor
));
expect
(
themeDataCopy
.
splashColor
,
equals
(
otherTheme
.
splashColor
));
expect
(
themeDataCopy
.
unselectedWidgetColor
,
equals
(
otherTheme
.
unselectedWidgetColor
));
...
...
@@ -1040,6 +1039,7 @@ void main() {
expect
(
themeDataCopy
.
primaryColorBrightness
,
equals
(
otherTheme
.
primaryColorBrightness
));
expect
(
themeDataCopy
.
androidOverscrollIndicator
,
equals
(
otherTheme
.
androidOverscrollIndicator
));
expect
(
themeDataCopy
.
toggleableActiveColor
,
equals
(
otherTheme
.
toggleableActiveColor
));
expect
(
themeDataCopy
.
selectedRowColor
,
equals
(
otherTheme
.
selectedRowColor
));
});
testWidgets
(
'ThemeData.toString has less than 200 characters output'
,
(
WidgetTester
tester
)
async
{
...
...
@@ -1110,7 +1110,6 @@ void main() {
'dividerColor'
,
'highlightColor'
,
'splashColor'
,
'selectedRowColor'
,
'unselectedWidgetColor'
,
'disabledColor'
,
'secondaryHeaderColor'
,
...
...
@@ -1170,6 +1169,7 @@ void main() {
'primaryColorBrightness'
,
'androidOverscrollIndicator'
,
'toggleableActiveColor'
,
'selectedRowColor'
,
};
final
DiagnosticPropertiesBuilder
properties
=
DiagnosticPropertiesBuilder
();
...
...
packages/flutter/test_fixes/material.dart
View file @
8c44c162
...
...
@@ -585,4 +585,11 @@ void main() {
toggleableActiveColor:
Colors
.
black
,
);
themeData
.
toggleableActiveColor
;
// Removing field reference not supported.
// Changes made in https://github.com/flutter/flutter/pull/109070
ThemeData
themeData
=
ThemeData
();
themeData
=
ThemeData
(
selectedRowColor:
Brightness
.
dark
);
themeData
=
ThemeData
.
raw
(
selectedRowColor:
Brightness
.
dark
);
themeData
=
themeData
.
copyWith
(
selectedRowColor:
Brightness
.
dark
);
themeData
.
selectedRowColor
;
// Removing field reference not supported.
}
packages/flutter/test_fixes/material.dart.expect
View file @
8c44c162
...
...
@@ -788,4 +788,11 @@ void main() {
),
);
themeData.toggleableActiveColor; // Removing field reference not supported.
// Changes made in https://github.com/flutter/flutter/pull/109070
ThemeData themeData = ThemeData();
themeData = ThemeData();
themeData = ThemeData.raw();
themeData = themeData.copyWith();
themeData.selectedRowColor; // Removing field reference not supported.
}
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