Commit 3783ad37 authored by Hixie's avatar Hixie

Fix scaffold to work for the toolbar.

Also, make the scaffold code more generic (with slots in a map,
instead of dedicated members for each slot).

This may eventually benefit from being split into a general
"multislot" superclass and a scaffold-specific subclass, but for now
it'll do.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/1152163007
parent dc491505
...@@ -206,22 +206,15 @@ class StocksApp extends App { ...@@ -206,22 +206,15 @@ class StocksApp extends App {
UINode build() { UINode build() {
// List<UINode> overlays = []; // List<UINode> overlays = [];
// addMenuToOverlays(overlays); // addMenuToOverlays(overlays);
return new Container( return new Scaffold(
child: new BlockContainer(children: [buildToolBar()]), toolbar: _isSearching ? buildSearchBar() : buildToolBar()
decoration: new BoxDecoration(
backgroundColor: const sky.Color(0xFFFFFFFF)
)
);
// return new Scaffold(
// toolbar: _isSearching ? buildSearchBar() : buildToolBar()
// , // ,
// body: new Stocklist(stocks: _stocks, query: _searchQuery), // body: new Stocklist(stocks: _stocks, query: _searchQuery),
// floatingActionButton: new FloatingActionButton( // floatingActionButton: new FloatingActionButton(
// content: new Icon(type: 'content/add_white', size: 24), level: 3), // content: new Icon(type: 'content/add_white', size: 24), level: 3),
// drawer: _drawerShowing ? buildDrawer() : null, // drawer: _drawerShowing ? buildDrawer() : null,
// overlays: overlays // overlays: overlays
// ); );
} }
} }
......
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