Commit 65bdb3c4 authored by wanglei's avatar wanglei

...

parent 4f47e325
...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint ...@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Environment import android.os.Environment
import android.view.View
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
...@@ -25,6 +26,7 @@ import com.base.filerecoveryrecyclebin.utils.BarUtils ...@@ -25,6 +26,7 @@ import com.base.filerecoveryrecyclebin.utils.BarUtils
import com.base.filerecoveryrecyclebin.utils.MediaStoreUtils import com.base.filerecoveryrecyclebin.utils.MediaStoreUtils
import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog import com.base.filerecoveryrecyclebin.view.DialogViews.showExitFunctionDialog
import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission import com.base.filerecoveryrecyclebin.view.DialogViews.showGerPermission
import com.ironsource.tr
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
...@@ -61,8 +63,14 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -61,8 +63,14 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
binding.tvSize.text = split[0] binding.tvSize.text = split[0]
binding.tvUnit.text = split[1] binding.tvUnit.text = split[1]
} }
if (scanFinish){
if (junkExpandAdapter.getAllChildItemCount() == 0) { if (junkExpandAdapter.getAllChildItemCount() == 0) {
binding.tvBtn.text = "Deep Clean" binding.tvBtn.visibility = View.GONE
binding.llTwoBtn.visibility = View.VISIBLE
} else {
binding.tvBtn.isVisible = true
binding.tvBtn.isEnabled = true
}
} }
} }
binding.exRv.adapter = junkExpandAdapter binding.exRv.adapter = junkExpandAdapter
...@@ -107,10 +115,6 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -107,10 +115,6 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
}) })
} }
"Deep Clean" -> {
startActivity(Intent(this@CleanJunkActivity, PhotoManagerAnimationActivity::class.java))
}
else -> { else -> {
startActivity( startActivity(
Intent(this, CleaningActivity::class.java).apply { Intent(this, CleaningActivity::class.java).apply {
...@@ -125,8 +129,23 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -125,8 +129,23 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
finish() finish()
} }
binding.tvGotIt2.setOnClickListener {
startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
putExtra("clean_size", JUNK_CLEANER)
putExtra("from", 0)
})
finish()
}
binding.tvDeepScan.setOnClickListener {
startActivity(Intent(this, PhotoManagerAnimationActivity::class.java).apply {
putExtra("tittle", "Deep Scan")
})
finish()
}
} }
var scanFinish: Boolean = false
private fun scanJunk() = lifecycleScope.launch(Dispatchers.Main) { private fun scanJunk() = lifecycleScope.launch(Dispatchers.Main) {
var totalSize = 0L var totalSize = 0L
...@@ -209,8 +228,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -209,8 +228,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
}.await() }.await()
junkExpandAdapter.addChildData(3, list) junkExpandAdapter.addChildData(3, list)
binding.tvBtn.isVisible = true scanFinish = true
binding.tvBtn.isEnabled = true
} }
......
...@@ -35,8 +35,9 @@ class PhotoManagerActivity : BaseActivity<ActivityPhotoManagerBinding>() { ...@@ -35,8 +35,9 @@ class PhotoManagerActivity : BaseActivity<ActivityPhotoManagerBinding>() {
BarUtils.setStatusBarColor(this, Color.WHITE) BarUtils.setStatusBarColor(this, Color.WHITE)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
val tittle = intent.extras?.getString("tittle")
tittle?.let { binding.tvTittle.text = it }
if (checkStorePermission()) { if (checkStorePermission()) {
initDataSize() initDataSize()
} else { } else {
showGerPermission(desc = "This feature requires access to your storage to scan your files and clean up screenshots. We will not transmit your data to any third-party service. Please grant permission so that we can provide you with better service.", showGerPermission(desc = "This feature requires access to your storage to scan your files and clean up screenshots. We will not transmit your data to any third-party service. Please grant permission so that we can provide you with better service.",
......
...@@ -32,8 +32,12 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi ...@@ -32,8 +32,12 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
binding.lottieCompleted.visibility = View.VISIBLE binding.lottieCompleted.visibility = View.VISIBLE
binding.lottieCompleted.playAnimation() binding.lottieCompleted.playAnimation()
delay(1500) delay(1500)
val tittle = this@PhotoManagerAnimationActivity.intent?.extras?.getString("tittle")
AdmobMaxHelper.admobMaxShowInterstitialAd(this@PhotoManagerAnimationActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@PhotoManagerAnimationActivity) {
startActivity(Intent(this@PhotoManagerAnimationActivity, PhotoManagerActivity::class.java)) startActivity(Intent(this@PhotoManagerAnimationActivity, PhotoManagerActivity::class.java).apply {
tittle?.let { putExtra("tittle", it) }
})
finish() finish()
} }
} }
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="22dp"/>
<solid android:color="#EEEEEE"/>
</shape>
\ No newline at end of file
...@@ -137,6 +137,11 @@ ...@@ -137,6 +137,11 @@
android:visibility="visible" android:visibility="visible"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/tv_btn" android:id="@+id/tv_btn"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -153,6 +158,45 @@ ...@@ -153,6 +158,45 @@
android:visibility="gone" android:visibility="gone"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<LinearLayout
android:id="@+id/ll_two_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="20dp"
android:visibility="gone">
<TextView
android:id="@+id/tv_got_it_2"
android:layout_width="165dp"
android:layout_height="45dp"
android:background="@drawable/bg_eeeeee_22"
android:gravity="center"
android:text="Got it"
android:textColor="@color/black"
android:textSize="17sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/tv_deep_scan"
android:layout_width="165dp"
android:layout_height="45dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_577dfd_22"
android:gravity="center"
android:text="Deep Scan"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
</LinearLayout>
</FrameLayout>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</FrameLayout> </FrameLayout>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<TextView <TextView
android:id="@+id/tv_tittle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment