Skip to content

Commit

Permalink
文字颜色修改
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaobs
xiaobs committed Dec 6, 2016
1 parent 215070e commit 485936e
Show file tree
Hide file tree
Showing 27 changed files with 22 additions and 4 deletions.
6 changes: 3 additions & 3 deletions JMTabBarKit/JMTabBarKit/JMTabBarController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file added ....build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-non-framework-target-headers.hmap
View file
Binary file not shown.
Binary file added ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-all-target-headers.hmap
View file
Binary file not shown.
Binary file added ...build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-generated-files.hmap
View file
Binary file not shown.
Binary file added ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-own-target-headers.hmap
View file
Binary file not shown.
Binary file added ...build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit-project-headers.hmap
View file
Binary file not shown.
Binary file added JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/JMTabBarKit.hmap
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions ...abBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.d
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added ...BarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.dia
View file
Binary file not shown.
Binary file added ...abBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarController.o
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.d
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added .../JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.dia
View file
Binary file not shown.
Binary file added ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarItem.o
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions ...rKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/JMTabBarKit.LinkFileList
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added .../JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/arm64/libJMTabBarKit.a
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions ...abBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.d
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added ...BarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.dia
View file
Binary file not shown.
Binary file added ...abBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarController.o
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.d
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added .../JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.dia
View file
Binary file not shown.
Binary file added ...ld/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarItem.o
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions ...rKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/JMTabBarKit.LinkFileList
View file
Original file line number Diff line number Diff line change
@@ -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
Binary file added .../JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/Objects-normal/armv7/libJMTabBarKit.a
View file
Binary file not shown.
Binary file added JMTabBarKit/build/JMTabBarKit.build/Debug-iphoneos/JMTabBarKit.build/dgph
View file
Binary file not shown.
Binary file added JMTabBarKit/build/JMTabBarKit.build/Debug-iphonesimulator/JMTabBarKit.build/dgph
View file
Binary file not shown.
Binary file modified ...xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion JMTabBarKitTest/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]};

Expand Down

0 comments on commit 485936e

Please sign in to comment.