更新导航栏

JianChunyang · Feb 28, 2013 · e2beede · e2beede
1 parent 071645c
commit e2beede
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 77 deletions.
diff --git a/SegmentFault.xcodeproj/project.pbxproj b/SegmentFault.xcodeproj/project.pbxproj
diff --git a/SegmentFault/Delegates/SFAppDelegate.m b/SegmentFault/Delegates/SFAppDelegate.m
@@ -50,12 +50,13 @@ - (void)initNavigators
                                                                                                      @"listnewest", @"list",
                                                                                                      nil]]];
     UIButton *nNavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [nNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [nNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [nNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [nNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
     [nNavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
+    nNavBtn.showsTouchWhenHighlighted = YES;
     UIBarButtonItem *nBtnItem = [[UIBarButtonItem alloc] initWithCustomView:nNavBtn];
     self.newestNavigator.rootViewController.navigationItem.leftBarButtonItem = nBtnItem;
-    [self.newestNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.newestNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.newestNavigator.title = @"最新问题";
 
     self.hottestNavigator = [[UMNavigationController alloc] initWithRootViewControllerURL:[[NSURL URLWithString:@"sf://questionlist"]
@@ -64,12 +65,13 @@ - (void)initNavigators
                                                                                                       @"listhottest", @"list",
                                                                                                       nil]]];
     UIButton *hNavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [hNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [hNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [hNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [hNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
+    hNavBtn.showsTouchWhenHighlighted = YES;
     [hNavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *hBtnItem = [[UIBarButtonItem alloc] initWithCustomView:hNavBtn];
     self.hottestNavigator.rootViewController.navigationItem.leftBarButtonItem = hBtnItem;
-    [self.hottestNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.hottestNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.hottestNavigator.title = @"热门问题";
 
     self.followedQuestionsNavigator = [[UMNavigationController alloc] initWithRootViewControllerURL:[[NSURL URLWithString:@"sf://questionlist"]
@@ -79,12 +81,13 @@ - (void)initNavigators
                                                                                                       @"1", @"login",
                                                                                                       nil]]];
     UIButton *fQNavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [fQNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [fQNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [fQNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [fQNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
+    fQNavBtn.showsTouchWhenHighlighted = YES;
     [fQNavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *fQBtnItem = [[UIBarButtonItem alloc] initWithCustomView:fQNavBtn];
     self.followedQuestionsNavigator.rootViewController.navigationItem.leftBarButtonItem = fQBtnItem;
-    [self.followedQuestionsNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.followedQuestionsNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.followedQuestionsNavigator.title = @"标记的问题";
 
     self.userProfileNavigator = [[UMNavigationController alloc] initWithRootViewControllerURL:[[NSURL URLWithString:@"http://segmentfault.com/user/settings"]
@@ -93,12 +96,13 @@ - (void)initNavigators
                                                                                                            @"1", @"login",
                                                                                                            nil]]];
     UIButton *fTNavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [fTNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [fTNavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [fTNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [fTNavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
     [fTNavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
+    fTNavBtn.showsTouchWhenHighlighted = YES;
     UIBarButtonItem *fTBtnItem = [[UIBarButtonItem alloc] initWithCustomView:fTNavBtn];
     self.userProfileNavigator.rootViewController.navigationItem.leftBarButtonItem = fTBtnItem;
-    [self.userProfileNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.userProfileNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.userProfileNavigator.title = @"个人资料";
 
     self.logoutNavigator = [[UMNavigationController alloc] initWithRootViewControllerURL:[[NSURL URLWithString:@"sf://login"]
@@ -107,25 +111,27 @@ - (void)initNavigators
                                                                                                           @"1", @"login",
                                                                                                           nil]]];
     UIButton *lONavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [lONavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [lONavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [lONavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [lONavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
+    lONavBtn.showsTouchWhenHighlighted = YES;
     [lONavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *lOBtnItem = [[UIBarButtonItem alloc] initWithCustomView:lONavBtn];
     self.logoutNavigator.rootViewController.navigationItem.leftBarButtonItem = lOBtnItem;
-    [self.logoutNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.logoutNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.logoutNavigator.title = @"退出登录";
 
     self.loginNavigator = [[UMNavigationController alloc] initWithRootViewControllerURL:[[NSURL URLWithString:@"sf://login"]
                                                                                                     addParams:[NSDictionary dictionaryWithObjectsAndKeys:
                                                                                                                @"用户登录", @"title",
                                                                                                                nil]]];
     UIButton *lINavBtn = [[UIButton alloc] initWithFrame:NAVIGATION_BAR_BTN_RECT];
-    [lINavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button.png"] forState:UIControlStateNormal];
-    [lINavBtn setBackgroundImage:[UIImage imageNamed:@"slide_navigator_button_pressed.png"] forState:UIControlStateHighlighted];
+    [lINavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateNormal];
+    [lINavBtn setBackgroundImage:[UIImage imageNamed:@"nav_menu.png"] forState:UIControlStateHighlighted];
+    lINavBtn.showsTouchWhenHighlighted = YES;
     [lINavBtn addTarget:self.navigator action:@selector(slideButtonClicked) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *lIBtnItem = [[UIBarButtonItem alloc] initWithCustomView:lINavBtn];
     self.loginNavigator.rootViewController.navigationItem.leftBarButtonItem = lIBtnItem;
-    [self.loginNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"navigationbar_light_background.png"] forBarMetrics:UIBarMetricsDefault];
+    [self.loginNavigator.navigationBar setBackgroundImage:[UIImage imageNamed:@"nav_bar_bg.png"] forBarMetrics:UIBarMetricsDefault];
     self.loginNavigator.title = @"用户登录";
 }
 

diff --git a/SegmentFault/Support/URLManager b/SegmentFault/Support/URLManager
diff --git a/SegmentFault/ViewControllers/Base/SFRootViewController.m b/SegmentFault/ViewControllers/Base/SFRootViewController.m
@@ -45,8 +45,9 @@ - (void)openedFromViewControllerWithURL:(NSURL *)aUrl
 {
     UIButton *navBtn = [[UIButton alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 32.0f, 32.0f)];
     [navBtn addTarget:self action:@selector(back) forControlEvents:UIControlEventTouchUpInside];
-    [navBtn setBackgroundImage:[UIImage imageNamed:@"back_button_background.png"] forState:UIControlStateNormal];
-    [navBtn setBackgroundImage:[UIImage imageNamed:@"back_button_pressed_background.png"] forState:UIControlStateHighlighted];
+    [navBtn setBackgroundImage:[UIImage imageNamed:@"nav_back.png"] forState:UIControlStateNormal];
+    [navBtn setBackgroundImage:[UIImage imageNamed:@"nav_back.png"] forState:UIControlStateHighlighted];
+    navBtn.showsTouchWhenHighlighted = YES;
     UIBarButtonItem *btnItem = [[UIBarButtonItem alloc] initWithCustomView:navBtn];
     self.navigationItem.leftBarButtonItem = btnItem;
 }
@@ -80,7 +81,9 @@ - (void)viewDidLoad
     label.backgroundColor = [UIColor clearColor];
     label.font = [UIFont boldSystemFontOfSize:20.0];
     label.textAlignment = NSTextAlignmentCenter;
-    label.textColor = RGBCOLOR(92.0f, 92.0f, 92.0f);
+    label.textColor = RGBCOLOR(33.0f, 33.0f, 33.0f);
+    label.shadowOffset = CGSizeMake(0.0f, 1.0f);
+    label.shadowColor = [UIColor whiteColor];
     self.navigationItem.titleView = label;
     label.text = self.params[@"title"];
     [label sizeToFit];

diff --git a/SegmentFault/ViewControllers/Base/SFWebViewController.m b/SegmentFault/ViewControllers/Base/SFWebViewController.m
@@ -44,8 +44,9 @@ - (void)openedFromViewControllerWithURL:(NSURL *)aUrl
 {
     UIButton *navBtn = [[UIButton alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 32.0f, 32.0f)];
     [navBtn addTarget:self action:@selector(back) forControlEvents:UIControlEventTouchUpInside];
-    [navBtn setBackgroundImage:[UIImage imageNamed:@"back_button_background.png"] forState:UIControlStateNormal];
-    [navBtn setBackgroundImage:[UIImage imageNamed:@"back_button_pressed_background.png"] forState:UIControlStateHighlighted];
+    [navBtn setBackgroundImage:[UIImage imageNamed:@"nav_back.png"] forState:UIControlStateNormal];
+    [navBtn setBackgroundImage:[UIImage imageNamed:@"nav_back.png"] forState:UIControlStateHighlighted];
+    navBtn.showsTouchWhenHighlighted = YES;
     UIBarButtonItem *btnItem = [[UIBarButtonItem alloc] initWithCustomView:navBtn];
     self.navigationItem.leftBarButtonItem = btnItem;
 }

diff --git a/SegmentFault/ViewControllers/Nav/SFSlideNavViewController.m b/SegmentFault/ViewControllers/Nav/SFSlideNavViewController.m
@@ -79,26 +79,18 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     if (cell == nil) {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier];
 
-        UIImageView *bg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav-cell-bg.png"]];
-        UIImageView *chevron = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav-cell-arrow.png"]];;
+        UIImageView *bg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav_cell_bg.png"]];
+        UIImageView *chevron = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav_cell_arrow.png"]];;
 
         bg.frame = CGRectMake(0.0f, 0.0f, 320.0f, CELL_HEIGHT);
         chevron.frame = CGRectMake(235.0f, 14.0f, 15.0f, 15.0f);
-        chevron.layer.shadowColor = [UIColor blackColor].CGColor;
-        chevron.layer.shadowOffset = CGSizeMake(0.0f, -1.0f);
-        chevron.layer.shadowOpacity= 1.0f;
-        chevron.layer.shadowRadius= 0.0f;
         [bg addSubview:chevron];
         cell.backgroundView = bg;
 
-        UIImageView *selectedBg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav-cell-bg-active.png"]];
+        UIImageView *selectedBg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav_cell_bg_active.png"]];
         selectedBg.frame = CGRectMake(0.0f, 0.0f, 320.0f, CELL_HEIGHT);
-        UIImageView *selectedChevron = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav-cell-arrow-active.png"]];
+        UIImageView *selectedChevron = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav_cell_arrow_active.png"]];
         selectedChevron.frame = CGRectMake(235.0f, 14.0f, 15.0f, 15.0f);
-        selectedChevron.layer.shadowColor = [UIColor blackColor].CGColor;
-        selectedChevron.layer.shadowOffset = CGSizeMake(0.0f, -1.0f);
-        selectedChevron.layer.shadowOpacity= 1.0f;
-        selectedChevron.layer.shadowRadius= 0.0f;
         [selectedBg addSubview:selectedChevron];
         cell.selectedBackgroundView = selectedBg;
 
@@ -175,7 +167,7 @@ - (void)viewDidLoad
     [fault sizeToFit];
     [self.slideView.tableHeaderView addSubview:fault];
 
-    self.slideView.tableFooterView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav-cell-bg.png"]];
+    self.slideView.tableFooterView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"nav_cell_bg.png"]];
 
     if (nil == self.loadedRootViewControllers) {
         self.loadedRootViewControllers = [[NSMutableSet alloc] initWithObjects:self.items[self.currentIndex.section][self.currentIndex.row], nil];

diff --git a/SegmentFault/images/nav/slide_navigator_shadow.png b/SegmentFault/images/nav/slide_navigator_shadow.png
diff --git a/SegmentFault/images/nav/[email protected] b/SegmentFault/images/nav/[email protected]
diff --git a/SegmentFault/imagesV2/nav/nav_back.png b/SegmentFault/imagesV2/nav/nav_back.png
diff --git a/SegmentFault/imagesV2/nav/[email protected] b/SegmentFault/imagesV2/nav/[email protected]
diff --git a/SegmentFault/imagesV2/nav/nav_bar_bg.png b/SegmentFault/imagesV2/nav/nav_bar_bg.png
diff --git a/SegmentFault/imagesV2/nav/[email protected] b/SegmentFault/imagesV2/nav/[email protected]
diff --git a/SegmentFault/imagesV2/nav/nav-cell-arrow.png → SegmentFault/imagesV2/nav/nav_cell_arrow.png b/SegmentFault/imagesV2/nav/nav-cell-arrow.png → SegmentFault/imagesV2/nav/nav_cell_arrow.png
diff --git a/...tFault/imagesV2/nav/[email protected] → ...tFault/imagesV2/nav/[email protected] b/...tFault/imagesV2/nav/[email protected] → ...tFault/imagesV2/nav/[email protected]
diff --git a/...lt/imagesV2/nav/nav-cell-arrow-active.png → ...lt/imagesV2/nav/nav_cell_arrow_active.png b/...lt/imagesV2/nav/nav-cell-arrow-active.png → ...lt/imagesV2/nav/nav_cell_arrow_active.png
diff --git a/...imagesV2/nav/[email protected] → ...imagesV2/nav/[email protected] b/...imagesV2/nav/[email protected] → ...imagesV2/nav/[email protected]
diff --git a/SegmentFault/imagesV2/nav/nav-cell-bg.png → SegmentFault/imagesV2/nav/nav_cell_bg.png b/SegmentFault/imagesV2/nav/nav-cell-bg.png → SegmentFault/imagesV2/nav/nav_cell_bg.png
diff --git a/SegmentFault/imagesV2/nav/[email protected] → SegmentFault/imagesV2/nav/[email protected] b/SegmentFault/imagesV2/nav/[email protected] → SegmentFault/imagesV2/nav/[email protected]
diff --git a/...Fault/imagesV2/nav/nav-cell-bg-active.png → ...Fault/imagesV2/nav/nav_cell_bg_active.png b/...Fault/imagesV2/nav/nav-cell-bg-active.png → ...Fault/imagesV2/nav/nav_cell_bg_active.png
diff --git a/...lt/imagesV2/nav/[email protected] → ...lt/imagesV2/nav/[email protected] b/...lt/imagesV2/nav/[email protected] → ...lt/imagesV2/nav/[email protected]
diff --git a/SegmentFault/imagesV2/nav/nav_menu.png b/SegmentFault/imagesV2/nav/nav_menu.png
diff --git a/SegmentFault/imagesV2/nav/[email protected] b/SegmentFault/imagesV2/nav/[email protected]
+ −		URLManager/slide_navigator_shadow.png
+ −		URLManager/[email protected]