Skip to content

Commit

Permalink
Solved merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Flavio De Stefano committed Jul 28, 2016
1 parent 7ab854e commit 271032a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
8 changes: 7 additions & 1 deletion apidoc/Titanium/UI/iOS/iOS.yml
Expand Up @@ -1537,6 +1537,12 @@ properties:
type: Boolean
since: "5.4.0"

- name: statusBarBackgroundColor
summary: Sets the global status bar background color for the application.
type: String
since: "6.0.0"
default: Undefined (Uses the native defaults)

methods:
- name: createTransitionAnimation
summary: |
Expand Down Expand Up @@ -1633,7 +1639,7 @@ properties:
summary: Animation to hide the current window.
type: Titanium.UI.Animation

- name: tranistionTo
- name: transitionTo
summary: Animation to show the new window.
type: Titanium.UI.Animation

11 changes: 11 additions & 0 deletions iphone/Classes/TiUIiOSProxy.m
Expand Up @@ -125,6 +125,17 @@ -(NSNumber*)forceTouchSupported
return NUMBOOL([TiUtils forceTouchSupported]);
}

-(void)setStatusBarBackgroundColor:(id)value
{
ENSURE_UI_THREAD(setStatusBarBackgroundColor, value);
ENSURE_SINGLE_ARG(value, NSString);

UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
if ([statusBar respondsToSelector:@selector(setBackgroundColor:)]) {
statusBar.backgroundColor = [[TiUtils colorValue:value] _color];
}
}

-(NSNumber*)SCROLL_DECELERATION_RATE_NORMAL
{
return NUMFLOAT(UIScrollViewDecelerationRateNormal);
Expand Down

0 comments on commit 271032a

Please sign in to comment.