diff --git a/CHANGELOG.md b/CHANGELOG.md index 8113e91..8e636c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Clever Ads Solutions Unity Plugin Change Log +## [2.0.1] - 2022-01-12 +### Dependencies +- CleverAdsSolutions - [2.7.2](https://github.com/cleveradssolutions/CAS-Unity/releases) +### Bug Fixes +- Disabled duplication of listeners from prefab on privacy policy buttons. +- Minor GUI adaptation for 9:20 aspect ratio. + ## [2.0.0] - 2022-01-12 ### Dependencies - CleverAdsSolutions - [2.6.1](https://github.com/cleveradssolutions/CAS-Unity/releases) diff --git a/Editor/CASSimpleLocalizeTextEditor.cs b/Editor/CASSimpleLocalizeTextEditor.cs index 73f8de5..345a2db 100644 --- a/Editor/CASSimpleLocalizeTextEditor.cs +++ b/Editor/CASSimpleLocalizeTextEditor.cs @@ -1,5 +1,9 @@ -using System.Collections; -using System.Collections.Generic; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + using UnityEngine; using UnityEditor; using UnityEditorInternal; diff --git a/Editor/ConsentRequestEditor.cs b/Editor/ConsentRequestEditor.cs index 61e8d27..4a760a7 100644 --- a/Editor/ConsentRequestEditor.cs +++ b/Editor/ConsentRequestEditor.cs @@ -1,4 +1,10 @@ -using UnityEngine; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using UnityEngine; using UnityEditor; namespace CAS.UserConsent diff --git a/Editor/ConsentRequestParametersEditor.cs b/Editor/ConsentRequestParametersEditor.cs index 6680b58..71f3298 100644 --- a/Editor/ConsentRequestParametersEditor.cs +++ b/Editor/ConsentRequestParametersEditor.cs @@ -1,4 +1,10 @@ -using System.Collections; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEditor; @@ -20,9 +26,6 @@ public class ConsentRequestParametersEditor : Editor private const string templateSettingsPrefabName = "NetworkPolicy.prefab"; private const string customUIPrefabName = "UserConsentUI.prefab"; private const string customSettingsPrefabName = "SettingToggleUI.prefab"; - private const string configuringPrivacyURL = Utils.gitRootURL + "CAS-Unity#include-ios"; - private const string locationUsageDefaultDescription = "Your data will be used to provide you a better and personalized ad experience."; - private SerializedProperty showInEditorProp; private SerializedProperty withAudienceDefinitionProp; @@ -201,7 +204,7 @@ private void DrawPrefabSelector( string title, SerializedProperty prop, string t } #region Utils - [MenuItem( "Assets/CleverAdsSolutions/Consent Request Parameters" )] + [MenuItem( "Assets/CleverAdsSolutions/Consent Request Parameters", priority = 1015 )] public static void CreateParameters() { if (!AssetDatabase.IsValidFolder( "Assets/Resources" )) diff --git a/Prefabs/ConsentUITemplate.prefab b/Prefabs/ConsentUITemplate.prefab index d3a3454..dccf9dc 100644 --- a/Prefabs/ConsentUITemplate.prefab +++ b/Prefabs/ConsentUITemplate.prefab @@ -178,8 +178,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.29999, y: -28.755} - m_SizeDelta: {x: 138.2, y: 57.51} + m_AnchoredPosition: {x: 200.75, y: -28.755} + m_SizeDelta: {x: 130.5, y: 57.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062541502625 CanvasRenderer: @@ -320,8 +320,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 68.75, y: -25} - m_SizeDelta: {x: 137.5, y: 50} + m_AnchoredPosition: {x: 65, y: -25} + m_SizeDelta: {x: 130, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062614071351 CanvasRenderer: @@ -542,7 +542,7 @@ MonoBehaviour: m_HandleRect: {fileID: 48348063612381030} m_Direction: 2 m_Value: 0 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -583,7 +583,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 70} - m_SizeDelta: {x: 280, y: 50} + m_SizeDelta: {x: 266, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &48348062625449501 MonoBehaviour: @@ -1202,8 +1202,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.1, y: -44.3825} - m_SizeDelta: {x: 138.2, y: 26.255} + m_AnchoredPosition: {x: 65.25, y: -44.3825} + m_SizeDelta: {x: 130.5, y: 26.255} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063205091764 CanvasRenderer: @@ -1744,8 +1744,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.1, y: -13.1275} - m_SizeDelta: {x: 138.2, y: 26.255} + m_AnchoredPosition: {x: 65.25, y: -13.1275} + m_SizeDelta: {x: 130.5, y: 26.255} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063544628666 CanvasRenderer: @@ -3093,7 +3093,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 68} - m_SizeDelta: {x: 281.4, y: 57.51} + m_SizeDelta: {x: 266, y: 57.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &48348064263290924 MonoBehaviour: @@ -4117,7 +4117,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: 6 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -4946,18 +4946,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6378617395282631496} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6378617394226191214} - m_MethodName: OnOpenCompanyPrivacyPolicy - 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: 2 + m_Calls: [] --- !u!1 &6378617395406947627 GameObject: m_ObjectHideFlags: 0 @@ -4995,8 +4984,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 211.25, y: -25} - m_SizeDelta: {x: 137.5, y: 50} + m_AnchoredPosition: {x: 200, y: -25} + m_SizeDelta: {x: 130, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617395406947631 CanvasRenderer: @@ -5502,18 +5491,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6378617395942446375} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6378617394226191214} - m_MethodName: OnOpenTermsOfUse - 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: 2 + m_Calls: [] --- !u!1 &7407072944406619641 GameObject: m_ObjectHideFlags: 0 @@ -5549,8 +5527,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.1, y: -28.755} - m_SizeDelta: {x: 138.2, y: 57.51} + m_AnchoredPosition: {x: 65.25, y: -28.755} + m_SizeDelta: {x: 130.5, y: 57.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4232900423922786516 MonoBehaviour: diff --git a/README.md b/README.md index 52b4b7b..ab7bc04 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ https://github.com/cleveradssolutions/CAS-Unity-Consent.git#2.0.0 Open `YourProject/Packages/manifest.json` file in any text editor and add line in `dependencies` tag: ```json { "dependencies": { -"com.cleversolutions.ads.unity": "https://github.com/cleveradssolutions/CAS-Unity-Consent.git#2.0.0", +"com.cleversolutions.ads.unity": "https://github.com/cleveradssolutions/CAS-Unity-Consent.git#2.0.1", } } ``` diff --git a/Runtime/AppTrackingTransparency.cs b/Runtime/AppTrackingTransparency.cs index c39a067..b613438 100644 --- a/Runtime/AppTrackingTransparency.cs +++ b/Runtime/AppTrackingTransparency.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; namespace CAS.iOS diff --git a/Runtime/AudienceDefinitionUI.cs b/Runtime/AudienceDefinitionUI.cs index 5acf6e4..c895f9b 100644 --- a/Runtime/AudienceDefinitionUI.cs +++ b/Runtime/AudienceDefinitionUI.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; diff --git a/Runtime/CASSimpleLocalizeText.cs b/Runtime/CASSimpleLocalizeText.cs index c25c2ca..db13c0d 100644 --- a/Runtime/CASSimpleLocalizeText.cs +++ b/Runtime/CASSimpleLocalizeText.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; diff --git a/Runtime/CASSimpleLocalizeText.cs.meta b/Runtime/CASSimpleLocalizeText.cs.meta index 345a334..c6520f1 100644 --- a/Runtime/CASSimpleLocalizeText.cs.meta +++ b/Runtime/CASSimpleLocalizeText.cs.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 0e875758cbc3f492e82057c10704a58b +labels: +- CleverAdsSolutions MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Runtime/ConsentClient.cs b/Runtime/ConsentClient.cs index e2d27dc..c831a7b 100644 --- a/Runtime/ConsentClient.cs +++ b/Runtime/ConsentClient.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using System.Collections.Generic; using UnityEngine; @@ -77,15 +83,13 @@ internal static void SetMediationExtras() if (active.Length != consent.Length) return; var result = new Dictionary(); - var netTags = AdNetworkExtension.GetListOfTags(); for (int i = 0; i < consent.Length; i++) { if (consent[i] != '-') { - var tagI = ( int )active[i]; - if (tagI < netTags.Length) + var tag = active[i].GetTag(); + if (tag.Length > 0) { - var tag = netTags[tagI]; result[tag + "_gdpr"] = consent[i].ToString(); //result[tag + "_ccpa"] = consent[i].ToString(); } diff --git a/Runtime/ConsentRequestParameters.cs b/Runtime/ConsentRequestParameters.cs index b9b5451..62d408d 100644 --- a/Runtime/ConsentRequestParameters.cs +++ b/Runtime/ConsentRequestParameters.cs @@ -1,6 +1,10 @@ -using System; -using System.Collections; -using System.Collections.Generic; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; namespace CAS.UserConsent diff --git a/Runtime/MediationPolicyUI.cs b/Runtime/MediationPolicyUI.cs index 8a8d402..a8be5cf 100644 --- a/Runtime/MediationPolicyUI.cs +++ b/Runtime/MediationPolicyUI.cs @@ -1,4 +1,10 @@ -using UnityEngine; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using UnityEngine; using UnityEngine.UI; namespace CAS.UserConsent diff --git a/Runtime/MediationSettingsUI.cs b/Runtime/MediationSettingsUI.cs index 1280291..45dff00 100644 --- a/Runtime/MediationSettingsUI.cs +++ b/Runtime/MediationSettingsUI.cs @@ -1,9 +1,12 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -using UnityEngine.UI; namespace CAS.UserConsent { diff --git a/Runtime/UserConsent.cs b/Runtime/UserConsent.cs index 329e246..60c7003 100644 --- a/Runtime/UserConsent.cs +++ b/Runtime/UserConsent.cs @@ -1,11 +1,17 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; namespace CAS.UserConsent { public static class UserConsent { - public const string version = "2.0.0"; + public const string version = "2.0.1"; /// /// User latest consent status values. diff --git a/Runtime/UserConsentRequest.cs b/Runtime/UserConsentRequest.cs index 7cb524f..c974b9a 100644 --- a/Runtime/UserConsentRequest.cs +++ b/Runtime/UserConsentRequest.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; using UnityEngine.Events; diff --git a/Runtime/UserConsentUI.cs b/Runtime/UserConsentUI.cs index 7305dd0..c44a398 100644 --- a/Runtime/UserConsentUI.cs +++ b/Runtime/UserConsentUI.cs @@ -1,4 +1,10 @@ -using System; +// +// Clever Ads Solutions Unity Consent Plugin +// +// Copyright © 2021 CleverAdsSolutions. All rights reserved. +// + +using System; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; diff --git a/package.json b/package.json index 0a58122..a3cf853 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "com.cleversolutions.ads.consent.unity", - "version": "2.0.0", + "version": "2.0.1", "displayName": "CleverAdsSolutions Consent", "description": "Clever Ads Solutions User consent Unity plugin.", "unity": "2017.4", "dependencies": { - "com.cleversolutions.ads.unity": "2.6.1" + "com.cleversolutions.ads.unity": "2.7.2" }, "author": { "name": "CleverAdsSolutions",