diff --git a/JMTabBarKit/JMTabBarKit/JMTabBarController.m b/JMTabBarKit/JMTabBarKit/JMTabBarController.m index 35cd864..5ef8128 100644 --- a/JMTabBarKit/JMTabBarKit/JMTabBarController.m +++ b/JMTabBarKit/JMTabBarKit/JMTabBarController.m @@ -136,10 +136,10 @@ - (UIViewController *)setTabBarSelectedIndex:(NSInteger)tabBarSelectedIndex { UIViewController *selectedVC = nil; if (tabBarSelectedIndex >= 0 && tabBarSelectedIndex < _tabBarArray.count) { - self.selectedIndex = tabBarSelectedIndex; - selectedVC = self.viewControllers[tabBarSelectedIndex]; - [self tabBarController:self shouldSelectViewController:selectedVC]; + if ([self tabBarController:self shouldSelectViewController:selectedVC]) { + self.selectedIndex = tabBarSelectedIndex; + } } return selectedVC; diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-non-framework-target-headers.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-non-framework-target-headers.hmap new file mode 100644 index 0000000..641c3d9 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-non-framework-target-headers.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-target-headers.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-target-headers.hmap new file mode 100644 index 0000000..641c3d9 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-target-headers.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-generated-files.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-generated-files.hmap new file mode 100644 index 0000000..dd8b535 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-generated-files.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-own-target-headers.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-own-target-headers.hmap new file mode 100644 index 0000000..cd9e899 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-own-target-headers.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-project-headers.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-project-headers.hmap new file mode 100644 index 0000000..cd9e899 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-project-headers.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit.hmap b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit.hmap new file mode 100644 index 0000000..6bed08a Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit.hmap differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.d b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.d new file mode 100644 index 0000000..8ba2b2f --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.d @@ -0,0 +1,4 @@ +dependencies: \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarController.m \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarController.h \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.h diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.dia b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.dia new file mode 100644 index 0000000..29ccd98 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.dia differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.o b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.o new file mode 100644 index 0000000..08f53d9 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.o differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.d b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.d new file mode 100644 index 0000000..f3a1669 --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.d @@ -0,0 +1,3 @@ +dependencies: \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.m \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.h diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.dia b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.dia new file mode 100644 index 0000000..29ccd98 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.dia differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.o b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.o new file mode 100644 index 0000000..01a9468 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.o differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarKit.LinkFileList b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarKit.LinkFileList new file mode 100644 index 0000000..01df143 --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarKit.LinkFileList @@ -0,0 +1,2 @@ +/Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.o +/Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.o diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/libJMTabBarKit.a b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/libJMTabBarKit.a new file mode 100644 index 0000000..a1a5806 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/libJMTabBarKit.a differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.d b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.d new file mode 100644 index 0000000..8ba2b2f --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.d @@ -0,0 +1,4 @@ +dependencies: \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarController.m \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarController.h \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.h diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.dia b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.dia new file mode 100644 index 0000000..29ccd98 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.dia differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.o b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.o new file mode 100644 index 0000000..07e4be9 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.o differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.d b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.d new file mode 100644 index 0000000..f3a1669 --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.d @@ -0,0 +1,3 @@ +dependencies: \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.m \ + /Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/JMTabBarKit/JMTabBarItem.h diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.dia b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.dia new file mode 100644 index 0000000..29ccd98 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.dia differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.o b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.o new file mode 100644 index 0000000..4db3ff2 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.o differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarKit.LinkFileList b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarKit.LinkFileList new file mode 100644 index 0000000..a7fa84b --- /dev/null +++ b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarKit.LinkFileList @@ -0,0 +1,2 @@ +/Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.o +/Users/James/Git/James/OC/GitHub/JMTabBarKit/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.o diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/libJMTabBarKit.a b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/libJMTabBarKit.a new file mode 100644 index 0000000..b18eef2 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/libJMTabBarKit.a differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/dgph b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/dgph new file mode 100644 index 0000000..bc63d11 Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/dgph differ diff --git a/JMTabBarKit/build/JMTabBarKit.build/Debug-iphonesimulator/JMTabBarKit.build/dgph b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphonesimulator/JMTabBarKit.build/dgph new file mode 100644 index 0000000..6346ddf Binary files /dev/null and b/JMTabBarKit/build/JMTabBarKit.build/Debug-iphonesimulator/JMTabBarKit.build/dgph differ diff --git a/JMTabBarKitTest.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate b/JMTabBarKitTest.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate index 2af634c..94b608a 100644 Binary files a/JMTabBarKitTest.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate and b/JMTabBarKitTest.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/JMTabBarKitTest/AppDelegate.m b/JMTabBarKitTest/AppDelegate.m index dd0494f..2081a2b 100644 --- a/JMTabBarKitTest/AppDelegate.m +++ b/JMTabBarKitTest/AppDelegate.m @@ -80,7 +80,7 @@ - (void)setupJMTabBar { [tabArray addObject:item3]; - NSDictionary *selectedStyleDic = @{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: [UIColor colorWithRed:255.0/255.0 green:73.0/255.0 blue:0.0/255.0 alpha:1.0]}; + NSDictionary *selectedStyleDic = @{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: [UIColor colorWithRed:0 green:152.0/255.0 blue:0 alpha:1.0]}; NSDictionary *unSelectedStyleDic = @{NSFontAttributeName: [UIFont systemFontOfSize:12], NSForegroundColorAttributeName: [UIColor colorWithRed:74.0f/255.0f green:74.0f/255.0f blue:74.0f/255.0f alpha:1.0]};