diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index c393cbde4..aac30e901 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -95,6 +95,7 @@ object PreferKey { const val uploadRule = "uploadRule" const val tocUiUseReplace = "tocUiUseReplace" const val enableReadRecord = "enableReadRecord" + const val localBookImportSort = "localBookImportSort" const val customWelcome = "customWelcome" const val welcomeImage = "welcomeImagePath" const val welcomeImageDark = "welcomeImagePathDark" @@ -103,6 +104,7 @@ object PreferKey { const val welcomeShowIcon = "welcomeShowIcon" const val welcomeShowIconDark = "welcomeShowIconDark" + const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" const val cBackground = "colorBackground" diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt index 72f111296..553f04aa2 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt @@ -12,6 +12,7 @@ import androidx.documentfile.provider.DocumentFile import androidx.recyclerview.widget.LinearLayoutManager import io.legado.app.R import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.PreferKey import io.legado.app.data.appDb import io.legado.app.databinding.ActivityImportBookBinding import io.legado.app.databinding.DialogEditTextBinding @@ -80,18 +81,9 @@ class ImportBookActivity : VMBaseActivity selectFolder.launch() R.id.menu_scan_folder -> scanFolder() R.id.menu_import_file_name -> alertImportFileName() - R.id.menu_sort_name -> { - viewModel.sort = 0 - upSort() - } - R.id.menu_sort_size -> { - viewModel.sort = 1 - upSort() - } - R.id.menu_sort_time -> { - viewModel.sort = 2 - upSort() - } + R.id.menu_sort_name -> upSort(0) + R.id.menu_sort_size -> upSort(1) + R.id.menu_sort_time -> upSort(2) } return super.onCompatOptionsItemSelected(item) } @@ -203,7 +195,9 @@ class ImportBookActivity : VMBaseActivity Unit)? = null val dataFlow = callbackFlow> {