...

app/src/main/AndroidManifest.xml

@@ -32,6 +32,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SmartCleaner"
         tools:targetApi="34" >
+        <activity
+            android:name=".activity.screenshot.ScreenShotAnimationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.similarphotos.RepeatPhotoAnimationActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.largefile.LargeFileAnimationActivity"
             android:exported="false" />
@@ -88,7 +94,7 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.ScreenShotActivity"
+            android:name=".activity.screenshot.ScreenShotActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -114,11 +120,11 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.ScanJunkActivity"
+            android:name=".activity.scanjunk.ScanJunkActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.CleanJunkActivity"
+            android:name=".activity.scanjunk.CleanJunkActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
@@ -141,7 +147,7 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".activity.RepeatPhotoActivity"
+            android:name=".activity.similarphotos.RepeatPhotoActivity"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity

app/src/main/java/com/test/easy/easycleanerjunk/activity/PrepareScanActivity.kt

 package com.test.easy.easycleanerjunk.activity
 
-import android.animation.ValueAnimator
 import android.content.Intent
 import android.graphics.Color
-import android.view.animation.LinearInterpolator
 import androidx.activity.OnBackPressedCallback
 import androidx.core.view.updatePadding
+import com.test.easy.easycleanerjunk.activity.scanjunk.CleanJunkActivity
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutParepreScanBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils

app/src/main/java/com/test/easy/easycleanerjunk/activity/ResultActivity.kt

@@ -6,9 +6,12 @@ import android.graphics.Color
 import androidx.activity.OnBackPressedCallback
 import androidx.core.view.updatePadding
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity
-import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoActivity
+import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
 import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
+import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity
+import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
 import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity
 import com.test.easy.easycleanerjunk.adapter.AppFunctionAdapter
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutResultBinding
@@ -38,7 +41,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
         adapter = AppFunctionAdapter {
             when (it) {
                 BATTERY_INFO -> {
-                    startActivity(Intent(this, BatteryInfoActivity::class.java))
+                    startActivity(Intent(this, BatteryInfoAnimationActivity::class.java))
                 }
 
                 JUNK_CLEANER -> {

app/src/main/java/com/test/easy/easycleanerjunk/activity/batteryinfo/BatteryInfoActivity.kt

@@ -13,6 +13,7 @@ import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.service.BatteryReceiver
 import com.test.easy.easycleanerjunk.view.AFunOb
+import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 import kotlin.random.Random
 
 class BatteryInfoActivity : BaseActivity<ActivityLayoutBatteryInfoBinding>() {
@@ -68,13 +69,11 @@ class BatteryInfoActivity : BaseActivity<ActivityLayoutBatteryInfoBinding>() {
             onBackPressedDispatcher.onBackPressed()
         }
         onBackPressedDispatcher.addCallback {
-//            AdmobUtils.showInterstitialAd(this@BatteryInfoActivity, isShowInterVal = false) {
-//                finishToMain()
-//            }
-            startActivity(Intent(this@BatteryInfoActivity, ResultActivity::class.java).apply {
-                putExtra("from", AFunOb.BATTERY_INFO)
-            })
-            finish()
+            showDialogFunctionExit(AFunOb.BATTERY_INFO) {
+                AdmobUtils.showInterstitialAd(this@BatteryInfoActivity, isShowInterVal = false) {
+                    finishToMain()
+                }
+            }
         }
         binding.idTvGotIt.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()

app/src/main/java/com/test/easy/easycleanerjunk/activity/photocompress/photo/CompressionPhotoListActivity.kt

@@ -7,6 +7,8 @@ import com.test.easy.easycleanerjunk.databinding.ActivityCompressionPhotoListBin
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
+import com.test.easy.easycleanerjunk.view.AFunOb
+import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 
 
 class CompressionPhotoListActivity : BaseActivity<ActivityCompressionPhotoListBinding>(),
@@ -31,11 +33,12 @@ class CompressionPhotoListActivity : BaseActivity<ActivityCompressionPhotoListBi
         }
         onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
+                showDialogFunctionExit(AFunOb.PHOTO_COMPRESS){
                     AdmobUtils.showInterstitialAd(this@CompressionPhotoListActivity, isShowInterVal = false) {
                         PhotoCache.getInstance().clearCache()
                         finishToMain()
                     }
-
+                }
             }
         })
         mActivity = this

app/src/main/java/com/test/easy/easycleanerjunk/activity/photocompress/photo/StartCompressionPhotoActivity.kt

@@ -26,7 +26,7 @@ class StartCompressionPhotoActivity : BaseActivity<ActivityStartCompressionPhoto
 
         onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                finishToMain()
+                Toast.makeText(this@StartCompressionPhotoActivity, "wait a moment", Toast.LENGTH_SHORT).show()
             }
         })
 

app/src/main/java/com/test/easy/easycleanerjunk/activity/CleanJunkActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/CleanJunkActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
@@ -14,6 +13,8 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.test.easy.easycleanerjunk.R
+import com.test.easy.easycleanerjunk.activity.CleaningActivity
+import com.test.easy.easycleanerjunk.activity.ResultActivity
 import com.test.easy.easycleanerjunk.bean.ChildBean
 import com.test.easy.easycleanerjunk.bean.ParentBean
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutCleanJunkBinding
@@ -25,6 +26,7 @@ import com.test.easy.easycleanerjunk.helps.MediaStoreUtils
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
 import com.test.easy.easycleanerjunk.view.AFunOb
+import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 import pokercc.android.expandablerecyclerview.ExpandableAdapter
 
 class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
@@ -80,11 +82,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
         }
         onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
-                    putExtra("from", AFunOb.JUNK_CLEANER)
-                    putExtra("clean_size", 0)
-                })
-                finish()
+                showDialogFunctionExit(AFunOb.JUNK_CLEANER) {
+                    AdmobUtils.showInterstitialAd(this@CleanJunkActivity) {
+                        finishToMain()
+                    }
+                }
             }
 
         })

app/src/main/java/com/test/easy/easycleanerjunk/activity/ScanJunkActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/scanjunk/ScanJunkActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.scanjunk
 
 import android.animation.ValueAnimator
 import android.content.Intent
-import android.view.animation.LinearInterpolator
-import androidx.activity.OnBackPressedCallback
+import android.widget.Toast
+import androidx.activity.addCallback
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutScanJunkBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
@@ -15,15 +15,14 @@ class ScanJunkActivity : BaseActivity<ActivityLayoutScanJunkBinding>() {
     }
 
     override fun initView() {
-        binding.idBackJunkScan.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                finishToMain()
+
     }
 
-        })
+    override fun initListener() {
+
+        onBackPressedDispatcher.addCallback {
+            Toast.makeText(this@ScanJunkActivity, "wait a moment", Toast.LENGTH_SHORT).show()
+        }
     }
 
     override fun onStart() {
@@ -39,6 +38,7 @@ class ScanJunkActivity : BaseActivity<ActivityLayoutScanJunkBinding>() {
         }
         isPause = false
     }
+
     override fun onDestroy() {
         super.onDestroy()
         animator1?.cancel()

app/src/main/java/com/test/easy/easycleanerjunk/activity/ScreenShotActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/screenshot/ScreenShotActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.screenshot
 
 import android.annotation.SuppressLint
 import android.content.Intent
@@ -7,6 +7,7 @@ import android.os.Handler
 import android.view.View
 import androidx.activity.addCallback
 import androidx.lifecycle.lifecycleScope
+import com.test.easy.easycleanerjunk.activity.ResultActivity
 import com.test.easy.easycleanerjunk.adapter.ScreenShotAdapter
 import com.test.easy.easycleanerjunk.bean.ScreenPhotoBean
 import com.test.easy.easycleanerjunk.bean.ScreenshotBean
@@ -18,6 +19,7 @@ import com.test.easy.easycleanerjunk.helps.PermissionHelp.checkStorePermission
 import com.test.easy.easycleanerjunk.helps.PermissionHelp.requestStorePermission
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.view.AFunOb
+import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 import com.test.easy.easycleanerjunk.view.DialogViews.showGerPermission
 import com.test.easy.easycleanerjunk.view.FileDeleteDialog.showFileDeleteDialog
 import kotlinx.coroutines.Dispatchers
@@ -44,20 +46,6 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
 
         binding.rv.adapter = screenShotAdapter
 
-        playLottie()
-    }
-
-    private fun playLottie() {
-        binding.clLottie.visibility = View.VISIBLE
-        binding.clLottie.setOnClickListener { }
-        binding.idLottie.imageAssetsFolder = "easy_imgcompress/images/"
-        binding.idLottie.setAnimation("easy_imgcompress/data.json")
-        binding.idLottie.playAnimation()
-        Handler().postDelayed({
-
-            AdmobUtils.showInterstitialAd(this) {
-                binding.clLottie.visibility = View.GONE
-
         if (checkStorePermission()) {
             initData()
         } else {
@@ -68,9 +56,7 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
                     })
                 })
         }
-            }
 
-        }, Random.nextLong(2500, 4000))
     }
 
 
@@ -101,13 +87,11 @@ class ScreenShotActivity : BaseActivity<ActivityScreenShotBinding>() {
             onBackPressedDispatcher.onBackPressed()
         }
         onBackPressedDispatcher.addCallback {
-//            AdmobUtils.showInterstitialAd(this@ScreenShotActivity, isShowInterVal = false) {
-//                finishToMain()
-//            }
-            startActivity(Intent(this@ScreenShotActivity, ResultActivity::class.java).apply {
-                putExtra("from", AFunOb.SIMILAR_PHOTOS)
-            })
-            finish()
+            showDialogFunctionExit(AFunOb.SCREENSHOT_CLEANER) {
+                AdmobUtils.showInterstitialAd(this@ScreenShotActivity) {
+                    finishToMain()
+                }
+            }
         }
 
 

app/src/main/java/com/test/easy/easycleanerjunk/activity/screenshot/ScreenShotAnimationActivity.kt

+package com.test.easy.easycleanerjunk.activity.screenshot
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.view.View
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.test.easy.easycleanerjunk.R
+import com.test.easy.easycleanerjunk.databinding.ActivityScreenShotAnimationBinding
+import com.test.easy.easycleanerjunk.helps.BaseActivity
+import com.test.easy.easycleanerjunk.helps.PermissionHelp.checkStorePermission
+import com.test.easy.easycleanerjunk.helps.PermissionHelp.requestStorePermission
+import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
+import com.test.easy.easycleanerjunk.view.DialogViews.showGerPermission
+import kotlin.random.Random
+
+class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBinding>() {
+
+
+    override val binding: ActivityScreenShotAnimationBinding by lazy {
+        ActivityScreenShotAnimationBinding.inflate(layoutInflater)
+    }
+
+    override fun initView() {
+        playLottie()
+    }
+
+    override fun initListener() {
+        super.initListener()
+
+        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                Toast.makeText(this@ScreenShotAnimationActivity, "wait a moment", Toast.LENGTH_SHORT).show()
+            }
+        })
+
+    }
+
+    private fun playLottie() {
+        binding.clLottie.visibility = View.VISIBLE
+        binding.clLottie.setOnClickListener { }
+        binding.idLottie.imageAssetsFolder = "easy_imgcompress/images/"
+        binding.idLottie.setAnimation("easy_imgcompress/data.json")
+        binding.idLottie.playAnimation()
+        Handler().postDelayed({
+
+            AdmobUtils.showInterstitialAd(this) {
+                binding.clLottie.visibility = View.GONE
+                startActivity(Intent(this@ScreenShotAnimationActivity, ScreenShotActivity::class.java))
+                finish()
+            }
+
+        }, Random.nextLong(2500, 4000))
+    }
+
+
+}
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/activity/RepeatPhotoActivity.kt → app/src/main/java/com/test/easy/easycleanerjunk/activity/similarphotos/RepeatPhotoActivity.kt

-package com.test.easy.easycleanerjunk.activity
+package com.test.easy.easycleanerjunk.activity.similarphotos
 
 import android.annotation.SuppressLint
 import android.content.Intent
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.test.easy.easycleanerjunk.R
+import com.test.easy.easycleanerjunk.activity.ResultActivity
 import com.test.easy.easycleanerjunk.bean.ImageDataBean
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutRepeatPhotoBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
@@ -24,6 +25,7 @@ import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
 import com.test.easy.easycleanerjunk.utils.NewFileUtils
 import com.test.easy.easycleanerjunk.view.AFunOb
+import com.test.easy.easycleanerjunk.view.DialogViews.showDialogFunctionExit
 import com.test.easy.easycleanerjunk.view.FileDeleteDialog.showFileDeleteDialog
 
 class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
@@ -49,13 +51,11 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
         }
         onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-//                AdmobUtils.showInterstitialAd(this@RepeatPhotoActivity, isShowInterVal = false) {
-//                    finishToMain()
-//                }
-                startActivity(Intent(this@RepeatPhotoActivity, ResultActivity::class.java).apply {
-                    putExtra("from", AFunOb.SIMILAR_PHOTOS)
-                })
-                finish()
+                showDialogFunctionExit(AFunOb.SIMILAR_PHOTOS) {
+                    AdmobUtils.showInterstitialAd(this@RepeatPhotoActivity) {
+                        finishToMain()
+                    }
+                }
             }
         })
 
@@ -97,13 +97,9 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
         if (isGranted) {
             isplay += 1
             if (isplay == 1) {
-                binding.idLlScanning.isVisible = true
-                binding.idLlScanning.setOnClickListener { }
-
+                binding.progressBar.isVisible = true
                 FileHelps.getImageFiles {
-                    AdmobUtils.showInterstitialAd(this) {
-                        binding.lottie.cancelAnimation()
-                        binding.idLlScanning.isVisible = false
+                    binding.progressBar.isVisible = false
                     binding.idLlResult.isVisible = true
                     fileList = FileHelps.similarImageList
                     binding.idTvNoData.isVisible = fileList.size == 0
@@ -113,7 +109,6 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
                     binding.idRlList.layoutManager = GridLayoutManager(this, 3)
                     binding.idRlList.adapter = mAdapter
                 }
-                }
                 AdmobUtils.showNativeAd(this, binding.flAd)
             }
 

app/src/main/java/com/test/easy/easycleanerjunk/activity/similarphotos/RepeatPhotoAnimationActivity.kt

+package com.test.easy.easycleanerjunk.activity.similarphotos
+
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.addCallback
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.test.easy.easycleanerjunk.R
+import com.test.easy.easycleanerjunk.databinding.ActivityRepeatPhotoAnimationBinding
+import com.test.easy.easycleanerjunk.helps.BaseActivity
+import kotlin.random.Random
+
+class RepeatPhotoAnimationActivity : BaseActivity<ActivityRepeatPhotoAnimationBinding>() {
+
+    override val binding: ActivityRepeatPhotoAnimationBinding by lazy {
+        ActivityRepeatPhotoAnimationBinding.inflate(layoutInflater)
+    }
+
+
+    override fun initView() {
+        binding.root.postDelayed({
+            binding.lottie.cancelAnimation()
+            startActivity(Intent(this@RepeatPhotoAnimationActivity, RepeatPhotoActivity::class.java))
+            finish()
+        }, Random.nextLong(2500, 4000))
+    }
+
+    override fun initListener() {
+        onBackPressedDispatcher.addCallback {
+            Toast.makeText(this@RepeatPhotoAnimationActivity, "wait a moment", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+}
\ No newline at end of file

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/SplashJumpUtils.kt

@@ -7,13 +7,16 @@ import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoActivity
 import com.test.easy.easycleanerjunk.activity.CleanGuestActivity
 import com.test.easy.easycleanerjunk.activity.DeviceScanActivity
 import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
-import com.test.easy.easycleanerjunk.activity.RepeatPhotoActivity
-import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
-import com.test.easy.easycleanerjunk.activity.ScreenShotActivity
+import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
+import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
 import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
+import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
 import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
+import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotAnimationActivity
+import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
 import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_APP_MANAGER
 import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_BATTERY
 import com.test.easy.easycleanerjunk.bean.ConfigBean.Companion.ID_JUNK_CLEAN_PUSH
@@ -54,15 +57,15 @@ object SplashJumpUtils {
             }
 
             ID_SIMILAR_IMAGE -> {
-                context.startActivity(Intent(context, RepeatPhotoActivity::class.java))
+                context.startActivity(Intent(context, RepeatPhotoAnimationActivity::class.java))
             }
 
             ID_SCREENSHOT_CLEAN -> {
-                context.startActivity(Intent(context, ScreenShotActivity::class.java))
+                context.startActivity(Intent(context, ScreenShotAnimationActivity::class.java))
             }
 
             ID_BATTERY -> {
-                context.startActivity(Intent(context, BatteryInfoActivity::class.java))
+                context.startActivity(Intent(context, BatteryInfoAnimationActivity::class.java))
             }
 
             ID_WHATSAPP -> {

app/src/main/java/com/test/easy/easycleanerjunk/fragment/HomeFragment.kt

@@ -6,15 +6,14 @@ import android.content.Intent
 import android.view.animation.LinearInterpolator
 import android.widget.ScrollView
 import androidx.core.view.updatePadding
-import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
-import com.test.easy.easycleanerjunk.activity.RepeatPhotoActivity
-import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
-import com.test.easy.easycleanerjunk.activity.ScreenShotActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
+import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
 import com.test.easy.easycleanerjunk.activity.SettingActivity
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerAnimationActivity
 import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.largefile.LargeFileAnimationActivity
 import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
+import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoAnimationActivity
 import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerAnimationActivity
 import com.test.easy.easycleanerjunk.databinding.FragmentLayoutHomeBinding
 import com.test.easy.easycleanerjunk.helps.BaseFragment
@@ -84,7 +83,7 @@ class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
         }
 
         binding.idSimilarPhotos.setOnClickListener {
-            startActivity(Intent(requireContext(), RepeatPhotoActivity::class.java))
+            startActivity(Intent(requireContext(), RepeatPhotoAnimationActivity::class.java))
         }
         binding.ivSetting.setOnClickListener {
             startActivity(Intent(requireContext(), SettingActivity::class.java))

app/src/main/java/com/test/easy/easycleanerjunk/fragment/ToolsFragment.kt

@@ -4,9 +4,9 @@ import android.content.Intent
 import com.test.easy.easycleanerjunk.activity.appmanager.AppManagerActivity
 import com.test.easy.easycleanerjunk.activity.batteryinfo.BatteryInfoActivity
 import com.test.easy.easycleanerjunk.activity.largefile.LargeFileCleanActivity
-import com.test.easy.easycleanerjunk.activity.RepeatPhotoActivity
-import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
-import com.test.easy.easycleanerjunk.activity.ScreenShotActivity
+import com.test.easy.easycleanerjunk.activity.similarphotos.RepeatPhotoActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
+import com.test.easy.easycleanerjunk.activity.screenshot.ScreenShotActivity
 import com.test.easy.easycleanerjunk.activity.whatsapp.WhatsAppCleanerActivity
 import com.test.easy.easycleanerjunk.activity.photocompress.photo.StartCompressionPhotoActivity
 import com.test.easy.easycleanerjunk.adapter.ToolsAdapter

app/src/main/java/com/test/easy/easycleanerjunk/view/PopExitWindow.kt

@@ -7,7 +7,7 @@ import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.core.view.updatePadding
-import com.test.easy.easycleanerjunk.activity.ScanJunkActivity
+import com.test.easy.easycleanerjunk.activity.scanjunk.ScanJunkActivity
 import com.test.easy.easycleanerjunk.databinding.LayoutExitWlBinding
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils

app/src/main/res/layout/activity_layout_parepre_scan.xml

@@ -29,7 +29,8 @@
             android:text="Clean Junk"
             android:textColor="#333333"
             android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 
@@ -56,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="150dp"
+            android:layout_marginBottom="295dp"
             android:text="Wait a moment..."
             android:textColor="#666666"
             android:textSize="16sp"

app/src/main/res/layout/activity_layout_repeat_photo.xml

@@ -6,45 +6,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/id_ll_scanning"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
-            android:id="@+id/lottie"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.3"
-            app:lottie_autoPlay="true"
-            app:lottie_loop="true"
-            app:lottie_rawRes="@raw/big_file_scan" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="295dp"
-            android:gravity="center_horizontal|bottom"
-            android:text="Please wait..."
-            android:textColor="#333333"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="HardcodedText" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/id_ll_result"
@@ -152,6 +113,17 @@
             app:bl_unEnabled_solid_color="#BFBFBF"
             app:bl_unEnabled_textColor="@color/white"
             tools:ignore="HardcodedText" />
+
     </androidx.appcompat.widget.LinearLayoutCompat>
 
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/activity_layout_scan_junk.xml

@@ -13,14 +13,6 @@
         android:layout_marginTop="12dp"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/id_back_junk_scan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20dp"
-            android:src="@mipmap/fanhui"
-            android:tint="@color/black" />
-
         <TextView
             android:id="@+id/id_tv_title_back"
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_repeat_photo_animation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.similarphotos.RepeatPhotoAnimationActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/id_ll_scanning"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
+            android:id="@+id/lottie"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.3"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/big_file_scan" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="295dp"
+            android:gravity="center_horizontal|bottom"
+            android:text="Please wait..."
+            android:textColor="#333333"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="HardcodedText" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/activity_scan_junk_animation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.scanjunk.ScanJunkAnimationActivity">
+
+
+    <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
+        android:id="@+id/id_junk_scan"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:adjustViewBounds="true"
+        app:layout_constraintBottom_toTopOf="@id/tv"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="true" />
+
+    <TextView
+        android:id="@+id/tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="295dp"
+        android:text="Wait a moment..."
+        android:textColor="#333333"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="HardcodedText" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/activity_screen_shot.xml

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.ScreenShotActivity">
+    tools:context=".activity.screenshot.ScreenShotActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -175,38 +175,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_lottie"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#4772ff">
-
-        <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
-            android:id="@+id/id_lottie"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.3"
-            app:lottie_autoPlay="true"
-            app:lottie_loop="true" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="295dp"
-            android:gravity="center"
-            android:text="Wait a moment please."
-            android:textColor="@color/white"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="HardcodedText" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </FrameLayout>
\ No newline at end of file

app/src/main/res/layout/activity_screen_shot_animation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.screenshot.ScreenShotAnimationActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_lottie"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#4772ff">
+
+        <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
+            android:id="@+id/id_lottie"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.3"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="295dp"
+            android:gravity="center"
+            android:text="Wait a moment please."
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="HardcodedText" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file