Commit 5cb3c820 authored by wanglei's avatar wanglei

...

parent 5e915ed4
...@@ -10,6 +10,7 @@ import android.widget.Toast ...@@ -10,6 +10,7 @@ import android.widget.Toast
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
...@@ -23,6 +24,8 @@ import com.test.easy.easycleanerjunk.helps.MediaStoreUtils ...@@ -23,6 +24,8 @@ import com.test.easy.easycleanerjunk.helps.MediaStoreUtils
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.utils.BarUtils import com.test.easy.easycleanerjunk.utils.BarUtils
import com.test.easy.easycleanerjunk.utils.NewFileUtils import com.test.easy.easycleanerjunk.utils.NewFileUtils
import kotlinx.coroutines.launch
import kotlin.random.Random
class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() { class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
private var isSelectAll = false private var isSelectAll = false
...@@ -94,17 +97,22 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() { ...@@ -94,17 +97,22 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeatPhotoBinding>() {
if (isGranted) { if (isGranted) {
isplay += 1 isplay += 1
if (isplay == 1) { if (isplay == 1) {
binding.idLlScanning.isVisible = true
binding.idLlScanning.setOnClickListener { }
FileHelps.getImageFiles { FileHelps.getImageFiles {
AdmobUtils.showInterstitialAd(this) AdmobUtils.showInterstitialAd(this){
binding.idLlScaning.isVisible = false binding.lottie.cancelAnimation()
binding.idLlResult.isVisible = true binding.idLlScanning.isVisible = false
fileList = FileHelps.similarImageList binding.idLlResult.isVisible = true
binding.idTvNoData.isVisible = fileList.size == 0 fileList = FileHelps.similarImageList
binding.idTvDelete.isVisible = fileList.size > 0 binding.idTvNoData.isVisible = fileList.size == 0
binding.idTvAll.isVisible = fileList.size > 0 binding.idTvDelete.isVisible = fileList.size > 0
binding.idImgSelect.isVisible = fileList.size > 0 binding.idTvAll.isVisible = fileList.size > 0
binding.idRlList.layoutManager = GridLayoutManager(this, 3) binding.idImgSelect.isVisible = fileList.size > 0
binding.idRlList.adapter = mAdapter binding.idRlList.layoutManager = GridLayoutManager(this, 3)
binding.idRlList.adapter = mAdapter
}
} }
AdmobUtils.showNativeAd(this, binding.flAd) AdmobUtils.showNativeAd(this, binding.flAd)
} }
......
...@@ -89,29 +89,25 @@ ...@@ -89,29 +89,25 @@
android:background="@color/white" android:background="@color/white"
android:visibility="gone"> android:visibility="gone">
<LinearLayout
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie"
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"
android:orientation="vertical" android:adjustViewBounds="true"
tools:ignore="UselessParent"> app:lottie_autoPlay="true"
app:lottie_loop="true" />
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView <TextView
android:id="@+id/lottie" android:textSize="16sp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:layout_gravity="center_horizontal|bottom"
app:lottie_autoPlay="true" android:layout_marginBottom="295dp"
app:lottie_loop="true" /> android:text="Wait a moment..."
android:textColor="#333333"
<TextView tools:ignore="HardcodedText" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:text="Wait a moment..."
tools:ignore="HardcodedText" />
</LinearLayout>
</FrameLayout> </FrameLayout>
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<androidx.constraintlayout.widget.ConstraintLayout <FrameLayout
android:id="@+id/id_cons_one" android:id="@+id/id_cons_one"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -244,11 +244,8 @@ ...@@ -244,11 +244,8 @@
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/id_battery_lottie" android:id="@+id/id_battery_lottie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/id_scanning" android:layout_gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" /> app:lottie_loop="true" />
...@@ -256,44 +253,13 @@ ...@@ -256,44 +253,13 @@
android:id="@+id/id_scanning" android:id="@+id/id_scanning"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="19dp" android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="295dp"
android:text="Wait a moment..." android:text="Wait a moment..."
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/id_scan"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<androidx.appcompat.widget.LinearLayoutCompat </FrameLayout>
android:id="@+id/id_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginBottom="140dp"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent">
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_marginHorizontal="2dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.35" app:layout_constraintVertical_bias="0.3"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
app:lottie_rawRes="@raw/new_lottie_large_file" /> app:lottie_rawRes="@raw/new_lottie_large_file" />
...@@ -261,18 +261,16 @@ ...@@ -261,18 +261,16 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp" android:layout_marginBottom="295dp"
android:gravity="center" android:gravity="center"
android:text="Wait a moment..." android:text="Wait a moment..."
android:textColor="@color/black" android:textColor="#333333"
android:textSize="19sp" android:textSize="16sp"
android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/lottie"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -6,30 +6,27 @@ ...@@ -6,30 +6,27 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/id_ll_scaning" android:id="@+id/id_ll_scanning"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/lottie"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp" android:layout_gravity="center"
app:lottie_autoPlay="true" app:layout_constraintBottom_toBottomOf="parent"
app:lottie_loop="true" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
<ProgressBar app:layout_constraintTop_toTopOf="parent"
android:layout_width="80dp" app:layout_constraintVertical_bias="0.3"
android:layout_height="80dp"
android:visibility="gone" />
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
app:lottie_rawRes="@raw/big_file_scan" /> app:lottie_rawRes="@raw/big_file_scan" />
...@@ -37,21 +34,23 @@ ...@@ -37,21 +34,23 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginBottom="295dp"
android:gravity="center" android:gravity="center_horizontal|bottom"
android:text="Please wait..." android:text="Please wait..."
android:textColor="#333333" android:textColor="#333333"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/id_ll_result" android:id="@+id/id_ll_result"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
......
...@@ -37,34 +37,29 @@ ...@@ -37,34 +37,29 @@
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:id="@+id/id_junk_scan" android:id="@+id/id_junk_scan"
android:layout_width="match_parent" android:layout_width="300dp"
android:layout_height="0dp" android:layout_height="300dp"
android:layout_marginHorizontal="36dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
app:layout_constraintBottom_toTopOf="@+id/id_bottomt_content" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/id_top_rl" 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_autoPlay="true"
app:lottie_loop="true" /> app:lottie_loop="true" />
<androidx.appcompat.widget.LinearLayoutCompat <TextView
android:id="@+id/id_bottomt_content" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_gravity="center_horizontal"
app:layout_constraintBottom_toBottomOf="parent"> android:layout_marginBottom="295dp"
android:text="Wait a moment..."
<TextView android:textColor="#333333"
android:layout_width="wrap_content" android:textSize="16sp"
android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent"
android:layout_gravity="center_horizontal" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="150dp" app:layout_constraintStart_toStartOf="parent"
android:text="Wait a moment..." tools:ignore="HardcodedText" />
android:textColor="#666666"
android:textSize="16sp"
tools:ignore="HardcodedText" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -64,8 +64,7 @@ ...@@ -64,8 +64,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3"> app:layout_constraintVertical_bias="0.3"></FrameLayout>
</FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_size" android:id="@+id/ll_size"
...@@ -190,25 +189,23 @@ ...@@ -190,25 +189,23 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" /> app:lottie_loop="true" />
<TextView <TextView
android:id="@+id/id_scaning"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="100dp" android:layout_marginBottom="295dp"
android:gravity="center" android:gravity="center"
android:text="Wait a moment please." android:text="Wait a moment please."
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#4772ff"> android:background="#4772ff">
...@@ -13,60 +14,22 @@ ...@@ -13,60 +14,22 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" /> app:lottie_loop="true" />
<TextView
android:id="@+id/id_scaning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:text="Scanning"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/id_scan"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/id_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:gravity="center"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toTopOf="@+id/id_tv_b_1">
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_marginHorizontal="2dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
<com.noober.background.view.BLView
android:layout_width="4dp"
android:layout_height="4dp"
app:bl_shape="oval"
app:bl_solid_color="@color/white" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView <TextView
android:id="@+id/id_tv_b_1" android:id="@+id/id_tv_b_1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="140dp" android:layout_marginBottom="295dp"
android:text="Wait a moment please" android:text="Wait a moment please."
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -121,39 +121,41 @@ ...@@ -121,39 +121,41 @@
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<FrameLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fl_lottie" android:id="@+id/fl_lottie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/white"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <com.test.easy.easycleanerjunk.view.XmlLottieAnimationView
android:layout_width="match_parent" android:id="@+id/lottie"
android:layout_height="wrap_content" android:layout_width="300dp"
android:layout_height="300dp"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="vertical" android:adjustViewBounds="true"
tools:ignore="UselessParent"> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
<com.test.easy.easycleanerjunk.view.XmlLottieAnimationView app:layout_constraintStart_toStartOf="parent"
android:id="@+id/lottie" app:layout_constraintTop_toTopOf="parent"
android:layout_width="wrap_content" app:layout_constraintVertical_bias="0.3"
android:layout_height="wrap_content" app:lottie_autoPlay="true"
android:layout_gravity="center_horizontal" app:lottie_loop="true" />
android:layout_marginHorizontal="36dp"
android:adjustViewBounds="true" <TextView
app:lottie_autoPlay="true" android:layout_width="wrap_content"
app:lottie_loop="true" /> android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
<TextView android:layout_marginBottom="295dp"
android:layout_width="wrap_content" android:text="Wait a moment..."
android:layout_height="wrap_content" android:textColor="#333333"
android:layout_gravity="center_horizontal" android:textSize="16sp"
android:text="Wait a moment..." app:layout_constraintBottom_toBottomOf="parent"
tools:ignore="HardcodedText" /> app:layout_constraintEnd_toEndOf="parent"
</LinearLayout> app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
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