Commit ca42e886 authored by Collin Jackson's avatar Collin Jackson

Merge pull request #747 from collinjackson/fitness_loading

Don’t flash a message while fitness data is loading
parents 010589be d75fb405
...@@ -214,6 +214,8 @@ class FeedFragment extends StatefulComponent { ...@@ -214,6 +214,8 @@ class FeedFragment extends StatefulComponent {
Widget buildBody() { Widget buildBody() {
TextStyle style = Theme.of(this).text.title; TextStyle style = Theme.of(this).text.title;
if (userData == null)
return new Material(type: MaterialType.canvas);
if (userData.items.length == 0) if (userData.items.length == 0)
return new Material( return new Material(
type: MaterialType.canvas, type: MaterialType.canvas,
......
...@@ -86,7 +86,7 @@ class UserDataImpl extends UserData { ...@@ -86,7 +86,7 @@ class UserDataImpl extends UserData {
class FitnessApp extends App { class FitnessApp extends App {
NavigationState _navigationState; NavigationState _navigationState;
UserDataImpl _userData = new UserDataImpl(); UserDataImpl _userData;
void didMount() { void didMount() {
super.didMount(); super.didMount();
......
...@@ -425,10 +425,14 @@ abstract class TagNode extends Widget { ...@@ -425,10 +425,14 @@ abstract class TagNode extends Widget {
void _sync(Widget old, dynamic slot) { void _sync(Widget old, dynamic slot) {
Widget oldChild = old == null ? null : (old as TagNode).child; Widget oldChild = old == null ? null : (old as TagNode).child;
child = syncChild(child, oldChild, slot); child = syncChild(child, oldChild, slot);
assert(child.parent == this); if (child != null) {
assert(child.renderObject != null); assert(child.parent == this);
_renderObject = child.renderObject; assert(child.renderObject != null);
assert(_renderObject == renderObject); // in case a subclass reintroduces it _renderObject = child.renderObject;
assert(_renderObject == renderObject); // in case a subclass reintroduces it
} else {
_renderObject = null;
}
} }
void updateSlot(dynamic newSlot) { void updateSlot(dynamic newSlot) {
......
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