com.amanotes.gdk 0.1.21 → 0.2.2

package/Runtime/AmaGDK.Internal.cs

@@ -1,6 +1,6 @@
-using System.Text;
+using System;
 using System.Collections.Generic;
-
+using System.Text;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using static Amanotes.Core.AmaGDK.Analytics;
@@ -39,11 +39,11 @@ namespace Amanotes.Core.Internal
         public const string AMAGDK_PREFAB = BASE_PATH + "Runtime/AmaGDK.prefab";
         public const string AMAGDK_CONFIG_PACKAGE = PACKAGE_PATH + "AmaGDKConfig.unitypackage";
 
-        public static readonly string[] AMAGDK_ADAPTERS = new string[]
+        public static readonly string[] AMAGDK_ADAPTERS =
         {
             "FirebaseAnalyticsAdapter_v9.1.0",
             "AppsFlyerAdapter_v6.5.4",
-            // "IronsourceAdapter_v7.2.6",
+            "IronsourceAdapter_v7.2.6",
             "FirebaseRemoteConfigAdapter_v9.1.0"
         };
 
@@ -52,14 +52,14 @@ namespace Amanotes.Core.Internal
         [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]
         private static void AddAmaGDKPrefab()
         {
-            GameObject prefab = AssetDatabase.LoadAssetAtPath<GameObject>(AMAGDK_PREFAB);
+            var 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;
+            var newPrefab = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
             newPrefab.name = "AmaGDK";
             newPrefab.transform.SetAsLastSibling();
             Selection.activeObject = null;
@@ -104,14 +104,14 @@ namespace Amanotes.Core.Internal
                 AmaGDK._instance = null;
             }
 
-            var result = Resources.FindObjectsOfTypeAll<AmaGDK>();
+            AmaGDK[] result = Resources.FindObjectsOfTypeAll<AmaGDK>();
             for (var i = 0; i < result.Length; i++)
             {
                 if (result[i] == null) continue;
 
 #if UNITY_EDITOR // Ignore loaded prefabs assets
                 {
-                    var path = UnityEditor.AssetDatabase.GetAssetPath(result[i]);
+                    string path = AssetDatabase.GetAssetPath(result[i]);
                     if (!string.IsNullOrEmpty(path)) continue;
                 }
 #endif
@@ -129,10 +129,15 @@ namespace Amanotes.Core.Internal
 
         public static void ClearAnalyticsData()
         {
-            AnalyticsData analyticsData = AmaGDK.Analytics.localData;
+            AnalyticsData analyticsData = localData;
             analyticsData.funnelSignatures.Clear();
             analyticsData.eventDetails.Clear();
-            analyticsData.migrationLog = new AmaGDK.Analytics.MigrationLog();
+            analyticsData.migrationLog = new MigrationLog();
         }
     }
-}
+    
+    public interface IOnApplicationPause { void OnApplicationPause(bool pauseStatus); }
+    public interface IOnApplicationQuit { void OnApplicationQuit(); }
+    public interface IOnApplicationFocus { void OnApplicationFocus(bool hasFocus); }
+    public interface IOnFrameUpdate { void OnFrameUpdate(); }
+}

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -8,7 +8,7 @@ using Amanotes.Core.Internal;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core
-{    
+{
     public partial class AmaGDK //Remote Config
     {
         public enum RemoteConfigSource
@@ -22,24 +22,26 @@ namespace Amanotes.Core
         [Serializable]
         public partial class RemoteConfig //Public
         {
+            public static Action<bool> onFetchCompleted;
             public static Dictionary<string, string> DictConfig { get { return dictConfig; } }
             public static RemoteConfigSource Source { private set; get; }
             static bool? _cacheExisted = null;
-            public static bool HasCache {
+            public static bool HasCache
+            {
                 get
                 {
                     if (_cacheExisted == null)
                         _cacheExisted = FileUtils.Exist(fileName);
                     return _cacheExisted.GetValueOrDefault();
                 }
-            }            
+            }
 
-            public static T ParseConfig<T>(T config = null) where T : class, new()
+            internal static T ParseConfig<T>(T config = null) where T : class, new()
             {
                 if (config == null)
                     config = new T();
 
-                var configInJson = GetConfigAsJson();
+                var configInJson = GetConfigAsJsonString();
                 if (string.IsNullOrEmpty(configInJson))
                 {
                     LogWarning("[RemoteConfig] The config is empty");
@@ -47,7 +49,7 @@ namespace Amanotes.Core
                 }
 
                 try
-                {                    
+                {
                     return config = JsonUtility.FromJson<T>(configInJson);
                 }
                 catch (Exception e)
@@ -64,11 +66,16 @@ namespace Amanotes.Core
                 return defaultValue;
             }
 
-            public static string GetConfigAsJson()
+            public static T WriteConfigTo<T>(T config = null) where T : class, new ()
+            {
+                return ParseConfig<T>(config);
+            }
+
+            public static string GetConfigAsJsonString()
             {
                 return JsonUtils.DictionaryToJson(dictConfig);
-            }                      
-        }        
+            }
+        }
 
         public partial class RemoteConfig //Internal
         {
@@ -98,8 +105,8 @@ namespace Amanotes.Core
             {
                 { FetchState.None,                new Action[]{ ResolveDependency }},
                 { FetchState.ResolveDependencies, new Action[]{ LoadCache, CheckInternet}},
-                { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},                
-                { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},                
+                { FetchState.CheckInternet,       new Action[]{ LoadCache, Fetch}},
+                { FetchState.Fetch,               new Action[]{ LoadCache, SaveCache}},
                 { FetchState.SaveCache,           new Action[]{ SetDone }},
                 { FetchState.LoadCache,           new Action[]{ LoadDefaultFile, SetDone}},
                 { FetchState.LoadDefaultFile,     new Action[]{ LoadDefaultAsset, SetDone}},
@@ -124,7 +131,7 @@ namespace Amanotes.Core
                 }
 
                 actions[result ? 1 : 0]();
-            }            
+            }
 
             static void ResolveDependency()
             {
@@ -142,7 +149,7 @@ namespace Amanotes.Core
             {
                 _state = FetchState.CheckInternet;
                 NextState(Application.internetReachability != NetworkReachability.NotReachable);
-            }            
+            }
 
             static void Fetch()
             {
@@ -153,14 +160,14 @@ namespace Amanotes.Core
                     {
                         NextState(false);
                         return;
-                    }                    
+                    }
 
                     dictConfig = result;
                     Source = RemoteConfigSource.Internet;
                     Log("[RemoteConfig] Load from the internet");
                     NextState(true);
                 });
-            }            
+            }
 
             static void SaveCache()
             {
@@ -175,7 +182,7 @@ namespace Amanotes.Core
                 FileUtils.Save(filePath, sb.ToString());
                 Log($"[RemoteConfig] Saved remote config to {filePath}");
                 NextState();
-            }            
+            }
 
             static void LoadCache()
             {
@@ -224,15 +231,15 @@ namespace Amanotes.Core
 
             static void LoadDefaultFile()
             {
-                _state = FetchState.LoadDefaultFile;                
+                _state = FetchState.LoadDefaultFile;
 
-                var defaultConfigFile = Resources.Load<TextAsset>(defaultConfigFileName);                
+                var defaultConfigFile = Resources.Load<TextAsset>(defaultConfigFileName);
                 if (defaultConfigFile == null)
                 {
                     NextState(false);
                     return;
                 }
-                
+
                 dictConfig = JsonToDictionary(defaultConfigFile.text);
 
                 Source = RemoteConfigSource.DefaultFile;
@@ -265,12 +272,14 @@ namespace Amanotes.Core
             {
                 _state = FetchState.Success;
                 onAdapterInitCompleteCallback(true);
+                onFetchCompleted?.Invoke(true);
             }
 
             static void SetFail()
             {
                 _state = FetchState.Fail;
                 onAdapterInitCompleteCallback(false);
+                onFetchCompleted?.Invoke(false);
             }
 
             static Dictionary<string, string> JsonToDictionary(string json)
@@ -294,12 +303,12 @@ namespace Amanotes.Core
                     {
                         value = lines[i].Substring(idx + 1).Trim();
                         value = value.Substring(1, value.Length - 3);
-                    }                    
+                    }
                     dictResult[key] = value;
                 }
                 return dictResult;
             }
-        }        
+        }
     }
 
     public static class RemoteConfigExtension
@@ -325,7 +334,7 @@ namespace Amanotes.Core.Internal
     {
         public KeyValue[] defaultValue;
         public float firstFetchTimeOutInSeconds = 10;
-        public float defaultTimeOutInSeconds = 3;        
+        public float defaultTimeOutInSeconds = 3;
     }
 
     [Serializable]
@@ -336,7 +345,7 @@ namespace Amanotes.Core.Internal
     }
 
     public interface IRemoteConfig
-    {        
+    {
         void ResolveDependencies(Action<bool> onComplete);
         void FetchConfig(bool isFirstTime, Action<bool, Dictionary<string, string>> onComplete);
     }

package/Runtime/AmaGDK.UserProfile.cs

@@ -1,8 +1,6 @@
 using System;
 using Amanotes.Core.Internal;
 using UnityEngine;
-using FileUtils = Amanotes.Core.Internal.FileUtils;
-
 namespace Amanotes.Core
 {
     public partial class AmaGDK //User profile
@@ -10,10 +8,10 @@ namespace Amanotes.Core
         public static readonly UserProfile User = new UserProfile().Load();
 
         [Serializable]
-        public partial class UserProfile: IJsonFile
+        public partial class UserProfile : IJsonFile
         {
-            [NonSerialized] internal bool _dirty = false;
-            const string FILE_NAME = nameof(UserProfile);
+            private const string FILE_NAME = nameof(UserProfile);
+            [NonSerialized] internal bool _dirty;
 
             public void Save()
             {
@@ -22,9 +20,8 @@ namespace Amanotes.Core
 
             public UserProfile Load()
             {
-                var json = FileUtils.Load(FILE_NAME);
-                if (string.IsNullOrEmpty(json))
-                    return this;
+                string json = FileUtils.Load(FILE_NAME);
+                if (string.IsNullOrEmpty(json)) return this;
                 JsonUtility.FromJsonOverwrite(json, this);
                 return this;
             }

package/Runtime/AmaGDK.Utils.cs

@@ -4,13 +4,27 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using UnityEngine;
-
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
     internal class FileUtils
     {
+
+        private static string _basePath;
+        private static string basePath
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_basePath)) return _basePath;
+                _basePath = Application.isEditor
+                    ? Path.Combine(Directory.GetCurrentDirectory(), "Library", "AmaGDK")
+                    : Path.Combine(Application.persistentDataPath, "AmaGDK");
+
+                if (!Directory.Exists(_basePath)) Directory.CreateDirectory(_basePath);
+                return _basePath;
+            }
+        }
         internal static string GetPath(string fileName)
         {
             return Path.Combine(basePath, fileName);
@@ -25,7 +39,7 @@ namespace Amanotes.Core.Internal
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -50,7 +64,7 @@ namespace Amanotes.Core.Internal
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -67,14 +81,14 @@ namespace Amanotes.Core.Internal
             catch (Exception ex)
             {
                 LogWarningOnce(path + "\n" + ex);
-            }            
+            }
         }
 
         internal static void SaveAppend(string fileName, string content)
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -92,15 +106,15 @@ namespace Amanotes.Core.Internal
             {
                 LogWarningOnce(path + "\n" + ex);
             }
-        }        
+        }
 
         internal static string Load(string fileName)
         {
-            string content = "";
+            var content = "";
 
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return content;
             }
 
@@ -132,29 +146,14 @@ namespace Amanotes.Core.Internal
             {
                 LogWarningOnce(path + "\n" + ex);
             }
-        }        
-
-        private static string _basePath;
-        private static string basePath
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(_basePath)) return _basePath;
-                _basePath = Application.isEditor
-                    ? Path.Combine(Directory.GetCurrentDirectory(), "Library", "AmaGDK")
-                    : Path.Combine(Application.persistentDataPath, "AmaGDK");
-
-                if (!Directory.Exists(_basePath)) Directory.CreateDirectory(_basePath);
-                return _basePath;
-            }
         }
     }
 
     public class ActionQueue
     {
-        private Queue<Action<Action>> queue;
-        private bool isProcessing = false;
-        private Action onComplete;
+        private bool isProcessing;
+        private readonly Action onComplete;
+        private readonly Queue<Action<Action>> queue;
 
         public ActionQueue(Action onComplete)
         {
@@ -170,7 +169,7 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
-            foreach (var action in actions)
+            foreach (Action<Action> action in actions)
             {
                 if (action == null) continue;
                 queue.Enqueue(action);
@@ -179,8 +178,7 @@ namespace Amanotes.Core.Internal
 
         private void ProcessQueue()
         {
-            if (isProcessing)
-                return;
+            if (isProcessing) return;
             if (queue.Count == 0)
             {
                 onComplete?.Invoke();
@@ -199,8 +197,7 @@ namespace Amanotes.Core.Internal
                 }
             }
 
-            if(nextAction == null)
-                onComplete?.Invoke();
+            if (nextAction == null) onComplete?.Invoke();
         }
 
         public void StartQueue()
@@ -227,7 +224,7 @@ namespace Amanotes.Core.Internal
                 instance = result;
             }
             string fileName = instance.GetType().Name;
-            var json = FileUtils.Load(fileName);
+            string json = FileUtils.Load(fileName);
             JsonUtility.FromJsonOverwrite(json, instance);
             return instance;
         }
@@ -235,7 +232,7 @@ namespace Amanotes.Core.Internal
         public static void SaveJsonToFile<T>(this T instance) where T : IJsonFile
         {
             string fileName = instance.GetType().Name;
-            var json = JsonUtility.ToJson(instance);
+            string json = JsonUtility.ToJson(instance);
             FileUtils.Save(fileName, json);
         }
     }
@@ -244,7 +241,7 @@ namespace Amanotes.Core.Internal
     {
         public static string TupleToJson(params (string key, object value)[] parameters)
         {
-            Dictionary<string, object> tupleToDict = new Dictionary<string, object>();
+            var tupleToDict = new Dictionary<string, object>();
             foreach (var item in parameters)
             {
                 tupleToDict.Add(item.key, item.value);
@@ -254,24 +251,21 @@ namespace Amanotes.Core.Internal
 
         public static string KeyValueToJson(string key, object value)
         {
-            return DictionaryToJson(new Dictionary<string, object>() { { key, value } });
+            return DictionaryToJson(new Dictionary<string, object>
+                { { key, value } });
         }
 
         public static string DictionaryToJson(IDictionary inputDict, bool format = false, bool checkJsonInString = true)
         {
-            if (inputDict == null)
-                return "{}";
+            if (inputDict == null) return "{}";
 
-            StringBuilder jsonSb = new StringBuilder();
+            var jsonSb = new StringBuilder();
             jsonSb.Append("{");
             var isFirstElement = true;
 
             foreach (DictionaryEntry entry in inputDict)
             {
-                if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString()))
-                {
-                    continue;
-                }
+                if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString())) continue;
                 var key = entry.Key.ToString();
                 var value = entry.Value;
 
@@ -302,15 +296,11 @@ namespace Amanotes.Core.Internal
                 else
                     jsonSb.Append(",");
 
-                if (format)
-                    jsonSb.AppendLine();
+                if (format) jsonSb.AppendLine();
                 AppendJsonValue(ref jsonSb, key, item, format, false);
             }
 
-            if (format)
-            {
-                jsonSb.AppendLine();
-            }
+            if (format) jsonSb.AppendLine();
             jsonSb.Append("]");
         }
 
@@ -324,7 +314,7 @@ namespace Amanotes.Core.Internal
 
             if (value is string)
             {
-                string s = value.ToString();
+                var s = value.ToString();
                 if (checkJsonInString)
                 {
                     if (s.StartsWith("{") && s.EndsWith("}"))
@@ -336,7 +326,7 @@ namespace Amanotes.Core.Internal
                     {
                         jsonSb.Append(s);
                         return;
-                    }                    
+                    }
                 }
 
                 jsonSb.Append($"\"{value}\"");

package/Runtime/AmaGDK.WebUtils.cs

@@ -1,34 +1,20 @@
-using System.Collections;
-using UnityEngine.Networking;
-using System;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 using UnityEngine;
+using UnityEngine.Networking;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
     public class JsonWebRequest<T> : UnityWebRequest where T : class
     {
-
-        [Serializable]
-        internal class ResponseError
-        {
-            public string error;
-            public string message;
-            public string statusCode;
-        }
-
-        [Serializable]
-        internal class ResponseT
-        {
-            public T data;
-            public ResponseError error = null;
-        }
-
-        private string requestJson;
-        private string requestHeader;
         public T data;
         public bool isResponseError;
+        private readonly string requestHeader;
+
+        private readonly string requestJson;
 
         public JsonWebRequest(string url, string json, string header = "") : base(url, "POST")
         {
@@ -47,14 +33,14 @@ namespace Amanotes.Core.Internal
 
         public new IEnumerator Send()
         {
-            byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(requestJson);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(requestJson);
             uploadHandler = new UploadHandlerRaw(bodyRaw);
             downloadHandler = new DownloadHandlerBuffer();
             SetRequestHeader(new Dictionary<string, string>
             {
-                {"Authorization", $"bearer {requestHeader}"},
-                {"Content-Type", "application/json"},
-                {"api-token", requestHeader}
+                { "Authorization", $"bearer {requestHeader}" },
+                { "Content-Type", "application/json" },
+                { "api-token", requestHeader }
             });
             yield return SendWebRequest();
 
@@ -63,7 +49,7 @@ namespace Amanotes.Core.Internal
                 LogWarning($"{url} returned {responseCode}: {error}");
                 yield break;
             }
-            
+
             try
             {
                 string result = downloadHandler.text;
@@ -87,22 +73,36 @@ namespace Amanotes.Core.Internal
             {
                 LogWarning($"Error parsing {typeof(T)}: {ex.Message}\n");
                 isResponseError = true;
-                yield break;
             }
         }
+
+        [Serializable]
+        internal class ResponseError
+        {
+            public string error;
+            public string message;
+            public string statusCode;
+        }
+
+        [Serializable]
+        internal class ResponseT
+        {
+            public T data;
+            public ResponseError error;
+        }
     }
 
 
     internal class WebUtils
     {
-        public static Coroutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
-        {
-            return AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
-        }
+        public static Coroutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        {
+            return AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
+        }
 
-        static IEnumerator PostJsonCoroutine(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        private static IEnumerator PostJsonCoroutine(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
         {
-            UnityWebRequest webRequest = new UnityWebRequest(url, "POST");
+            var webRequest = new UnityWebRequest(url, "POST");
             if (headers != null)
             {
                 foreach (KeyValuePair<string, string> kvp in headers)
@@ -111,19 +111,19 @@ namespace Amanotes.Core.Internal
                 }
             }
 
-            byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
             webRequest.uploadHandler = new UploadHandlerRaw(bodyRaw);
             webRequest.downloadHandler = new DownloadHandlerBuffer();
             yield return webRequest.SendWebRequest();
 
-            if (!string.IsNullOrEmpty(webRequest.error))
-            {
-                onComplete?.Invoke(false, webRequest.error);                
-            }
-            else
-            {
+            if (!string.IsNullOrEmpty(webRequest.error))
+            {
+                onComplete?.Invoke(false, webRequest.error);
+            }
+            else
+            {
                 onComplete?.Invoke(true, webRequest.downloadHandler.text);
-            }            
+            }
         }
     }
-}
+}