Merge pull request #8 from seapy/progressbar

Fogh · Fogh · commit b70186fca5ca · 2015-07-16T18:02:03.000+02:00
Add progressview under navigationbar
diff --git a/AFWebViewController/AFWebViewController.m b/AFWebViewController/AFWebViewController.m
@@ -17,6 +17,7 @@ @interface AFWebViewController () <WKNavigationDelegate>
 // Bar buttons
 @property (nonatomic, strong) UIBarButtonItem *backBarButtonItem, *forwardBarButtonItem, *refreshBarButtonItem, *stopBarButtonItem, *actionBarButtonItem;
 @property (nonatomic, strong) NSURLRequest *request;
+@property (nonatomic, strong) UIProgressView *progressView;
 @end
 
 @implementation AFWebViewController
@@ -73,6 +74,7 @@ - (void)loadRequest:(NSURLRequest *)request {
 - (void)dealloc
 {
     self.webView.navigationDelegate = nil;
+    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
 }
 
 - (void)loadView {
@@ -83,6 +85,7 @@ - (void)loadView {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self updateToolbarItems];
+    [self appendProgressView];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -111,6 +114,11 @@ - (void)viewDidDisappear:(BOOL)animated {
     [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
 }
 
+- (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
+    self.progressView.frame = CGRectMake(0, [self.topLayoutGuide length], self.view.frame.size.width, 0.5);
+}
+
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
         return YES;
@@ -168,6 +176,13 @@ - (UIBarButtonItem *)actionBarButtonItem {
     return _actionBarButtonItem;
 }
 
+- (UIProgressView *)progressView {
+    if (!_progressView) {
+        _progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
+    }
+    return _progressView;
+}
+
 #pragma mark - Toolbar
 
 - (void)updateToolbarItems {
@@ -260,6 +275,21 @@ - (void)actionButtonTapped:(id)sender {
     }
 }
 
+#pragma mark - ProgressView
+
+- (void)appendProgressView {
+    [self.view addSubview:self.progressView];
+    [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+    if ([keyPath isEqualToString:@"estimatedProgress"]) {
+        self.progressView.hidden = self.webView.estimatedProgress == 1;
+        float progress = self.progressView.hidden ? 0 : self.webView.estimatedProgress;
+        [self.progressView setProgress:progress animated:true];
+    }
+}
+
 #pragma mark - WKNavigation delegate
 
 - (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation {
