com.amanotes.gdk 0.2.71 → 0.2.73-1

package/Editor/AmaGDKEditor.cs

@@ -1,18 +1,20 @@
 using System;
-using Amanotes.Core;
-using Amanotes.Core.Internal;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static Amanotes.Core.Internal.Logging;
-using static Amanotes.Core.AmaGDK.AdapterID;
 using UnityObject = UnityEngine.Object;
 using UnityEvent = UnityEngine.Event;
 
+using Amanotes.Core;
+using Amanotes.Core.Internal;
+using static Amanotes.Core.GDKDebug;
+using static Amanotes.Core.AmaGDK.AdapterID;
+
 namespace Amanotes.Editor
 {
     [CustomEditor(typeof(AmaGDK))]
@@ -35,11 +37,8 @@ namespace Amanotes.Editor
 
         // DO NOT PUT [NonSerialized]
         private static bool adapterScanned = false;
-        private static bool searchedForConfig = false;
-        
         private static bool extraScanned = false;
         private static readonly List<string> extraPackages = new List<string>();
-
         private static readonly List<string> adapterPackages = new List<string>();
 
         public static Color btnColor;
@@ -62,64 +61,42 @@ namespace Amanotes.Editor
             if (sdk != null) sdk.transform.hideFlags = HideFlags.HideInInspector;
 
             SDKStatus.ClearCache();
-            TryLoadConfigAsset();
+            RefreshConfigStatus();
             RefreshListAdapters();
         }
 
-        private void TryLoadConfigAsset()
+        internal enum ConfigAssetStatus
         {
-            if (configAsset != null) return;
-            if (EditorApplication.isCompiling) return;
-            if (EditorApplication.isUpdating) return;
-
-            searchedForConfig = true;
-            Resources.UnloadUnusedAssets();
-
-            configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
-            invalidConfigAsset = configAsset == null ? Resources.Load("AmaGDKConfig") : null;
-
-            RefreshListAdapters();
-            SDKStatus.ClearCache();
-            Repaint();
+            None,
+            ScriptNotFound,
+            AssetNotFound,
+            AssetIsInvalid,
+            AssetOk
         }
+        
+        [NonSerialized] internal static ConfigAssetStatus cfgStatus = ConfigAssetStatus.None;
 
-        private void DrawGUI_ConfigMissing()
+        void RefreshConfigStatus()
         {
-            EditorGUI.indentLevel--;
-            if (invalidConfigAsset != null)
+            string[] scriptGUIDs = AssetDatabase.FindAssets("t:MonoScript AmaGDKConfigAsset");
+            if (scriptGUIDs.Length == 0)
             {
-                EditorGUILayout.HelpBox($" INVALID <Resources/AmaGDKConfig.asset> found!", MessageType.Warning);
-                if (AmaGUI.BigButton("RE-IMPORT GDK Config", 40f, ORANGE))
-                {
-                    AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
-                    searchedForConfig = false;
-                }
-            } else
+                cfgStatus = ConfigAssetStatus.ScriptNotFound;
+                return;
+            }
+            
+            string[] assetGUIDs = AssetDatabase.FindAssets("t:ConfigAsset");
+            if (assetGUIDs.Length == 0)
             {
-                EditorGUILayout.HelpBox("[Warning] <Resources/AmaGDKConfig.asset> NOT FOUND!\nYou need to create one to control all the adapter's configurations!", MessageType.Warning);
-                GUILayout.BeginHorizontal();
-                {
-                    if (AmaGUI.BigButton("CREATE", 40f, BLUE))
-                    {
-                        AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
-
-                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
-                        AssetDatabase.CreateAsset(config, "Assets/AmaGDK/Resources/AmaGDKConfig.asset");
-                        AssetDatabase.SaveAssets();
-                        TryLoadConfigAsset();
-                        adapterScanned = false;
-                    }
-
-                    if (GUILayout.Button(EditorGUIUtility.IconContent("d_Refresh@2x"), GUILayout.Width(40f), GUILayout.Height(40f)))
-                    {
-                        TryLoadConfigAsset();
-                    }
-                }
-                GUILayout.EndHorizontal();
+                cfgStatus = ConfigAssetStatus.AssetNotFound;
+                return;
             }
-            EditorGUI.indentLevel++;
+            
+            configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
+            cfgStatus = configAsset != null ? ConfigAssetStatus.AssetOk : ConfigAssetStatus.AssetIsInvalid;
+            if (cfgStatus == ConfigAssetStatus.AssetOk) adapterScanned = false;
         }
-
+        
         private void DrawGUI_AutoInitDisabled()
         {
             if (sdk.autoInit) return;
@@ -130,21 +107,7 @@ namespace Amanotes.Editor
                 EditorUtility.SetDirty(sdk);
             }
         }
-
-        private void DrawGUI_ConfigDetail()
-        {
-            CreateCachedEditor(configAsset, null, ref editor);
-            float lbWidth = EditorGUIUtility.labelWidth;
-            EditorGUIUtility.labelWidth = 220f;
-            editor.OnInspectorGUI();
-            EditorGUIUtility.labelWidth = lbWidth;
-        }
-
-        private void DrawGUI_ConfigAsset()
-        {
-            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false, GUILayout.Width(EditorGUIUtility.currentViewWidth - 414), GUILayout.ExpandWidth(true));
-        }
-
+        
         private void ScanForAdapterPackages()
         {
             adapterScanned = true;
@@ -193,26 +156,26 @@ namespace Amanotes.Editor
             }
         }
 
-        private void DrawGUI_ExampleScene()
-        {
-            var examplePackageName = "AmaGDKExample";
-            if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
-            {
-                var package = $"{Res.PACKAGE_PATH}{examplePackageName}.unitypackage";
-                AssetDatabase.ImportPackage(package, false);
-            }
-        }
-
-        private void DrawGUI_ColorPicker()
-        {
-            GUILayout.BeginHorizontal();
-            {
-                btnColor = EditorGUILayout.ColorField(btnColor);
-                btnLerp = EditorGUILayout.Slider(btnLerp, -1f, 1f);
-            }
-            GUILayout.EndHorizontal();
-        }
-
+        // private void DrawGUI_ExampleScene()
+        // {
+        //     var examplePackageName = "AmaGDKExample";
+        //     if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
+        //     {
+        //         var package = $"{Res.PACKAGE_PATH}{examplePackageName}.unitypackage";
+        //         AssetDatabase.ImportPackage(package, false);
+        //     }
+        // }
+        
+        // private void DrawGUI_ColorPicker()
+        // {
+        //     GUILayout.BeginHorizontal();
+        //     {
+        //         btnColor = EditorGUILayout.ColorField(btnColor);
+        //         btnLerp = EditorGUILayout.Slider(btnLerp, -1f, 1f);
+        //     }
+        //     GUILayout.EndHorizontal();
+        // }
+        
         // public void CopyVersion()
         // {
         //     var sb = new StringBuilder();
@@ -236,7 +199,7 @@ namespace Amanotes.Editor
         //     EditorGUIUtility.systemCopyBuffer = tsv;
         //     Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
         // }
-
+        
         void ShowAmaGDKContext()
         {
             var menu = new GenericMenu();
@@ -286,11 +249,6 @@ namespace Amanotes.Editor
             AmaGUI.SectionLabel(bannerTitle);
             var rect = GUILayoutUtility.GetLastRect();
             var btnRect = rect;
-            
-            // btnRect.x = 4f;
-            // btnRect.width = 24f; //btnRect.xMax - 
-            // btnRect.yMin = btnRect.yMax - 32f;
-            
             btnRect.xMin = btnRect.xMax - 24f; 
             btnRect.yMin = btnRect.yMax - 32f;
             
@@ -301,6 +259,55 @@ namespace Amanotes.Editor
             }
         }
 
+        void DrawGUI_GDKConfig()
+        {
+            if (cfgStatus == ConfigAssetStatus.None) RefreshConfigStatus();
+            if (cfgStatus == ConfigAssetStatus.ScriptNotFound
+                || cfgStatus == ConfigAssetStatus.AssetIsInvalid)
+            {
+                // Automatically import GDKConfigAsset
+                AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
+                return;
+            }
+            
+            if (cfgStatus == ConfigAssetStatus.AssetNotFound)
+            {
+                EditorGUILayout.HelpBox("[Warning] <Resources/AmaGDKConfig.asset> NOT FOUND!\nYou need to create one to control all the adapter's configurations!", MessageType.Warning);
+                GUILayout.BeginHorizontal();
+                {
+                    if (AmaGUI.BigButton("CREATE", 40f, BLUE))
+                    {
+                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
+                        var resourcePath = "Assets/AmaGDK/Resources";
+                        Directory.CreateDirectory(resourcePath);
+                        
+                        AssetDatabase.CreateAsset(config, Path.Combine(resourcePath, "AmaGDKConfig.asset"));
+                        AssetDatabase.SaveAssets();
+                        RefreshConfigStatus();
+                    }
+
+                    if (GUILayout.Button(EditorGUIUtility.IconContent("d_Refresh@2x"), GUILayout.Width(40f), GUILayout.Height(40f)))
+                    {
+                        RefreshConfigStatus();
+                    }
+                }
+                GUILayout.EndHorizontal();
+                return;
+            }
+            
+            if (configAsset == null)
+            {
+                Debug.LogWarning("Have you just deleted AmaGDKConfig.asset?" + cfgStatus);
+                cfgStatus = ConfigAssetStatus.None;
+                Repaint();
+                return;
+            }
+            
+            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false, 
+                GUILayout.Width(EditorGUIUtility.currentViewWidth - 414), 
+                GUILayout.ExpandWidth(true));
+        }
+
         public override void OnInspectorGUI()
         {
             Profiler.BeginSample("GDKEditor.OnInspectorGUI()");
@@ -322,7 +329,6 @@ namespace Amanotes.Editor
                 return;
             }
             
-            
             // DrawGUI_ColorPicker();
             DrawGUI_AmaGDKBanner();
             EditorGUILayout.Space();
@@ -330,23 +336,23 @@ namespace Amanotes.Editor
 
             if (EditorApplication.isCompiling || EditorApplication.isUpdating)
             {
+                cfgStatus = ConfigAssetStatus.None;
                 EditorGUILayout.HelpBox("Please wait for UnityEditor to finish compiling or importing", MessageType.Warning);
                 Profiler.EndSample();
                 return;
             }
-
-            if (!searchedForConfig) TryLoadConfigAsset();
-            if (!adapterScanned) ScanForAdapterPackages();
-            if (!extraScanned) ScanForAdapterPackages();
-
+            
+            DrawGUI_GDKConfig();
+            
             if (configAsset == null)
             {
-                DrawGUI_ConfigMissing();
-                Repaint();
                 Profiler.EndSample();
                 return;
             }
-
+            
+            if (!adapterScanned) ScanForAdapterPackages();
+            if (!extraScanned) ScanForAdapterPackages();
+            
             configSO = new SerializedObject(configAsset);
             configSO.Update();
             DrawProperty(configSO, "common", true);
@@ -354,6 +360,7 @@ namespace Amanotes.Editor
             DrawProperty(configSO, "enableServerTime", false);
             DrawProperty(configSO, "enableGeoLocation", false);
             GUILayout.Space(8f);
+            
             for (var i = 0; i < allAdapters.Count; i++)
             {
                 var item = allAdapters[i];
@@ -364,6 +371,13 @@ namespace Amanotes.Editor
             AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
             AmaGUI.Foldout("Extras", ref showExtra, DrawGUI_ExtraList);
             EditorGUILayout.ObjectField("Config", configAsset, typeof(ScriptableObject), false);
+    
+            EditorGUILayout.Space();
+            if (GUILayout.Button("Reimport Adapters", GUILayout.Height(30)))
+            {
+                GDKAutoUpdateAdapter.ImportAdapters();
+            }
+            
             Profiler.EndSample();
         }
 
@@ -378,22 +392,6 @@ namespace Amanotes.Editor
             return result;
         }
         
-
-        private static List<Type> FindSubClassesOf(Type baseType)
-        {
-            List<Type> result = new List<Type>();
-
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            foreach (Assembly assembly in assemblies)
-            {
-                if (!assembly.FullName.Contains("Assembly-CSharp")) continue;
-                if (!assembly.FullName.Contains("Editor")) continue;
-                Debug.Log(assembly.FullName);
-            }
-
-            return result;
-        }
-
         private static void RefreshListAdapters()
         {
             allAdapters = SDK_IDS
@@ -405,12 +403,12 @@ namespace Amanotes.Editor
                 .ToList();
         }
 
-        private static string FindBestAdapterFor(string adapterId)
+        private static List<string> FindPackagesFor(string adapterId)
         {
-            var matched = adapterPackages
-                .Where(item => item.ToLower().Contains(adapterId.ToLower()));
-
-            return matched.First();
+            return adapterPackages
+                .Where(item => item.ToLower().Contains(adapterId.ToLower()))
+                .OrderBy(item => item.Length)
+                .ToList();
         }
 
         private static void DrawAdapterDetail(string adapterId, Adapter2 adapter)
@@ -431,19 +429,21 @@ namespace Amanotes.Editor
                 if (adapter != null)
                 {
                     DrawSDKConfig(adapter, adapterId, status);
-                } else
+                }
+                
+                var packages = FindPackagesFor(adapterId);
+                EditorGUI.BeginDisabledGroup(!status.sdkInstalled);
                 {
-                    string adapterName = FindBestAdapterFor(adapterId);
-                    var package = $"{Res.PACKAGE_PATH}{adapterName}";
-                    EditorGUI.BeginDisabledGroup(!status.sdkInstalled);
+                    foreach (var package in packages)
                     {
-                        if (GUILayout.Button(GetGUIContent($"Import {adapterId} Adapter"), GUILayout.Height(24f)))
+                        var packagePath = $"{Res.PACKAGE_PATH}{package}";
+                        if (GUILayout.Button(GetGUIContent($"Import {package.Replace(".unitypackage", "")}"), GUILayout.Height(24f)))
                         {
-                            AssetDatabase.ImportPackage(package, false);
-                        }    
+                            AssetDatabase.ImportPackage(packagePath, false);
+                        }
                     }
-                    EditorGUI.EndDisabledGroup();
                 }
+                EditorGUI.EndDisabledGroup();
 
             }, () =>
             {
@@ -484,8 +484,6 @@ namespace Amanotes.Editor
                 }
             });
             
-
-
             if (changed) configOpen[adapterId] = isOpen;
         }
 

package/Editor/EmbedRemoteConfigAssetInspector.cs

@@ -4,7 +4,7 @@ using Amanotes.Core.Internal;
 using UnityEditor;
 using UnityEngine;
 
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Editor
 {

package/Editor/Extra/GDKAutoUpdateAdapter.cs

@@ -28,32 +28,32 @@ namespace Amanotes.Editor
             { "AndroidPostProcessor", $"{Res.EXTRA_PATH}PostProcessor.unitypackage" }
         };
         
-        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
-        {
-            #if AMAGDK_DEV
-            return;
-            #endif
-            
-            #pragma warning disable CS0162
-            CheckImportedAssets(importedAssets);
-            #pragma warning restore CS0162
-        }
-
-        private static void CheckImportedAssets(string[] importedAssets)
-        {
-            if (importedAssets.Length == 0) return;
-            // Debug.LogWarning($"importedAssets: {string.Join("\n", importedAssets)}");
-            
-            foreach (string path in importedAssets)
-            {
-                if (!path.EndsWith("AmaGDK.cs", StringComparison.InvariantCulture)) continue;
-                ImportAdapters();
-                break;
-            }
-        }
+        // private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        // {
+        //     #if AMAGDK_DEV
+        //     return;
+        //     #endif
+        //     
+        //     #pragma warning disable CS0162
+        //     CheckImportedAssets(importedAssets);
+        //     #pragma warning restore CS0162
+        // }
+        //
+        // private static void CheckImportedAssets(string[] importedAssets)
+        // {
+        //     if (importedAssets.Length == 0) return;
+        //     // Debug.LogWarning($"importedAssets: {string.Join("\n", importedAssets)}");
+        //     
+        //     foreach (string path in importedAssets)
+        //     {
+        //         if (!path.EndsWith("AmaGDK.cs", StringComparison.InvariantCulture)) continue;
+        //         ImportAdapters();
+        //         break;
+        //     }
+        // }
         
         [MenuItem("Window/AmaGDK/Reimport Adapters")]
-        private static void ImportAdapters()
+        public static void ImportAdapters()
         {
             var packages = new List<string>();
             foreach (KeyValuePair<string, string> kvp in packageMap)

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -370,13 +370,6 @@ namespace Amanotes.Core
     
     public class GDKPreProcessBuild: IPreprocessBuildWithReport
     {
-    #if UNITY_2022_1_OR_NEWER
-        private static readonly string GRADLE_VERSION = "7.6.1";
-    #else
-        private static readonly string GRADLE_VERSION = "6.7.1";
-    #endif
-        private static readonly string GRADLE_ROOT = "/usr/local/gradle";
-        
         public int callbackOrder
         {
             get { return 0; }
@@ -388,19 +381,12 @@ namespace Amanotes.Core
                 // Change Gradle path when running in headless mode (CI Machine)
                 if (Application.isBatchMode)
                 {   
-                    EditorPrefs.SetBool("GradleUseEmbedded", false);
-                    
                     if (GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath))
-                    {   
+                    {
+                        EditorPrefs.SetBool("GradleUseEmbedded", false);
                         EditorPrefs.SetString("GradlePath", envGradlePath);
                         Debug.Log("Update gradle path to: " + envGradlePath);
                     }
-                    else
-                    {
-                        string gradlePath = GRADLE_ROOT + "/gradle-" + GRADLE_VERSION;
-                        EditorPrefs.SetString("GradlePath", gradlePath);
-                        Debug.Log("Update gradle path to: " + gradlePath);
-                    }
                 }
             }
             

package/Packages/AppsFlyerAdapter.AdRevenue.unitypackage.meta

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

package/Runtime/Ad/AdExtension.cs

@@ -1,5 +1,6 @@
 using Amanotes.Core.Internal;
 using System;
+using static Amanotes.Core.GDKDebug;
 namespace Amanotes.Core
 {
     public static class AdExtension
@@ -105,7 +106,7 @@ namespace Amanotes.Core
             bool isValid = (ad != null);
             if (!isValid)
             {
-                Logging.LogWarning("Something wrong:: no AdShowContext");
+                LogWarning("Something wrong:: no AdShowContext");
             }
             return isValid;
         }

package/Runtime/Ad/AdLogic.cs

@@ -1,6 +1,6 @@
 using System.Collections;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.AmaGDK;
 
 namespace Amanotes.Core.Internal
@@ -131,7 +131,11 @@ namespace Amanotes.Core.Internal
         private Coroutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
+        
+        // Do not warn unused variable, it's been use outside of Editor (Runtime)
+        #pragma warning disable
         private bool isFocus;
+        #pragma warning enable
         
         public void StartShowAd()
         {
@@ -281,11 +285,12 @@ namespace Amanotes.Core.Internal
 
         private IEnumerator WaitForMediationCallback()
         {
-            #if !UNITY_EDITOR
-            while (!isFocus) yield return null; 
+            #if UNITY_EDITOR
+            while (!context.hasClosed) yield return null;
+            yield break;
             #endif
-            
-            int wait4CallbackCounter = 0;
+            while (!isFocus) yield return null;
+            var wait4CallbackCounter = 0;
             while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
                 wait4CallbackCounter++;

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using Amanotes.Core.Internal;
 
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.AmaGDK;
 
 namespace Amanotes.Core
@@ -157,7 +157,7 @@ namespace Amanotes.Core
             {
                 if (Adapter2.GetAllAdapter<AdAdapter>().Count > 1)
                 {
-                    Utils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
+                    GDKUtils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
                 }
                 _adapter = Adapter2.GetAdapter<AdAdapter>();
                 return _adapter != null;

package/Runtime/AmaGDK.Adapters.cs

@@ -2,13 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
-    
-    
-    public abstract partial class Adapter2
+    public abstract class GDKInternal
     {
         protected internal enum ConfigStatus
         {
@@ -17,6 +15,11 @@ namespace Amanotes.Core.Internal
             Warning
         }
         
+        internal protected static Action<string, string, double> _onAdImpression;
+    }
+    
+    public abstract partial class Adapter2 : GDKInternal
+    {
         // internal use
         [HideInNormalInspector] [SerializeField] internal int initOrder;
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;