Update version 2.2.1

zayvius-dev · May 18, 2022 · 6fff2e7 · 6fff2e7
1 parent cadbf18
commit 6fff2e7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 53 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,7 +30,6 @@ android {
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
     implementation 'com.google.android.material:material:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation project(path: ':zs-ads')

diff --git a/app/src/main/java/com/zayvius/adsall/MainActivity.java b/app/src/main/java/com/zayvius/adsall/MainActivity.java
@@ -9,7 +9,6 @@
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
-import com.zayvius.zs_ads.ads.ZayviusAdsOnOff;
 import com.zayvius.zs_ads.settings.Config;
 
 public class MainActivity extends AppCompatActivity {

diff --git a/gradle.properties b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library

diff --git a/libs/unity-ads.aar b/libs/unity-ads.aar
diff --git a/zs-ads/build.gradle b/zs-ads/build.gradle
@@ -26,10 +26,8 @@ android {
 }
 
 dependencies {
-
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.6.0'
-    implementation 'com.google.android.material:material:1.6.0'
     implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -40,7 +38,7 @@ dependencies {
     implementation 'com.applovin:applovin-sdk:11.4.0'
     implementation 'com.applovin.mediation:facebook-adapter:6.11.0.1'
     implementation 'com.google.ads.mediation:facebook:6.10.0.0'
-    implementation files('../libs/unity-ads.aar')
+    //implementation files('../libs/unity-ads.aar')
     /*Ads End*/
     implementation 'com.google.android.play:core:1.10.3'
     implementation 'com.google.android.play:core-ktx:1.8.1'

diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsBanner.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsBanner.java
@@ -21,9 +21,6 @@
 import com.google.android.gms.ads.AdSize;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.LoadAdError;
-import com.unity3d.services.banners.BannerErrorInfo;
-import com.unity3d.services.banners.BannerView;
-import com.unity3d.services.banners.UnityBannerSize;
 import com.zayvius.zs_ads.R;
 
 public class ZayviusAdsBanner {
@@ -50,7 +47,7 @@ public void onAdFailedToLoad(@NonNull LoadAdError adError) {
                             BannerApplovinMAx(activity,relativeLayout);
                             break;
                         case "unity":
-                            BannerUnity(activity,relativeLayout);
+                            //BannerUnity(activity,relativeLayout);
                             break;
                         case "applovinzone":
                             BannerApplovinZone(activity,relativeLayout);
@@ -121,7 +118,7 @@ public void onAdLoadFailed(String adUnitId, MaxError error) {
                             BannerAdmob(activity,relativeLayout);
                             break;
                         case "unity":
-                            BannerUnity(activity,relativeLayout);
+                            //BannerUnity(activity,relativeLayout);
                             break;
                         case "applovinzone":
                             BannerApplovinZone(activity,relativeLayout);
@@ -165,7 +162,7 @@ public void failedToReceiveAd(int errorCode) {
                             BannerApplovinMAx(activity, relativeLayout);
                             break;
                         case "unity":
-                            BannerUnity(activity, relativeLayout);
+                            //BannerUnity(activity, relativeLayout);
                             break;
                     }
                 }
@@ -175,7 +172,7 @@ public void failedToReceiveAd(int errorCode) {
     }
 
     /*Unity*/
-    public static void BannerUnity(Activity activity,RelativeLayout relativeLayout){
+    /*public static void BannerUnity(Activity activity,RelativeLayout relativeLayout){
         if (ZayviusAdsOnOff.ad_unity) {
             BannerView bannerView = new BannerView(activity, ZayviusAdsIDUnity.Bannerx, new UnityBannerSize(320, 50));
             bannerView.load();
@@ -213,7 +210,7 @@ public void onBannerLeftApplication(BannerView bannerAdView) {
             });
 
         }
-    }
+    }*/
 }
 
 
diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsGDPR.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsGDPR.java
@@ -7,7 +7,6 @@
 import com.google.android.ump.ConsentInformation;
 import com.google.android.ump.ConsentRequestParameters;
 import com.google.android.ump.UserMessagingPlatform;
-import com.unity3d.ads.metadata.MetaData;
 
 public class ZayviusAdsGDPR {
     public static ConsentInformation consentInformation;
@@ -77,11 +76,11 @@ public static void ApplovinZone(Activity activity, boolean children ){
     }
 
     /*Unity*/
-    public static void Unity(Activity activity){
+   /* public static void Unity(Activity activity){
         if (ZayviusAdsOnOff.ad_unity) {
             MetaData gdprMetaData = new MetaData(activity);
             gdprMetaData.set("gdpr.consent", true);
             gdprMetaData.commit();
         }
-    }
+    }*/
 }
diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsInitialize.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsInitialize.java
@@ -13,8 +13,6 @@
 import com.google.android.gms.ads.initialization.AdapterStatus;
 import com.google.android.gms.ads.initialization.InitializationStatus;
 import com.google.android.gms.ads.initialization.OnInitializationCompleteListener;
-import com.unity3d.ads.IUnityAdsInitializationListener;
-import com.unity3d.ads.UnityAds;
 
 import java.util.Map;
 
@@ -77,7 +75,7 @@ public static void ApplovinZone(Activity activity){
     }
 
     /*uUnity*/
-    public static void Unity(Activity activity){
+    /*public static void Unity(Activity activity){
         if (ZayviusAdsOnOff.ad_unity) {
             UnityAds.initialize(activity, ZayviusAdsIDUnity.Id_Appx, ZayviusAdsIDUnity.Tes_Modex, new IUnityAdsInitializationListener() {
                 @Override
@@ -92,5 +90,5 @@ public void onInitializationFailed(UnityAds.UnityAdsInitializationError unityAds
             });
 
         }
-    }
+    }*/
 }
diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsInterstitial.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsInterstitial.java
@@ -19,10 +19,6 @@
 import com.google.android.gms.ads.LoadAdError;
 import com.google.android.gms.ads.interstitial.InterstitialAd;
 import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback;
-import com.unity3d.ads.IUnityAdsLoadListener;
-import com.unity3d.ads.IUnityAdsShowListener;
-import com.unity3d.ads.UnityAds;
-import com.unity3d.ads.UnityAdsShowOptions;
 
 import java.util.concurrent.TimeUnit;
 
@@ -93,7 +89,7 @@ public static void AdmobloadInterstitial(Activity activity, int interval_inter)
                         applovinmax(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                     case "applovinzone":
                         applovinzone(activity);
@@ -110,7 +106,7 @@ public static void AdmobloadInterstitial(Activity activity, int interval_inter)
                             show_applovinmax();
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                            /*UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
 
@@ -130,7 +126,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
                         case "applovinzone":
                             show_applovinzone();
@@ -218,7 +214,7 @@ public static void ApplovinMaxloadInterstitial(Activity activity , int interval_
                         admob(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                     case "applovinzone":
                         applovinzone(activity);
@@ -237,7 +233,7 @@ public static void ApplovinMaxloadInterstitial(Activity activity , int interval_
                             }
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                           /* UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
                                 }
@@ -256,7 +252,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
 
                         case "applovinzone":
@@ -305,7 +301,7 @@ public static void ApplovinZoneloadInterstitial(Activity activity , int interval
                         admob(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                     case "applovinmax":
                         applovinmax(activity);
@@ -324,7 +320,7 @@ public static void ApplovinZoneloadInterstitial(Activity activity , int interval
                             }
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                           /* UnityAds.show(activity, ZayviusAdsIDUnity.Interstitialx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
                                 }
@@ -343,7 +339,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
                         case "applovinmax":
                             show_applovinmax();
@@ -363,7 +359,7 @@ public static void show_applovinzone(){
     }
 
     /*Unity*/
-    public static void unity(){
+    /*public static void unity(){
         if (ZayviusAdsOnOff.ad_unity) {
             UnityAds.load(ZayviusAdsIDUnity.Interstitialx, new IUnityAdsLoadListener() {
                 @Override
@@ -436,7 +432,7 @@ public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionStat
             }
 
         }
-    }
+    }*/
 
 
 }
diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsOnOff.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsOnOff.java
@@ -4,12 +4,12 @@ public class ZayviusAdsOnOff {
     public static boolean ad_admob;
     public static boolean ad_applovinmax;
     public static boolean ad_applovinzone;
-    public static boolean ad_unity;
-    public static void allads(boolean admob,boolean applovinmax,boolean applovinzone,boolean unity){
+    //public static boolean ad_unity;
+    public static void allads(boolean admob,boolean applovinmax,boolean applovinzone ){
         ad_admob = admob;
         ad_applovinmax = applovinmax;
         ad_applovinzone = applovinzone;
-        ad_unity = unity;
+        //ad_unity = unity;
     }
 
 }
diff --git a/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsReward.java b/zs-ads/src/main/java/com/zayvius/zs_ads/ads/ZayviusAdsReward.java
@@ -23,10 +23,6 @@
 import com.google.android.gms.ads.rewarded.RewardItem;
 import com.google.android.gms.ads.rewarded.RewardedAd;
 import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback;
-import com.unity3d.ads.IUnityAdsLoadListener;
-import com.unity3d.ads.IUnityAdsShowListener;
-import com.unity3d.ads.UnityAds;
-import com.unity3d.ads.UnityAdsShowOptions;
 
 import java.util.concurrent.TimeUnit;
 
@@ -108,7 +104,7 @@ public static void RewardedAdmob(Activity activity, int interval_reward) {
                         applovinmax(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                     case "applovinzone":
                         applovinzone(activity);
@@ -134,7 +130,7 @@ public void onUserEarnedReward(@NonNull RewardItem rewardItem) {
                             }
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                            /*UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
 
@@ -154,7 +150,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
                         case "applovinzone":
                             if(incentivizedInterstitial.isAdReadyToDisplay()){
@@ -242,7 +238,7 @@ public static void RewardedApplovinMax(Activity activity, int interval_reward) {
                         admob(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                     case "applovinzone":
                         applovinzone(activity);
@@ -269,7 +265,7 @@ public void onUserEarnedReward(@NonNull RewardItem rewardItem) {
 
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                            /*UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
 
@@ -289,7 +285,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
                         case "applovinzone":
                             if(incentivizedInterstitial.isAdReadyToDisplay()){
@@ -334,7 +330,7 @@ public static void RewardedApplovinZone(Activity activity, int interval_reward)
                         applovinmax(activity);
                         break;
                     case "unity":
-                        unity();
+                        //unity();
                         break;
                 }
                 loadingIklanapzone = false;
@@ -362,7 +358,7 @@ public void onUserEarnedReward(@NonNull RewardItem rewardItem) {
                             }
                             break;
                         case "unity":
-                            UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
+                           /* UnityAds.show(activity, ZayviusAdsIDUnity.Rewardedx, new UnityAdsShowOptions(), new IUnityAdsShowListener() {
                                 @Override
                                 public void onUnityAdsShowFailure(String s, UnityAds.UnityAdsShowError unityAdsShowError, String s1) {
 
@@ -382,7 +378,7 @@ public void onUnityAdsShowClick(String s) {
                                 public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionState unityAdsShowCompletionState) {
 
                                 }
-                            });
+                            });*/
                             break;
                     }
                 }
@@ -392,7 +388,7 @@ public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionStat
     }
 
     /*Unity*/
-    public static void unity(){
+   /* public static void unity(){
         if (ZayviusAdsOnOff.ad_unity) {
             UnityAds.load(ZayviusAdsIDUnity.Rewardedx, new IUnityAdsLoadListener() {
                 @Override
@@ -475,5 +471,5 @@ public void onUnityAdsShowComplete(String s, UnityAds.UnityAdsShowCompletionStat
                 loadingIklanunity = true;
             }
         }
-    }
+    }*/
 }