Skip to content

Added ability to customize how networkActivityIndicator is managed #81

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −7
Open

Added ability to customize how networkActivityIndicator is managed #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion SVWebViewController/SVModalWebViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

@class SVWebViewController;

@interface SVModalWebViewController : UINavigationController
@interface SVModalWebViewController : UINavigationController {
void(^_customSetNetworkActivityIndicatorVisible)(BOOL networkActivityIndicatorVisible);
}

@property (nonatomic, copy) void(^customSetNetworkActivityIndicatorVisible)(BOOL networkActivityIndicatorVisible);

- (id)initWithAddress:(NSString*)urlString;
- (id)initWithURL:(NSURL *)URL;
Expand Down
10 changes: 10 additions & 0 deletions SVWebViewController/SVModalWebViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ @interface SVModalWebViewController ()

@implementation SVModalWebViewController

@synthesize customSetNetworkActivityIndicatorVisible = _customSetNetworkActivityIndicatorVisible;

#pragma mark - Initialization


Expand Down Expand Up @@ -47,4 +49,12 @@ - (void)viewWillAppear:(BOOL)animated {
self.navigationBar.tintColor = self.barsTintColor;
}

#pragma mark - Accessors
-(void) setCustomSetNetworkActivityIndicatorVisible:(void (^)(BOOL))customSetNetworkActivityIndicatorVisible
{
_customSetNetworkActivityIndicatorVisible = customSetNetworkActivityIndicatorVisible;

self.webViewController.customSetNetworkActivityIndicatorVisible = customSetNetworkActivityIndicatorVisible;
}

@end
6 changes: 5 additions & 1 deletion SVWebViewController/SVWebViewController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

#import "SVModalWebViewController.h"

@interface SVWebViewController : UIViewController
@interface SVWebViewController : UIViewController {
void(^_customSetNetworkActivityIndicatorVisible)(BOOL networkActivityIndicatorVisible);
}

@property (copy) void(^customSetNetworkActivityIndicatorVisible)(BOOL networkActivityIndicatorVisible);

- (id)initWithAddress:(NSString*)urlString;
- (id)initWithURL:(NSURL*)URL;
Expand Down
22 changes: 17 additions & 5 deletions SVWebViewController/SVWebViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ - (void)actionButtonClicked:(UIBarButtonItem *)sender;

@implementation SVWebViewController

@synthesize customSetNetworkActivityIndicatorVisible = _customSetNetworkActivityIndicatorVisible;

#pragma mark - Initialization

- (void)dealloc {
[self.webView stopLoading];
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
[self setNetworkActivityIndicatorVisible:NO];
self.webView.delegate = nil;
}

Expand All @@ -63,6 +65,16 @@ - (void)loadURL:(NSURL *)pageURL {
[self.webView loadRequest:[NSURLRequest requestWithURL:pageURL]];
}

- (void)setNetworkActivityIndicatorVisible:(BOOL) networkActivityIndicatorVisible
{
if (self.customSetNetworkActivityIndicatorVisible != nil) {
self.customSetNetworkActivityIndicatorVisible(networkActivityIndicatorVisible);
return;
}

[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:networkActivityIndicatorVisible];
}

#pragma mark - View lifecycle

- (void)loadView {
Expand Down Expand Up @@ -105,7 +117,7 @@ - (void)viewWillDisappear:(BOOL)animated {

- (void)viewDidDisappear:(BOOL)animated {
[super viewDidDisappear:animated];
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
[self setNetworkActivityIndicatorVisible:NO];
}

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {
Expand Down Expand Up @@ -225,20 +237,20 @@ - (void)updateToolbarItems {
#pragma mark - UIWebViewDelegate

- (void)webViewDidStartLoad:(UIWebView *)webView {
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
[self setNetworkActivityIndicatorVisible:YES];
[self updateToolbarItems];
}


- (void)webViewDidFinishLoad:(UIWebView *)webView {
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
[self setNetworkActivityIndicatorVisible:NO];

self.navigationItem.title = [webView stringByEvaluatingJavaScriptFromString:@"document.title"];
[self updateToolbarItems];
}

- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
[self setNetworkActivityIndicatorVisible:NO];
[self updateToolbarItems];
}

Expand Down