firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for specifying tab label and indicator colors (#4107)

Browse Source
This commit is contained in:
Hans Muller 2016-05-23 12:02:43 -07:00
parent d5e3ea2f9c
commit 40179aaa1c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/flutter/lib/src/material/tabs.dart
View File

@ -652,7 +652,9 @@ class TabBar<T> extends Scrollable {
TabBar({ TabBar({
Key key, Key key,
this.labels, this.labels,
this.isScrollable: false this.isScrollable: false,
this.indicatorColor,
this.labelColor
}) : super(key: key, scrollDirection: Axis.horizontal); }) : super(key: key, scrollDirection: Axis.horizontal);
/// The labels to display in the tabs. /// The labels to display in the tabs.
@ -665,6 +667,15 @@ class TabBar<T> extends Scrollable {
/// share of the available space. /// share of the available space.
final bool isScrollable; final bool isScrollable;
/// The color of the line that appears below the selected tab. If this parameter
/// is null then the value of the Theme's indicatorColor property is used.
final Color indicatorColor;
/// The color of selected tab labels. Unselected tab labels are rendered
/// with the same color rendered at 70% opacity. If this parameter is null then
/// the color of the theme's body2 text color is used.
final Color labelColor;
double get minimumHeight { double get minimumHeight {
for (TabLabel label in labels.values) { for (TabLabel label in labels.values) {
if (label.text != null && (label.icon != null || label.iconBuilder != null)) if (label.text != null && (label.icon != null || label.iconBuilder != null))
@ -900,7 +911,7 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect
ThemeData themeData = Theme.of(context); ThemeData themeData = Theme.of(context);
Color backgroundColor = Material.of(context).color; Color backgroundColor = Material.of(context).color;
Color indicatorColor = themeData.indicatorColor; Color indicatorColor = config.indicatorColor ?? themeData.indicatorColor;
if (indicatorColor == backgroundColor) { if (indicatorColor == backgroundColor) {
// ThemeData tries to avoid this by having indicatorColor avoid being the // ThemeData tries to avoid this by having indicatorColor avoid being the
// primaryColor. However, it's possible that the tab bar is on a // primaryColor. However, it's possible that the tab bar is on a
@ -914,13 +925,14 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect
final TextStyle textStyle = themeData.primaryTextTheme.body2; final TextStyle textStyle = themeData.primaryTextTheme.body2;
final IconThemeData iconTheme = themeData.primaryIconTheme; final IconThemeData iconTheme = themeData.primaryIconTheme;
final Color textColor = themeData.primaryTextTheme.body2.color.withAlpha(0xB2); // 70% alpha final Color selectedLabelColor = config.labelColor ?? themeData.primaryTextTheme.body2.color;
final Color labelColor = selectedLabelColor.withAlpha(0xB2); // 70% alpha
List<Widget> tabs = <Widget>[]; List<Widget> tabs = <Widget>[];
bool textAndIcons = false; bool textAndIcons = false;
int tabIndex = 0; int tabIndex = 0;
for (TabLabel label in config.labels.values) { for (TabLabel label in config.labels.values) {
tabs.add(_toTab(label, tabIndex++, textColor, indicatorColor)); tabs.add(_toTab(label, tabIndex++, labelColor, selectedLabelColor));
if (label.text != null && (label.icon != null || label.iconBuilder != null)) if (label.text != null && (label.icon != null || label.iconBuilder != null))
textAndIcons = true; textAndIcons = true;
} }