Updated progress bar will react to state changes

Author: Dzejkop

Assets/PatchKit Patcher/Scripts/UI/ProgressBar.cs

@@ -11,6 +11,12 @@ public class ProgressBar : MonoBehaviour
 
         public Image Image;
 
+        private struct UpdateData
+        {
+            public double Progress;
+            public PatcherState State;
+        }
+
         private void SetBar(float start, float end)
         {
             var anchorMax = Image.rectTransform.anchorMax;
@@ -23,15 +29,32 @@ private void SetBar(float start, float end)
             Image.rectTransform.anchorMin = anchorMin;
         }
 
-        private void SetProgress(double progress)
+        private void SetProgress(UpdateData data)
         {
-            if (progress <= 0 && _isIdle)
+            if (data.State == PatcherState.None)
+            {
+                Text.text = "";
+                _isIdle = false;
+                SetBar(0, 0);
+                return;
+            }
+
+            if (data.State == PatcherState.DisplayingError)
+            {
+                Text.text = "Error!";
+                _isIdle = false;
+                SetBar(0, 0);
+                return;
+            }
+
+            if (data.State == PatcherState.Connecting)
             {
                 Text.text = "Connecting...";
+                _isIdle = true;
                 return;
             }
 
-            _isIdle = false;
+            double progress = data.Progress;
 
             Text.text = progress >= 0.0 ? progress.ToString("0.0%") : "";
             float visualProgress = progress >= 0.0 ? (float) progress : 0.0f;
@@ -41,15 +64,18 @@ private void SetProgress(double progress)
 
         private void Start()
         {
-            Patcher.Instance.UpdaterStatus
-                .SelectSwitchOrDefault(s => s.Progress, -1.0)
+            var progress = Patcher.Instance.UpdaterStatus
+                .SelectSwitchOrDefault(s => s.Progress, -1.0);
+
+            Patcher.Instance.State
+                .CombineLatest(progress, (state, d) => new UpdateData { Progress = d, State = state })
                 .ObserveOnMainThread()
                 .Subscribe(SetProgress)
                 .AddTo(this);
         }
 
 
-        private bool _isIdle = true;
+        private bool _isIdle = false;
         private const float IdleBarWidth = 0.2f;
         private const float IdleBarSpeed = 1.2f;
         private float _idleProgress = -IdleBarWidth;