Navigation bar hidden upon connection completed.

pull/1/head
Christine Corbett 10 years ago committed by Frederic Jacobs
parent d912471a94
commit be6c412cd2

@ -94,7 +94,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
APDropDownNavToolbar: APDropDownNavToolbar:
:commit: cf63307d5e3833b16caa9a07f3b5ea06359913f9 :commit: 98a606b343c0ccc6cca1cd243b296325716f21e7
:git: https://github.com/corbett/APDropDownNavToolbar.git :git: https://github.com/corbett/APDropDownNavToolbar.git
JSQMessagesViewController: JSQMessagesViewController:
:commit: bfb0c58785b33fa30ac3c88ef38477e49a674912 :commit: bfb0c58785b33fa30ac3c88ef38477e49a674912

@ -21,7 +21,6 @@ static double const STALLED_PROGRESS = 0.9;
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
[self initializeSocketStatusBar];
[self initializeObserver]; [self initializeObserver];
[TSSocketManager sendNotification]; [TSSocketManager sendNotification];
} }
@ -38,6 +37,7 @@ static double const STALLED_PROGRESS = 0.9;
CGRect bar = self.navigationBar.frame; CGRect bar = self.navigationBar.frame;
_socketStatusView.frame = CGRectMake(0, bar.size.height-1.0f, self.view.frame.size.width, 1.0f); _socketStatusView.frame = CGRectMake(0, bar.size.height-1.0f, self.view.frame.size.width, 1.0f);
_socketStatusView.progress = 0.0f; _socketStatusView.progress = 0.0f;
_socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor];
[self.navigationBar addSubview:_socketStatusView]; [self.navigationBar addSubview:_socketStatusView];
} }
@ -60,19 +60,23 @@ static double const STALLED_PROGRESS = 0.9;
-(void)socketDidOpen -(void)socketDidOpen
{ {
[_updateStatusTimer invalidate]; [_updateStatusTimer invalidate];
_socketStatusView.progress = 0.0f; for(UIView* view in self.navigationBar.subviews) {
_socketStatusView.hidden = YES; if([view isKindOfClass:[UIProgressView class]]) {
[view removeFromSuperview];
_socketStatusView = nil;
}
}
} }
-(void)socketDidClose -(void)socketDidClose
{ {
_socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor]; if(_socketStatusView==nil) {
if(_socketStatusView.progress >= STALLED_PROGRESS) { [self initializeSocketStatusBar];
[ _updateStatusTimer invalidate];
}
else {
_socketStatusView.hidden = NO;
_updateStatusTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(updateSocketConnecting) userInfo:nil repeats:YES]; _updateStatusTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(updateSocketConnecting) userInfo:nil repeats:YES];
}
else if(_socketStatusView.progress >= STALLED_PROGRESS) {
[ _updateStatusTimer invalidate];
} }
} }
@ -82,9 +86,7 @@ static double const STALLED_PROGRESS = 0.9;
} }
-(void)socketIsConnecting{ -(void)socketIsConnecting{
_socketStatusView.hidden = NO; // Nothing to see here currently
_socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor];
} }

Loading…
Cancel
Save