com.amanotes.gdk 0.2.21 → 0.2.23

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.23 - 2023-10-18]
+- Fix UserProfile out of main thread
+- Handle multiple Firebase's dependency check
+
+## [0.2.22 - 2023-10-11]
+- Get adapter info
+
 ## [0.2.21 - 2023-10-11]
 - RevenueCat adapter v6.0.0
 - Handle early Firebase call

package/Runtime/AmaGDK.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
@@ -8,21 +9,24 @@ using Amanotes.Core.Internal;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
-using Debug = System.Diagnostics.Debug;
 
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.21";
+        public const string VERSION = "0.2.23";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
         internal static Action _onReadyCallback;
+        internal static Action<AdapterInfo> _onAdapterReadyCallback;
         internal static bool _allowInit = false;
         public bool autoInit = true;
 
         private static ConfigAsset _config = null;
+        private static readonly Dictionary<string, AdapterInfo> _adapters = new Dictionary<string, AdapterInfo>();
+        private static readonly List<string> _firebaseServices = new List<string>() { AdapterID.FIREBASE_REMOTE_CONFIG, AdapterID.FIREBASE_ANALYTICS };
+
         internal static ConfigAsset Config
         {
             get
@@ -61,7 +65,7 @@ namespace Amanotes.Core
                 throw new Exception("[AmaGDK] " + CONFIG_NOT_FOUND);
             }
 
-            yield return User.Init();
+            yield return StartCoroutine(User.Init());
 
             float time = 0;
             float timeout = 10;
@@ -83,7 +87,7 @@ namespace Amanotes.Core
 
             _status = Status.Initialize;
             float startTime = Time.realtimeSinceStartup;
-            StringBuilder adapterInfo = new StringBuilder();
+            StringBuilder adapterAnnounce = new StringBuilder();
 
             // sort on priority
             Adapter.listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
@@ -104,8 +108,18 @@ namespace Amanotes.Core
                     break;
                 }
                 
-                adapterInfo.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL", adapter.adapterId, adapter.adapterVersion));
+                if (adapter.IsReady && _firebaseServices.Contains(adapter.adapterId))
+                {
+                    firebaseResolved = true;
+                }
+
+                var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady);
+                _adapters.Add(adapter.adapterId, adapterInfo);
+                _onAdapterReadyCallback?.Invoke(adapterInfo);
+                adapterAnnounce.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL",
+                    adapter.adapterId, adapter.adapterVersion));
             }
+            _onAdapterReadyCallback = null;
 
             // Init modules (Adapter managers)
             Analytics.Init();
@@ -115,7 +129,7 @@ namespace Amanotes.Core
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
             _onReadyCallback = null;
-            Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterInfo.ToString()}");
+            Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterAnnounce.ToString()}");
         }
 
         void RegisterUnityCallback(AdapterContext adapter)
@@ -155,6 +169,7 @@ namespace Amanotes.Core
     public partial class AmaGDK // PUBLIC APIS
     {
         public static bool isReady => _status == Status.Ready;
+        public static bool firebaseResolved { get; private set; }
 
         public static void Init(Action onReady = null)
         {
@@ -188,12 +203,40 @@ namespace Amanotes.Core
         {
             if (onReady == null)
             {
-                LogWarning("Can not add a null callback!");
+                LogWarning("Cannot add a null callback!");
                 return;
             }
             _onReadyCallback -= onReady;
             _onReadyCallback += onReady;
         }
+
+        public static void SetAdapterReadyCallback(Action<AdapterInfo> onAdapterReady)
+        {
+            if (onAdapterReady == null)
+            {
+                LogWarning("Cannot add a null callback!");
+                return;
+            }
+            _onAdapterReadyCallback -= onAdapterReady;
+            _onAdapterReadyCallback += onAdapterReady;
+        }
+
+        public static AdapterInfo GetAdapterInfo(string id)
+        {
+            if (string.IsNullOrWhiteSpace(id))
+            {
+                LogWarning("Please provide Adapter ID to get the info.");
+                return default;
+            }
+
+            if (!_adapters.ContainsKey(id))
+            {
+                LogWarning($"Adapter {id} is not found.");
+                return default;
+            }
+
+            return _adapters[id];
+        }
     }
 
     public partial class AmaGDK
@@ -238,7 +281,7 @@ namespace Amanotes.Core
         }
     }
     
-    public  partial class  AmaGDK // Switch dev mode
+    public partial class  AmaGDK // Switch dev mode
     {
         [ContextMenu("Change Dev Mode")]
         public void ChangeDevMode()
@@ -281,4 +324,18 @@ namespace Amanotes.Core
             File.WriteAllText(manifestPath, manifestJson);
         }
     }
+    
+    public struct AdapterInfo
+    {
+        public string id;
+        public string version;
+        public bool isReady;
+
+        public AdapterInfo(string id, string version, bool isReady)
+        {
+            this.id = id;
+            this.version = version;
+            this.isReady = isReady;
+        }
+    }
 }

package/package.json

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