Add loading indicators to brb

cuappdev · Jan 16, 2018 · b5946e4 · b5946e4
1 parent 8bc9673
commit b5946e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/Eatery/Controllers/BRB Feature/BRBConnectionHandler.swift b/Eatery/Controllers/BRB Feature/BRBConnectionHandler.swift
@@ -95,7 +95,7 @@ class BRBConnectionHandler: WKWebView, WKNavigationDelegate {
         getHTML { (html: NSString) in
             let tableHTMLRegex = "(<tr class=\\\"(?:even|odd|odd first-child)\\\"><td class=\\\"first-child account_name\\\">(.*?)<\\/td><td class=\\\"date_(and_|)time\\\"><span class=\\\"date\\\">(.*?)<\\/span><\\/td><td class=\\\"activity_details\\\">(.*?)<\\/td><td class=\\\"last-child amount_points (credit|debit)\\\" title=\\\"(credit|debit)\\\">(.*?)<\\/td><\\/tr>)"
 
-            let regex = try? NSRegularExpression(pattern: tableHTMLRegex as String, options: .useUnicodeWordBoundaries)
+            let regex = try? NSRegularExpression(pattern: tableHTMLRegex, options: .useUnicodeWordBoundaries)
             if let matches = regex?.matches(in: html as String, options: NSRegularExpression.MatchingOptions.withTransparentBounds , range: NSMakeRange(0, html.length))
             {
                 for match in matches

diff --git a/Eatery/Controllers/BRB Feature/BRBLoginView.swift b/Eatery/Controllers/BRB Feature/BRBLoginView.swift
@@ -1,4 +1,5 @@
 import UIKit
+import NVActivityIndicatorView
 
 protocol BRBLoginViewDelegate {
     func brbLoginViewClickedLogin(brbLoginView: BRBLoginView, netid: String, password: String)
@@ -18,7 +19,7 @@ class BRBLoginView: UIView, UITextFieldDelegate {
     let privacyStatementButton = UIButton()
     let privacyStatementTextView = UITextView()
 
-    var activityIndicator = UIActivityIndicatorView()
+    var activityIndicator: NVActivityIndicatorView!
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -160,8 +161,7 @@ class BRBLoginView: UIView, UITextFieldDelegate {
             make.height.equalTo(55)
         }
 
-        activityIndicator = UIActivityIndicatorView()
-        activityIndicator.color = .white
+        activityIndicator = NVActivityIndicatorView(frame: CGRect(x: 0.0, y: 0.0, width: 22.0, height: 22.0), type: .circleStrokeSpin, color: .white, padding: nil)
         addSubview(activityIndicator)
         activityIndicator.snp.makeConstraints { make in
             make.center.equalTo(loginButton)

diff --git a/Eatery/Controllers/BRB Feature/BRBViewController.swift b/Eatery/Controllers/BRB Feature/BRBViewController.swift
@@ -2,6 +2,7 @@ import UIKit
 import WebKit
 import SafariServices
 import Crashlytics
+import NVActivityIndicatorView
 
 class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDelegate, BRBAccountSettingsDelegate, UITableViewDelegate, UITableViewDataSource {
 
@@ -11,8 +12,7 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
     var timer: Timer!
 
     var tableView: UITableView!
-    let activityIndicatorView = UIActivityIndicatorView()
-    let activityIndicatorDescriptionLabel = UILabel()
+    var activityIndicatorView: NVActivityIndicatorView!
     let timeout = 30.0 // seconds
     var time = 0.0 // time of request
     var historyHeader : EateriesCollectionViewHeaderView?
@@ -35,12 +35,6 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
         }
 
         connectionHandler.delegate = self
-
-        activityIndicatorView.color = .black
-        activityIndicatorView.hidesWhenStopped = true
-        activityIndicatorDescriptionLabel.text = "Logging in, this may take a minute"
-        activityIndicatorDescriptionLabel.textAlignment = .center
-        activityIndicatorDescriptionLabel.font = UIFont.systemFont(ofSize: 12)
 
         navigationItem.rightBarButtonItem?.isEnabled = false
 
@@ -117,13 +111,8 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
     }
 
     func setupAccountPage() {
-
         diningHistory = connectionHandler.diningHistory
 
-        if diningHistory.count == 0 {
-            activityIndicatorView.startAnimating()
-        }
-
         navigationItem.rightBarButtonItem?.isEnabled = true
 
         tableView = UITableView(frame: .zero, style: .grouped)
@@ -139,6 +128,10 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
         tableView.snp.makeConstraints { make in
             make.top.edges.equalToSuperview()
         }
+
+        activityIndicatorView = NVActivityIndicatorView(frame: CGRect(x: 16.0, y: 8.0, width: 36.0, height: 36.0), type: .circleStrokeSpin, color: .gray)
+        activityIndicatorView.startAnimating()
+        tableView.tableFooterView = activityIndicatorView
     }
 
     /// MARK: Table view delegate/data source
@@ -240,6 +233,9 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
 
         let indexPaths = (0..<entries.count).map { IndexPath(row: $0, section: 1) }
         self.tableView.insertRows(at: indexPaths, with: .automatic)
+
+        tableView.tableFooterView = nil
+        activityIndicatorView.removeFromSuperview()
     }
 
     func showSafariVC() {
@@ -264,9 +260,6 @@ class BRBViewController: UIViewController, BRBConnectionDelegate, BRBLoginViewDe
             keychainItemWrapper["netid"] = loginView?.netidTextField.text! as AnyObject?
             keychainItemWrapper["password"] = loginView?.passwordTextField.text! as AnyObject?
         }
-
-        activityIndicatorView.stopAnimating()
-        activityIndicatorDescriptionLabel.removeFromSuperview()
 
         if loginView != nil {
             loginView?.superview?.removeFromSuperview()

diff --git a/Eatery/Controllers/EateriesViewController.swift b/Eatery/Controllers/EateriesViewController.swift
@@ -217,7 +217,7 @@ class EateriesViewController: UIViewController, MenuButtonsDelegate, CLLocationM
                     }, completion: nil)
                 }
 
-                UIView.animate(withDuration: 0.55) {
+                UIView.animate(withDuration: 0.35) {
                     self.activityIndicator.alpha = 0.0
                 }
             }