com.amanotes.gdk 0.1.21 → 0.2.1

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -10,67 +10,84 @@ using static Amanotes.Core.AmaGDK.AdapterID;
 
 namespace Amanotes.Editor
 {
+    internal class IronSourceSDKAdapter
+    {
+        public string name;
+        public SemVer semVer;
+        public string version;
+
+        public IronSourceSDKAdapter(string name, string version)
+        {
+            this.name = name;
+            this.version = version;
+            semVer = new SemVer(version);
+        }
+    }
+
     [Serializable] internal class SDKStatus
     {
+
+        // 
+
+        private static readonly Dictionary<string, SDKStatus> _cache = new Dictionary<string, SDKStatus>();
         public string sdkId;
-        public SemVer sdkVersion;
         public SemVer adapterVersion;
+        public SemVer sdkVersion;
 
-        public bool sdkInstalled { get { return sdkVersion > SemVer.ZERO; }}
-        public bool adapterInstalled { get { return sdkVersion > SemVer.ZERO; }}
+        public bool sdkInstalled => sdkVersion > SemVer.ZERO;
+        public bool adapterInstalled => sdkVersion > SemVer.ZERO;
 
         public string ToTSVString()
         {
             return $"{sdkId}\t{sdkVersion}\t{adapterVersion}";
         }
-
-        // 
-
-        static readonly public Dictionary<string, SDKStatus> _cache = new Dictionary<string, SDKStatus>();
-        static public SDKStatus Get(string sdkId, bool force = false){
+        public static SDKStatus Get(string sdkId, bool force = false)
+        {
             if (!force && _cache.TryGetValue(sdkId, out var result)) return result;
 
-            result = new SDKStatus(){
+            result = new SDKStatus
+            {
                 sdkId = sdkId,
                 adapterVersion = new SemVer(ExtractVersion.GDKAdapter(sdkId)),
                 sdkVersion = new SemVer(ExtractVersion.ThirdParty(sdkId))
             };
 
-            if (_cache.ContainsKey(sdkId)){
+            if (_cache.ContainsKey(sdkId))
+            {
                 _cache[sdkId] = result;
-            } else {
+            }
+            else
+            {
                 _cache.Add(sdkId, result);
             }
-            
+
             return result;
         }
     }
 
-    public class ExtractVersion
+    internal static class ExtractVersion
     {
         public static string GDKAdapter(string sdkId)
         {
-            string version = "";
-            var adapterId = sdkId + "Adapter";
+            var version = "";
+            string adapterId = sdkId + "Adapter";
+
             // Debug.Log($"Searching for AdapterId: {adapterId}");
-            List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
-            if (assemblies != null)
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
-                foreach (Assembly assembly in assemblies)
+                foreach (var oType in assembly.GetTypes())
                 {
-                    foreach (Type oType in assembly.GetTypes())
+                    if (!oType.Name.Equals(adapterId)) continue;
+
+                    var field = oType.GetField("VERSION");
+                    if (field == null)
                     {
-                        if (!oType.Name.Equals(adapterId)) continue;
-                        
-                        var field = oType.GetField("VERSION");
-                        if (field == null) {
-                            // Debug.Log("Found: " + oType + " --> " + field);
-                            continue;
-                        }
-                        
-                        version = field.GetValue(null).ToString();
-                        return version;
+                        // Debug.Log("Found: " + oType + " --> " + field);
+                        continue;
                     }
+
+                    version = field.GetValue(null).ToString();
+                    return version;
                 }
             }
             return version.Trim();
@@ -78,87 +95,77 @@ namespace Amanotes.Editor
 
         public static string ThirdParty(string sdkId)
         {
-            string version = "";
+            var version = "";
             switch (sdkId)
             {
-                case FIREBASE_ANALYTICS     : return FirebaseAnalytics();
-                case FIREBASE_REMOTE_CONFIG : return FirebaseRemoteConfig();
-                case APPSFLYER              : return AppsFlyer();
-                case IRONSOURCE             : return Ironsource();
-                case REVENUECAT             : return RevenueCat();
-                default:
-                    Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
-                    break;
+            case FIREBASE_ANALYTICS: return FirebaseAnalytics();
+            case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
+            case APPSFLYER: return AppsFlyer();
+            case IRONSOURCE: return Ironsource();
+            case REVENUECAT: return RevenueCat();
+            default:
+                Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
+                break;
             }
             return version;
         }
-        
+
         internal static string FirebaseAnalytics()
         {
-            string version = "";
+            var version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
-            if (filesFirebase != null && filesFirebase.Length > 0)
+            if (filesFirebase.Length <= 0) return version.Trim();
+
+            for (var i = 0; i < filesFirebase.Length; i++)
             {
-                for (int i = 0; i < filesFirebase.Length; i++)
-                {
-                    XmlDocument Xdoc = new XmlDocument();
+                var Xdoc = new XmlDocument();
 
-                    Xdoc.Load(filesFirebase[i]);
-                    XmlElement root = Xdoc.DocumentElement;
+                Xdoc.Load(filesFirebase[i]);
+                var root = Xdoc.DocumentElement;
 
-                    XmlNode dataName = root.SelectSingleNode("artifactId");
-                    XmlNode dataVersion = root.SelectSingleNode("versioning/release");
+                if (root == null) continue;
+                var dataName = root.SelectSingleNode("artifactId");
+                var dataVersion = root.SelectSingleNode("versioning/release");
 
-                    if (dataName.InnerText.Contains("firebase-analytics-unity"))
-                    {
-                        version = dataVersion.InnerText;
-                        break;
-                    }
-                }
+                if (dataName == null || !dataName.InnerText.Contains("firebase-analytics-unity")) continue;
+                version = dataVersion?.InnerText;
+                break;
             }
-            return version.Trim();
+            return version?.Trim();
         }
 
         internal static string FirebaseRemoteConfig()
         {
-            string version = "";
+            var version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
-            if (filesFirebase != null && filesFirebase.Length > 0)
-            {
-                for (int i = 0; i < filesFirebase.Length; i++)
-                {
-                    XmlDocument Xdoc = new XmlDocument();
-
-                    Xdoc.Load(filesFirebase[i]);
-                    XmlElement root = Xdoc.DocumentElement;
-
-                    XmlNode dataName = root.SelectSingleNode("artifactId");
-                    XmlNode dataVersion = root.SelectSingleNode("versioning/release");
+            if (filesFirebase.Length <= 0) return version.Trim();
 
-                    if (dataName.InnerText.Contains("firebase-config-unity"))
-                    {
-                        version = dataVersion.InnerText;
-                        break;
-                    }
-                }
+            for (var i = 0; i < filesFirebase.Length; i++)
+            {
+                var Xdoc = new XmlDocument();
+                Xdoc.Load(filesFirebase[i]);
+                var root = Xdoc.DocumentElement;
+                if (root == null) continue;
+                var dataName = root.SelectSingleNode("artifactId");
+                var dataVersion = root.SelectSingleNode("versioning/release");
+                if (dataName == null || !dataName.InnerText.Contains("firebase-config-unity")) continue;
+                version = dataVersion?.InnerText;
+                break;
             }
-            return version.Trim();
+            return version?.Trim();
         }
 
         internal static string AppsFlyer()
         {
-            string version = "";
+            var version = "";
             List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
-            if (assemblies != null)
+            foreach (var assembly in assemblies)
             {
-                foreach (Assembly assembly in assemblies)
+                foreach (var oType in assembly.GetTypes())
                 {
-                    foreach (Type oType in assembly.GetTypes())
+                    if (oType.Name.Equals("AppsFlyer"))
                     {
-                        if (oType.Name.Equals("AppsFlyer"))
-                        {
-                            version = oType.GetField("kAppsFlyerPluginVersion").GetValue(null).ToString();
-                        }
+                        version = oType.GetField("kAppsFlyerPluginVersion").GetValue(null).ToString();
                     }
                 }
             }
@@ -168,24 +175,23 @@ namespace Amanotes.Editor
 
         internal static string Ironsource()
         {
-            string version = "";
-            string[] issdk = Directory.GetFiles("Assets", "IronSourceSDKDependencies.xml", System.IO.SearchOption.AllDirectories);
-            if (issdk != null && issdk.Length > 0)
-            {
-                XmlDocument Xdoc2 = new XmlDocument();
-                Xdoc2.Load(issdk[0]);
-                XmlElement root2 = Xdoc2.DocumentElement;
-                XmlNode dataVersion2 = root2.SelectSingleNode("unityversion");
-                version = dataVersion2.InnerText;
-            }
-            return version.Trim();
+            var version = "";
+            string[] issdk = Directory.GetFiles("Assets", "IronSourceSDKDependencies.xml", SearchOption.AllDirectories);
+            if (issdk.Length <= 0) return version.Trim();
+
+            var Xdoc2 = new XmlDocument();
+            Xdoc2.Load(issdk[0]);
+            var root2 = Xdoc2.DocumentElement;
+            var dataVersion2 = root2?.SelectSingleNode("unityversion");
+            version = dataVersion2?.InnerText;
+            return version?.Trim();
         }
-        
+
         internal static string RevenueCat()
         {
             string[] files = Directory.GetFiles("Assets", "PurchasesWrapper.java", SearchOption.AllDirectories);
-            string searchString = "PLUGIN_VERSION";
-            string version = "";
+            var searchString = "PLUGIN_VERSION";
+            var version = "";
             if (files.Length < 1)
             {
                 return version;
@@ -193,20 +199,44 @@ namespace Amanotes.Editor
 
             foreach (string file in files)
             {
-                using (StreamReader r = new StreamReader(file))
+                using (var r = new StreamReader(file))
                 {
                     string line;
                     while ((line = r.ReadLine()) != null)
                     {
-                        if (line.Contains(searchString))
-                        {
-                            version = line.Split('=')[1].Replace("\"", "").Replace(";", "");
-                            break;
-                        }
+                        if (!line.Contains(searchString)) continue;
+                        version = line.Split('=')[1].Replace("\"", "").Replace(";", "");
+                        break;
                     }
                 }
             }
             return version.Trim();
         }
+
+        internal static List<IronSourceSDKAdapter> IronSourceAdapter()
+        {
+            string[] filesIRadapter = Directory.GetFiles("Assets/IronSource", "IS*AdapterDependencies.xml", SearchOption.AllDirectories);
+            List<IronSourceSDKAdapter> listAdapter = new List<IronSourceSDKAdapter>();
+
+            if (filesIRadapter.Length <= 0) return listAdapter;
+            for (var i = 0; i < filesIRadapter.Length; i++)
+            {
+                var Xdoc = new XmlDocument();
+                string filePath = filesIRadapter[i];
+
+                Xdoc.Load(filePath);
+
+                var root = Xdoc.DocumentElement;
+                var version = root?.SelectSingleNode("//unityversion");
+                if (version == null) continue;
+                string name = Path.GetFileName(filePath)
+                    .Replace("AdapterDependencies.xml", "")
+                    .Replace("IS", "").Trim();
+
+                listAdapter.Add(new IronSourceSDKAdapter(name, version.InnerText));
+            }
+
+            return listAdapter;
+        }
     }
-}
+}

package/Editor/Utils/AmaGDKEditor.GUI.cs

@@ -2,22 +2,26 @@
 using Amanotes.Core.Internal;
 using UnityEditor;
 using UnityEngine;
-
 namespace Amanotes.Editor
 {
-    public static class AmaGUI
+    internal static class AmaGUI
     {
-        static Color LIGHT_BLUE = new Color(0.2f, 0.45f, 1f);
-        static Color LIGHT_GRAY = new Color(0.6f, 0.6f, 0.6f);
-        static Color DARK = new Color(0.15f, 0.15f, 0.15f, 1f);
+        private static readonly Color LIGHT_BLUE = new Color(0.2f, 0.45f, 1f);
+        private static readonly Color LIGHT_GRAY = new Color(0.6f, 0.6f, 0.6f);
+        private static readonly Color DARK = new Color(0.15f, 0.15f, 0.15f, 1f);
+
+        private static GUIStyle BIG_LABEL;
 
-        static GUIStyle BIG_LABEL = null;
+        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;
 
         public static void SectionLabel(string text)
         {
             if (BIG_LABEL == null)
             {
-                BIG_LABEL = new GUIStyle(UnityEngine.GUI.skin.label)
+                BIG_LABEL = new GUIStyle(GUI.skin.label)
                 {
                     fontSize = 18,
                     alignment = TextAnchor.MiddleCenter,
@@ -27,7 +31,7 @@ namespace Amanotes.Editor
                 BIG_LABEL.normal.textColor = Color.white;
             }
 
-            Rect rect = GUILayoutUtility.GetRect(Screen.width, 32);
+            var rect = GUILayoutUtility.GetRect(Screen.width, 32);
             rect.xMin -= 16f;
             EditorGUI.DrawRect(rect, DARK);
             EditorGUI.LabelField(rect, text, BIG_LABEL);
@@ -35,25 +39,25 @@ namespace Amanotes.Editor
 
         public static bool BigButton(string label, float height = 16f, Color? color = null, float colorMod = 0.5f)
         {
-            var bgColor = UnityEngine.GUI.backgroundColor;
+            var bgColor = GUI.backgroundColor;
 
             bool result;
             if (color != null)
             {
-                var c = (colorMod < 0f) ? Color.Lerp(color.Value, Color.black, -colorMod)
-                        : (colorMod > 0f) ? Color.Lerp(color.Value, Color.white, colorMod) : color.Value;
-                UnityEngine.GUI.backgroundColor = c;
+                var c = colorMod < 0f ? Color.Lerp(color.Value, Color.black, -colorMod)
+                    : colorMod > 0f ? Color.Lerp(color.Value, Color.white, colorMod) : color.Value;
+                GUI.backgroundColor = c;
             }
             {
                 result = GUILayout.Button(label, GUILayout.Height(height));
             }
-            if (color != null) UnityEngine.GUI.backgroundColor = bgColor;
+            if (color != null) GUI.backgroundColor = bgColor;
             return result;
         }
 
         public static bool Toggle(string label, ref bool value)
         {
-            var newValue = EditorGUILayout.Toggle(label, value);
+            bool newValue = EditorGUILayout.Toggle(label, value);
             if (newValue == value) return false;
 
             value = newValue;
@@ -63,8 +67,8 @@ namespace Amanotes.Editor
         public static bool ToggleGroup(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
         {
             GUILayout.BeginHorizontal();
-            var newValue = EditorGUILayout.Foldout(isOpen, label);
-            var changed = newValue != isOpen;
+            bool newValue = EditorGUILayout.Foldout(isOpen, label);
+            bool changed = newValue != isOpen;
             titleFunc?.Invoke();
             GUILayout.EndHorizontal();
 
@@ -81,35 +85,36 @@ namespace Amanotes.Editor
             return true;
         }
 
-        static readonly Texture2D TAG_0 = (Texture2D)EditorGUIUtility.IconContent("sv_label_0").image;
-        static readonly Texture2D TAG_1 = (Texture2D)EditorGUIUtility.IconContent("sv_icon_dot1_pix16_gizmo").image;
-        static GUIStyle versionStyle;
-        static GUIStyle tagLabelStyle;
-
-        public static void SemVerGUI(string title, SemVer version)
+        public static void SemVerGUI(string title, SemVer version, Color? color1 = null, Color? color2 = null)
         {
-            if (versionStyle == null){
-                versionStyle = new GUIStyle(EditorStyles.miniBoldLabel)
-                {
-                    alignment = TextAnchor.MiddleCenter
-                };
-            }
+            const int TAG_SIZE = 60;
+            versionStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
+            {
+                alignment = TextAnchor.MiddleCenter
+            };
 
-            var rect = GUILayoutUtility.GetRect(100, 16f);
+            var rect = GUILayoutUtility.GetRect(120, 16f);
             var rect1 = rect;
-            
+
             rect1.width /= 2;
             var rect2 = rect1;
             rect2.x += rect.width / 2f;
             
             GUI.Box(rect, GUIContent.none);
-            DrawTag(rect2, version.ToString(), version.isValid ? LIGHT_BLUE : LIGHT_GRAY, 0.5f, 2f);
+            rect2.xMin += (rect2.width-TAG_SIZE);
+            rect2.width = TAG_SIZE;
+
+            color1 ??= LIGHT_BLUE;
+            color2 ??= LIGHT_GRAY;
+            DrawTag(rect2, version.ToString(), version.isValid ? color1.Value : color2.Value, 0.5f);
 
             rect1.xMin += 4f;
+            rect1.width = rect.width - rect2.width;
             GUI.Label(rect1, title, versionStyle);
         }
-        
-        public static void DrawSDKStatus(string sdkId){
+
+        public static void DrawSDKStatus(string sdkId)
+        {
             var status = SDKStatus.Get(sdkId);
             GUILayout.BeginHorizontal();
             {
@@ -122,14 +127,12 @@ namespace Amanotes.Editor
             GUILayout.EndHorizontal();
         }
 
-        public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 2f)
+        public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 1f)
         {
-            if (tagLabelStyle == null){
-                tagLabelStyle = new GUIStyle(EditorStyles.miniBoldLabel)
-                {
-                    alignment = TextAnchor.MiddleCenter
-                };
-            }
+            tagLabelStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
+            {
+                alignment = TextAnchor.MiddleCenter
+            };
 
             rect.xMin += margin;
             rect.xMax -= margin;
@@ -138,12 +141,12 @@ namespace Amanotes.Editor
 
             tagColor.a = alpha;
             GUI.DrawTexture(rect, Texture2D.whiteTexture, ScaleMode.StretchToFill, false, 1f, tagColor, 0f, 5f);
-            
+
             rect.xMin += 4f;
             GUI.Label(rect, label, versionStyle);
         }
 
-        public static void Draw9Slice(Rect rect, Texture2D texture, 
+        public static void Draw9Slice(Rect rect, Texture2D texture,
             float l, float r, float t, float b)
         {
             float x = rect.x;
@@ -156,7 +159,7 @@ namespace Amanotes.Editor
 
             float lu = l / tw;
             float ru = (tw - r) / tw;
-            float tv = (th-t) / th;
+            float tv = (th - t) / th;
             float bv = b / th;
 
             // Calculate the sizes of the texture's center and corners.
@@ -164,19 +167,19 @@ namespace Amanotes.Editor
             float centerY = Mathf.Max(h - t - b, 0);
 
             // Draw the corners.
-            GUI.DrawTextureWithTexCoords(new Rect(x, y, l, t), texture, new Rect(0, tv, lu, t/th));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y, r, t), texture, new Rect(ru, tv, r/tw, t/th));
+            GUI.DrawTextureWithTexCoords(new Rect(x, y, l, t), texture, new Rect(0, tv, lu, t / th));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y, r, t), texture, new Rect(ru, tv, r / tw, t / th));
             GUI.DrawTextureWithTexCoords(new Rect(x, y + h - b, l, b), texture, new Rect(0, 0, lu, bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + h - b, r, b), texture, new Rect(ru, 0, r/tw, bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + h - b, r, b), texture, new Rect(ru, 0, r / tw, bv));
 
             // Draw the edges.
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y, centerX, t), texture, new Rect(lu, tv, ru-lu, t/th));
-            GUI.DrawTextureWithTexCoords(new Rect(x, y + t, l, centerY), texture, new Rect(0, bv, lu, tv-bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + t, r, centerY), texture, new Rect(ru, bv, r/tw, tv-bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + h - b, centerX, b), texture, new Rect(lu, 0, ru-lu, bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y, centerX, t), texture, new Rect(lu, tv, ru - lu, t / th));
+            GUI.DrawTextureWithTexCoords(new Rect(x, y + t, l, centerY), texture, new Rect(0, bv, lu, tv - bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + t, r, centerY), texture, new Rect(ru, bv, r / tw, tv - bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + h - b, centerX, b), texture, new Rect(lu, 0, ru - lu, bv));
 
             // Draw the center.
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + t, centerX, centerY), texture, new Rect(lu, bv, ru-lu, tv-bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + t, centerX, centerY), texture, new Rect(lu, bv, ru - lu, tv - bv));
         }
     }
 }

package/Editor/Utils/AmaGDKEditor.Utils.cs

@@ -2,12 +2,11 @@ using System;
 using System.Collections;
 using UnityEditor;
 using UnityEngine;
-
 namespace Amanotes.Editor
 {
-    public static class Utils
+    internal static class Utils
     {
-        public static void StartEditorCoroutine(this IEnumerator update, Action end = null)
+        internal static void StartEditorCoroutine(this IEnumerator update, Action end = null)
         {
             EditorApplication.CallbackFunction closureCallback = null;
 

package/Packages/AmaPassport.ATTSupport.unitypackage.meta

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

package/Packages/AmaPassport.AdvertisingID.unitypackage.meta

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

package/Packages/FirebaseRemoteConfigAdapter_v9.1.0.unitypackage.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c4acdfbf7c40646b6b8d379d00b3df5d
+guid: e92fc676e2bc74d8ab6e0e0fb24d713a
 DefaultImporter:
   externalObjects: {}
   userData: