com.amanotes.gdk 0.1.21 → 0.2.2

package/Runtime/AmaGDK.Analytics.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using UnityEngine;
 using System.Text;
-
 using Amanotes.Core.Internal;
+using UnityEngine;
+using static Amanotes.Core.AmaGDK.Analytics;
 using static Amanotes.Core.Internal.Logging;
-using IEventParamsBuilder = Amanotes.Core.AmaGDK.Analytics.IEventParamsBuilder;
-using EventParams = Amanotes.Core.AmaGDK.Analytics.EventParams;
 
 namespace Amanotes.Core
 {
@@ -95,16 +93,16 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName, Dictionary<string, object> parameters)
             {
-                return LogEvent(eventName).AddParam(parameters);                
+                return LogEvent(eventName).AddParam(parameters);
             }
 
             public static IEventParamsBuilder LogEvent(string eventName, params (string, object)[] parameters)
             {
-                var result = LogEvent(eventName);
-                for (var i = 0;i < parameters.Length; i++)
+                IEventParamsBuilder result = LogEvent(eventName);
+                for (var i = 0; i < parameters.Length; i++)
                 {
                     result.AddParam(parameters[i].Item1, parameters[i].Item2);
-                }                
+                }
                 return result;
             }
 
@@ -143,7 +141,7 @@ namespace Amanotes.Core
                     return;
                 }
 
-                foreach (var s in listAdapters)
+                foreach (AdapterContext s in listAdapters)
                 {
                     s.GetAdapterApi<IAnalyticAdapter>().SetUserId(userId);
                 }
@@ -157,17 +155,17 @@ namespace Amanotes.Core
                     return;
                 }
 
-                foreach (var s in listAdapters)
+                foreach (AdapterContext s in listAdapters)
                 {
                     s.GetAdapterApi<IAnalyticAdapter>().SetUserProperty(key, value);
                 }
             }
-            
+
             private static IntegrityFlag MergeData(List<string> funnelEvents, Dictionary<string, int> eventCountMap, bool sumEventCount)
             {
                 var flag = IntegrityFlag.Ok;
 
-                foreach (var e in funnelEvents)
+                foreach (string e in funnelEvents)
                 {
                     if (localData.funnelSignatures.Contains(e)) continue;
 
@@ -175,9 +173,9 @@ namespace Amanotes.Core
                     localData.AddFunnelSignature(e);
                 }
 
-                foreach (var e in eventCountMap)
+                foreach (KeyValuePair<string, int> e in eventCountMap)
                 {
-                    var eventDetail = localData.GetEventDetail(e.Key);
+                    EventDetail eventDetail = localData.GetEventDetail(e.Key);
                     if (eventDetail == null)
                     {
                         localData.eventDetails.Add(new EventDetail
@@ -205,7 +203,7 @@ namespace Amanotes.Core
 
             public static void Migrate(List<string> lsFunnelEvents, Dictionary<string, int> dicEventCounts)
             {
-                var migrationLog = localData.migrationLog;
+                MigrationLog migrationLog = localData.migrationLog;
 
                 //First time
                 if (migrationLog.count == 0)
@@ -216,12 +214,11 @@ namespace Amanotes.Core
                 }
 
                 //Integrity check
-                if (!Config.common.checkMigrationIntegrity)
-                    return;
+                if (!Config.common.checkMigrationIntegrity) return;
 
                 // False: DO NOT UPDATE EXISTED COUNT VALUE BECAUSE WE DON'T HAVE
                 // ENOUGH INFORMATION TO DECIDE WHICH ONE IS MORE ACCURATE
-                var flag = MergeData(lsFunnelEvents, dicEventCounts, false);
+                IntegrityFlag flag = MergeData(lsFunnelEvents, dicEventCounts, false);
                 if (flag == IntegrityFlag.Ok) return;
 
                 localData.UpdateMigrationLog();
@@ -229,9 +226,9 @@ namespace Amanotes.Core
 
             public static void OnlyAllowEvents(List<string> eventNames, params string[] adapterIDs)
             {
-                foreach (var adapterID in adapterIDs)
+                foreach (string adapterID in adapterIDs)
                 {
-                    var adapter = listAdapters.Find(a => a.adapterId == adapterID);
+                    AdapterContext adapter = listAdapters.Find(a => a.adapterId == adapterID);
                     if (adapter == null) continue;
 
                     var config = adapter.GetAdapterConfig<AnalyticsAdapterConfig>();
@@ -241,9 +238,9 @@ namespace Amanotes.Core
 
             public static void OnlyBanEvents(List<string> eventNames, params string[] adapterIDs)
             {
-                foreach (var adapterID in adapterIDs)
-                {                    
-                    var adapter = listAdapters.Find(a => a.adapterId == adapterID);
+                foreach (string adapterID in adapterIDs)
+                {
+                    AdapterContext adapter = listAdapters.Find(a => a.adapterId == adapterID);
                     if (adapter == null) continue;
 
                     var config = adapter.GetAdapterConfig<AnalyticsAdapterConfig>();
@@ -264,14 +261,14 @@ namespace Amanotes.Core
                 if (sendAtCount.ContainsKey(eventName))
                 {
                     LogWarning($"{eventName} has already been set list of count number to log.");
-                    sendAtCount[eventName] = config;                    
+                    sendAtCount[eventName] = config;
                 }
                 else
                 {
                     sendAtCount.Add(eventName, config);
-                }                
+                }
+            }
             }
-        }
 
         //INTERNAL
         public static partial class Analytics
@@ -296,8 +293,8 @@ namespace Amanotes.Core
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter.FindAll<IAnalyticAdapter>());
 
-                _frameUpdate -= ProcessEventQueue;
-                _frameUpdate += ProcessEventQueue;
+                onFrameUpdate -= ProcessEventQueue;
+                onFrameUpdate += ProcessEventQueue;
             }
 
             internal static void ProcessEventQueue()
@@ -311,23 +308,22 @@ namespace Amanotes.Core
                     var eventData = eventQueue.Dequeue();
                     var (countInSession, totalCount) = localData.IncreaseCounter(eventData.eventName);
 
-                    if (!ShouldSendEvent(eventData))
-                        continue;
+                    if (!ShouldSendEvent(eventData)) continue;
 
                     if (eventData.accumulated)
                     {
                         eventData.AddParam("accumulated_count", eventData.withinSession ? countInSession : totalCount);
                     }
 
-                    var eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
+                    string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     NormalizeEventName(ref eventNameToSend);
 
 					if (showAnalyticsLog) Debug.Log($"[AmaGDK] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n" +
-                                                    $"Params:\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                            $"Params:\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
 
                     var inUseAdapterIDs = new List<string>();
-                    foreach (var m in listAdapters)
-                    {                        
+                    foreach (AdapterContext m in listAdapters)
+                    {
                         var api = m.GetAdapterApi<IAnalyticAdapter>();
                         var config = m.GetAdapterConfig<AnalyticsAdapterConfig>();
 
@@ -364,16 +360,16 @@ namespace Amanotes.Core
 
             internal static void NormalizeEventName(ref string eventName)
             {
-                var sb = tmpWarningSB;
+                StringBuilder sb = tmpWarningSB;
                 sb.Clear();
 
                 if (string.IsNullOrEmpty(eventName))
                 {
-                    sb.AppendLine($" - EventName should not be empty");
+                    sb.AppendLine(" - EventName should not be empty");
                     return;
-                }                    
+                }
 
-                var normalizedEventName = eventName.Trim()
+                string normalizedEventName = eventName.Trim()
                     .Replace(' ', '_')
                     .Replace('-', '_');
 
@@ -411,7 +407,7 @@ namespace Amanotes.Core
                 //Check the rule to log event
                 if (logEventHook != null)
                 {
-                    var eventDetail = localData.GetEventDetail(eventData.eventName, true);
+                    EventDetail eventDetail = localData.GetEventDetail(eventData.eventName, true);
                     return logEventHook(eventDetail);
                 }
 
@@ -425,10 +421,10 @@ namespace Amanotes.Core
             [Serializable]
             public class EventDetail
             {
-                public string eventName;                
+                public string eventName;
+                public int totalCount;
                 [NonSerialized]
                 public int countInSession;
-                public int totalCount;
             }
 
             [Serializable]
@@ -436,12 +432,12 @@ namespace Amanotes.Core
             {
                 public string eventNameToSend;
                 public List<string> adapters;
-                public string parameters;                
+                public string parameters;
 
                 public EventStat(string eventNameToSend, EventParams eventParams, List<string> adapterIDs)
                 {
                     this.eventNameToSend = eventNameToSend;
-                    parameters = JsonUtils.DictionaryToJson(eventParams.parameters, false);
+                    parameters = JsonUtils.DictionaryToJson(eventParams.parameters);
                     adapters = adapterIDs;
                 }
 
@@ -483,17 +479,17 @@ namespace Amanotes.Core
             [Serializable]
             internal class AnalyticsData : IJsonFile
             {
-                [NonSerialized] internal bool _dirty = false;                
 
                 public List<string> funnelSignatures = new List<string>();
                 public List<EventDetail> eventDetails = new List<EventDetail>();
-                public MigrationLog migrationLog = new MigrationLog();                
+                public MigrationLog migrationLog = new MigrationLog();
+                [NonSerialized] internal bool _dirty;
 
                 internal EventDetail GetEventDetail(string eventName, bool autoNew = false)
                 {
                     if (string.IsNullOrEmpty(eventName)) return null;
 
-                    var result = eventDetails.Find(e => e.eventName == eventName);
+                    EventDetail result = eventDetails.Find(e => e.eventName == eventName);
                     if (result != null) return result;
                     if (autoNew == false) return null;
 
@@ -508,10 +504,7 @@ namespace Amanotes.Core
 
                 internal bool AddFunnelSignature(string signature)
                 {
-                    if (funnelSignatures.Contains(signature))
-                    {
-                        return false;
-                    }
+                    if (funnelSignatures.Contains(signature)) return false;
 
                     _dirty = true;
                     funnelSignatures.Add(signature);
@@ -520,9 +513,9 @@ namespace Amanotes.Core
 
                 internal (int countInSession, int totalCount) IncreaseCounter(string eventName)
                 {
-                    var result = GetEventDetail(eventName, true);
+                    EventDetail result = GetEventDetail(eventName, true);
                     result.countInSession++;
-                    result.totalCount++;                    
+                    result.totalCount++;
                     _dirty = true;
                     return (result.countInSession, result.totalCount);
                 }
@@ -540,44 +533,41 @@ namespace Amanotes.Core
                     {
                         migrationLog.deviceId = SystemInfo.deviceUniqueIdentifier;
                         migrationLog.appVersion = Application.version;
-                        migrationLog.amaGDKVersion = AmaGDK.VERSION;
+                        migrationLog.amaGDKVersion = VERSION;
                         migrationLog.count = 1;
-                        Log($"Analytics data was migrated successfully");
+                        Log("Analytics data was migrated successfully");
                     }
                     else
                     {
                         migrationLog.count++;
                         Log($"Analytics data was migrated {migrationLog.count} times");
 
-                        if (migrationLog.count == 2)
-                        {
-                            LogEvent("migration_error").AddParam(migrationLog.ToDictionary());
-                        }
+                        if (migrationLog.count == 2) LogEvent("migration_error").AddParam(migrationLog.ToDictionary());
                     }
 
                     _dirty = true;
                     SaveIfDirty();
-                }                
+                }
             }
 
             internal class SessionStat
-            {                
-                public List<EventStat> lastFrameEventStats = new List<EventStat>();
+            {
 
-                const string TSV_HEADER_ROW = "EventName\tAdapters\tParameters";
-                string fileName = nameof(SessionStat) + DateTime.Now.ToString("_yyMMdd_HHmmss") + ".tsv";
-                bool isFirstSave = true;
-                StringBuilder contents = new StringBuilder();
+                private const string TSV_HEADER_ROW = "EventName\tAdapters\tParameters";
+                private readonly string fileName = nameof(SessionStat) + DateTime.Now.ToString("_yyMMdd_HHmmss") + ".tsv";
+                private StringBuilder contents = new StringBuilder();
+                private bool isFirstSave = true;
+                public List<EventStat> lastFrameEventStats = new List<EventStat>();
 
                 internal void Add(string eventNameToSend, EventParams eventParams, List<string> adapterIDs)
                 {
-                    var eventStat = new EventStat(eventNameToSend, eventParams, adapterIDs);                    
+                    var eventStat = new EventStat(eventNameToSend, eventParams, adapterIDs);
                     lastFrameEventStats.Add(eventStat);
                 }
 
                 internal void ClearLastFrameEventInfo()
                 {
-                    lastFrameEventStats.Clear();                    
+                    lastFrameEventStats.Clear();
                 }
 
                 internal void Save()
@@ -590,13 +580,13 @@ namespace Amanotes.Core
                         contents = contents.AppendLine(TSV_HEADER_ROW);
                         isFirstSave = false;
                     }
-                    foreach (var stat in lastFrameEventStats)
+                    foreach (EventStat stat in lastFrameEventStats)
                     {
                         contents.AppendLine(stat.ToTsv());
-                    }                    
-                    
+                    }
+
                     FileUtils.SaveAppend(fileName, contents.ToString());
-                }                
+                }
             }
         }
     }
@@ -607,7 +597,7 @@ namespace Amanotes.Core
         {
             if (ap == null) return null;
 
-            EventParams data = ap as EventParams;
+            var data = ap as EventParams;
             data.funnelSignature = string.IsNullOrEmpty(signature) ? data.eventName : signature;
             return ap;
         }
@@ -616,7 +606,7 @@ namespace Amanotes.Core
         {
             if (ap == null) return null;
 
-            EventParams data = ap as EventParams;
+            var data = ap as EventParams;
             data.accumulated = true;
             data.withinSession = withinSession;
             return ap;
@@ -631,7 +621,7 @@ namespace Amanotes.Core
                 return ap;
             }
 
-            EventParams eventData = ap as EventParams;
+            var eventData = ap as EventParams;
             if (eventData.overrideConfig)
             {
                 LogWarning("Except() can only be set once!");
@@ -639,7 +629,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            foreach (var mId in analyticIds)
+            foreach (string mId in analyticIds)
             {
                 eventData.ignoreAdapterIds.Add(mId);
             }
@@ -655,7 +645,7 @@ namespace Amanotes.Core
                 return ap;
             }
 
-            EventParams eventData = ap as EventParams;
+            var eventData = ap as EventParams;
             if (eventData.overrideConfig)
             {
                 LogWarning("OnlyTo() can only be set once!");
@@ -663,7 +653,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            foreach (var mId in analyticIds)
+            foreach (string mId in analyticIds)
             {
                 eventData.allowAdapterIds.Add(mId);
             }
@@ -673,16 +663,16 @@ namespace Amanotes.Core
         public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, string key, object value)
         {
             if (ap == null) return null;
-            if (!IsValidKeyValue(ap, key, value)) return ap;            
+            if (!IsValidKeyValue(ap, key, value)) return ap;
 
-            var parameters = (ap as EventParams).parameters;
-            if (parameters.ContainsKey(key))
+            Dictionary<string, object> parameters = (ap as EventParams)?.parameters;
+            if (parameters != null && parameters.ContainsKey(key))
             {
                 LogWarning($"Duplicated key: {key}!");
                 return ap;
-            };
-
-            parameters.Add(key, value);
+            }
+            
+            parameters?.Add(key, value);
             return ap;
         }
 
@@ -691,11 +681,11 @@ namespace Amanotes.Core
             if (ap == null) return null;
             if (dictParams == null)
             {
-                LogWarning($"Param dictionary is null. Event name: {(ap as EventParams).eventName}!");
+                LogWarning($"Param dictionary is null. Event name: {((EventParams)ap).eventName}!");
                 return ap;
             }
 
-            foreach (var kvp in dictParams)
+            foreach (KeyValuePair<string, object> kvp in dictParams)
             {
                 if (IsValidKeyValue(ap, kvp.Key, kvp.Value))
                     ap.AddParam(kvp.Key, kvp.Value);
@@ -720,7 +710,7 @@ namespace Amanotes.Core
             return ap;
         }
 
-        static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
+        private static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
         {
             string eventName = (ap as EventParams).eventName;
             if (string.IsNullOrWhiteSpace(key))
@@ -735,8 +725,7 @@ namespace Amanotes.Core
             }
 
             return true;
-        }        
-
+        }
     }
 }
 
@@ -758,4 +747,4 @@ namespace Amanotes.Core.Internal
 
         void SetUserProperty(string key, string value);
     }
-}
+}

package/Runtime/AmaGDK.Config.cs

@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine;
-
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
-namespace Amanotes.Core.Internal {
+namespace Amanotes.Core.Internal
+{
     public partial class ConfigAsset : ScriptableObject
     {
         [SerializeField] internal bool simpleOrder = true;
@@ -15,63 +15,67 @@ namespace Amanotes.Core.Internal {
         [SerializeField] public SDKConfig common;
 
 #if UNITY_EDITOR
-        void OnValidate()
+        private void OnValidate()
         {
             if (Application.isPlaying) return;
-            if (simpleOrder) {
+            if (simpleOrder)
+            {
                 EditorApplication.update -= DelayCheckOrder;
                 EditorApplication.update += DelayCheckOrder;
             }
         }
 
-        void DelayCheckOrder()
+        private void DelayCheckOrder()
         {
             EditorApplication.update -= DelayCheckOrder;
             var dirty = false;
-            for (var i =0 ;i < initOrder.Count;i++){
+            for (var i = 0; i < initOrder.Count; i++)
+            {
                 if (initOrder[i].order == i) continue;
                 dirty = true;
                 break;
             }
 
             if (!dirty) return;
-            initOrder.Sort((a1, a2)=> a1.order.CompareTo(a2.order));
-            for (var i =0 ;i < initOrder.Count;i++){
+            initOrder.Sort((a1, a2) => a1.order.CompareTo(a2.order));
+            for (var i = 0; i < initOrder.Count; i++)
+            {
                 initOrder[i].order = i;
             }
             EditorUtility.SetDirty(this);
         }
 
         [ContextMenu("Scan Adapters")]
-        void ScanAdapters()
+        private void ScanAdapters()
         {
             initOrder.Clear();
 
             var counter = 0;
-            foreach (var adapter in GetAllAdapters<AdapterContext>())
+            foreach (Type adapter in GetAllAdapters<AdapterContext>())
             {
-                var id = adapter.Name.Replace("Adapter", string.Empty);
+                string id = adapter.Name.Replace("Adapter", string.Empty);
                 initOrder.Add(new InitOrder(){ id = id, order = counter++ });
             }
         }
 
         [ContextMenu("Refresh Order")]
-        void UpdateOrderToPosition()
+        private void UpdateOrderToPosition()
         {
-            for (var i =0 ;i < initOrder.Count; i++)
+            for (var i = 0; i < initOrder.Count; i++)
             {
                 initOrder[i].order = i;
             }
         }
-        
+
         public static IEnumerable<Type> GetAllAdapters<T>()
         {
-            var typeT = typeof(T);
+            Type typeT = typeof(T);
             foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
             {
                 if (!a.FullName.Contains("Assembly-CSharp")) continue;
-                
-                foreach (var type in a.GetTypes()){
+
+                foreach (Type type in a.GetTypes())
+                {
                     if (typeT.IsAssignableFrom(type)) yield return type;
                 }
             }
@@ -82,7 +86,7 @@ namespace Amanotes.Core.Internal {
     [Serializable]
     public partial class SDKConfig
     {
-        public bool verboseLog = false;
+        public bool verboseLog;
     }
 
     [Serializable]
@@ -91,4 +95,4 @@ namespace Amanotes.Core.Internal {
         public string id;
         public int order;
     }
-}
+}

package/Runtime/AmaGDK.Internal.SemVer.cs

@@ -29,14 +29,11 @@ namespace Amanotes.Core.Internal
             patch = 0;
             extra = -1;
 
-            if (string.IsNullOrEmpty(version))
-            {
-                return;
-            }
+            if (string.IsNullOrEmpty(version)) return;
 
             version = version.Trim();
 
-            Regex regex = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
+            var regex = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
             Match match = regex.Match(version);
             if (!match.Success)
             {
@@ -51,10 +48,10 @@ namespace Amanotes.Core.Internal
                 if (!int.TryParse(match.Groups[4].Value, out extra))
                     extra = -1;
             }
-                
+
         }
 
-        public bool isValid { get { return this != ZERO; } }
+        public bool isValid => this != ZERO;
 
         public override string ToString()
         {
@@ -65,22 +62,10 @@ namespace Amanotes.Core.Internal
 
         public int CompareTo(SemVer other)
         {
-            if (major != other.major)
-            {
-                return major.CompareTo(other.major);
-            }
-            if (minor != other.minor)
-            {
-                return minor.CompareTo(other.minor);
-            }
-            if (patch != other.patch)
-            {
-                return patch.CompareTo(other.patch);
-            }
-            if (extra != other.extra)
-            {
-                return extra.CompareTo(other.extra);
-            }
+            if (major != other.major) return major.CompareTo(other.major);
+            if (minor != other.minor) return minor.CompareTo(other.minor);
+            if (patch != other.patch) return patch.CompareTo(other.patch);
+            if (extra != other.extra) return extra.CompareTo(other.extra);
             return 0;
         }
 
@@ -91,11 +76,8 @@ namespace Amanotes.Core.Internal
 
         public override bool Equals(object obj)
         {
-            if (!(obj is SemVer))
-            {
-                return false;
-            }
-            SemVer other = (SemVer)obj;
+            if (!(obj is SemVer)) return false;
+            var other = (SemVer)obj;
             return major == other.major && minor == other.minor && patch == other.patch && extra == other.extra;
         }
 
@@ -134,4 +116,4 @@ namespace Amanotes.Core.Internal
             return (major << 24) | (minor << 16) | (patch << 8) | extra;
         }
     }
-}
+}