Merge pull request #719 from RocketChat/chore/show_loader_connecting.713

[NEW] Show activity indicator when connecting to the server in the status banner
RocketChat · Sep 25, 2017 · 7779655 · 7779655
2 parents f4400d2 + bc5131d
commit 7779655
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/Rocket.Chat/Controllers/Chat/ChatControllerHeaderStatus.swift b/Rocket.Chat/Controllers/Chat/ChatControllerHeaderStatus.swift
@@ -14,6 +14,7 @@ extension ChatViewController {
         chatHeaderViewStatus?.removeFromSuperview()
 
         if let headerView = ChatHeaderViewStatus.instantiateFromNib() {
+            headerView.delegate = self
             headerView.translatesAutoresizingMaskIntoConstraints = false
             headerView.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: 44)
             view.addSubview(headerView)
@@ -47,3 +48,23 @@ extension ChatViewController {
     }
 
 }
+
+// MARK: ChatHeaderViewStatusDelegate
+
+extension ChatViewController: ChatHeaderViewStatusDelegate {
+
+    func viewStatusButtonRefreshDidPressed(_ view: ChatHeaderViewStatus) {
+        view.activityIndicator.startAnimating()
+        view.buttonRefresh.isHidden = true
+
+        SocketManager.reconnect()
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
+            if !SocketManager.isConnected() {
+                view.activityIndicator.stopAnimating()
+                view.buttonRefresh.isHidden = false
+            }
+        }
+    }
+
+}
diff --git a/Rocket.Chat/Views/Chat/ChatHeaderViewStatus.swift b/Rocket.Chat/Views/Chat/ChatHeaderViewStatus.swift
@@ -8,10 +8,16 @@
 
 import UIKit
 
+protocol ChatHeaderViewStatusDelegate: class {
+    func viewStatusButtonRefreshDidPressed(_ view: ChatHeaderViewStatus)
+}
+
 final class ChatHeaderViewStatus: UIView {
 
     static let defaultHeight = CGFloat(44)
 
+    weak var delegate: ChatHeaderViewStatusDelegate?
+
     @IBOutlet weak var labelTitle: UILabel! {
         didSet {
             labelTitle.lineBreakMode = .byTruncatingMiddle
@@ -32,7 +38,7 @@ final class ChatHeaderViewStatus: UIView {
     // MARK: IBAction
 
     @IBAction func buttonRefreshDidPressed(_ sender: Any) {
-        SocketManager.reconnect()
+        delegate?.viewStatusButtonRefreshDidPressed(self)
     }
 
 }