com.amanotes.gdk 0.2.11 → 0.2.13

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.13 - 2023-07-20]
+### Fix error Remote Config JSON caused by special chars (", ', \)
+
+## [0.2.12 - 2023-07-07]
+### Restructure GDK - symlink GDK source to unity projects
+### Unity 2019 compatible - no null coalescing
+### Remove redundant AmaPassport config field
+### Auto request AmaId
+
 ## [0.2.11 - 2023-06-29]
 ### SetLogCondition with EventParam
 ### Rename Migrated -> HasMigrated

package/Editor/AmaGDKEditor.cs

@@ -3,6 +3,7 @@ using System.Text;
 using Amanotes.Core;
 using Amanotes.Core.Internal;
 using System.Collections.Generic;
+using System.IO;
 using UnityEditor;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
@@ -23,6 +24,8 @@ namespace Amanotes.Editor
         private static bool showConfigDetail;
         private static bool showAdapterInstaller;
         private static bool showExampleDetail;
+        private bool adapterScanned;
+        private readonly List<string> lstAdapter = new List<string>();
 
         public static Color btnColor;
         public static float btnLerp;
@@ -32,6 +35,7 @@ namespace Amanotes.Editor
             FIREBASE_ANALYTICS,
             FIREBASE_REMOTE_CONFIG,
             APPSFLYER,
+            ADJUST,
             IRONSOURCE,
             REVENUECAT
         };
@@ -118,14 +122,28 @@ namespace Amanotes.Editor
             EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false);
         }
 
+        private void UpdateListAdapter()
+        {
+            if(adapterScanned)
+                return;
+            
+            adapterScanned = true;
+            
+            var adapterPath = Directory.GetFiles(Res.PACKAGE_PATH, "*Adapter*.unitypackage", SearchOption.AllDirectories);
+
+            for (int i = 0; i < adapterPath.Length; i++)
+            {
+                lstAdapter.Add(Path.GetFileName(adapterPath[i]));
+            }
+        }
         private void DrawGUI_AdapterList()
         {
-            for (var i = 0; i < Res.AMAGDK_ADAPTERS.Length; i++)
+            UpdateListAdapter();
+            foreach (var adapter in lstAdapter)
             {
-                string adapterName = Res.AMAGDK_ADAPTERS[i];
-                if (GUILayout.Button(ObjectNames.NicifyVariableName(adapterName)))
+                if (GUILayout.Button(ObjectNames.NicifyVariableName(adapter)))
                 {
-                    var package = $"{Res.PACKAGE_PATH}{adapterName}.unitypackage";
+                    var package = $"{Res.PACKAGE_PATH}{adapter}";
                     AssetDatabase.ImportPackage(package, false);
                 }
             }

package/Editor/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+
+#if UNITY_EDITOR
+[assembly: InternalsVisibleTo("AmaGDK.Dev.Editor")]
+#endif

package/Editor/AssemblyInfo.cs.meta

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

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -101,6 +101,7 @@ namespace Amanotes.Editor
             case FIREBASE_ANALYTICS: return FirebaseAnalytics();
             case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
             case APPSFLYER: return AppsFlyer();
+            case ADJUST: return Adjust();
             case IRONSOURCE: return Ironsource();
             case REVENUECAT: return RevenueCat();
             default:
@@ -172,6 +173,25 @@ namespace Amanotes.Editor
 
             return version.Trim();
         }
+        
+        internal static string Adjust()
+        {
+            var version = "";
+            List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+            foreach (var assembly in assemblies)
+            {
+                foreach (var oType in assembly.GetTypes())
+                {
+                    if (oType.Name.Equals("AdjustAndroid") || oType.Name.Equals("AdjustiOS") )
+                    {
+                        version = oType.GetField("sdkPrefix", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null).ToString();
+                        version = version.StartsWith("unity") ? version.Substring(5) : "";
+                    }
+                }
+            }
+
+            return version.Trim();
+        }
 
         internal static string Ironsource()
         {

package/Editor/Utils/AmaGDKEditor.GUI.cs

@@ -14,8 +14,14 @@ namespace Amanotes.Editor
 
         private static readonly Texture2D TAG_0 = (Texture2D)EditorGUIUtility.IconContent("sv_label_0").image;
         private static readonly Texture2D TAG_1 = (Texture2D)EditorGUIUtility.IconContent("sv_icon_dot1_pix16_gizmo").image;
-        private static GUIStyle versionStyle;
-        private static GUIStyle tagLabelStyle;
+        private static GUIStyle versionStyle = new GUIStyle(EditorStyles.miniBoldLabel)
+        {
+            alignment = TextAnchor.MiddleCenter
+        };
+        private static GUIStyle tagLabelStyle = new GUIStyle(EditorStyles.miniBoldLabel)
+        {
+            alignment = TextAnchor.MiddleCenter
+        };
 
         public static void SectionLabel(string text)
         {
@@ -88,11 +94,6 @@ namespace Amanotes.Editor
         public static void SemVerGUI(string title, SemVer version, Color? color1 = null, Color? color2 = null)
         {
             const int TAG_SIZE = 60;
-            versionStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
-            {
-                alignment = TextAnchor.MiddleCenter
-            };
-
             var rect = GUILayoutUtility.GetRect(120, 16f);
             var rect1 = rect;
 
@@ -104,8 +105,8 @@ namespace Amanotes.Editor
             rect2.xMin += (rect2.width-TAG_SIZE);
             rect2.width = TAG_SIZE;
 
-            color1 ??= LIGHT_BLUE;
-            color2 ??= LIGHT_GRAY;
+            if (!color1.HasValue) color1 = LIGHT_BLUE;
+            if (!color2.HasValue) color2 = LIGHT_GRAY;
             DrawTag(rect2, version.ToString(), version.isValid ? color1.Value : color2.Value, 0.5f);
 
             rect1.xMin += 4f;
@@ -129,11 +130,6 @@ namespace Amanotes.Editor
 
         public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 1f)
         {
-            tagLabelStyle ??= new GUIStyle(EditorStyles.miniBoldLabel)
-            {
-                alignment = TextAnchor.MiddleCenter
-            };
-
             rect.xMin += margin;
             rect.xMax -= margin;
             rect.yMin += margin;

package/Packages/AdjustAdapter_v4.33.0.unitypackage.meta

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

package/Runtime/AmaGDK.Ads.cs

@@ -85,7 +85,7 @@ namespace Amanotes.Core
             public AdStat interstitial = new AdStat();
             public AdStat reward = new AdStat();
 
-            internal int GetLastShowInSeconds(AdType adType)
+            internal int TimeSinceLastShow(AdType adType)
             {
                 return (int)(Time.realtimeSinceStartup - (adType == AdType.Interstitial ? interstitial.lastSuccessTime : reward.lastSuccessTime));
             }
@@ -138,11 +138,11 @@ namespace Amanotes.Core
                 _adapter?.rewardVideo.StartLoadAd();
             }
 
-            public static bool hasInterstitial => _adapter.interstitial.hasAd;
-            public static bool hasRewardedVideo => _adapter.rewardVideo.hasAd;
-            public static bool showingBanner => _showingBanner;
-            public static bool showingAd => context != null;
-
+            public static bool HasInterstitial => _adapter.interstitial.hasAd;
+            public static bool HasRewardedVideo => _adapter.rewardVideo.hasAd;
+            public static bool IsBannerShowing => _isBannerShowing;
+            public static bool IsAdShowing => context != null;
+            
             private static bool ClearPrevContext()
             {
                 if (context == null) return true;
@@ -176,6 +176,15 @@ namespace Amanotes.Core
                 return context;
             }
 
+            public static bool IsInterstitialShowing
+            {
+                get
+                {
+                    if (context == null)  return false;
+                    return context.adType == AdType.Interstitial;
+                }
+            }
+
             public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (!ClearPrevContext()) return null;
@@ -184,19 +193,36 @@ namespace Amanotes.Core
                 _adapter.rewardVideo.StartShowAd();
                 return context;
             }
+            
+            public static bool IsRewardedVideoShowing
+            {
+                get
+                {
+                    if (context == null)  return false;
+                    return context.adType == AdType.VideoReward;
+                }
+            }
 
-            private static bool _showingBanner;
-            public static void ShowBanner()
+            private static bool _isBannerShowing;
+            public static void ShowBanner(BannerPosition? bannerPosition = null)
             {
-                if (_showingBanner) return;
-                _showingBanner = true;
-                _adapter.ShowBanner(_adConfig.bannerPosition);
+                if (_isBannerShowing) return;
+                _isBannerShowing = true;
+
+                if (bannerPosition.HasValue)
+                {
+                    _adapter.ShowBanner(bannerPosition.Value);
+                }
+                else
+                {
+                    _adapter.ShowBanner(_adConfig.bannerPosition);
+                }
             }
 
             public static void HideBanner()
             {
-                if (!_showingBanner) return;
-                _showingBanner = false;
+                if (!_isBannerShowing) return;
+                _isBannerShowing = false;
                 _adapter.HideBanner();
             }
 
@@ -210,6 +236,12 @@ namespace Amanotes.Core
                 else
                     _adapter.rewardVideo.StopShowAd();
             }
+
+            public static int TimeSinceLastInterstitial => localData.TimeSinceLastShow(AdType.Interstitial);
+            
+            public static int TimeSinceLastVideoReward => localData.TimeSinceLastShow(AdType.VideoReward);
+            
+            public static int TimeSinceLastAd => Math.Min(TimeSinceLastInterstitial, TimeSinceLastVideoReward) ;
         }
     }
 }
@@ -287,7 +319,7 @@ namespace Amanotes.Core.Internal
         // Stats
         public float showCallAt;
         public float showFinishAt;
-
+        
         public ShowAdContext(AdType adType, string placementName, Dictionary<string, object> userData)
         {
             this.adType = adType;

package/Runtime/AmaGDK.Analytics.cs

@@ -585,7 +585,7 @@ namespace Amanotes.Core
                         contents.AppendLine(stat.ToTsv());
                     }
 
-                    FileUtils.SaveAppend(fileName, contents.ToString());
+                    GDKFileUtils.SaveAppend(fileName, contents.ToString());
                 }
             }
         }

package/Runtime/AmaGDK.Internal.cs

@@ -40,14 +40,6 @@ 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 =
-        {
-            "FirebaseAnalyticsAdapter_v9.1.0",
-            "AppsFlyerAdapter_v6.5.4",
-            "IronsourceAdapter_v7.2.6",
-            "FirebaseRemoteConfigAdapter_v9.1.0"            
-        };
-
 #if UNITY_EDITOR
 
         [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -34,7 +34,7 @@ namespace Amanotes.Core
                 get
                 {
                     if (_cacheExisted == null)
-                        _cacheExisted = FileUtils.Exist(fileName);
+                        _cacheExisted = GDKFileUtils.Exist(fileName);
                     return _cacheExisted.GetValueOrDefault();
                 }
             }
@@ -199,8 +199,8 @@ namespace Amanotes.Core
                 }
                 #endif
                 
-                string filePath = FileUtils.GetPath(fileName);
-                FileUtils.Save(filePath, sb.ToString());
+                string filePath = GDKFileUtils.GetPath(fileName);
+                GDKFileUtils.Save(filePath, sb.ToString());
                 Log($"[RemoteConfig] Saved remote config to {filePath}");
                 NextState();
             }
@@ -218,7 +218,7 @@ namespace Amanotes.Core
                 try
                 {
                     dictConfig.Clear();
-                    using (StreamReader sr = new StreamReader(FileUtils.GetPath(fileName)))
+                    using (StreamReader sr = new StreamReader(GDKFileUtils.GetPath(fileName)))
                     {
                         string line;
                         int lineIdx = 0;

package/Runtime/AmaGDK.UserProfile.cs

@@ -15,12 +15,12 @@ namespace Amanotes.Core
 
             public void Save()
             {
-                FileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
+                GDKFileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
             }
 
             public UserProfile Load()
             {
-                string json = FileUtils.Load(FILE_NAME);
+                string json = GDKFileUtils.Load(FILE_NAME);
                 if (string.IsNullOrEmpty(json)) return this;
                 JsonUtility.FromJsonOverwrite(json, this);
                 return this;

package/Runtime/AmaGDK.Utils.cs

@@ -3,12 +3,13 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
-    public class Utils
+    public class GDKUtils
     {
         public static void DelayCall(float seconds, Action action)
         {
@@ -22,7 +23,7 @@ namespace Amanotes.Core.Internal
         }
     }
     
-    internal class FileUtils
+    internal class GDKFileUtils
     {
 
         private static string _basePath;
@@ -39,6 +40,7 @@ namespace Amanotes.Core.Internal
                 return _basePath;
             }
         }
+        
         internal static string GetPath(string fileName)
         {
             return Path.Combine(basePath, fileName);
@@ -161,6 +163,26 @@ namespace Amanotes.Core.Internal
                 LogWarningOnce(path + "\n" + ex);
             }
         }
+        
+        internal static void ClearCacheData()
+        {
+            StringBuilder logBuilder = new StringBuilder();
+            logBuilder.AppendLine("[AmaGDK] All cached data & stats cleared");
+            
+            if (!Directory.Exists(_basePath))
+            {
+                logBuilder.AppendLine("Cache path not exists: " + _basePath);
+                return;
+            }
+            
+            string[] filePaths = Directory.GetFiles(_basePath);
+            foreach (string path in filePaths)
+            {
+                Delete(path);
+                logBuilder.AppendLine($"[deleted] - {path}");
+            }
+            Debug.Log(logBuilder);
+        }
     }
 
     public class ActionQueue
@@ -238,7 +260,7 @@ namespace Amanotes.Core.Internal
                 instance = result;
             }
             string fileName = instance.GetType().Name;
-            string json = FileUtils.Load(fileName);
+            string json = GDKFileUtils.Load(fileName);
             JsonUtility.FromJsonOverwrite(json, instance);
             return instance;
         }
@@ -247,7 +269,7 @@ namespace Amanotes.Core.Internal
         {
             string fileName = instance.GetType().Name;
             string json = JsonUtility.ToJson(instance);
-            FileUtils.Save(fileName, json);
+            GDKFileUtils.Save(fileName, json);
         }
     }
 
@@ -342,8 +364,7 @@ namespace Amanotes.Core.Internal
                         return;
                     }
                 }
-
-                jsonSb.Append($"\"{value}\"");
+                jsonSb.Append($"\"{EscapeJsonString(s)}\"");
                 return;
             }
 
@@ -374,6 +395,13 @@ namespace Amanotes.Core.Internal
             jsonSb.Append($"{JsonUtility.ToJson(value, format)}");
         }
 
+        private static string EscapeJsonString(string input)
+        {
+            //Match any occurrence of a backslash(\), single quotation('), or double quotation (")
+            string pattern = "[\\\'\"]";
+            return Regex.Replace(input, pattern, match => $"\\{match.Value}");
+        }
+
         //public static T[] FromJsonToArray<T>(string json)
         //{
         //    if (!json.StartsWith("{\"items\":"))

package/Runtime/AmaGDK.cs

@@ -1,16 +1,20 @@
 using System;
 using System.Collections;
+using System.Diagnostics;
+using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
+using Debug = System.Diagnostics.Debug;
 
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.11";
+        public const string VERSION = "0.2.13";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -109,7 +113,7 @@ namespace Amanotes.Core
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
             _onReadyCallback = null;
-            Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterInfo.ToString()}");
+            Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterInfo.ToString()}");
         }
 
         void RegisterUnityCallback(AdapterContext adapter)
@@ -197,6 +201,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 ADJUST = "Adjust";
             public const string IRONSOURCE = "IronSource";
             public const string REVENUECAT = "RevenueCat";
         }
@@ -230,4 +235,48 @@ namespace Amanotes.Core
             applicationQuit?.Invoke();
         }
     }
+    
+    public  partial class  AmaGDK // Switch dev mode
+    {
+        [ContextMenu("Change Dev Mode")]
+        public void ChangeDevMode()
+        {
+            string variableName = "GDK_HOME";
+            string output = RunShellCommand($"source ~/.zshrc && echo ${variableName}");
+            output = output.Trim();
+
+            if (string.IsNullOrEmpty(output))
+            {
+                LogWarning($"{variableName} environment variable is not set.");
+                return;
+            }
+            
+            UpdateManifest(output);
+        }
+            
+        private string RunShellCommand(string command)
+        {
+            Process process = new Process();
+            process.StartInfo.FileName = "/bin/zsh";
+            process.StartInfo.Arguments = $"-c \"{command}\"";
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.UseShellExecute = false;
+            process.StartInfo.CreateNoWindow = true;
+            process.Start();
+    
+            string output = process.StandardOutput.ReadToEnd();
+            process.WaitForExit();
+    
+            return output;
+        }
+            
+        private void UpdateManifest(string strDesired)
+        {
+            const string manifestPath = "Packages/manifest.json";
+            string manifestJson = File.ReadAllText(manifestPath);
+
+            manifestJson = Regex.Replace(manifestJson, "\"com\\.amanotes\\.gdk\"\\s*:\\s*\"\\d+\\.\\d+\\.\\d+\"", $"\"com.amanotes.gdk\": \"{strDesired}\"");
+            File.WriteAllText(manifestPath, manifestJson);
+        }
+    }
 }

package/Runtime/AssemblyInfo.cs

@@ -4,4 +4,5 @@
 #if UNITY_EDITOR
 [assembly: InternalsVisibleTo("AmaGDK.Editor")]
 [assembly: InternalsVisibleTo("AmaGDK.Test.Editor")]
-#endif
+[assembly: InternalsVisibleTo("AmaGDK.Dev.Editor")]
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.11",
+    "version": "0.2.13",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",