Merge pull request #14 from coryleach/dev

major updates

Author: coryleach

Demo/Demo.unitypackage

@@ -4,7 +4,7 @@
 
 namespace Gameframe.GUI.PanelSystem
 {
-  [CustomEditor(typeof(PanelStackSystem))]
+  [CustomEditor(typeof(ScriptablePanelStackSystem))]
   public class PanelStackSystemEditor : UnityEditor.Editor
   {
     public override bool RequiresConstantRepaint()
@@ -18,7 +18,7 @@ public override void OnInspectorGUI()
       EditorGUILayout.BeginVertical("box");
       EditorGUILayout.LabelField("Current Stack");
 
-      var stack = (PanelStackSystem) target;
+      var stack = (ScriptablePanelStackSystem) target;
       for (int i = stack.Count-1; i >= 0; i--)
       {
         EditorGUILayout.BeginVertical("box");

Editor/PanelStackSystemEditor.cs

@@ -16,22 +16,22 @@
 This is a library of GUI helpers for UGUI    
 Includes a panel system that implements a navigation stack.    
 Includes a scene transition system.    
-Includes a shader for blurring the background of UI panels.
+Includes a SRP shader for blurring the background of UI panels.
 
 ## Quick Package Install
 
 #### 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#2.0.1<br/>
+https://github.com/coryleach/UnityGUI.git#3.0.0<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#2.0.1",
+    "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.0",
     ...
   },
 }

README.md

@@ -1,13 +1,6 @@
-using System.Threading.Tasks;
-
-namespace Gameframe.GUI.PanelSystem
+namespace Gameframe.GUI.PanelSystem
 {
-    public interface IPanelStackController
+    public interface IPanelStackController : IPanelSystemController
     {
-        /// <summary>
-        /// Transitions views to reflect state of the panel stack system
-        /// </summary>
-        /// <returns>Task that completes when transition is finished</returns>
-        Task TransitionAsync();
     }
 }

Runtime/PanelSystem/IPanelStackController.cs

@@ -2,12 +2,10 @@
 
 namespace Gameframe.GUI.PanelSystem
 {
-    public interface IPanelStackSystem : IEnumerable<IPanelViewController>
+    public interface IPanelStackSystem : IEnumerable<IPanelViewController>, IPanelSystem
     {
         int Count { get; }
         IPanelViewController this[int index] { get; }
-        void AddController(IPanelStackController controller);
-        void RemoveController(IPanelStackController controller);
         void Push(IPanelViewController controller);
         void Pop();
     }

Runtime/PanelSystem/IPanelStackSystem.cs

@@ -1,10 +1,7 @@
-using System.Threading.Tasks;
-
+
 namespace Gameframe.GUI.PanelSystem
 {
-    public interface IPanelSwapController
+    public interface IPanelSwapController : IPanelSystemController
     {
-        Task TransitionAsync();
-    }    
+    }
 }
-

Runtime/PanelSystem/IPanelSwapController.cs

@@ -2,14 +2,10 @@
 
 namespace Gameframe.GUI.PanelSystem
 {
-    public interface IPanelSwapSystem
+    public interface IPanelSwapSystem : IPanelSystem
     {
         IPanelViewController CurrentViewController { get; }
-        void AddController(IPanelSwapController controller);
-        void RemoveController(IPanelSwapController controller);
         void Show(IPanelViewController panelViewController);
         Task ShowAsync(IPanelViewController panelViewController);
     }
 }
-
-

Runtime/PanelSystem/IPanelSwapSystem.cs

@@ -0,0 +1,8 @@
+namespace Gameframe.GUI.PanelSystem
+{
+    public interface IPanelSystem
+    {
+        void AddController(IPanelSystemController controller);
+        void RemoveController(IPanelSystemController controller);
+    }
+}

Runtime/PanelSystem/IPanelSystem.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+
+namespace Gameframe.GUI.PanelSystem
+{
+    public interface IPanelSystemController
+    {
+        /// <summary>
+        /// Transitions views to reflect state of the panel system
+        /// </summary>
+        /// <returns>Task that completes when transition is finished</returns>
+        Task TransitionAsync();
+    }
+}