Commit 9523283b authored by Hixie's avatar Hixie

[Effen] Rename Action Bar to Tool Bar.

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/1133353008
parent 17040ff3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:sky/framework/components/action_bar.dart'; import 'package:sky/framework/components/tool_bar.dart';
import 'package:sky/framework/components/drawer.dart'; import 'package:sky/framework/components/drawer.dart';
import 'package:sky/framework/components/drawer_header.dart'; import 'package:sky/framework/components/drawer_header.dart';
import 'package:sky/framework/components/floating_action_button.dart'; import 'package:sky/framework/components/floating_action_button.dart';
...@@ -31,7 +31,7 @@ enum StockMode { Optimistic, Pessimistic } ...@@ -31,7 +31,7 @@ enum StockMode { Optimistic, Pessimistic }
class StocksApp extends App { class StocksApp extends App {
static final Style _actionBarStyle = new Style(''' static final Style _toolBarStyle = new Style('''
background-color: ${Purple[500]};'''); background-color: ${Purple[500]};''');
static final Style _searchBarStyle = new Style(''' static final Style _searchBarStyle = new Style('''
...@@ -163,9 +163,9 @@ class StocksApp extends App { ...@@ -163,9 +163,9 @@ class StocksApp extends App {
); );
} }
UINode buildActionBar() { UINode buildToolBar() {
return new StyleNode( return new StyleNode(
new ActionBar( new ToolBar(
left: new IconButton( left: new IconButton(
icon: 'navigation/menu_white', icon: 'navigation/menu_white',
onGestureTap: _drawerController.toggle), onGestureTap: _drawerController.toggle),
...@@ -180,13 +180,13 @@ class StocksApp extends App { ...@@ -180,13 +180,13 @@ class StocksApp extends App {
icon: 'navigation/more_vert_white', icon: 'navigation/more_vert_white',
onGestureTap: _handleMenuShow) onGestureTap: _handleMenuShow)
]), ]),
_actionBarStyle); _toolBarStyle);
} }
// TODO(abarth): Should we factor this into a SearchBar in the framework? // TODO(abarth): Should we factor this into a SearchBar in the framework?
UINode buildSearchBar() { UINode buildSearchBar() {
return new StyleNode( return new StyleNode(
new ActionBar( new ToolBar(
left: new IconButton( left: new IconButton(
icon: 'navigation/arrow_back_grey600', icon: 'navigation/arrow_back_grey600',
onGestureTap: _handleSearchEnd), onGestureTap: _handleSearchEnd),
...@@ -214,7 +214,7 @@ class StocksApp extends App { ...@@ -214,7 +214,7 @@ class StocksApp extends App {
addMenuToOverlays(overlays); addMenuToOverlays(overlays);
return new Scaffold( return new Scaffold(
header: _isSearching ? buildSearchBar() : buildActionBar(), header: _isSearching ? buildSearchBar() : buildToolBar(),
content: new Stocklist(stocks: _stocks, query: _searchQuery), content: new Stocklist(stocks: _stocks, query: _searchQuery),
fab: new FloatingActionButton( fab: new FloatingActionButton(
content: new Icon(type: 'content/add_white', size: 24), level: 3), content: new Icon(type: 'content/add_white', size: 24), level: 3),
......
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