fix : test ads id issue and loader changes

InfyOmLabs · Aug 11, 2023 · 5a60ad2 · 5a60ad2
1 parent 9f26384
commit 5a60ad2
Show file tree

Hide file tree

Showing 15 changed files with 10,078 additions and 36 deletions.
diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/adsSdk/build.gradle b/adsSdk/build.gradle
@@ -49,4 +49,6 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.0'
 
+    implementation 'com.airbnb.android:lottie:6.1.0'
+
 }
diff --git a/adsSdk/src/main/java/com/infyom/adssdk/InfyOmAds.java b/adsSdk/src/main/java/com/infyom/adssdk/InfyOmAds.java
@@ -214,15 +214,15 @@ public static void enableTestMode(Context context) {
         myPref = new AdsAccountProvider(context);
 
         myPref.setOpenAds("/6499/example/app-open");
-        myPref.setBannerAds1("/6499/example/bannr");
-        myPref.setBannerAds2("/6499/example/baner");
-        myPref.setBannerAds3("/6499/example/baner");
-        myPref.setInterAds1("/6499/example/inerstitial");
-        myPref.setInterAds2("/6499/example/iterstitial");
-        myPref.setInterAds3("/6499/example/nterstitial");
-        myPref.setNativeAds1("/6499/exampl/native");
-        myPref.setNativeAds2("/6499/exampe/native");
-        myPref.setNativeAds3("/6499/examle/native");
+        myPref.setBannerAds1("/6499/example/banner");
+        myPref.setBannerAds2("/6499/example/banner");
+        myPref.setBannerAds3("/6499/example/banner");
+        myPref.setInterAds1("/6499/example/interstitial");
+        myPref.setInterAds2("/6499/example/interstitial");
+        myPref.setInterAds3("/6499/example/interstitial");
+        myPref.setNativeAds1("/6499/example/native");
+        myPref.setNativeAds2("/6499/example/native");
+        myPref.setNativeAds3("/6499/example/native");
         myPref.setFbBannerAds("IMG_16_9_LINK#YOUR_PLACEMENT_ID");
         myPref.setFbNativeAds("IMG_16_9_LINK#YOUR_PLACEMENT_ID");
         myPref.setFbInterAds("IMG_16_9_LINK#YOUR_PLACEMENT_ID");

diff --git a/adsSdk/src/main/res/layout/ads_progress_dialog.xml b/adsSdk/src/main/res/layout/ads_progress_dialog.xml
@@ -5,37 +5,44 @@
     android:layout_height="150dp"
     android:padding="5dp">
 
-    <androidx.cardview.widget.CardView
+    <com.airbnb.lottie.LottieAnimationView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp">
+        app:lottie_rawRes="@raw/ad_loader"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="true"/>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+<!--    <androidx.cardview.widget.CardView-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:cardBackgroundColor="@color/white"-->
+<!--        app:cardCornerRadius="10dp">-->
 
-            <ProgressBar
-                android:id="@+id/pb_ads"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="20dp"
-                android:indeterminateTint="?android:attr/colorPrimary"
-                android:secondaryProgressTint="?android:attr/colorPrimary"/>
+<!--        <FrameLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="match_parent"-->
+<!--            android:orientation="vertical">-->
 
-            <TextView
-                android:id="@+id/tv_pb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="24dp"
-                android:textColor="?android:attr/colorPrimary"
-                android:text="Ads Loading..."
-                android:textSize="16sp"
-                android:textStyle="bold" />
-        </FrameLayout>
-    </androidx.cardview.widget.CardView>
+<!--            <ProgressBar-->
+<!--                android:id="@+id/pb_ads"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_gravity="center"-->
+<!--                android:layout_marginBottom="20dp"-->
+<!--                android:indeterminateTint="?android:attr/colorPrimary"-->
+<!--                android:secondaryProgressTint="?android:attr/colorPrimary"/>-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/tv_pb"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_gravity="center_horizontal|bottom"-->
+<!--                android:layout_marginBottom="24dp"-->
+<!--                android:textColor="?android:attr/colorPrimary"-->
+<!--                android:text="Ads Loading..."-->
+<!--                android:textSize="16sp"-->
+<!--                android:textStyle="bold" />-->
+<!--        </FrameLayout>-->
+<!--    </androidx.cardview.widget.CardView>-->
 
 </RelativeLayout>
diff --git a/adsSdk/src/main/res/raw/ad_loader.json b/adsSdk/src/main/res/raw/ad_loader.json