| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:sky/framework/components2/tool_bar.dart'; | 5 import 'package:sky/framework/components2/tool_bar.dart'; |
| 6 // import 'package:sky/framework/components2/drawer.dart'; | 6 // import 'package:sky/framework/components2/drawer.dart'; |
| 7 // import 'package:sky/framework/components2/drawer_header.dart'; | 7 // import 'package:sky/framework/components2/drawer_header.dart'; |
| 8 // import 'package:sky/framework/components2/floating_action_button.dart'; | 8 // import 'package:sky/framework/components2/floating_action_button.dart'; |
| 9 // import 'package:sky/framework/components2/icon.dart'; | 9 // import 'package:sky/framework/components2/icon.dart'; |
| 10 import 'package:sky/framework/components2/icon_button.dart'; | 10 import 'package:sky/framework/components2/icon_button.dart'; |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 // left: new IconButton( | 184 // left: new IconButton( |
| 185 // icon: 'navigation/arrow_back_grey600', | 185 // icon: 'navigation/arrow_back_grey600', |
| 186 // onGestureTap: _handleSearchEnd), | 186 // onGestureTap: _handleSearchEnd), |
| 187 // center: new Input( | 187 // center: new Input( |
| 188 // focused: true, | 188 // focused: true, |
| 189 // placeholder: 'Search stocks', | 189 // placeholder: 'Search stocks', |
| 190 // onChanged: _handleSearchQueryChanged)), | 190 // onChanged: _handleSearchQueryChanged)), |
| 191 // _searchBarStyle); | 191 // _searchBarStyle); |
| 192 } | 192 } |
| 193 | 193 |
| 194 // void addMenuToOverlays(List<UINode> overlays) { | 194 void addMenuToOverlays(List<UINode> overlays) { |
| 195 // if (_menuController == null) | 195 // if (_menuController == null) |
| 196 // return; | 196 // return; |
| 197 // overlays.add(new ModalOverlay( | 197 // overlays.add(new ModalOverlay( |
| 198 // children: [new StockMenu( | 198 // children: [new StockMenu( |
| 199 // controller: _menuController, | 199 // controller: _menuController, |
| 200 // autorefresh: _autorefresh, | 200 // autorefresh: _autorefresh, |
| 201 // onAutorefreshChanged: _handleAutorefreshChanged | 201 // onAutorefreshChanged: _handleAutorefreshChanged |
| 202 // )], | 202 // )], |
| 203 // onDismiss: _handleMenuHide)); | 203 // onDismiss: _handleMenuHide)); |
| 204 // } | 204 } |
| 205 | 205 |
| 206 UINode build() { | 206 UINode build() { |
| 207 // List<UINode> overlays = []; | 207 List<UINode> overlays = [ |
| 208 // addMenuToOverlays(overlays); | 208 new Scaffold( |
| 209 return new Scaffold( | 209 toolbar: _isSearching ? buildSearchBar() : buildToolBar() |
| 210 toolbar: _isSearching ? buildSearchBar() : buildToolBar() | 210 // , |
| 211 // , | 211 // body: new Stocklist(stocks: _stocks, query: _searchQuery), |
| 212 // body: new Stocklist(stocks: _stocks, query: _searchQuery), | 212 // floatingActionButton: new FloatingActionButton( |
| 213 // floatingActionButton: new FloatingActionButton( | 213 // content: new Icon(type: 'content/add_white', size: 24), |
| 214 // content: new Icon(type: 'content/add_white', size: 24), level: 3), | 214 // level: 3), |
| 215 // drawer: _drawerShowing ? buildDrawer() : null, | 215 // drawer: _drawerShowing ? buildDrawer() : null |
| 216 // overlays: overlays | 216 ), |
| 217 ); | 217 ]; |
| 218 addMenuToOverlays(overlays); |
| 219 return new StackContainer(children: overlays); |
| 218 } | 220 } |
| 219 } | 221 } |
| 220 | 222 |
| 221 void main() { | 223 void main() { |
| 222 print("starting stocks app!"); | 224 print("starting stocks app!"); |
| 223 new StocksApp(); | 225 new StocksApp(); |
| 224 } | 226 } |
| OLD | NEW |