com.azerion.bluestack 3.1.7 → 3.1.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [3.1.9] - 2024-11-07
+
+### fixed
+
+- Removed unused namespaces and fixed assembly reference missing issue.
+
+## [3.1.8] - 2024-11-07
+
+### Changed
+
+- BlueStackSettings Initialization on AssetPostProcess.
+
 ## [3.1.7] - 2024-10-23
 
 ### Changed
@@ -11,7 +23,7 @@
 
 ### Fixed
 
-- Rerestricted interaction with Native ad objects while any overlay view is on top.
+- Restricted interaction with Native ad objects while any overlay view is on top.
 
 ## [3.1.6] - 2024-07-26
 

package/Editor/Android/AndroidDependencyModifier.cs

@@ -29,6 +29,7 @@ namespace Azerion.BlueStack.Editor.Android
                 return;
             }
             
+            bool valueChanged = false;
             // Remove all networks from the packages node
             // androidPackages.RemoveAll();
             
@@ -41,16 +42,17 @@ namespace Azerion.BlueStack.Editor.Android
                 if (packageNode != null)
                 {
                     // Remove inactive network
-                    if (!dependency.Active)
+                    if (!dependency.IsActive)
                     {
                         androidPackages.RemoveChild(packageNode);
+                        valueChanged = true;
                     }
                     // else keep it
                 }
                 else
                 {
                     // Add new active network
-                    if (dependency.Active)
+                    if (dependency.IsActive)
                     {
                         XmlElement package = xmlDoc.CreateElement("androidPackage");
                         package.SetAttribute("spec", dependency.Package);
@@ -60,54 +62,64 @@ namespace Azerion.BlueStack.Editor.Android
                             package.AppendChild(repositories);
                         }
                         androidPackages.AppendChild(package);
+                        valueChanged = true;
                     }
                 }
             }
 
             // Replace main dependency XML content with the updated XML
-            System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
-            AssetDatabase.Refresh();
-            
-            // Debug.Log("Mediation Dependencies are updated successfully in Main Dependencies XML.");
+            if (valueChanged)
+            {
+                DependencyProvider.SaveDependenciesXMLFile(xmlDoc.OuterXml);
+                // Debug.Log("Android Mediation Dependencies are updated successfully in Main Dependencies XML.");
+            }
         }
 
         void IDependencyModifier.modifyMediationNetworkDependencies(string xmlFilePath,
             List<MediationNetworkDependency> dependencies)
         {
-            XmlDocument mainDependencyXML = new XmlDocument();
+            XmlDocument mediationDependencyXML = new XmlDocument();
 
             try
             {
-                mainDependencyXML.Load(xmlFilePath);
+                mediationDependencyXML.Load(xmlFilePath);
             }
             catch (IOException e)
             {
                 throw new Exception("Unable to load xml, error: " + e.Message);
             }
 
+            bool valueChanged = false;
             foreach (MediationNetworkDependency dependency in dependencies)
             {
                 XmlNode mainNode =
-                    mainDependencyXML.SelectSingleNode(
+                    mediationDependencyXML.SelectSingleNode(
                         $"//networkList/androidNetworks/network[@name='{dependency.Name}']");
 
-                if (mainNode != null)
+                if (mainNode is { Attributes: not null })
                 {
-                    mainNode.Attributes["active"].Value = dependency.Active.ToString();
+                    if (mainNode.Attributes["active"].Value != dependency.IsActive.ToString())
+                    {
+                        mainNode.Attributes["active"].Value = dependency.IsActive.ToString();
+                        valueChanged = true;
+                    }
                 }
                 else
                 {
                     // Node doesn't exists in Mediation Dependency XML
                     Debug.LogError(
-                        $"Something went wrong: Node '{dependency.Name}' doesn't exists in Mediation Dependency XML! " +
+                        "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.");
+            // if changed, Save the modified XML
+            if (valueChanged)
+            {
+                DependencyProvider.SaveMediationDependenciesXMLFile(mediationDependencyXML.OuterXml);
+                // Debug.Log("Android Mediation Dependency XML files merged and updated successfully.");
+            }
         }
     }
 }

package/Editor/Android/Gradle/GradleConfigUtils.cs

@@ -1,8 +1,5 @@
 using System;
 using System.IO;
-using Azerion.BlueStack.Editor;
-using Azerion.BlueStack.Editor.Android;
-using Azerion.BlueStack.Editor.iOS;
 
 namespace Azerion.BlueStack.Editor.Android.Gradle
 {

package/Editor/Android/ManifestProcessor.cs

@@ -3,9 +3,6 @@ using System.IO;
 using System.Linq;
 using System.Xml.Linq;
 using UnityEditor;
-using UnityEditor.Build;
-using UnityEditor.Build.Reporting;
-using UnityEngine;
 
 namespace Azerion.BlueStack.Editor.Android
 {

package/Editor/BlueStackAssetPostProcessor.cs

@@ -0,0 +1,15 @@
+using UnityEditor;
+
+namespace Azerion.BlueStack.Editor
+{
+    public class BlueStackAssetPostProcessor : AssetPostprocessor
+    {
+        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets,
+            string[] movedFromAssetPaths, bool didDomainReload)
+        {
+            // This is Required when updating the SDK.
+            // Initialize and Sync dependencies when project loaded in Unity Editor.
+            BlueStackSettingsEditor.Initialize();
+        }
+    }
+}

package/Editor/BlueStackAssetPostProcessor.cs.meta

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

package/Editor/BlueStackSettings.cs

@@ -1,8 +1,5 @@
-using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.Serialization;
 
 namespace Azerion.BlueStack.Editor
 {

package/Editor/BlueStackSettingsEditor.cs

@@ -1,10 +1,8 @@
 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;
 
@@ -40,6 +38,7 @@ namespace Azerion.BlueStack.Editor
         {
             if (BlueStackSettings.Instance == null)
             {
+                Debug.LogWarning("BlueStackSettings Instance is not available!");
                 try
                 {
                     Directory.CreateDirectory(BlueStackSettingsResDir);
@@ -69,18 +68,19 @@ namespace Azerion.BlueStack.Editor
 
         // This is Required when updating the SDK.
         // Initialize and Sync dependencies when project loaded in Unity Editor.
-        [InitializeOnLoadMethod]
-        static void OnProjectLoadedInEditor()
-        {
-            Initialize();
-        }
+        // This logic is now moved to OnPostprocessAllAssets of BlueStackAssetPostProcessor
+        // [InitializeOnLoadMethod]
+        // static void OnProjectLoadedInEditor()
+        // {
+        //     Initialize();
+        // }
 
         void OnEnable()
         {
             Initialize();
         }
 
-        static void Initialize()
+        public static void Initialize()
         {
             if (!DoesBlueStackSettingsExist()) return;
             
@@ -121,10 +121,10 @@ namespace Azerion.BlueStack.Editor
             foreach (var dependency in BlueStackSettings.Instance.AndroidMediationNetworks)
             {
                 // dependency.Print();
-                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.Active, dependency.Name);
-                if (newAutomaticConfigurationFilesUpdate != dependency.Active)
+                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.IsActive, dependency.Name);
+                if (newAutomaticConfigurationFilesUpdate != dependency.IsActive)
                 {
-                    dependency.Active = newAutomaticConfigurationFilesUpdate;
+                    dependency.IsActive = newAutomaticConfigurationFilesUpdate;
                 }
             }
             
@@ -135,10 +135,10 @@ namespace Azerion.BlueStack.Editor
             foreach (var dependency in BlueStackSettings.Instance.IOSMediationNetworks)
             {
                 // dependency.Print();
-                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.Active, dependency.Name);
-                if (newAutomaticConfigurationFilesUpdate != dependency.Active)
+                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.IsActive, dependency.Name);
+                if (newAutomaticConfigurationFilesUpdate != dependency.IsActive)
                 {
-                    dependency.Active = newAutomaticConfigurationFilesUpdate;
+                    dependency.IsActive = newAutomaticConfigurationFilesUpdate;
                 }
             }
 

package/Editor/Constants.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace Azerion.BlueStack.Editor
 {
     public class Constants

package/Editor/DependencyProvider.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
@@ -67,9 +68,9 @@ namespace Azerion.BlueStack.Editor
         public static void SyncDependenciesXMLs()
         {
             // Copy from the source
-            CopyDependenciesXMLFileToAssets();
-            if (CopyMediationDependenciesXMLFileToAssets())
+            if (CopyDependenciesXMLFileToAssets() & CopyMediationDependenciesXMLFileToAssets())
             {
+                Debug.LogWarning("XML Files Copied from package to To Assets.");
                 return;
             }
 
@@ -82,7 +83,7 @@ namespace Azerion.BlueStack.Editor
             if (!XMLStructuresMatch(mainDependencyXML, updateDependencyXML))
             {
                 Debug.LogWarning("XML structures do not match. replacing main with update.");
-                SaveMainXMLFile(updateDependencyXML.OuterXml);
+                SaveMediationDependenciesXMLFile(updateDependencyXML.OuterXml);
                 return;
             }
 
@@ -119,9 +120,7 @@ namespace Azerion.BlueStack.Editor
             }
 
             // Save the modified main XML
-            SaveMainXMLFile(mainDependencyXML.OuterXml);
-
-            // Debug.Log("Mediation Dependency XML files merged and updated successfully.");
+            SaveMediationDependenciesXMLFile(mainDependencyXML.OuterXml);
         }
 
         private static bool XMLStructuresMatch(XmlDocument mainDoc, XmlDocument updateDoc)
@@ -141,21 +140,40 @@ namespace Azerion.BlueStack.Editor
                 return true;
             }
         }
+        
+        public static void SaveDependenciesXMLFile(string updatedXML)
+        {
+            // Replace main mediation dependency XML content with the updated XML
+            System.IO.File.WriteAllText(_dependencyPathInAssets, updatedXML);
+            AssetDatabase.Refresh();
+        }
 
-        public static void SaveMainXMLFile(string updatedXML)
+        public static void SaveMediationDependenciesXMLFile(string updatedXML)
         {
             // Replace main mediation dependency XML content with the updated XML
             System.IO.File.WriteAllText(_mediationDependencyPathInAssets, updatedXML);
             AssetDatabase.Refresh();
         }
-
-        private static void CopyDependenciesXMLFileToAssets()
+        
+        public static void SaveMainXMLFile(string updatedXML, string path)
         {
-            Directory.CreateDirectory(_editorPathInAssets);
-            FileUtil.ReplaceFile(_dependencyPathInPackage, _dependencyPathInAssets);
+            // Replace main XML content with the updated XML
+            System.IO.File.WriteAllText(path, updatedXML);
             AssetDatabase.Refresh();
         }
 
+        private static bool CopyDependenciesXMLFileToAssets()
+        {
+            if (!File.Exists(_dependencyPathInAssets))
+            {
+                Directory.CreateDirectory(_editorPathInAssets);
+                FileUtil.ReplaceFile(_dependencyPathInPackage, _dependencyPathInAssets);
+                AssetDatabase.Refresh();
+                return true;
+            }
+            return false;
+        }
+
         private static bool CopyMediationDependenciesXMLFileToAssets()
         {
             // Delete previous BlueStackMediationDependencies.xml file - TODO: remove in future 
@@ -180,7 +198,7 @@ namespace Azerion.BlueStack.Editor
             Debug.Log($"====================={dependencies.Count}=====================>");
             foreach (MediationNetworkDependency dependency in dependencies)
             {
-                Debug.Log($"Network Name: {dependency.Name}, Package: {dependency.Package}, Status: {dependency.Active}");
+                Debug.Log($"Network Name: {dependency.Name}, Package: {dependency.Package}, Status: {dependency.IsActive}");
             }
             Debug.Log("<==========================================");
         }

package/Editor/MediationNetworkDependency.cs

@@ -7,22 +7,22 @@ namespace Azerion.BlueStack.Editor
     [Serializable]
     public class MediationNetworkDependency
     {
-        public MediationNetworkDependency(string name, string package, bool active, XmlNode repositories = null)
+        public MediationNetworkDependency(string name, string package, bool isActive, XmlNode repositories = null)
         {
             Name = name;
             Package = package;
-            Active = active;
+            IsActive = isActive;
             Repositories = repositories;
         }
 
         public string Name { get; set; }
         public string Package { get; set; }
-        public bool Active { get; set; }
+        public bool IsActive { get; set; }
         public XmlNode Repositories { get; set; }
 
         public void Print()
         {
-            Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + Active + "\nRepositories: " + Repositories.ToString());
+            Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + IsActive + "\nRepositories: " + Repositories.ToString());
         }
     }
 }

package/Editor/iOS/BlueStackBuildPostProcess.cs

@@ -6,7 +6,6 @@ using UnityEditor.Callbacks;
 using System.IO;
 using Azerion.BlueStack.Editor.iOS.PodDependency;
 using UnityEditor.iOS.Xcode;
-using UnityEngine;
 
 namespace Azerion.BlueStack.Editor.iOS
 {

package/Editor/iOS/IOSDependencyModifier.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Xml;
-using UnityEditor;
 using UnityEngine;
 
 namespace Azerion.BlueStack.Editor.iOS
@@ -24,14 +22,13 @@ namespace Azerion.BlueStack.Editor.iOS
             }
 
             XmlNode mainNode = xmlDoc.SelectSingleNode($"//dependencies/iosPods/iosPod[@name='BlueStack-SDK']");
-            if (mainNode == null || mainNode.Attributes == null)
+            if (mainNode?.Attributes == null)
             {
                 Debug.LogError("No node with the name 'BlueStack-SDK' found in the xml");
                 return;
             }
 
-            var subspecsAttribute = mainNode.Attributes["subspecs"];
-            if (subspecsAttribute == null)
+            if (mainNode.Attributes["subspecs"] == null)
             {
                 Debug.LogError("No 'subspecs' Attribute found in the node 'BlueStack-SDK'");
                 return;
@@ -39,67 +36,72 @@ namespace Azerion.BlueStack.Editor.iOS
 
             // remove all inactive networks from the list
             // dependencies.RemoveAll(a => dependencies.Any(b => !b.Active));
-            
-            mainNode.Attributes["subspecs"].Value = "[";
+
+            string subspecsValue;
+            subspecsValue = "[";
             foreach (MediationNetworkDependency dependency in dependencies)
             {
-                if (dependency.Active)
+                if (dependency.IsActive)
                 {
-                    mainNode.Attributes["subspecs"].Value += $"'{dependency.Package}', ";
+                    subspecsValue += $"'{dependency.Package}', ";
                 }
             }
-            mainNode.Attributes["subspecs"].Value += "]";
+            subspecsValue += "]";
 
-            // Replace main dependency XML content with the updated XML
-            System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
-            AssetDatabase.Refresh();
-            
-            // Debug.Log("Mediation Dependencies are updated successfully in Main Dependencies XML.");
+            if (subspecsValue != mainNode.Attributes["subspecs"].Value)
+            {
+                mainNode.Attributes["subspecs"].Value = subspecsValue;
+                
+                // Replace main dependency XML content with the updated XML
+                DependencyProvider.SaveDependenciesXMLFile(xmlDoc.OuterXml);
+                // Debug.Log("iOS Mediation Dependencies are updated successfully in Main Dependencies XML.");
+            }
         }
 
         void IDependencyModifier.modifyMediationNetworkDependencies(string xmlFilePath,
             List<MediationNetworkDependency> dependencies)
         {
-            XmlDocument xmlDoc = new XmlDocument();
+            XmlDocument mediationDependencyXML = new XmlDocument();
 
             try
             {
-                xmlDoc.Load(xmlFilePath);
+                mediationDependencyXML.Load(xmlFilePath);
             }
             catch (IOException e)
             {
                 throw new Exception("Unable to load xml, error: " + e.Message);
             }
 
+            bool valueChanged = false;
             foreach (MediationNetworkDependency dependency in dependencies)
             {
                 XmlNode mainNode =
-                    xmlDoc.SelectSingleNode($"//networkList/iosNetworks/network[@name='{dependency.Name}']");
+                    mediationDependencyXML.SelectSingleNode($"//networkList/iosNetworks/network[@name='{dependency.Name}']");
 
-                if (mainNode != null)
+                if (mainNode is { Attributes: not null })
                 {
-                    mainNode.Attributes["active"].Value = dependency.Active.ToString();
+                    if (mainNode.Attributes["active"].Value != dependency.IsActive.ToString())
+                    {
+                        mainNode.Attributes["active"].Value = dependency.IsActive.ToString();
+                        valueChanged = true;
+                    }
                 }
                 else
                 {
                     // Node doesn't exists in Mediation Dependency XML
                     Debug.LogError(
-                        $"Something went wrong: Node '{dependency.Name}' doesn't exists in Mediation Dependency XML! " +
+                        $"Something went wrong: " +
+                        $"Node '{dependency.Name}' doesn't exists in Mediation Dependency XML! " +
                         "Please check if you have manually changed the xml");
                 }
             }
-
+            
             // Replace main mediation dependency XML content with the modified XML
-            System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
-            AssetDatabase.Refresh();            
-            // Debug.Log("Mediation Network Dependencies XML file updated successfully.");
-        }
-
-        private static void SaveMainXMLFile(string updatedXML, string path)
-        {
-            // Replace main mediation dependency XML content with the updated XML
-            System.IO.File.WriteAllText(path, updatedXML);
-            AssetDatabase.Refresh();
+            if (valueChanged)
+            {
+                DependencyProvider.SaveMediationDependenciesXMLFile(mediationDependencyXML.OuterXml);
+                // Debug.Log("iOS Mediation Network Dependencies XML file updated successfully.");
+            }
         }
     }
 }

package/Editor/iOS/IOSDependencyParser.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Xml;
-using UnityEngine;
 
 namespace Azerion.BlueStack.Editor.iOS
 {

package/Example/Scripts/NativeAdManager.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using Azerion.BlueStack.API;
 using UnityEngine.UI;
-using System.Linq;
-using UnityEngine.Serialization;
 
 namespace Azerion.BlueStack.Example
 {

package/Example/Scripts/SmallNativeAdManager.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using Azerion.BlueStack.API;
 using UnityEngine.UI;
-using System.Linq;
-using UnityEngine.Serialization;
 
 namespace Azerion.BlueStack.Example
 {

package/Runtime/API/Banner/BannerAd.cs

@@ -1,6 +1,4 @@
 using System;
-using Azerion.BlueStack;
-using Azerion.BlueStack.API;
 using Azerion.BlueStack.Internal;
 
 namespace Azerion.BlueStack.API.Banner

package/Runtime/API/NativeAd/NativeAd.cs

@@ -2,7 +2,6 @@ using System;
 using Azerion.BlueStack.Internal;
 using Azerion.BlueStack.Common;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Azerion.BlueStack.API
 {

package/Runtime/API/NativeAd/NativeAdInteractionHandler.cs

@@ -87,7 +87,7 @@ namespace Azerion.BlueStack.API
             {
                 nativeAdObject.Initialize(assetID, isImpressive, isClickable);
             }
-            catch (InvalidOperationException ex)
+            catch (SystemException ex)
             {
                 Debug.LogWarning("Unable to initialize nativeAdObject!");
                 Debug.LogException(ex);

package/Runtime/API/NativeAd/NativeAdLoader.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
 using Azerion.BlueStack.Common;
 using Azerion.BlueStack.Internal;
 using UnityEngine;

package/Runtime/API/NativeAd/NativeAdObject.cs

@@ -1,10 +1,8 @@
 using Azerion.BlueStack.Common;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityEngine.Serialization;
 using UnityEngine.UI;
 
 namespace Azerion.BlueStack.API
@@ -34,7 +32,7 @@ namespace Azerion.BlueStack.API
         ObstructedHit,
         UnobstructedHit,
     }
-
+    
     [AddComponentMenu(""), DisallowMultipleComponent, HideInInspector]
     internal sealed class NativeAdObject : MonoBehaviour
     {
@@ -51,11 +49,46 @@ namespace Azerion.BlueStack.API
         internal bool HasMadeImpression;
         internal bool IsImpressive;
         internal bool IsClickable;
-
+        internal bool IsUIObject;
+        
+        
         internal float InteractionTime { get; private set; }
 
         internal string ObjectTag { get; private set; }
 
+        private Canvas _canvas;
+        private Canvas CanvasComponent
+        {
+            get
+            {
+                if (_canvas == null)
+                {
+                    _canvas = GetComponent<Canvas>();
+            
+                    if (_canvas == null)
+                    {
+                        _canvas = GetComponentInParent<Canvas>();
+                    }
+                }
+                return _canvas;
+            }
+        }
+        
+        private CanvasRenderer _canvasRenderer;
+        private CanvasRenderer CanvasRendererComponent => _canvasRenderer ??= GetComponent<CanvasRenderer>();
+
+        private RectTransform _rectTransform;
+        private RectTransform RectTransformComponent => _rectTransform ??= GetComponent<RectTransform>();
+        
+        private Renderer _renderer;
+        private Renderer RendererComponent => _renderer ??= GetComponent<Renderer>();
+        
+        private Collider2D _collider2D;
+        private Collider2D Collider2DComponent => _collider2D ??= GetComponent<Collider2D>();
+        
+        private Collider _collider;
+        private Collider ColliderComponent => _collider ??= GetComponent<Collider>();
+            
         public void Start()
         {
             _lastInteractionTime = 0f;
@@ -69,7 +102,7 @@ namespace Azerion.BlueStack.API
             IsClickable = isClickable;
 
             // Check for Collider or Collider2D
-            if (!ValidateColliders())
+            if (!HasCollider())
             {
                 throw new MissingComponentException("No Collider or Collider2D component found.");
             }
@@ -77,7 +110,7 @@ namespace Azerion.BlueStack.API
             // Check if the GameObject has a Renderer or is a valid UI object
             if (!ValidateRendererOrUIObject(nativeAssetID))
             {
-                throw new MissingComponentException("Not a valid Ad Object, No Renderer or UI components found.");
+                throw new InvalidOperationException("Not a valid Ad Object.");
             }
 
             if (IsImpressive)
@@ -135,11 +168,11 @@ namespace Azerion.BlueStack.API
             Bounds worldSpaceBounds;
             if (!_is2DColliderPresent) // Check if 3D object
             {
-                worldSpaceBounds = GetComponent<Collider>().bounds;
+                worldSpaceBounds = ColliderComponent.bounds;
             }
             else
             {
-                worldSpaceBounds = GetComponent<Collider2D>().bounds;
+                worldSpaceBounds = Collider2DComponent.bounds;
             }
 
             // Get max bounds 
@@ -208,7 +241,7 @@ namespace Azerion.BlueStack.API
             // Check if the raycast hit is obstructed by a Collider component
             if (rayIntersection2D.collider != null)
             {
-                if (rayIntersection2D.collider == GetComponent<Collider2D>())
+                if (rayIntersection2D.collider == Collider2DComponent)
                 {
                     // Perform a 3D raycast and store the result
                     if (Physics.Raycast(ray, out var hitInfo3D, float.PositiveInfinity))
@@ -220,7 +253,7 @@ namespace Azerion.BlueStack.API
                         }
                     }
                     
-                    if (IsValidUIObject())
+                    if (IsUIObject)
                     {
                         return CheckHitStatusCanvas(position);
                     }
@@ -230,13 +263,13 @@ namespace Azerion.BlueStack.API
                 }
                 
                 // Check if the 2D raycast is hit but Obstructed 
-                if(NativeUtils.CheckRayHits2DCollider(ray, GetComponent<Collider2D>()))
+                if(NativeUtils.CheckRayHits2DCollider(ray, Collider2DComponent))
                 {
                     return HitStatus.ObstructedHit;
                 }
             }
             // Check if the gameobject is rendered in the screen space overlay canvas and valid UI Object
-            // else if (NativeUtils.IsRenderedInScreenSpaceOverlayCanvas(gameObject) && IsValidUIObject())
+            // else if (NativeUtils.IsRenderedInScreenSpaceOverlayCanvas(gameObject) && IsUIObject)
             // {
             //     return CheckHitStatusCanvas(position);
             // }
@@ -301,13 +334,13 @@ namespace Azerion.BlueStack.API
             // Initialize variables for raycast hits
             RaycastHit hitInfo3D;
             RaycastHit2D rayIntersection2D;
-            // bool isHit = GetComponent<Collider>().Raycast(ray, out hitInfo3D, float.PositiveInfinity);
+            // bool isHit = AdObjCollider.Raycast(ray, out hitInfo3D, float.PositiveInfinity);
 
             // Check for 3D raycast hit
             if (Physics.Raycast(ray, out hitInfo3D, float.PositiveInfinity))
             {
                 // Check if the hit object is the current object
-                if (hitInfo3D.collider == GetComponent<Collider>())
+                if (hitInfo3D.collider == ColliderComponent)
                 {
                     rayIntersection2D = Physics2D.GetRayIntersection(ray);
                     if (rayIntersection2D.collider != null)
@@ -319,7 +352,7 @@ namespace Azerion.BlueStack.API
                         }
                     }
 
-                    if (IsValidUIObject())
+                    if (IsUIObject)
                     {
                         return CheckHitStatusCanvas(position);
                     }
@@ -329,13 +362,13 @@ namespace Azerion.BlueStack.API
                 }
                 
                 // Check if the 3D raycast is hit but Obstructed 
-                if(NativeUtils.CheckRayHits3DCollider(ray, GetComponent<Collider>()))
+                if(NativeUtils.CheckRayHits3DCollider(ray, ColliderComponent))
                 {
                     return HitStatus.ObstructedHit;
                 }
             }
             // Check if the gameobject is rendered in the screen space overlay canvas and valid UI Object
-            // else if (NativeUtils.IsRenderedInScreenSpaceOverlayCanvas(gameObject) && IsValidUIObject())
+            // else if (NativeUtils.IsRenderedInScreenSpaceOverlayCanvas(gameObject) && IsUIObject)
             // {
             //     return CheckHitStatusCanvas(position);
             // }
@@ -407,18 +440,21 @@ namespace Azerion.BlueStack.API
         // Method to check if a UI element overlaps with the screen 
         private bool DoesUIElementOverlapScreen()
         {
-            // Get the RectTransform component
-            RectTransform rectTransform = GetComponent<RectTransform>();
+            if (RectTransformComponent == null)
+            {
+                Debug.LogWarning(ObjectTag + ": RectTransform component is missing.");
+                return false;
+            }
             
             // Create a rect for the screen size
             Rect screenRect = new Rect(0.0f, 0.0f, Screen.width, Screen.height);
             
             // Get the anchored position of the UI element
-            float x = rectTransform.anchoredPosition.x + rectTransform.position.x;
-            float y = Screen.height - rectTransform.position.y - rectTransform.anchoredPosition.y;
+            float x = RectTransformComponent.anchoredPosition.x + RectTransformComponent.position.x;
+            float y = Screen.height - RectTransformComponent.position.y - RectTransformComponent.anchoredPosition.y;
             
             // Get the size of the UI element
-            Vector2 elementSize = Vector2.Scale(rectTransform.rect.size, rectTransform.lossyScale);
+            Vector2 elementSize = Vector2.Scale(RectTransformComponent.rect.size, RectTransformComponent.lossyScale);
             
             // Create a rect for the UI element
             Rect elementRect = new Rect(x, y, elementSize.x, elementSize.y);
@@ -445,11 +481,11 @@ namespace Azerion.BlueStack.API
                 Bounds bounds;
                 if (_is2DColliderPresent)
                 {
-                    bounds = GetComponent<Collider2D>().bounds;
+                    bounds = Collider2DComponent.bounds;
                 }
                 else
                 {
-                    bounds = GetComponent<Collider>().bounds;
+                    bounds = ColliderComponent.bounds;
                 }
                 // Debug.LogWarning("bounds: " + bounds);
 
@@ -514,15 +550,16 @@ namespace Azerion.BlueStack.API
             return 1.0f;
         }
 
-        private bool ValidateColliders()
+        private bool HasCollider()
         {
             // Check for the presence of a Collider or Collider2D component
-            if (GetComponent<Collider>() != null)
+            if (ColliderComponent != null)
             {
                 // Regular 3D collider found, no issues
                 return true;
             }
-            else if (GetComponent<Collider2D>() != null)
+
+            if (Collider2DComponent != null)
             {
                 // 2D collider found, set the flag for later use
                 _is2DColliderPresent = true;
@@ -536,15 +573,14 @@ namespace Azerion.BlueStack.API
         private bool ValidateRendererOrUIObject(string nativeAssetID)
         {
             // Check for Renderer component on the GameObject
-            Renderer rendererComponent = GetComponent<Renderer>();
-    
-            if (rendererComponent != null)
+            if (RendererComponent != null)
             {
-                Debug.Log($"RendererComponent.isVisible: {nativeAssetID} : {rendererComponent.isVisible}");
+                Debug.Log($"RendererComponent.isVisible: {nativeAssetID} : {RendererComponent.isVisible}");
 
                 // Throw an exception if the object is not visible
-                if (!rendererComponent.isVisible)
+                if (!RendererComponent.isVisible)
                 {
+                    Debug.Log("Renderer Component not visible!!");
                     throw new InvalidOperationException("Object is not visible.");
                 }
 
@@ -553,9 +589,9 @@ namespace Azerion.BlueStack.API
             }
 
             // If no Renderer, check if the GameObject is a valid UI object
-            if (IsValidUIObject())
+            IsUIObject = IsValidUIObject();
+            if (IsUIObject)
             {
-                // Valid UI Object
                 return true;
             }
 
@@ -563,42 +599,47 @@ namespace Azerion.BlueStack.API
             return false;
         }
         
-        // TODO: More testing and Improvement required
-        // TODO: BSSDK-401 : Move viewability to container level - may not have a container
         private bool IsValidUIObject()
         {
-            Canvas canvas = GetComponentInParent<Canvas>();
-            if (canvas == null)
+            if (CanvasComponent == null)
             {
-                // Debug.LogWarning(ObjectTag + ": Unable to find Canvas component in parents.");
+                // throw new MissingComponentException("Unable to find Canvas component in parents.");
+                Debug.LogWarning(ObjectTag + ": Unable to find Canvas component in parents.");
                 return false;
             }
 
-            RectTransform rectTransform = GetComponent<RectTransform>();
-            if (rectTransform == null)
+            if (RectTransformComponent == null)
             {
-                // Debug.LogWarning(ObjectTag + ": RectTransform component is missing.");
+                // throw new MissingComponentException("RectTransform component is missing.");
+                Debug.LogWarning(ObjectTag + ": RectTransform component is missing.");
                 return false;
             }
 
-            CanvasRenderer canvasRenderer = GetComponent<CanvasRenderer>();
-            if (canvasRenderer == null)
+            if (CanvasRendererComponent == null)
             {
-                // Debug.LogWarning(ObjectTag + ": CanvasRenderer component is missing.");
+                // throw new MissingComponentException("CanvasRenderer component is missing.");
+                Debug.LogWarning(ObjectTag + ": CanvasRenderer component is missing.");
                 return false;
             }
-
-
-/*          // In future if want to check the center position or full object inside the viewport 
-   
-            // Check if the center is inside the viewport
-            Rect rect = rectTransform.rect;
+            
+            return true;
+        }
+        
+        // TODO: More testing and Improvement required
+        // TODO: BSSDK-401 : Move viewability to container level - may not have a container
+        
+        // In future if want to check the center position or full object inside the viewport 
+        
+        // Check if the center is inside the viewport
+        private bool IsCenterInsideViewport()
+        {
+            Rect rect = RectTransformComponent.rect;
 
             // Get the center position of the RectTransform in its local coordinates
             Vector2 centerLocalPosition = new Vector2(rect.center.x, rect.center.y);
 
             // Convert the local center position to world position
-            Vector3 centerWorldPosition = rectTransform.TransformPoint(centerLocalPosition);
+            Vector3 centerWorldPosition = RectTransformComponent.TransformPoint(centerLocalPosition);
             Debug.Log("centerWorldPosition: " + centerWorldPosition);
 
             Vector3 centerViewportPoint = NativeUtils.GetCamera().WorldToViewportPoint(centerWorldPosition);
@@ -610,9 +651,14 @@ namespace Azerion.BlueStack.API
                 return true;
             }
 
-            // Check if the object is completely inside the viewport
+            return false;
+        }
+
+        // Check if the object is completely inside the viewport
+        private bool IsCompletelyInsideViewport()
+        {
             Vector3[] corners = new Vector3[4];
-            rectTransform.GetWorldCorners(corners);
+            RectTransformComponent.GetWorldCorners(corners);
             foreach (Vector3 corner in corners)
             {
                 Vector3 cornerViewportPoint = NativeUtils.GetCamera().WorldToViewportPoint(corner);
@@ -623,10 +669,8 @@ namespace Azerion.BlueStack.API
                     return true;
                 }
             }
-*/
-            // Debug.Log("Not a Valid UI Object!");
-
-            return true;           
+            
+            return false;
         }
          
     }

package/Runtime/Internal/IBannerAdClient.cs

@@ -1,5 +1,4 @@
 using System;
-using Azerion.BlueStack;
 using Azerion.BlueStack.API.Banner;
 using Azerion.BlueStack.API;
 

package/Runtime/Internal/NativeAd/INativeAdClient.cs

@@ -1,5 +1,4 @@
 using System;
-using Azerion.BlueStack;
 using Azerion.BlueStack.API;
 
 namespace Azerion.BlueStack.Internal

package/Runtime/Platforms/Unity/BaseAdClient.cs

@@ -1,5 +1,4 @@
 #if UNITY_EDITOR
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEditor;

package/Runtime/Platforms/Unity/BlueStackClient.cs

@@ -1,6 +1,5 @@
 #if UNITY_EDITOR
 using System;
-using System.Collections.Generic;
 using Azerion.BlueStack.API;
 using Azerion.BlueStack.Internal;
 

package/Runtime/Platforms/Unity/NativeAdClient.cs

@@ -2,9 +2,7 @@
 using System;
 using Azerion.BlueStack.API;
 using Azerion.BlueStack.Internal;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Azerion.BlueStack.Platforms.UnityEditor
 {

package/Runtime/Platforms/Unity/Utils.cs

@@ -1,8 +1,5 @@
 #if UNITY_EDITOR
 using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using Azerion.BlueStack.API;
 
 namespace Azerion.BlueStack.Platforms.UnityEditor
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.azerion.bluestack",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "displayName": "BlueStack",
   "description": "BlueStack SDK has been designed to give developers options for showing Ads from different ad networks.",
   "unity": "2020.3",