com.amanotes.gdk 0.2.22 → 0.2.25

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.2.25 - 2023-10-25]
+Update Ads module: 
+- OnRewardedAvailable
+- OnRewardedUnavailable
+- OnAdImpression
+- Report internet condition in ShowAdFail
+- Polish display of ironSource config's inspector
+- Move SKAdnetwork's destination to Editor
+
+## [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
 

package/Editor/AmaGDKEditor.cs

@@ -112,14 +112,14 @@ namespace Amanotes.Editor
         {
             CreateCachedEditor(configAsset, null, ref editor);
             float lbWidth = EditorGUIUtility.labelWidth;
-            EditorGUIUtility.labelWidth = 200f;
+            EditorGUIUtility.labelWidth = 220f;
             editor.OnInspectorGUI();
             EditorGUIUtility.labelWidth = lbWidth;
         }
 
         private void DrawGUI_ConfigAsset()
         {
-            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false);
+            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false, GUILayout.Width(EditorGUIUtility.currentViewWidth - 414), GUILayout.ExpandWidth(true));
         }
 
         private void UpdateListAdapter()

package/Editor/MatchSDKVersion.cs

@@ -142,7 +142,7 @@ namespace Amanotes.Core
 
         private static string GetSDKName(string packageName)
         {
-            return sdkToClassMap.Keys.FirstOrDefault(sdk => packageName.Contains(sdk));
+            return sdkToClassMap.Keys.FirstOrDefault(sdk => packageName.Contains(sdk)) ?? "";
         }
     }
 }

package/Editor/Utils/AmaGDKEditor.GUI.cs

@@ -63,9 +63,12 @@ namespace Amanotes.Editor
 
         public static bool Toggle(string label, ref bool value)
         {
+            float lbWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = 220f;
             bool newValue = EditorGUILayout.Toggle(label, value);
+            EditorGUIUtility.labelWidth = lbWidth;
+            
             if (newValue == value) return false;
-
             value = newValue;
             return true;
         }

package/Runtime/AmaGDK.Ads.cs

@@ -64,6 +64,18 @@ namespace Amanotes.Core
             return ad;
         }
 
+        public static IAdCallback OnRewardedVideoComplete(this IAdCallback ad, Action<bool> callback)
+        {
+            if (ad == null)
+                return null;
+            void RewardedVideoComplete()
+            {
+                callback(Ads.context.hasReward);
+            }
+            Ads.context.onClosed -= RewardedVideoComplete;
+            Ads.context.onClosed += RewardedVideoComplete;
+            return ad;
+        }
     }
 
     public partial class AmaGDK // Ads module
@@ -306,6 +318,7 @@ namespace Amanotes.Core.Internal
     {
         public readonly AdType adType;
         public readonly string placementName;
+        public string errorMessage;
         public readonly Dictionary<string, object> userData;
         public AdCallback adCallback;
 
@@ -473,6 +486,9 @@ namespace Amanotes.Core.Internal
                 if (Ads._adConfig.checkInternet && !hasInternet)
                 {
                     _showState = ShowAdsState.ShowFail;
+                    Ads.context.errorMessage = "Please check you internet connection";
+                    if (_isInterstitial) Ads.Events.OnInterstitialShowFailed?.Invoke();
+                    else Ads.Events.OnRewardedShowFailed?.Invoke();
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
@@ -734,6 +750,8 @@ namespace Amanotes.Core.Internal
 
     public class AdListener
     {
+        public Action OnRewardedAvailable;
+        public Action OnRewardedUnavailable;
         public Action OnRewardedOpened;
         public Action OnRewardedReceived;
         public Action OnRewardedClicked;
@@ -749,5 +767,6 @@ namespace Amanotes.Core.Internal
         public Action<string> OnInterstitialLoadFailed;
 
         public Action OnShowTimeout;
+        public Action<object> OnAdImpression;
     }
 }

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.22";
+        public const string VERSION = "0.2.25";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -25,6 +25,7 @@ namespace Amanotes.Core
 
         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
         {
@@ -56,7 +57,7 @@ namespace Amanotes.Core
             _allowInit = _allowInit || autoInit;
             StartCoroutine(InitRoutine());
         }
-
+        
         IEnumerator InitRoutine()
         {
             if (Config == null)
@@ -64,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;
@@ -95,7 +96,7 @@ namespace Amanotes.Core
                 Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder}");
                 adapter.Init();
                 RegisterUnityCallback(adapter);
-
+                
                 time = 0;
 
                 while (!adapter.IsReady)
@@ -106,6 +107,11 @@ namespace Amanotes.Core
                     LogWarning($"{adapter.adapterId} init time out: {timeout}");
                     break;
                 }
+                
+                if (adapter.IsReady && _firebaseServices.Contains(adapter.adapterId))
+                {
+                    firebaseResolved = true;
+                }
 
                 var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady);
                 _adapters.Add(adapter.adapterId, adapterInfo);
@@ -130,15 +136,13 @@ namespace Amanotes.Core
         {
             switch (adapter)
             {
-                case IOnFrameUpdate a:
-                {
+                case IOnFrameUpdate a: {
                     onFrameUpdate -= a.OnFrameUpdate;
                     onFrameUpdate += a.OnFrameUpdate;
                     break;
                 }
 
-                case IOnApplicationPause a:
-                {
+                case IOnApplicationPause a: {
                     onApplicationPause -= a.OnApplicationPause;
                     onApplicationPause += a.OnApplicationPause;
                     break;
@@ -150,21 +154,22 @@ namespace Amanotes.Core
                     applicationFocus += a.OnApplicationFocus;
                     break;
                 }
-
+                
                 case IOnApplicationQuit a:
                 {
                     applicationQuit -= a.OnApplicationQuit;
                     applicationQuit += a.OnApplicationQuit;
-                    break;
+                    break;  
                 }
             }
         }
-
+        
     }
 
     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)
         {

package/package.json

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