Merge remote-tracking branch 'origin/master'

app/src/main/java/com/swiftcleaner/chovey/view/activity/CleanJunkActivity.java

@@ -381,27 +381,29 @@ public class CleanJunkActivity extends AppCompatActivity {
         binding.radarview.setSearching(true);
         handler = new Handler();
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
-        AdmobHelper.INSTANCE.showAppOpenAd(this,
-                () -> {
-                    binding.radarview.setSearching(false);
-                    intent.putExtra("cleanstr", str);
-                    startActivity(intent);
-                    finish();
-                    return null;
-                },
-                () -> {
-
-                    return null;
-                },
-                () -> {
-                    binding.radarview.setSearching(false);
-                    intent.putExtra("cleanstr", str);
-                    startActivity(intent);
-                    finish();
-                    return null;
-                }
+        handler.postDelayed(() -> {
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        binding.radarview.setSearching(false);
+                        intent.putExtra("cleanstr", str);
+                        startActivity(intent);
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        binding.radarview.setSearching(false);
+                        intent.putExtra("cleanstr", str);
+                        startActivity(intent);
+                        finish();
+                        return null;
+                    }
+            );
+        }, 3000);
 
-        );
 
     }
 

app/src/main/java/com/swiftcleaner/chovey/view/activity/EndCleanJunkActivity.java

@@ -33,36 +33,156 @@ public class EndCleanJunkActivity extends AppCompatActivity {
             initCustDialog();
         });
         binding.buttonBatteryInfoCheckNo.setOnClickListener(v->{
-            startActivity(new Intent(this, InfoActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, InfoActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, InfoActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonAppManagerCheckNo.setOnClickListener(v->{
-            startActivity(new Intent(this, BatteryInfoActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, BatteryInfoActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, BatteryInfoActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonWhatsappCheckNo.setOnClickListener(v->{
-            startActivity(new Intent(this, WhatsAppActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, WhatsAppActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, WhatsAppActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonAppProcessCheckNo.setOnClickListener(v->{
-            startActivity(new Intent(this, AppProcessActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, AppProcessActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, AppProcessActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonCleanJunkCleanNo.setOnClickListener(v->{
-            startActivity(new Intent(this, CleanJunkActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, CleanJunkActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, CleanJunkActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonLargefilecleanerCleanUp.setOnClickListener(v->{
-            startActivity(new Intent(this, LargeFileActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, LargeFileActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, LargeFileActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonSimilarPhotos.setOnClickListener(v->{
-            startActivity(new Intent(this, SimilarPhotosActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, SimilarPhotosActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, SimilarPhotosActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
         binding.buttonScreenshot.setOnClickListener(v->{
-            startActivity(new Intent(this, ScreenShotActivity.class));
-            finish();
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        startActivity(new Intent(this, ScreenShotActivity.class));
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        startActivity(new Intent(this, ScreenShotActivity.class));
+                        finish();
+                        return null;
+                    }
+            );
+
         });
     }
 

app/src/main/java/com/swiftcleaner/chovey/view/activity/ScreenShotActivity.java

@@ -150,27 +150,28 @@ public class ScreenShotActivity extends AppCompatActivity {
 
         handler = new Handler(Looper.getMainLooper());
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
-        AdmobHelper.INSTANCE.showAppOpenAd(this,
-                () -> {
-                    binding.radarview.setSearching(false);
-                    intent.putExtra("cleanstr", cleanSize);
-                    startActivity(intent);
-                    finish();
-                    return null;
-                },
-                () -> {
-
-                    return null;
-                },
-                () -> {
-                    binding.radarview.setSearching(false);
-                    intent.putExtra("cleanstr", cleanSize);
-                    startActivity(intent);
-                    finish();
-                    return null;
-                }
-
-        );
+        handler.postDelayed(() -> {
+            AdmobHelper.INSTANCE.showAppOpenAd(this,
+                    () -> {
+                        binding.radarview.setSearching(false);
+                        intent.putExtra("cleanstr", cleanSize);
+                        startActivity(intent);
+                        finish();
+                        return null;
+                    },
+                    () -> {
+
+                        return null;
+                    },
+                    () -> {
+                        binding.radarview.setSearching(false);
+                        intent.putExtra("cleanstr", cleanSize);
+                        startActivity(intent);
+                        finish();
+                        return null;
+                    }
+            );
+        }, 3000);
 //        handler.postDelayed(() -> {
 //            binding.radarview.setSearching(false);
 //            intent.putExtra("cleanstr", cleanSize);