Merge pull request #4750 from vishalduggal/timob-11876

[TIMOB-11876] Support for custom shadow image of nav bar
tidev · Oct 7, 2013 · aedb7a9 · aedb7a9
2 parents 97ea321 + d47939d
commit aedb7a9
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 44 deletions.
diff --git a/apidoc/Titanium/UI/Window.yml b/apidoc/Titanium/UI/Window.yml
@@ -256,6 +256,10 @@ properties:
 
   - name: barImage
     summary: Background image for the nav bar, specified as a URL to a local image.
+    description: |
+        The behavior of this API on iOS has changed from version 3.2.0. Previous versions
+        of the SDK created a custom image view and inserted it as a child of the navigation bar.
+        The titanium sdk now uses the native call to set the background image of the navigation bar.
     platforms: [iphone, ipad, mobileweb, tizen]
     type: String
 
@@ -339,6 +343,15 @@ properties:
     type: Boolean
     default: false
 
+  - name: hideShadow
+    summary: Set this to true to hide the shadow image of the navigation bar.
+    description: |
+        This property is only honored if a valid value is specified for the [barImage](Titanium.UI.Window.barImage) property.
+    platforms: [iphone, ipad]
+    type: Boolean
+    default: false
+    since: 3.2.0
+
   - name: left
     summary: Window's left position, in platform-specific units.
     description: |
@@ -556,6 +569,14 @@ properties:
     platforms: [iphone, ipad, mobileweb, tizen]
     type: Titanium.UI.View
 
+  - name: shadowImage
+    summary: Shadow image for the navigation bar, specified as a URL to a local image..
+    description: |
+        This property is only honored if a valid value is specified for the [barImage](Titanium.UI.Window.barImage) property.
+    platforms: [iphone, ipad]
+    type: String
+    since: 3.2.0
+
   - name: statusBarStyle
     summary: The status bar style associated with this window. 
     description: |

diff --git a/apidoc/Titanium/UI/iOS/NavigationWindow.yml b/apidoc/Titanium/UI/iOS/NavigationWindow.yml
@@ -21,7 +21,7 @@ excludes:
     properties: [navBarHidden, tabBarHidden, navTintColor, translucent, toolbar,
                 barColor, barImage, leftNavButton, rightNavButton, title, titleControl,
                 titlePrompt, titleImage, titleid, titlepromptid, url, backButtonTitle,
-                backButtonTitleImage]
+                backButtonTitleImage, shadowImage, hideShadow]
 
 properties:
   - name: window

diff --git a/iphone/Classes/TiUIWindowProxy.m b/iphone/Classes/TiUIWindowProxy.m
@@ -272,14 +272,6 @@ -(BOOL)_handleClose:(id)args
 -(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
     [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-    //Update the barImage here as well. Might have the wrong bounds but that will be corrected
-    //in the call from frameSizeChanged in TiUIWindow. Avoids the visual glitch
-    if ( (shouldUpdateNavBar) && (controller != nil) && ([controller navigationController] != nil) ) {
-        id barImageValue = [self valueForKey:@"barImage"];
-        if ((barImageValue != nil) && (barImageValue != [NSNull null])) {
-            [self updateBarImage];
-        }
-    }
     [self willChangeSize];
 }
 
@@ -379,39 +371,65 @@ -(void)setBarColor:(id)colorString
     }
 }
 
+
+
 -(void)updateBarImage
 {
-	UINavigationBar * ourNB = [[controller navigationController] navigationBar];
-	CGRect barFrame = [ourNB bounds];
-	UIImage * newImage = [TiUtils toImage:[self valueForUndefinedKey:@"barImage"]
-                                    proxy:self size:barFrame.size];
-
-    if (newImage == nil) {
-        [barImageView removeFromSuperview];
-        RELEASE_TO_NIL(barImageView);
+    if (controller == nil || [controller navigationController] == nil || !shouldUpdateNavBar) {
         return;
     }
-    if (barImageView == nil) {
-        barImageView = [[UIImageView alloc]initWithImage:newImage];
+
+    id barImageValue = [self valueForUndefinedKey:@"barImage"];
+
+    UINavigationBar* ourNB = [[controller navigationController] navigationBar];
+    UIImage* theImage = [TiUtils toImage:barImageValue proxy:self];
+
+    if (theImage == nil) {
+        [ourNB setBackgroundImage:nil forBarMetrics:UIBarMetricsDefault];
     } else {
-        [barImageView setImage:newImage];
-    }
-    [barImageView setFrame:barFrame];
-    int barImageViewIndex = 0;
-    if ([ourNB respondsToSelector:@selector(setBackgroundImage:forBarMetrics:)]) {
-        //We should ideally be using the setBackgroundImage:forBarMetrics:
-        //method. Revisit after 1.8.1 release
-        barImageViewIndex = 1;
-    }
-    if ([[ourNB subviews] indexOfObject:barImageView] != barImageViewIndex) {
-        [ourNB insertSubview:barImageView atIndex:barImageViewIndex];
+        UIImage* resizableImage = [theImage resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch];
+        [ourNB setBackgroundImage:resizableImage forBarMetrics:UIBarMetricsDefault];
+        //You can only set up the shadow image with a custom background image.
+        id shadowImageValue = [self valueForUndefinedKey:@"shadowImage"];
+        theImage = [TiUtils toImage:shadowImageValue proxy:self];
+
+        if (theImage != nil) {
+            UIImage* resizableImage = [theImage resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch];
+            ourNB.shadowImage = resizableImage;
+        } else {
+            BOOL clipValue = [TiUtils boolValue:[self valueForUndefinedKey:@"hideShadow"] def:NO];
+            if (clipValue) {
+                //Set an empty Image.
+                ourNB.shadowImage = [[[UIImage alloc] init] autorelease];
+            } else {
+                ourNB.shadowImage = nil;
+            }
+        }
     }
 
 }
 
 -(void)setBarImage:(id)value
 {
-	[self replaceValue:[self sanitizeURL:value] forKey:@"barImage" notification:NO];
+	[self replaceValue:value forKey:@"barImage" notification:NO];
+	if (controller!=nil)
+	{
+		TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO);
+	}
+}
+
+-(void)setShadowImage:(id)value
+{
+	[self replaceValue:value forKey:@"shadowImage" notification:NO];
+	if (controller!=nil)
+	{
+		TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO);
+	}
+}
+
+-(void)setHideShadow:(id)value
+{
+	[self replaceValue:value forKey:@"hideShadow" notification:NO];
 	if (controller!=nil)
 	{
 		TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO);
@@ -458,8 +476,7 @@ -(void)setRightNavButton:(id)proxy withObject:(id)properties
 				// add the new one
                 BOOL animated = [TiUtils boolValue:@"animated" properties:properties def:NO];
                 [controller.navigationItem setRightBarButtonItem:[proxy barButtonItem] animated:animated];
-                [self updateBarImage];
-			}
+            }
 			else 
 			{
 				controller.navigationItem.rightBarButtonItem = nil;
@@ -506,8 +523,7 @@ -(void)setLeftNavButton:(id)proxy withObject:(id)properties
 				// add the new one
                 BOOL animated = [TiUtils boolValue:@"animated" properties:properties def:NO];
                 [controller.navigationItem setLeftBarButtonItem:[proxy barButtonItem] animated:animated];
-                [self updateBarImage];
-			}
+            }
 			else 
 			{
 				controller.navigationItem.leftBarButtonItem = nil;
@@ -583,7 +599,6 @@ -(void)refreshBackButton
 	}
 	[[prevController navigationItem] setBackBarButtonItem:backButton];
 	[backButton release];
-    [self updateBarImage];
 }
 
 -(void)setBackButtonTitle:(id)proxy
@@ -619,10 +634,6 @@ -(void)updateNavBar
         if ([[self valueForKey:@"titleControl"] isKindOfClass:[TiViewProxy class]]) {
             [self updateTitleView];
         }
-        id barImageValue = [self valueForKey:@"barImage"];
-        if ((barImageValue != nil) && (barImageValue != [NSNull null])) {
-            [self updateBarImage];
-        }
     }, NO);
 }
 
@@ -664,8 +675,6 @@ -(void)updateTitleView
             //layout the titleControl children
             [titleControl layoutChildren:NO];
 
-            [self updateBarImage];
-
             return;
         }
         [oldProxy removeBarButtonView];
@@ -689,7 +698,6 @@ -(void)updateTitleView
     if (oldView != newTitleView) {
         [ourNavItem setTitleView:newTitleView];
     }
-	[self updateBarImage];
 }
 
 
@@ -862,7 +870,7 @@ -(void)setupWindowDecorations
     SETPROPOBJ(@"leftNavButton",setLeftNavButton);
     SETPROPOBJ(@"rightNavButton",setRightNavButton);
     SETPROPOBJ(@"toolbar",setToolbar);
-    SETPROP(@"barImage",setBarImage);
+    [self updateBarImage];
     [self refreshBackButton];
 
     id navBarHidden = [self valueForKey:@"navBarHidden"];