feat: 优化

app/src/main/java/io/legado/app/service/help/CheckSource.kt

@@ -10,7 +10,7 @@ import org.jetbrains.anko.toast
 
 object CheckSource {
 
-    fun start(context: Context, sources: LinkedHashSet<BookSource>) {
+    fun start(context: Context, sources: List<BookSource>) {
         if (sources.isEmpty()) {
             context.toast(R.string.non_select)
             return

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt

@@ -46,14 +46,14 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
         callBack.upCountView()
     }
 
-    fun getSelection(): LinkedHashSet<BookSource> {
-        val selection = linkedSetOf<BookSource>()
+    fun getSelection(): List<BookSource> {
+        val selection = arrayListOf<BookSource>()
         getItems().map {
             if (selected.contains(it)) {
                 selection.add(it)
             }
         }
-        return selection
+        return selection.sortedBy { it.customOrder }
     }
 
     override fun convert(holder: ItemViewHolder, item: BookSource, payloads: MutableList<Any>) {

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt

@@ -57,7 +57,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun enableSelection(sources: LinkedHashSet<BookSource>) {
+    fun enableSelection(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -67,7 +67,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun disableSelection(sources: LinkedHashSet<BookSource>) {
+    fun disableSelection(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -77,7 +77,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun enableSelectExplore(sources: LinkedHashSet<BookSource>) {
+    fun enableSelectExplore(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -87,7 +87,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun disableSelectExplore(sources: LinkedHashSet<BookSource>) {
+    fun disableSelectExplore(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -97,13 +97,13 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun delSelection(sources: LinkedHashSet<BookSource>) {
+    fun delSelection(sources: List<BookSource>) {
         execute {
             App.db.bookSourceDao().delete(*sources.toTypedArray())
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<BookSource>, file: File) {
+    fun exportSelection(sources: List<BookSource>, file: File) {
         execute {
             val json = GSON.toJson(sources)
             FileUtils.createFileIfNotExist(file, "exportBookSource.json")
@@ -115,7 +115,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<BookSource>, doc: DocumentFile) {
+    fun exportSelection(sources: List<BookSource>, doc: DocumentFile) {
         execute {
             val json = GSON.toJson(sources)
             doc.findFile("exportBookSource.json")?.delete()

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -204,7 +204,7 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
 
     private fun upGroupMenu() {
         groupMenu?.removeGroup(R.id.source_group)
-        groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
+        groups.sortedWith(Collator.getInstance(Locale.CHINESE))
             .map {
                 groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
             }

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt

@@ -40,14 +40,14 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
         callBack.upCountView()
     }
 
-    fun getSelection(): LinkedHashSet<RssSource> {
-        val selection = linkedSetOf<RssSource>()
+    fun getSelection(): List<RssSource> {
+        val selection = arrayListOf<RssSource>()
         getItems().forEach {
             if (selected.contains(it)) {
                 selection.add(it)
             }
         }
-        return selection
+        return selection.sortedBy { it.customOrder }
     }
 
     override fun convert(holder: ItemViewHolder, item: RssSource, payloads: MutableList<Any>) {

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt

@@ -55,7 +55,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun enableSelection(sources: LinkedHashSet<RssSource>) {
+    fun enableSelection(sources: List<RssSource>) {
         execute {
             val list = arrayListOf<RssSource>()
             sources.forEach {
@@ -65,7 +65,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun disableSelection(sources: LinkedHashSet<RssSource>) {
+    fun disableSelection(sources: List<RssSource>) {
         execute {
             val list = arrayListOf<RssSource>()
             sources.forEach {
@@ -75,13 +75,13 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun delSelection(sources: LinkedHashSet<RssSource>) {
+    fun delSelection(sources: List<RssSource>) {
         execute {
             App.db.rssSourceDao().delete(*sources.toTypedArray())
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<RssSource>, file: File) {
+    fun exportSelection(sources: List<RssSource>, file: File) {
         execute {
             val json = GSON.toJson(sources)
             FileUtils.createFileIfNotExist(file, "exportRssSource.json")
@@ -93,7 +93,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<RssSource>, doc: DocumentFile) {
+    fun exportSelection(sources: List<RssSource>, doc: DocumentFile) {
         execute {
             val json = GSON.toJson(sources)
             doc.findFile("exportRssSource.json")?.delete()