com.amanotes.gdk 0.1.10 → 0.1.12

package/CHANGELOG.md

@@ -1,8 +1,21 @@
 # Changelog
 
+## [0.1.12 - 2023-03-01]
+### Release AmaGDK v0.1.12
+### Prioritize analytics instant config over the base config
+### Public common config
+
+## [0.1.11 - 2023-02-28]
+### Release AmaGDK v0.1.11
+### Auto start and log Appsflyer open session
+### Add analytics adapter base config
+### Analytics: count by session
+### Export example scene
+### Add AmaGDKManager
+### Refactor Adapter to support for init order configuration
+
 ## [0.1.10 - 2023-02-17]
 ### Release AmaGDK v0.1.10
-### Support accumulated event within session
 
 ## [0.1.9 - 2023-02-15]
 ### Release AmaGDK v0.1.9
@@ -26,4 +39,4 @@
 ## [0.1.2] - 2023-02-08
 ### Release AmaGDK 0.1.2
 ### FirebaseAnalytics adapter compatible with FirebaseAnalytics SDK v9
-### Appsflyer adapter compatible with Appsflyer SDK v6
+### AppsFlyer adapter compatible with AppsFlyer SDK v6

package/Editor/AmaGDKEditor.cs

@@ -1,42 +1,29 @@
+using System;
+
 using UnityEngine;
 using UnityEditor;
+
+using Amanotes.Core;
 using Amanotes.Core.Internal;
-using System;
 using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Editor.AmaGUI;
+using static Amanotes.Core.AmaGDK.AdapterID;
+using System.Text;
 
-namespace Amanotes.Core
+namespace Amanotes.Editor
 {
-    internal class EditorContext
-    {
-        [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]
-        private static void AddPrefab_AmaGDK()
-        {
-            GameObject prefab = AssetDatabase.LoadAssetAtPath<GameObject>(Res.AMAGDK_PREFAB);
-            if (prefab == null)
-            {
-                Debug.LogWarning($"Prefab [AmaGDK] not found at: {Res.AMAGDK_PREFAB}");
-                return;
-            }
-
-            GameObject newPrefab = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
-            newPrefab.name = "AmaGDK";
-            Selection.activeObject = newPrefab;
-            Selection.activeObject = null;
-            Selection.activeObject = newPrefab;
-        }
-    }
-
     [CustomEditor(typeof(AmaGDK))]
-    public class AmaGDKEditor : Editor
+    public class AmaGDKEditor : UnityEditor.Editor
     {
         static Color BLUE = new Color32(0x34, 0xFF, 0xF7, 0xFF);
 
         static AmaGDK sdk;
         static ConfigAsset configAsset;
-        static Editor editor;
+        static UnityEditor.Editor editor;
 
         static bool showConfigDetail;
         static bool showAdapterInstaller;
+        static bool showExampleDetail;
 
         public void OnEnable()
         {
@@ -66,7 +53,7 @@ namespace Amanotes.Core
 
             GUILayout.BeginHorizontal();
             {
-                if (GUIButton("CREATE", 40f, BLUE))
+                if (BigButton("CREATE", 40f, BLUE))
                 {
                     try
                     {
@@ -93,12 +80,12 @@ namespace Amanotes.Core
         {
             if (sdk.autoInit)
             {
-                GUIToggle("Auto Init", ref sdk.autoInit);
+                Toggle("Auto Init", ref sdk.autoInit);
                 return;
             }
 
             EditorGUILayout.HelpBox("You disabled AmaGDK AutoInit\nMake sure to call AmaGDK.Init() manually!", MessageType.Warning);
-            if (GUIButton("Enable AutoInit", 40f, BLUE))
+            if (BigButton("Enable AutoInit", 40f, BLUE))
             {
                 sdk.autoInit = true;
                 EditorUtility.SetDirty(sdk);
@@ -131,6 +118,16 @@ namespace Amanotes.Core
             }
         }
 
+        void DrawGUI_ExampleScene()
+        {
+            var examplePackageName = "AmaGDKExample";
+            if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
+            {
+                var package = $"{Res.PACKAGE_PATH}{examplePackageName}.unitypackage";
+                AssetDatabase.ImportPackage(package, false);
+            }
+        }
+
         static public Color btnColor;
         static public float btnLerp;
         void DrawGUI_ColorPicker()
@@ -142,72 +139,61 @@ namespace Amanotes.Core
             }
             GUILayout.EndHorizontal();
         }
+        
+        private static readonly string[] SDK_IDS = new string[]{
+            FIREBASE_ANALYTICS,
+            FIREBASE_REMOTE_CONFIG,
+            APPSFLYER,
+            IRONSOURCE,
+            REVENUECAT
+        };
 
         public override void OnInspectorGUI()
         {
             if (sdk == null) return;
 
             // DrawGUI_ColorPicker();
-
-            if (configAsset == null)
+            SectionLabel($"<b>AmaGDK</b> <size=12><color=gray>v{AmaGDK.VERSION}</color></size>");
+            EditorGUILayout.Space();
+            
+            for (var i =0 ;i < SDK_IDS.Length; i++)
             {
-                DrawGUI_ConfigMissing();
-                return;
+                AmaGUI.DrawSDKStatus(SDK_IDS[i]);
             }
+            EditorGUILayout.Space();
 
-            DrawGUI_AutoInit();
-            GUIToggleGroup("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
-            GUIToggleGroup("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
-        }
-
+            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++)
+                {
+                    sb.AppendLine(SDKStatus.Get(SDK_IDS[i]).ToTSVString());
+                }
 
+                var tsv = sb.ToString();
+                EditorGUIUtility.systemCopyBuffer = tsv;
+                Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
+            };
 
-        private static bool GUIButton(string label, float height = 16f, Color? color = null, float colorMod = 0.5f)
-        {
-            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;
-                GUI.backgroundColor = c;
-            }
+            if (configAsset == null)
             {
-                result = GUILayout.Button(label, GUILayout.Height(height));
+                DrawGUI_ConfigMissing();
+                return;
             }
-            if (color != null) GUI.backgroundColor = bgColor;
-            return result;
-        }
-
-        private static bool GUIToggle(string label, ref bool value)
-        {
-            var newValue = EditorGUILayout.Toggle(label, value);
-            if (newValue == value) return false;
 
-            value = newValue;
-            EditorUtility.SetDirty(sdk);
-            return true;
+            DrawGUI_AutoInit();
+            ToggleGroup("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
+            ToggleGroup("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
+            ToggleGroup("Example", ref showExampleDetail, DrawGUI_ExampleScene);
         }
 
-        private static bool GUIToggleGroup(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null){
-            GUILayout.BeginHorizontal();
-            var newValue = EditorGUILayout.Foldout(isOpen, label);
-            var changed = newValue != isOpen;
-            titleFunc?.Invoke();
-            GUILayout.EndHorizontal();
-
-            if (isOpen)
+        private static void DrawVersion(string label, string version){
+            EditorGUI.BeginDisabledGroup(true);
             {
-                EditorGUI.indentLevel++;
-                drawFunc();
-                EditorGUI.indentLevel--;
+                GUILayout.Label($"{label} v{version}", EditorStyles.largeLabel);
             }
-
-            if (!changed) return false;
-
-            isOpen = newValue;
-            return true;
-        }
+            EditorGUI.EndDisabledGroup();
+        }        
     }
 }

package/Editor/AmaGDKManager.cs

@@ -0,0 +1,236 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Amanotes.Core;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace Amanotes.Editor
+{
+    [Serializable]
+    public class GDKModule
+    {
+        public string id;
+        public string name;
+        public string adapter;
+        public string currentVersion;
+        public int selectIndex;
+        public string[] versions;
+        public string infoURL;
+    }
+
+    [Serializable]
+    public class BucketInfo
+    {
+        public PackageInfo[] packages;
+    }
+
+    [Serializable]
+    public class PackageInfo
+    {
+        public string version;
+    }
+
+    public class VersionHelper
+    {
+        public const string PACKAGE_NAME = "com.amanotes.gdk";
+
+        public static T[] FromJsonToArray<T>(string json)
+        {
+            if (!json.StartsWith("{\"items\":"))
+            {
+                json = $"{{\"items\":{json}}}";
+            }
+            Wrapper<T> wrapper = JsonUtility.FromJson<Wrapper<T>>(json);
+            return wrapper.items;
+        }
+
+        [Serializable]
+        private class Wrapper<T>
+        {
+            public T[] items;
+        }
+        
+        public static List<GDKModule> LoadLocalModuleInfo()
+        {
+            List<GDKModule> dicModule = new List<GDKModule>();
+            string jsonServices = Resources.Load<TextAsset>("amasdk-modules").text;
+            if (!string.IsNullOrEmpty(jsonServices))
+            {
+                GDKModule[] configs = FromJsonToArray<GDKModule>(jsonServices);
+
+                foreach (var config in configs)
+                {
+                    GDKModule module = new GDKModule();
+                    module.infoURL = config.infoURL;
+                    module.name = config.name;
+                    module.adapter = config.adapter;
+                    module.id = config.id;
+                    module.currentVersion = ExtractVersion.GDKAdapter(module.adapter);
+                    dicModule.Add(module);
+                }
+            }
+            return dicModule;
+        }
+
+        public static void UpdateListVersions(GDKModule module)
+        {
+            LoadModuleInfo($"{module.infoURL}/package.json",
+            bucketInfo =>
+            {
+                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))
+            {
+                yield return www.SendWebRequest();
+
+                while (www.isDone == false)
+                    yield return null;
+
+                bucketInfo = JsonUtility.FromJson<BucketInfo>(www.downloadHandler.text);
+            }
+            callback(bucketInfo);
+        }
+    }
+    
+    public class AmaGDKManager : EditorWindow
+    {
+        private static AmaGDKManager window;
+        private Dictionary<string, string> dicThirdparty;
+        private List<GDKModule> listModule;
+        private GUIStyle headerStyle;
+
+        #if AMAGDK_DEV
+
+        [MenuItem("AmaGDK/AmaGDK Manager", priority = 1)]
+        private static void ShowAmaSDKNotificationEditor()
+        {
+            if(window)
+            {
+                window.Show();
+                return;
+            }
+            window = GetWindow<AmaGDKManager>();
+            window.titleContent = new GUIContent("AmaGDK Manager");
+            window.minSize = new Vector2(600, 600);
+            window.Show();
+        }
+        #endif
+
+        private void OnEnable()
+        {
+            headerStyle = new GUIStyle();
+            headerStyle.normal.textColor = Color.green;
+            dicThirdparty = new Dictionary<string, string>();
+            listModule = VersionHelper.LoadLocalModuleInfo();
+            foreach (GDKModule module in listModule)
+            {
+                VersionHelper.UpdateListVersions(module);
+                dicThirdparty.Add(module.id, ExtractVersion.ThirdParty(module.id));
+            }
+        }
+
+        private void DrawUILine(int thickness = 2, int padding = 10)
+        {
+            Rect r = EditorGUILayout.GetControlRect(GUILayout.Height(padding + thickness));
+            r.height = thickness;
+            r.y += padding / 2;
+            r.x -= 2;
+            r.width += 6;
+            EditorGUI.DrawRect(r, EditorGUIUtility.isProSkin ? Color.black : Color.gray);
+        }
+
+        private void ModuleInformation()
+        {
+            foreach (GDKModule module in listModule)
+            {
+                var currentVersion = module.currentVersion;
+                string[] versions = module.versions;
+                DrawUILine();
+                GUILayout.Label(module.name, headerStyle);
+                GUILayout.BeginVertical();
+                {
+                    GUILayout.Space(10);
+                    GUILayout.BeginHorizontal(GUILayout.Width(450));
+                    {
+                        GUILayout.BeginVertical();
+                        {
+                            GUILayout.Label($"- Adapter version: {(string.IsNullOrEmpty(currentVersion) ? "None" : currentVersion)}");
+                            if (dicThirdparty != null && dicThirdparty.ContainsKey(module.id))
+                            {
+                                GUILayout.Label($"- Thirdparty version: {dicThirdparty[module.id]}");
+                            }
+                            else
+                            {
+                                GUILayout.Label("- Thirdparty version: None");
+                            }
+                        }
+                        GUILayout.EndVertical();
+
+                        GUILayout.BeginVertical();
+                        {
+                            if (versions != null && versions.Length > 0)
+                            {
+                                module.selectIndex = EditorGUILayout.Popup("Adapter all version:", module.selectIndex, versions);
+                                if (GUILayout.Button(!string.IsNullOrEmpty(currentVersion) ? "Update" : "Install"))
+                                {
+                                    // Install or update module
+                                }
+                            }
+                        }
+                        GUILayout.EndVertical();
+                    }
+                    GUILayout.EndHorizontal();
+                }
+                GUILayout.EndVertical();
+            }
+        }
+
+        private void AmaGDKCoreInformation()
+        {
+            GUILayout.Space(10);
+            GUILayout.Label("AmaGDK Core", headerStyle);
+            GUILayout.Label(string.Format("version: {0}", AmaGDK.VERSION));
+            if (GUILayout.Button("Check Update", GUILayout.MaxWidth(100)))
+            {
+                UnityEditor.PackageManager.UI.Window.Open(VersionHelper.PACKAGE_NAME);
+            }
+        }
+
+        private void OnGUI()
+        {
+            GUILayout.BeginVertical();
+            {
+                GUILayout.BeginHorizontal();
+                {
+                    GUILayout.Space(10);
+
+                    GUILayout.BeginVertical(GUILayout.MaxWidth(150));
+                    {
+                        AmaGDKCoreInformation();
+                    }
+                    GUILayout.EndVertical();
+
+                    GUILayout.BeginVertical();
+                    {
+                        ModuleInformation();
+                    }
+                    GUILayout.EndVertical();
+                }
+                GUILayout.EndHorizontal();
+            }
+            GUILayout.EndVertical();
+        }
+    }
+}

package/Editor/AmaGDKManager.cs.meta

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

package/Editor/Resources/amasdk-modules.json

@@ -0,0 +1,31 @@
+[
+    {
+        "id": "FirebaseAnalytics",
+        "name": "Firebase Analytics",
+        "adapter": "FirebaseAnalyticsAdapter",
+        "infoURL": "https://d29y8yeuyaq8nk.cloudfront.net/firebase-analytics"
+    },
+    {
+        "id": "FirebaseRemoteConfig",
+        "name": "Firebase Remote Config",
+        "adapter": "",
+        "infoURL": "https://d29y8yeuyaq8nk.cloudfront.net/firebase-remote-config"
+    },
+    {
+        "id": "AppsFlyer",
+        "name": "AppsFlyer",
+        "adapter": "AppsFlyerAdapter",
+        "infoURL": "https://d29y8yeuyaq8nk.cloudfront.net/appsflyer"
+    },
+    {
+        "id": "IronSource",
+        "name": "Ironsource",
+        "infoURL": "https://d29y8yeuyaq8nk.cloudfront.net/ama-ironsource"
+    },
+    {
+        "id": "RevenueCat",
+        "name": "Revenuecat",
+        "adapter": "",
+        "infoURL": "https://d29y8yeuyaq8nk.cloudfront.net/ama-revenuecat"
+    }
+]

package/Editor/Resources/amasdk-modules.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ea137f13e3884de083707626db8fb45
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa56aa5c6656f415ebac7089cf7cf7dc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: