TouchInstinct
/
XLPagerTabStrip
314
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Martin Barreto 2015-04-09 18:16:28 -03:00
parent 43d9302bcf
commit e53e88cba9
37 changed files with 74 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XLPagerTabStrip.xcodeproj/project.pbxproj
View File

@ -492,7 +492,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = XLPagerTabStrip/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@ -505,7 +504,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = XLPagerTabStrip/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

2
XLPagerTabStrip/AppDelegate.h
View File

@ -2,7 +2,7 @@
// AppDelegate.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/AppDelegate.m
View File

@ -2,7 +2,7 @@
// AppDelegate.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/BarExampleViewController.h
View File

@ -2,7 +2,7 @@
// BarContainerViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/BarExampleViewController.m
View File

@ -2,7 +2,7 @@
// BarContainerViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ButtonBarExampleViewController.h
View File

@ -2,7 +2,7 @@
// ButtonContainerViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ButtonBarExampleViewController.m
View File

@ -2,7 +2,7 @@
// ButtonContainerViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.h
View File

@ -2,7 +2,7 @@
// ChildExampleViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/ChildExampleViewController.m
View File

@ -2,7 +2,7 @@
// ChildExampleViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/TableChildExampleViewController.h
View File

@ -2,7 +2,7 @@
// TableChildExampleViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/TableChildExampleViewController.m
View File

@ -2,7 +2,7 @@
// TableChildExampleViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/Views/PostCell.h
View File

@ -2,7 +2,7 @@
// PostCell.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/ChildViewController/Views/PostCell.m
View File

@ -2,7 +2,7 @@
// PostCell.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.h
View File

@ -3,7 +3,7 @@
// XLPagerTabStrip
//
// Created by Martin Barreto on 12/20/14.
// Copyright (c) 2014 Xmartlabs. All rights reserved.
// Copyright (c) 2015 Xmartlabs. All rights reserved.
//
#import <UIKit/UIKit.h>

2
XLPagerTabStrip/Demo/Helpers/ReloadExampleViewController.m
View File

@ -3,7 +3,7 @@
// XLPagerTabStrip
//
// Created by Martin Barreto on 12/20/14.
// Copyright (c) 2014 Xmartlabs. All rights reserved.
// Copyright (c) 2015 Xmartlabs. All rights reserved.
//
#import "XLPagerTabStripViewController.h"
#import "ReloadExampleViewController.h"

2
XLPagerTabStrip/Demo/Helpers/XLJSONSerialization.h
View File

@ -2,7 +2,7 @@
// XLJSONSerialization.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/Helpers/XLJSONSerialization.m
View File

@ -2,7 +2,7 @@
// XLJSONSerialization.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/SegmentedExampleViewController.h
View File

@ -2,7 +2,7 @@
// SegmentedContainerViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/Demo/SegmentedExampleViewController.m
View File

@ -2,7 +2,7 @@
// SegmentedContainerViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.h
View File

@ -2,7 +2,7 @@
// XLBarPagerTabStripViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLBarPagerTabStripViewController.m
View File

@ -2,7 +2,7 @@
// XLBarPagerTabStripViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.h
View File

@ -2,7 +2,7 @@
// XLButtonBarPagerTabStripViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLButtonBarPagerTabStripViewController.m
View File

@ -2,7 +2,7 @@
// XLButtonBarPagerTabStripViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.h
View File

@ -2,7 +2,7 @@
// XLPagerTabStripViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLPagerTabStripViewController.m
View File

@ -2,7 +2,7 @@
// XLPagerTabStripViewController
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.h
View File

@ -2,7 +2,7 @@
// XLSegmentedPagerTabStripViewController.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Controllers/XLSegmentedPagerTabStripViewController.m
View File

@ -2,7 +2,7 @@
// XLSegmentedPagerTabStripViewController.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

23
XLPagerTabStrip/XL/Controllers/XLTwitterPagerTabStripViewController.h
View File

@ -1,10 +1,27 @@
//
// XLTwitterPagerTabStripViewController.h
// XLPagerTabStrip
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Created by Martin Pastorin on 2/12/15.
// Copyright (c) 2015 Xmartlabs. All rights reserved.
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#import "XLPagerTabStripViewController.h"

23
XLPagerTabStrip/XL/Controllers/XLTwitterPagerTabStripViewController.m
View File

@ -1,10 +1,27 @@
//
// XLTwitterPagerTabStripViewController.m
// XLPagerTabStrip
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Created by Martin Pastorin on 2/12/15.
// Copyright (c) 2015 Xmartlabs. All rights reserved.
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#import "XLTwitterPagerTabStripViewController.h"
#import "TableChildExampleViewController.h"

2
XLPagerTabStrip/XL/Views/XLBarView.h
View File

@ -2,7 +2,7 @@
// XLBarView.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Views/XLBarView.m
View File

@ -2,7 +2,7 @@
// XLBarView.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Views/XLButtonBarView.h
View File

@ -2,7 +2,7 @@
// XLButtonBarView.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Views/XLButtonBarView.m
View File

@ -2,7 +2,7 @@
// XLButtonBarView.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Views/XLButtonBarViewCell.h
View File

@ -2,7 +2,7 @@
// XLButtonBarViewCell.h
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/XL/Views/XLButtonBarViewCell.m
View File

@ -2,7 +2,7 @@
// XLButtonBarViewCell.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStrip/main.m
View File

@ -2,7 +2,7 @@
// main.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy

2
XLPagerTabStripTests/XLPagerTabStripTests.m
View File

@ -2,7 +2,7 @@
// XLPagerTabStripTests.m
// XLPagerTabStrip ( https://github.com/xmartlabs/XLPagerTabStrip )
//
// Copyright (c) 2014 Xmartlabs ( http://xmartlabs.com )
// Copyright (c) 2015 Xmartlabs ( http://xmartlabs.com )
//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy