com.amanotes.gdk 0.2.81-alpha.14 → 0.2.81-alpha.15

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "v0.2.81-alpha.14";
+        public const string VERSION = "v0.2.81-alpha.15";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;

package/Runtime/Consent/AmaGDK.Consent.cs

@@ -1,6 +1,7 @@
 using System;
 using Amanotes.Core.Internal;
 using UnityEngine;
+using UnityEngine.Serialization;
 using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
@@ -10,6 +11,8 @@ namespace Amanotes.Core
         public static partial class Consent //Public
         {
             private static readonly GDKTaskTracker _allConsentTaskTracker = new GDKTaskTracker();
+
+            public static void OnAllConsentsCompleted(Action onComplete) => _allConsentTaskTracker.RegisterOnCompleteCallback(onComplete);
             public static void RequestAllConsents(Action onComplete)
             {
                 _allConsentTaskTracker.RegisterOnCompleteCallback(onComplete);
@@ -72,21 +75,37 @@ namespace Amanotes.Core
                         onComplete?.Invoke(false);
                         return;
                     }
+                    
+                    void RequestATT()
+                    {
+                        ConsentHook.ATTRequest(
+                            isAllowed =>
+                            {
+                                data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
+                                data.SaveJsonToFile(false);
+                                onComplete?.Invoke(allowedATT);
+                            }
+                        );
+                    }
 
-                    ConsentHook.ATTRequest(isAllowed =>
+                    if (_config.autoGetConsent)
                     {
-                        data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
-                        data.SaveJsonToFile(false);
-                        onComplete?.Invoke(allowedATT);
-                    });
+                        // Delay 1s due to iOS issue, ATT popup will not show if we request soon at app launch
+                        GDKUtils.DelayCall(1f, RequestATT);
+                    }
+                    else
+                    {
+                        RequestATT();
+                    }
                 }
             }
-            
         }
         
         public static partial class Consent //CMP
         {
-            public static class CMP
+            public static readonly CMPConsent CMP = new CMPConsent(); 
+
+            public class CMPConsent
             {
                 /// <summary>
                 /// Determines if a consent popup should be shown to the user and displays it if required.
@@ -101,7 +120,7 @@ namespace Amanotes.Core
                 /// </param>
                 /// <param name="onError">Callback invoked with an error message if the consent
                 /// form could not be loaded or shown.</param>
-                public static void ShowConsentFormIfRequired(Action<bool> onComplete, Action<string> onError)
+                public void ShowConsentFormIfRequired(Action<bool> onComplete, Action<string> onError)
                 {
                     if (ConsentHook.ShowConsentFormIfRequired == null)
                     {
@@ -112,59 +131,17 @@ namespace Amanotes.Core
                     if (data.consentAlreadyShown)
                     {
                         Log("[Consent] Consent form has already been shown");
-                        onComplete?.Invoke(data.canShowAds);
+                        onComplete?.Invoke(data.canRequestAds);
                         return;
                     }
-                    ConsentHook.ShowConsentFormIfRequired(canShowAd =>
+                    ConsentHook.ShowConsentFormIfRequired(canRequestAds =>
                     {
-                        data.canShowAds = canShowAd;
+                        data.canRequestAds = canRequestAds;
                         data.consentAlreadyShown = true;
                         data.SaveJsonToFile(false);
-                        onComplete?.Invoke(canShowAd);
+                        onComplete?.Invoke(canRequestAds);
                     }, onError);
                 }
-                
-                /// <summary>
-                /// Forces the consent popup to be shown to the user, regardless of previous
-                /// consent status.
-                /// </summary>
-                /// <param name="onComplete">Callback invoked with a boolean indicating the
-                /// ConsentInformation.CanRequestAds() result
-                /// </param>
-                /// <param name="onError">Callback invoked with an error message if the consent
-                /// form could not be loaded or shown.</param>
-                public static void ShowPrivacyForm(Action<bool> onComplete, Action<string> onError)
-                {
-                    if (ConsentHook.CheckPrivacyOptionsRequired == null)
-                    {
-                        LogWarning("[Consent] ConsentHook.ShowPrivacyForm is not implemented");
-                        onError?.Invoke("ShowPrivacyForm is not implemented");
-                        return;
-                    }
-                    ConsentHook.ShowPrivacyForm(onComplete, onError);
-                }
-
-                /// <summary>
-                /// Determines whether privacy options are required for the current user.
-                /// Updates the consent information before returning the result.
-                /// </summary>
-                /// <param name="onComplete">Callback invoked with `true` if privacy options are required, otherwise `false`.</param>
-                public static void CheckPrivacyOptionsRequired(Action<bool> onComplete)
-                {
-                    if (ConsentHook.CheckPrivacyOptionsRequired == null)
-                    {
-                        LogWarning("[Consent] ConsentHook.CheckPrivacyOptionsRequired is not implemented");
-                        onComplete?.Invoke(false);
-                        return;
-                    }
-                    ConsentHook.CheckPrivacyOptionsRequired(onComplete);
-                }
-
-                [Obsolete("Use ShowPrivacyForm instead")]
-                public static void ForceShowPopup(Action<bool> onComplete)
-                {
-                    ShowPrivacyForm(onComplete, s => onComplete?.Invoke(false));
-                }
             }
         }
 
@@ -177,7 +154,7 @@ namespace Amanotes.Core
             internal static bool checkedATT => data.att >= Status.Allowed;
             internal static bool allowedATT => data.att == Status.Allowed;
             
-            internal enum Status
+            public enum Status
             {
                 None,
                 NotRequired,
@@ -201,14 +178,13 @@ namespace Amanotes.Core
     {
         [SerializeField] internal AmaGDK.Consent.Status att;
         [SerializeField] internal bool consentAlreadyShown;
-        [SerializeField] internal bool canShowAds;
+        [FormerlySerializedAs("canShowAds")]
+        [SerializeField] internal bool canRequestAds;
     }
 
     public static class ConsentHook
     {
         public static Action<Action<bool>, Action<string>> ShowConsentFormIfRequired;
-        public static Action<Action<bool>, Action<string>> ShowPrivacyForm;
-        public static Action<Action<bool>> CheckPrivacyOptionsRequired;
         public static Action<Action<bool>> ATTRequest;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.81-alpha.14",
+    "version": "0.2.81-alpha.15",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",

package/Runtime/Consent/GDKPrivacyButton.cs

@@ -1,25 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.UI;
-namespace Amanotes.Core
-{
-    public class GDKPrivacyButton: MonoBehaviour
-    {
-        public Button button;
-        private void Start()
-        {
-            gameObject.SetActive(false);
-            UpdateUI();
-        }
-        
-        public void OnButtonClick()
-        {
-            AmaGDK.Consent.CMP.ShowPrivacyForm(canShowAd => UpdateUI(), GDKDebug.LogWarning);
-        }
-
-        private void UpdateUI()
-        {
-            AmaGDK.Consent.CMP.CheckPrivacyOptionsRequired(required => button.interactable = required);   
-        }
-    }
-}

package/Runtime/Consent/GDKPrivacyButton.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 23184a9779a949419e702ce599a0dcc5
-timeCreated: 1733448516