com.amanotes.gdk 0.1.10 → 0.1.11

package/Editor/Utils/AmaGDKEditor.GUI.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace Amanotes.Editor
+{
+    public static class GUI
+    {
+        static Color LIGHT_BLUE = new Color(0.25f, 0.5f, 1f);
+        
+        static GUIStyle BIG_LABEL = null;
+
+        public static void SectionLabel(string text)
+        {
+            if (BIG_LABEL == null)
+            {
+                BIG_LABEL = new GUIStyle(UnityEngine.GUI.skin.label)
+                {
+                    fontSize = 18,
+                    alignment = TextAnchor.MiddleCenter,
+                    richText = true
+                };
+
+                BIG_LABEL.normal.textColor = Color.white;
+            }
+            
+            Rect rect = GUILayoutUtility.GetRect(Screen.width, 32);
+            rect.xMin -= 16f;
+            EditorGUI.DrawRect(rect, LIGHT_BLUE);
+            EditorGUI.LabelField(rect, text, BIG_LABEL);
+        }
+
+        public static bool BigButton(string label, float height = 16f, Color? color = null, float colorMod = 0.5f)
+        {
+            var bgColor = UnityEngine.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;
+            }
+            {
+                result = GUILayout.Button(label, GUILayout.Height(height));
+            }
+            if (color != null) UnityEngine.GUI.backgroundColor = bgColor;
+            return result;
+        }
+
+        public static bool Toggle(string label, ref bool value)
+        {
+            var newValue = EditorGUILayout.Toggle(label, value);
+            if (newValue == value) return false;
+
+            value = newValue;
+            return true;
+        }
+
+        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;
+            titleFunc?.Invoke();
+            GUILayout.EndHorizontal();
+
+            if (isOpen)
+            {
+                EditorGUI.indentLevel++;
+                drawFunc();
+                EditorGUI.indentLevel--;
+            }
+
+            if (!changed) return false;
+
+            isOpen = newValue;
+            return true;
+        }
+    }
+}

package/Editor/Utils/AmaGDKEditor.GUI.cs.meta

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

package/Editor/Utils/AmaGDKEditor.Utils.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using UnityEditor;
+using UnityEngine;
+
+namespace Amanotes.Editor
+{
+    public static class Utils
+    {
+        public static void StartEditorCoroutine(this IEnumerator update, Action end = null)
+        {
+            EditorApplication.CallbackFunction closureCallback = null;
+
+            closureCallback = () =>
+            {
+                try
+                {
+                    if (update.MoveNext() == false)
+                    {
+                        end?.Invoke();
+                        EditorApplication.update -= closureCallback;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    end?.Invoke();
+                    Debug.LogException(ex);
+                    EditorApplication.update -= closureCallback;
+                }
+            };
+
+            EditorApplication.update += closureCallback;
+        }
+    }
+}

package/Editor/Utils/AmaGDKEditor.Utils.cs.meta

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

package/Editor/Utils.meta

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

package/Packages/AmaGDKExample.unitypackage.meta

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

package/Packages/AppsflyerAdapter_v6.5.4.unitypackage.meta

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

package/Runtime/AmaGDK.Analytics.cs

@@ -8,7 +8,22 @@ using IEventParamsBuilder = Amanotes.Core.AmaGDK.Analytics.IEventParamsBuilder;
 using EventParams = Amanotes.Core.AmaGDK.Analytics.EventParams;
 
 namespace Amanotes.Core
-{    
+{
+    [Serializable]
+    public class AnalyticsAdapterBaseConfig
+    {
+        public bool SendEventByDefault;
+        public List<string> NeverSend;
+        public List<string> AlwaysSend;
+
+        public bool AllowSend(string eventName)
+        {
+            return SendEventByDefault
+                ? !NeverSend.Contains(eventName)
+                : AlwaysSend.Contains(eventName);
+        }
+    }
+
     partial class AmaGDK
     {
         //PUBLIC APIS
@@ -224,6 +239,8 @@ namespace Amanotes.Core
 
                     foreach (var m in listAdapters)
                     {
+                        if (!eventData.allowAnalyticIds.Contains(m.id))
+                            continue;
                         if (eventData.ignoreAnalyticIds.Contains(m.id))
                             continue;
                         m.GetAdapterApi<IAnalyticAdapter>().LogEvent(eventData);
@@ -288,10 +305,10 @@ namespace Amanotes.Core
             [Serializable]
             public class EventDetail
             {
-                public string eventName;
-                public int totalCount;
+                public string eventName;                
                 [NonSerialized]
                 public int countInSession;
+                public int totalCount;
             }
 
             [Flags]
@@ -360,8 +377,8 @@ namespace Amanotes.Core
                 internal (int countInSession, int totalCount) IncreaseCounter(string eventName)
                 {
                     var result = GetEventDetail(eventName, true);
-                    result.totalCount++;
                     result.countInSession++;
+                    result.totalCount++;                    
                     _dirty = true;
                     return (result.countInSession, result.totalCount);
                 }
@@ -417,7 +434,7 @@ namespace Amanotes.Core
 
             EventParams data = ap as EventParams;
             data.accumulated = true;
-            if (withinSession) data.withinSession = true;
+            data.withinSession = withinSession;
             return ap;
         }
 
@@ -480,6 +497,23 @@ namespace Amanotes.Core
             return ap;
         }
 
+        public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, params (string key, object value)[] parameters)
+        {
+            if (ap == null) return null;
+            if (parameters.Length == 0)
+            {
+                LogWarning($"Param tuple is null. Event name: {(ap as EventParams).eventName}!");
+                return ap;
+            }
+
+            foreach (var kvp in parameters)
+            {
+                if (IsValidKeyValue(ap, kvp.key, kvp.value))
+                    ap.AddParam(kvp.key, kvp.value);
+            }
+            return ap;
+        }
+
         static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
         {
             string eventName = (ap as EventParams).eventName;

package/Runtime/AmaGDK.Internal.cs

@@ -5,6 +5,10 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
 namespace Amanotes.Core.Internal
 {
     public enum Status
@@ -38,9 +42,29 @@ namespace Amanotes.Core.Internal
         public static readonly string[] AMAGDK_ADAPTERS = new string[]
         {
             "FirebaseAnalyticsAdapter_v9.1.0",
-            //"AppsflyerAdapter_v6.5.4",
+            "AppsflyerAdapter_v6.5.4",
             // "IronsourceAdapter_v7.2.6",
         };
+
+#if UNITY_EDITOR
+
+        [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]
+        private static void AddAmaGDKPrefab()
+        {
+            GameObject prefab = AssetDatabase.LoadAssetAtPath<GameObject>(AMAGDK_PREFAB);
+            if (prefab == null)
+            {
+                Debug.LogWarning($"Prefab [AmaGDK] not found at: {AMAGDK_PREFAB}");
+                return;
+            }
+
+            GameObject newPrefab = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
+            newPrefab.name = "AmaGDK";
+            newPrefab.transform.SetAsLastSibling();
+            Selection.activeObject = null;
+            Selection.activeObject = newPrefab;
+        }
+#endif
     }
 
 

package/Runtime/AmaGDK.cs

@@ -12,7 +12,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.1.10";
+        public const string VERSION = "0.1.11";
 
         internal static AmaGDK _instance;
         internal static event Action _frameUpdate;
@@ -177,7 +177,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 IRONSOURCE = "ironSource";
+            public const string IRONSOURCE = "IronSource";
             public const string REVENUECAT = "RevenueCat";     
         }
     }

package/Samples~/Example/AmaGDKExample.cs

@@ -0,0 +1,87 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Amanotes.Core;
+
+public class AmaGDKExample : MonoBehaviour
+{
+    private void Start()
+    {
+        //Config: log at even count
+        AmaGDK.Analytics.SetLogEventCondition((eventDetail) =>
+        {
+            if (eventDetail.eventName == "even_count")
+            {
+                return eventDetail.count % 2 == 0;
+            }
+
+            return true;
+        });
+    }
+
+    public void OnInitSDKClick()
+    {
+        AmaGDK.Init();            
+    }
+
+    public void OnLogEventClick()
+    {
+        Debug.Log("Log test event");
+        AmaGDK.Analytics.LogEvent("TestEvent");
+    }
+
+    public void SaveUser()
+    {
+        var user = AmaGDK.User;
+        user.amaId = "3";
+        user.amaDeviceId = "4";
+        Debug.Log($"[Save] ama_id: {user.amaId},\nama_device_id: {user.amaDeviceId}");
+        AmaGDK.User.Save();
+    }
+
+    public void LoadUser()
+    {            
+        var user = AmaGDK.User;
+        Debug.Log($"[Load] ama_id: {user.amaId},\nama_device_id: {user.amaDeviceId}");
+    }
+
+    public void LogFunnelWithSignature()
+    {
+        AmaGDK.Analytics.LogFunnelEvent("funnel", "TestFunnel1");
+    }
+
+    public void LogFunnelWithoutSignature()
+    {
+        AmaGDK.Analytics.LogFunnelEvent("funnel");
+    }
+
+    public void LogAccumulatedEvent()
+    {
+        AmaGDK.Analytics.LogEvent("accu").SetAsAccumulated();                
+    }
+
+    public void LogWithEven()
+    {
+        AmaGDK.Analytics.LogEvent("even_count");
+    }
+
+        public void ShowBanner()
+        {
+            AmaGDK.Ads.ShowBanner();
+        }
+
+        public void HideBanner()
+        {
+            AmaGDK.Ads.HideBanner();
+        }
+
+        public void ShowInterstitial()
+        {
+            AmaGDK.Ads.ShowInterstitial();
+        }
+
+        public void ShowReward()
+        {
+            AmaGDK.Ads.ShowRewardedVideo();
+        }
+}

package/Samples~/Example/AmaGDKExample.cs.meta

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