com.amanotes.gdk 0.1.20 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.1 - 2023-06-06]
+### Refactor Ads module, support ironSource
+### Refactor AmaPassport
+### Refactor AmaGDK structure
+### Add callback when RemoteConfig module completes fetching
+
 ## [0.1.20 - 2023-04-20]
 ### Refactor Adapter architure to support reading adapter config from Core
 ### Add session stat for Analytics module

package/Editor/AmaGDKEditor.cs

@@ -1,29 +1,40 @@
 using System;
-
-using UnityEngine;
-using UnityEditor;
-
+using System.Text;
 using Amanotes.Core;
 using Amanotes.Core.Internal;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Editor.AmaGUI;
 using static Amanotes.Core.AmaGDK.AdapterID;
-using System.Text;
 
 namespace Amanotes.Editor
 {
     [CustomEditor(typeof(AmaGDK))]
-    public class AmaGDKEditor : UnityEditor.Editor
+    internal class AmaGDKEditor : UnityEditor.Editor
     {
-        static Color BLUE = new Color32(0x34, 0xFF, 0xF7, 0xFF);
+        private static readonly Color BLUE = new Color32(0x34, 0xFF, 0xF7, 0xFF);
+
+        private static AmaGDK sdk;
+        private static ConfigAsset configAsset;
+        private static UnityEditor.Editor editor;
 
-        static AmaGDK sdk;
-        static ConfigAsset configAsset;
-        static UnityEditor.Editor editor;
+        private static bool showConfigDetail;
+        private static bool showAdapterInstaller;
+        private static bool showExampleDetail;
 
-        static bool showConfigDetail;
-        static bool showAdapterInstaller;
-        static bool showExampleDetail;
+        public static Color btnColor;
+        public static float btnLerp;
+
+        private static readonly string[] SDK_IDS =
+        {
+            FIREBASE_ANALYTICS,
+            FIREBASE_REMOTE_CONFIG,
+            APPSFLYER,
+            IRONSOURCE,
+            REVENUECAT
+        };
 
         public void OnEnable()
         {
@@ -32,13 +43,13 @@ namespace Amanotes.Editor
             if (configAsset == null) SearchForConfigAsset();
         }
 
-        void SearchForConfigAsset()
+        private void SearchForConfigAsset()
         {
             Resources.UnloadUnusedAssets();
             configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
         }
 
-        void KeepSearchingForConfig()
+        private void KeepSearchingForConfig()
         {
             if (EditorApplication.isUpdating || EditorApplication.isCompiling) return;
             SearchForConfigAsset();
@@ -47,7 +58,7 @@ namespace Amanotes.Editor
             EditorApplication.update -= KeepSearchingForConfig;
         }
 
-        void DrawGUI_ConfigMissing()
+        private void DrawGUI_ConfigMissing()
         {
             EditorGUILayout.HelpBox("[Warning] AmaGDK ConfigAsset NOT FOUND!\nYou need to create one to control all the adapter's configurations!", MessageType.Warning);
 
@@ -76,7 +87,7 @@ namespace Amanotes.Editor
             GUILayout.EndHorizontal();
         }
 
-        void DrawGUI_AutoInit()
+        private void DrawGUI_AutoInit()
         {
             if (sdk.autoInit)
             {
@@ -93,24 +104,25 @@ namespace Amanotes.Editor
             }
         }
 
-        void DrawGUI_ConfigDetail()
+        private void DrawGUI_ConfigDetail()
         {
             CreateCachedEditor(configAsset, null, ref editor);
-            var lbWidth = EditorGUIUtility.labelWidth;
+            float lbWidth = EditorGUIUtility.labelWidth;
             EditorGUIUtility.labelWidth = 200f;
             editor.OnInspectorGUI();
             EditorGUIUtility.labelWidth = lbWidth;
         }
 
-        void DrawGUI_ConfigAsset(){
+        private void DrawGUI_ConfigAsset()
+        {
             EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false);
         }
 
-        void DrawGUI_AdapterList()
+        private void DrawGUI_AdapterList()
         {
             for (var i = 0; i < Res.AMAGDK_ADAPTERS.Length; i++)
             {
-                var adapterName = Res.AMAGDK_ADAPTERS[i];
+                string adapterName = Res.AMAGDK_ADAPTERS[i];
                 if (GUILayout.Button(ObjectNames.NicifyVariableName(adapterName)))
                 {
                     var package = $"{Res.PACKAGE_PATH}{adapterName}.unitypackage";
@@ -119,7 +131,7 @@ namespace Amanotes.Editor
             }
         }
 
-        void DrawGUI_ExampleScene()
+        private void DrawGUI_ExampleScene()
         {
             var examplePackageName = "AmaGDKExample";
             if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
@@ -128,10 +140,7 @@ namespace Amanotes.Editor
                 AssetDatabase.ImportPackage(package, false);
             }
         }
-
-        static public Color btnColor;
-        static public float btnLerp;
-        void DrawGUI_ColorPicker()
+        private void DrawGUI_ColorPicker()
         {
             GUILayout.BeginHorizontal();
             {
@@ -140,14 +149,6 @@ namespace Amanotes.Editor
             }
             GUILayout.EndHorizontal();
         }
-        
-        private static readonly string[] SDK_IDS = new string[]{
-            FIREBASE_ANALYTICS,
-            FIREBASE_REMOTE_CONFIG,
-            APPSFLYER,
-            IRONSOURCE,
-            REVENUECAT
-        };
 
         public override void OnInspectorGUI()
         {
@@ -156,26 +157,49 @@ namespace Amanotes.Editor
             // DrawGUI_ColorPicker();
             SectionLabel($"<b>AmaGDK</b> <size=12><color=gray>v{AmaGDK.VERSION}</color></size>");
             EditorGUILayout.Space();
-            
-            for (var i =0 ;i < SDK_IDS.Length; i++)
+
+            for (var i = 0; i < SDK_IDS.Length; i++)
             {
+                string id = SDK_IDS[i];
                 AmaGUI.DrawSDKStatus(SDK_IDS[i]);
+                
+                if (id == IRONSOURCE)
+                {
+                    var lastRect = GUILayoutUtility.GetLastRect();
+                    lastRect.width = 18f;
+                    lastRect.y += 2f;
+                    showIronSourceSDKAdapter = EditorGUI.Foldout(lastRect, showIronSourceSDKAdapter, "");
+                    if (showIronSourceSDKAdapter)
+                    {
+                        DrawIRSAdapterVersions();
+                    }
+                }
             }
             EditorGUILayout.Space();
 
-            if (GUILayout.Button("version_info.tsv -> Clipboard")){
+            if (GUILayout.Button("version_info.tsv -> Clipboard"))
+            {
                 var sb = new StringBuilder();
                 sb.AppendLine("ID\tSDK VERSION\tADAPTER VERSION");
-                for (var i =0 ;i < SDK_IDS.Length; i++)
+                for (var i = 0; i < SDK_IDS.Length; i++)
                 {
-                    sb.AppendLine(SDKStatus.Get(SDK_IDS[i]).ToTSVString());
+                    var status = SDKStatus.Get(SDK_IDS[i]); 
+                    sb.AppendLine(status.ToTSVString());
+                    if (status.sdkId != IRONSOURCE) continue;
+                    if (!status.sdkInstalled || !status.adapterInstalled) continue;
+                    
+                    List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();
+                    for (var j = 0; j < list.Count; j++)
+                    {
+                        var item = list[j];
+                        sb.AppendLine($"IS{item.name}Adapter\t{item.version}");    
+                    }
                 }
-
+                
                 var tsv = sb.ToString();
                 EditorGUIUtility.systemCopyBuffer = tsv;
                 Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
-            };
-
+            }
 
             if (configAsset == null)
             {
@@ -186,15 +210,36 @@ namespace Amanotes.Editor
             DrawGUI_AutoInit();
             ToggleGroup("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
             ToggleGroup("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
+
             //("Example", ref showExampleDetail, DrawGUI_ExampleScene);
         }
 
-        private static void DrawVersion(string label, string version){
+        private static void DrawVersion(string label, string version)
+        {
             EditorGUI.BeginDisabledGroup(true);
             {
                 GUILayout.Label($"{label} v{version}", EditorStyles.largeLabel);
             }
             EditorGUI.EndDisabledGroup();
-        }        
+        }
+        public static bool showIronSourceSDKAdapter = false;
+        
+        public static void DrawIRSAdapterVersions()
+        {
+            SDKStatus status = SDKStatus.Get(IRONSOURCE);
+            if (!status.sdkInstalled) return;
+            if (!status.adapterInstalled) return;
+            if (!showIronSourceSDKAdapter) return;
+            
+            // Get the list of installed SDK & versions
+            List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();
+
+            var color = new Color(0.0f, .5f, .5f, 1f);
+            for (var i = 0; i < list.Count; i++)
+            {
+                var item = list[i];
+                SemVerGUI(item.name, item.semVer, color);
+            }
+        }
     }
-}
+}

package/Editor/AmaGDKManager.cs

@@ -4,13 +4,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Amanotes.Core;
 using UnityEditor;
+using UnityEditor.PackageManager.UI;
 using UnityEngine;
 using UnityEngine.Networking;
-
 namespace Amanotes.Editor
 {
     [Serializable]
-    public class GDKModule
+    internal class GDKModule
     {
         public string id;
         public string name;
@@ -22,18 +22,18 @@ namespace Amanotes.Editor
     }
 
     [Serializable]
-    public class BucketInfo
+    internal class BucketInfo
     {
         public PackageInfo[] packages;
     }
 
     [Serializable]
-    public class PackageInfo
+    internal class PackageInfo
     {
         public string version;
     }
 
-    public class VersionHelper
+    internal class VersionHelper
     {
         public const string PACKAGE_NAME = "com.amanotes.gdk";
 
@@ -47,12 +47,6 @@ namespace Amanotes.Editor
             return wrapper.items;
         }
 
-        [Serializable]
-        private class Wrapper<T>
-        {
-            public T[] items;
-        }
-        
         public static List<GDKModule> LoadLocalModuleInfo()
         {
             List<GDKModule> dicModule = new List<GDKModule>();
@@ -63,7 +57,7 @@ namespace Amanotes.Editor
 
                 foreach (var config in configs)
                 {
-                    GDKModule module = new GDKModule();
+                    var module = new GDKModule();
                     module.infoURL = config.infoURL;
                     module.name = config.name;
                     module.adapter = config.adapter;
@@ -78,20 +72,20 @@ namespace Amanotes.Editor
         public static void UpdateListVersions(GDKModule module)
         {
             LoadModuleInfo($"{module.infoURL}/package.json",
-            bucketInfo =>
-            {
-                if (bucketInfo != null)
+                bucketInfo =>
                 {
-                    module.versions = bucketInfo.packages.Select(p => p.version).ToArray();
-                }
-            }).StartEditorCoroutine();
+                    if (bucketInfo != null)
+                    {
+                        module.versions = bucketInfo.packages.Select(p => p.version).ToArray();
+                    }
+                }).StartEditorCoroutine();
         }
 
         private static IEnumerator LoadModuleInfo(string url, Action<BucketInfo> callback)
         {
             BucketInfo bucketInfo = null;
 
-            using (UnityWebRequest www = UnityWebRequest.Get(url))
+            using (var www = UnityWebRequest.Get(url))
             {
                 yield return www.SendWebRequest();
 
@@ -102,8 +96,14 @@ namespace Amanotes.Editor
             }
             callback(bucketInfo);
         }
+
+        [Serializable]
+        private class Wrapper<T>
+        {
+            public T[] items;
+        }
     }
-    
+
     public class AmaGDKManager : EditorWindow
     {
         private static AmaGDKManager window;
@@ -112,7 +112,6 @@ namespace Amanotes.Editor
         private GUIStyle headerStyle;
 
         #if AMAGDK_DEV
-
         [MenuItem("AmaGDK/AmaGDK Manager", priority = 1)]
         private static void ShowAmaSDKNotificationEditor()
         {
@@ -134,7 +133,7 @@ namespace Amanotes.Editor
             headerStyle.normal.textColor = Color.green;
             dicThirdparty = new Dictionary<string, string>();
             listModule = VersionHelper.LoadLocalModuleInfo();
-            foreach (GDKModule module in listModule)
+            foreach (var module in listModule)
             {
                 VersionHelper.UpdateListVersions(module);
                 dicThirdparty.Add(module.id, ExtractVersion.ThirdParty(module.id));
@@ -143,9 +142,9 @@ namespace Amanotes.Editor
 
         private void DrawUILine(int thickness = 2, int padding = 10)
         {
-            Rect r = EditorGUILayout.GetControlRect(GUILayout.Height(padding + thickness));
+            var r = EditorGUILayout.GetControlRect(GUILayout.Height(padding + thickness));
             r.height = thickness;
-            r.y += padding / 2;
+            r.y += padding / 2f;
             r.x -= 2;
             r.width += 6;
             EditorGUI.DrawRect(r, EditorGUIUtility.isProSkin ? Color.black : Color.gray);
@@ -153,9 +152,9 @@ namespace Amanotes.Editor
 
         private void ModuleInformation()
         {
-            foreach (GDKModule module in listModule)
+            foreach (var module in listModule)
             {
-                var currentVersion = module.currentVersion;
+                string currentVersion = module.currentVersion;
                 string[] versions = module.versions;
                 DrawUILine();
                 GUILayout.Label(module.name, headerStyle);
@@ -204,7 +203,7 @@ namespace Amanotes.Editor
             GUILayout.Label(string.Format("version: {0}", AmaGDK.VERSION));
             if (GUILayout.Button("Check Update", GUILayout.MaxWidth(100)))
             {
-                UnityEditor.PackageManager.UI.Window.Open(VersionHelper.PACKAGE_NAME);
+                Window.Open(VersionHelper.PACKAGE_NAME);
             }
         }