Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[New Component] Tab component with MDCTabBar #1164

Merged
merged 88 commits into from
Jan 25, 2017

Conversation

brianjmoore
Copy link
Contributor

This adds a new Tabs components with an MDCTabBar class that implements a material-style tab bar.

brianjmoore and others added 30 commits October 4, 2016 14:20
…components#711)

* Add initial headers for MDC*Bar

* Initial chunk of work

* It works…ish

* Update demo images and update style with appearance

* Update Podfile.lock

* Merge

* Merge

* Revert bottom bar for now

* Update description

* Formatting and cleanup

* Manual revert of mistaken changes

* Manual revert of mistaken changes

* Manual revert of mistaken changes

* Update with consistent terminology

* Update constant names

* Update localizable strings

* More naming updates

* Rename TabBar to Tabs, move ItemBar into Tabs/private

* Rename string keys

* Rename string files from ItemBar to Tabs

* Rename string keys header

* Update podspec and move bundle

* Reset Podfile.lock in preparation for re-updating

* Clean update to Podfile.lock, adding MaterialTabs

* Update import paths

* Move CatalogByConvention method to end of file

* Add copyright notice on all h/m files

* Add safe fallbacks for switches

* Use conventional common init method name

* Podfile.lock checksum update
Master updated to match upstream
…components#711)

* Add initial headers for MDC*Bar

* Initial chunk of work

* It works…ish

* Update demo images and update style with appearance

* Update Podfile.lock

* Merge

* Merge

* Revert bottom bar for now

* Update description

* Formatting and cleanup

* Manual revert of mistaken changes

* Manual revert of mistaken changes

* Manual revert of mistaken changes

* Update with consistent terminology

* Update constant names

* Update localizable strings

* More naming updates

* Rename TabBar to Tabs, move ItemBar into Tabs/private

* Rename string keys

* Rename string files from ItemBar to Tabs

* Rename string keys header

* Update podspec and move bundle

* Reset Podfile.lock in preparation for re-updating

* Clean update to Podfile.lock, adding MaterialTabs

* Update import paths

* Move CatalogByConvention method to end of file

* Add copyright notice on all h/m files

* Add safe fallbacks for switches

* Use conventional common init method name

* Podfile.lock checksum update
[Tabs] Fix podspec for resource bundle key
Split Tabs examples into 2 and updated organization inside them
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@willlarche
Copy link
Collaborator

willlarche commented Jan 23, 2017 via email

@codecov-io
Copy link

Current coverage is 26.36% (diff: 0.41%)

No coverage report found for develop at 8490f6e.

Powered by Codecov. Last update 8490f6e...dfd38e3

@samnm samnm assigned samnm and unassigned samnm Jan 24, 2017
@samnm samnm self-requested a review January 24, 2017 20:14
<!-- <a href="https://material.google.com/components/bottom-navigation.html">-->
<!-- Bottom navigation-->
<!-- </a>-->
<!-- </li>-->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Omit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor

@samnm samnm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM aside from some minor comments

@@ -162,11 +168,11 @@ DEPENDENCIES:

EXTERNAL SOURCES:
MaterialComponents:
:path: "../"
:path: ../
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you update the rubygem 'psych', newly generated Podfiles will include the quotation marks. Try sudo gem update psych.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Done

@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to edit this file?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... Probably not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted

}
}

#pragma mark - GOOAccessibility
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this just say Accessibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@willlarche willlarche changed the title Tab component with MDCTabBar [New Component] Tab component with MDCTabBar Jan 25, 2017
@willlarche
Copy link
Collaborator

Verified build is good with another Travis and local testing. This Travis is not trusted.

@willlarche willlarche merged commit fd074fc into material-components:develop Jan 25, 2017
@brianjmoore brianjmoore deleted the feature-tabs branch January 25, 2017 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants