com.amanotes.gdk 0.2.48 → 0.2.49

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.2.49 - 2024-01-29]
+- New feature: SDK version tracking
+- New feature: Google Consent Management (CMP)
+- New feature: Force update pop-up
+- Add event dispatcher, unit tests
+- Update user profile and map_user_id event
+- Fix accumulated_count logic
+- Fix IAP editor
+- Improve generated code for Klavar
+
 ## [0.2.48 - 2024-01-15]
 - Add GDKTest project for Unity versions 2020.3, 2021.3 and 2022.3
 - Integrate Klavar library & toolset

package/Editor/AmaGDKEditor.cs

@@ -7,9 +7,11 @@ using System.Linq;
 using System.Reflection;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.AmaGDK.AdapterID;
 using UnityObject = UnityEngine.Object;
+using UnityEvent = UnityEngine.Event;
 
 namespace Amanotes.Editor
 {
@@ -18,7 +20,7 @@ namespace Amanotes.Editor
     {
         private static readonly Color BLUE = new Color32(0x34, 0xFF, 0xF7, 0xFF);
         private static readonly Color ORANGE = new Color32(0xFF, 0xC0, 0x00, 0xFF);
-        
+
         [NonSerialized] private static AmaGDK sdk;
         [NonSerialized] private static ConfigAsset configAsset;
         [NonSerialized] private static UnityObject invalidConfigAsset;
@@ -29,13 +31,12 @@ namespace Amanotes.Editor
         private static bool showConfigDetail;
         private static bool showAdapterInstaller;
         private static bool showExampleDetail;
-        
-        
-        
+        private static bool showVersionTracking;
+
         // DO NOT PUT [NonSerialized]
         private static bool adapterScanned = false;
         private static bool searchedForConfig = false;
-        
+
         private static readonly List<string> adapterPackages = new List<string>();
 
         public static Color btnColor;
@@ -49,12 +50,12 @@ namespace Amanotes.Editor
             IRONSOURCE,
             REVENUECAT
         };
-        
+
         public void OnEnable()
         {
             sdk = (AmaGDK)target;
             if (sdk != null) sdk.transform.hideFlags = HideFlags.HideInInspector;
-            
+
             SDKStatus.ClearCache();
             TryLoadConfigAsset();
             RefreshListAdapters();
@@ -65,18 +66,18 @@ namespace Amanotes.Editor
             if (configAsset != null) return;
             if (EditorApplication.isCompiling) return;
             if (EditorApplication.isUpdating) return;
-            
+
             searchedForConfig = true;
             Resources.UnloadUnusedAssets();
-            
+
             configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
             invalidConfigAsset = configAsset == null ? Resources.Load("AmaGDKConfig") : null;
-            
+
             RefreshListAdapters();
             SDKStatus.ClearCache();
             Repaint();
         }
-        
+
         private void DrawGUI_ConfigMissing()
         {
             EditorGUI.indentLevel--;
@@ -98,7 +99,7 @@ namespace Amanotes.Editor
                         AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
                         adapterScanned = false;
                     }
-                    
+
                     if (GUILayout.Button(EditorGUIUtility.IconContent("d_Refresh@2x"), GUILayout.Width(40f), GUILayout.Height(40f)))
                     {
                         TryLoadConfigAsset();
@@ -144,7 +145,17 @@ namespace Amanotes.Editor
                 adapterPackages.Add(Path.GetFileName(adapterPath[i]));
             }
         }
-        
+
+        private void DrawGUI_VersionTracking()
+        {
+            if (GUILayout.Button("SDK Version Tracking"))
+            {
+                var package = $"{Res.PACKAGE_PATH}SDKVersionTracking.unitypackage";
+                AssetDatabase.ImportPackage(package, true);
+            }
+        }
+
+
         private void DrawGUI_AdapterList()
         {
             if (!adapterScanned) ScanForAdapterPackages();
@@ -167,7 +178,7 @@ namespace Amanotes.Editor
                 AssetDatabase.ImportPackage(package, false);
             }
         }
-        
+
         private void DrawGUI_ColorPicker()
         {
             GUILayout.BeginHorizontal();
@@ -177,7 +188,7 @@ namespace Amanotes.Editor
             }
             GUILayout.EndHorizontal();
         }
-        
+
         // public void CopyVersion()
         // {
         //     var sb = new StringBuilder();
@@ -206,7 +217,7 @@ namespace Amanotes.Editor
         {
             AmaGUI.SectionLabel($"<b>AmaGDK</b> <size=12><color=gray>v{AmaGDK.VERSION}</color></size>");
             var rect = GUILayoutUtility.GetLastRect();
-            if (Event.current.isMouse && Event.current.button == 1 && rect.Contains(Event.current.mousePosition))
+            if (UnityEvent.current.isMouse && UnityEvent.current.button == 1 && rect.Contains(UnityEvent.current.mousePosition))
             {
                 var menu = new GenericMenu();
                 menu.AddDisabledItem(new GUIContent("AmaGDK"));
@@ -218,30 +229,35 @@ namespace Amanotes.Editor
                 });
                 menu.AddItem(new GUIContent("Clear Cache"), false, () =>
                 {
-                    GDKFileUtils.ClearCacheData();    
+                    GDKFileUtils.ClearCacheData();
                 });
                 menu.ShowAsContext();
-                Event.current.Use();
+                UnityEvent.current.Use();
             }
         }
-        
+
         public override void OnInspectorGUI()
         {
+            Profiler.BeginSample("GDKEditor.OnInspectorGUI()");
+            
             if (target == null)
             {
                 EditorGUILayout.HelpBox("Target is null!", MessageType.Warning);
                 Repaint();
+                Profiler.EndSample();
                 return;
             }
-            
+
             sdk = (AmaGDK)target;
             if (sdk == null)
             {
                 EditorGUILayout.HelpBox("AmaGDK is null!", MessageType.Warning);
                 Repaint();
+                Profiler.EndSample();
                 return;
             }
             
+            
             // DrawGUI_ColorPicker();
             DrawGUI_AmaGDKBanner();
             EditorGUILayout.Space();
@@ -250,22 +266,24 @@ namespace Amanotes.Editor
             if (EditorApplication.isCompiling || EditorApplication.isUpdating)
             {
                 EditorGUILayout.HelpBox("Please wait for UnityEditor to finish compiling or importing", MessageType.Warning);
+                Profiler.EndSample();
                 return;
             }
-            
+
             if (!searchedForConfig) TryLoadConfigAsset();
             if (!adapterScanned) ScanForAdapterPackages();
-            
+
             if (configAsset == null)
             {
                 DrawGUI_ConfigMissing();
                 Repaint();
+                Profiler.EndSample();
                 return;
             }
-            
+
             configSO = new SerializedObject(configAsset);
             configSO.Update();
-            
+
             DrawProperty(configSO, "common");
             GUILayout.Space(8f);
             for (var i = 0; i < allAdapters.Count; i++)
@@ -273,15 +291,26 @@ namespace Amanotes.Editor
                 var item = allAdapters[i];
                 DrawAdapterDetail(item.id, item.adapter);
             }
-            
+
             EditorGUILayout.Space();
             AmaGUI.Foldout("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
             AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
+            AmaGUI.Foldout("SDK Version Tracking", ref showVersionTracking, DrawGUI_VersionTracking);
+            Profiler.EndSample();
         }
 
         private static List<(string id, Adapter2 adapter)> allAdapters = new List<(string, Adapter2)>();
         private static readonly Dictionary<string, bool> configOpen = new Dictionary<string, bool>();
+        private static readonly Dictionary<string, GUIContent> cacheGUIContent = new Dictionary<string, GUIContent>();
+        private static GUIContent GetGUIContent(string str)
+        {
+            if (cacheGUIContent.TryGetValue(str, out var result)) return result;
+            result = new GUIContent(str);
+            cacheGUIContent.Add(str, result);
+            return result;
+        }
         
+
         private static List<Type> FindSubClassesOf(Type baseType)
         {
             List<Type> result = new List<Type>();
@@ -296,57 +325,96 @@ namespace Amanotes.Editor
 
             return result;
         }
-        
+
         private static void RefreshListAdapters()
         {
             allAdapters = SDK_IDS
                 .Select(id => (id: id, adapter: GetAdapter(id)))
-                .OrderBy(x=> 
-                    x.adapter == null ? 2: 
+                .OrderBy(x =>
+                    x.adapter == null ? 2 :
                     x.adapter.enabled == false ? 1 :
                     -x.adapter.initOrder)
                 .ToList();
         }
-        
+
+        private static string FindBestAdapterFor(string adapterId)
+        {
+            var matched = adapterPackages
+                .Where(item => item.ToLower().Contains(adapterId.ToLower()));
+
+            return matched.First();
+        }
+
         private static void DrawAdapterDetail(string adapterId, Adapter2 adapter)
         {
             if (!configOpen.TryGetValue(adapterId, out bool isOpen))
             {
                 configOpen.Add(adapterId, isOpen = false);
             }
-            
-            if (adapter == null)
-            {
-                EditorGUILayout.HelpBox("Adapter<" + adapterId + "> not imported!", MessageType.Info);
-                return;
-            }
-            
+
+            // if (adapter == null)
+            // {
+            //     // EditorGUILayout.HelpBox("Adapter<" + adapterId + "> not imported!", MessageType.Info);
+            //     string adapterName = FindBestAdapterFor(adapterId);
+            //     var package = $"{Res.PACKAGE_PATH}{adapterName}";
+            //     
+            //     if (GUILayout.Button(adapterName))
+            //     {
+            //         AssetDatabase.ImportPackage(package, false);    
+            //     }
+            //     return;
+            // }
+
             SDKStatus status = SDKStatus.Get(adapterId);
             bool changed = AmaGUI.Foldout(ObjectNames.NicifyVariableName(adapterId), ref isOpen, () =>
             {
-                DrawSDKConfig(adapter, adapterId, status);
+                if (adapter != null)
+                {
+                    DrawSDKConfig(adapter, adapterId, status);
+                } else
+                {
+                    string adapterName = FindBestAdapterFor(adapterId);
+                    var package = $"{Res.PACKAGE_PATH}{adapterName}";
+                    if (GUILayout.Button(GetGUIContent($"Import {adapterId} Adapter"), GUILayout.Height(24f)))
+                    {
+                        AssetDatabase.ImportPackage(package, false);
+                    }
+                }
+
             }, () =>
             {
                 GUILayout.FlexibleSpace();
-                if (!adapter.enabled)
+
+                bool installed = status.adapterInstalled;
+                bool adapterActive = installed && adapter.enabled;
+
+                if (!adapterActive)
                 {
+                    GUIContent label = GetGUIContent(installed ? "disabled" : "unavailable");
                     Color c = GUI.color;
                     GUI.color = Color.yellow;
-                    GUILayout.Label("disabled", GUILayout.Width(60f));
+                    
+                    float w = EditorStyles.label.CalcSize(label).x;
+                    GUILayout.Label(label, GUILayout.Width(w));
                     GUI.color = c;
                 }
-                AmaGUI.DrawVersionTag(status.sdkVersion, status.adapterInstalled && adapter.enabled);
-                Rect titleRect = GUILayoutUtility.GetLastRect();
-                bool hit = Event.current.isMouse && titleRect.Contains(Event.current.mousePosition);
-                if (hit && Event.current.button == 1)
+
+                AmaGUI.DrawVersionTag(status.sdkVersion, adapterActive);
+
+                if (installed)
                 {
-                    Event.current.Use();
-                    CreateGenericMenu(adapter, adapterId);
+                    Rect titleRect = GUILayoutUtility.GetLastRect();
+                    bool hit = UnityEvent.current.isMouse && titleRect.Contains(UnityEvent.current.mousePosition);
+                    if (hit && UnityEvent.current.button == 1)
+                    {
+                        UnityEvent.current.Use();
+                        CreateGenericMenu(adapter, adapterId);
+                    }
                 }
             });
-            
-            
-            
+
+
+
             if (changed) configOpen[adapterId] = isOpen;
         }
 
@@ -360,10 +428,10 @@ namespace Amanotes.Editor
                 adapter.enabled = !adapter.enabled;
                 EditorUtility.SetDirty(configAsset);
             });
-            
+
             menu.ShowAsContext();
         }
-        
+
         private static void DrawSDKConfig(Adapter2 adapter, string adapterId, SDKStatus status)
         {
             if (!status.sdkInstalled)
@@ -376,13 +444,13 @@ namespace Amanotes.Editor
                 EditorGUILayout.HelpBox($"{adapterId}-GDKAdapter not installed", MessageType.Warning);
                 return;
             }
-            
+
             if (!status.adapterInstalled)
             {
                 EditorGUILayout.HelpBox($"{adapterId}-GDKAdapter not installed", MessageType.Warning);
                 return;
             }
-            
+
             DrawModuleConfig(adapter, adapterId);
         }
 
@@ -402,7 +470,7 @@ namespace Amanotes.Editor
                         GUILayout.Space(8f);
                     });
                 }
-                
+
                 if (adapter.enabled)
                 {
                     Color c = GUI.contentColor;
@@ -411,9 +479,9 @@ namespace Amanotes.Editor
                     if (adapter is IAPAdapter) EditorGUILayout.PropertyField(configSO.FindProperty("iap"), new GUIContent("Shared settings for In App Purchase Modules"));
                     if (adapter is AnalyticsAdapter) EditorGUILayout.PropertyField(configSO.FindProperty("analytics"), new GUIContent("Shared settings for Analytics Modules"));
                     if (adapter is RemoteConfigAdapter) EditorGUILayout.PropertyField(configSO.FindProperty("remoteConfig"), new GUIContent("Shared settings for Remote Config Modules"));
-                    GUI.contentColor = c;    
+                    GUI.contentColor = c;
                 }
-                configSO.ApplyModifiedProperties();    
+                configSO.ApplyModifiedProperties();
             }
             EditorGUIUtility.labelWidth -= 70;
             EditorGUI.EndDisabledGroup();
@@ -423,27 +491,27 @@ namespace Amanotes.Editor
         {
             SerializedProperty property = so.FindProperty(propertyField);
             if (property == null) return;
-            
+
             string basePath = property.propertyPath;
             var first = true;
             while (property.NextVisible(first))
             {
                 first = false;
                 if (!property.propertyPath.Contains(basePath)) break;
-                EditorGUILayout.PropertyField(property);    
+                EditorGUILayout.PropertyField(property);
             }
-            
+
             so.ApplyModifiedProperties();
         }
-        
+
         private static Adapter2 GetAdapter(string id)
         {
             if (configAsset == null) return null;
             Type configType = configAsset.GetType();
-            
+
             FieldInfo field = configType
                 .GetField(id, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-            
+
             if (field == null)
             {
                 #if AMAGDK_DEV
@@ -451,14 +519,14 @@ namespace Amanotes.Editor
                 #endif
                 return null;
             }
-            
-            var adapter = (Adapter2) field.GetValue(AmaGDK.Config);
+
+            var adapter = (Adapter2)field.GetValue(AmaGDK.Config);
             if (adapter != null) return adapter;
-            
+
             LogWarning($"Adapter <{id}> == null in ConfigAsset? (non-serialized?)");
             return null;
         }
-        
+
         public static void DrawIRSAdapterVersions()
         {
             List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();

package/Editor/AmaGDKExtra.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Amanotes.Editor
+{
+    public class AmaGDKExtra : UnityEditor.Editor
+    {
+        public static Dictionary<string, object> GetThirdPartyVersions()
+        {
+            Dictionary<string, object> dicThirdParty = new Dictionary<string, object>();
+            List<GDKModule> listModule = VersionHelper.LoadLocalModuleInfo();
+            foreach (var module in listModule)
+            {
+                VersionHelper.UpdateListVersions(module);
+                dicThirdParty.Add(module.id, ExtractVersion.ThirdParty(module.id));
+            }
+            
+            foreach (IronSourceSDKAdapter adapter in ExtractVersion.IronSourceAdapter())
+            {
+                dicThirdParty.Add(adapter.name, adapter.version);
+            }
+            
+            return dicThirdParty;
+        }
+
+        public static string FirebaseVersion()
+        {
+            string version = ExtractVersion.FirebaseAnalytics();
+            return !string.IsNullOrEmpty(version) ? version : ExtractVersion.FirebaseRemoteConfig();
+        }
+    }
+}

package/Editor/AmaGDKExtra.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 85db6a6a8ddad403ea586f9388c02be6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -35,7 +35,7 @@ namespace Amanotes.Editor
         public SemVer sdkVersion;
 
         public bool sdkInstalled => sdkVersion > SemVer.ZERO;
-        public bool adapterInstalled => sdkVersion > SemVer.ZERO;
+        public bool adapterInstalled => adapterVersion > SemVer.ZERO;
 
         public string ToTSVString()
         {

package/Extra/SDKVersionTracking.unitypackage.meta

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

package/Runtime/AmaGDK.Adapters.cs

@@ -27,15 +27,11 @@ namespace Amanotes.Core.Internal
                 return;
             }
             
-            #if UNITY_EDITOR
-            status = Status.Ready;
-            #else
             status = Status.Initialize;
             Init(success =>
             {
                 status = success ? Status.Ready : Status.Failed;
             });
-            #endif
         }
     }