Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-10678] iOS: Rename non-public APIs #2882

Merged
merged 2 commits into from
Sep 10, 2012
Merged

[TIMOB-10678] iOS: Rename non-public APIs #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb37bc6
[TIMOB-10678] rename _updateTitleBar => updateNavBar
Sep 7, 2012
463f479
rename _refreshBackButton => refreshBackButton
Sep 7, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIWindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ -(void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds

//Need the delay so that we get the right navbar bounds
TiProxy* windowProxy = [self proxy];
if ([windowProxy respondsToSelector:@selector(_updateTitleView)]) {
[windowProxy performSelector:@selector(_updateTitleView)
if ([windowProxy respondsToSelector:@selector(updateNavBar)]) {
[windowProxy performSelector:@selector(updateNavBar)
withObject:nil
afterDelay:[[UIApplication sharedApplication] statusBarOrientationAnimationDuration] ];
}
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIWindowProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
id latch;
}

-(void)_refreshBackButton;
-(void)_updateTitleView;
-(void)refreshBackButton;
-(void)updateNavBar;
-(void)boot:(BOOL)timeout args:(id)args;

@end
Expand Down
12 changes: 6 additions & 6 deletions iphone/Classes/TiUIWindowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ -(void)setBarColor:(id)colorString

UINavigationController * ourNC = [controller navigationController];
[TiUtils applyColor:newColor toNavigationController:ourNC];
[self performSelector:@selector(_refreshBackButton) withObject:nil afterDelay:0.0];
[self performSelector:@selector(refreshBackButton) withObject:nil afterDelay:0.0];
}
}

Expand Down Expand Up @@ -480,7 +480,7 @@ -(void)showTabBar:(id)value
[self setTabBarHidden:[NSNumber numberWithBool:NO]];
}

-(void)_refreshBackButton
-(void)refreshBackButton
{
ENSURE_UI_THREAD_0_ARGS;

Expand Down Expand Up @@ -527,7 +527,7 @@ -(void)setBackButtonTitle:(id)proxy
[self replaceValue:proxy forKey:@"backButtonTitle" notification:NO];
if (controller!=nil)
{
[self _refreshBackButton]; //Because this is actually a property of a DIFFERENT view controller,
[self refreshBackButton]; //Because this is actually a property of a DIFFERENT view controller,
//we can't attach this until we're in the navbar stack.
}
}
Expand All @@ -538,12 +538,12 @@ -(void)setBackButtonTitleImage:(id)proxy
[self replaceValue:proxy forKey:@"backButtonTitleImage" notification:NO];
if (controller!=nil)
{
[self _refreshBackButton]; //Because this is actually a property of a DIFFERENT view controller,
[self refreshBackButton]; //Because this is actually a property of a DIFFERENT view controller,
//we can't attach this until we're in the navbar stack.
}
}

-(void)_updateTitleView
-(void)updateNavBar
{
//Called from the view when the screen rotates.
//Resize titleControl and barImage based on navbar bounds
Expand Down Expand Up @@ -816,7 +816,7 @@ -(void)setupWindowDecorations
SETPROPOBJ(@"rightNavButton",setRightNavButton);
SETPROPOBJ(@"toolbar",setToolbar);
SETPROP(@"barImage",setBarImage);
[self _refreshBackButton];
[self refreshBackButton];

id navBarHidden = [self valueForKey:@"navBarHidden"];
if (navBarHidden!=nil)
Expand Down