[1.5.4] Upgrade app and app_bar.

Author: Yuncong Zhang

Runtime/material/app.cs

@@ -133,7 +133,7 @@ void _updateNavigator() {
                 this._navigatorObservers.Add(this._heroController);
             }
             else {
-                this._navigatorObservers = null;
+                this._navigatorObservers = new List<NavigatorObserver>();
             }
         }
 

Runtime/material/app_bar.cs

@@ -47,9 +47,11 @@ public AppBar(
             Widget flexibleSpace = null,
             PreferredSizeWidget bottom = null,
             float? elevation = null,
+            ShapeBorder shape = null,
             Color backgroundColor = null,
             Brightness? brightness = null,
             IconThemeData iconTheme = null,
+            IconThemeData actionsIconTheme = null,
             TextTheme textTheme = null,
             bool primary = true,
             bool? centerTitle = null,
@@ -65,9 +67,11 @@ public AppBar(
             this.flexibleSpace = flexibleSpace;
             this.bottom = bottom;
             this.elevation = elevation;
+            this.shape = shape;
             this.backgroundColor = backgroundColor;
             this.brightness = brightness;
             this.iconTheme = iconTheme;
+            this.actionsIconTheme = actionsIconTheme;
             this.textTheme = textTheme;
             this.primary = primary;
             this.centerTitle = centerTitle;
@@ -91,12 +95,16 @@ public AppBar(
 
         public readonly float? elevation;
 
+        public readonly ShapeBorder shape;
+
         public readonly Color backgroundColor;
 
         public readonly Brightness? brightness;
 
         public readonly IconThemeData iconTheme;
 
+        public readonly IconThemeData actionsIconTheme;
+
         public readonly TextTheme textTheme;
 
         public readonly bool primary;
@@ -153,9 +161,12 @@ public override Widget build(BuildContext context) {
             bool canPop = parentRoute?.canPop ?? false;
             bool useCloseButton = parentRoute is PageRoute && ((PageRoute) parentRoute).fullscreenDialog;
 
-            IconThemeData appBarIconTheme = this.widget.iconTheme
+            IconThemeData overallIconTheme = this.widget.iconTheme
                                             ?? appBarTheme.iconTheme
                                             ?? themeData.primaryIconTheme;
+            IconThemeData actionsIconTheme = this.widget.actionsIconTheme
+                                             ?? appBarTheme.actionsIconTheme
+                                             ?? overallIconTheme;
             TextStyle centerStyle = this.widget.textTheme?.title
                                     ?? appBarTheme.textTheme?.title
                                     ?? themeData.primaryTextTheme.title;
@@ -174,8 +185,11 @@ public override Widget build(BuildContext context) {
                     sideStyle = sideStyle.copyWith(color: sideStyle.color.withOpacity(opacity));
                 }
 
-                appBarIconTheme = appBarIconTheme.copyWith(
-                    opacity: opacity * (appBarIconTheme.opacity ?? 1.0f)
+                overallIconTheme = overallIconTheme.copyWith(
+                    opacity: opacity * (overallIconTheme.opacity ?? 1.0f)
+                );
+                actionsIconTheme = actionsIconTheme.copyWith(
+                    opacity: opacity * (actionsIconTheme.opacity ?? 1.0f)
                 );
             }
 
@@ -223,6 +237,13 @@ public override Widget build(BuildContext context) {
                     tooltip: MaterialLocalizations.of(context).openAppDrawerTooltip);
             }
 
+            if (actions != null) {
+                actions = IconTheme.merge(
+                    data: actionsIconTheme,
+                    child: actions
+                );
+            }
+
             Widget toolbar = new NavigationToolbar(
                 leading: leading,
                 middle: title,
@@ -234,7 +255,7 @@ public override Widget build(BuildContext context) {
                 child: new CustomSingleChildLayout(
                     layoutDelegate: new _ToolbarContainerLayout(),
                     child: IconTheme.merge(
-                        data: appBarIconTheme,
+                        data: overallIconTheme,
                         child: new DefaultTextStyle(
                             style: sideStyle,
                             child: toolbar)
@@ -299,6 +320,7 @@ public override Widget build(BuildContext context) {
                     elevation: this.widget.elevation
                                ?? appBarTheme.elevation
                                ?? _defaultElevation,
+                    shape: this.widget.shape,
                     child: appBar
                 ));
         }
@@ -379,6 +401,7 @@ public _SliverAppBarDelegate(
             Color backgroundColor,
             Brightness? brightness,
             IconThemeData iconTheme,
+            IconThemeData actionsIconTheme,
             TextTheme textTheme,
             bool primary,
             bool? centerTitle,
@@ -402,6 +425,7 @@ FloatingHeaderSnapConfiguration snapConfiguration
             this.backgroundColor = backgroundColor;
             this.brightness = brightness;
             this.iconTheme = iconTheme;
+            this.actionsIconTheme = actionsIconTheme;
             this.textTheme = textTheme;
             this.primary = primary;
             this.centerTitle = centerTitle;
@@ -426,6 +450,7 @@ FloatingHeaderSnapConfiguration snapConfiguration
         public readonly Color backgroundColor;
         public readonly Brightness? brightness;
         public readonly IconThemeData iconTheme;
+        public readonly IconThemeData actionsIconTheme;
         public readonly TextTheme textTheme;
         public readonly bool primary;
         public readonly bool? centerTitle;
@@ -506,6 +531,7 @@ public override bool shouldRebuild(SliverPersistentHeaderDelegate _oldDelegate)
                    || this.backgroundColor != oldDelegate.backgroundColor
                    || this.brightness != oldDelegate.brightness
                    || this.iconTheme != oldDelegate.iconTheme
+                   || this.actionsIconTheme != oldDelegate.actionsIconTheme
                    || this.textTheme != oldDelegate.textTheme
                    || this.primary != oldDelegate.primary
                    || this.centerTitle != oldDelegate.centerTitle
@@ -537,6 +563,7 @@ public SliverAppBar(
             Color backgroundColor = null,
             Brightness? brightness = null,
             IconThemeData iconTheme = null,
+            IconThemeData actionsIconTheme = null,
             TextTheme textTheme = null,
             bool primary = true,
             bool? centerTitle = null,
@@ -558,6 +585,7 @@ public SliverAppBar(
             this.backgroundColor = backgroundColor;
             this.brightness = brightness;
             this.iconTheme = iconTheme;
+            this.actionsIconTheme = actionsIconTheme;
             this.textTheme = textTheme;
             this.primary = primary;
             this.centerTitle = centerTitle;
@@ -590,6 +618,8 @@ public SliverAppBar(
         public readonly Brightness? brightness;
 
         public readonly IconThemeData iconTheme;
+        
+        public readonly IconThemeData actionsIconTheme;
 
         public readonly TextTheme textTheme;
 
@@ -666,6 +696,7 @@ public override Widget build(BuildContext context) {
                         backgroundColor: this.widget.backgroundColor,
                         brightness: this.widget.brightness,
                         iconTheme: this.widget.iconTheme,
+                        actionsIconTheme: this.widget.actionsIconTheme,
                         textTheme: this.widget.textTheme,
                         primary: this.widget.primary,
                         centerTitle: this.widget.centerTitle,

Runtime/material/app_bar_theme.cs

@@ -10,12 +10,14 @@ public AppBarTheme(
             Color color = null,
             float? elevation = null,
             IconThemeData iconTheme = null,
+            IconThemeData actionsIconTheme = null,
             TextTheme textTheme = null
         ) {
             this.brightness = brightness;
             this.color = color;
             this.elevation = elevation;
             this.iconTheme = iconTheme;
+            this.actionsIconTheme = actionsIconTheme;
             this.textTheme = textTheme;
         }
 
@@ -27,20 +29,24 @@ public AppBarTheme(
 
         public readonly IconThemeData iconTheme;
 
+        public readonly IconThemeData actionsIconTheme;
+
         public readonly TextTheme textTheme;
 
         AppBarTheme copyWith(
             Brightness? brightness = null,
             Color color = null,
             float? elevation = null,
             IconThemeData iconTheme = null,
+            IconThemeData actionsIconTheme = null,
             TextTheme textTheme = null
         ) {
             return new AppBarTheme(
                 brightness: brightness ?? this.brightness,
                 color: color ?? this.color,
                 elevation: elevation ?? this.elevation,
                 iconTheme: iconTheme ?? this.iconTheme,
+                actionsIconTheme: actionsIconTheme ?? this.actionsIconTheme,
                 textTheme: textTheme ?? this.textTheme
             );
         }
@@ -55,6 +61,7 @@ public static AppBarTheme lerp(AppBarTheme a, AppBarTheme b, float t) {
                 color: Color.lerp(a?.color, b?.color, t),
                 elevation: MathUtils.lerpFloat(a?.elevation ?? 0.0f, b?.elevation ?? 0.0f, t),
                 iconTheme: IconThemeData.lerp(a?.iconTheme, b?.iconTheme, t),
+                actionsIconTheme: IconThemeData.lerp(a?.actionsIconTheme, b?.actionsIconTheme, t),
                 textTheme: TextTheme.lerp(a?.textTheme, b?.textTheme, t)
             );
         }
@@ -64,6 +71,7 @@ public override int GetHashCode() {
             hashCode = (hashCode * 397) ^ this.color?.GetHashCode() ?? 0;
             hashCode = (hashCode * 397) ^ this.elevation?.GetHashCode() ?? 0;
             hashCode = (hashCode * 397) ^ this.iconTheme?.GetHashCode() ?? 0;
+            hashCode = (hashCode * 397) ^ this.actionsIconTheme?.GetHashCode() ?? 0;
             hashCode = (hashCode * 397) ^ this.textTheme?.GetHashCode() ?? 0;
             return hashCode;
         }
@@ -97,6 +105,7 @@ public bool Equals(AppBarTheme other) {
                    && other.color == this.color
                    && other.elevation == this.elevation
                    && other.iconTheme == this.iconTheme
+                   && other.actionsIconTheme == this.actionsIconTheme
                    && other.textTheme == this.textTheme;
         }
 
@@ -106,6 +115,7 @@ public override void debugFillProperties(DiagnosticPropertiesBuilder properties)
             properties.add(new DiagnosticsProperty<Color>("color", this.color, defaultValue: null));
             properties.add(new DiagnosticsProperty<float?>("elevation", this.elevation, defaultValue: null));
             properties.add(new DiagnosticsProperty<IconThemeData>("iconTheme", this.iconTheme, defaultValue: null));
+            properties.add(new DiagnosticsProperty<IconThemeData>("actionsIconTheme", this.actionsIconTheme, defaultValue: null));
             properties.add(new DiagnosticsProperty<TextTheme>("textTheme", this.textTheme, defaultValue: null));
         }
     }