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
ed5229e5
Unverified
Commit
ed5229e5
authored
Dec 08, 2020
by
Michael Goderbauer
Committed by
GitHub
Dec 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove isMaterialAppTheme property (#71861)
parent
5bae3b5d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
19 deletions
+0
-19
app.dart
packages/flutter/lib/src/material/app.dart
+0
-1
theme.dart
packages/flutter/lib/src/material/theme.dart
+0
-17
text_selection_test.dart
packages/flutter/test/material/text_selection_test.dart
+0
-1
No files found.
packages/flutter/lib/src/material/app.dart
View file @
ed5229e5
...
@@ -739,7 +739,6 @@ class _MaterialAppState extends State<MaterialApp> {
...
@@ -739,7 +739,6 @@ class _MaterialAppState extends State<MaterialApp> {
key:
widget
.
scaffoldMessengerKey
,
key:
widget
.
scaffoldMessengerKey
,
child:
AnimatedTheme
(
child:
AnimatedTheme
(
data:
theme
,
data:
theme
,
isMaterialAppTheme:
true
,
child:
widget
.
builder
!=
null
child:
widget
.
builder
!=
null
?
Builder
(
?
Builder
(
builder:
(
BuildContext
context
)
{
builder:
(
BuildContext
context
)
{
...
...
packages/flutter/lib/src/material/theme.dart
View file @
ed5229e5
...
@@ -40,7 +40,6 @@ class Theme extends StatelessWidget {
...
@@ -40,7 +40,6 @@ class Theme extends StatelessWidget {
const
Theme
({
const
Theme
({
Key
?
key
,
Key
?
key
,
required
this
.
data
,
required
this
.
data
,
this
.
isMaterialAppTheme
=
false
,
required
this
.
child
,
required
this
.
child
,
})
:
assert
(
child
!=
null
),
})
:
assert
(
child
!=
null
),
assert
(
data
!=
null
),
assert
(
data
!=
null
),
...
@@ -49,17 +48,6 @@ class Theme extends StatelessWidget {
...
@@ -49,17 +48,6 @@ class Theme extends StatelessWidget {
/// Specifies the color and typography values for descendant widgets.
/// Specifies the color and typography values for descendant widgets.
final
ThemeData
data
;
final
ThemeData
data
;
/// True if this theme was installed by the [MaterialApp].
///
/// When an app uses the [Navigator] to push a route, the route's widgets
/// will only inherit from the app's theme, even though the widget that
/// triggered the push may inherit from a theme that "shadows" the app's
/// theme because it's deeper in the widget tree. Apps can find the shadowing
/// theme with `Theme.of(context, shadowThemeOnly: true)` and pass it along
/// to the class that creates a route's widgets. Material widgets that push
/// routes, like [PopupMenuButton] and [DropdownButton], do this.
final
bool
isMaterialAppTheme
;
/// The widget below this widget in the tree.
/// The widget below this widget in the tree.
///
///
/// {@macro flutter.widgets.ProxyWidget.child}
/// {@macro flutter.widgets.ProxyWidget.child}
...
@@ -209,7 +197,6 @@ class AnimatedTheme extends ImplicitlyAnimatedWidget {
...
@@ -209,7 +197,6 @@ class AnimatedTheme extends ImplicitlyAnimatedWidget {
const
AnimatedTheme
({
const
AnimatedTheme
({
Key
?
key
,
Key
?
key
,
required
this
.
data
,
required
this
.
data
,
this
.
isMaterialAppTheme
=
false
,
Curve
curve
=
Curves
.
linear
,
Curve
curve
=
Curves
.
linear
,
Duration
duration
=
kThemeAnimationDuration
,
Duration
duration
=
kThemeAnimationDuration
,
VoidCallback
?
onEnd
,
VoidCallback
?
onEnd
,
...
@@ -221,9 +208,6 @@ class AnimatedTheme extends ImplicitlyAnimatedWidget {
...
@@ -221,9 +208,6 @@ class AnimatedTheme extends ImplicitlyAnimatedWidget {
/// Specifies the color and typography values for descendant widgets.
/// Specifies the color and typography values for descendant widgets.
final
ThemeData
data
;
final
ThemeData
data
;
/// True if this theme was created by the [MaterialApp]. See [Theme.isMaterialAppTheme].
final
bool
isMaterialAppTheme
;
/// The widget below this widget in the tree.
/// The widget below this widget in the tree.
///
///
/// {@macro flutter.widgets.ProxyWidget.child}
/// {@macro flutter.widgets.ProxyWidget.child}
...
@@ -245,7 +229,6 @@ class _AnimatedThemeState extends AnimatedWidgetBaseState<AnimatedTheme> {
...
@@ -245,7 +229,6 @@ class _AnimatedThemeState extends AnimatedWidgetBaseState<AnimatedTheme> {
@override
@override
Widget
build
(
BuildContext
context
)
{
Widget
build
(
BuildContext
context
)
{
return
Theme
(
return
Theme
(
isMaterialAppTheme:
widget
.
isMaterialAppTheme
,
child:
widget
.
child
,
child:
widget
.
child
,
data:
_data
!.
evaluate
(
animation
!),
data:
_data
!.
evaluate
(
animation
!),
);
);
...
...
packages/flutter/test/material/text_selection_test.dart
View file @
ed5229e5
...
@@ -556,7 +556,6 @@ void main() {
...
@@ -556,7 +556,6 @@ void main() {
selectionHandleColor:
Color
(
0x550000AA
),
selectionHandleColor:
Color
(
0x550000AA
),
),
),
),
),
isMaterialAppTheme:
true
,
child:
Builder
(
child:
Builder
(
builder:
(
BuildContext
context
)
{
builder:
(
BuildContext
context
)
{
return
Container
(
return
Container
(
...
...
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