Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

some changes & fixes for Xcode 4.2/iOS5 #2

Closed
wants to merge 4 commits into from

1 participant

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
8 .gitignore
@@ -0,0 +1,8 @@
+build
+*.pbxuser
+*.mode1v3
+.DS_Store
+*xcuserdata
+Development
+Releases
+channellist_tablet/
View
37 Projects/Applications/TabBarKitCatalog/TabBarKitCatalog.xcodeproj/project.pbxproj
@@ -47,6 +47,16 @@
63F77EC812F007BD008C61E0 /* Super8@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63F77EB412F007BD008C61E0 /* Super8@2x.png */; };
/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+ 78D9E5D7144F419D0037CB86 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 78D9E5D3144F419D0037CB86 /* TabBarKit.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = D2AAC07E0554694100DB518D;
+ remoteInfo = TabBarKit;
+ };
+/* End PBXContainerItemProxy section */
+
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D6058910D05DD3D006BFB54 /* TabBarKitCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TabBarKitCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -101,6 +111,7 @@
63F77EB412F007BD008C61E0 /* Super8@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Super8@2x.png"; path = "Source/Resources/Media/Images/Tabs/Super8@2x.png"; sourceTree = SOURCE_ROOT; };
63F7E3DA137656490053B106 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Configurations/Debug.xcconfig; sourceTree = SOURCE_ROOT; };
63F7E3DB137656490053B106 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Configurations/Release.xcconfig; sourceTree = SOURCE_ROOT; };
+ 78D9E5D3144F419D0037CB86 /* TabBarKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TabBarKit.xcodeproj; path = ../../Libraries/TabBarKit/TabBarKit.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -281,6 +292,7 @@
6384390E1040F20A00D29404 /* Projects */ = {
isa = PBXGroup;
children = (
+ 78D9E5D3144F419D0037CB86 /* TabBarKit.xcodeproj */,
);
name = Projects;
sourceTree = "<group>";
@@ -332,6 +344,14 @@
path = Source/Resources/Media/Images/Tabs;
sourceTree = SOURCE_ROOT;
};
+ 78D9E5D4144F419D0037CB86 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 78D9E5D8144F419D0037CB86 /* libTabBarKit.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -359,6 +379,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0420;
ORGANIZATIONNAME = Semantap;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TabBarKitCatalog" */;
@@ -374,6 +395,12 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
+ projectReferences = (
+ {
+ ProductGroup = 78D9E5D4144F419D0037CB86 /* Products */;
+ ProjectRef = 78D9E5D3144F419D0037CB86 /* TabBarKit.xcodeproj */;
+ },
+ );
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* TabBarKitCatalog */,
@@ -381,6 +408,16 @@
};
/* End PBXProject section */
+/* Begin PBXReferenceProxy section */
+ 78D9E5D8144F419D0037CB86 /* libTabBarKit.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libTabBarKit.a;
+ remoteRef = 78D9E5D7144F419D0037CB86 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+/* End PBXReferenceProxy section */
+
/* Begin PBXResourcesBuildPhase section */
1D60588D0D05DD3D006BFB54 /* Resources */ = {
isa = PBXResourcesBuildPhase;
View
4 Projects/Libraries/TabBarKit/Source/Classes/TBKTabBarController.h
@@ -6,8 +6,8 @@
*/
#import <UIKit/UIKit.h>
-#import <TabBarKit/TBKTabBar.h>
-#import <TabBarKit/TBKTabBarItem.h>
+#import "TBKTabBar.h"
+#import "TBKTabBarItem.h"
@class TBKTabBarView;
@protocol TBKTabBarControllerDelegate;
View
32 Projects/Libraries/TabBarKit/Source/Classes/TBKTabBarController.m
@@ -200,7 +200,7 @@ -(void) navigationController:(UINavigationController *)nvc willShowViewControlle
self.tabBar.frame = tabBarBounds;
}
completion:^(BOOL finished){
- [UIView animateWithDuration:0.1 delay:0
+ [UIView animateWithDuration:0 delay:0
options:(UIViewAnimationOptionLayoutSubviews | UIViewAnimationOptionBeginFromCurrentState)
animations:^{
self.containerView.frame = CGRectMake(CGRectGetMinX(self.view.bounds),
@@ -222,17 +222,8 @@ -(void) navigationController:(UINavigationController *)nvc didShowViewController
#pragma mark - UIInterfaceOrientation
--(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)anOrientation {
- BOOL shouldRotate = YES;
- if (selectedViewController && [selectedViewController respondsToSelector:@selector(shouldAutorotateToInterfaceOrientation:)])
- {
- shouldRotate = [self.selectedViewController shouldAutorotateToInterfaceOrientation:anOrientation];
- }
- return shouldRotate;
-}
-
--(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)anOrientation duration:(NSTimeInterval)aDuration {
- if (UIInterfaceOrientationIsPortrait(anOrientation)) {
+- (void)updateTabbarImagesForOrientation:(UIInterfaceOrientation)anOrientation {
+ if (UIInterfaceOrientationIsPortrait(anOrientation)) {
for (TBKTabBarItem *tabBarItem in self.tabBar.items) {
if (self.displaysTabBarItemTitles) {
tabBarItem.imageEdgeInsets = UIEdgeInsetsMake(0, 22, 11, 0);
@@ -256,6 +247,18 @@ -(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)anOrientation d
[tabBarItem setNeedsDisplay];
}
}
+}
+
+-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)anOrientation {
+ BOOL shouldRotate = YES;
+ if (selectedViewController && [selectedViewController respondsToSelector:@selector(shouldAutorotateToInterfaceOrientation:)])
+ {
+ shouldRotate = [self.selectedViewController shouldAutorotateToInterfaceOrientation:anOrientation];
+ }
+ return shouldRotate;
+}
+
+-(void) willRotateToInterfaceOrientation:(UIInterfaceOrientation)anOrientation duration:(NSTimeInterval)aDuration {
[self.selectedViewController willRotateToInterfaceOrientation:anOrientation duration:aDuration];
}
@@ -264,6 +267,7 @@ -(void) willAnimateFirstHalfOfRotationToInterfaceOrientation:(UIInterfaceOrienta
}
-(void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)anOrientation duration:(NSTimeInterval)aDuration {
+ [self updateTabbarImagesForOrientation:anOrientation];
[self.selectedViewController willAnimateRotationToInterfaceOrientation:anOrientation duration:aDuration];
}
@@ -276,6 +280,10 @@ -(void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)anOrientation
[self.selectedViewController didRotateFromInterfaceOrientation:anOrientation];
}
+- (void)viewWillLayoutSubviews {
+ [super viewWillLayoutSubviews];
+ [self updateTabbarImagesForOrientation:[UIApplication sharedApplication].statusBarOrientation];
+}
#pragma mark - Memory
View
9 Projects/Libraries/TabBarKit/TabBarKit.xcodeproj/project.pbxproj
@@ -265,6 +265,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0420;
ORGANIZATIONNAME = "Your Company";
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "TabBarKit" */;
@@ -340,6 +341,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63894BE5103BD59B007C9CC9 /* Project.xcconfig */;
buildSettings = {
+ ARCHS = (
+ armv7,
+ armv6,
+ );
};
name = Debug;
};
@@ -347,6 +352,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63894BE5103BD59B007C9CC9 /* Project.xcconfig */;
buildSettings = {
+ ARCHS = (
+ armv7,
+ armv6,
+ );
};
name = Release;
};
Something went wrong with that request. Please try again.