更新ui设计。

app/src/main/java/com/all/pdfreader/pro/app/model/SortConfig.kt

@@ -43,4 +43,21 @@ data class SortConfig(
             }
         }
     }
+
+    fun applySortFavorite(documents: List<PdfDocumentEntity>): List<PdfDocumentEntity> {
+        return when (field) {
+            SortField.NAME -> when (direction) {
+                SortDirection.ASC -> documents.sortedBy { it.fileName.lowercase() }
+                SortDirection.DESC -> documents.sortedByDescending { it.fileName.lowercase() }
+            }
+            SortField.DATE -> when (direction) {
+                SortDirection.ASC -> documents.sortedBy { it.addedToFavoriteTime }
+                SortDirection.DESC -> documents.sortedByDescending { it.addedToFavoriteTime }
+            }
+            SortField.SIZE -> when (direction) {
+                SortDirection.ASC -> documents.sortedBy { it.fileSize }
+                SortDirection.DESC -> documents.sortedByDescending { it.fileSize }
+            }
+        }
+    }
 }

app/src/main/java/com/all/pdfreader/pro/app/sp/AppStore.kt

@@ -20,6 +20,10 @@ class AppStore(context: Context) {
         key = DOCUMENT_SORT_TYPE, defaultValue = SortConfig.default().toPreferenceString()
     )
 
+    var favoriteSortType: String by store.string(
+        key = DOCUMENT_FAVORITE_SORT_TYPE, defaultValue = SortConfig.default().toPreferenceString()
+    )
+
     // 是否开启护眼遮罩
     var isEyeCareMode: Boolean by store.boolean(
         key = IS_EYE_CARE_MODE, defaultValue = false
@@ -44,6 +48,7 @@ class AppStore(context: Context) {
         private const val FILE_NAME = "prp_sp_name"
         private const val PERMISSIONS_DIALOG_PROMPT = "permissions_dialog_prompt"
         private const val DOCUMENT_SORT_TYPE = "document_sort_type"
+        private const val DOCUMENT_FAVORITE_SORT_TYPE = "document_favorite_sort_type"
         private const val IS_EYE_CARE_MODE = "is_eye_care_mode"
         private const val IS_VERTICAL = "is_vertical"
         private const val IS_PAGE_FLING = "is_page_fling"

app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt

@@ -14,6 +14,8 @@ import com.all.pdfreader.pro.app.databinding.ActivityMainBinding
 import com.all.pdfreader.pro.app.model.FileActionEvent
 import com.all.pdfreader.pro.app.model.FragmentType
 import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pro.app.model.SortField
 import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.ui.dialog.PermissionDialogFragment
 import com.all.pdfreader.pro.app.ui.dialog.ProgressDialogFragment
@@ -58,7 +60,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
         setContentView(binding.root)
         setupDoubleBackExit()
         initObserve()
-        ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
+        ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(false)
             .navigationBarColor(R.color.white).init()
 
         setupFragments()
@@ -191,25 +193,43 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
             startActivity(SearchActivity.createIntent(this, PdfPickerSource.NONE))
         }
 
-        binding.sortingBtn.setClickWithAnimation {
-            SortDialogFragment(onOkClick = { it ->
-                // 通知当前fragment更新排序
-                (activeFragment as? SortableFragment)?.onSortTypeChanged(it)
-            }).show(supportFragmentManager, TAG)
-        }
         binding.multiSelectBackBtn.setOnSingleClickListener {
             exitAllMultiSelect()
         }
-        binding.multiSelectAllBtn.setOnSingleClickListener {
+        binding.multiSelectBtn.setOnClickListener {
-            homeFragment.adapter.toggleSelectAll()
+            when (activeFragment) {
-            val isAllSelected = homeFragment.adapter.isAllSelected()
+                is HomeFrag -> {
-            if (isAllSelected) {
+                    (activeFragment as HomeFrag).setupMultiSelect()
-                binding.multiSelectAllIv.setBackgroundResource(R.drawable.dr_circular_sel_on_bg) // 已全选图标
-            } else {
-                binding.multiSelectAllIv.setBackgroundResource(R.drawable.dr_circular_sel_off_bg) // 未全选图标
                 }
+
+                is RecentlyFrag -> {
+                    (activeFragment as RecentlyFrag).setupMultiSelect()
+                }
+
+                is FavoriteFrag -> {
+                    (activeFragment as FavoriteFrag).setupMultiSelect()
+                }
+            }
+        }
+        binding.multiSelectAllBtn.setOnSingleClickListener {
+            when (activeFragment) {
+                is HomeFrag -> {
+                    homeFragment.adapter.toggleSelectAll()
                     updateSelectNumber(homeFragment.adapter.getSelectedItems().size)
                 }
+
+                is RecentlyFrag -> {
+                    recentlyFragment.adapter.toggleSelectAll()
+                    updateSelectNumber(recentlyFragment.adapter.getSelectedItems().size)
+                }
+
+                is FavoriteFrag -> {
+                    favoriteFragment.adapter.toggleSelectAll()
+                    updateSelectNumber(favoriteFragment.adapter.getSelectedItems().size)
+                }
+            }
+
+        }
         binding.multiSelectDeleteBtn.setOnSingleClickListener {
             val selectedItems = homeFragment.adapter.getSelectedItems()
             if (selectedItems.isNotEmpty()) {
@@ -271,10 +291,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
         updateSelectedNav(target)
     }
 
-    interface SortableFragment {
-        fun onSortTypeChanged(sortType: String)
-    }
-
     private fun updateSelectedNav(fragment: Fragment) {
         if (fragment is ToolsFrag) {//工具界面不展示权限
             binding.pnLayout.visibility = View.GONE
@@ -283,21 +299,22 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
                 binding.pnLayout.visibility = View.VISIBLE
             }
         }
-        if (fragment is HomeFrag) {
         if (StoragePermissionHelper.hasBasicStoragePermission(this)) {
             binding.topButtonLayout.visibility = View.VISIBLE
         } else {
             binding.topButtonLayout.visibility = View.GONE
         }
-        } else {
-            binding.topButtonLayout.visibility = View.GONE
-        }
         when (fragment) {
             is HomeFrag -> {
                 binding.homeIv.setImageResource(R.drawable.icon_home_sel_on)
                 binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off)
                 binding.favoriteIv.setImageResource(R.drawable.collect)
                 binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off)
+
+                binding.homeTv.setTextColor(getColor(R.color.icon_on))
+                binding.recentlyTv.setTextColor(getColor(R.color.icon_off))
+                binding.favoriteTv.setTextColor(getColor(R.color.icon_off))
+                binding.toolsTv.setTextColor(getColor(R.color.icon_off))
             }
 
             is RecentlyFrag -> {
@@ -305,6 +322,11 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
                 binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_on)
                 binding.favoriteIv.setImageResource(R.drawable.collect)
                 binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off)
+
+                binding.homeTv.setTextColor(getColor(R.color.icon_off))
+                binding.recentlyTv.setTextColor(getColor(R.color.icon_on))
+                binding.favoriteTv.setTextColor(getColor(R.color.icon_off))
+                binding.toolsTv.setTextColor(getColor(R.color.icon_off))
             }
 
             is FavoriteFrag -> {
@@ -312,6 +334,11 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
                 binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off)
                 binding.favoriteIv.setImageResource(R.drawable.collected)
                 binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_off)
+
+                binding.homeTv.setTextColor(getColor(R.color.icon_off))
+                binding.recentlyTv.setTextColor(getColor(R.color.icon_off))
+                binding.favoriteTv.setTextColor(getColor(R.color.icon_on))
+                binding.toolsTv.setTextColor(getColor(R.color.icon_off))
             }
 
             is ToolsFrag -> {
@@ -319,6 +346,11 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
                 binding.recentlyIv.setImageResource(R.drawable.icon_recently_sel_off)
                 binding.favoriteIv.setImageResource(R.drawable.collect)
                 binding.toolsIv.setImageResource(R.drawable.icon_tools_sel_on)
+
+                binding.homeTv.setTextColor(getColor(R.color.icon_off))
+                binding.recentlyTv.setTextColor(getColor(R.color.icon_off))
+                binding.favoriteTv.setTextColor(getColor(R.color.icon_off))
+                binding.toolsTv.setTextColor(getColor(R.color.icon_on))
             }
         }
     }
@@ -403,7 +435,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
             }
         }
 
-    override fun onItemLongClicked(item: PdfDocumentEntity, type: FragmentType) {
+    override fun onItemLongClicked(type: FragmentType) {
         fragmentType = type
         updateMultiSelectUi(true, fragmentType)
         updateSelectNumber(homeFragment.adapter.getSelectedItems().size)
@@ -496,6 +528,4 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
             }
         })
     }
-
-
 }

app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt

@@ -9,6 +9,7 @@ import com.all.pdfreader.pro.app.databinding.AdapterPdfItemBinding
 import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.ui.act.MainActivity
 import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pro.app.util.FileUtils
 import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
 import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
 import com.bumptech.glide.Glide
@@ -69,7 +70,7 @@ class PdfAdapter(
             holder.binding.deleteBtn.visibility = if (showDeleteButton) View.VISIBLE else View.GONE
         }
         holder.binding.checkbox.isChecked = item.isSelected
-
+        holder.binding.fileTv.text = FileUtils.getParentFolderName(item.filePath)
         holder.binding.root.setOnClickListener {
             if (isMultiSelectMode) {
                 item.isSelected = !item.isSelected
@@ -156,4 +157,9 @@ class PdfAdapter(
     fun getIsMultiSelectMode(): Boolean {
         return isMultiSelectMode
     }
+
+    fun setIsMultiSelectMode(b: Boolean) {
+        isMultiSelectMode = b
+        notifyDataSetChanged()
+    }
 }

app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt

@@ -1,21 +1,27 @@
 package com.all.pdfreader.pro.app.ui.dialog
 
+import android.annotation.SuppressLint
+import android.media.Image
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
 import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogPermissionBinding
 import com.all.pdfreader.pro.app.databinding.DialogSortBinding
 import com.all.pdfreader.pro.app.model.SortConfig
 import com.all.pdfreader.pro.app.model.SortDirection
 import com.all.pdfreader.pro.app.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.ui.act.MainActivity.SortableFragment
+import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class SortDialogFragment(
+    private val fragment: Fragment,
     private val onOkClick: (String) -> Unit
 ) : BottomSheetDialogFragment() {
 
@@ -46,72 +52,41 @@ class SortDialogFragment(
         super.onViewCreated(view, savedInstanceState)
         val appStore = AppStore(requireActivity())
         isCancelable = false
+        when(fragment){
+            is HomeFrag->{
                 sortConfig = SortConfig.fromPreferenceString(appStore.documentSortType)
+            }
+            is FavoriteFrag->{
+                sortConfig = SortConfig.fromPreferenceString(appStore.favoriteSortType)
+            }
+        }
+        updateUi(sortConfig)
         selectedField = sortConfig.field
         selectedDirection = sortConfig.direction
 
-        setAllAlphaUnselected()
-        when (sortConfig.field) {
-            SortField.DATE -> {
-                setViewsAlpha(1f, binding.createdDateIv, binding.createdDateTv)
-                setViewsGoneIsVISIBLE(View.VISIBLE, binding.createdDateGou)
-            }
-
-            SortField.NAME -> {
-                setViewsAlpha(1f, binding.fileNameIv, binding.fileNameTv)
-                setViewsGoneIsVISIBLE(View.VISIBLE, binding.fileNameGou)
-            }
-
-            SortField.SIZE -> {
-                setViewsAlpha(1f, binding.fileSizeIv, binding.fileSizeTv)
-                setViewsGoneIsVISIBLE(View.VISIBLE, binding.fileSizeGou)
-            }
-        }
-        when (sortConfig.direction) {
-            SortDirection.ASC -> {
-                setViewsAlpha(1f, binding.ascendingIv, binding.ascendingTv)
-                setViewsGoneIsVISIBLE(View.VISIBLE, binding.ascendingGou)
-            }
-
-            SortDirection.DESC -> {
-                setViewsAlpha(1f, binding.descendingIv, binding.descendingTv)
-                setViewsGoneIsVISIBLE(View.VISIBLE, binding.descendingGou)
-            }
-        }
-
         binding.createdDateBtn.setOnClickListener {
-            setAllAlphaTop()
-            setViewsAlpha(1f, binding.createdDateIv, binding.createdDateTv)
-            setViewsGoneIsVISIBLE(View.VISIBLE, binding.createdDateGou)
             selectedField = SortField.DATE
+            updateUi(SortConfig(selectedField,selectedDirection))
         }
 
         binding.fileNameBtn.setOnClickListener {
-            setAllAlphaTop()
-            setViewsAlpha(1f, binding.fileNameIv, binding.fileNameTv)
-            setViewsGoneIsVISIBLE(View.VISIBLE, binding.fileNameGou)
             selectedField = SortField.NAME
+            updateUi(SortConfig(selectedField,selectedDirection))
         }
 
         binding.fileSizeBtn.setOnClickListener {
-            setAllAlphaTop()
-            setViewsAlpha(1f, binding.fileSizeIv, binding.fileSizeTv)
-            setViewsGoneIsVISIBLE(View.VISIBLE, binding.fileSizeGou)
             selectedField = SortField.SIZE
+            updateUi(SortConfig(selectedField,selectedDirection))
         }
 
         binding.ascendingBtn.setOnClickListener {
-            setAllAlphaBoo()
-            setViewsAlpha(1f, binding.ascendingIv, binding.ascendingTv)
-            setViewsGoneIsVISIBLE(View.VISIBLE, binding.ascendingGou)
             selectedDirection = SortDirection.ASC
+            updateUi(SortConfig(selectedField,selectedDirection))
         }
 
         binding.descendingBtn.setOnClickListener {
-            setAllAlphaBoo()
-            setViewsAlpha(1f, binding.descendingIv, binding.descendingTv)
-            setViewsGoneIsVISIBLE(View.VISIBLE, binding.descendingGou)
             selectedDirection = SortDirection.DESC
+            updateUi(SortConfig(selectedField,selectedDirection))
         }
 
         binding.cancelBtn.setOnClickListener {
@@ -121,74 +96,80 @@ class SortDialogFragment(
             val newConfig = SortConfig(
                 field = selectedField, direction = selectedDirection
             )
-            appStore.documentSortType = newConfig.toPreferenceString()
+            onOkClick(newConfig.toPreferenceString())
-            onOkClick(appStore.documentSortType)
             dismiss()
         }
     }
 
-    private fun setAllAlphaTop() {
+    private fun updateUi(config: SortConfig){
-        setViewsAlpha(
+        when (config.field) {
-            0.5f,
+            SortField.DATE -> {
-            binding.createdDateIv,
+                binding.createdDateIv.setImageResource(R.drawable.icon_created_date)
-            binding.createdDateTv,
+                binding.createdDateTv.setTextColor(requireActivity().getColor(R.color.icon_on))
-            binding.fileNameIv,
+
-            binding.fileNameTv,
+                binding.fileNameIv.setImageResource(R.drawable.icon_sort_name_off)
-            binding.fileSizeIv,
+                binding.fileNameTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            binding.fileSizeTv,
+
-        )
+                binding.fileSizeIv.setImageResource(R.drawable.icon_sort_size_off)
-        setViewsGoneIsVISIBLE(
+                binding.fileSizeTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            View.GONE,
+
-            binding.createdDateGou,
+                binding.createdDateGou.visibility = View.VISIBLE
-            binding.fileNameGou,
+                binding.fileNameGou.visibility = View.GONE
-            binding.fileSizeGou,
+                binding.fileSizeGou.visibility = View.GONE
-        )
             }
 
-    private fun setAllAlphaBoo() {
+            SortField.NAME -> {
-        setViewsAlpha(
+                binding.createdDateIv.setImageResource(R.drawable.icon_created_date_off)
-            0.5f,
+                binding.createdDateTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            binding.ascendingIv,
+
-            binding.ascendingTv,
+                binding.fileNameIv.setImageResource(R.drawable.icon_sort_name)
-            binding.descendingIv,
+                binding.fileNameTv.setTextColor(requireActivity().getColor(R.color.icon_on))
-            binding.descendingTv
+
-        )
+                binding.fileSizeIv.setImageResource(R.drawable.icon_sort_size_off)
-        setViewsGoneIsVISIBLE(
+                binding.fileSizeTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            View.GONE,
+
-            binding.ascendingGou,
+                binding.createdDateGou.visibility = View.GONE
-            binding.descendingGou
+                binding.fileNameGou.visibility = View.VISIBLE
-        )
+                binding.fileSizeGou.visibility = View.GONE
             }
 
-    private fun setAllAlphaUnselected() {
+            SortField.SIZE -> {
-        setViewsAlpha(
+                binding.createdDateIv.setImageResource(R.drawable.icon_created_date_off)
-            0.5f,
+                binding.createdDateTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            binding.createdDateIv,
+
-            binding.createdDateTv,
+                binding.fileNameIv.setImageResource(R.drawable.icon_sort_name_off)
-            binding.fileNameIv,
+                binding.fileNameTv.setTextColor(requireActivity().getColor(R.color.icon_off))
-            binding.fileNameTv,
+
-            binding.fileSizeIv,
+                binding.fileSizeIv.setImageResource(R.drawable.icon_sort_size)
-            binding.fileSizeTv,
+                binding.fileSizeTv.setTextColor(requireActivity().getColor(R.color.icon_on))
-            binding.ascendingIv,
+
-            binding.ascendingTv,
+                binding.createdDateGou.visibility = View.GONE
-            binding.descendingIv,
+                binding.fileNameGou.visibility = View.GONE
-            binding.descendingTv
+                binding.fileSizeGou.visibility = View.VISIBLE
-        )
+            }
-        setViewsGoneIsVISIBLE(
+        }
-            View.GONE,
+        when (config.direction) {
-            binding.createdDateGou,
+            SortDirection.ASC -> {
-            binding.fileNameGou,
+                binding.ascendingIv.setImageResource(R.drawable.icon_ascending)
-            binding.fileSizeGou,
+                binding.ascendingTv.setTextColor(requireActivity().getColor(R.color.icon_on))
-            binding.ascendingGou,
+
-            binding.descendingGou
+                binding.descendingIv.setImageResource(R.drawable.icon_descending_off)
-        )
+                binding.descendingTv.setTextColor(requireActivity().getColor(R.color.icon_off))
+
+                binding.ascendingGou.visibility = View.VISIBLE
+                binding.descendingGou.visibility = View.GONE
             }
 
-    private fun setViewsAlpha(alpha: Float, vararg views: View) {
+            SortDirection.DESC -> {
-        views.forEach { it.alpha = alpha }
+                binding.ascendingIv.setImageResource(R.drawable.icon_ascending_off)
-    }
+                binding.ascendingTv.setTextColor(requireActivity().getColor(R.color.icon_off))
 
-    private fun setViewsGoneIsVISIBLE(int: Int, vararg views: View) {
+                binding.descendingIv.setImageResource(R.drawable.icon_descending)
-        views.forEach { it.visibility = int }
+                binding.descendingTv.setTextColor(requireActivity().getColor(R.color.icon_on))
+
+                binding.ascendingGou.visibility = View.GONE
+                binding.descendingGou.visibility = View.VISIBLE
+            }
+        }
     }
 }

app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/FavoriteFrag.kt

@@ -9,17 +9,22 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.all.pdfreader.pro.app.R
 import com.all.pdfreader.pro.app.databinding.FragmentFavoriteBinding
 import com.all.pdfreader.pro.app.model.FragmentType
+import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pro.app.model.SortField
 import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.room.repository.PdfRepository
 import com.all.pdfreader.pro.app.ui.act.MainActivity
 import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
 import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
 import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
 import kotlinx.coroutines.launch
 
-class FavoriteFrag : BaseFrag() {
+class FavoriteFrag : BaseFrag(){
     override val TAG: String = "FavoriteFrag"
 
     companion object {
@@ -32,7 +37,7 @@ class FavoriteFrag : BaseFrag() {
     private var onItemLongClickListener: OnItemLongClickListener? = null
 
     interface OnItemLongClickListener {
-        fun onItemLongClicked(item: PdfDocumentEntity, type: FragmentType)
+        fun onItemLongClicked(type: FragmentType)
     }
 
     override fun onCreateView(
@@ -46,6 +51,14 @@ class FavoriteFrag : BaseFrag() {
         super.onViewCreated(view, savedInstanceState)
         initView()
         observeDocuments()
+        updateSortUi(appStore.favoriteSortType)
+    }
+
+    fun setupMultiSelect() {
+        onItemLongClickListener?.onItemLongClicked(FragmentType.FAVORITE)
+        updateSwipeRefreshState()
+        (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
+        adapter.setIsMultiSelectMode(true)
     }
 
     private fun initView() {
@@ -55,9 +68,7 @@ class FavoriteFrag : BaseFrag() {
         }, onMoreClick = { pdf ->
             ListMoreDialogFragment(pdf.filePath).show(parentFragmentManager, FRAG_TAG)
         }, onLongClick = { pdf ->
-            onItemLongClickListener?.onItemLongClicked(pdf, FragmentType.FAVORITE)
+            setupMultiSelect()
-            updateSwipeRefreshState()
-            (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
         }, onSelectModelItemClick = { number ->
             (requireActivity() as? MainActivity)?.updateSelectNumber(number)
         })
@@ -71,6 +82,13 @@ class FavoriteFrag : BaseFrag() {
                 binding.swipeRefreshLayout.isRefreshing = false
             }
         }
+
+        binding.sortingBtn.setOnSingleClickListener {
+            SortDialogFragment(FavoriteFrag(), onOkClick = { it ->
+                updateSortUi(it)
+                onSortFavoriteTypeChanged(it)
+            }).show(parentFragmentManager, TAG)
+        }
     }
 
     fun updateSwipeRefreshState() {
@@ -85,8 +103,9 @@ class FavoriteFrag : BaseFrag() {
     private fun observeDocuments(onComplete: () -> Unit = {}) {
         lifecycleScope.launch {
             PdfRepository.getInstance().getFavoriteDocuments().collect { list ->
-                if (list.isNotEmpty()) {
+                val sortedList = sortDocuments(list)
-                    adapter.updateData(list)
+                if (sortedList.isNotEmpty()) {
+                    adapter.updateData(sortedList)
                     onComplete()
                     binding.noFilesLayout.visibility = View.GONE
                 } else {
@@ -102,4 +121,32 @@ class FavoriteFrag : BaseFrag() {
             onItemLongClickListener = context
         }
     }
+
+    private fun onSortFavoriteTypeChanged(sortType: String) {
+        appStore.favoriteSortType = sortType
+        updateSortUi(sortType)
+        observeDocuments()
+    }
+
+    private fun sortDocuments(documents: List<PdfDocumentEntity>): List<PdfDocumentEntity> {
+        val sortConfig = SortConfig.fromPreferenceString(appStore.favoriteSortType)
+        return sortConfig.applySortFavorite(documents)
+    }
+
+    private fun updateSortUi(type: String) {
+        val config = SortConfig.fromPreferenceString(type)
+        when (config.field) {
+            SortField.NAME -> {
+                binding.sortingTv.text = getString(R.string.sort_by_name)
+            }
+
+            SortField.DATE -> {
+                binding.sortingTv.text = getString(R.string.sort_by_last_modified)
+            }
+
+            SortField.SIZE -> {
+                binding.sortingTv.text = getString(R.string.sort_by_size)
+            }
+        }
+    }
 }

app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/HomeFrag.kt

@@ -1,26 +1,29 @@
 package com.all.pdfreader.pro.app.ui.fragment
 
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.all.pdfreader.pro.app.R
 import com.all.pdfreader.pro.app.databinding.FragmentHomeBinding
 import com.all.pdfreader.pro.app.model.FragmentType
 import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pro.app.model.SortField
 import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
 import com.all.pdfreader.pro.app.room.repository.PdfRepository
 import com.all.pdfreader.pro.app.ui.act.MainActivity
 import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
 import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
 import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
 import com.all.pdfreader.pro.app.util.PdfScanner
 import kotlinx.coroutines.launch
 
-class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
+class HomeFrag : BaseFrag(){
     override val TAG: String = "HomeFrag"
 
     companion object {
@@ -32,7 +35,7 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
     private var onItemLongClickListener: OnItemLongClickListener? = null
 
     interface OnItemLongClickListener {
-        fun onItemLongClicked(item: PdfDocumentEntity, type: FragmentType)
+        fun onItemLongClicked(type: FragmentType)
     }
 
     override fun onCreateView(
@@ -46,23 +49,24 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
         super.onViewCreated(view, savedInstanceState)
         initView()
         observeDocuments()
+        updateSortUi(appStore.documentSortType)
+    }
+
+    fun setupMultiSelect() {
+        onItemLongClickListener?.onItemLongClicked(FragmentType.HOME)
+        updateSwipeRefreshState()
+        (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
+        adapter.setIsMultiSelectMode(true)
     }
 
     private fun initView() {
         adapter = PdfAdapter(pdfList = mutableListOf(), onItemClick = { pdf ->
             val intent = PdfViewActivity.createIntent(requireContext(), pdf.filePath)
             startActivity(intent)
-
-//            val intent = Intent(context, PdfTextSearchTestActivity::class.java).apply {
-//                putExtra("pdf_path", pdf.filePath)
-//            }
-//            startActivity(intent)
         }, onMoreClick = { pdf ->
             ListMoreDialogFragment(pdf.filePath).show(parentFragmentManager, FRAG_TAG)
         }, onLongClick = { pdf ->
-            onItemLongClickListener?.onItemLongClicked(pdf, FragmentType.HOME)
+            setupMultiSelect()
-            updateSwipeRefreshState()
-            (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
         }, onSelectModelItemClick = { number ->
             (requireActivity() as? MainActivity)?.updateSelectNumber(number)
         })
@@ -79,6 +83,13 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
                 }
             }
         }
+
+        binding.sortingBtn.setOnSingleClickListener {
+            SortDialogFragment(HomeFrag(), onOkClick = { it ->
+                updateSortUi(it)
+                onSortTypeChanged(it)
+            }).show(parentFragmentManager, TAG)
+        }
     }
 
     fun updateSwipeRefreshState() {
@@ -90,7 +101,9 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
         binding.swipeRefreshLayout.isEnabled = !adapter.getIsMultiSelectMode()
     }
 
-    override fun onSortTypeChanged(sortType: String) {
+    private fun onSortTypeChanged(sortType: String) {
+        appStore.documentSortType = sortType
+        updateSortUi(sortType)
         // 排序类型改变时重新加载数据
         observeDocuments()
     }
@@ -105,7 +118,6 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
                 } else {
                     binding.noFilesLayout.visibility = View.VISIBLE
                 }
-                logDebug("更新adapter数据，排序方式: ${appStore.documentSortType}")
             }
         }
     }
@@ -122,4 +134,20 @@ class HomeFrag : BaseFrag(), MainActivity.SortableFragment {
         }
     }
 
+    private fun updateSortUi(type: String) {
+        val config = SortConfig.fromPreferenceString(type)
+        when (config.field) {
+            SortField.NAME -> {
+                binding.sortingTv.text = getString(R.string.sort_by_name)
+            }
+
+            SortField.DATE -> {
+                binding.sortingTv.text = getString(R.string.sort_by_last_modified)
+            }
+
+            SortField.SIZE -> {
+                binding.sortingTv.text = getString(R.string.sort_by_size)
+            }
+        }
+    }
 }

app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt

@@ -31,7 +31,7 @@ class RecentlyFrag : BaseFrag() {
     private var onItemLongClickListener: OnItemLongClickListener? = null
 
     interface OnItemLongClickListener {
-        fun onItemLongClicked(item: PdfDocumentEntity, type: FragmentType)
+        fun onItemLongClicked(type: FragmentType)
     }
 
     override fun onCreateView(
@@ -47,6 +47,13 @@ class RecentlyFrag : BaseFrag() {
         observeDocuments()
     }
 
+    fun setupMultiSelect() {
+        onItemLongClickListener?.onItemLongClicked(FragmentType.RECENTLY)
+        updateSwipeRefreshState()
+        (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
+        adapter.setIsMultiSelectMode(true)
+    }
+
     private fun initView() {
         adapter = PdfAdapter(pdfList = mutableListOf(), onItemClick = { pdf ->
             val intent = PdfViewActivity.createIntent(requireContext(), pdf.filePath)
@@ -54,9 +61,7 @@ class RecentlyFrag : BaseFrag() {
         }, onMoreClick = { pdf ->
             ListMoreDialogFragment(pdf.filePath).show(parentFragmentManager, FRAG_TAG)
         }, onLongClick = { pdf ->
-            onItemLongClickListener?.onItemLongClicked(pdf, FragmentType.RECENTLY)
+            setupMultiSelect()
-            updateSwipeRefreshState()
-            (requireActivity() as? MainActivity)?.updateSelectNumber(adapter.getSelectedItems().size)
         }, onSelectModelItemClick = { number ->
             (requireActivity() as? MainActivity)?.updateSelectNumber(number)
         })

app/src/main/java/com/all/pdfreader/pro/app/util/FileUtils.kt

@@ -597,4 +597,8 @@ object FileUtils {
         }
     }
 
+    fun getParentFolderName(path: String): String? {
+        val file = File(path)
+        return file.parentFile?.name
+    }
 }

app/src/main/res/drawable/back_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="256dp"
+    android:height="256dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M927.9,478.1 L168.9,478.1l308.7,-308.9c11.7,-11.7 11.4,-30.9 -0.6,-42.9 -12,-12 -31.2,-12.2 -42.9,-0.5L75.2,484.9c-2,1.7 -3.8,3.6 -5.3,5.7 -4,5.4 -6,11.8 -5.9,18.3 -0.1,7.8 2.7,15.6 8.6,21.4l361.6,361.7c11.7,11.7 30.9,11.4 42.9,-0.5 12,-12 12.2,-31.2 0.6,-42.9L168.4,539.5l759.4,0c16.5,0 29.9,-13.7 29.9,-30.7S944.4,478.1 927.9,478.1z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/checkbox_selector.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 选中状态 -->
+    <item android:state_checked="true" android:drawable="@drawable/ic_checkbox_checked" />
+    <!-- 未选中状态 -->
+    <item android:drawable="@drawable/ic_checkbox_unchecked" />
+</selector>

app/src/main/res/drawable/collect.xml

@@ -4,10 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,20.88L10.55,19.55C5.4,14.9 3,12.36 3,9.5C3,7.01 5.01,5 7.5,5C8.74,5 9.91,5.5 10.7,6.35L12,7.63L13.3,6.35C14.09,5.5 15.26,5 16.5,5C18.99,5 21,7.01 21,9.5C21,12.36 18.6,14.9 13.45,19.55L12,20.88Z"
+      android:pathData="M12,23C11.878,22.99 11.759,22.956 11.65,22.9C11.2,22.7 0,17 0,8.45C0.003,6.621 0.73,4.867 2.024,3.574C3.317,2.28 5.071,1.553 6.9,1.55C7.859,1.556 8.806,1.758 9.684,2.145C10.561,2.532 11.349,3.096 12,3.8C12.644,3.087 13.431,2.518 14.31,2.13C15.189,1.742 16.139,1.545 17.1,1.55C18.929,1.553 20.683,2.28 21.976,3.574C23.27,4.867 23.997,6.621 24,8.45C24,17 12.8,22.7 12.35,22.9C12.241,22.956 12.122,22.99 12,23ZM6.9,3.1C5.482,3.103 4.123,3.667 3.12,4.67C2.117,5.673 1.553,7.032 1.55,8.45C1.55,15.25 10.15,20.35 12,21.35C13.85,20.35 22.45,15.25 22.45,8.45C22.464,7.296 22.103,6.168 21.423,5.236C20.742,4.304 19.777,3.618 18.674,3.28C17.57,2.942 16.386,2.971 15.3,3.362C14.215,3.753 13.285,4.486 12.65,5.45C12.577,5.555 12.48,5.641 12.367,5.701C12.254,5.76 12.128,5.791 12,5.791C11.872,5.791 11.746,5.76 11.633,5.701C11.52,5.641 11.423,5.555 11.35,5.45C10.859,4.722 10.196,4.127 9.42,3.717C8.643,3.307 7.778,3.095 6.9,3.1Z"
-      android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-      android:fillColor="#00000000"
-      android:strokeColor="#CCCCCC"
-      android:strokeLineCap="round"
-      android:strokeLineJoin="round"/>
 </vector>

app/src/main/res/drawable/collected.xml

@@ -4,10 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,20.88L10.55,19.55C5.4,14.9 3,12.36 3,9.5C3,7.01 5.01,5 7.5,5C8.74,5 9.91,5.5 10.7,6.35L12,7.63L13.3,6.35C14.09,5.5 15.26,5 16.5,5C18.99,5 21,7.01 21,9.5C21,12.36 18.6,14.9 13.45,19.55L12,20.88Z"
+      android:pathData="M17.11,1.6C16.149,1.592 15.197,1.789 14.318,2.177C13.439,2.565 12.652,3.135 12.01,3.85C11.359,3.146 10.571,2.582 9.694,2.195C8.816,1.808 7.869,1.606 6.91,1.6C5.08,1.603 3.325,2.33 2.03,3.623C0.735,4.916 0.005,6.67 0,8.5C0,17.05 11.21,22.75 11.66,22.95C11.769,23.006 11.888,23.04 12.01,23.05C12.129,23.042 12.245,23.007 12.35,22.95C12.81,22.75 24,17.05 24,8.5C23.997,6.673 23.271,4.921 21.98,3.627C20.688,2.334 18.937,1.605 17.11,1.6Z"
-      android:strokeWidth="1.5"
+      android:fillColor="#E43521"/>
-      android:fillColor="#E43521"
-      android:strokeColor="#E43521"
-      android:strokeLineCap="round"
-      android:strokeLineJoin="round"/>
 </vector>

app/src/main/res/drawable/dr_collect_state_bg.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners
-        android:topRightRadius="8dp"
+        android:topLeftRadius="4dp"
-        android:bottomLeftRadius="8dp" />
+        android:bottomRightRadius="4dp" />
     <solid android:color="@color/icon_sel_on_color" />
 </shape>

app/src/main/res/drawable/dr_item_img_frame.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <stroke android:color="@color/line_color"
         android:width="1dp"/>
-    <corners android:radius="8dp" />
+    <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/dr_item_lock_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="8dp"/>
+    <corners android:radius="4dp"/>
     <solid android:color="@color/placeholder_bg_color"/>
 
 </shape>

app/src/main/res/drawable/dr_placeholder_bg.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/placeholder_bg_color"/>
-    <corners android:radius="8dp" />
+    <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/dr_top_left_radius_white_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:topLeftRadius="20dp"/>
+</shape>

app/src/main/res/drawable/ic_checkbox_checked.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.3,4.8C18.418,4.8 18.535,4.823 18.644,4.869C18.754,4.914 18.853,4.98 18.936,5.064C19.02,5.147 19.086,5.246 19.132,5.356C19.177,5.465 19.2,5.582 19.2,5.7V18.3C19.2,18.539 19.105,18.768 18.936,18.936C18.768,19.105 18.539,19.2 18.3,19.2H5.7C5.461,19.2 5.232,19.105 5.064,18.936C4.895,18.768 4.8,18.539 4.8,18.3V5.7C4.8,5.461 4.895,5.232 5.064,5.064C5.232,4.895 5.461,4.8 5.7,4.8H18.3ZM18.3,3H5.7C4.984,3 4.297,3.284 3.791,3.791C3.284,4.297 3,4.984 3,5.7L3,18.3C3,19.016 3.284,19.703 3.791,20.209C4.297,20.715 4.984,21 5.7,21H18.3C19.016,21 19.703,20.715 20.209,20.209C20.715,19.703 21,19.016 21,18.3V5.7C21,4.984 20.715,4.297 20.209,3.791C19.703,3.284 19.016,3 18.3,3Z"
+      android:fillColor="#E43521"/>
+  <path
+      android:pathData="M8,7L16,7A1,1 0,0 1,17 8L17,16A1,1 0,0 1,16 17L8,17A1,1 0,0 1,7 16L7,8A1,1 0,0 1,8 7z"
+      android:fillColor="#E43521"/>
+</vector>

app/src/main/res/drawable/ic_checkbox_unchecked.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.3,4.8C18.418,4.8 18.535,4.823 18.644,4.869C18.754,4.914 18.853,4.98 18.936,5.064C19.02,5.147 19.086,5.246 19.132,5.356C19.177,5.465 19.2,5.582 19.2,5.7V18.3C19.2,18.539 19.105,18.768 18.936,18.936C18.768,19.105 18.539,19.2 18.3,19.2H5.7C5.461,19.2 5.232,19.105 5.064,18.936C4.895,18.768 4.8,18.539 4.8,18.3V5.7C4.8,5.461 4.895,5.232 5.064,5.064C5.232,4.895 5.461,4.8 5.7,4.8H18.3ZM18.3,3H5.7C4.984,3 4.297,3.284 3.791,3.791C3.284,4.297 3,4.984 3,5.7L3,18.3C3,19.016 3.284,19.703 3.791,20.209C4.297,20.715 4.984,21 5.7,21H18.3C19.016,21 19.703,20.715 20.209,20.209C20.715,19.703 21,19.016 21,18.3V5.7C21,4.984 20.715,4.297 20.209,3.791C19.703,3.284 19.016,3 18.3,3Z"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/icon_arrow_down.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M2.827,5.199C2.773,5.143 2.709,5.099 2.638,5.068C2.567,5.037 2.49,5.021 2.413,5.02C2.336,5.019 2.259,5.033 2.187,5.061C2.115,5.09 2.049,5.132 1.994,5.186C1.938,5.24 1.894,5.304 1.863,5.375C1.832,5.446 1.816,5.522 1.815,5.6C1.814,5.677 1.828,5.754 1.856,5.826C1.885,5.898 1.927,5.963 1.981,6.019L7.694,11.91C7.749,11.967 7.816,12.012 7.89,12.043C7.964,12.074 8.043,12.089 8.123,12.089C8.203,12.088 8.281,12.071 8.355,12.038C8.428,12.006 8.493,11.959 8.548,11.901L14.029,6.01C14.114,5.926 14.172,5.817 14.194,5.7C14.217,5.582 14.203,5.46 14.154,5.35C14.113,5.259 14.05,5.18 13.97,5.12C13.891,5.06 13.797,5.021 13.699,5.007C13.6,4.993 13.499,5.004 13.406,5.04C13.313,5.075 13.23,5.134 13.166,5.21L8.108,10.647L2.827,5.199V5.199Z"
+      android:fillColor="#E43521"/>
+</vector>

app/src/main/res/drawable/icon_ascending.xml

@@ -3,22 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <!-- 外圈 -->
   <path
-        android:pathData="M12,3C16.9706,3 21,7.0294 21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3Z"
+      android:pathData="M19.82,16.47C19.688,16.47 19.557,16.443 19.435,16.391C19.313,16.34 19.203,16.265 19.11,16.17L17.11,14.17L15.22,16.06C15.127,16.154 15.017,16.228 14.895,16.279C14.773,16.33 14.642,16.356 14.51,16.356C14.378,16.356 14.247,16.33 14.125,16.279C14.004,16.228 13.893,16.154 13.8,16.06C13.614,15.873 13.509,15.619 13.509,15.355C13.509,15.091 13.614,14.837 13.8,14.65L16.4,12.05C16.493,11.956 16.604,11.882 16.726,11.831C16.847,11.781 16.978,11.754 17.11,11.754C17.242,11.754 17.373,11.781 17.495,11.831C17.617,11.882 17.727,11.956 17.82,12.05L20.52,14.75C20.661,14.89 20.757,15.069 20.796,15.264C20.835,15.458 20.816,15.66 20.739,15.844C20.663,16.027 20.534,16.184 20.369,16.294C20.203,16.403 20.009,16.461 19.81,16.46L19.82,16.47Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"/>
-
-    <!-- 向上箭头 -->
   <path
-        android:pathData="M12,8L8,12H10.5V16H13.5V12H16L12,8Z"
+      android:pathData="M17.12,21.72C16.855,21.72 16.601,21.614 16.413,21.427C16.226,21.239 16.12,20.985 16.12,20.72V12.8C16.12,12.535 16.226,12.28 16.413,12.093C16.601,11.905 16.855,11.8 17.12,11.8C17.385,11.8 17.64,11.905 17.827,12.093C18.015,12.28 18.12,12.535 18.12,12.8V20.72C18.12,20.985 18.015,21.239 17.827,21.427C17.64,21.614 17.385,21.72 17.12,21.72Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
+  <path
-        android:fillColor="#00000000"
+      android:pathData="M11.66,21.72C9.663,21.713 7.712,21.121 6.046,20.019C4.381,18.916 3.074,17.351 2.287,15.515C1.5,13.679 1.267,11.654 1.617,9.687C1.967,7.721 2.884,5.9 4.256,4.448C5.627,2.996 7.393,1.977 9.337,1.516C11.28,1.056 13.316,1.173 15.193,1.855C17.07,2.536 18.707,3.752 19.903,5.352C21.098,6.952 21.799,8.867 21.92,10.86C21.936,11.125 21.846,11.386 21.67,11.585C21.493,11.784 21.245,11.904 20.98,11.92C20.715,11.936 20.454,11.846 20.256,11.67C20.057,11.493 19.936,11.245 19.92,10.98C19.823,9.376 19.258,7.835 18.296,6.547C17.334,5.26 16.016,4.282 14.505,3.734C12.994,3.186 11.355,3.092 9.792,3.463C8.228,3.835 6.807,4.655 5.703,5.824C4.6,6.993 3.863,8.459 3.582,10.042C3.301,11.624 3.49,13.254 4.124,14.731C4.758,16.208 5.81,17.468 7.151,18.354C8.492,19.24 10.063,19.715 11.67,19.72C11.935,19.72 12.19,19.826 12.377,20.013C12.565,20.201 12.67,20.455 12.67,20.72C12.67,20.985 12.565,21.24 12.377,21.427C12.19,21.615 11.935,21.72 11.67,21.72H11.66Z"
-        android:strokeLineJoin="round"
+      android:fillColor="@color/icon_on"/>
-        android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,13.05H8.17C7.905,13.05 7.65,12.944 7.463,12.757C7.275,12.569 7.17,12.315 7.17,12.05C7.17,11.785 7.275,11.53 7.463,11.343C7.65,11.155 7.905,11.05 8.17,11.05H11V8.05C11,7.785 11.105,7.53 11.293,7.343C11.48,7.155 11.735,7.05 12,7.05C12.265,7.05 12.519,7.155 12.707,7.343C12.895,7.53 13,7.785 13,8.05V12.05C13,12.315 12.895,12.569 12.707,12.757C12.519,12.944 12.265,13.05 12,13.05Z"
+      android:fillColor="@color/icon_on"/>
 </vector>

app/src/main/res/drawable/icon_ascending_off.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.82,16.47C19.688,16.47 19.557,16.443 19.435,16.391C19.313,16.34 19.203,16.265 19.11,16.17L17.11,14.17L15.22,16.06C15.127,16.154 15.017,16.228 14.895,16.279C14.773,16.33 14.642,16.356 14.51,16.356C14.378,16.356 14.247,16.33 14.125,16.279C14.004,16.228 13.893,16.154 13.8,16.06C13.614,15.873 13.509,15.619 13.509,15.355C13.509,15.091 13.614,14.837 13.8,14.65L16.4,12.05C16.493,11.956 16.604,11.882 16.726,11.831C16.847,11.781 16.978,11.754 17.11,11.754C17.242,11.754 17.373,11.781 17.495,11.831C17.617,11.882 17.727,11.956 17.82,12.05L20.52,14.75C20.661,14.89 20.757,15.069 20.796,15.264C20.835,15.458 20.816,15.66 20.739,15.844C20.663,16.027 20.534,16.184 20.369,16.294C20.203,16.403 20.009,16.461 19.81,16.46L19.82,16.47Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M17.12,21.72C16.855,21.72 16.601,21.614 16.413,21.427C16.226,21.239 16.12,20.985 16.12,20.72V12.8C16.12,12.535 16.226,12.28 16.413,12.093C16.601,11.905 16.855,11.8 17.12,11.8C17.385,11.8 17.64,11.905 17.827,12.093C18.015,12.28 18.12,12.535 18.12,12.8V20.72C18.12,20.985 18.015,21.239 17.827,21.427C17.64,21.614 17.385,21.72 17.12,21.72Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M11.66,21.72C9.663,21.713 7.712,21.121 6.046,20.019C4.381,18.916 3.074,17.351 2.287,15.515C1.5,13.679 1.267,11.654 1.617,9.687C1.967,7.721 2.884,5.9 4.256,4.448C5.627,2.996 7.393,1.977 9.337,1.516C11.28,1.056 13.316,1.173 15.193,1.855C17.07,2.536 18.707,3.752 19.903,5.352C21.098,6.952 21.799,8.867 21.92,10.86C21.936,11.125 21.846,11.386 21.67,11.585C21.493,11.784 21.245,11.904 20.98,11.92C20.715,11.936 20.454,11.846 20.256,11.67C20.057,11.493 19.936,11.245 19.92,10.98C19.823,9.376 19.258,7.835 18.296,6.547C17.334,5.26 16.016,4.282 14.505,3.734C12.994,3.186 11.355,3.092 9.792,3.463C8.228,3.835 6.807,4.655 5.703,5.824C4.6,6.993 3.863,8.459 3.582,10.042C3.301,11.624 3.49,13.254 4.124,14.731C4.758,16.208 5.81,17.468 7.151,18.354C8.492,19.24 10.063,19.715 11.67,19.72C11.935,19.72 12.19,19.826 12.377,20.013C12.565,20.201 12.67,20.455 12.67,20.72C12.67,20.985 12.565,21.24 12.377,21.427C12.19,21.615 11.935,21.72 11.67,21.72H11.66Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M12,13.05H8.17C7.905,13.05 7.65,12.944 7.463,12.757C7.275,12.569 7.17,12.315 7.17,12.05C7.17,11.785 7.275,11.53 7.463,11.343C7.65,11.155 7.905,11.05 8.17,11.05H11V8.05C11,7.785 11.105,7.53 11.293,7.343C11.48,7.155 11.735,7.05 12,7.05C12.265,7.05 12.519,7.155 12.707,7.343C12.895,7.53 13,7.785 13,8.05V12.05C13,12.315 12.895,12.569 12.707,12.757C12.519,12.944 12.265,13.05 12,13.05Z"
+      android:fillColor="@color/icon_off"/>
+</vector>

app/src/main/res/drawable/icon_created_date.xml

@@ -4,17 +4,30 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-        android:fillColor="#00000000"
+      android:pathData="M19.03,21.6H5.13C4.392,21.597 3.685,21.302 3.164,20.779C2.643,20.256 2.35,19.548 2.35,18.81V6.21C2.35,5.472 2.643,4.764 3.164,4.241C3.685,3.718 4.392,3.423 5.13,3.42H19.03C19.77,3.42 20.48,3.714 21.003,4.237C21.526,4.76 21.82,5.47 21.82,6.21V18.81C21.82,19.55 21.526,20.26 21.003,20.783C20.48,21.306 19.77,21.6 19.03,21.6ZM5.13,5.23C4.865,5.23 4.611,5.335 4.423,5.523C4.235,5.71 4.13,5.965 4.13,6.23V18.83C4.13,19.095 4.235,19.35 4.423,19.537C4.611,19.725 4.865,19.83 5.13,19.83H19.03C19.295,19.83 19.55,19.725 19.737,19.537C19.925,19.35 20.03,19.095 20.03,18.83V6.23C20.03,5.965 19.925,5.71 19.737,5.523C19.55,5.335 19.295,5.23 19.03,5.23H5.13Z"
-        android:pathData="M3,12C3,13.181 3.233,14.352 3.685,15.444C4.137,16.536 4.8,17.528 5.636,18.364C6.472,19.2 7.464,19.863 8.556,20.315C9.648,20.767 10.819,21 12,21C13.181,21 14.352,20.767 15.444,20.315C16.536,19.863 17.528,19.2 18.364,18.364C19.2,17.528 19.863,16.536 20.315,15.444C20.767,14.352 21,13.181 21,12C21,9.613 20.052,7.324 18.364,5.636C16.676,3.948 14.387,3 12,3C9.613,3 7.324,3.948 5.636,5.636C3.948,7.324 3,9.613 3,12Z"
+      android:fillColor="@color/icon_on"/>
-        android:strokeWidth="1.5"
-        android:strokeColor="#E43521"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
   <path
-        android:fillColor="#00000000"
+      android:pathData="M20.91,8.21H2.59V10.01H20.91V8.21Z"
-        android:pathData="M12,7V12L15,15"
+      android:fillColor="@color/icon_on"/>
-        android:strokeWidth="1.5"
+  <path
-        android:strokeColor="#E43521"
+      android:pathData="M8.65,7C8.411,7 8.182,6.905 8.014,6.736C7.845,6.568 7.75,6.339 7.75,6.1V2.61C7.75,2.371 7.845,2.142 8.014,1.974C8.182,1.805 8.411,1.71 8.65,1.71C8.889,1.71 9.118,1.805 9.286,1.974C9.455,2.142 9.55,2.371 9.55,2.61V6.1C9.55,6.218 9.527,6.335 9.481,6.444C9.436,6.554 9.37,6.653 9.286,6.736C9.203,6.82 9.104,6.886 8.994,6.931C8.885,6.977 8.768,7 8.65,7Z"
-        android:strokeLineCap="round"
+      android:fillColor="@color/icon_on"/>
-        android:strokeLineJoin="round" />
+  <path
+      android:pathData="M7.74,13.85H6.34C6.101,13.85 5.872,13.755 5.704,13.586C5.535,13.417 5.44,13.189 5.44,12.95C5.44,12.711 5.535,12.482 5.704,12.313C5.872,12.145 6.101,12.05 6.34,12.05H7.74C7.979,12.05 8.208,12.145 8.376,12.313C8.545,12.482 8.64,12.711 8.64,12.95C8.64,13.189 8.545,13.417 8.376,13.586C8.208,13.755 7.979,13.85 7.74,13.85Z"
+      android:fillColor="@color/icon_on"/>
+  <path
+      android:pathData="M12.73,13.83H11.33C11.092,13.83 10.863,13.735 10.694,13.567C10.525,13.398 10.43,13.169 10.43,12.93C10.43,12.691 10.525,12.463 10.694,12.294C10.863,12.125 11.092,12.03 11.33,12.03H12.73C12.969,12.03 13.198,12.125 13.367,12.294C13.535,12.463 13.63,12.691 13.63,12.93C13.63,13.169 13.535,13.398 13.367,13.567C13.198,13.735 12.969,13.83 12.73,13.83Z"
+      android:fillColor="@color/icon_on"/>
+  <path
+      android:pathData="M17.82,13.85H16.42C16.181,13.85 15.952,13.755 15.784,13.586C15.615,13.417 15.52,13.189 15.52,12.95C15.52,12.711 15.615,12.482 15.784,12.313C15.952,12.145 16.181,12.05 16.42,12.05H17.82C18.059,12.05 18.288,12.145 18.456,12.313C18.625,12.482 18.72,12.711 18.72,12.95C18.72,13.189 18.625,13.417 18.456,13.586C18.288,13.755 18.059,13.85 17.82,13.85Z"
+      android:fillColor="@color/icon_on"/>
+  <path
+      android:pathData="M7.74,17.36H6.34C6.222,17.36 6.105,17.337 5.996,17.292C5.886,17.246 5.787,17.18 5.704,17.096C5.62,17.013 5.554,16.914 5.508,16.805C5.463,16.695 5.44,16.578 5.44,16.46C5.44,16.342 5.463,16.225 5.508,16.116C5.554,16.007 5.62,15.907 5.704,15.824C5.787,15.74 5.886,15.674 5.996,15.628C6.105,15.583 6.222,15.56 6.34,15.56H7.74C7.858,15.56 7.975,15.583 8.084,15.628C8.194,15.674 8.293,15.74 8.376,15.824C8.46,15.907 8.526,16.007 8.571,16.116C8.617,16.225 8.64,16.342 8.64,16.46C8.64,16.578 8.617,16.695 8.571,16.805C8.526,16.914 8.46,17.013 8.376,17.096C8.293,17.18 8.194,17.246 8.084,17.292C7.975,17.337 7.858,17.36 7.74,17.36Z"
+      android:fillColor="@color/icon_on"/>
+  <path
+      android:pathData="M12.73,17.35H11.33C11.092,17.35 10.863,17.255 10.694,17.086C10.525,16.917 10.43,16.688 10.43,16.45C10.43,16.211 10.525,15.982 10.694,15.813C10.863,15.645 11.092,15.55 11.33,15.55H12.73C12.969,15.55 13.198,15.645 13.367,15.813C13.535,15.982 13.63,16.211 13.63,16.45C13.63,16.688 13.535,16.917 13.367,17.086C13.198,17.255 12.969,17.35 12.73,17.35Z"
+      android:fillColor="@color/icon_on"/>
+  <path
+      android:pathData="M15.5,7C15.261,7 15.033,6.905 14.864,6.736C14.695,6.568 14.6,6.339 14.6,6.1V2.61C14.6,2.371 14.695,2.142 14.864,1.974C15.033,1.805 15.261,1.71 15.5,1.71C15.739,1.71 15.968,1.805 16.136,1.974C16.305,2.142 16.4,2.371 16.4,2.61V6.1C16.4,6.339 16.305,6.568 16.136,6.736C15.968,6.905 15.739,7 15.5,7Z"
+      android:fillColor="@color/icon_on"/>
 </vector>

app/src/main/res/drawable/icon_created_date_off.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.03,21.6H5.13C4.392,21.597 3.685,21.302 3.164,20.779C2.643,20.256 2.35,19.548 2.35,18.81V6.21C2.35,5.472 2.643,4.764 3.164,4.241C3.685,3.718 4.392,3.423 5.13,3.42H19.03C19.77,3.42 20.48,3.714 21.003,4.237C21.526,4.76 21.82,5.47 21.82,6.21V18.81C21.82,19.55 21.526,20.26 21.003,20.783C20.48,21.306 19.77,21.6 19.03,21.6ZM5.13,5.23C4.865,5.23 4.611,5.335 4.423,5.523C4.235,5.71 4.13,5.965 4.13,6.23V18.83C4.13,19.095 4.235,19.35 4.423,19.537C4.611,19.725 4.865,19.83 5.13,19.83H19.03C19.295,19.83 19.55,19.725 19.737,19.537C19.925,19.35 20.03,19.095 20.03,18.83V6.23C20.03,5.965 19.925,5.71 19.737,5.523C19.55,5.335 19.295,5.23 19.03,5.23H5.13Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M20.91,8.21H2.59V10.01H20.91V8.21Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M8.65,7C8.411,7 8.182,6.905 8.014,6.736C7.845,6.568 7.75,6.339 7.75,6.1V2.61C7.75,2.371 7.845,2.142 8.014,1.974C8.182,1.805 8.411,1.71 8.65,1.71C8.889,1.71 9.118,1.805 9.286,1.974C9.455,2.142 9.55,2.371 9.55,2.61V6.1C9.55,6.218 9.527,6.335 9.481,6.444C9.436,6.554 9.37,6.653 9.286,6.736C9.203,6.82 9.104,6.886 8.994,6.931C8.885,6.977 8.768,7 8.65,7Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M7.74,13.85H6.34C6.101,13.85 5.872,13.755 5.704,13.586C5.535,13.417 5.44,13.189 5.44,12.95C5.44,12.711 5.535,12.482 5.704,12.313C5.872,12.145 6.101,12.05 6.34,12.05H7.74C7.979,12.05 8.208,12.145 8.376,12.313C8.545,12.482 8.64,12.711 8.64,12.95C8.64,13.189 8.545,13.417 8.376,13.586C8.208,13.755 7.979,13.85 7.74,13.85Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M12.73,13.83H11.33C11.092,13.83 10.863,13.735 10.694,13.567C10.525,13.398 10.43,13.169 10.43,12.93C10.43,12.691 10.525,12.463 10.694,12.294C10.863,12.125 11.092,12.03 11.33,12.03H12.73C12.969,12.03 13.198,12.125 13.367,12.294C13.535,12.463 13.63,12.691 13.63,12.93C13.63,13.169 13.535,13.398 13.367,13.567C13.198,13.735 12.969,13.83 12.73,13.83Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M17.82,13.85H16.42C16.181,13.85 15.952,13.755 15.784,13.586C15.615,13.417 15.52,13.189 15.52,12.95C15.52,12.711 15.615,12.482 15.784,12.313C15.952,12.145 16.181,12.05 16.42,12.05H17.82C18.059,12.05 18.288,12.145 18.456,12.313C18.625,12.482 18.72,12.711 18.72,12.95C18.72,13.189 18.625,13.417 18.456,13.586C18.288,13.755 18.059,13.85 17.82,13.85Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M7.74,17.36H6.34C6.222,17.36 6.105,17.337 5.996,17.292C5.886,17.246 5.787,17.18 5.704,17.096C5.62,17.013 5.554,16.914 5.508,16.805C5.463,16.695 5.44,16.578 5.44,16.46C5.44,16.342 5.463,16.225 5.508,16.116C5.554,16.007 5.62,15.907 5.704,15.824C5.787,15.74 5.886,15.674 5.996,15.628C6.105,15.583 6.222,15.56 6.34,15.56H7.74C7.858,15.56 7.975,15.583 8.084,15.628C8.194,15.674 8.293,15.74 8.376,15.824C8.46,15.907 8.526,16.007 8.571,16.116C8.617,16.225 8.64,16.342 8.64,16.46C8.64,16.578 8.617,16.695 8.571,16.805C8.526,16.914 8.46,17.013 8.376,17.096C8.293,17.18 8.194,17.246 8.084,17.292C7.975,17.337 7.858,17.36 7.74,17.36Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M12.73,17.35H11.33C11.092,17.35 10.863,17.255 10.694,17.086C10.525,16.917 10.43,16.688 10.43,16.45C10.43,16.211 10.525,15.982 10.694,15.813C10.863,15.645 11.092,15.55 11.33,15.55H12.73C12.969,15.55 13.198,15.645 13.367,15.813C13.535,15.982 13.63,16.211 13.63,16.45C13.63,16.688 13.535,16.917 13.367,17.086C13.198,17.255 12.969,17.35 12.73,17.35Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M15.5,7C15.261,7 15.033,6.905 14.864,6.736C14.695,6.568 14.6,6.339 14.6,6.1V2.61C14.6,2.371 14.695,2.142 14.864,1.974C15.033,1.805 15.261,1.71 15.5,1.71C15.739,1.71 15.968,1.805 16.136,1.974C16.305,2.142 16.4,2.371 16.4,2.61V6.1C16.4,6.339 16.305,6.568 16.136,6.736C15.968,6.905 15.739,7 15.5,7Z"
+      android:fillColor="@color/icon_off"/>
+</vector>

app/src/main/res/drawable/icon_descending.xml

@@ -3,22 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <!-- 外圈 -->
   <path
-        android:pathData="M12,3C16.9706,3 21,7.0294 21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3Z"
+      android:pathData="M17.22,21.69C17.089,21.691 16.958,21.666 16.836,21.616C16.715,21.566 16.604,21.493 16.51,21.4L13.81,18.7C13.622,18.512 13.516,18.256 13.516,17.99C13.516,17.724 13.622,17.468 13.81,17.28C13.998,17.092 14.254,16.986 14.52,16.986C14.786,16.986 15.042,17.092 15.23,17.28L17.23,19.28L19.12,17.39C19.213,17.296 19.324,17.222 19.446,17.171C19.567,17.12 19.698,17.094 19.83,17.094C19.962,17.094 20.093,17.12 20.215,17.171C20.337,17.222 20.447,17.296 20.54,17.39C20.726,17.577 20.831,17.831 20.831,18.095C20.831,18.359 20.726,18.613 20.54,18.8L17.94,21.4C17.846,21.494 17.733,21.568 17.61,21.618C17.486,21.667 17.354,21.692 17.22,21.69Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"/>
-
-    <!-- 向下箭头 -->
   <path
-        android:pathData="M12,16L16,12H13.5V8H10.5V12H8L12,16Z"
+      android:pathData="M17.22,21.69C16.955,21.69 16.701,21.584 16.513,21.397C16.326,21.209 16.22,20.955 16.22,20.69V12.78C16.22,12.515 16.326,12.26 16.513,12.073C16.701,11.885 16.955,11.78 17.22,11.78C17.485,11.78 17.74,11.885 17.927,12.073C18.115,12.26 18.22,12.515 18.22,12.78V20.69C18.22,20.955 18.115,21.209 17.927,21.397C17.74,21.584 17.485,21.69 17.22,21.69Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
+  <path
-        android:fillColor="#00000000"
+      android:pathData="M11.66,21.69C9.662,21.684 7.709,21.094 6.042,19.993C4.375,18.891 3.067,17.326 2.279,15.49C1.491,13.654 1.257,11.627 1.606,9.66C1.955,7.693 2.872,5.87 4.245,4.418C5.617,2.965 7.384,1.946 9.328,1.486C11.272,1.025 13.309,1.143 15.187,1.826C17.065,2.509 18.702,3.726 19.896,5.328C21.091,6.929 21.791,8.845 21.91,10.84C21.918,10.971 21.9,11.103 21.857,11.227C21.814,11.351 21.747,11.466 21.66,11.565C21.572,11.663 21.466,11.743 21.348,11.801C21.23,11.858 21.101,11.892 20.97,11.9C20.839,11.908 20.707,11.89 20.583,11.847C20.458,11.804 20.344,11.737 20.245,11.649C20.147,11.562 20.067,11.456 20.009,11.338C19.952,11.22 19.918,11.091 19.91,10.96C19.815,9.355 19.252,7.814 18.291,6.525C17.33,5.236 16.014,4.257 14.503,3.707C12.993,3.157 11.355,3.061 9.79,3.431C8.226,3.8 6.804,4.619 5.699,5.787C4.594,6.954 3.855,8.42 3.573,10.002C3.29,11.584 3.477,13.215 4.109,14.692C4.742,16.17 5.793,17.431 7.133,18.319C8.472,19.206 10.043,19.683 11.65,19.69C11.915,19.69 12.17,19.795 12.357,19.983C12.545,20.17 12.65,20.425 12.65,20.69C12.65,20.955 12.545,21.209 12.357,21.397C12.17,21.585 11.915,21.69 11.65,21.69H11.66Z"
-        android:strokeLineJoin="round"
+      android:fillColor="@color/icon_on"/>
-        android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,13.06H8.17C7.905,13.06 7.65,12.955 7.463,12.767C7.275,12.58 7.17,12.325 7.17,12.06C7.17,11.795 7.275,11.54 7.463,11.353C7.65,11.165 7.905,11.06 8.17,11.06H11V8.06C11,7.795 11.105,7.541 11.293,7.353C11.48,7.165 11.735,7.06 12,7.06C12.265,7.06 12.519,7.165 12.707,7.353C12.895,7.541 13,7.795 13,8.06V12.06C13,12.325 12.895,12.58 12.707,12.767C12.519,12.955 12.265,13.06 12,13.06Z"
+      android:fillColor="@color/icon_on"/>
 </vector>

app/src/main/res/drawable/icon_descending_off.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.22,21.69C17.089,21.691 16.958,21.666 16.836,21.616C16.715,21.566 16.604,21.493 16.51,21.4L13.81,18.7C13.622,18.512 13.516,18.256 13.516,17.99C13.516,17.724 13.622,17.468 13.81,17.28C13.998,17.092 14.254,16.986 14.52,16.986C14.786,16.986 15.042,17.092 15.23,17.28L17.23,19.28L19.12,17.39C19.213,17.296 19.324,17.222 19.446,17.171C19.567,17.12 19.698,17.094 19.83,17.094C19.962,17.094 20.093,17.12 20.215,17.171C20.337,17.222 20.447,17.296 20.54,17.39C20.726,17.577 20.831,17.831 20.831,18.095C20.831,18.359 20.726,18.613 20.54,18.8L17.94,21.4C17.846,21.494 17.733,21.568 17.61,21.618C17.486,21.667 17.354,21.692 17.22,21.69Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M17.22,21.69C16.955,21.69 16.701,21.584 16.513,21.397C16.326,21.209 16.22,20.955 16.22,20.69V12.78C16.22,12.515 16.326,12.26 16.513,12.073C16.701,11.885 16.955,11.78 17.22,11.78C17.485,11.78 17.74,11.885 17.927,12.073C18.115,12.26 18.22,12.515 18.22,12.78V20.69C18.22,20.955 18.115,21.209 17.927,21.397C17.74,21.584 17.485,21.69 17.22,21.69Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M11.66,21.69C9.662,21.684 7.709,21.094 6.042,19.993C4.375,18.891 3.067,17.326 2.279,15.49C1.491,13.654 1.257,11.627 1.606,9.66C1.955,7.693 2.872,5.87 4.245,4.418C5.617,2.965 7.384,1.946 9.328,1.486C11.272,1.025 13.309,1.143 15.187,1.826C17.065,2.509 18.702,3.726 19.896,5.328C21.091,6.929 21.791,8.845 21.91,10.84C21.918,10.971 21.9,11.103 21.857,11.227C21.814,11.351 21.747,11.466 21.66,11.565C21.572,11.663 21.466,11.743 21.348,11.801C21.23,11.858 21.101,11.892 20.97,11.9C20.839,11.908 20.707,11.89 20.583,11.847C20.458,11.804 20.344,11.737 20.245,11.649C20.147,11.562 20.067,11.456 20.009,11.338C19.952,11.22 19.918,11.091 19.91,10.96C19.815,9.355 19.252,7.814 18.291,6.525C17.33,5.236 16.014,4.257 14.503,3.707C12.993,3.157 11.355,3.061 9.79,3.431C8.226,3.8 6.804,4.619 5.699,5.787C4.594,6.954 3.855,8.42 3.573,10.002C3.29,11.584 3.477,13.215 4.109,14.692C4.742,16.17 5.793,17.431 7.133,18.319C8.472,19.206 10.043,19.683 11.65,19.69C11.915,19.69 12.17,19.795 12.357,19.983C12.545,20.17 12.65,20.425 12.65,20.69C12.65,20.955 12.545,21.209 12.357,21.397C12.17,21.585 11.915,21.69 11.65,21.69H11.66Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M12,13.06H8.17C7.905,13.06 7.65,12.955 7.463,12.767C7.275,12.58 7.17,12.325 7.17,12.06C7.17,11.795 7.275,11.54 7.463,11.353C7.65,11.165 7.905,11.06 8.17,11.06H11V8.06C11,7.795 11.105,7.541 11.293,7.353C11.48,7.165 11.735,7.06 12,7.06C12.265,7.06 12.519,7.165 12.707,7.353C12.895,7.541 13,7.795 13,8.06V12.06C13,12.325 12.895,12.58 12.707,12.767C12.519,12.955 12.265,13.06 12,13.06Z"
+      android:fillColor="@color/icon_off"/>
+</vector>

app/src/main/res/drawable/icon_file_gray.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.049,14.086H1.854C1.854,14.086 0.883,14.237 0.883,12.942V2.475C0.883,2.475 0.905,1.309 2.092,1.309H6.365C6.365,1.309 6.883,1.201 7.315,1.87C7.725,2.518 7.962,2.928 7.962,2.928C7.962,2.928 8.113,3.1 8.459,3.1C8.156,3.1 13.962,3.1 13.962,3.1C13.962,3.1 14.933,2.993 14.933,4.072V13.007C14.933,13.007 15.085,14.086 14.049,14.086H14.049ZM13.142,5.885C13.142,5.626 12.926,5.41 12.667,5.41H3.171C2.89,5.41 2.675,5.626 2.675,5.885V5.928C2.675,6.208 2.89,6.424 3.171,6.424H12.667C12.926,6.424 13.142,6.208 13.142,5.928V5.885Z"
+      android:fillColor="#A9A4A4"/>
+</vector>

app/src/main/res/drawable/icon_home_sel_off.xml

@@ -4,14 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M3.2,12.18C3.2,10.33 3.2,9.44 3.68,8.64C4.16,7.84 5.06,7.28 6.59,6.49L8.59,5.18C10.29,3.96 11.19,3.3 12,3.3C12.81,3.3 13.71,3.96 15.41,5.18L17.41,6.49C18.94,7.28 19.84,7.84 20.32,8.64C20.8,9.44 20.8,10.33 20.8,12.18V13.61C20.8,16.86 20.8,18.64 19.74,19.71C18.68,20.78 17.19,20.78 14,20.78H10C6.81,20.78 5.32,20.78 4.26,19.71C3.2,18.64 3.2,16.86 3.2,13.61V12.18Z"
+      android:pathData="M20.2,22.94H3.81C2.873,22.937 1.975,22.563 1.313,21.9C0.652,21.236 0.28,20.337 0.28,19.4V8.19C0.282,7.576 0.442,6.972 0.745,6.438C1.048,5.904 1.484,5.457 2.01,5.14L10.45,1C10.934,0.763 11.466,0.64 12.005,0.64C12.544,0.64 13.076,0.763 13.56,1L21.93,5.11C22.474,5.42 22.926,5.868 23.242,6.409C23.558,6.95 23.726,7.564 23.73,8.19V19.44C23.719,20.37 23.343,21.259 22.683,21.914C22.022,22.569 21.13,22.937 20.2,22.94ZM12,2.4C11.737,2.397 11.477,2.455 11.24,2.57L2.87,6.68C2.627,6.841 2.428,7.059 2.29,7.315C2.152,7.572 2.08,7.859 2.08,8.15V19.4C2.08,19.86 2.262,20.301 2.586,20.627C2.91,20.953 3.35,21.137 3.81,21.14H20.2C20.66,21.137 21.1,20.953 21.424,20.627C21.748,20.301 21.93,19.86 21.93,19.4V8.19C21.929,7.888 21.85,7.591 21.701,7.329C21.552,7.066 21.338,6.846 21.08,6.69L12.77,2.61C12.534,2.48 12.27,2.408 12,2.4Z"
-      android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-      android:fillColor="#00000000"
-      android:strokeColor="#CCCCCC"/>
   <path
-      android:pathData="M12,15.3V18"
+      android:pathData="M16.65,18.45H7.4C7.161,18.45 6.932,18.355 6.764,18.186C6.595,18.018 6.5,17.789 6.5,17.55C6.5,17.311 6.595,17.082 6.764,16.914C6.932,16.745 7.161,16.65 7.4,16.65H16.69C16.929,16.65 17.158,16.745 17.326,16.914C17.495,17.082 17.59,17.311 17.59,17.55C17.59,17.789 17.495,18.018 17.326,18.186C17.158,18.355 16.929,18.45 16.69,18.45H16.65Z"
-      android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-      android:fillColor="#00000000"
-      android:strokeColor="#CCCCCC"
-      android:strokeLineCap="round"/>
 </vector>

app/src/main/res/drawable/icon_home_sel_on.xml

@@ -4,14 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-        android:pathData="M3.2,12.18C3.2,10.33 3.2,9.44 3.68,8.64C4.16,7.84 5.06,7.28 6.59,6.49L8.59,5.18C10.29,3.96 11.19,3.3 12,3.3C12.81,3.3 13.71,3.96 15.41,5.18L17.41,6.49C18.94,7.28 19.84,7.84 20.32,8.64C20.8,9.44 20.8,10.33 20.8,12.18V13.61C20.8,16.86 20.8,18.64 19.74,19.71C18.68,20.78 17.19,20.78 14,20.78H10C6.81,20.78 5.32,20.78 4.26,19.71C3.2,18.64 3.2,16.86 3.2,13.61V12.18Z"
+      android:pathData="M21.53,5.87L13.16,1.76C12.799,1.583 12.402,1.49 12,1.49C11.598,1.49 11.201,1.583 10.84,1.76L2.47,5.87C2.076,6.106 1.75,6.44 1.524,6.839C1.297,7.239 1.179,7.691 1.18,8.15V19.4C1.18,20.097 1.457,20.767 1.95,21.26C2.444,21.753 3.112,22.03 3.81,22.03H20.2C20.897,22.03 21.566,21.753 22.06,21.26C22.553,20.767 22.83,20.097 22.83,19.4V8.15C22.831,7.69 22.711,7.237 22.483,6.837C22.255,6.437 21.927,6.104 21.53,5.87ZM16.62,18.44H7.36C7.121,18.44 6.892,18.345 6.724,18.176C6.555,18.008 6.46,17.779 6.46,17.54C6.46,17.301 6.555,17.072 6.724,16.904C6.892,16.735 7.121,16.64 7.36,16.64H16.62C16.738,16.64 16.855,16.663 16.964,16.708C17.074,16.754 17.173,16.82 17.256,16.904C17.34,16.987 17.406,17.086 17.451,17.196C17.497,17.305 17.52,17.422 17.52,17.54C17.52,17.658 17.497,17.775 17.451,17.884C17.406,17.994 17.34,18.093 17.256,18.176C17.173,18.26 17.074,18.326 16.964,18.372C16.855,18.417 16.738,18.44 16.62,18.44Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:fillColor="#E43521"
-        android:strokeColor="#E43521"/>
-    <path
-        android:pathData="M12,15.3V18"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFFFFF"
-        android:strokeLineCap="round"/>
 </vector>

app/src/main/res/drawable/icon_lock_item.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M28.47,12.52H7.53C6.297,12.522 5.115,13.012 4.243,13.884C3.371,14.756 2.88,15.939 2.879,17.172V31.132C2.879,32.365 3.369,33.548 4.241,34.421C5.113,35.293 6.297,35.783 7.53,35.783H28.47C29.081,35.784 29.687,35.664 30.251,35.431C30.816,35.197 31.33,34.854 31.762,34.423C32.195,33.991 32.538,33.478 32.772,32.913C33.006,32.348 33.127,31.743 33.127,31.132V17.172C33.125,15.938 32.634,14.755 31.761,13.882C30.888,13.01 29.704,12.52 28.47,12.52ZM19.167,23.914V27.618C19.167,27.927 19.044,28.223 18.826,28.441C18.608,28.659 18.311,28.782 18.003,28.782C17.694,28.782 17.398,28.659 17.179,28.441C16.961,28.223 16.838,27.927 16.838,27.618V23.914C16.099,23.665 15.467,23.171 15.046,22.514C14.625,21.857 14.441,21.076 14.523,20.301C14.606,19.525 14.95,18.801 15.5,18.247C16.05,17.694 16.772,17.344 17.548,17.257C17.692,17.196 17.847,17.166 18.003,17.167C18.823,17.163 19.619,17.451 20.248,17.978C20.877,18.506 21.299,19.239 21.438,20.048C21.578,20.857 21.426,21.689 21.01,22.397C20.595,23.104 19.941,23.642 19.167,23.914Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18.632,0.101C18.421,0.101 18.209,0.101 18.003,0.101C17.796,0.101 17.585,0.101 17.373,0.101C11.795,0.471 7.604,5.392 7.604,10.959V12.515H11.515V10.79C11.49,9.188 12.039,7.63 13.061,6.397C14.084,5.164 15.514,4.336 17.093,4.064C17.694,3.979 18.306,3.979 18.907,4.064C20.486,4.336 21.916,5.164 22.938,6.397C23.961,7.63 24.51,9.188 24.485,10.79V12.52H28.401V10.965C28.401,5.392 24.205,0.476 18.632,0.101Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/icon_multi_select.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.31,3.833C5.31,3.372 5.682,3 6.143,3H18.303C19.018,3 19.704,3.284 20.21,3.79C20.716,4.295 21,4.981 21,5.696V17.721C21,18.182 20.627,18.554 20.166,18.554H19.539V6.131C19.539,5.689 19.363,5.265 19.05,4.953C18.738,4.64 18.314,4.464 17.872,4.464H5.309V3.833H5.31ZM3,6.28C3,5.819 3.373,5.447 3.834,5.447H17.727C18.188,5.447 18.561,5.819 18.561,6.28V20.167C18.561,20.628 18.188,21 17.727,21H3.835C3.614,21 3.401,20.912 3.245,20.756C3.089,20.6 3.001,20.388 3.001,20.167V6.28H3ZM4.471,6.917V19.53H17.09V6.917H4.472H4.471ZM15.163,10.742C15.293,10.602 15.363,10.418 15.36,10.228C15.357,10.037 15.28,9.856 15.145,9.721C15.01,9.586 14.828,9.509 14.638,9.506C14.447,9.502 14.263,9.573 14.123,9.703L9.616,14.206L7.439,12.031C7.299,11.901 7.115,11.83 6.924,11.834C6.734,11.837 6.552,11.914 6.417,12.049C6.282,12.184 6.205,12.365 6.202,12.556C6.198,12.746 6.269,12.931 6.399,13.07L9.026,15.697C9.183,15.853 9.395,15.941 9.616,15.941C9.837,15.941 10.049,15.853 10.205,15.697L15.163,10.742Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/icon_recently_sel_off.xml

@@ -3,18 +3,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
     <path
-        android:fillColor="#00000000"
+        android:pathData="M12,23.41C9.743,23.41 7.537,22.741 5.661,21.487C3.785,20.233 2.322,18.451 1.459,16.366C0.595,14.281 0.369,11.987 0.809,9.774C1.25,7.561 2.336,5.528 3.932,3.932C5.528,2.336 7.561,1.25 9.774,0.809C11.987,0.369 14.281,0.595 16.366,1.459C18.451,2.322 20.233,3.785 21.487,5.661C22.741,7.537 23.41,9.743 23.41,12C23.407,15.025 22.204,17.926 20.065,20.065C17.926,22.204 15.025,23.407 12,23.41ZM12,2.41C10.099,2.41 8.241,2.974 6.661,4.03C5.081,5.086 3.849,6.586 3.122,8.342C2.394,10.098 2.204,12.031 2.575,13.895C2.945,15.759 3.861,17.471 5.205,18.815C6.549,20.159 8.261,21.075 10.125,21.445C11.989,21.816 13.922,21.626 15.678,20.899C17.434,20.171 18.934,18.939 19.99,17.359C21.046,15.779 21.61,13.921 21.61,12.02C21.611,10.757 21.364,9.505 20.882,8.338C20.399,7.17 19.692,6.109 18.799,5.215C17.907,4.32 16.847,3.611 15.681,3.126C14.514,2.641 13.263,2.391 12,2.39V2.41Z"
-        android:pathData="M3,12C3,13.181 3.233,14.352 3.685,15.444C4.137,16.536 4.8,17.528 5.636,18.364C6.472,19.2 7.464,19.863 8.556,20.315C9.648,20.767 10.819,21 12,21C13.181,21 14.352,20.767 15.444,20.315C16.536,19.863 17.528,19.2 18.364,18.364C19.2,17.528 19.863,16.536 20.315,15.444C20.767,14.352 21,13.181 21,12C21,9.613 20.052,7.324 18.364,5.636C16.676,3.948 14.387,3 12,3C9.613,3 7.324,3.948 5.636,5.636C3.948,7.324 3,9.613 3,12Z"
+        android:fillColor="#A9A4A4"/>
-        android:strokeWidth="1.5"
-        android:strokeColor="#cccccc"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
     <path
-        android:fillColor="#00000000"
+        android:pathData="M14.63,15.86C14.511,15.861 14.394,15.839 14.284,15.795C14.174,15.75 14.074,15.684 13.99,15.6L11.36,12.97C11.277,12.887 11.212,12.789 11.167,12.681C11.123,12.573 11.1,12.457 11.1,12.34V6.8C11.1,6.561 11.195,6.332 11.364,6.164C11.532,5.995 11.761,5.9 12,5.9C12.239,5.9 12.468,5.995 12.636,6.164C12.805,6.332 12.9,6.561 12.9,6.8V11.96L15.27,14.33C15.394,14.456 15.478,14.617 15.511,14.79C15.545,14.964 15.526,15.144 15.458,15.307C15.389,15.471 15.274,15.61 15.127,15.708C14.98,15.807 14.807,15.859 14.63,15.86Z"
-        android:pathData="M12,7V12L15,15"
+        android:fillColor="#A9A4A4"/>
-        android:strokeWidth="1.5"
+  </group>
-        android:strokeColor="#cccccc"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
 </vector>

app/src/main/res/drawable/icon_recently_sel_on.xml

@@ -1,20 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="24dp"
+    android:width="24dp"
-android:height="24dp"
+    android:height="24dp"
-android:viewportWidth="24"
+    android:viewportWidth="24"
-android:viewportHeight="24">
+    android:viewportHeight="24">
-<path
+  <path
-    android:fillColor="#E43521"
+      android:pathData="M12,1.48C9.92,1.482 7.888,2.1 6.159,3.257C4.431,4.414 3.084,6.057 2.289,7.979C1.494,9.901 1.286,12.015 1.693,14.055C2.099,16.095 3.101,17.968 4.571,19.439C6.042,20.909 7.915,21.911 9.955,22.317C11.995,22.724 14.109,22.516 16.031,21.721C17.953,20.926 19.596,19.579 20.753,17.851C21.91,16.122 22.528,14.09 22.53,12.01C22.533,10.627 22.262,9.256 21.734,7.977C21.206,6.699 20.43,5.537 19.452,4.558C18.473,3.58 17.312,2.804 16.033,2.276C14.754,1.748 13.384,1.477 12,1.48ZM15.26,15.59C15.179,15.676 15.081,15.744 14.973,15.79C14.865,15.837 14.748,15.861 14.63,15.86C14.511,15.86 14.393,15.836 14.283,15.789C14.173,15.743 14.073,15.675 13.99,15.59L11.36,13.01C11.277,12.927 11.212,12.829 11.167,12.721C11.123,12.613 11.1,12.497 11.1,12.38V6.84C11.1,6.601 11.195,6.372 11.364,6.204C11.532,6.035 11.761,5.94 12,5.94C12.239,5.94 12.468,6.035 12.636,6.204C12.805,6.372 12.9,6.601 12.9,6.84V12L15.26,14.37C15.413,14.536 15.498,14.754 15.498,14.98C15.498,15.206 15.413,15.424 15.26,15.59Z"
-    android:pathData="M3,12C3,13.181 3.233,14.352 3.685,15.444C4.137,16.536 4.8,17.528 5.636,18.364C6.472,19.2 7.464,19.863 8.556,20.315C9.648,20.767 10.819,21 12,21C13.181,21 14.352,20.767 15.444,20.315C16.536,19.863 17.528,19.2 18.364,18.364C19.2,17.528 19.863,16.536 20.315,15.444C20.767,14.352 21,13.181 21,12C21,9.613 20.052,7.324 18.364,5.636C16.676,3.948 14.387,3 12,3C9.613,3 7.324,3.948 5.636,5.636C3.948,7.324 3,9.613 3,12Z"
+      android:fillColor="#E43521"/>
-    android:strokeWidth="1.5"
-    android:strokeColor="#E43521"
-    android:strokeLineCap="round"
-    android:strokeLineJoin="round" />
-<path
-    android:fillColor="#00000000"
-    android:pathData="M12,7V12L15,15"
-    android:strokeWidth="1.5"
-    android:strokeColor="#FFFFFF"
-    android:strokeLineCap="round"
-    android:strokeLineJoin="round" />
 </vector>

app/src/main/res/drawable/icon_search.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.79,20.24C10.118,20.242 8.484,19.748 7.093,18.821C5.702,17.893 4.617,16.574 3.976,15.031C3.335,13.487 3.166,11.787 3.491,10.148C3.816,8.508 4.62,7.001 5.801,5.818C6.983,4.636 8.488,3.83 10.128,3.503C11.767,3.176 13.467,3.343 15.011,3.982C16.556,4.621 17.876,5.704 18.805,7.094C19.734,8.484 20.23,10.118 20.23,11.79C20.23,14.029 19.341,16.177 17.759,17.761C16.176,19.346 14.029,20.237 11.79,20.24ZM11.79,5.15C10.474,5.148 9.187,5.536 8.092,6.266C6.997,6.996 6.143,8.035 5.638,9.25C5.134,10.466 5.001,11.804 5.257,13.095C5.514,14.386 6.147,15.571 7.078,16.502C8.008,17.433 9.194,18.066 10.485,18.323C11.776,18.579 13.114,18.446 14.33,17.942C15.545,17.437 16.583,16.583 17.313,15.488C18.043,14.393 18.432,13.106 18.43,11.79C18.431,10.917 18.261,10.052 17.928,9.244C17.595,8.437 17.106,7.703 16.489,7.085C15.873,6.466 15.14,5.975 14.334,5.64C13.528,5.304 12.663,5.131 11.79,5.13V5.15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19.75,20.65C19.633,20.65 19.517,20.627 19.409,20.583C19.301,20.538 19.203,20.473 19.12,20.39L16.74,18.01C16.571,17.84 16.477,17.61 16.477,17.37C16.477,17.13 16.571,16.9 16.74,16.73C16.909,16.562 17.137,16.468 17.375,16.468C17.613,16.468 17.841,16.562 18.01,16.73L20.39,19.11C20.559,19.28 20.653,19.51 20.653,19.75C20.653,19.99 20.559,20.22 20.39,20.39C20.218,20.556 19.989,20.649 19.75,20.65Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/icon_select_all.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.51,10.717C6.299,10.717 6.096,10.635 5.945,10.488L3.245,7.855C3.168,7.781 3.108,7.692 3.066,7.595C3.024,7.497 3.001,7.392 3,7.285C2.997,7.071 3.08,6.863 3.23,6.71C3.38,6.556 3.585,6.468 3.8,6.465C4.015,6.462 4.222,6.545 4.375,6.695L6.455,8.723L11.068,3.307C11.136,3.224 11.22,3.155 11.315,3.105C11.41,3.054 11.515,3.023 11.622,3.014C11.729,3.004 11.837,3.016 11.94,3.049C12.042,3.081 12.137,3.134 12.219,3.204C12.302,3.274 12.369,3.359 12.417,3.455C12.466,3.552 12.495,3.656 12.502,3.764C12.51,3.871 12.496,3.979 12.461,4.081C12.427,4.183 12.372,4.277 12.301,4.358L7.126,10.433C7.054,10.517 6.966,10.586 6.866,10.635C6.767,10.684 6.658,10.712 6.547,10.717H6.51ZM17.13,10.74C14.996,10.74 13.26,9.004 13.26,6.87C13.26,4.736 14.996,3 17.13,3C19.264,3 21,4.736 21,6.87C21,9.004 19.264,10.74 17.13,10.74ZM17.13,4.62C16.685,4.62 16.25,4.752 15.88,4.999C15.51,5.246 15.222,5.598 15.051,6.009C14.881,6.42 14.836,6.872 14.923,7.309C15.01,7.745 15.224,8.146 15.539,8.461C15.854,8.776 16.255,8.99 16.691,9.077C17.128,9.164 17.58,9.119 17.991,8.949C18.402,8.778 18.754,8.49 19.001,8.12C19.248,7.75 19.38,7.315 19.38,6.87C19.379,6.273 19.142,5.702 18.72,5.28C18.299,4.858 17.726,4.621 17.13,4.62ZM17.13,21C14.996,21 13.26,19.264 13.26,17.13C13.26,14.996 14.996,13.26 17.13,13.26C19.264,13.26 21,14.996 21,17.13C21,19.264 19.264,21 17.13,21ZM17.13,14.88C16.685,14.88 16.25,15.012 15.88,15.259C15.51,15.506 15.222,15.858 15.051,16.269C14.881,16.68 14.836,17.132 14.923,17.569C15.01,18.005 15.224,18.406 15.539,18.721C15.854,19.036 16.255,19.25 16.691,19.337C17.128,19.424 17.58,19.379 17.991,19.209C18.402,19.038 18.754,18.75 19.001,18.38C19.248,18.01 19.38,17.575 19.38,17.13C19.379,16.534 19.142,15.962 18.72,15.54C18.299,15.118 17.726,14.881 17.13,14.88ZM6.87,21C4.736,21 3,19.264 3,17.13C3,14.996 4.736,13.26 6.87,13.26C9.004,13.26 10.74,14.996 10.74,17.13C10.74,19.264 9.004,21 6.87,21ZM6.87,14.88C6.425,14.88 5.99,15.012 5.62,15.259C5.25,15.506 4.962,15.858 4.791,16.269C4.621,16.68 4.576,17.132 4.663,17.569C4.75,18.005 4.964,18.406 5.279,18.721C5.594,19.036 5.995,19.25 6.431,19.337C6.868,19.424 7.32,19.379 7.731,19.209C8.142,19.038 8.494,18.75 8.741,18.38C8.988,18.01 9.12,17.575 9.12,17.13C9.119,16.534 8.882,15.962 8.46,15.54C8.038,15.118 7.467,14.881 6.87,14.88Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/icon_sidebar.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.924,6.741H20.076C20.587,6.741 21,6.351 21,5.871C21,5.39 20.587,5 20.076,5H3.924C3.414,5 3,5.39 3,5.871C3,6.351 3.414,6.741 3.924,6.741ZM20.076,11.094H3.924C3.413,11.094 3,11.483 3,11.964C3,12.445 3.413,12.835 3.924,12.835H20.076C20.587,12.835 21,12.445 21,11.964C21,11.483 20.584,11.094 20.076,11.094ZM20.076,17.259H3.924C3.414,17.259 3,17.649 3,18.129C3,18.61 3.414,19 3.924,19H20.076C20.587,19 21,18.61 21,18.129C21,17.649 20.587,17.259 20.076,17.259Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/icon_sort_name.xml

@@ -3,22 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <!-- 外圈 -->
   <path
-        android:pathData="M12,3C16.9706,3 21,7.0294 21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3Z"
+      android:pathData="M20.91,10.22H16.3C15.536,10.22 14.804,9.916 14.264,9.376C13.723,8.836 13.42,8.104 13.42,7.34V3.34H15.22V7.34C15.22,7.626 15.334,7.901 15.536,8.104C15.739,8.306 16.014,8.42 16.3,8.42H20.91V10.22Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"/>
-
-    <!-- A 字母路径 -->
   <path
-        android:pathData="M9,15L12,9L15,15M10,13H14"
+      android:pathData="M18.88,22.35H5.97C5.588,22.354 5.208,22.282 4.854,22.14C4.499,21.997 4.176,21.786 3.903,21.519C3.63,21.251 3.413,20.933 3.263,20.581C3.113,20.23 3.034,19.852 3.03,19.47V4.7C3.04,3.929 3.355,3.193 3.906,2.654C4.457,2.114 5.199,1.815 5.97,1.82H15.25L21.82,8.22V19.47C21.816,19.852 21.737,20.23 21.587,20.581C21.437,20.933 21.219,21.251 20.946,21.519C20.673,21.786 20.35,21.997 19.996,22.14C19.641,22.282 19.262,22.354 18.88,22.35ZM5.97,3.62C5.676,3.614 5.392,3.725 5.179,3.927C4.966,4.129 4.84,4.406 4.83,4.7V19.47C4.84,19.764 4.966,20.041 5.179,20.243C5.392,20.445 5.676,20.555 5.97,20.55H18.88C19.173,20.555 19.455,20.445 19.667,20.243C19.879,20.04 20.002,19.763 20.01,19.47V8.95L14.51,3.59L5.97,3.62Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
+  <path
-        android:strokeLineCap="round"
+      android:pathData="M13.07,12.48H8.65C8.411,12.48 8.182,12.385 8.014,12.217C7.845,12.048 7.75,11.819 7.75,11.58C7.75,11.342 7.845,11.113 8.014,10.944C8.182,10.775 8.411,10.68 8.65,10.68H13.06C13.299,10.68 13.528,10.775 13.696,10.944C13.865,11.113 13.96,11.342 13.96,11.58C13.96,11.819 13.865,12.048 13.696,12.217C13.528,12.385 13.299,12.48 13.06,12.48H13.07Z"
-        android:strokeLineJoin="round"
+      android:fillColor="@color/icon_on"/>
-        android:fillColor="#00000000"/>
+  <path
+      android:pathData="M16.73,16.34H8.65C8.411,16.34 8.182,16.245 8.014,16.076C7.845,15.908 7.75,15.679 7.75,15.44C7.75,15.201 7.845,14.972 8.014,14.804C8.182,14.635 8.411,14.54 8.65,14.54H16.72C16.959,14.54 17.188,14.635 17.356,14.804C17.525,14.972 17.62,15.201 17.62,15.44C17.62,15.679 17.525,15.908 17.356,16.076C17.188,16.245 16.959,16.34 16.72,16.34H16.73Z"
+      android:fillColor="@color/icon_on"/>
 </vector>

app/src/main/res/drawable/icon_sort_name_off.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.91,10.22H16.3C15.536,10.22 14.804,9.916 14.264,9.376C13.723,8.836 13.42,8.104 13.42,7.34V3.34H15.22V7.34C15.22,7.626 15.334,7.901 15.536,8.104C15.739,8.306 16.014,8.42 16.3,8.42H20.91V10.22Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M18.88,22.35H5.97C5.588,22.354 5.208,22.282 4.854,22.14C4.499,21.997 4.176,21.786 3.903,21.519C3.63,21.251 3.413,20.933 3.263,20.581C3.113,20.23 3.034,19.852 3.03,19.47V4.7C3.04,3.929 3.355,3.193 3.906,2.654C4.457,2.114 5.199,1.815 5.97,1.82H15.25L21.82,8.22V19.47C21.816,19.852 21.737,20.23 21.587,20.581C21.437,20.933 21.219,21.251 20.946,21.519C20.673,21.786 20.35,21.997 19.996,22.14C19.641,22.282 19.262,22.354 18.88,22.35ZM5.97,3.62C5.676,3.614 5.392,3.725 5.179,3.927C4.966,4.129 4.84,4.406 4.83,4.7V19.47C4.84,19.764 4.966,20.041 5.179,20.243C5.392,20.445 5.676,20.555 5.97,20.55H18.88C19.173,20.555 19.455,20.445 19.667,20.243C19.879,20.04 20.002,19.763 20.01,19.47V8.95L14.51,3.59L5.97,3.62Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M13.07,12.48H8.65C8.411,12.48 8.182,12.385 8.014,12.217C7.845,12.048 7.75,11.819 7.75,11.58C7.75,11.342 7.845,11.113 8.014,10.944C8.182,10.775 8.411,10.68 8.65,10.68H13.06C13.299,10.68 13.528,10.775 13.696,10.944C13.865,11.113 13.96,11.342 13.96,11.58C13.96,11.819 13.865,12.048 13.696,12.217C13.528,12.385 13.299,12.48 13.06,12.48H13.07Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M16.73,16.34H8.65C8.411,16.34 8.182,16.245 8.014,16.076C7.845,15.908 7.75,15.679 7.75,15.44C7.75,15.201 7.845,14.972 8.014,14.804C8.182,14.635 8.411,14.54 8.65,14.54H16.72C16.959,14.54 17.188,14.635 17.356,14.804C17.525,14.972 17.62,15.201 17.62,15.44C17.62,15.679 17.525,15.908 17.356,16.076C17.188,16.245 16.959,16.34 16.72,16.34H16.73Z"
+      android:fillColor="@color/icon_off"/>
+</vector>

app/src/main/res/drawable/icon_sort_size.xml

@@ -3,22 +3,13 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <!-- 圆圈 -->
   <path
-        android:pathData="M12,3C16.9706,3 21,7.0294 21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3Z"
+      android:pathData="M20.91,10.23H16.3C15.535,10.227 14.803,9.922 14.263,9.38C13.723,8.838 13.42,8.105 13.42,7.34V3.34H15.22V7.34C15.219,7.483 15.246,7.624 15.299,7.756C15.353,7.888 15.432,8.009 15.533,8.11C15.633,8.211 15.753,8.292 15.884,8.347C16.016,8.402 16.157,8.43 16.3,8.43H20.91V10.23Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"/>
-
-    <!-- KB 文字路径，居中 -->
   <path
-        android:pathData="M8.5,9V15M8.5,12L11,9M8.5,12L11,15M13,9V15H15C16,15 16.5,14.5 16.5,13.5C16.5,12.5 16,12 15,12H13M15,12C16,12 16.5,11.5 16.5,10.5C16.5,9.5 16,9 15,9H13"
+      android:pathData="M18.88,22.36H5.97C5.197,22.365 4.454,22.064 3.903,21.523C3.352,20.981 3.038,20.243 3.03,19.47V4.71C3.034,4.328 3.113,3.95 3.263,3.599C3.413,3.247 3.63,2.929 3.903,2.661C4.176,2.394 4.499,2.183 4.854,2.04C5.208,1.898 5.588,1.826 5.97,1.83H15.25L21.82,8.23V19.47C21.812,20.243 21.498,20.981 20.947,21.523C20.396,22.064 19.653,22.365 18.88,22.36ZM5.97,3.63C5.824,3.626 5.679,3.651 5.543,3.703C5.406,3.755 5.282,3.834 5.176,3.934C5.07,4.034 4.985,4.154 4.926,4.288C4.866,4.421 4.834,4.564 4.83,4.71V19.47C4.838,19.765 4.962,20.046 5.175,20.25C5.389,20.454 5.674,20.566 5.97,20.56H18.88C19.026,20.563 19.17,20.537 19.306,20.483C19.442,20.43 19.566,20.351 19.671,20.249C19.775,20.148 19.86,20.027 19.918,19.893C19.976,19.76 20.007,19.616 20.01,19.47V8.99L14.51,3.63H5.97Z"
-        android:strokeWidth="1.5"
+      android:fillColor="@color/icon_on"/>
-        android:strokeColor="#E43521"
+  <path
-        android:strokeLineCap="round"
+      android:pathData="M15.44,11.3H13.66L11.2,13.94V9.66H9.79V17.48H11.2V14.99L13.79,17.48H15.65L12.53,14.27L15.44,11.3Z"
-        android:strokeLineJoin="round"
+      android:fillColor="@color/icon_on"/>
-        android:fillColor="#00000000"/>
 </vector>

app/src/main/res/drawable/icon_sort_size_off.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.91,10.23H16.3C15.535,10.227 14.803,9.922 14.263,9.38C13.723,8.838 13.42,8.105 13.42,7.34V3.34H15.22V7.34C15.219,7.483 15.246,7.624 15.299,7.756C15.353,7.888 15.432,8.009 15.533,8.11C15.633,8.211 15.753,8.292 15.884,8.347C16.016,8.402 16.157,8.43 16.3,8.43H20.91V10.23Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M18.88,22.36H5.97C5.197,22.365 4.454,22.064 3.903,21.523C3.352,20.981 3.038,20.243 3.03,19.47V4.71C3.034,4.328 3.113,3.95 3.263,3.599C3.413,3.247 3.63,2.929 3.903,2.661C4.176,2.394 4.499,2.183 4.854,2.04C5.208,1.898 5.588,1.826 5.97,1.83H15.25L21.82,8.23V19.47C21.812,20.243 21.498,20.981 20.947,21.523C20.396,22.064 19.653,22.365 18.88,22.36ZM5.97,3.63C5.824,3.626 5.679,3.651 5.543,3.703C5.406,3.755 5.282,3.834 5.176,3.934C5.07,4.034 4.985,4.154 4.926,4.288C4.866,4.421 4.834,4.564 4.83,4.71V19.47C4.838,19.765 4.962,20.046 5.175,20.25C5.389,20.454 5.674,20.566 5.97,20.56H18.88C19.026,20.563 19.17,20.537 19.306,20.483C19.442,20.43 19.566,20.351 19.671,20.249C19.775,20.148 19.86,20.027 19.918,19.893C19.976,19.76 20.007,19.616 20.01,19.47V8.99L14.51,3.63H5.97Z"
+      android:fillColor="@color/icon_off"/>
+  <path
+      android:pathData="M15.44,11.3H13.66L11.2,13.94V9.66H9.79V17.48H11.2V14.99L13.79,17.48H15.65L12.53,14.27L15.44,11.3Z"
+      android:fillColor="@color/icon_off"/>
+</vector>

app/src/main/res/drawable/icon_tools_sel_off.xml

@@ -3,32 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
   <path
-        android:pathData="M3,3H10V10H3V3Z"
+      android:pathData="M20.14,22.82H3.83C2.866,22.82 1.942,22.438 1.26,21.757C0.577,21.077 0.193,20.154 0.19,19.19V7.91C0.19,6.945 0.573,6.019 1.256,5.336C1.939,4.654 2.865,4.27 3.83,4.27H20.14C21.105,4.27 22.031,4.654 22.714,5.336C23.396,6.019 23.78,6.945 23.78,7.91V19.24C23.764,20.195 23.374,21.105 22.693,21.775C22.012,22.445 21.095,22.82 20.14,22.82ZM3.81,6.07C3.568,6.07 3.329,6.118 3.106,6.21C2.883,6.302 2.68,6.438 2.509,6.609C2.338,6.78 2.203,6.983 2.11,7.206C2.018,7.429 1.97,7.668 1.97,7.91V19.24C1.97,19.481 2.018,19.72 2.11,19.943C2.203,20.165 2.339,20.368 2.51,20.538C2.681,20.708 2.883,20.842 3.107,20.934C3.33,21.025 3.569,21.071 3.81,21.07H20.14C20.381,21.071 20.62,21.025 20.843,20.934C21.066,20.842 21.27,20.708 21.441,20.538C21.611,20.368 21.747,20.165 21.84,19.943C21.932,19.72 21.98,19.481 21.98,19.24V7.91C21.98,7.422 21.786,6.954 21.441,6.609C21.096,6.264 20.628,6.07 20.14,6.07H3.81Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#CCCCCC"
-        android:strokeLineJoin="round"/>
-
   <path
-        android:pathData="M14,3H21V10H14V3Z"
+      android:pathData="M18.49,6.07H5.49V2.98C5.503,2.454 5.717,1.952 6.09,1.58C6.462,1.207 6.964,0.993 7.49,0.98H16.4C16.926,0.993 17.428,1.207 17.8,1.58C18.173,1.952 18.387,2.454 18.4,2.98L18.49,6.07ZM7.3,4.24H16.69V2.95C16.69,2.885 16.665,2.823 16.62,2.777C16.576,2.73 16.515,2.703 16.45,2.7H7.54C7.475,2.703 7.414,2.73 7.37,2.777C7.325,2.823 7.3,2.885 7.3,2.95V4.24Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#CCCCCC"
-        android:strokeLineJoin="round"/>
-
   <path
-        android:pathData="M3,14H10V21H3V14Z"
+      android:pathData="M22.9,8.97H1.09V10.77H22.9V8.97Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#CCCCCC"
-        android:strokeLineJoin="round"/>
-
   <path
-        android:pathData="M14,14H21V21H14V14Z"
+      android:pathData="M16.45,18.24H7.54C7.301,18.24 7.072,18.145 6.904,17.976C6.735,17.808 6.64,17.579 6.64,17.34C6.64,17.101 6.735,16.872 6.904,16.704C7.072,16.535 7.301,16.44 7.54,16.44H16.45C16.689,16.44 16.918,16.535 17.086,16.704C17.255,16.872 17.35,17.101 17.35,17.34C17.35,17.579 17.255,17.808 17.086,17.976C16.918,18.145 16.689,18.24 16.45,18.24Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#A9A4A4"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#CCCCCC"
-        android:strokeLineJoin="round"/>
 </vector>

app/src/main/res/drawable/icon_tools_sel_on.xml

@@ -3,32 +3,13 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
   <path
-        android:pathData="M3,3H10V10H3V3Z"
+      android:pathData="M23.81,10.77H0.2V19.19C0.215,19.567 0.305,19.938 0.465,20.281C0.624,20.623 0.85,20.931 1.129,21.185C1.408,21.44 1.734,21.637 2.09,21.765C2.445,21.893 2.823,21.949 3.2,21.93H20.87C21.247,21.949 21.625,21.893 21.98,21.765C22.336,21.637 22.662,21.44 22.941,21.185C23.22,20.931 23.446,20.623 23.605,20.281C23.765,19.938 23.855,19.567 23.87,19.19L23.81,10.77ZM16.45,18.2H7.56C7.321,18.2 7.092,18.105 6.924,17.936C6.755,17.768 6.66,17.539 6.66,17.3C6.66,17.061 6.755,16.832 6.924,16.664C7.092,16.495 7.321,16.4 7.56,16.4H16.47C16.709,16.4 16.938,16.495 17.106,16.664C17.275,16.832 17.37,17.061 17.37,17.3C17.37,17.539 17.275,17.768 17.106,17.936C16.938,18.105 16.709,18.2 16.47,18.2H16.45Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#E43521"/>
-        android:fillColor="#E43521"
-        android:strokeColor="#E43521"
-        android:strokeLineJoin="round"/>
-
   <path
-        android:pathData="M14,3H21V10H14V3Z"
+      android:pathData="M7.3,2.99C7.3,2.924 7.326,2.86 7.373,2.813C7.42,2.766 7.484,2.74 7.55,2.74H16.45C16.515,2.743 16.576,2.77 16.62,2.817C16.665,2.863 16.69,2.925 16.69,2.99V4.33H18.49V2.99C18.497,2.723 18.45,2.458 18.352,2.209C18.255,1.961 18.109,1.734 17.922,1.543C17.736,1.352 17.513,1.201 17.267,1.097C17.021,0.993 16.757,0.94 16.49,0.94H7.56C7.016,0.94 6.495,1.156 6.11,1.54C5.726,1.925 5.51,2.446 5.51,2.99V4.33H7.31L7.3,2.99Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#E43521"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#E43521"
-        android:strokeLineJoin="round"/>
-
   <path
-        android:pathData="M3,14H10V21H3V14Z"
+      android:pathData="M21.17,4.26H2.84C2.14,4.26 1.468,4.538 0.973,5.033C0.478,5.528 0.2,6.2 0.2,6.9V8.97H23.81V6.92C23.813,6.572 23.746,6.226 23.615,5.904C23.483,5.581 23.289,5.288 23.044,5.04C22.799,4.793 22.507,4.597 22.185,4.463C21.863,4.329 21.518,4.26 21.17,4.26Z"
-        android:strokeWidth="1.5"
+      android:fillColor="#E43521"/>
-        android:fillColor="#00000000"
-        android:strokeColor="#E43521"
-        android:strokeLineJoin="round"/>
-
-    <path
-        android:pathData="M14,14H21V21H14V14Z"
-        android:strokeWidth="1.5"
-        android:fillColor="#E43521"
-        android:strokeColor="#E43521"
-        android:strokeLineJoin="round"/>
 </vector>

app/src/main/res/drawable/search.xml

@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M11,4C7.13,4 4,7.13 4,11C4,14.87 7.13,18 11,18C14.87,18 18,14.87 18,11C18,7.13 14.87,4 11,4Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-
-    <path
-        android:pathData="M16.5,16.5L20,20"
-        android:strokeWidth="1.5"
-        android:strokeColor="#000000"
-        android:strokeLineCap="round" />
-</vector>

app/src/main/res/drawable/sidebar.xml

@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-  <path
-      android:pathData="M3,6H21"
-      android:strokeWidth="1.5"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-
-  <path
-      android:pathData="M3,12H17"
-      android:strokeWidth="1.5"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-
-  <path
-      android:pathData="M3,18H13"
-      android:strokeWidth="1.5"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-</vector>

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_color"
+    android:background="#E43521"
     android:orientation="vertical">
 
     <View
@@ -21,15 +21,15 @@
             android:id="@+id/sidebarBtn"
             android:layout_width="44dp"
             android:layout_height="44dp"
-            android:visibility="gone"
             android:layout_marginStart="6dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
-            android:gravity="center">
+            android:gravity="center"
+            android:visibility="visible">
 
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/sidebar" />
+                android:src="@drawable/icon_sidebar" />
         </LinearLayout>
 
 
@@ -41,7 +41,7 @@
             android:layout_marginEnd="6dp"
             android:layout_weight="1"
             android:text="@string/app_name"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="18sp" />
 
         <LinearLayout
@@ -60,11 +60,11 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/search" />
+                    android:src="@drawable/icon_search" />
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/sortingBtn"
+                android:id="@+id/multiSelectBtn"
                 android:layout_width="44dp"
                 android:layout_height="44dp"
                 android:layout_marginEnd="6dp"
@@ -72,10 +72,9 @@
                 android:gravity="center">
 
                 <ImageView
-                    android:id="@+id/sortingImg"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/sorting" />
+                    android:src="@drawable/icon_multi_select" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
@@ -99,7 +98,7 @@
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/back_black" />
+                android:src="@drawable/back_white" />
         </LinearLayout>
 
 
@@ -112,7 +111,7 @@
             android:layout_marginEnd="6dp"
             android:layout_weight="1"
             android:text="@string/selected_page"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="18sp" />
 
         <LinearLayout
@@ -123,17 +122,21 @@
             android:gravity="center">
 
             <ImageView
-                android:id="@+id/multiSelectAllIv"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:background="@drawable/dr_circular_sel_off_bg"
+                android:src="@drawable/icon_select_all" />
-                android:padding="2dp"
-                android:src="@drawable/gou_white" />
 
         </LinearLayout>
     </LinearLayout>
 
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/dr_top_left_radius_white_bg"
+        android:orientation="vertical">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -445,5 +448,7 @@
             </LinearLayout>
 
         </LinearLayout>
+    </LinearLayout>
+
 
 </LinearLayout>

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

@@ -56,7 +56,7 @@
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/search" />
+                android:src="@drawable/icon_search" />
         </LinearLayout>
 
     </LinearLayout>

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

@@ -80,7 +80,7 @@
                             android:id="@+id/searchIv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/search" />
+                            android:src="@drawable/icon_search" />
 
                         <ImageView
                             android:id="@+id/deleteIv"
@@ -154,7 +154,7 @@
                     <ImageView
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:src="@drawable/search" />
+                        android:src="@drawable/icon_search" />
 
                 </LinearLayout>
 

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

@@ -63,7 +63,7 @@
                     android:id="@+id/searchIv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/search" />
+                    android:src="@drawable/icon_search" />
 
                 <ImageView
                     android:id="@+id/deleteIv"

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

@@ -4,25 +4,21 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginTop="6dp"
+    android:layout_marginTop="8dp"
-    android:layout_marginEnd="16dp"
+    android:layout_marginEnd="6dp"
-    android:layout_marginBottom="6dp"
+    android:layout_marginBottom="8dp"
-    android:background="@drawable/dr_item_click_btn_bg"
     android:orientation="vertical"
     tools:ignore="RtlSymmetry">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <RelativeLayout
-            android:layout_width="56dp"
+            android:layout_width="66dp"
-            android:layout_height="56dp">
+            android:layout_height="80dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -38,21 +34,21 @@
             </LinearLayout>
 
             <RelativeLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:background="@drawable/dr_item_img_frame">
 
                 <ImageView
                     android:id="@+id/tvFileImg"
-                    android:layout_width="56dp"
+                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
+                    android:layout_height="match_parent"
                     android:layout_margin="0.5dp" />
             </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/lock_layout"
-                android:layout_width="56dp"
+                android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="match_parent"
                 android:background="@drawable/dr_item_lock_bg"
                 android:gravity="center"
                 android:visibility="gone">
@@ -60,27 +56,27 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/lock" />
+                    android:src="@drawable/icon_lock_item" />
             </LinearLayout>
 
             <ImageView
                 android:id="@+id/collectState"
-                android:layout_width="16dp"
+                android:layout_width="24dp"
-                android:layout_height="16dp"
+                android:layout_height="24dp"
                 android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
                 android:background="@drawable/dr_collect_state_bg"
                 android:padding="2dp"
                 android:src="@drawable/collected_white" />
 
         </RelativeLayout>
 
-        <LinearLayout
+        <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             android:layout_weight="1"
-            android:gravity="center_vertical"
             android:orientation="vertical">
 
             <TextView
@@ -88,6 +84,7 @@
                 style="@style/TextViewFont_PopSemiBold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
                 android:ellipsize="middle"
                 android:maxLines="1"
                 android:text="@string/app_name"
@@ -97,7 +94,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_below="@+id/tvFileName"
+                android:layout_marginTop="2dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -108,7 +106,7 @@
                     android:layout_height="wrap_content"
                     android:text="2月27,2025"
                     android:textColor="@color/black_60"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/tvFileSize"
@@ -118,16 +116,40 @@
                     android:layout_marginStart="8dp"
                     android:text="8.1MB"
                     android:textColor="@color/black_60"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
-
-            </LinearLayout>
 
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="2dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/icon_file_gray" />
+
+                <TextView
+                    android:id="@+id/fileTv"
+                    style="@style/TextViewFont_PopMedium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="download"
+                    android:textColor="@color/black_60"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
         <LinearLayout
             android:id="@+id/moreBtn"
-            android:layout_width="48dp"
+            android:layout_width="44dp"
-            android:layout_height="48dp"
+            android:layout_height="44dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
             android:gravity="center">
 
@@ -139,8 +161,8 @@
 
         <LinearLayout
             android:id="@+id/checkBtn"
-            android:layout_width="48dp"
+            android:layout_width="44dp"
-            android:layout_height="48dp"
+            android:layout_height="44dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
             android:gravity="center">
 
@@ -149,6 +171,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
+                android:button="@drawable/checkbox_selector"
                 android:clickable="false"
                 android:duplicateParentState="true"
                 android:focusable="false" />
@@ -156,8 +179,8 @@
 
         <LinearLayout
             android:id="@+id/deleteBtn"
-            android:layout_width="48dp"
+            android:layout_width="44dp"
-            android:layout_height="48dp"
+            android:layout_height="44dp"
             android:background="@drawable/dr_click_effect_oval_transparent"
             android:gravity="center">
 

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

@@ -48,7 +48,7 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/lock" />
+                    android:src="@drawable/icon_lock_item" />
             </LinearLayout>
 
 

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

@@ -40,8 +40,8 @@
                 android:layout_marginStart="16dp"
                 android:layout_weight="1"
                 android:text="@string/created_date"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
-                android:textColor="@color/black"
+                android:textColor="@color/icon_on"
                 android:textSize="16sp" />
 
             <ImageView
@@ -69,10 +69,10 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
                 android:layout_weight="1"
                 android:text="@string/file_name"
-                android:textColor="@color/black"
+                android:textColor="@color/icon_on"
                 android:textSize="16sp" />
 
             <ImageView
@@ -102,9 +102,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
                 android:text="@string/file_size"
-                android:textColor="@color/black"
+                android:textColor="@color/icon_on"
                 android:textSize="16sp" />
 
             <ImageView
@@ -147,9 +147,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
                 android:text="@string/ascending"
-                android:textColor="@color/black"
+                android:textColor="@color/icon_on"
                 android:textSize="16sp" />
 
             <ImageView
@@ -180,8 +180,8 @@
                 android:layout_marginStart="16dp"
                 android:layout_weight="1"
                 android:text="@string/descending"
-                style="@style/TextViewFont_PopRegular"
+                style="@style/TextViewFont_PopMedium"
-                android:textColor="@color/black"
+                android:textColor="@color/icon_on"
                 android:textSize="16sp" />
 
             <ImageView

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

@@ -31,6 +31,32 @@
             android:textSize="20sp" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/sortingBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="42dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/dr_click_effect_rectangle_transparent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/sortingTv"
+            style="@style/TextViewFont_PopMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sort_by_last_modified"
+            android:textColor="@color/text_red_lv1"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:src="@drawable/icon_arrow_down" />
+    </LinearLayout>
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"

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

@@ -31,6 +31,32 @@
             android:textSize="20sp" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/sortingBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="42dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/dr_click_effect_rectangle_transparent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/sortingTv"
+            style="@style/TextViewFont_PopMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/sort_by_last_modified"
+            android:textColor="@color/text_red_lv1"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:src="@drawable/icon_arrow_down" />
+    </LinearLayout>
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"

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

@@ -31,11 +31,11 @@
             android:textSize="20sp" />
     </LinearLayout>
 
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"

app/src/main/res/values/colors.xml

@@ -24,6 +24,8 @@
     <color name="text_red_lv2">#BB6D64</color>
     <color name="btn_sel_on_color">#E43521</color>
     <color name="btn_sel_off_color">#33E43521</color>
-    <color name="placeholder_bg_color">#E8EAEE</color>
+    <color name="placeholder_bg_color">#E5E5E5</color>
     <color name="night_mode_bg_color">#A6000000</color>
+    <color name="icon_off">#A9A4A4</color>
+    <color name="icon_on">#E43521</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -166,4 +166,7 @@
     <string name="press_again_to_exit">Press again to exit</string>
     <string name="enter_search_key">Please enter the search keyword</string>
     <string name="no_more_results">No more results</string>
+    <string name="sort_by_last_modified">Sort by Last modified</string>
+    <string name="sort_by_name">Sort by Name</string>
+    <string name="sort_by_size">Sort by Size</string>
 </resources>