Merge remote-tracking branch 'origin/master'

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

@@ -14,7 +14,6 @@ import androidx.core.view.updatePadding
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.base.scanqrclear.R
 import com.base.scanqrclear.base.BaseFragment
@@ -101,8 +100,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
             }
         }
         binding.rvFunction.adapter = functionAdapter
-        binding.rvFunction.layoutManager =
-            GridLayoutManager(requireContext(), 3, GridLayoutManager.VERTICAL, false)
+//        binding.rvFunction.layoutManager =
+//            GridLayoutManager(requireContext(), 3, GridLayoutManager.VERTICAL, false)
 
         val functionMoreAdapter = FunctionMoreAdapter(getMoreData())
         functionMoreAdapter.callback = object : BaseAdapter.OnClickCallback<FunctionBean> {
@@ -158,8 +157,13 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
             val totalLength = emptyLength + filesLength
             val totalSize = Utils.getSize(totalLength)
             withContext(Dispatchers.Main) {
-                val sp= SpannableString("$totalSize\n${getString(R.string.junk_files)}")
-                sp.setSpan(AbsoluteSizeSpan(16,true),sp.indexOf("\n"),sp.length,SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE)
+                val sp = SpannableString("$totalSize\n${getString(R.string.junk_files)}")
+                sp.setSpan(
+                    AbsoluteSizeSpan(16, true),
+                    sp.indexOf("\n"),
+                    sp.length,
+                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
                 binding.tvJunkFiles.text = sp
             }
         }

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

@@ -11,11 +11,11 @@
         android:id="@+id/tv_app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="13dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginVertical="10dp"
+        android:layout_marginStart="16dp"
         android:text="@string/files_manager"
         android:textColor="@color/white"
-        android:textSize="20sp"
+        android:textSize="19sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -175,7 +175,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/junk_files"
                 android:gravity="center"
-                android:textColor="@color/white"
+                android:textColor="@color/mbridge_cpb_red"
                 android:textSize="20sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="@id/iv_shan"
@@ -216,6 +216,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="28dp"
+                app:spanCount="3"
+                app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+                tools:itemCount="4"
+                tools:listitem="@layout/item_function_2"
                 android:nestedScrollingEnabled="false"
                 android:paddingVertical="10dp"
                 app:layout_constraintTop_toBottomOf="@id/iv_upward" />
@@ -254,6 +258,8 @@
                     android:layout_height="wrap_content"
                     android:nestedScrollingEnabled="false"
                     android:layout_marginTop="14dp"
+                    tools:itemCount="1"
+                    tools:listitem="@layout/item_function_more"
                     android:background="@drawable/white_background_top"
                     android:paddingBottom="9dp"
                     app:layout_constraintTop_toBottomOf="@id/tv_hot_tools" />

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

@@ -42,8 +42,8 @@
         android:id="@+id/view_line"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginTop="18dp"
-        android:background="@color/color_f9f9fc"
+        android:layout_marginTop="12dp"
+        android:background="#EEEEEE"
         app:layout_constraintStart_toStartOf="@id/iv_icon"
         app:layout_constraintEnd_toEndOf="@id/iv_more"
         app:layout_constraintTop_toBottomOf="@id/iv_icon" />