Skip to content

Commit

Permalink
[Tabs] Replace MDCRaisedButton with contained button themer in TabBar…
Browse files Browse the repository at this point in the history
…IndicatorTemplateExample. (#3500)

Pivotal story: https://www.pivotaltracker.com/story/show/157105832

Before:
![simulator screen shot - iphone se - 2018-04-25 at 20 14 16](https://user-images.githubusercontent.com/45670/39279219-a8eb18b0-48c5-11e8-8c51-dea08ac819d5.png)

After:
![simulator screen shot - iphone se - 2018-04-25 at 20 15 57](https://user-images.githubusercontent.com/45670/39279225-ac8c4200-48c5-11e8-8475-42db5c2a76ba.png)
  • Loading branch information
jverkoey committed Apr 27, 2018
1 parent 149834e commit 6ef9939
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
5 changes: 3 additions & 2 deletions components/Tabs/examples/TabBarIndicatorTemplateExample.swift
Expand Up @@ -46,10 +46,11 @@ class TabBarIndicatorTemplateExample: UIViewController {
}
}

lazy var alignmentButton: MDCRaisedButton = self.makeAlignmentButton()
lazy var appearanceButton: MDCRaisedButton = self.makeAppearanceButton()
lazy var alignmentButton: MDCButton = self.makeAlignmentButton()
lazy var appearanceButton: MDCButton = self.makeAppearanceButton()
lazy var appBar: MDCAppBar = self.makeAppBar()
var colorScheme = MDCSemanticColorScheme()
var typographyScheme = MDCTypographyScheme()

lazy var tabBar: MDCTabBar = {
let tabBar = MDCTabBar()
Expand Down
Expand Up @@ -17,17 +17,27 @@
import UIKit

import MaterialComponents.MaterialButtons
import MaterialComponents.MaterialButtons_ButtonThemer

extension TabBarIndicatorTemplateExample {

func makeAlignmentButton() -> MDCRaisedButton {
let button = MDCRaisedButton()
private func themeButton(_ button: MDCButton) {
let buttonScheme = MDCButtonScheme()
buttonScheme.colorScheme = colorScheme
buttonScheme.typographyScheme = typographyScheme
MDCContainedButtonThemer.applyScheme(buttonScheme, to: button)
}

func makeAlignmentButton() -> MDCButton {
let button = MDCButton()
themeButton(button)
button.setTitle("Change Alignment", for: .normal)
return button
}

func makeAppearanceButton() -> MDCRaisedButton {
let button = MDCRaisedButton()
func makeAppearanceButton() -> MDCButton {
let button = MDCButton()
themeButton(button)
button.setTitle("Change Appearance", for: .normal)
return button
}
Expand Down

0 comments on commit 6ef9939

Please sign in to comment.