Merge pull request #562 from eseidelGoogle/fitness

Fix crash when hitting "enter" key on keyboard during entry

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<String, String> _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<String, String> labels = {
-      '/meals/new': 'Eat',
-      '/measurements/new': 'Measure',
-    };
     List<Widget> 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)));
     }

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));
   }
 

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:

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,