Skip to content

Commit

Permalink
Some fixes (#431)
Browse files Browse the repository at this point in the history
* fix: change default value for is muted property

* fix: fix test

* feat: use unified namings for mediation utils classes

* feat: update sdk version
  • Loading branch information
ValentinPostindustria authored Apr 27, 2022
1 parent 25f5872 commit bf652e5
Show file tree
Hide file tree
Showing 32 changed files with 77 additions and 67 deletions.
2 changes: 1 addition & 1 deletion Example/PrebidDemoJava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
implementation project(':PrebidMobile')

// For testing staging releases
// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1'

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.gms:play-services-ads:20.4.0'
Expand Down
8 changes: 4 additions & 4 deletions Example/PrebidDemoKotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ dependencies {
implementation project(':PrebidMobile-maxAdapters')

// For testing staging releases
// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:2.0.0-beta1'

// Standard libraries
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import android.view.ViewGroup
import com.google.android.gms.ads.*
import com.google.android.gms.ads.initialization.InitializationStatus
import org.prebid.mobile.PrebidMobile
import org.prebid.mobile.admob.AdMobBannerMediationUtils
import org.prebid.mobile.admob.AdMobMediationBannerUtils
import org.prebid.mobile.admob.PrebidBannerAdapter
import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit

Expand Down Expand Up @@ -56,7 +56,7 @@ object InAppAdMobBanner {
.Builder()
.addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, extras)
.build()
val mediationUtils = AdMobBannerMediationUtils(extras, bannerView)
val mediationUtils = AdMobMediationBannerUtils(extras, bannerView)

adUnit = MediationBannerAdUnit(
wrapper.context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.google.android.gms.ads.LoadAdError
import com.google.android.gms.ads.interstitial.InterstitialAd
import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
import org.prebid.mobile.PrebidMobile
import org.prebid.mobile.admob.AdMobInterstitialMediationUtils
import org.prebid.mobile.admob.AdMobMediationInterstitialUtils
import org.prebid.mobile.admob.PrebidInterstitialAdapter
import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit
import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
Expand All @@ -31,7 +31,7 @@ object InAppAdMobInterstitial {
.Builder()
.addCustomEventExtrasBundle(PrebidInterstitialAdapter::class.java, extras)
.build()
val mediationUtils = AdMobInterstitialMediationUtils(extras)
val mediationUtils = AdMobMediationInterstitialUtils(extras)
PrebidMobile.setStoredAuctionResponse(storedAuctionResponse)
adUnit = MediationInterstitialAdUnit(
activity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.google.android.gms.ads.LoadAdError
import com.google.android.gms.ads.rewarded.RewardedAd
import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback
import org.prebid.mobile.PrebidMobile
import org.prebid.mobile.admob.AdMobRewardedMediationUtils
import org.prebid.mobile.admob.AdMobMediationRewardedUtils
import org.prebid.mobile.admob.PrebidRewardedAdapter
import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit

Expand All @@ -29,7 +29,7 @@ object InAppAdMobRewarded {
.Builder()
.addNetworkExtrasBundle(PrebidRewardedAdapter::class.java, extras)
.build()
val mediationUtils = AdMobRewardedMediationUtils(extras)
val mediationUtils = AdMobMediationRewardedUtils(extras)
PrebidMobile.setStoredAuctionResponse(storedAuctionResponse)
adUnit = MediationRewardedVideoAdUnit(activity, configId, mediationUtils)
adUnit?.fetchDemand { result ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import android.widget.FrameLayout
import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdViewAdListener
import com.applovin.mediation.MaxError
import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils
import com.applovin.mediation.ads.MaxAdView
import org.prebid.mobile.AdSize
import org.prebid.mobile.prebidkotlindemo.R
Expand All @@ -33,7 +33,8 @@ object InAppMaxBanner {
)
wrapper.addView(adView)

val mediationUtils = MaxBannerMediationUtils(adView)
val mediationUtils =
MaxMediationBannerUtils(adView)
adUnit = MediationBannerAdUnit(
wrapper.context,
configId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.app.Activity
import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdListener
import com.applovin.mediation.MaxError
import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils
import com.applovin.mediation.ads.MaxInterstitialAd
import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit
import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
Expand All @@ -24,7 +24,7 @@ object InAppMaxInterstitial {
maxInterstitialAd?.setListener(createListener())

val mediationUtils =
MaxInterstitialMediationUtils(
MaxMediationInterstitialUtils(
maxInterstitialAd
)
adUnit = MediationInterstitialAdUnit(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdFormat
import com.applovin.mediation.MaxAdViewAdListener
import com.applovin.mediation.MaxError
import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils
import com.applovin.mediation.ads.MaxAdView
import com.applovin.sdk.AppLovinSdkUtils
import org.prebid.mobile.AdSize
Expand Down Expand Up @@ -37,7 +37,8 @@ object InAppMaxMrec {
)
wrapper.addView(adView)

val mediationUtils = MaxBannerMediationUtils(adView)
val mediationUtils =
MaxMediationBannerUtils(adView)
adUnit = MediationBannerAdUnit(
wrapper.context,
configId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxError
import com.applovin.mediation.MaxReward
import com.applovin.mediation.MaxRewardedAdListener
import com.applovin.mediation.adapters.prebid.utils.MaxRewardedMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationRewardedUtils
import com.applovin.mediation.ads.MaxRewardedAd
import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit

Expand All @@ -23,7 +23,7 @@ object InAppMaxRewarded {
maxRewardedAd?.setListener(createListener())

val mediationUtils =
MaxRewardedMediationUtils(maxRewardedAd)
MaxMediationRewardedUtils(maxRewardedAd)
adUnit = MediationRewardedVideoAdUnit(
activity,
configId,
Expand Down
8 changes: 4 additions & 4 deletions Example/PrebidInternalTestApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ dependencies {
implementation project(':PrebidMobile-maxAdapters')

// For testing staging releases
// implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:1.13.0-beta2'
// implementation 'org.prebid:prebid-mobile-sdk:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:2.0.0-beta1'
// implementation 'org.prebid:prebid-mobile-sdk-max-adapters:2.0.0-beta1'

// Base dependencies
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.google.android.gms.ads.AdView
import com.google.android.gms.ads.MobileAds
import kotlinx.android.synthetic.main.fragment_bidding_banner.*
import org.prebid.mobile.AdSize
import org.prebid.mobile.admob.AdMobBannerMediationUtils
import org.prebid.mobile.admob.AdMobMediationBannerUtils
import org.prebid.mobile.admob.PrebidBannerAdapter
import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit
import com.google.android.gms.ads.AdSize as GamAdSize
Expand Down Expand Up @@ -35,7 +35,8 @@ class AdMobBannerFlexibleFragment : AdMobBannerFragment() {
.Builder()
.addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, adRequestExtras!!)
.build()
val mediationUtils = AdMobBannerMediationUtils(adRequestExtras, bannerView)
val mediationUtils =
AdMobMediationBannerUtils(adRequestExtras, bannerView)


adUnit = MediationBannerAdUnit(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.events_admob.*

import kotlinx.android.synthetic.main.fragment_bidding_banner.*
import org.prebid.mobile.AdSize
import org.prebid.mobile.admob.AdMobBannerMediationUtils
import org.prebid.mobile.admob.AdMobMediationBannerUtils
import org.prebid.mobile.admob.PrebidBannerAdapter
import org.prebid.mobile.rendering.bidding.display.MediationBannerAdUnit
import org.prebid.mobile.renderingtestapp.AdFragment
Expand Down Expand Up @@ -58,7 +58,8 @@ open class AdMobBannerFragment : AdFragment() {
.Builder()
.addCustomEventExtrasBundle(PrebidBannerAdapter::class.java, adRequestExtras!!)
.build()
val mediationUtils = AdMobBannerMediationUtils(adRequestExtras, bannerView)
val mediationUtils =
AdMobMediationBannerUtils(adRequestExtras, bannerView)


adUnit = MediationBannerAdUnit(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.google.android.gms.ads.interstitial.InterstitialAd
import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback
import kotlinx.android.synthetic.main.events_admob_rewarded.*
import kotlinx.android.synthetic.main.fragment_bidding_banner.*
import org.prebid.mobile.admob.AdMobInterstitialMediationUtils
import org.prebid.mobile.admob.AdMobMediationInterstitialUtils
import org.prebid.mobile.admob.PrebidInterstitialAdapter
import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit
import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
Expand Down Expand Up @@ -45,7 +45,7 @@ open class AdMobInterstitialFragment : AdFragment() {

override fun initAd(): Any? {
extras = Bundle()
val mediationUtils = AdMobInterstitialMediationUtils(extras)
val mediationUtils = AdMobMediationInterstitialUtils(extras)

isVideo = arguments?.getBoolean(ARG_IS_VIDEO) ?: false
var adUnitFormat = EnumSet.of(AdUnitFormat.DISPLAY)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.google.android.gms.ads.rewarded.RewardedAd
import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback
import kotlinx.android.synthetic.main.events_admob_rewarded.*
import kotlinx.android.synthetic.main.fragment_bidding_banner.*
import org.prebid.mobile.admob.AdMobRewardedMediationUtils
import org.prebid.mobile.admob.AdMobMediationRewardedUtils
import org.prebid.mobile.admob.PrebidRewardedAdapter
import org.prebid.mobile.rendering.bidding.display.MediationRewardedVideoAdUnit
import org.prebid.mobile.renderingtestapp.AdFragment
Expand Down Expand Up @@ -41,7 +41,7 @@ open class AdMobRewardedFragment : AdFragment() {

override fun initAd(): Any? {
extras = Bundle()
val mediationUtils = AdMobRewardedMediationUtils(extras)
val mediationUtils = AdMobMediationRewardedUtils(extras)
adUnit = MediationRewardedVideoAdUnit(activity, configId, mediationUtils)
return adUnit
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdFormat
import com.applovin.mediation.MaxAdViewAdListener
import com.applovin.mediation.MaxError
import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils
import com.applovin.mediation.ads.MaxAdView
import com.applovin.sdk.AppLovinSdkUtils
import kotlinx.android.synthetic.main.events_max_banner.*
Expand Down Expand Up @@ -62,7 +62,8 @@ open class MaxBannerFragment : AdFragment() {
)
viewContainer.addView(adView)

val mediationUtils = MaxBannerMediationUtils(adView)
val mediationUtils =
MaxMediationBannerUtils(adView)
adUnit = MediationBannerAdUnit(
requireContext(),
configId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.prebid.mobile.renderingtestapp.plugplay.bidding.max
import android.view.ViewGroup
import android.widget.FrameLayout
import com.applovin.mediation.MaxAdFormat
import com.applovin.mediation.adapters.prebid.utils.MaxBannerMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationBannerUtils
import com.applovin.mediation.ads.MaxAdView
import com.applovin.sdk.AppLovinSdkUtils
import kotlinx.android.synthetic.main.fragment_bidding_banner_applovin_max.*
Expand All @@ -23,7 +23,8 @@ class MaxBannerFragmentAdaptive : MaxBannerFragment() {
adView?.setExtraParameter("adaptive_banner", "true")
viewContainer.addView(adView)

val mediationUtils = MaxBannerMediationUtils(adView)
val mediationUtils =
MaxMediationBannerUtils(adView)
adUnit = MediationBannerAdUnit(
requireContext(),
configId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import android.view.View
import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdListener
import com.applovin.mediation.MaxError
import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils
import com.applovin.mediation.ads.MaxInterstitialAd
import kotlinx.android.synthetic.main.events_max_interstitial.*
import kotlinx.android.synthetic.main.fragment_bidding_interstitial_applovin_max.*
Expand Down Expand Up @@ -44,7 +44,7 @@ open class MaxInterstitialFragment : AdFragment() {
maxInterstitialAd?.setListener(createListener())

val mediationUtils =
MaxInterstitialMediationUtils(
MaxMediationInterstitialUtils(
maxInterstitialAd
)
adUnit = MediationInterstitialAdUnit(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.prebid.mobile.renderingtestapp.plugplay.bidding.max

import com.applovin.mediation.adapters.prebid.utils.MaxInterstitialMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationInterstitialUtils
import com.applovin.mediation.ads.MaxInterstitialAd
import org.prebid.mobile.rendering.bidding.display.MediationInterstitialAdUnit
import org.prebid.mobile.rendering.bidding.enums.AdUnitFormat
Expand All @@ -12,9 +12,10 @@ class MaxInterstitialFragmentMultiformat : MaxInterstitialFragment() {
maxInterstitialAd = MaxInterstitialAd(adUnitId, activity)
maxInterstitialAd?.setListener(createListener())

val mediationUtils = MaxInterstitialMediationUtils(
maxInterstitialAd
)
val mediationUtils =
MaxMediationInterstitialUtils(
maxInterstitialAd
)
adUnit = MediationInterstitialAdUnit(
activity,
configId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxError
import com.applovin.mediation.MaxReward
import com.applovin.mediation.MaxRewardedAdListener
import com.applovin.mediation.adapters.prebid.utils.MaxRewardedMediationUtils
import com.applovin.mediation.adapters.prebid.utils.MaxMediationRewardedUtils
import com.applovin.mediation.ads.MaxRewardedAd
import kotlinx.android.synthetic.main.events_max_rewarded.*
import kotlinx.android.synthetic.main.fragment_bidding_rewarded_applovin_max.*
Expand Down Expand Up @@ -42,7 +42,7 @@ class MaxRewardedFragment : AdFragment() {
maxRewardedAd = MaxRewardedAd.getInstance(adUnitId, activity)
maxRewardedAd?.setListener(createListener())

val mediationUtils = MaxRewardedMediationUtils(
val mediationUtils = MaxMediationRewardedUtils(
maxRewardedAd
)
adUnit = MediationRewardedVideoAdUnit(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@
import java.lang.ref.WeakReference;
import java.util.HashMap;

public class AdMobBannerMediationUtils implements PrebidMediationDelegate {
public class AdMobMediationBannerUtils implements PrebidMediationDelegate {

private static final String TAG = "BannerMediationUtils";

private final Bundle extras;
private final WeakReference<AdView> adView;

public AdMobBannerMediationUtils(Bundle adMobExtrasBundle, AdView adView) {
public AdMobMediationBannerUtils(
Bundle adMobExtrasBundle,
AdView adView
) {
this.extras = adMobExtrasBundle;
this.adView = new WeakReference<>(adView);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

import java.util.HashMap;

public class AdMobInterstitialMediationUtils implements PrebidMediationDelegate {
public class AdMobMediationInterstitialUtils implements PrebidMediationDelegate {

private final Bundle extras;

public AdMobInterstitialMediationUtils(Bundle adMobExtrasBundle) {
public AdMobMediationInterstitialUtils(Bundle adMobExtrasBundle) {
this.extras = adMobExtrasBundle;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

import java.util.HashMap;

public class AdMobRewardedMediationUtils implements PrebidMediationDelegate {
public class AdMobMediationRewardedUtils implements PrebidMediationDelegate {

private final Bundle extras;

public AdMobRewardedMediationUtils(Bundle adMobExtrasBundle) {
public AdMobMediationRewardedUtils(Bundle adMobExtrasBundle) {
this.extras = adMobExtrasBundle;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class AdUnitConfiguration {

private boolean isRewarded;
private boolean isBuiltInVideo = false;
private boolean isMuted = true;
private boolean isMuted = false;
private boolean isSoundButtonVisible = false;
private boolean isOriginalAdUnit = false;

Expand Down
Loading

0 comments on commit bf652e5

Please sign in to comment.