Merge pull request #5 from coryleach/dev

Merge 1.0.2

Author: coryleach

Editor/SceneSwitcherWindow.cs

@@ -19,7 +19,7 @@ private static void OpenWindow()
         private Vector2 _scrollPosition;
 
         [System.Serializable]
-        public class SceneSwitcherData
+        private class SceneSwitcherData
         {
             public List<string> sceneGuids = new List<string>();
             public bool sortRecentToTop = true;
@@ -49,7 +49,7 @@ private void OnDisable()
             PlayerPrefs.SetString(PrefsKey, JsonUtility.ToJson(_sceneSwitcherData));
         }
 
-        private bool _editing = false;
+        private bool _editing;
 
         private void OnGUI()
         {
@@ -76,6 +76,9 @@ private void OnGUI()
                     return;
                 case EventType.DragExited:
                     break;
+                default:
+                    //Other events ignored
+                    break;
             }
 
             if (_sceneSwitcherData.sceneGuids.Count > 0)
@@ -160,9 +163,10 @@ private void SceneListGui()
 
             GUILayout.EndVertical();
 
-            int lineHeight = 18;
+            const int lineHeight = 18;
             if (_editing)
             {
+                //Draw Toggle Buttons
                 GUILayout.BeginHorizontal();
                 _sceneSwitcherData.sortRecentToTop = GUILayout.Toggle(_sceneSwitcherData.sortRecentToTop,
                     new GUIContent("Auto Sort", "Will sort most recently used scenes to the top"),
@@ -173,19 +177,16 @@ private void SceneListGui()
                     new GUIContent("Close", "Will close/unload other scenes when additive loading is active"),
                     GUILayout.Height(lineHeight));
                 GUILayout.EndHorizontal();
-            }
-
-            if (_editing)
-            {
+            
+                //Draw Done Button
                 GUILayout.BeginHorizontal();
 
                 GUILayout.FlexibleSpace();
-                GUI.backgroundColor = _editing ? Color.green : Color.red;
-                if (GUILayout.Button(_editing ? "Done" : "Edit", GUILayout.MaxWidth(60)))
+                GUI.backgroundColor = Color.green;
+                if (GUILayout.Button("Done", GUILayout.MaxWidth(60)))
                 {
                     _editing = !_editing;
                 }
-
                 GUI.backgroundColor = Color.white;
 
                 GUILayout.EndHorizontal();
@@ -235,10 +236,9 @@ private void SwitchToScene(string path)
             }
 
             //Close other scenes
-            Scene otherScene = new Scene();
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
-                otherScene = SceneManager.GetSceneAt(i);
+                var otherScene = SceneManager.GetSceneAt(i);
                 if (otherScene.isLoaded && otherScene != scene)
                 {
                     EditorSceneManager.CloseScene(otherScene, false);

Editor/csc.rsp

@@ -0,0 +1 @@
+-nowarn:CS0649

Editor/csc.rsp.meta

@@ -1,28 +1,30 @@
-<h1 align="center">Welcome to com.gameframe.sceneswitcher 👋</h1>
+<h1 align="center">Gameframe.SceneSwitcher 👋</h1>
 
 <!-- BADGE-START -->
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/5e25869cd7c34f218c6483e496038da2)](https://www.codacy.com/manual/coryleach/UnitySceneSwitcher?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=coryleach/UnitySceneSwitcher&amp;utm_campaign=Badge_Grade)
 ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/coryleach/UnitySceneSwitcher?include_prereleases)
 [![openupm](https://img.shields.io/npm/v/com.gameframe.sceneswitcher?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gameframe.sceneswitcher/)
 ![GitHub](https://img.shields.io/github/license/coryleach/UnitySceneSwitcher)
 
 [![twitter](https://img.shields.io/twitter/follow/coryleach.svg?style=social)](https://twitter.com/coryleach)
 <!-- BADGE-END -->
 
-> Unity editor window for quick scene switching.
+Unity editor window for quick scene switching.
 
 ## 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/UnitySceneSwitcher.git#1.0.1<br/>
+https://github.com/coryleach/UnitySceneSwitcher.git#1.0.2<br/>
+
+#### Using UnityPackageManager (for Unity 2019.1 or later)
 
-#### Using UnityPackageManager (for Unity 2018.3 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.sceneswitcher": "https://github.com/coryleach/UnitySceneSwitcher.git#1.0.1",
+    "com.gameframe.sceneswitcher": "https://github.com/coryleach/UnitySceneSwitcher.git#1.0.2",
     ...
   },
 }
@@ -40,9 +42,9 @@ In the menu select Window -> SceneSwitcher
 ```
 
 <p align="center">
-  <img width="250" src="https://github.com/coryleach/UnitySceneSwitcher/blob/master/Documentation~/img/Empty.png" />
-  <img width="250" src="https://github.com/coryleach/UnitySceneSwitcher/blob/master/Documentation~/img/DefaultMode.png" />
-  <img width="250" src="https://github.com/coryleach/UnitySceneSwitcher/blob/master/Documentation~/img/EditMode.png" />
+  <img width="250" src="https://raw.githubusercontent.com/coryleach/UnitySceneSwitcher/master/Documentation~/img/Empty.png" />
+  <img width="250" src="https://raw.githubusercontent.com/coryleach/UnitySceneSwitcher/master/Documentation~/img/DefaultMode.png" />
+  <img width="250" src="https://raw.githubusercontent.com/coryleach/UnitySceneSwitcher/master/Documentation~/img/EditMode.png" />
 </p>
 
 <p>
@@ -69,9 +71,10 @@ Close = Closes other scenes
 * Twitter: [@coryleach](https://twitter.com/coryleach)
 * Github: [@coryleach](https://github.com/coryleach)
 
+
 ## Show your support
 
 Give a ⭐️ if this project helped you!
 
 ***
-_This README was generated with ❤️ by [readme-md-generator](https://github.com/kefranabg/readme-md-generator)_
+_This README was generated with ❤️ by [Gameframe.Packages](https://github.com/coryleach/unitypackages)_

README.md

@@ -1,12 +1,15 @@
 {
-    "name": "com.gameframe.sceneswitcher",
-    "displayName": "Gameframe.SceneSwitcher",
-    "version": "1.0.1",
-    "description": "Unity editor window for quick scene switching.",
-    "keywords": [],
-    "author": {
-        "name": "Cory Leach",
-        "email": "[email protected]",
-        "url": "https://github.com/coryleach"
-    }
-}
+  "name": "com.gameframe.sceneswitcher",
+  "displayName": "Gameframe.SceneSwitcher",
+  "version": "1.0.2",
+  "description": "Unity editor window for quick scene switching.",
+  "keywords": [],
+  "author": {
+    "name": "Cory Leach",
+    "email": "[email protected]",
+    "url": "https://github.com/coryleach",
+    "github": "coryleach",
+    "twitter": "coryleach"
+  },
+  "repositoryName": "UnitySceneSwitcher"
+}