DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when toggling "Everything is awesome" in Stock's Settings.

Browse Source 
Material.backgroundColor can be null.

R=ianh@google.com

Review URL: https://codereview.chromium.org/1225153003 .
This commit is contained in:
Matt Perry 2015-07-09 19:28:44 -04:00
parent d9f4561053
commit 2a127e7fba
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sdk/lib/widgets/material.dart
View File

@ -34,7 +34,7 @@ class Material extends AnimatedComponent {
if (level == null) level = 0;
_container = new AnimatedContainer()
..shadow = new AnimatedType<double>(level.toDouble())
..backgroundColor = new AnimatedColor(_getBackgroundColor(type, color))
..backgroundColor = _getBackgroundColor(type, color)
..borderRadius = edges[type]
..shape = type == MaterialType.circle ? Shape.circle : Shape.rectangle;
watchPerformance(_container.createPerformance(
@ -53,17 +53,14 @@ class Material extends AnimatedComponent {
super.syncFields(source);
}
Color _getBackgroundColor(MaterialType type, Color color) {
if (color != null)
return color;
switch (type) {
case MaterialType.canvas:
return Theme.of(this).canvasColor;
case MaterialType.card:
return Theme.of(this).cardColor;
default:
return null;
AnimatedColor _getBackgroundColor(MaterialType type, Color color) {
if (color == null) {
switch (type) {
case MaterialType.canvas: color = Theme.of(this).canvasColor; break;
case MaterialType.card: color = Theme.of(this).cardColor; break;
}
}
return color == null ? null : new AnimatedColor(color);
}
Widget build() {