Support for icon theming

sky/sdk/lib/widgets/tabs.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:math' as math;
 
 import 'package:sky/animation/generators.dart';
 import 'package:sky/animation/mechanics.dart';
 import 'package:sky/animation/scroll_behavior.dart';
 import 'package:sky/painting/text_style.dart';
 import 'package:sky/rendering/box.dart';
 import 'package:sky/rendering/object.dart';
 import 'package:vector_math/vector_math.dart';
 import 'package:sky/theme/colors.dart' as colors;
+import 'package:sky/theme/typography.dart' as typography;
 import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/default_text_style.dart';
 import 'package:sky/widgets/icon.dart';
 import 'package:sky/widgets/ink_well.dart';
 import 'package:sky/widgets/scrollable.dart';
 import 'package:sky/widgets/theme.dart';
 import 'package:sky/widgets/widget.dart';
 
 typedef void SelectedIndexChanged(int selectedIndex);
 typedef void LayoutChanged(Size size, List<double> widths);
 
 // See https://www.google.com/design/spec/components/tabs.html#tabs-specs
@@ skipping 268 matching lines @@
     this.selected: false
   }) : super(key: key) {
     assert(label.text != null || label.icon != null);
   }
 
   final TabLabel label;
   final bool selected;
 
   Widget _buildLabelText() {
     assert(label.text != null);
-    TextStyle textStyle = Theme.of(this).toolbarText.button.merge(_kTabTextStyle);
-    return new Text(label.text, style: textStyle);
+    return new Text(label.text, style: _kTabTextStyle);
   }
 
   Widget _buildLabelIcon() {
     assert(label.icon != null);
     return new Icon(type: label.icon, size: _kTabIconSize);
   }
 
   Widget build() {
     Widget labelContents;
     if (label.icon == null) {
@@ skipping 111 matching lines @@
     assert(labels != null && labels.isNotEmpty);
     List<Widget> tabs = <Widget>[];
     bool textAndIcons = false;
     int tabIndex = 0;
     for (TabLabel label in labels) {
       tabs.add(_toTab(label, tabIndex++));
       if (label.text != null && label.icon != null)
         textAndIcons = true;
     }
 
-    Color backgroundColor = Theme.of(this).primaryColor;
-    Color indicatorColor = Theme.of(this).accentColor;
+    ThemeData themeData = Theme.of(this);
+    Color backgroundColor = themeData.primaryColor;
+    Color indicatorColor = themeData.accentColor;
     if (indicatorColor == backgroundColor) {
       indicatorColor = colors.White;
     }
 
-    TabBarWrapper tabBarWrapper = new TabBarWrapper(
-      children: tabs,
-      selectedIndex: selectedIndex,
-      backgroundColor: backgroundColor,
-      indicatorColor: indicatorColor,
-      textAndIcons: textAndIcons,
-      scrollable: scrollable,
-      onLayoutChanged: scrollable ? _layoutChanged : null
-    );
+    TextStyle textStyle;
+    IconThemeColor iconThemeColor;
+    switch (themeData.primaryColorBrightness) {
+      case ThemeBrightness.light:
+        textStyle = typography.black.body1;
+        iconThemeColor = IconThemeColor.black;
+        break;
+      case ThemeBrightness.dark:
+        textStyle = typography.white.body1;
+        iconThemeColor = IconThemeColor.white;
+        break;
+    }
 
     Matrix4 transform = new Matrix4.identity();
     transform.translate(-scrollOffset, 0.0);
-    return new Transform(child: tabBarWrapper, transform: transform);
+
+    return new Transform(
+      transform: transform,
+      child: new IconTheme(
+        data: new IconThemeData(color: iconThemeColor),
+        child: new DefaultTextStyle(
+          style: textStyle,
+          child: new TabBarWrapper(
+            children: tabs,
+            selectedIndex: selectedIndex,
+            backgroundColor: backgroundColor,
+            indicatorColor: indicatorColor,
+            textAndIcons: textAndIcons,
+            scrollable: scrollable,
+            onLayoutChanged: scrollable ? _layoutChanged : null
+          )
+        )
+      )
+    );
   }
 }
 
 class TabNavigatorView {
   TabNavigatorView({ this.label, this.builder });
 
   final TabLabel label;
   final Builder builder;
 
   Widget buildContent() {
@@ skipping 33 matching lines @@
       selectedIndex: selectedIndex,
       scrollable: scrollable
     );
 
     Widget content = views[selectedIndex].buildContent();
     return new Flex([tabBar, new Flexible(child: content)],
       direction: FlexDirection.vertical
     );
   }
 }