【调整】调整部分UI样式

app/src/main/java/com/base/scanqrclear/fcm/notification/NotificationUiUtil.kt

@@ -120,7 +120,7 @@ object NotificationUiUtil {
                 smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.clean_junk_pop))
                 val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
                 bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.clean_junk_pop))
-                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_junk_scan1)
+                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_junk_scan)
 
                 sendBean.bigRemoteViews = bigRemoteViews
                 sendBean.smallRemoteViews = smallRemoteViews
@@ -131,7 +131,7 @@ object NotificationUiUtil {
                 smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.app_process_pop))
                 val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
                 bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.app_process_pop))
-                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_app_process_1)
+                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_app_t)
 
                 sendBean.bigRemoteViews = bigRemoteViews
                 sendBean.smallRemoteViews = smallRemoteViews
@@ -142,7 +142,7 @@ object NotificationUiUtil {
                 smallRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.whatsapp_pop))
                 val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_common_large)
                 bigRemoteViews.setTextViewText(R.id.tv_content, MyApplication.appContext.getString(R.string.whatsapp_pop))
-                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_whatsapp_1)
+                bigRemoteViews.setImageViewResource(R.id.iv_image, R.mipmap.icon_whatsapp_clean_t)
 
                 sendBean.bigRemoteViews = bigRemoteViews
                 sendBean.smallRemoteViews = smallRemoteViews

app/src/main/java/com/base/scanqrclear/luma/AppProcessActivity.kt

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.base.scanqrclear.R
 import com.base.scanqrclear.databinding.ActivityAppProcessBinding
 import com.base.scanqrclear.luma.DialogHelps.showExitDialog
+import com.base.scanqrclear.luma.StatusBarHelps.immersiveStatusBar
 import com.base.scanqrclear.utils.AnimationHelps
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -30,7 +31,7 @@ class AppProcessActivity : BaseActivity2() {
         }
     }
 
-    private val binding by lazy {
+    private val binding by lazy(LazyThreadSafetyMode.NONE) {
         ActivityAppProcessBinding.inflate(layoutInflater)
     }
 
@@ -43,6 +44,7 @@ class AppProcessActivity : BaseActivity2() {
         initData()
         showAnimationAd(LottieType.APP_PROCESS) {
             AnimationHelps.progress(binding.pbProcess, end = binding.pbProcess.progress)
+            immersiveStatusBar(this, getColor(R.color.white),true)
         }
         onBackPressedDispatcher.addCallback {
             val title = getString(R.string.exit_app_process)

app/src/main/java/com/base/scanqrclear/luma/CleanJunkActivity.kt

@@ -32,7 +32,7 @@ class CleanJunkActivity : BaseActivity2() {
         }
     }
 
-    private val binding by lazy {
+    private val binding by lazy(LazyThreadSafetyMode.NONE) {
         ActivityCleanJunkBinding.inflate(layoutInflater)
     }
 

app/src/main/java/com/base/scanqrclear/luma/CleanResultActivity.kt

@@ -20,7 +20,7 @@ class CleanResultActivity : BaseActivity2() {
         }
     }
 
-    private val binding by lazy {
+    private val binding by lazy(LazyThreadSafetyMode.NONE) {
         ActivityCleanResultBinding.inflate(layoutInflater)
     }
 
@@ -57,15 +57,15 @@ class CleanResultActivity : BaseActivity2() {
 
     private fun getData(): List<FunctionBean> {
         val list = mutableListOf<FunctionBean>().apply {
-            add(FunctionBean(R.mipmap.icon_junk_scan1, R.string.junk_scan, R.string.result_clean_junk, text = R.string.clean_now))
+            add(FunctionBean(R.mipmap.icon_junk_scan, R.string.junk_scan, R.string.result_clean_junk, text = R.string.clean_now))
            // add(FunctionBean(R.mipmap.icon_battery_1, R.string.battery_info, R.string.result_battery_info, text = R.string.view))
-            add(FunctionBean(R.mipmap.icon_app_process_1, R.string.app_process, R.string.result_app_processes, text = R.string.view))
+            add(FunctionBean(R.mipmap.icon_app_t, R.string.app_process, R.string.result_app_processes, text = R.string.view))
           //  add(FunctionBean(R.mipmap.icon_large_1, R.string.large_files, R.string.result_large_file, text = R.string.clean_now))
            // add(FunctionBean(R.mipmap.icon_image, R.string.image_compressor, R.string.result_photo_compression, text = R.string.compress))
             add(FunctionBean(R.mipmap.icon_screenshot_1, R.string.screenshot_clean, R.string.result_screenshot_clean, text = R.string.clean_now))
-            add(FunctionBean(R.mipmap.icon_similar_1, R.string.similar_photos, R.string.result_similar_photos, text = R.string.clean_now))
+            add(FunctionBean(R.mipmap.icon_similar, R.string.similar_photos, R.string.result_similar_photos, text = R.string.clean_now))
           //  add(FunctionBean(R.mipmap.icon_app_1, R.string.app_manager, R.string.result_app_manager, text = R.string.view))
-            add(FunctionBean(R.mipmap.icon_whatsapp_1, R.string.whatsapp_clean, R.string.result_whatsapp_clean, text = R.string.clean_now))
+            add(FunctionBean(R.mipmap.icon_whatsapp_clean_t, R.string.whatsapp_clean, R.string.result_whatsapp_clean, text = R.string.clean_now))
         }
 
         val filteredList = list.filter { getString(it.name) != titleName }

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

@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f7fafa">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/gradient_background"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.LinearLayoutCompat
@@ -32,6 +32,7 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:tint="@color/black"
                     android:src="@mipmap/icon_return_bar_nor" />
             </FrameLayout>
 
@@ -39,7 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/app_process"
-                android:textColor="@color/white"
+                android:textColor="@color/black"
                 android:textSize="20sp"
                 android:textStyle="bold"
                 app:layout_constraintTop_toTopOf="@id/fl_back"
@@ -53,7 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:text="@string/already_occupied"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -64,8 +65,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:text="58.6%"
-            android:textColor="@color/white"
+            tools:text="22%"
+            android:textColor="@color/black"
             android:textSize="32sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -103,15 +104,11 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="24dp"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:paddingTop="20dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:paddingTop="18dp"
         android:paddingBottom="14dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:background="@drawable/white_background"
         app:layout_constraintBottom_toTopOf="@id/ll_bottom"
         app:layout_constraintTop_toBottomOf="@id/cl_top">
 
@@ -138,7 +135,7 @@
                 android:id="@+id/tv_process_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="121"
+                tools:text="999"
                 android:textColor="@color/colorPrimary"
                 android:textSize="14sp"
                 android:textStyle="bold" />
@@ -154,7 +151,7 @@
                 android:id="@+id/tv_total_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="127"
+                tools:text="999"
                 android:textColor="@color/color_181b1f"
                 android:textSize="14sp"
                 android:textStyle="bold" />

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

@@ -16,24 +16,22 @@
             android:id="@+id/ll_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
             app:layout_constraintTop_toTopOf="parent">
-            <FrameLayout
+
+            <ImageView
                 android:id="@+id/fl_back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="11dp"
+                android:importantForAccessibility="no"
                 android:padding="4dp"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/icon_return_bar_nor" />
-            </FrameLayout>
+                android:src="@mipmap/icon_return_bar_nor"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
@@ -42,25 +40,27 @@
                 android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                app:layout_constraintTop_toTopOf="@id/fl_back"
                 app:layout_constraintBottom_toBottomOf="@id/fl_back"
-                app:layout_constraintStart_toEndOf="@id/fl_back" />
+                app:layout_constraintStart_toEndOf="@id/fl_back"
+                app:layout_constraintTop_toTopOf="@id/fl_back" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/ll_size"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="36dp"
+            android:layout_marginTop="27dp"
             android:gravity="center"
             android:orientation="vertical"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_title">
+
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tv_length"
                     android:layout_width="wrap_content"
@@ -88,8 +88,8 @@
                 android:textColor="@color/white"
                 android:textSize="16sp"
                 android:textStyle="bold"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/ll_size" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -106,62 +106,74 @@
             android:id="@+id/pb_progress"
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
+            android:layout_marginHorizontal="24dp"
             android:layout_height="2dp"
-            android:layout_marginTop="32dp"
-            android:progress="0"
             android:max="100"
+            android:progress="0"
             android:progressDrawable="@drawable/clean_junk_progress"
-            app:layout_constraintTop_toBottomOf="@id/ll_size" />
+            app:layout_constraintTop_toBottomOf="@id/tv_path" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_path"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/bg_ffffff_10"
+            android:backgroundTint="#29FFFFFF"
             android:ellipsize="end"
+            android:gravity="center"
             android:maxLines="1"
             android:paddingTop="6dp"
+            android:layout_marginTop="32dp"
             android:paddingBottom="6dp"
             android:text="@string/clean_tips"
             android:textColor="@color/white"
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/pb_progress" />
+            app:layout_constraintTop_toBottomOf="@id/ll_size" />
 
+        <View
+            android:layout_width="match_parent"
+            android:backgroundTint="@color/color_f7fafa"
+            android:background="@drawable/white_background_top"
+            android:layout_marginTop="9dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/pb_progress"
+            android:layout_height="10dp"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <pokercc.android.expandablerecyclerview.ExpandableRecyclerView
         android:id="@+id/expandable_files"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
         android:paddingStart="15dp"
         android:paddingEnd="15dp"
         android:scrollbars="none"
         android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/cl_top"
-        app:layout_constraintBottom_toTopOf="@id/tv_clean" />
+        app:layout_constraintBottom_toTopOf="@id/tv_clean"
+        app:layout_constraintTop_toBottomOf="@id/cl_top" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_clean"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/gradient"
+        android:gravity="center"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
-        android:gravity="center"
-        android:background="@drawable/gradient"
         android:text="@string/clean"
         android:textColor="@color/white"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <include
         android:id="@+id/animation"
-        android:visibility="gone"
-        layout="@layout/custom_animation" />
+        layout="@layout/custom_animation"
+        android:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -16,24 +16,23 @@
             android:id="@+id/ll_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
             android:gravity="center_vertical"
             android:orientation="horizontal"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
             app:layout_constraintTop_toTopOf="parent">
-            <FrameLayout
+
+            <ImageView
                 android:id="@+id/fl_back"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="11dp"
+                android:importantForAccessibility="no"
                 android:padding="4dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@mipmap/icon_return_bar_nor" />
-            </FrameLayout>
+                android:src="@mipmap/icon_return_bar_nor"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/tv_title"
@@ -43,9 +42,9 @@
                 android:textColor="@color/white"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                app:layout_constraintTop_toTopOf="@id/fl_back"
                 app:layout_constraintBottom_toBottomOf="@id/fl_back"
-                app:layout_constraintStart_toEndOf="@id/fl_back" />
+                app:layout_constraintStart_toEndOf="@id/fl_back"
+                app:layout_constraintTop_toTopOf="@id/fl_back" />
         </androidx.appcompat.widget.LinearLayoutCompat>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -57,8 +56,8 @@
             android:textColor="@color/white"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_title" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -70,8 +69,8 @@
             android:textColor="@color/white"
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_cleaned_up" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -89,10 +88,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:lottie_fileName="ok.json"
-        app:lottie_autoPlay="true"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:lottie_autoPlay="true"
+        app:lottie_fileName="ok.json" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -69,7 +69,7 @@
             android:paddingBottom="10dp"
             android:text="@string/cancel"
             android:textAlignment="center"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="18sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@id/tv_sure"

app/src/main/res/layout/fragment_home.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/cl_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -36,16 +37,17 @@
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="404dp"
-                android:scaleType="fitXY"
                 android:importantForAccessibility="no"
+                android:scaleType="fitXY"
                 android:src="@mipmap/home_bg"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="22dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="10dp"
                 android:orientation="vertical"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,10 +66,10 @@
                         android:id="@+id/tv_storage_used"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="17%"
                         android:textColor="@color/white"
                         android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:text="22%" />
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <com.base.scanqrclear.luma.MyProgressBar
@@ -79,8 +81,8 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ll_storage_used"
                     app:max="100"
-                    app:pBgColor="@color/white"
-                    app:pColor="@color/color_e75506"
+                    app:pBgColor="@color/color_e75506"
+                    app:pColor="@color/white"
                     app:progress="0"
                     app:progressDirection="0" />
 
@@ -99,7 +101,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginEnd="22dp"
+                android:layout_marginEnd="20dp"
                 android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
@@ -117,10 +119,10 @@
                         android:id="@+id/tv_memory_used"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="67%"
                         android:textColor="@color/white"
                         android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:textStyle="bold"
+                        tools:text="21%" />
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <com.base.scanqrclear.luma.MyProgressBar
@@ -132,10 +134,8 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ll_memory_used"
                     app:max="100"
-                    app:pBgColor="@color/white"
-                    app:pColor="@color/color_e75506"
-                    app:pEndColor="@color/color_ff9a0c"
-                    app:pStartColor="@color/color_ffc067"
+                    app:pBgColor="@color/color_e75506"
+                    app:pColor="@color/white"
                     app:progress="0"
                     app:progressDirection="1" />
 
@@ -214,15 +214,23 @@
                 android:id="@+id/rv_function"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="25dp"
-                android:paddingVertical="14dp"
+                android:layout_marginTop="28dp"
+                android:nestedScrollingEnabled="false"
+                android:paddingVertical="10dp"
                 app:layout_constraintTop_toBottomOf="@id/iv_upward" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@color/color_f8f8fb"
+                app:layout_constraintBottom_toTopOf="@id/cl_pet"
+                app:layout_constraintTop_toBottomOf="@id/rv_function" />
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_hot_tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
+                android:layout_marginTop="16dp"
                 android:background="@color/white"
                 app:layout_constraintTop_toBottomOf="@id/rv_function">
 
@@ -243,6 +251,7 @@
                     android:id="@+id/rv_more"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
                     android:layout_marginTop="14dp"
                     android:background="@drawable/white_background_top"
                     android:paddingBottom="9dp"
@@ -250,9 +259,10 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_pet"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
+                android:layout_marginTop="16dp"
                 android:background="@color/white"
                 app:layout_constraintTop_toBottomOf="@id/cl_hot_tools">
 
@@ -291,7 +301,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tv_day"
                     app:lottie_autoPlay="true"
-                    app:lottie_fileName="home_bottom.json"
+                    app:lottie_fileName="home_pet.json"
                     app:lottie_loop="true" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,10 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
     android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingEnd="11dp"
     android:background="@color/white">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -37,8 +38,8 @@
         android:id="@+id/tv_length"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:text="67.4MB"
+        android:layout_marginEnd="3dp"
+        tools:text="100MB"
         android:textSize="12sp"
         android:textColor="@color/color_aeb4bd"
         app:layout_constraintTop_toTopOf="parent"
@@ -49,7 +50,8 @@
         android:id="@+id/iv_select"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/icon_all_photo_off"
+        android:padding="@dimen/dp_5"
+        android:src="@mipmap/ic_check_n"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?android:selectableItemBackground"
-    android:layout_marginTop="13dp">
+    android:layout_marginTop="10dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_icon"
@@ -35,6 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
+        android:paddingBottom="5dp"
         android:layout_marginHorizontal="10dp"
         android:gravity="center"
         android:text="@string/app_name"

app/src/main/res/layout/item_group_clean_junk.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="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
-        android:paddingVertical="16dp"
-        android:paddingHorizontal="16dp"
         android:background="@drawable/white_background"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        android:paddingVertical="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="11dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@mipmap/icon_empty_junk_nor"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_name"
@@ -33,9 +34,9 @@
             android:text="@string/app_name"
             android:textColor="@color/color_181b1f"
             android:textSize="16sp"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/iv_icon" />
+            app:layout_constraintStart_toEndOf="@id/iv_icon"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_indicator"
@@ -43,30 +44,31 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:src="@mipmap/icon_down_setting"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_name" />
+            app:layout_constraintStart_toEndOf="@id/tv_name"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_length"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            tools:text="67.4MB"
-            android:textSize="12sp"
+            android:layout_marginEnd="3dp"
             android:textColor="@color/color_ff613e"
-            app:layout_constraintTop_toTopOf="parent"
+            android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_select" />
+            app:layout_constraintEnd_toStartOf="@id/iv_select"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="67.4MB" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_select"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:padding="@dimen/dp_5"
             android:src="@mipmap/ic_check_n"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file