Merge branch 'free-master' of gitlab.huolea.com:koko/easy-junk-cleaner-6-18 into free-master

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import com.test.easy.easycleanerjunk.activity.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.photocompress.photo.StartCompressionPhotoActivity
 import com.test.easy.easycleanerjunk.adapter.ToolsAdapter
 import com.test.easy.easycleanerjunk.databinding.FragmentLayoutTools1Binding
@@ -11,6 +12,7 @@ import com.test.easy.easycleanerjunk.helps.BaseFragment
 import com.test.easy.easycleanerjunk.view.AFunOb
 import com.test.easy.easycleanerjunk.view.AFunOb.LARGE_FILE_CLEANER
 import com.test.easy.easycleanerjunk.view.AFunOb.PHOTO_COMPRESS
+import com.test.easy.easycleanerjunk.view.AFunOb.SCREENSHOT_CLEANER
 import com.test.easy.easycleanerjunk.view.AFunOb.SIMILAR_PHOTOS
 
 class ToolsFragment : BaseFragment<FragmentLayoutTools1Binding>() {
@@ -27,14 +29,10 @@ class ToolsFragment : BaseFragment<FragmentLayoutTools1Binding>() {
                     startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
                 }
 
-
-
                 LARGE_FILE_CLEANER -> {
                     startActivity(Intent(requireContext(), LargeFileCleanActivity::class.java))
                 }
 
-
-
                 SIMILAR_PHOTOS -> {
                     startActivity(Intent(requireContext(), RepeatPhotoActivity::class.java))
                 }
@@ -42,6 +40,10 @@ class ToolsFragment : BaseFragment<FragmentLayoutTools1Binding>() {
                 PHOTO_COMPRESS -> {
                     startActivity(Intent(requireActivity(), StartCompressionPhotoActivity::class.java))
                 }
+
+                SCREENSHOT_CLEANER -> {
+                    startActivity(Intent(requireActivity(), ScreenShotActivity::class.java))
+                }
             }
         }
         binding.rvTools.adapter = adapter

app/src/main/res/layout/activity_layout_parepre_scan.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:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -51,89 +52,15 @@
         app:layout_constraintBottom_toBottomOf="parent">
 
         <TextView
+            android:layout_marginBottom="150dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="Scanning..."
+            android:text="Wait a moment..."
             android:textColor="#666666"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:ignore="HardcodedText" />
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
-            android:layout_marginBottom="75dp"
-            android:gravity="center_horizontal">
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/id_view1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/cjxuanzhuan" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@mipmap/cleantu1" />
-            </FrameLayout>
-
-            <View
-                android:layout_width="39dp"
-                android:layout_height="1dp"
-                android:layout_gravity="center"
-                android:layout_marginHorizontal="20dp"
-                android:background="#DCDCDC" />
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/id_view2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/cjxuanzhuan" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@mipmap/cleantu2" />
-            </FrameLayout>
-
-            <View
-                android:layout_width="39dp"
-                android:layout_height="1dp"
-                android:layout_gravity="center"
-                android:layout_marginHorizontal="20dp"
-                android:background="#DCDCDC" />
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/id_view3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/cjxuanzhuan" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@mipmap/cleantu3" />
-            </FrameLayout>
-
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.appcompat.widget.LinearLayoutCompat>