Merge pull request #388 from OneSignal/bugfix/feedback

Resolve version feedback

OneSignalExample/Assets/OneSignal/CHANGELOG.md

@@ -5,9 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Added a delayed call when attempting to reshow the `OneSignalSetupWindow` after importing packages.
+- Moved the example code to a separate assembly definition so that it may be utilized in place.
+- The EDM4U setup step will rename the `Google.IOSResolver_v1.2.165.dll` on import in Unity 2021 and above. See EDM4U issue [#441](https://github.com/googlesamples/unity-jar-resolver/issues/441) for more information.
+### Changed
+- Updated formatting and documentation within the [OneSignalExampleBehaviour.cs](https://github.com/OneSignal/OneSignal-Unity-SDK/blob/main/OneSignalExample/Assets/OneSignal/Example/Scripts/OneSignalExampleBehaviour.cs) example code for clarity.
+- Marked `EnabledVibrate` and `EnableSound` as `Obsolete` with as they do not function on Android 8+. Please check out https://documentation.onesignal.com/docs/android-notification-categories for more information.
+
 ## [2.14.2]
 ### Fixed
 - Fixes rare iOS crash with some apps due to a threading issue. From [OneSignal-iOS-SDK PR #979](https://github.com/OneSignal/OneSignal-iOS-SDK/pull/979)
+
 ## [2.14.1]
 ### Fixed
 - Corrected directory separators in post processor when building for iOS in a 

OneSignalExample/Assets/OneSignal/OneSignal.UnityPackage.asmdef → OneSignalExample/Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "OneSignal.UnityPackage",
+    "name": "OneSignal.UnityPackage.Editor",
     "references": [
         "OneSignal.Core.Editor",
         "OneSignal.Core"

OneSignalExample/Assets/OneSignal/Editor/Resources/OneSignalFileInventory.asset

@@ -19,8 +19,6 @@ MonoBehaviour:
   - Assets/OneSignal/Example.meta
   - Assets/OneSignal/LICENSE.md
   - Assets/OneSignal/LICENSE.md.meta
-  - Assets/OneSignal/OneSignal.UnityPackage.asmdef
-  - Assets/OneSignal/OneSignal.UnityPackage.asmdef.meta
   - Assets/OneSignal/README.md
   - Assets/OneSignal/README.md.meta
   - Assets/OneSignal/VERSION
@@ -41,6 +39,8 @@ MonoBehaviour:
   - Assets/OneSignal/Documentation~/setup_window.png
   - Assets/OneSignal/Editor/AssemblyInfo.cs
   - Assets/OneSignal/Editor/AssemblyInfo.cs.meta
+  - Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef
+  - Assets/OneSignal/Editor/OneSignal.UnityPackage.Editor.asmdef.meta
   - Assets/OneSignal/Editor/OneSignalBootstrapper.cs
   - Assets/OneSignal/Editor/OneSignalBootstrapper.cs.meta
   - Assets/OneSignal/Editor/OneSignalFileInventory.cs
@@ -72,6 +72,8 @@ MonoBehaviour:
   - Assets/OneSignal/Editor/Utilities/GitHubUtility.cs.meta
   - Assets/OneSignal/Editor/Utilities/MiniJSON.cs
   - Assets/OneSignal/Editor/Utilities/MiniJSON.cs.meta
+  - Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef
+  - Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef.meta
   - Assets/OneSignal/Example/Scenes.meta
   - Assets/OneSignal/Example/Scripts.meta
   - Assets/OneSignal/Example/Scenes/OneSignalExampleScene.unity

OneSignalExample/Assets/OneSignal/Editor/SetupSteps/ImportPackagesStep.cs

@@ -65,7 +65,7 @@ public static void _showCoreInstallerWindow()
             return;
 
         SessionState.EraseBool(_shouldShowWindowKey);
-        OneSignalSetupWindow.ShowWindow();
+        EditorApplication.delayCall += OneSignalSetupWindow.ShowWindow;
     }
 #endif
 

OneSignalExample/Assets/OneSignal/Example/OneSignal.UnityPackage.Example.asmdef

@@ -0,0 +1,26 @@
+{
+    "name": "OneSignal.UnityPackage.Example",
+    "rootNamespace": "",
+    "references": [
+        "OneSignal.Core"
+    ],
+    "includePlatforms": [
+        "Android",
+        "Editor",
+        "iOS"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.onesignal.unity.core",
+            "expression": "0.0.1-preview",
+            "define": "ONE_SIGNAL_INSTALLED"
+        }
+    ],
+    "noEngineReferences": false
+}

OneSignalExample/Assets/OneSignal/Example/Scenes/OneSignalExampleScene.unity

@@ -244,6 +244,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9e0cf583b67c419894c77bc78acc66c4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  email: Email Address
+  externalId: External User ID
 --- !u!4 &1816083102
 Transform:
   m_ObjectHideFlags: 0