com.azerion.bluestack 3.0.0-preview1 → 3.0.0-preview2

package/Example/Prefabs/NativeAd.prefab

@@ -206,7 +206,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -154}
+  m_AnchoredPosition: {x: 0, y: 241}
   m_SizeDelta: {x: 1040, y: 1040}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5666620918374091933
@@ -801,13 +801,13 @@ BoxCollider2D:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5666620919071030920}
-  m_Enabled: 0
+  m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 100.407486, y: -100.05159}
+  m_Offset: {x: 100, y: -100}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -818,7 +818,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 201.81497, y: 201.10318}
+  m_Size: {x: 200, y: 200}
   m_EdgeRadius: 0
 --- !u!1 &5666620919168347859
 GameObject:

package/Example/Scripts/NativeAdManager.cs

@@ -53,7 +53,7 @@ namespace Azerion.BlueStack.Example
 
             Settings settings = new Settings(isDebugModeEnabled: true);
             BlueStackAds.Initialize(AppId, settings, HandleSDKInitCompleteAction);
-            _preference = createBSPreference();
+            _preference = CreatePreference();
         }
 
         private void HandleSDKInitCompleteAction(SDKInitializationStatus sdkInitializationStatus)
@@ -74,13 +74,14 @@ namespace Azerion.BlueStack.Example
 
 
         // Update is called once per frame
-        void RegisterGameObjects()
+        void Update()
         {
-            Debug.Log("NativeAdManager: RegisterGameObjects");
             if (this.unifiedNativeAdLoaded)
             {
                 this.unifiedNativeAdLoaded = false;
-
+                
+                Debug.Log("NativeAdManager: RegisterGameObjects");
+                
                 // badge
                 string badgeText = this.nativeAd.GetBadge();
                 if (badgeText != null)
@@ -130,7 +131,7 @@ namespace Azerion.BlueStack.Example
                     }
                 }
 
-                // Main/Cover Images
+                // Main/Cover Image
                 Texture2D imageTexture = this.nativeAd.GetCoverImageTexture();
                 if (imageTexture != null)
                 {
@@ -163,13 +164,13 @@ namespace Azerion.BlueStack.Example
         private void RequestNativeAd()
         {
             Debug.Log("NativeAdManager: Requesting Ad!");
-            AdLoader adLoader = new AdLoader.Builder(NativeAdUnitId).Build();
-            adLoader.OnNativeAdLoaded += this.HandleNativeAdLoaded;
-            adLoader.OnAdFailedToLoad += this.HandleNativeAdFailedToLoad;
-            adLoader.LoadAd();
+            NativeAdLoader nativeAdLoader = new NativeAdLoader(NativeAdUnitId);
+            nativeAdLoader.OnNativeAdLoaded += this.HandleNativeAdLoaded;
+            nativeAdLoader.OnNativeAdFailedToLoad += this.HandleNativeNativeAdFailedToLoad;
+            nativeAdLoader.Load();
         }
 
-        private void HandleNativeAdFailedToLoad(object sender, BlueStackError args)
+        private void HandleNativeNativeAdFailedToLoad(object sender, BlueStackError args)
         {
             Debug.Log("BlueStack NativeAd failed to load: " + "errorCode: " + args.ErrorCode + " message: " +
                       args.Message);
@@ -180,11 +181,11 @@ namespace Azerion.BlueStack.Example
             Debug.Log("NativeAdManager: Unified Native Ad Loaded");
             this.nativeAd = args.nativeAd;
             this.unifiedNativeAdLoaded = true;
-            RegisterGameObjects();
+            // RegisterGameObjects();
         }
 
 
-        private Preference createBSPreference()
+        private Preference CreatePreference()
         {
             Preference bsPreference = new Preference();
 

package/Example/Scripts/SmallNativeAdManager.cs

@@ -50,7 +50,7 @@ namespace Azerion.BlueStack.Example
         {
             Settings settings = new Settings(isDebugModeEnabled: true);
             BlueStackAds.Initialize(AppId, settings, HandleSDKInitCompleteAction);
-            _preference = createBSPreference();
+            _preference = CreatePreference();
         }
 
         private void HandleSDKInitCompleteAction(SDKInitializationStatus sdkInitializationStatus)
@@ -71,13 +71,15 @@ namespace Azerion.BlueStack.Example
 
 
         // Update is called once per frame
-        void RegisterGameObjects()
+        void Update()
         {
-            Debug.Log("NativeAdManager: RegisterGameObjects");
+
             if (this.unifiedNativeAdLoaded)
             {
                 this.unifiedNativeAdLoaded = false;
 
+                Debug.Log("NativeAdManager: RegisterGameObjects");
+
                 // badge
                 string badgeText = this.nativeAd.GetBadge();
                 if (badgeText != null)
@@ -135,13 +137,13 @@ namespace Azerion.BlueStack.Example
         private void RequestNativeAd()
         {
             Debug.Log("NativeAdManager: Requesting Ad!");
-            AdLoader adLoader = new AdLoader.Builder(NativeAdUnitId).Build();
-            adLoader.OnNativeAdLoaded += this.HandleNativeAdLoaded;
-            adLoader.OnAdFailedToLoad += this.HandleNativeAdFailedToLoad;
-            adLoader.LoadAd();
+            NativeAdLoader nativeAdLoader = new NativeAdLoader(NativeAdUnitId);
+            nativeAdLoader.OnNativeAdLoaded += this.HandleNativeAdLoaded;
+            nativeAdLoader.OnNativeAdFailedToLoad += this.HandleNativeNativeAdFailedToLoad;
+            nativeAdLoader.Load();
         }
 
-        private void HandleNativeAdFailedToLoad(object sender, BlueStackError args)
+        private void HandleNativeNativeAdFailedToLoad(object sender, BlueStackError args)
         {
             Debug.Log("BlueStack NativeAd failed to load: " + "errorCode: " + args.ErrorCode + " message: " +
                       args.Message);
@@ -152,11 +154,11 @@ namespace Azerion.BlueStack.Example
             Debug.Log("NativeAdManager: Unified Native Ad Loaded");
             this.nativeAd = args.nativeAd;
             this.unifiedNativeAdLoaded = true;
-            RegisterGameObjects();
+            // RegisterGameObjects();
         }
 
 
-        private Preference createBSPreference()
+        private Preference CreatePreference()
         {
             Preference bsPreference = new Preference();
 

package/Runtime/API/NativeAd/NativeAdLoader.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Azerion.BlueStack.Common;
+using Azerion.BlueStack.Internal;
+using UnityEngine;
+
+// WIP
+namespace Azerion.BlueStack.API
+{
+    public class NativeAdLoader
+    {
+        private IAdLoaderClient _adLoaderClient;
+        public event EventHandler<BlueStackError> OnNativeAdFailedToLoad;
+        public event EventHandler<NativeAdEventArgs> OnNativeAdLoaded; 
+
+        internal bool IsAdLoaded;
+        internal GameObject AdGameObject;
+        private NativeAd _nativeAd;
+            
+        public NativeAdLoader(string adUnitId)
+        {
+            AdUnitId = adUnitId; 
+             
+            NativeUtils.CheckInitialization();
+            
+            _nativeAd = new NativeAd(AdUnitId);
+            
+            _nativeAd.OnNativeAdDidFail += (sender, args) =>
+            {
+                OnNativeAdFailedToLoad?.Invoke(this, args);
+            };
+            
+            _nativeAd.OnNativeAdDidLoad +=(_sender, _args) =>
+            {
+                NativeAdEventArgs nativeAdEventArgs = new NativeAdEventArgs
+                {
+                    nativeAd = _nativeAd
+                };
+
+                this.OnNativeAdLoaded?.Invoke(this, nativeAdEventArgs);
+            };
+            
+        }
+        
+        public string AdUnitId { get; private set; }
+        public HashSet<NativeAdType> AdTypes { get; private set; }
+        public HashSet<string> FormatIds { get; private set; }
+        internal int NumberOfAdsToLoad { get; private set; }
+    
+        public void Load() => this._nativeAd.Load();
+        public void Load(Preference preference) => this._nativeAd.Load(preference);
+        
+    }
+
+}

package/Runtime/API/NativeAd/NativeAdObject.cs

@@ -512,22 +512,7 @@ namespace Azerion.BlueStack.API
 			{
 				return true;
 			}
-			
-			// Check if it is completely inside the viewport 
-			// Vector3[] corners = new Vector3[4];
-			// rectTransform.GetWorldCorners(corners);
-			// Debug.Log("Ad Object: " + this.name + " - " + corners.Length);
-			// foreach (Vector3 corner in corners)
-			// {
-			// 	// Debug.Log("corner: " + corner);
-			// 	Vector3 viewportPoint = Camera.main.WorldToViewportPoint(corner);
-			// 	// Debug.Log("viewportPoints: " + viewportPoint);
-			// 	if (viewportPoint.x >= 0 && viewportPoint.x <= 1 && viewportPoint.y >= 0 && viewportPoint.y <= 1 && viewportPoint.z > 0)
-			// 	{
-			// 		//return true;
-			// 	}
-			// }
-			
+
 			Debug.Log("Object Not visible!");
 			return false;
 		}

package/package.json

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

package/Runtime/API/NativeAd/AdLoader.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Azerion.BlueStack.Common;
-using Azerion.BlueStack.Internal;
-using UnityEngine;
-
-namespace Azerion.BlueStack.API
-{
-    public class AdLoader
-    {
-        private IAdLoaderClient _adLoaderClient;
-        public event EventHandler<BlueStackError> OnAdFailedToLoad;
-        public event EventHandler<NativeAdEventArgs> OnNativeAdLoaded; //NativeAdEventArgs
-
-        internal bool IsAdLoaded;
-        internal GameObject AdGameObject;
-        private NativeAd _nativeAd;
-            
-        private AdLoader(AdLoader.Builder builder)
-        {
-            AdUnitId = string.Copy(builder.AdUnitId);
-            FormatIds = new HashSet<string>(builder.FormatIds);
-            AdTypes = new HashSet<NativeAdType>(builder.AdTypes);
-            AdGameObject = builder.AdGameObject;
-            NumberOfAdsToLoad = builder.NumberOfAdsToLoad;
-            IsAdLoaded = builder.IsAdLoaded;
-            Dictionary<string, bool> formatIdDictionary = new Dictionary<string, bool>();
-            
-            foreach (string formatId in this.FormatIds)
-            {
-                formatIdDictionary[formatId] = false;
-            }
-
-             // _adLoaderClient = NativeClientFactoryManager.CreateAdLoaderClient(
-             //     new AdLoaderClientArgs()
-             //     {
-             //         AdUnitId = this.AdUnitId,
-             //         AdTypes = this.AdTypes,
-             //         FormatIds = formatIdDictionary,
-             //         NumberOfAdsToLoad = this.NumberOfAdsToLoad
-             //     }
-             // );
-             
-            NativeUtils.CheckInitialization();
-            
-            _nativeAd = new NativeAd(AdUnitId);
-            
-            _nativeAd.OnNativeAdDidFail += (sender, args) =>
-            {
-                OnAdFailedToLoad?.Invoke(this, args);
-            };
-            
-            _nativeAd.OnNativeAdDidLoad +=(_sender, _args) =>
-            {
-                // NativeAd nativeAd = new NativeAd(AdUnitId);
-                // NativeAd nativeAd = new NativeAd(_args.nativeAdClient);
-                NativeAdEventArgs nativeAdEventArgs = new NativeAdEventArgs
-                {
-                    nativeAd = _nativeAd
-                };
-
-                this.OnNativeAdLoaded?.Invoke(this, nativeAdEventArgs);
-            };
-            
-            // _adLoaderClient.OnNativeAdImpression += (_sender, _args) =>
-            // {
-            //     this.OnNativeAdImpression?.Invoke(this, _args);
-            // };
-            //
-            // _adLoaderClient.OnNativeAdClicked += (_sender, _args) =>
-            // {
-            //     this.OnNativeAdClicked?.Invoke(this, _args);
-            // };
-            //
-            // _adLoaderClient.OnNativeAdOpening += (_sender, _args) =>
-            // {
-            //     this.OnNativeAdOpening?.Invoke(this, _args);
-            // };
-            //
-            // _adLoaderClient.OnNativeAdClosed += (_sender, _args) =>
-            // {
-            //     this.OnNativeAdClosed?.Invoke(this, _args);
-            // };
-        }
-        
-        
-        public string AdUnitId { get; private set; }
-        public HashSet<NativeAdType> AdTypes { get; private set; }
-        public HashSet<string> FormatIds { get; private set; }
-        internal int NumberOfAdsToLoad { get; private set; }
-    
-        // public void LoadAd() => this._adLoaderClient.LoadAd();
-        public void LoadAd() => this._nativeAd.Load();
-        public void LoadAd(Preference preference) => this._nativeAd.Load(preference);
-        
-        // public void LoadAd(AdRequest request) => this._adLoaderClient.LoadAd(request); //new AdRequest.Builder().Build()
-        
-        public class Builder
-        {
-            internal bool IsAdLoaded;
-            internal GameObject AdGameObject;
-    
-            public Builder(string adUnitId)
-            {
-                IsAdLoaded = false;
-                FormatIds = new HashSet<string>();
-                NumberOfAdsToLoad = 1;
-                AdTypes = new HashSet<NativeAdType>();
-                AdUnitId = adUnitId;
-            }
-    
-            internal string AdUnitId { get; private set; }
-            internal HashSet<NativeAdType> AdTypes { get; private set; }
-            internal HashSet<string> FormatIds { get; private set; }
-            internal int NumberOfAdsToLoad { get; private set; }
-
-            // public Builder ForNativeAd()
-            // {
-            //     AdTypes.Add(NativeAdType.NativeAd);
-            //     return this;
-            // }
-            //
-            // public Builder SetNumberOfAdsToLoad(int num)
-            // {
-            //     NumberOfAdsToLoad = num;
-            //     return this;
-            // }
-
-            public AdLoader Build() => new AdLoader(this);
-        }
-    }
-
-}