Skip to content

Commit

Permalink
[NavigationBar][ButtonBar] Restore the changed default inkColor
Browse files Browse the repository at this point in the history
The issue was caused by #3250, where we override MDCFlatButton's appearance.inkColor with MDCButton's default inkColor.

https://github.com/material-components/material-components-ios/blob/5fe8cf2752dcafad7b07d6f8935910f1597ed963/components/Buttons/src/MDCFlatButton.m#L32
  • Loading branch information
Ali Rabbani authored and jverkoey committed Apr 16, 2018
1 parent 8c02f78 commit 367048d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions components/ButtonBar/src/private/MDCAppBarButtonBarBuilder.m
Expand Up @@ -88,8 +88,10 @@ - (UIView *)buttonBar:(MDCButtonBar *)buttonBar
MDCButtonBarButton *button = [[MDCButtonBarButton alloc] init];
[button setBackgroundColor:[UIColor clearColor] forState:UIControlStateNormal];
button.disabledAlpha = kDisabledButtonAlpha;
button.inkColor = buttonBar.inkColor ? buttonBar.inkColor : button.inkColor;

if (buttonBar.inkColor) {
button.inkColor = buttonBar.inkColor;
}

button.exclusiveTouch = YES;

[MDCAppBarButtonBarBuilder configureButton:button fromButtonItem:buttonItem];
Expand Down

0 comments on commit 367048d

Please sign in to comment.