diff --git a/examples/fitness/lib/feed.dart b/examples/fitness/lib/feed.dart index f02aed74870142a8c8d35599794c8a4a25368e66..10da157cf0d98301eaad2d532c10052b59f12e17 100644 --- a/examples/fitness/lib/feed.dart +++ b/examples/fitness/lib/feed.dart @@ -254,7 +254,13 @@ class AddItemDialog extends StatefulComponent { this.navigator = source.navigator; } - String _addItemRoute; + // TODO(jackson): Internationalize + static final Map _labels = { + '/measurements/new': 'Measure', + '/meals/new': 'Eat', + }; + + String _addItemRoute = _labels.keys.first; void _handleAddItemRouteChanged(String routeName) { setState(() { @@ -263,15 +269,10 @@ class AddItemDialog extends StatefulComponent { } Widget build() { - // TODO(jackson): Internationalize - Map labels = { - '/meals/new': 'Eat', - '/measurements/new': 'Measure', - }; List menuItems = []; - for(String routeName in labels.keys) { + for(String routeName in _labels.keys) { menuItems.add(new DialogMenuItem([ - new Flexible(child: new Text(labels[routeName])), + new Flexible(child: new Text(_labels[routeName])), new Radio(value: routeName, groupValue: _addItemRoute, onChanged: _handleAddItemRouteChanged), ], onPressed: () => _handleAddItemRouteChanged(routeName))); } diff --git a/examples/fitness/lib/measurement.dart b/examples/fitness/lib/measurement.dart index a6ba6c89c5922a3ce796496d176e2c6a39679bfe..a84d4fc9b16d160808cdfb302442ffad2eb69617 100644 --- a/examples/fitness/lib/measurement.dart +++ b/examples/fitness/lib/measurement.dart @@ -72,7 +72,8 @@ class MeasurementFragment extends StatefulComponent { double parsedWeight; try { parsedWeight = double.parse(_weight); - } on FormatException { + } on FormatException catch(e) { + print("Exception $e"); setState(() { _errorMessage = "Save failed"; }); @@ -130,6 +131,7 @@ class MeasurementFragment extends StatefulComponent { Widget buildSnackBar() { if (_errorMessage == null) return null; + // TODO(jackson): This doesn't show up, unclear why. return new SnackBar(content: new Text(_errorMessage)); } diff --git a/examples/fitness/pubspec.yaml b/examples/fitness/pubspec.yaml index a24792ae8de60e737801d3dec99a1372f7b30bc4..f1c1d0ab87790e9d4e64a92df21caa78207cd17d 100644 --- a/examples/fitness/pubspec.yaml +++ b/examples/fitness/pubspec.yaml @@ -2,8 +2,8 @@ name: fitness dependencies: sky: any sky_tools: any -dependency_overrides: path: "^1.3.6" +dependency_overrides: material_design_icons: path: ../../sky/packages/material_design_icons sky: diff --git a/sky/packages/sky/lib/widgets/snack_bar.dart b/sky/packages/sky/lib/widgets/snack_bar.dart index b0ad48e4229a2fd4c246a4c579eac54c45cd2dfc..46cc64944c08c1323abf4b89fa91714794b934cc 100644 --- a/sky/packages/sky/lib/widgets/snack_bar.dart +++ b/sky/packages/sky/lib/widgets/snack_bar.dart @@ -72,7 +72,9 @@ class SnackBar extends Component { ) ) ) - ]..addAll(actions); + ]; + if (actions != null) + children.addAll(actions); return new SlideTransition( duration: _kSlideInDuration,