com.amanotes.gdk 0.2.10 → 0.2.12

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.2.12 - 2023-07-07]
+### Restructure GDK - symlink GDK source to unity projects
+### Unity 2019 compatible - no null coalescing
+### Remove redundant AmaPassport config field
+### Auto request AmaId
+
+## [0.2.11 - 2023-06-29]
+### SetLogCondition with EventParam
+### Rename Migrated -> HasMigrated
+### Fix StopShowAd
+
 ## [0.2.10 - 2023-06-23]
 ### Extra package: Project Panel
 ### Remote config: Allow user to enable / disable automatic default valuye updating (in play mode)

package/Editor/AmaGDKEditor.cs

@@ -32,6 +32,7 @@ namespace Amanotes.Editor
             FIREBASE_ANALYTICS,
             FIREBASE_REMOTE_CONFIG,
             APPSFLYER,
+            ADJUST,
             IRONSOURCE,
             REVENUECAT
         };

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -101,6 +101,7 @@ namespace Amanotes.Editor
             case FIREBASE_ANALYTICS: return FirebaseAnalytics();
             case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
             case APPSFLYER: return AppsFlyer();
+            case ADJUST: return Adjust();
             case IRONSOURCE: return Ironsource();
             case REVENUECAT: return RevenueCat();
             default:
@@ -172,6 +173,25 @@ namespace Amanotes.Editor
 
             return version.Trim();
         }
+        
+        internal static string Adjust()
+        {
+            var version = "";
+            List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+            foreach (var assembly in assemblies)
+            {
+                foreach (var oType in assembly.GetTypes())
+                {
+                    if (oType.Name.Equals("AdjustAndroid") || oType.Name.Equals("AdjustiOS") )
+                    {
+                        version = oType.GetField("sdkPrefix", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null).ToString();
+                        version = version.StartsWith("unity") ? version.Substring(5) : "";
+                    }
+                }
+            }
+
+            return version.Trim();
+        }
 
         internal static string Ironsource()
         {

package/Editor/Utils/AmaGDKEditor.GUI.cs

@@ -14,8 +14,14 @@ namespace Amanotes.Editor
 
         private static readonly Texture2D TAG_0 = (Texture2D)EditorGUIUtility.IconContent("sv_label_0").image;
         private static readonly Texture2D TAG_1 = (Texture2D)EditorGUIUtility.IconContent("sv_icon_dot1_pix16_gizmo").image;
-        private static GUIStyle versionStyle;
-        private static GUIStyle tagLabelStyle;
+        private static GUIStyle versionStyle = new GUIStyle(EditorStyles.miniBoldLabel)
+        {
+            alignment = TextAnchor.MiddleCenter
+        };
+        private static GUIStyle tagLabelStyle = new GUIStyle(EditorStyles.miniBoldLabel)
+        {
+            alignment = TextAnchor.MiddleCenter
+        };
 
         public static void SectionLabel(string text)
         {
@@ -88,11 +94,6 @@ namespace Amanotes.Editor
         public static void SemVerGUI(string title, SemVer version, Color? color1 = null, Color? color2 = null)
         {
             const int TAG_SIZE = 60;
-            versionStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
-            {
-                alignment = TextAnchor.MiddleCenter
-            };
-
             var rect = GUILayoutUtility.GetRect(120, 16f);
             var rect1 = rect;
 
@@ -104,8 +105,8 @@ namespace Amanotes.Editor
             rect2.xMin += (rect2.width-TAG_SIZE);
             rect2.width = TAG_SIZE;
 
-            color1 ??= LIGHT_BLUE;
-            color2 ??= LIGHT_GRAY;
+            if (!color1.HasValue) color1 = LIGHT_BLUE;
+            if (!color2.HasValue) color2 = LIGHT_GRAY;
             DrawTag(rect2, version.ToString(), version.isValid ? color1.Value : color2.Value, 0.5f);
 
             rect1.xMin += 4f;
@@ -129,11 +130,6 @@ namespace Amanotes.Editor
 
         public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 1f)
         {
-            tagLabelStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
-            {
-                alignment = TextAnchor.MiddleCenter
-            };
-
             rect.xMin += margin;
             rect.xMax -= margin;
             rect.yMin += margin;

package/Packages/AdjustAdapter_v4.33.0.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f2d9b3b564a254fc7914e00113b51329
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Ads.cs

@@ -416,6 +416,11 @@ namespace Amanotes.Core.Internal
         {
             Log($"[Ad] {adType} StopShowAd");
             _showState = ShowAdsState.None;
+            if (_loadState == LoadAdsState.Ready && !isAdReady)
+            {
+                _loadState = LoadAdsState.None;
+                StartLoadAd();
+            }
             RestoreVolume();
             if (_showAdRoutine == null) return;
             _instance.StopCoroutine(_showAdRoutine);

package/Runtime/AmaGDK.Analytics.cs

@@ -29,13 +29,13 @@ namespace Amanotes.Core
         //PUBLIC APIS
         public static partial class Analytics
         {
-            public static bool Migrated => localData.migrationLog.count > 0;
+            public static bool HasMigrated => localData.migrationLog.count > 0;
 
             public interface IEventParamsBuilder { }            
 
             public class EventParams : IEventParamsBuilder
             {
-                public string eventName;
+                public readonly string eventName;
                 public Dictionary<string, object> parameters = new Dictionary<string, object>();
                 public string funnelSignature;
                 public bool accumulated;
@@ -45,6 +45,8 @@ namespace Amanotes.Core
                 public HashSet<string> ignoreAdapterIds = new HashSet<string>();
                 public HashSet<string> allowAdapterIds = new HashSet<string>();
 
+                public EventDetail EventDetail => localData.GetEventDetail(eventName, true);
+
                 public EventParams(string eventName)
                 {
                     this.eventName = eventName;
@@ -126,7 +128,7 @@ namespace Amanotes.Core
                 return eventDetail != null ? (withinSession ? eventDetail.countInSession : eventDetail.totalCount) : 0;
             }
 
-            public static void SetLogEventCondition(Predicate<EventDetail> condition)
+            public static void SetLogEventCondition(Predicate<EventParams> condition)
             {
                 if (logEventHook != null) LogWarning("LogEventCondition has already set! Please make sure to call it once.");
                 logEventHook = condition;
@@ -281,7 +283,7 @@ namespace Amanotes.Core
             }
 
             internal static readonly Dictionary<string, EventConfig> sendAtCount = new Dictionary<string, EventConfig>();
-            internal static Predicate<EventDetail> logEventHook = null;
+            internal static Predicate<EventParams> logEventHook = null;
             internal static readonly Queue<EventParams> eventQueue = new Queue<EventParams>();
             internal static readonly List<AdapterContext> listAdapters = new List<AdapterContext>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
@@ -317,7 +319,7 @@ namespace Amanotes.Core
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     if (Config.common.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-					if (showAnalyticsLog) Debug.Log($"AmaGDK v{AmaGDK.VERSION} | Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+					if (showAnalyticsLog) Debug.Log($"AmaGDK | Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
 
                     var inUseAdapterIDs = new List<string>();
                     foreach (AdapterContext m in listAdapters)
@@ -406,7 +408,7 @@ namespace Amanotes.Core
                 if (logEventHook != null)
                 {
                     EventDetail eventDetail = localData.GetEventDetail(eventData.eventName, true);
-                    return logEventHook(eventDetail);
+                    return logEventHook(eventData);
                 }
 
                 return true;

package/Runtime/AmaGDK.Internal.cs

@@ -44,6 +44,7 @@ namespace Amanotes.Core.Internal
         {
             "FirebaseAnalyticsAdapter_v9.1.0",
             "AppsFlyerAdapter_v6.5.4",
+            "AdjustAdapter_v4.33.0",
             "IronsourceAdapter_v7.2.6",
             "FirebaseRemoteConfigAdapter_v9.1.0"            
         };

package/Runtime/AmaGDK.cs

@@ -10,7 +10,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.10";
+        public const string VERSION = "0.2.12";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -197,6 +197,7 @@ namespace Amanotes.Core
             public const string FIREBASE_ANALYTICS = "FirebaseAnalytics";
             public const string FIREBASE_REMOTE_CONFIG = "FirebaseRemoteConfig";
             public const string APPSFLYER = "AppsFlyer";
+            public const string ADJUST = "Adjust";
             public const string IRONSOURCE = "IronSource";
             public const string REVENUECAT = "RevenueCat";
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.10",
+    "version": "0.2.12",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",