Unverified Commit ed5229e5 authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Remove isMaterialAppTheme property (#71861)

parent 5bae3b5d
...@@ -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) {
......
...@@ -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!),
); );
......
...@@ -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(
......
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