feat(unification): fix ad units types #370

prebid · Mar 23, 2022 · b56bc85 · b56bc85
1 parent 2fac52d
commit b56bc85
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/InterstitialAdUnit.java
@@ -18,12 +18,14 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import org.prebid.mobile.rendering.models.AdPosition;
 import org.prebid.mobile.units.configuration.AdUnitConfiguration;
 
 public class InterstitialAdUnit extends BannerBaseAdUnit {
 
     public InterstitialAdUnit(@NonNull String configId) {
         super(configId, AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
+        configuration.setAdPosition(AdPosition.FULLSCREEN);
     }
 
     public InterstitialAdUnit(@NonNull String configId, int minWidthPerc, int minHeightPerc) {

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/NativeAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/NativeAdUnit.java
@@ -23,7 +23,6 @@ public class NativeAdUnit extends AdUnit {
 
     public NativeAdUnit(@NonNull String configId) {
         super(configId, AdUnitConfiguration.AdUnitIdentifierType.NATIVE);
-        configuration.initNativeConfiguration();
         nativeConfiguration = configuration.getNativeConfiguration();
     }
 

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
@@ -53,7 +53,7 @@ public IMAGE_TYPE getImageType() {
         return type;
     }
 
-    private int wmin = 0;
+    private int wmin = -1;
 
     public void setWMin(int wmin) {
         this.wmin = wmin;
@@ -63,7 +63,7 @@ public int getWMin() {
         return wmin;
     }
 
-    private int hmin = 0;
+    private int hmin = -1;
 
     public int getHMin() {
         return hmin;
@@ -73,7 +73,7 @@ public void setHMin(int hmin) {
         this.hmin = hmin;
     }
 
-    private int w = 0;
+    private int w = -1;
 
     public int getW() {
         return w;
@@ -83,7 +83,7 @@ public void setW(int w) {
         this.w = w;
     }
 
-    private int h = 0;
+    private int h = -1;
 
     public void setH(int h) {
         this.h = h;

diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/RewardedVideoAdUnit.java
@@ -17,12 +17,15 @@
 package org.prebid.mobile;
 
 import androidx.annotation.NonNull;
+import org.prebid.mobile.rendering.models.AdPosition;
 import org.prebid.mobile.units.configuration.AdUnitConfiguration;
 
 public class RewardedVideoAdUnit extends VideoBaseAdUnit {
 
     public RewardedVideoAdUnit(@NonNull String configId) {
         super(configId, AdUnitConfiguration.AdUnitIdentifierType.VAST);
+        configuration.setRewarded(true);
+        configuration.setAdPosition(AdPosition.FULLSCREEN);
     }
 
 }
diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/VideoInterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/VideoInterstitialAdUnit.java
@@ -17,12 +17,14 @@
 package org.prebid.mobile;
 
 import androidx.annotation.NonNull;
+import org.prebid.mobile.rendering.models.AdPosition;
 import org.prebid.mobile.units.configuration.AdUnitConfiguration;
 
 public class VideoInterstitialAdUnit extends VideoBaseAdUnit {
 
     public VideoInterstitialAdUnit(@NonNull String configId) {
-        super(configId, AdUnitConfiguration.AdUnitIdentifierType.INTERSTITIAL);
+        super(configId, AdUnitConfiguration.AdUnitIdentifierType.VAST);
+        configuration.setAdPosition(AdPosition.FULLSCREEN);
     }
 
 }
diff --git a/...dMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java b/...dMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java
@@ -229,6 +229,9 @@ public int getVideoSkipOffset() {
     }
 
     public void setAdUnitIdentifierType(@Nullable AdUnitIdentifierType adUnitIdentifierType) {
+        if (adUnitIdentifierType == AdUnitIdentifierType.NATIVE) {
+            nativeConfiguration = new NativeAdUnitConfiguration();
+        }
         this.adUnitIdentifierType = adUnitIdentifierType;
     }
 
@@ -307,13 +310,6 @@ public int getBroadcastId() {
     }
 
 
-    /**
-     * Creates native configuration. It must be used for Native ad units.
-     */
-    public void initNativeConfiguration() {
-        nativeConfiguration = new NativeAdUnitConfiguration();
-    }
-
     @Nullable
     public NativeAdUnitConfiguration getNativeConfiguration() {
         return nativeConfiguration;