Merge pull request #22 from coryleach/dev

ConfigureAwait changes to fix compatibility issues with WebGL

Author: coryleach

Demo/Demo.unitypackage

@@ -1,10 +1,16 @@
+<p align="center">
+<img align="center" src="https://raw.githubusercontent.com/coryleach/UnityPackages/master/Documentation/GameframeFace.gif" />
+</p>
 <h1 align="center">Gameframe.GUI 👋</h1>
+
+<!-- BADGE-START -->
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-3.0.5-blue.svg?cacheSeconds=2592000" />
+<img alt="Version" src="https://img.shields.io/badge/version-3.0.6-blue.svg?cacheSeconds=2592000" />
   <a href="https://twitter.com/Cory Leach">
     <img alt="Twitter: coryleach" src="https://img.shields.io/twitter/follow/coryleach.svg?style=social" target="_blank" />
   </a>
-</p>
+  </p>
+<!-- BADGE-END -->
 
 This is a library of GUI helpers for UGUI    
 Includes a panel system that implements a navigation stack.    
@@ -16,15 +22,15 @@ Includes a SRP shader for blurring the background of UI panels.
 #### Using UnityPackageManager (for Unity 2019.3 or later)
 Open the package manager window (menu: Window > Package Manager)<br/>
 Select "Add package from git URL...", fill in the pop-up with the following link:<br/>
-https://github.com/coryleach/UnityGUI.git#3.0.5<br/>
+https://github.com/coryleach/UnityGUI.git#3.0.6<br/>
 
 #### Using UnityPackageManager (for Unity 2019.1 or later)
 
 Find the manifest.json file in the Packages folder of your project and edit it to look like this:
 ```js
 {
   "dependencies": {
-    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.5",
+    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.6",
     ...
   },
 }
@@ -78,8 +84,8 @@ Contains information about a panel and is used by the PanelViewController to loc
 
 
 ## Show your support
-
 Give a ⭐️ if this project helped you!
 
+
 ***
 _This README was generated with ❤️ by [Gameframe.Packages](https://github.com/coryleach/unitypackages)_

README.md

@@ -58,7 +58,7 @@ public async Task TransitionAsync()
                 }
 
                 //Load Views
-                await LoadViews(showControllers).ConfigureAwait(true);
+                await LoadViews(showControllers);
 
                 //Sort Views so things overlay property
                 SortViews();
@@ -70,7 +70,7 @@ public async Task TransitionAsync()
                 ListPool<IPanelViewController>.Release(activeControllers);
                 activeControllers = showControllers;
 
-                await transitionTask.ConfigureAwait(true);
+                await transitionTask;
             }
             catch (Exception e)
             {

Runtime/PanelSystem/PanelStackController.cs

@@ -66,7 +66,7 @@ public void RemoveController(IPanelSystemController controller)
         /// <param name="controller"></param>
         public async void Push(IPanelViewController controller)
         {
-            await PushAsync(controller).ConfigureAwait(false);
+            await PushAsync(controller);
         }
 
         /// <summary>
@@ -78,15 +78,15 @@ public async Task PushAsync(IPanelViewController controller)
         {
             stack.Add(controller);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
         /// Pop the top panel off the stack
         /// </summary>
         public async void Pop()
         {
-            await PopAsync().ConfigureAwait(false);
+            await PopAsync();
         }
 
         /// <summary>
@@ -102,7 +102,7 @@ public async Task PopAsync()
 
             stack.RemoveAt(stack.Count - 1);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ public async Task PopAsync(int count)
         {
             stack.RemoveRange(stack.Count-count,count);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public async Task PopAsync(int count)
         /// <param name="count">Number of panels to pop</param>
         public async void Pop(int count)
         {
-            await PopAsync(count).ConfigureAwait(false);
+            await PopAsync(count);
         }
 
         /// <summary>
@@ -138,7 +138,7 @@ public async Task PopToIndexAsync(int index)
                 stack.RemoveRange(index+1, stack.Count - (index+1));
                 _needsTransition = true;
             }
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -147,7 +147,7 @@ public async Task PopToIndexAsync(int index)
         /// <param name="index"></param>
         public async void PopToIndex(int index)
         {
-            await PopToIndexAsync(index).ConfigureAwait(false);
+            await PopToIndexAsync(index);
         }
 
         /// <summary>
@@ -164,7 +164,7 @@ public async Task PopAndPushAsync(int popCount, params IPanelViewController[] co
             stack.RemoveRange(stack.Count-popCount,popCount);
             stack.AddRange(controllers);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -174,7 +174,7 @@ public async Task PopAndPushAsync(int popCount, params IPanelViewController[] co
         /// <param name="controllers">list of controllers to push</param>
         public async void PopAndPush(int popCount, params IPanelViewController[] controllers)
         {
-            await PopAndPushAsync(popCount, controllers).ConfigureAwait(false);
+            await PopAndPushAsync(popCount, controllers);
         }
 
         /// <summary>
@@ -191,7 +191,7 @@ public async Task PopAndPushAsync(int popCount, IPanelViewController controller)
             stack.RemoveRange(stack.Count-popCount,popCount);
             stack.Add(controller);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -201,7 +201,7 @@ public async Task PopAndPushAsync(int popCount, IPanelViewController controller)
         /// <param name="controller">controller to push</param>
         public async void PopAndPush(int popCount, IPanelViewController controller)
         {
-            await PopAndPushAsync(popCount, controller).ConfigureAwait(false);
+            await PopAndPushAsync(popCount, controller);
         }
 
         /// <summary>
@@ -213,7 +213,7 @@ public async Task PushAsync(params IPanelViewController[] controllers)
         {
             stack.AddRange(controllers);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -222,7 +222,7 @@ public async Task PushAsync(params IPanelViewController[] controllers)
         /// <param name="controllers">array of panel view controllers</param>
         public async void Push(params IPanelViewController[] controllers)
         {
-            await PushAsync(controllers).ConfigureAwait(false);
+            await PushAsync(controllers);
         }
 
         /// <summary>
@@ -235,7 +235,7 @@ public async Task ClearAndPushAsync(params IPanelViewController[] controllers)
             stack.Clear();
             stack.AddRange(controllers);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
@@ -244,7 +244,7 @@ public async Task ClearAndPushAsync(params IPanelViewController[] controllers)
         /// <param name="controllers">array of panel view controllers</param>
         public async void ClearAndPush(params IPanelViewController[] controllers)
         {
-            await ClearAndPushAsync(controllers).ConfigureAwait(false);
+            await ClearAndPushAsync(controllers);
         }
 
         /// <summary>
@@ -255,15 +255,15 @@ public async Task ClearAsync()
         {
             stack.Clear();
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
         /// Clear all panels from the stack
         /// </summary>
         public async void Clear()
         {
-            await ClearAsync().ConfigureAwait(false);
+            await ClearAsync();
         }
 
         /// <summary>
@@ -275,15 +275,15 @@ public async Task ClearAndPushAsync(IPanelViewController viewController)
             stack.Clear();
             stack.Add(viewController);
             _needsTransition = true;
-            await TransitionAsync().ConfigureAwait(false);
+            await TransitionAsync();
         }
 
         /// <summary>
         /// Clear all panels from the stack and then push a panel on top
         /// </summary>
         public async void ClearAndPush(IPanelViewController viewController)
         {
-            await ClearAndPushAsync(viewController).ConfigureAwait(false);
+            await ClearAndPushAsync(viewController);
         }
 
         private async Task TransitionAsync()
@@ -312,7 +312,7 @@ private async Task TransitionAsync()
                     tasks[i] = systemControllers[i].TransitionAsync();
                 }
 
-                await Task.WhenAll(tasks).ConfigureAwait(false);
+                await Task.WhenAll(tasks);
             }
             _isTransitioning = false;
         }

Runtime/PanelSystem/PanelStackSystem.cs

@@ -39,11 +39,11 @@ public async Task TransitionAsync()
                 //Load Views
                 if (showController != null)
                 {
-                    await LoadView(showController).ConfigureAwait(true);
+                    await LoadView(showController);
                 }
 
                 var transitionTask = TransitionDefault(hideController, showController);
-                await transitionTask.ConfigureAwait(true);
+                await transitionTask;
 
                 activePanelController = showController;
             }
@@ -101,12 +101,12 @@ private async Task TransitionDefault(IPanelViewController hideController, IPanel
 
             if (hideTask != null)
             {
-                await hideTask.ConfigureAwait(true);
+                await hideTask;
             }
 
             if (showTask != null)
             {
-                await showTask.ConfigureAwait(true);
+                await showTask;
             }
         }
 

Runtime/PanelSystem/PanelSwapController.cs

@@ -26,7 +26,7 @@ public void RemoveController(IPanelSystemController controller)
 
         public async void Show(IPanelViewController controller)
         {
-            await ShowAsync(controller).ConfigureAwait(false);
+            await ShowAsync(controller);
         }
 
         public async Task ShowAsync(IPanelViewController panelViewController)

Runtime/PanelSystem/PanelSwapSystem.cs

@@ -122,7 +122,7 @@ public async Task ShowAsync(bool immediate = false, ITransitionEvent transitionE
 
             if (!IsViewLoaded)
             {
-                await LoadViewAsync().ConfigureAwait(true);
+                await LoadViewAsync();
 
                 if (currentToken.IsCancellationRequested)
                 {

Runtime/PanelSystem/PanelViewControllerBase.cs

@@ -81,17 +81,17 @@ public RectTransform ParentTransform
 
         public async void Show(ITransitionEvent transitionEvent = null)
         {
-            await ShowAsync(transitionEvent).ConfigureAwait(false);
+            await ShowAsync(transitionEvent);
         }
 
         public async void Hide(ITransitionEvent transitionEvent = null)
         {
-            await HideAsync(transitionEvent).ConfigureAwait(false);
+            await HideAsync(transitionEvent);
         }
 
         public async void Show(bool immediate, ITransitionEvent transitionEvent = null)
         {
-            await ShowAsync(immediate, transitionEvent).ConfigureAwait(false);
+            await ShowAsync(immediate, transitionEvent);
         }
 
         public Task ShowAsync(bool immediate, ITransitionEvent transitionEvent = null) => BaseController.ShowAsync(immediate, transitionEvent);
@@ -100,7 +100,7 @@ public async void Show(bool immediate, ITransitionEvent transitionEvent = null)
 
         public async void Hide(bool immediate, ITransitionEvent transitionEvent = null)
         {
-            await HideAsync(immediate, transitionEvent).ConfigureAwait(false);
+            await HideAsync(immediate, transitionEvent);
         }
 
         public Task HideAsync(bool immediate, ITransitionEvent transitionEvent = null) => BaseController.HideAsync(immediate, transitionEvent);