diff --git a/MIGRATION_GUIDE_v3_to_v5.md b/MIGRATION_GUIDE_v3_to_v5.md index df798703f..b4e00396e 100644 --- a/MIGRATION_GUIDE_v3_to_v5.md +++ b/MIGRATION_GUIDE_v3_to_v5.md @@ -251,14 +251,36 @@ The debug namespace is accessible via `OneSignal.Debug` and provides access to d # Troubleshooting -If you run into the following errors : +``` +Assets/OneSignal/Example/OneSignalExampleBehaviou.cs: error CS0246: The type or namespace name '...' could not be found (are you missing a using directive or an assembly reference?) +``` -`Assets/OneSignal/Example/OneSignalExampleBehaviou.cs: error CS0246: The type or namespace name '...' could not be found (are you missing a using directive or an assembly reference?)` - -`Assets/OneSignal/Attribution/OneSignalVSAttribution.cs: error CS0117: 'OneSignal' does not contain a definition for '...'` +``` +Assets/OneSignal/Attribution/OneSignalVSAttribution.cs: error CS0117: 'OneSignal' does not contain a definition for '...' +``` 1. Delete the directory at `Assets/OneSignal` and the xml file at `Assets/Plugins/Android/OneSignalConfig.plugin/AndroidManifest.xml` - + - If you would like to regenerate the OneSignal assets, remove the OneSignal Unity SDK packages (Android, Core, iOS) from your project and import the OneSignal SDK again. 2. Check the menu at **Window > OneSignal SDK Setup** to see if there are any remaining steps to run -If you would like to regenerate the OneSignal assets, remove the OneSignal Unity SDK packages (Android, Core, iOS) from your project and import the OneSignal SDK again. \ No newline at end of file +``` +FAILURE: Build failed with an exception. +* What went wrong: +Execution failed for task ':unityLibrary:mergeReleaseJavaResource'. +> A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction + > 2 files found with path 'META-INF/kotlinx_coroutines_core.version' from inputs: + - /Users/.../Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/libs/org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm-1.6.4.jar + - /Users/.../Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/libs/org.jetbrains.kotlinx.kotlinx-coroutines-core-1.6.4.jar +``` +``` +FAILURE: Build failed with an exception. +* What went wrong: +Execution failed for task ':launcher:mergeReleaseJavaResource'. +> A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade + > More than one file was found with OS independent path 'META-INF/kotlinx_coroutines_core.version'. +``` + +1. Go to **Player Settings** and click the Android Tab. Under **Publishing Settings**, enable the following: + - Custom Main Gradle Template + - Custom Gradle Properties Template +2. Resolve Android dependencies with EDM4U at **Assets > External Dependency Manager > Android Resolver > Force Resolve** \ No newline at end of file diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll deleted file mode 100755 index 214390d56..000000000 Binary files a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll and /dev/null differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll deleted file mode 100755 index 215b999e8..000000000 Binary files a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll and /dev/null differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177.meta similarity index 77% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177.meta index c47641aad..1a30d9e89 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 434e7c333795f4325a9e410a71dc5cd7 +guid: 5f15f92a65ae14b4586771e83e22c578 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll new file mode 100755 index 000000000..f28b310d5 Binary files /dev/null and b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta similarity index 84% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta index 396b9664d..f568b5499 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: e2b1894e7d784825bf9719c33331fae8 +guid: 5552c54c11d94016bcfe740f27df44a6 labels: - gvh -- gvh_version-1.2.169 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll similarity index 65% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll index 47613998e..28462c552 100755 Binary files a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll and b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta similarity index 84% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta index 05bf9c0f6..0ce064948 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 2730c87d98d4480884d11cfb29ff72cb +guid: 1f4f113972f04c3695341dfb3ba48d3b labels: - gvh -- gvh_version-1.2.169 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll similarity index 99% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll index b23356bb6..0064fe6b1 100755 Binary files a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll and b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta similarity index 84% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta index 7676ed78b..2f76e5022 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 3ed19a202c4b4b439183dc00efee3c4a +guid: 413ed4abd14645c38ebbd8c5ff26e9de labels: - gvh -- gvh_version-1.2.169 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll new file mode 100755 index 000000000..789a9f25b Binary files /dev/null and b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta similarity index 84% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta index d26a581e8..d9825a71d 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 14338063180a4626be53643cb2ab5d69 +guid: 38d0b40a7b2d44c6a6a2362599bfc41e labels: - gvh -- gvh_version-1.2.169 -- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll - gvhp_targets-editor PluginImporter: externalObjects: {} diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md index 79d7b94da..31c808855 100755 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -1,4 +1,57 @@ -# Version 1.2.169 - Jan 20, 2021 +# Version 1.2.177 - Aug 14, 2023 +* iOS Resolver - Added `/opt/homebrew/bin` to Cocoapod executable search path. + Fixes #627 + +# Version 1.2.176 - Apr 27, 2023 +* Android Resolver - Added two Android Resolver settings to determine whether + EDM4U injects custom local Maven repo path as a relative path or full path. + Fixes #537 +* Android Resolver - Inject Maven Repo to `settingTemplate.gradle` from + Unity 2022.2+ + Fixes #594 +* Android Resolver - Jetifier option is enabled by default now. +* Android Resolver - `Explode Aar` option applies to all cases, whether the + project will be exported or not. + Fixes #584 + Fixes #287 + +# Version 1.2.175 - Nov 16, 2022 +* General - Added tvOS podfile support to the iOS resolver. + +# Version 1.2.174 - Oct 06, 2022 +* General - Added tvOS support to the iOS resolver. +* General - Fixed #484 - Changed `EditorMeasurement` to use secure connection. +* Android Resolver - Fixed Android Resolver unable to resolve + `mainTemplate.gradle` in Unity `2022.2+` or `2023.1+`. + +# Version 1.2.173 - Sep 28, 2022 +* General - Added tvOS library support to the export unity package scripts. + +# Version 1.2.172 - Jun 23, 2022 +* iOS Resolver - Stop forcing `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` to `YES`, + which seems to cause problem for some when submitting apps. See #526 for more + information. + +# Version 1.2.171 - May 11, 2022 +* iOS Resolver - Change `Enable Swift Framework Support Workaround` setting to + be `ON` by default since more pods are using Swift Framework now. + +# Version 1.2.170 - Apr 4, 2022 +* Android Resolver - Fixes #498 - Fix the path separator of the Maven repo + injected to `mainTemplate.gradle`. +* iOS Resolver - Fixes #470 - Switch default Cocoapods master repo from Github + to CDN. +* iOS Resolver - `Link Framework Statically` setting is now default to `true`. + That is, `use_frameworks! :linkage => static` will be added to `Podfile` by + default instead of `use_frameworks!`. This can be changed in iOS Resolver + settings. This fixes odd behaviors when pods include static libraries, ex. + Firebase Analytics. +* iOS Resolver - Added a workaround when app crashes on launch due to + `Library not loaded: @rpath/libswiftCore.dylib` when some pods includes Swift + framework. This is turned `OFF` by default and can be changed in iOS Resolver + settings. + +# Version 1.2.169 - Jan 20, 2022 * General - Fixes #425 - Change to save `GvhProjectSettings.xml` without Unicode byte order mark (BoM). * Android Resolver - Remove reference to `jcenter()` diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta index 77a0dd33e..023bd4ea3 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: deafbeef1ed04f639e3195087b6d2e9f +guid: 6cdb6572965940cb9bcd8ce572951c7d labels: - gvh -- gvh_version-1.2.169 +- gvh_version-1.2.177 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md timeCreated: 1584567712 licenseType: Pro diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll index bcf089019..03ad6370a 100755 Binary files a/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll and b/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta index 80fa4f72e..a35483b17 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 17e39196248d458daa69b514bc09b6a7 +guid: 86460262ea60447dbb6a62d21167790f labels: - gvh -- gvh_version-1.2.169 +- gvh_version-1.2.177 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll - gvhp_targets-editor timeCreated: 1480838400 diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/LICENSE.meta index 6207f9d2e..e3d273463 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/LICENSE.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 61e923e8fff245a9bf5cfcf0774e75df +guid: 7640443de1d445eab9dfaac68fefcc3b labels: - gvh -- gvh_version-1.2.169 +- gvh_version-1.2.177 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE timeCreated: 1584567712 licenseType: Pro diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md b/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md index cbc98e197..c0ee576e2 100755 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md @@ -26,7 +26,7 @@ This causes the following problems: Unity project can be complex and a burden on a Unity plugin maintainer. * The process of resolving conflicting dependencies on platform specific libraries is pushed to the developer attempting to use a Unity plugin. - The developer trying to use you plugin is very likely to give up when + The developer trying to use your plugin is very likely to give up when faced with Android or iOS specific build errors. * The process of resolving conflicting Unity plugins (due to shared Unity plugin components) is pushed to the developer attempting to use your Unity @@ -36,6 +36,9 @@ This causes the following problems: EDM provides solutions for each of these problems. +If, after reading this, you need to debug usage of EDM in a Unity project, +consult the debugging [step-by-step guide](troubleshooting-faq.md). + ## Android Dependency Management The *Android Resolver* component of this plugin will download and integrate diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md.meta index 0a934fb08..d88caa52f 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 57b5c3f72b65480eba2cc96380835972 +guid: 6fd4c95e7f9941198f1bac5f0fff74c8 labels: - gvh -- gvh_version-1.2.169 +- gvh_version-1.2.177 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md timeCreated: 1584567712 licenseType: Pro diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt b/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt deleted file mode 100755 index 63e8150ce..000000000 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt +++ /dev/null @@ -1,13 +0,0 @@ -Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.169/Google.JarResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.169/Google.PackageManagerResolver.dll.mdb -Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll.mdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt b/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt new file mode 100755 index 000000000..5aac0e823 --- /dev/null +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt.meta b/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta similarity index 75% rename from OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt.meta rename to OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta index aa22ac825..2adb22ea9 100644 --- a/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt.meta +++ b/OneSignalExample/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: f0ebd68c0b4541ada7e16bfce4ef4155 +guid: 2764c5ea3b354f3cb7ca80028fd08da2 labels: - gvh - gvh_manifest -- gvh_version-1.2.169 -- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.169_manifest.txt +- gvh_version-1.2.177 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt - gvhp_manifestname-0External Dependency Manager - gvhp_manifestname-play-services-resolver timeCreated: 1474401009 diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md index 78328e11a..e771bfc5e 100644 --- a/OneSignalExample/Assets/OneSignal/CHANGELOG.md +++ b/OneSignalExample/Assets/OneSignal/CHANGELOG.md @@ -5,6 +5,12 @@ 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] +### Changed +- `InstallEdm4uStep` now imports version [1.2.177](https://github.com/googlesamples/unity-jar-resolver/releases/tag/v1.2.177) of [EDM4U](https://github.com/googlesamples/unity-jar-resolver) +- Updated included Android SDK to [5.0.1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.1) +### Fixed +- Sending VSAttribution data from the editor + ## [5.0.2] ### Fixed - Stop foreground notifications from displaying after calling prevent default on iOS diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs index 79b8cc90b..1efb742a5 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs @@ -313,8 +313,6 @@ public async void PromptForPush() { _log("Notification permission accepeted"); else _log("Notification permission denied"); - - _log($"Notification permission is: {OneSignal.Notifications.Permission}"); } public void ClearPush() { @@ -325,10 +323,16 @@ public void ClearPush() { _log("Notifications cleared"); } - public void GetPermissionNative() { + public void GetNotificationsPermission() { + var permission = OneSignal.Notifications.Permission; + + _log($"Notifications permission is: {permission}"); + } + + public void GetNotificationsPermissionNative() { var permissionNative = OneSignal.Notifications.PermissionNative; - _log($"Permission Native is: {permissionNative.ToString()}"); + _log($"Notifications native permission is: {permissionNative.ToString()}"); } /* diff --git a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity index f14b099ba..b7731ada6 100644 --- a/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity +++ b/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44407052, g: 0.49331468, b: 0.57239574, a: 1} + m_IndirectSpecularColor: {r: 0.44407046, g: 0.49331486, b: 0.57238823, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -474,7 +474,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 307684281} m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example - m_MethodName: GetPermissionNative + m_MethodName: GetNotificationsPermissionNative m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1413,6 +1413,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1507945964} + - {fileID: 1401559308} - {fileID: 1393191773} - {fileID: 479644927} m_Father: {fileID: 185876438} @@ -1421,7 +1422,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 180} + m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &194426461 MonoBehaviour: @@ -3604,7 +3605,7 @@ RectTransform: m_Children: - {fileID: 1820559741} m_Father: {fileID: 194426460} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4627,7 +4628,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 395336054} - m_Father: {fileID: 1393191773} + m_Father: {fileID: 1401559308} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -11627,10 +11628,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 636357802} + - {fileID: 1417538972} - {fileID: 60724773} m_Father: {fileID: 194426460} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11797,6 +11798,204 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400655136} m_CullTransparentMesh: 1 +--- !u!1 &1401559307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1401559308} + - component: {fileID: 1401559309} + m_Layer: 5 + m_Name: controls_container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1401559308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401559307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 636357802} + m_Father: {fileID: 194426460} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1401559309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401559307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &1417538971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1417538972} + - component: {fileID: 1417538975} + - component: {fileID: 1417538974} + - component: {fileID: 1417538973} + m_Layer: 5 + m_Name: button_permission + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1417538972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1870595883} + m_Father: {fileID: 1393191773} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1417538973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1417538974} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 307684281} + m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example + m_MethodName: GetNotificationsPermission + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 +--- !u!114 &1417538974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1417538975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_CullTransparentMesh: 1 --- !u!1 &1419489717 GameObject: m_ObjectHideFlags: 0 @@ -13506,7 +13705,7 @@ MonoBehaviour: m_HandleRect: {fileID: 916273502} m_Direction: 2 m_Value: 1 - m_Size: 0.3937309 + m_Size: 0.3125 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -14913,6 +15112,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1870595882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1870595883} + - component: {fileID: 1870595885} + - component: {fileID: 1870595884} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1870595883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1417538972} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1870595884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Get Permission +--- !u!222 &1870595885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_CullTransparentMesh: 1 --- !u!1 &1873715879 GameObject: m_ObjectHideFlags: 0 diff --git a/OneSignalExample/Assets/OneSignal/MIGRATION_GUIDE_v3_to_v5.md b/OneSignalExample/Assets/OneSignal/MIGRATION_GUIDE_v3_to_v5.md index df798703f..b4e00396e 100644 --- a/OneSignalExample/Assets/OneSignal/MIGRATION_GUIDE_v3_to_v5.md +++ b/OneSignalExample/Assets/OneSignal/MIGRATION_GUIDE_v3_to_v5.md @@ -251,14 +251,36 @@ The debug namespace is accessible via `OneSignal.Debug` and provides access to d # Troubleshooting -If you run into the following errors : +``` +Assets/OneSignal/Example/OneSignalExampleBehaviou.cs: error CS0246: The type or namespace name '...' could not be found (are you missing a using directive or an assembly reference?) +``` -`Assets/OneSignal/Example/OneSignalExampleBehaviou.cs: error CS0246: The type or namespace name '...' could not be found (are you missing a using directive or an assembly reference?)` - -`Assets/OneSignal/Attribution/OneSignalVSAttribution.cs: error CS0117: 'OneSignal' does not contain a definition for '...'` +``` +Assets/OneSignal/Attribution/OneSignalVSAttribution.cs: error CS0117: 'OneSignal' does not contain a definition for '...' +``` 1. Delete the directory at `Assets/OneSignal` and the xml file at `Assets/Plugins/Android/OneSignalConfig.plugin/AndroidManifest.xml` - + - If you would like to regenerate the OneSignal assets, remove the OneSignal Unity SDK packages (Android, Core, iOS) from your project and import the OneSignal SDK again. 2. Check the menu at **Window > OneSignal SDK Setup** to see if there are any remaining steps to run -If you would like to regenerate the OneSignal assets, remove the OneSignal Unity SDK packages (Android, Core, iOS) from your project and import the OneSignal SDK again. \ No newline at end of file +``` +FAILURE: Build failed with an exception. +* What went wrong: +Execution failed for task ':unityLibrary:mergeReleaseJavaResource'. +> A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction + > 2 files found with path 'META-INF/kotlinx_coroutines_core.version' from inputs: + - /Users/.../Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/libs/org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm-1.6.4.jar + - /Users/.../Library/Bee/Android/Prj/Mono2x/Gradle/unityLibrary/libs/org.jetbrains.kotlinx.kotlinx-coroutines-core-1.6.4.jar +``` +``` +FAILURE: Build failed with an exception. +* What went wrong: +Execution failed for task ':launcher:mergeReleaseJavaResource'. +> A failure occurred while executing com.android.build.gradle.internal.tasks.Workers$ActionFacade + > More than one file was found with OS independent path 'META-INF/kotlinx_coroutines_core.version'. +``` + +1. Go to **Player Settings** and click the Android Tab. Under **Publishing Settings**, enable the following: + - Custom Main Gradle Template + - Custom Gradle Properties Template +2. Resolve Android dependencies with EDM4U at **Assets > External Dependency Manager > Android Resolver > Force Resolve** \ No newline at end of file diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle index f87112fb0..946a85737 100644 --- a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle +++ b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle @@ -21,7 +21,7 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start - implementation 'com.onesignal:OneSignal:5.0.0' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 + implementation 'com.onesignal:OneSignal:5.0.1' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 // Android Resolver Dependencies End **DEPS**} diff --git a/README.md b/README.md index 64389e39c..cb8b6a6f4 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,13 @@ After building in Unity and exporting the XCode project follow these steps: 6. **App Groups** should now be provisioned for you going forward for your iOS bundle id, even on clean builds. ### Android +In the Unity editor: + +1. Go to **Player Settings** and click the Android Tab. Under **Publishing Settings**, enable the following: + - Custom Main Gradle Template + - Custom Gradle Properties Template +2. Resolve Android dependencies with EDM4U at **Assets > External Dependency Manager > Android Resolver > Force Resolve** + Most of the Android setup was already handled during installation! The only thing remaining is to setup your own notification icons. You can do this be replacing the example icons located at `Assets/Plugins/Android/OneSignalConfig.plugin` diff --git a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml index 2feed81f1..62ec13452 100644 --- a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml +++ b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml @@ -3,6 +3,6 @@ https://repo.maven.apache.org/maven2 - + \ No newline at end of file diff --git a/com.onesignal.unity.core/Editor/Platform/OneSignalNative.cs b/com.onesignal.unity.core/Editor/Platform/OneSignalNative.cs index 7642c6b1f..18b2bb70c 100755 --- a/com.onesignal.unity.core/Editor/Platform/OneSignalNative.cs +++ b/com.onesignal.unity.core/Editor/Platform/OneSignalNative.cs @@ -92,8 +92,10 @@ public override void Initialize(string appId) { SDKDebug.Error("appId is null or empty"); return; } - - SDKDebug.Warn("Native SDK is placeholder. Please run on supported platform (iOS or Android)."); + + _init(appId); + + SDKDebug.Warn("Native SDK is a placeholder. Please run on supported platform (iOS or Android)."); } public override void Login(string externalId, string jwtBearerToken = null) { diff --git a/com.onesignal.unity.core/Editor/SetupSteps/InstallEdm4uStep.cs b/com.onesignal.unity.core/Editor/SetupSteps/InstallEdm4uStep.cs index a50b2005d..0c3f6f05f 100644 --- a/com.onesignal.unity.core/Editor/SetupSteps/InstallEdm4uStep.cs +++ b/com.onesignal.unity.core/Editor/SetupSteps/InstallEdm4uStep.cs @@ -121,7 +121,7 @@ protected override void _runStep() { }); } - private const string _edm4UVersion = "1.2.169"; + private const string _edm4UVersion = "1.2.177"; private static readonly string _edm4UPackageDownloadUrl = $"https://github.com/googlesamples/unity-jar-resolver/blob/v{_edm4UVersion}/external-dependency-manager-{_edm4UVersion}.unitypackage?raw=true"; diff --git a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs index ff91532e5..13dcbe9b1 100644 --- a/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs +++ b/com.onesignal.unity.core/Runtime/OneSignalPlatform.cs @@ -51,6 +51,10 @@ protected static void _completedInit(string appId) { OnInitialize?.Invoke(AppId); } + protected static void _init(string appId) { + OnInitialize?.Invoke(appId); + } + /// /// The user manager for accessing user-scoped management. Initialized only after [initWithContext] /// has been called, and initialized with a device-scoped user until (or if) [login] has been diff --git a/com.onesignal.unity.core/Samples~/OneSignalExampleBehaviour.cs b/com.onesignal.unity.core/Samples~/OneSignalExampleBehaviour.cs index 79b8cc90b..1efb742a5 100644 --- a/com.onesignal.unity.core/Samples~/OneSignalExampleBehaviour.cs +++ b/com.onesignal.unity.core/Samples~/OneSignalExampleBehaviour.cs @@ -313,8 +313,6 @@ public async void PromptForPush() { _log("Notification permission accepeted"); else _log("Notification permission denied"); - - _log($"Notification permission is: {OneSignal.Notifications.Permission}"); } public void ClearPush() { @@ -325,10 +323,16 @@ public void ClearPush() { _log("Notifications cleared"); } - public void GetPermissionNative() { + public void GetNotificationsPermission() { + var permission = OneSignal.Notifications.Permission; + + _log($"Notifications permission is: {permission}"); + } + + public void GetNotificationsPermissionNative() { var permissionNative = OneSignal.Notifications.PermissionNative; - _log($"Permission Native is: {permissionNative.ToString()}"); + _log($"Notifications native permission is: {permissionNative.ToString()}"); } /* diff --git a/com.onesignal.unity.core/Samples~/OneSignalExampleScene.unity b/com.onesignal.unity.core/Samples~/OneSignalExampleScene.unity index 11f551f2b..b7731ada6 100644 --- a/com.onesignal.unity.core/Samples~/OneSignalExampleScene.unity +++ b/com.onesignal.unity.core/Samples~/OneSignalExampleScene.unity @@ -474,7 +474,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 307684281} m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example - m_MethodName: GetPermissionNative + m_MethodName: GetNotificationsPermissionNative m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1413,6 +1413,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1507945964} + - {fileID: 1401559308} - {fileID: 1393191773} - {fileID: 479644927} m_Father: {fileID: 185876438} @@ -1421,7 +1422,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 180} + m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &194426461 MonoBehaviour: @@ -2304,10 +2305,9 @@ MonoBehaviour: email: externalId: phoneNumber: - appId: ba9d1c88-4130-498c-849f-9a4bf36ec0b8 + appId: consentRequired: 0 consentGiven: 0 - launchURLsInApp: 0 language: aliasKey: aliasValue: @@ -3574,140 +3574,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &475651594 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 475651595} - - component: {fileID: 475651598} - - component: {fileID: 475651597} - - component: {fileID: 475651596} - m_Layer: 5 - m_Name: button_launchURLs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &475651595 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475651594} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 960942963} - m_Father: {fileID: 1212167157} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &475651596 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475651594} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 475651597} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 307684281} - m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example - m_MethodName: ToggleLaunchURLsInApp - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 ---- !u!114 &475651597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475651594} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &475651598 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475651594} - m_CullTransparentMesh: 1 --- !u!1 &479644926 GameObject: m_ObjectHideFlags: 0 @@ -3739,7 +3605,7 @@ RectTransform: m_Children: - {fileID: 1820559741} m_Father: {fileID: 194426460} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4762,7 +4628,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 395336054} - m_Father: {fileID: 1393191773} + m_Father: {fileID: 1401559308} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6621,7 +6487,7 @@ RectTransform: m_Children: - {fileID: 1969667766} m_Father: {fileID: 1504821450} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7183,86 +7049,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 950232554} m_CullTransparentMesh: 1 ---- !u!1 &960942962 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 960942963} - - component: {fileID: 960942965} - - component: {fileID: 960942964} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &960942963 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960942962} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 475651595} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &960942964 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960942962} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Toggle Launch URLs In App ---- !u!222 &960942965 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960942962} - m_CullTransparentMesh: 1 --- !u!1 &997767966 GameObject: m_ObjectHideFlags: 0 @@ -9686,70 +9472,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175679466} m_CullTransparentMesh: 1 ---- !u!1 &1212167156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1212167157} - - component: {fileID: 1212167158} - m_Layer: 5 - m_Name: controls_container - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1212167157 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1212167156} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 475651595} - m_Father: {fileID: 1504821450} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1212167158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1212167156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &1221267383 GameObject: m_ObjectHideFlags: 0 @@ -11080,7 +10802,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 5551234567 + m_Text: +15551234567 --- !u!222 &1323715502 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11906,10 +11628,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 636357802} + - {fileID: 1417538972} - {fileID: 60724773} m_Father: {fileID: 194426460} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12076,6 +11798,204 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400655136} m_CullTransparentMesh: 1 +--- !u!1 &1401559307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1401559308} + - component: {fileID: 1401559309} + m_Layer: 5 + m_Name: controls_container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1401559308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401559307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 636357802} + m_Father: {fileID: 194426460} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1401559309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401559307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &1417538971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1417538972} + - component: {fileID: 1417538975} + - component: {fileID: 1417538974} + - component: {fileID: 1417538973} + m_Layer: 5 + m_Name: button_permission + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1417538972 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1870595883} + m_Father: {fileID: 1393191773} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1417538973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1417538974} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 307684281} + m_TargetAssemblyTypeName: OneSignalExampleBehaviour, OneSignal.UnityPackage.Example + m_MethodName: GetNotificationsPermission + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 +--- !u!114 &1417538974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1417538975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417538971} + m_CullTransparentMesh: 1 --- !u!1 &1419489717 GameObject: m_ObjectHideFlags: 0 @@ -13323,7 +13243,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1449350197} - - {fileID: 1212167157} - {fileID: 907083753} m_Father: {fileID: 185876438} m_RootOrder: 7 @@ -13786,7 +13705,7 @@ MonoBehaviour: m_HandleRect: {fileID: 916273502} m_Direction: 2 m_Value: 1 - m_Size: 0.47565883 + m_Size: 0.3125 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -15193,6 +15112,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1870595882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1870595883} + - component: {fileID: 1870595885} + - component: {fileID: 1870595884} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1870595883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1417538972} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1870595884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Get Permission +--- !u!222 &1870595885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870595882} + m_CullTransparentMesh: 1 --- !u!1 &1873715879 GameObject: m_ObjectHideFlags: 0