feat(unification): fix NativeImageAsset examples #370

prebid · Mar 23, 2022 · 2ac2f65 · 2ac2f65
1 parent 56081ca
commit 2ac2f65
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 76 deletions.
diff --git a/...e/PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInAppGAMDemoActivity.java b/...e/PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInAppGAMDemoActivity.java
@@ -116,16 +116,12 @@ private void loadInAppNative() {
         title.setLength(90);
         title.setRequired(true);
         nativeAdUnit.addAsset(title);
-        NativeImageAsset icon = new NativeImageAsset();
+        NativeImageAsset icon = new NativeImageAsset(20, 20, 20, 20);
         icon.setImageType(NativeImageAsset.IMAGE_TYPE.ICON);
-        icon.setWMin(20);
-        icon.setHMin(20);
         icon.setRequired(true);
         nativeAdUnit.addAsset(icon);
-        NativeImageAsset image = new NativeImageAsset();
+        NativeImageAsset image = new NativeImageAsset(200, 200, 200, 200);
         image.setImageType(NativeImageAsset.IMAGE_TYPE.MAIN);
-        image.setHMin(200);
-        image.setWMin(200);
         image.setRequired(true);
         nativeAdUnit.addAsset(image);
         NativeDataAsset data = new NativeDataAsset();

diff --git a/...PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInAppMoPubDemoActivity.java b/...PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInAppMoPubDemoActivity.java
@@ -6,39 +6,14 @@
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
+import android.widget.*;
 import androidx.appcompat.app.AppCompatActivity;
-
 import com.mopub.common.MoPub;
 import com.mopub.common.SdkConfiguration;
 import com.mopub.common.logging.MoPubLog;
-import com.mopub.nativeads.MoPubNative;
-import com.mopub.nativeads.MoPubStaticNativeAdRenderer;
-import com.mopub.nativeads.NativeAd;
-import com.mopub.nativeads.NativeErrorCode;
-import com.mopub.nativeads.RequestParameters;
-import com.mopub.nativeads.StaticNativeAd;
-
-import org.prebid.mobile.AdUnit;
-import org.prebid.mobile.Host;
-import org.prebid.mobile.NativeAdUnit;
-import org.prebid.mobile.NativeDataAsset;
-import org.prebid.mobile.NativeEventTracker;
-import org.prebid.mobile.NativeImageAsset;
-import org.prebid.mobile.NativeTitleAsset;
-import org.prebid.mobile.OnCompleteListener;
-import org.prebid.mobile.PrebidMobile;
-import org.prebid.mobile.PrebidNativeAd;
-import org.prebid.mobile.PrebidNativeAdEventListener;
-import org.prebid.mobile.PrebidNativeAdListener;
-import org.prebid.mobile.ResultCode;
+import com.mopub.nativeads.*;
 import org.prebid.mobile.Util;
+import org.prebid.mobile.*;
 import org.prebid.mobile.addendum.AdViewUtils;
 
 import java.util.ArrayList;
@@ -173,16 +148,12 @@ private void loadInAppNativeMopub() {
             title.setLength(90);
             title.setRequired(true);
             nativeAdUnit.addAsset(title);
-            NativeImageAsset icon = new NativeImageAsset();
+            NativeImageAsset icon = new NativeImageAsset(20, 20, 20, 20);
             icon.setImageType(NativeImageAsset.IMAGE_TYPE.ICON);
-            icon.setWMin(20);
-            icon.setHMin(20);
             icon.setRequired(true);
             nativeAdUnit.addAsset(icon);
-            NativeImageAsset image = new NativeImageAsset();
+            NativeImageAsset image = new NativeImageAsset(200, 200, 200, 200);
             image.setImageType(NativeImageAsset.IMAGE_TYPE.MAIN);
-            image.setHMin(200);
-            image.setWMin(200);
             image.setRequired(true);
             nativeAdUnit.addAsset(image);
             NativeDataAsset data = new NativeDataAsset();

diff --git a/...rebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInBannerGamDemoActivity.java b/...rebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInBannerGamDemoActivity.java
@@ -63,16 +63,12 @@ public void onAdLoaded() {
         title.setLength(90);
         title.setRequired(true);
         nativeAdUnit.addAsset(title);
-        NativeImageAsset icon = new NativeImageAsset();
+        NativeImageAsset icon = new NativeImageAsset(20, 20, 20, 20);
         icon.setImageType(NativeImageAsset.IMAGE_TYPE.ICON);
-        icon.setWMin(20);
-        icon.setHMin(20);
         icon.setRequired(true);
         nativeAdUnit.addAsset(icon);
-        NativeImageAsset image = new NativeImageAsset();
+        NativeImageAsset image = new NativeImageAsset(200, 200, 200, 200);
         image.setImageType(NativeImageAsset.IMAGE_TYPE.MAIN);
-        image.setHMin(200);
-        image.setWMin(200);
         image.setRequired(true);
         nativeAdUnit.addAsset(image);
         NativeDataAsset data = new NativeDataAsset();

diff --git a/...bidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInBannerMoPubDemoActivity.java b/...bidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInBannerMoPubDemoActivity.java
@@ -77,16 +77,12 @@ public void onBannerCollapsed(MoPubView banner) {
         title.setLength(90);
         title.setRequired(true);
         nativeAdUnit.addAsset(title);
-        NativeImageAsset icon = new NativeImageAsset();
+        NativeImageAsset icon = new NativeImageAsset(20, 20, 20, 20);
         icon.setImageType(NativeImageAsset.IMAGE_TYPE.ICON);
-        icon.setWMin(20);
-        icon.setHMin(20);
         icon.setRequired(true);
         nativeAdUnit.addAsset(icon);
-        NativeImageAsset image = new NativeImageAsset();
+        NativeImageAsset image = new NativeImageAsset(200, 200, 200, 200);
         image.setImageType(NativeImageAsset.IMAGE_TYPE.MAIN);
-        image.setHMin(200);
-        image.setWMin(200);
         image.setRequired(true);
         nativeAdUnit.addAsset(image);
         NativeDataAsset data = new NativeDataAsset();

diff --git a/...otlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobNative.kt b/...otlin/src/main/java/org/prebid/mobile/prebidkotlindemo/ads/inappadmob/InAppAdMobNative.kt
@@ -110,17 +110,13 @@ object InAppAdMobNative {
         title.isRequired = true
         nativeAdUnit.addAsset(title)
 
-        val icon = NativeImageAsset()
+        val icon = NativeImageAsset(20, 20, 20, 20)
         icon.imageType = NativeImageAsset.IMAGE_TYPE.ICON
-        icon.wMin = 20
-        icon.hMin = 20
         icon.isRequired = true
         nativeAdUnit.addAsset(icon)
 
-        val image = NativeImageAsset()
+        val image = NativeImageAsset(200, 200, 200, 200)
         image.imageType = NativeImageAsset.IMAGE_TYPE.MAIN
-        image.hMin = 200
-        image.wMin = 200
         image.isRequired = true
         nativeAdUnit.addAsset(image)
 

diff --git a/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/AdFragment.kt b/Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/AdFragment.kt
@@ -127,17 +127,13 @@ abstract class AdFragment : BaseFragment() {
         title.isRequired = true
         nativeAdUnit.addAsset(title)
 
-        val icon = NativeImageAsset()
+        val icon = NativeImageAsset(20, 20, 20, 20)
         icon.imageType = NativeImageAsset.IMAGE_TYPE.ICON
-        icon.wMin = 20
-        icon.hMin = 20
         icon.isRequired = true
         nativeAdUnit.addAsset(icon)
 
-        val image = NativeImageAsset()
+        val image = NativeImageAsset(200, 200, 200, 200)
         image.imageType = NativeImageAsset.IMAGE_TYPE.MAIN
-        image.hMin = 200
-        image.wMin = 200
         image.isRequired = true
         nativeAdUnit.addAsset(image)
 

diff --git a/...ain/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/mopub/MopubNativeFragment.kt b/...ain/java/org/prebid/mobile/renderingtestapp/plugplay/bidding/mopub/MopubNativeFragment.kt
@@ -195,17 +195,13 @@ open class MopubNativeFragment : AdFragment() {
             assetTitle.isRequired = true
             addAsset(assetTitle)
 
-            val assetIcon = NativeImageAsset()
+            val assetIcon = NativeImageAsset(20, 20, 20, 20)
             assetIcon.imageType = NativeImageAsset.IMAGE_TYPE.ICON
-            assetIcon.wMin = 20
-            assetIcon.hMin = 20
             assetIcon.isRequired = true
             addAsset(assetIcon)
 
-            val image = NativeImageAsset()
+            val image = NativeImageAsset(200, 200, 200, 200)
             image.imageType = NativeImageAsset.IMAGE_TYPE.MAIN
-            image.hMin = 200
-            image.wMin = 200
             image.isRequired = true
             addAsset(image)
 

diff --git a/...src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/MoPubNativeFeedAdapter.kt b/...src/main/java/org/prebid/mobile/renderingtestapp/utils/adapters/MoPubNativeFeedAdapter.kt
@@ -114,17 +114,13 @@ class MoPubNativeFeedAdapter(
             assetTitle.isRequired = true
             addAsset(assetTitle)
 
-            val assetIcon = NativeImageAsset()
+            val assetIcon = NativeImageAsset(20, 20, 20, 20)
             assetIcon.imageType = NativeImageAsset.IMAGE_TYPE.ICON
-            assetIcon.wMin = 20
-            assetIcon.hMin = 20
             assetIcon.isRequired = true
             addAsset(assetIcon)
 
-            val image = NativeImageAsset()
+            val image = NativeImageAsset(200, 200, 200, 200)
             image.imageType = NativeImageAsset.IMAGE_TYPE.MAIN
-            image.hMin = 200
-            image.wMin = 200
             image.isRequired = true
             addAsset(image)
 

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/NativeImageAsset.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/NativeImageAsset.java
@@ -7,10 +7,19 @@
 
 public class NativeImageAsset extends NativeAsset {
 
+    @Deprecated
     public NativeImageAsset() {
         super(REQUEST_ASSET.IMAGE);
     }
 
+    public NativeImageAsset(int w, int h, int minWidth, int minHeight) {
+        super(REQUEST_ASSET.IMAGE);
+        this.w = w;
+        this.h = h;
+        wmin = minWidth;
+        hmin = minHeight;
+    }
+
     public enum IMAGE_TYPE {
         ICON(1),
         MAIN(3),