Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: sky/sdk/lib/widgets/menu_item.dart

Issue 1223843014: Update material design icons (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: alphabetize Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/sdk/lib/mojo/net/image_cache.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/widgets/menu_item.dart
diff --git a/sky/sdk/lib/widgets/menu_item.dart b/sky/sdk/lib/widgets/menu_item.dart
index 94a17a81484f7cec869bced63db1811f95b10644..76c5de84f163100cf1763c1d53954ca3c266b0ac 100644
--- a/sky/sdk/lib/widgets/menu_item.dart
+++ b/sky/sdk/lib/widgets/menu_item.dart
@@ -47,7 +47,39 @@ class MenuItem extends ButtonBase {
return result;
}
+ String get iconSuffix {
+ switch(Theme.of(this).brightness) {
+ case ThemeBrightness.dark:
+ return "white";
+ case ThemeBrightness.light:
+ return "black";
+ }
+ }
+
Widget buildContent() {
+ List<Widget> flexChildren = new List<Widget>();
+ if (icon != null) {
+ flexChildren.add(
+ new Opacity(
+ opacity: highlight ? 1.0 : 0.45,
+ child: new Padding(
+ padding: const EdgeDims.symmetric(horizontal: 16.0),
+ child: new Icon(type: "${icon}_${iconSuffix}", size: 24)
+ )
+ )
+ );
+ }
+ flexChildren.add(
+ new Flexible(
+ child: new Padding(
+ padding: const EdgeDims.symmetric(horizontal: 16.0),
+ child: new DefaultTextStyle(
+ style: textStyle,
+ child: new Flex(children, direction: FlexDirection.horizontal)
+ )
+ )
+ )
+ );
return new Listener(
onGestureTap: (_) {
if (onPressed != null)
@@ -57,21 +89,7 @@ class MenuItem extends ButtonBase {
height: 48.0,
decoration: highlight ? _kHighlightDecoration : _kHighlightBoring,
child: new InkWell(
- child: new Flex([
- new Padding(
- padding: const EdgeDims.symmetric(horizontal: 16.0),
- child: new Icon(type: "${icon}_grey600", size: 24)
- ),
- new Flexible(
- child: new Padding(
- padding: const EdgeDims.symmetric(horizontal: 16.0),
- child: new DefaultTextStyle(
- style: textStyle,
- child: new Flex(children, direction: FlexDirection.horizontal)
- )
- )
- )
- ])
+ child: new Flex(flexChildren)
)
)
);
« no previous file with comments | « sky/sdk/lib/mojo/net/image_cache.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698