diff --git a/com.adsbynimbus.nimbus/Editor/NimbusManagerCreator.cs b/com.adsbynimbus.nimbus/Editor/NimbusManagerCreator.cs index d71526f9..3430fe71 100644 --- a/com.adsbynimbus.nimbus/Editor/NimbusManagerCreator.cs +++ b/com.adsbynimbus.nimbus/Editor/NimbusManagerCreator.cs @@ -172,19 +172,21 @@ private void OnGUI() { #if NIMBUS_ENABLE_VUNGLE EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray, 2); GUILayout.Space(10); - EditorGUILayout.LabelField("Vungle Configuration", headerStyle); + EditorGUILayout.LabelField("Liftoff Monetize Configuration", headerStyle); #if UNITY_ANDROID - EditorGUILayout.PropertyField((_androidVungleAppId)); + var label = new GUIContent("Android Liftoff Monetize App ID"); + EditorGUILayout.PropertyField(_androidVungleAppId, label); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); #endif #if UNITY_IOS - EditorGUILayout.PropertyField((_iosVungleAppId)); + var label = new GUIContent("iOS Liftoff Monetize App ID"); + EditorGUILayout.PropertyField(_iosVungleAppId, label); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); #endif #if !UNITY_ANDROID && !UNITY_IOS - EditorGUILayout.HelpBox("In build settings select Android or IOS to enter Vungle data", MessageType.Warning); + EditorGUILayout.HelpBox("In build settings select Android or IOS to enter Liftoff Monetize data", MessageType.Warning); #endif #endif @@ -339,7 +341,7 @@ private bool ValidateVungleData() { if (appId.IsNullOrEmpty()) { Debug.unityLogger.LogError("Nimbus", - "Vungle SDK has been included, the Vungle App ID cannot be empty, object NimbusAdsManager not created"); + "Liftoff Monetize SDK has been included, the Liftoff Monetize App ID cannot be empty, object NimbusAdsManager not created"); return false; } ApsSlotData[] slotData = null; diff --git a/com.adsbynimbus.nimbus/Editor/ThirdPartyMacros.cs b/com.adsbynimbus.nimbus/Editor/ThirdPartyMacros.cs index 9022363f..24f022cc 100644 --- a/com.adsbynimbus.nimbus/Editor/ThirdPartyMacros.cs +++ b/com.adsbynimbus.nimbus/Editor/ThirdPartyMacros.cs @@ -17,7 +17,7 @@ public class ThirdPartyMacros : EditorWindow { private const string Disabled = "Disabled"; private const string ButtonMessageTemplate = @"{0} {1} Build Macro For {2}?"; private const string ApsPartnerStr = "APS"; - private const string VunglePartnerStr = "Vungle"; + private const string VunglePartnerStr = "Liftoff Monetize"; private void OnEnable() { UpdateSettings(); @@ -85,7 +85,7 @@ private void OnGUI() { EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray, 2); // START OF VUNGLE - EditorGUILayout.LabelField("Vungle Build Macro Settings:", headerStyle); + EditorGUILayout.LabelField("Liftoff Monetize Build Macro Settings:", headerStyle); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray, 2); GUILayout.Space(10); @@ -93,15 +93,15 @@ private void OnGUI() { EditorGUILayout.LabelField($"Macro is set for Android is: {vungleAndroidStatus}", headerStyle); GUILayout.Space(2); var androidVunglebuttonText = _androidVungleIsEnabled - ? string.Format(ButtonMessageTemplate, "Remove", "Vungle", "Android") - : string.Format(ButtonMessageTemplate, "Enable", "Vungle", "Android"); + ? string.Format(ButtonMessageTemplate, "Remove", "Liftoff Monetize", "Android") + : string.Format(ButtonMessageTemplate, "Enable", "Liftoff Monetize", "Android"); if (GUILayout.Button(androidVunglebuttonText)) { if (_androidVungleIsEnabled) { RemoveBuildMacroForGroup(BuildTargetGroup.Android, VungleMacro); } else { SetBuildMacroForGroup(BuildTargetGroup.Android, VungleMacro); - EditorUtil.LogWithHelpBox("Don't Forget To Add your Android Vungle App Id to the " + + EditorUtil.LogWithHelpBox("Don't Forget To Add your Liftoff Monetize Android App Id to the " + "NimbusSDKConfiguration Scriptable object attached to your NimbusAdManager game object", MessageType.Warning); FocusOnGameManager(VunglePartnerStr); } @@ -113,15 +113,15 @@ private void OnGUI() { EditorGUILayout.LabelField($"Macro is set for Ios is: {vungleIosStatus}", headerStyle); GUILayout.Space(2); var vungleAndroidButtonText = _iosVungleIsEnabled - ? string.Format(ButtonMessageTemplate, "Remove", "Vungle", "Ios") - : string.Format(ButtonMessageTemplate, "Enable", "Vungle", "Ios"); + ? string.Format(ButtonMessageTemplate, "Remove", "Liftoff Monetize", "Ios") + : string.Format(ButtonMessageTemplate, "Enable", "Liftoff Monetize", "Ios"); if (GUILayout.Button(vungleAndroidButtonText)) { if (_iosVungleIsEnabled) { RemoveBuildMacroForGroup(BuildTargetGroup.iOS, VungleMacro); } else { SetBuildMacroForGroup(BuildTargetGroup.iOS, VungleMacro); - EditorUtil.LogWithHelpBox("Don't Forget To Add your IOS Vungle App Id to the " + + EditorUtil.LogWithHelpBox("Don't Forget To Add your Liftoff Monetize IOS App Id to the " + "NimbusSDKConfiguration Scriptable object attached to your NimbusAdManager game object", MessageType.Warning); FocusOnGameManager(VunglePartnerStr); } diff --git a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/IOS.cs b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/IOS.cs index b3dba423..f66c0735 100644 --- a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/IOS.cs +++ b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/IOS.cs @@ -103,7 +103,7 @@ internal override void InitializeSDK(NimbusSDKConfiguration configuration) { _interceptors.Add(aps); #endif #if NIMBUS_ENABLE_VUNGLE - Debug.unityLogger.Log("Initializing iOS Vungle SDK"); + Debug.unityLogger.Log("Initializing iOS Liftoff Monetize SDK"); var appID = configuration.GetVungleData(); var vungle = new VungleIOS(appID); vungle.InitializeNativeSDK(); diff --git a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleAndroid.cs b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleAndroid.cs index e39f75a5..7cb5e483 100644 --- a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleAndroid.cs +++ b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleAndroid.cs @@ -27,9 +27,10 @@ public BidRequest ModifyRequest(BidRequest bidRequest, string data) { if (data.IsNullOrEmpty()) { return bidRequest; } - if (bidRequest.User.Ext != null) { - bidRequest.User.Ext.VungleBuyerId = data; + if (bidRequest.User.Ext == null) { + bidRequest.User.Ext = new UserExt(); } + bidRequest.User.Ext.VungleBuyerId = data; return bidRequest; } diff --git a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleIOS.cs b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleIOS.cs index f87be30b..030bde74 100644 --- a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleIOS.cs +++ b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.Internal/Interceptor/ThirdPartyDemand/Vungle/VungleIOS.cs @@ -30,18 +30,15 @@ public BidRequest ModifyRequest(BidRequest bidRequest, string data) { if (data.IsNullOrEmpty()) { return bidRequest; } - if (bidRequest.User.Ext != null) { - bidRequest.User.Ext.VungleBuyerId = data; + if (bidRequest.User.Ext == null) { + bidRequest.User.Ext = new UserExt(); } - + bidRequest.User.Ext.VungleBuyerId = data; return bidRequest; } - public string GetProviderRtbDataFromNativeSDK(AdUnitType type, bool isFullScreen) - { - var buyerId = _fetchVungleBuyerId(); - Debug.unityLogger.Log("VUNGLEBUYER", buyerId); - return buyerId; + public string GetProviderRtbDataFromNativeSDK(AdUnitType type, bool isFullScreen) { + return _fetchVungleBuyerId(); } } diff --git a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.ScriptableObjects/NimbusSDKConfigurationPropertiesEditor.cs b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.ScriptableObjects/NimbusSDKConfigurationPropertiesEditor.cs index 7656c359..a19e02d3 100644 --- a/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.ScriptableObjects/NimbusSDKConfigurationPropertiesEditor.cs +++ b/com.adsbynimbus.nimbus/Runtime/Scripts/Nimbus.ScriptableObjects/NimbusSDKConfigurationPropertiesEditor.cs @@ -144,13 +144,13 @@ public override void OnInspectorGUI() { GUILayout.Space(10); EditorGUILayout.LabelField("APS Configuration", headerStyle); #if UNITY_ANDROID - EditorGUILayout.PropertyField((_androidAppId)); + EditorGUILayout.PropertyField(_androidAppId); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); EditorDrawUtility.DrawArray(_androidApsSlots, "Android Slot Id Data"); #endif #if UNITY_IOS - EditorGUILayout.PropertyField((_iosAppId)); + EditorGUILayout.PropertyField(_iosAppId); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); EditorDrawUtility.DrawArray(_iosApsSlots, "iOS Slot Id Data"); #endif @@ -164,19 +164,21 @@ public override void OnInspectorGUI() { #if NIMBUS_ENABLE_VUNGLE EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray, 2); GUILayout.Space(10); - EditorGUILayout.LabelField("Vungle Configuration", headerStyle); + EditorGUILayout.LabelField("Liftoff Monetize Configuration", headerStyle); #if UNITY_ANDROID - EditorGUILayout.PropertyField((_androidVungleAppId)); + var label = new GUIContent("Android Liftoff Monetize App ID"); + EditorGUILayout.PropertyField(_androidVungleAppId, label); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); #endif #if UNITY_IOS - EditorGUILayout.PropertyField((_iosVungleAppId)); + var label = new GUIContent("iOS Liftoff Monetize App ID"); + EditorGUILayout.PropertyField(_iosVungleAppId, label); EditorDrawUtility.DrawEditorLayoutHorizontalLine(Color.gray); #endif #if !UNITY_ANDROID && !UNITY_IOS - EditorGUILayout.HelpBox("In build settings select Android or IOS to enter Vungle data", MessageType.Warning); + EditorGUILayout.HelpBox("In build settings select Android or IOS to enter Liftoff Monetize data", MessageType.Warning); #endif #endif