com.azerion.bluestack 3.0.3 → 3.1.0-preview2

package/Editor/Android/AndroidBuildPostProcess.cs

@@ -1,5 +1,4 @@
 #if UNITY_ANDROID
-
 using System;
 using System.IO;
 using System.Linq;

package/Editor/Android/AndroidDependency.cs

@@ -2,12 +2,11 @@ namespace Azerion.BlueStack.Editor.Android
 {
     public class AndroidDependency : Dependency
     {
-        
         public AndroidDependency(string gradleDependency, string name, string version) : base(name, version)
         {
             GradleDependency = gradleDependency;
         }
-        
+
         public string GradleDependency { get; }
     }
 }

package/Editor/Android/AndroidDependencyModifier.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using UnityEngine;
+
+namespace Azerion.BlueStack.Editor.Android
+{
+    public class AndroidDependencyModifier : IDependencyModifier
+    {
+        void IDependencyModifier.modifyDependencies(string xmlFilePath, List<MediationNetworkDependency> dependencies)
+        {
+
+        }
+
+        void IDependencyModifier.modifyMediationNetworkDependencies(string xmlFilePath,
+            List<MediationNetworkDependency> dependencies)
+        {
+            XmlDocument mainDependencyXML = new XmlDocument();
+
+            try
+            {
+                mainDependencyXML.Load(xmlFilePath);
+            }
+            catch (IOException e)
+            {
+                throw new Exception("Unable to load xml, error: " + e.Message);
+            }
+
+            foreach (MediationNetworkDependency dependency in dependencies)
+            {
+                XmlNode mainNode =
+                    mainDependencyXML.SelectSingleNode(
+                        $"//networkList/androidNetworks/network[@name='{dependency.Name}']");
+
+                if (mainNode != null)
+                {
+                    mainNode.Attributes["active"].Value = dependency.Active.ToString();
+                }
+                else
+                {
+                    // Node doesn't exists in Mediation Dependency XML
+                    Debug.LogError(
+                        $"Something went wrong: Node '{dependency.Name}' doesn't exists in Mediation Dependency XML! " +
+                        "Please check if you have manually changed the xml");
+                }
+            }
+
+            // Save the modified XML
+            DependencyProvider.SaveMainXMLFile(mainDependencyXML.OuterXml);
+
+            Debug.Log("Mediation Dependency XML files merged and updated successfully.");
+        }
+    }
+}

package/Editor/Android/AndroidDependencyModifier.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79c21ad51cf7244c985af0130855820f
+timeCreated: 1671784779

package/Editor/Android/AndroidDependencyParser.cs

@@ -18,7 +18,32 @@ namespace Azerion.BlueStack.Editor.Android
             {
                 var specAttribute = androidPackageNode.Attributes?["spec"];
                 if (specAttribute == null) continue;
-                dependencies.Add(new AndroidDependency(specAttribute.Value,"", ""));
+                dependencies.Add(new AndroidDependency(specAttribute.Value, "", ""));
+            }
+
+            return dependencies;
+        }
+
+        List<MediationNetworkDependency> IDependencyParser.parseMediationNetworkDependencies(string xmlFilePath)
+        {
+            var xmlDoc = new XmlDocument();
+            xmlDoc.Load(xmlFilePath);
+            const string xmlPathPattern = "//networkList/androidNetworks";
+            var androidPackagesNode = xmlDoc.SelectSingleNode(xmlPathPattern);
+            var dependencies = new List<MediationNetworkDependency>();
+            if (androidPackagesNode == null) return dependencies;
+            foreach (XmlNode androidPackageNode in androidPackagesNode.ChildNodes)
+            {
+                var nameAttribute = androidPackageNode.Attributes?["name"];
+                var packageAttribute = androidPackageNode.Attributes?["package"];
+                var activeAttribute = androidPackageNode.Attributes?["active"];
+                if (nameAttribute == null || packageAttribute == null) continue;
+
+                var name = nameAttribute.Value;
+                var package = packageAttribute.Value;
+                var active = bool.Parse(activeAttribute.Value);
+
+                dependencies.Add(new MediationNetworkDependency(name, package, active));
             }
 
             return dependencies;

package/Editor/Android/ManifestProcessor.cs

@@ -70,7 +70,8 @@ namespace Azerion.BlueStack.Editor.Android
             }
             else
             {
-                adMobAppMetaElement.SetAttributeValue(ANDROID_NS + "value", BlueStackSettings.Instance.AdmobAppIdAndroid);
+                adMobAppMetaElement.SetAttributeValue(ANDROID_NS + "value",
+                    BlueStackSettings.Instance.AdmobAppIdAndroid);
             }
 
             elemManifest.Save(manifestPath);

package/Editor/Azerion.BlueStack.Editor.asmdef

@@ -1,16 +1,16 @@
 {
-    "name": "Azerion.BlueStack.Editor",
-    "rootNamespace": "",
-    "references": [],
-    "includePlatforms": [
-        "Editor"
-    ],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
+  "name": "Azerion.BlueStack.Editor",
+  "rootNamespace": "",
+  "references": [],
+  "includePlatforms": [
+    "Editor"
+  ],
+  "excludePlatforms": [],
+  "allowUnsafeCode": false,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [],
+  "noEngineReferences": false
 }

package/Editor/BlueStackDependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.azerion:bluestack-sdk-core:4.3.0" />
+        <androidPackage spec="com.azerion:bluestack-sdk-core:4.3.1.3-SNAPSHOT"/>
     </androidPackages>
     <iosPods>
         <iosPod name="BlueStack-SDK" version="4.4.0" bitcodeEnabled="false" addToAllTargets="false" subspecs="['Google-Mobile-Ads-SDK']"/>

package/Editor/BlueStackMediationDependencies.xml

@@ -0,0 +1,11 @@
+<networkList>
+    <androidNetworks>
+    </androidNetworks>
+    <iosNetworks>
+        <network name="AdMob" package="Google-Mobile-Ads-SDK" active="true"/>
+        <network name="Smart Display" package="Smart-Display-SDK" active="true"/>
+        <network name="Ogury" package="OguryAds" active="true"/>
+        <network name="In-App Bidding" package="In-App-Bidding" active="true"/>
+        <network name="ImproveDigital" package="ImproveDigital" active="true"/>
+    </iosNetworks>
+</networkList>

package/Editor/BlueStackMediationDependencies.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 17379802e308d4595828a770efabe5f7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/BlueStackSettings.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace Azerion.BlueStack.Editor
@@ -7,25 +8,26 @@ namespace Azerion.BlueStack.Editor
         private static BlueStackSettings instance;
         private const string BlueStackSettingsFile = "BlueStackSettings";
 
-// #if !UNITY_ANDROID
-//         [HideInInspector]
-// #endif
-       [SerializeField] private string admobAppIdAndroid;
-       public string AdmobAppIdAndroid
+        [SerializeField] private string admobAppIdAndroid;
+        public string AdmobAppIdAndroid
         {
-            get { return Instance.admobAppIdAndroid; }
-            set { Instance.admobAppIdAndroid = value; }
+            get => Instance.admobAppIdAndroid;
+            set => Instance.admobAppIdAndroid = value;
+        }
+
+        [SerializeField] private string admobAppIdIOS;
+        public string AdmobAppIdIOS
+        {
+            get => Instance.admobAppIdIOS;
+            set => Instance.admobAppIdIOS = value;
+        }
+
+        [SerializeField] private List<MediationNetworkDependency> networkList;
+        public List<MediationNetworkDependency> NetworkList
+        {
+            get => Instance.networkList;
+            set => Instance.networkList = value;
         }
-       
-// #if !UNITY_IOS
-//         [HideInInspector]
-// #endif
-       [SerializeField] private string admobAppIdIOS;
-       public string AdmobAppIdIOS
-       {
-           get { return Instance.admobAppIdIOS; }
-           set { Instance.admobAppIdIOS = value; }
-       }
 
         public static BlueStackSettings Instance
         {
@@ -44,7 +46,8 @@ namespace Azerion.BlueStack.Editor
                 }
                 else
                 {
-                    Debug.LogWarning("BlueStackSettings asset not found! Creating new via Azerion/BlueStack/Settings  menu");
+                    Debug.LogWarning(
+                        "BlueStackSettings asset not found! Creating new via Azerion/BlueStack/Settings  menu");
                     return null;
                 }
             }

package/Editor/BlueStackSettingsEditor.cs

@@ -1,6 +1,12 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
+using System.Xml;
+using Azerion.BlueStack.Editor.Android;
+using Azerion.BlueStack.Editor.iOS;
 
 namespace Azerion.BlueStack.Editor
 {
@@ -10,7 +16,15 @@ namespace Azerion.BlueStack.Editor
         private const string BlueStackSettingsResDir = "Assets/Resources";
         private const string BlueStackSettingsFile = "BlueStackSettings";
         private const string BlueStackSettingsFileExtension = ".asset";
-        
+
+        private List<bool> iOSMediationNetworkList = new List<bool>();
+        private List<bool> AndroidMediationNetworkList = new List<bool>();
+        SerializedProperty iOSMediationNetworkListProperty;
+        SerializedProperty androidMediationNetworkListProperty;
+
+        SerializedProperty iOSAdmobAppIdProperty;
+        SerializedProperty androidAdmobAppIdProperty;
+
         [MenuItem("Azerion/BlueStack/Settings")]
         public static void OpenInspector()
         {
@@ -33,5 +47,54 @@ namespace Azerion.BlueStack.Editor
                 EditorApplication.ExecuteMenuItem("Window/General/Inspector");
             }
         }
+
+        void OnEnable()
+        {
+            // BlueStackSettings.Instance.NetworkList.Clear();
+            
+            // Sync/Copy base mediation dependency xml file from Package to Assets directory 
+            DependencyProvider.SyncMediationDependencyXML();
+            
+            iOSAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdIOS");
+            androidAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdAndroid");
+
+            var dependencies = DependencyProvider.GetAllMediationNetworkDependencies(new IOSDependencyParser());
+            BlueStackSettings.Instance.NetworkList = BlueStackSettings.Instance.NetworkList
+                .Where(x => dependencies.All(l2 => l2.Name != x.Name)).ToList();
+            BlueStackSettings.Instance.NetworkList =
+                BlueStackSettings.Instance.NetworkList.Union(dependencies).ToList();
+            
+            DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
+                BlueStackSettings.Instance.NetworkList);
+        }
+        
+        public override void OnInspectorGUI()
+        {
+            EditorGUI.BeginChangeCheck();
+            // serializedObject.Update();
+
+            EditorGUILayout.PropertyField(iOSAdmobAppIdProperty, new GUIContent("Admob AppId IOS: "));
+            EditorGUILayout.PropertyField(androidAdmobAppIdProperty, new GUIContent("Admob AppId Android: "));
+            EditorGUILayout.Separator();
+            EditorGUILayout.LabelField("Android Mediation Networks: ", EditorStyles.boldLabel);
+            
+            foreach (var dependency in BlueStackSettings.Instance.NetworkList)
+            {
+                dependency.Print();
+                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.Active, dependency.Name);
+                if (newAutomaticConfigurationFilesUpdate != dependency.Active)
+                {
+                    dependency.Active = newAutomaticConfigurationFilesUpdate;
+                }
+            }
+            
+            if (EditorGUI.EndChangeCheck())
+            {
+                DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
+                    BlueStackSettings.Instance.NetworkList);
+                // serializedObject.ApplyModifiedProperties();
+            }
+            
+        }
     }
 }

package/Editor/DebugHelper.cs

@@ -14,10 +14,10 @@ namespace Azerion.BlueStack.Editor
         throw new OperationCanceledException(prefix + message);
 #endif
         }
-        
+
         public static void Log(string message)
         {
-            Debug.Log("[BlueStack] "+message);
+            Debug.Log("[BlueStack] " + message);
         }
     }
 }

package/Editor/Dependency.cs

@@ -7,7 +7,7 @@ namespace Azerion.BlueStack.Editor
             Name = name;
             Version = version;
         }
-        
+
         public string Name { get; }
         public string Version { get; }
     }

package/Editor/DependencyProvider.cs

@@ -1,13 +1,224 @@
 using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+using UnityEditor;
+using UnityEngine;
 
 namespace Azerion.BlueStack.Editor
 {
     public class DependencyProvider
     {
+        private static readonly string _dependencyPathInPackage =
+            "Packages/com.azerion.bluestack/Editor/" + "BlueStackDependencies.xml";
+
+        private static readonly string _mediationDependencyPathInPackage =
+            "Packages/com.azerion.bluestack/Editor/" + "BlueStackMediationDependencies.xml";
+
+        private static readonly string _editorPathInAssets = "Assets/Editor/";
+        private static readonly string _dependencyPathInAssets = _editorPathInAssets + "BlueStackDependencies.xml";
+
+        private static readonly string _mediationDependencyPathInAssets =
+            _editorPathInAssets + "BlueStackMediationDependencies.xml";
+
         public static List<Dependency> GetAllDependencies(IDependencyParser parser)
         {
-            string dependencyXmlFilePath = "Packages/com.azerion.bluestack/Editor/" + "BlueStackDependencies.xml";
-            return parser.parseDependencies(dependencyXmlFilePath);
+            if (File.Exists(_dependencyPathInPackage))
+            {
+                return parser.parseDependencies(_dependencyPathInPackage);
+            }
+            else
+            {
+                Debug.LogError("Dependencies file not found at: " + _dependencyPathInPackage);
+                return new List<Dependency>();
+            }
+        }
+
+        public static List<MediationNetworkDependency> GetAllMediationNetworkDependencies(IDependencyParser parser)
+        {
+            if (File.Exists(_mediationDependencyPathInAssets))
+            {
+                return parser.parseMediationNetworkDependencies(_mediationDependencyPathInAssets);
+            }
+            else
+            {
+                Debug.LogError("Dependencies file not found at: " + _mediationDependencyPathInAssets);
+                return new List<MediationNetworkDependency>();
+            }
+        }
+
+        public static void UpdateMediationNetworkDependencies(IDependencyModifier modifier,
+            List<MediationNetworkDependency> dependencies)
+        {
+            // Update Mediation Network Dependencies in BlueStackMediationDependencies.xml
+            if (File.Exists(_mediationDependencyPathInAssets))
+            {
+                modifier.modifyMediationNetworkDependencies(_mediationDependencyPathInAssets, dependencies);
+            }
+            else
+            {
+                Debug.LogError("Dependencies file not found at: " + _mediationDependencyPathInAssets);
+            }
+            
+            // Update Mediation Network Dependencies in BlueStackDependencies.xml
+            if (File.Exists(_dependencyPathInAssets))
+            {
+                modifier.modifyDependencies(_dependencyPathInAssets, dependencies);
+            }
+            else
+            {
+                Debug.LogError("Dependencies file not found at: " + _dependencyPathInAssets);
+            }
+        }
+
+        public static void SyncMediationDependencyXML()
+        {
+            // if file doesn't exists, just copy from the source
+            CopyDependenciesXMLFileToAssets();
+            if (CopyMediationDependenciesXMLFileToAssets())
+            {
+                return;
+            }
+
+            XmlDocument mainDependencyXML = new XmlDocument();
+            mainDependencyXML.Load(_mediationDependencyPathInAssets);
+
+            XmlDocument updateDependencyXML = new XmlDocument();
+            updateDependencyXML.Load(_mediationDependencyPathInPackage);
+
+            if (!XMLStructuresMatch(mainDependencyXML, updateDependencyXML))
+            {
+                Debug.LogWarning("XML structures do not match. replacing main with update.");
+                SaveMainXMLFile(updateDependencyXML.OuterXml);
+                return;
+            }
+
+            // Update Main Dependency XML
+            // UpdateMainXML(mainDependencyXML, updateDependencyXML);
+            XmlNodeList updateNodes = updateDependencyXML.SelectNodes("//network");
+
+            if (updateNodes == null || updateNodes.Count < 1)
+            {
+                return;
+            }
+            
+            foreach (XmlNode updateNode in updateNodes)
+            {
+                XmlNode mainNode = mainDependencyXML.SelectSingleNode($"//{updateNode.ParentNode.Name}/network[@name='{updateNode.Attributes["name"].Value}']");
+
+                if (mainNode == null)
+                {
+                    // Node not in main.xml, add it
+                    XmlNode importedNode = mainDependencyXML.ImportNode(updateNode, true);
+                    mainDependencyXML.DocumentElement.SelectSingleNode($"//{updateNode.ParentNode.Name}")
+                        .AppendChild(importedNode);
+                }
+            }
+
+            // Remove nodes in mainDependencyXML not present in updateDependencyXML
+            XmlNodeList mainNodes = mainDependencyXML.SelectNodes("//network");
+            foreach (XmlNode mainNode in mainNodes)
+            {
+                XmlNode updateNode =
+                    updateDependencyXML.SelectSingleNode($"//network[@name='{mainNode.Attributes["name"].Value}']");
+
+                if (updateNode == null)
+                {
+                    mainNode.ParentNode.RemoveChild(mainNode);
+                }
+            }
+
+            // Save the modified main XML
+            SaveMainXMLFile(mainDependencyXML.OuterXml);
+
+            Debug.Log("Mediation Dependency XML files merged and updated successfully.");
+        }
+
+        private static void CopyMediationDependencyXML()
+        {
+            
+        }
+
+        public static void UpdateMediationDependencyXML(List<MediationNetworkDependency> dependencies)
+        {
+            // if file doesn't exists, return
+            if (!File.Exists(_mediationDependencyPathInAssets))
+            {
+                return;
+            }
+
+            XmlDocument mainDependencyXML = new XmlDocument();
+            mainDependencyXML.Load(_mediationDependencyPathInAssets);
+
+            foreach (MediationNetworkDependency dependency in dependencies)
+            {
+                XmlNode mainNode = mainDependencyXML.SelectSingleNode($"//network[@name='{dependency.Name}']");
+
+                if (mainNode != null)
+                {
+                    mainNode.Attributes["active"].Value = dependency.Active.ToString();
+                }
+                else
+                {
+                    // Node doesn't exists in Mediation Dependency XML
+                    Debug.LogError("Something went wrong: Node doesn't exists in Mediation Dependency XML! " +
+                                   "Please check if you have manually changed the xml");
+                }
+            }
+
+            // Save the modified XML
+            SaveMainXMLFile(mainDependencyXML.OuterXml);
+
+            Debug.Log("Mediation Dependency XML files merged and updated successfully.");
+        }
+
+        private static bool XMLStructuresMatch(XmlDocument mainDoc, XmlDocument updateDoc)
+        {
+            string iosNodePath = "//networkList/iosNetworks";
+            XmlNode iosNetworksNode = mainDoc.SelectSingleNode(iosNodePath);
+            
+            string androidNodePath = "//networkList/androidNetworks";
+            XmlNode androidNetworksNode = mainDoc.SelectSingleNode(androidNodePath);
+
+            if (iosNetworksNode == null || androidNetworksNode == null)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+        public static void SaveMainXMLFile(string updatedXML)
+        {
+            // Replace main mediation dependency XML content with the updated XML
+            System.IO.File.WriteAllText(_mediationDependencyPathInAssets, updatedXML);
+            AssetDatabase.Refresh();
+        }
+
+        public static bool CopyDependenciesXMLFileToAssets()
+        {
+            if (!File.Exists(_dependencyPathInAssets))
+            {
+                Directory.CreateDirectory(_editorPathInAssets);
+                FileUtil.CopyFileOrDirectory(_dependencyPathInPackage, _dependencyPathInAssets);
+                AssetDatabase.Refresh();
+                return true;
+            }
+
+            return false;
+        }
+        
+        public static bool CopyMediationDependenciesXMLFileToAssets()
+        {
+            if (!File.Exists(_mediationDependencyPathInAssets))
+            {
+                Directory.CreateDirectory(_editorPathInAssets);
+                FileUtil.CopyFileOrDirectory(_mediationDependencyPathInPackage, _mediationDependencyPathInAssets);
+                AssetDatabase.Refresh();
+                return true;
+            }
+            return false;
         }
     }
 }

package/Editor/IDependencyModifier.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Azerion.BlueStack.Editor
+{
+    public interface IDependencyModifier
+    {
+        public void modifyDependencies(string xmlFilePath, List<MediationNetworkDependency> dependencies);
+
+        public void modifyMediationNetworkDependencies(string xmlFilePath,
+            List<MediationNetworkDependency> dependencies);
+    }
+}

package/Editor/IDependencyModifier.cs.meta

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

package/Editor/IDependencyParser.cs

@@ -5,5 +5,6 @@ namespace Azerion.BlueStack.Editor
     public interface IDependencyParser
     {
         public List<Dependency> parseDependencies(string xmlFilePath);
+        public List<MediationNetworkDependency> parseMediationNetworkDependencies(string xmlFilePath);
     }
 }

package/Editor/MediationNetworkDependency.cs

@@ -0,0 +1,34 @@
+using System;
+using UnityEngine;
+
+namespace Azerion.BlueStack.Editor
+{
+    [Serializable]
+    public class MediationNetworkDependency
+    {
+        public MediationNetworkDependency(string name, string package, bool active)
+        {
+            Name = name;
+            Package = package;
+            Active = active;
+        }
+
+        public string Name { get; set; }
+        public string Package { get; set; }
+
+        // [SerializeField]
+        public bool Active { get; set; }
+
+        // [SerializeField] private bool active;
+        // public bool Active
+        // {
+        //     get => active;
+        //     set => active = value;
+        // }
+
+        public void Print()
+        {
+            Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + Active);
+        }
+    }
+}

package/Editor/MediationNetworkDependency.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a4f9c0013a9c4aa8a10631761a602613
+timeCreated: 1708551835

package/Editor/iOS/IOSDependency.cs

@@ -0,0 +1,12 @@
+namespace Azerion.BlueStack.Editor.iOS
+{
+    public class IOSDependency : Dependency
+    {
+        public string GradleDependency { get; }
+
+        public IOSDependency(string gradleDependency, string name, string version) : base(name, version)
+        {
+            GradleDependency = gradleDependency;
+        }
+    }
+}