From 721adf5d1984386985f32155f9c6dc45513850b7 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 23 Oct 2014 16:40:49 -0700 Subject: [PATCH] Fixing bug with showing progress bar on ios. --- clients/ios/Classes/OriginalStoryViewController.h | 1 + clients/ios/Classes/OriginalStoryViewController.m | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/clients/ios/Classes/OriginalStoryViewController.h b/clients/ios/Classes/OriginalStoryViewController.h index e21febb71..f551a0134 100644 --- a/clients/ios/Classes/OriginalStoryViewController.h +++ b/clients/ios/Classes/OriginalStoryViewController.h @@ -34,6 +34,7 @@ UIGestureRecognizerDelegate, NJKWebViewProgressDelegate> { //@property (strong, nonatomic) SloppySwiper *swiper; @property (nonatomic) NJKWebViewProgressView *progressView; +- (void)resetProgressBar; - (void)loadInitialStory; - (IBAction) doOpenActionSheet:(id)sender; - (IBAction)loadAddress:(id)sender; diff --git a/clients/ios/Classes/OriginalStoryViewController.m b/clients/ios/Classes/OriginalStoryViewController.m index 504658700..847dec1b5 100644 --- a/clients/ios/Classes/OriginalStoryViewController.m +++ b/clients/ios/Classes/OriginalStoryViewController.m @@ -42,9 +42,6 @@ [super viewDidAppear:animated]; [self.navigationController.navigationBar addSubview:progressView]; - progressView.progressBarView.alpha = 0.0f; - [progressView setProgress:0 animated:NO]; - [progressView setProgress:NJKInitialProgressValue animated:YES]; } - (void)viewWillDisappear:(BOOL)animated { @@ -72,7 +69,13 @@ return YES; } -- (void)viewDidLoad { +- (void)resetProgressBar { + progressView.progressBarView.alpha = 0.0f; + [progressView setProgress:0 animated:NO]; + [progressView setProgress:NJKInitialProgressValue animated:YES]; +} + +- (void)viewDidLoad { // self.navigationItem.title = [[appDelegate activeStory] objectForKey:@"story_title"]; [super viewDidLoad]; @@ -232,6 +235,7 @@ } - (void)loadInitialStory { + [self resetProgressBar]; [self loadAddress:nil]; titleView.text = [[[appDelegate activeStory] objectForKey:@"story_title"]