优化源导入

app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt

@@ -72,6 +72,7 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
                                 groups.addAll(it)
                             }
                             groups.add(group)
+                            source.bookSourceGroup = groups.joinToString(",")
                         } else {
                             source.bookSourceGroup = group
                         }

app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt

@@ -20,7 +20,7 @@ import io.legado.app.constant.AppPattern
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.RssSource
-import io.legado.app.databinding.DialogEditTextBinding
+import io.legado.app.databinding.DialogCustomGroupBinding
 import io.legado.app.databinding.DialogRecyclerViewBinding
 import io.legado.app.databinding.ItemSourceImportBinding
 import io.legado.app.help.AppConfig
@@ -80,6 +80,7 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe
         return inflater.inflate(R.layout.dialog_recycler_view, container)
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         binding.toolBar.setBackgroundColor(primaryColor)
         binding.toolBar.setTitle(R.string.import_rss_source)
@@ -165,29 +166,7 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe
     @SuppressLint("InflateParams")
     override fun onMenuItemClick(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_new_group -> {
-                alert(R.string.diy_edit_source_group) {
-                    val alertBinding = DialogEditTextBinding.inflate(layoutInflater).apply {
-                        val groups = linkedSetOf<String>()
-                        appDb.rssSourceDao.allGroup.forEach { group ->
-                            groups.addAll(group.splitNotBlank(AppPattern.splitGroupRegex))
-                        }
-                        textInputLayout.setHint(R.string.group_name)
-                        editView.setFilterValues(groups.toList())
-                        editView.dropDownHeight = 180.dp
-                    }
-                    customView {
-                        alertBinding.root
-                    }
-                    okButton {
-                        alertBinding.editView.text?.toString()?.let { group ->
-                            viewModel.groupName = group
-                            item.title = getString(R.string.diy_edit_source_group_title, group)
-                        }
-                    }
-                    noButton()
-                }.show()
-            }
+            R.id.menu_new_group -> alertCustomGroup(item)
             R.id.menu_Keep_original_name -> {
                 item.isChecked = !item.isChecked
                 putPrefBoolean(PreferKey.importKeepName, item.isChecked)
@@ -196,6 +175,38 @@ class ImportRssSourceDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListe
         return false
     }
 
+    private fun alertCustomGroup(item: MenuItem) {
+        alert(R.string.diy_edit_source_group) {
+            val alertBinding = DialogCustomGroupBinding.inflate(layoutInflater).apply {
+                val groups = linkedSetOf<String>()
+                appDb.rssSourceDao.allGroup.forEach { group ->
+                    groups.addAll(group.splitNotBlank(AppPattern.splitGroupRegex))
+                }
+                textInputLayout.setHint(R.string.group_name)
+                editView.setFilterValues(groups.toList())
+                editView.dropDownHeight = 180.dp
+            }
+            customView {
+                alertBinding.root
+            }
+            okButton {
+                viewModel.isAddGroup = alertBinding.swAddGroup.isChecked
+                viewModel.groupName = alertBinding.editView.text?.toString()
+                if (viewModel.groupName.isNullOrBlank()) {
+                    item.title = getString(R.string.diy_source_group)
+                } else {
+                    val group = getString(R.string.diy_edit_source_group_title, viewModel.groupName)
+                    if (viewModel.isAddGroup) {
+                        item.title = "+$group"
+                    } else {
+                        item.title = group
+                    }
+                }
+            }
+            noButton()
+        }.show()
+    }
+
     inner class SourcesAdapter(context: Context) :
         RecyclerAdapter<RssSource, ItemSourceImportBinding>(context) {
 

app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import com.jayway.jsonpath.JsonPath
 import io.legado.app.R
 import io.legado.app.base.BaseViewModel
+import io.legado.app.constant.AppPattern
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.AppConfig
@@ -16,6 +17,7 @@ import io.legado.app.help.storage.Restore
 import io.legado.app.utils.*
 
 class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
+    var isAddGroup = false
     var groupName: String? = null
     val errorLiveData = MutableLiveData<String>()
     val successLiveData = MutableLiveData<Int>()
@@ -45,6 +47,7 @@ class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
 
     fun importSelect(finally: () -> Unit) {
         execute {
+            val group = groupName?.trim()
             val keepName = AppConfig.importKeepName
             val selectSource = arrayListOf<RssSource>()
             selectStatus.forEachIndexed { index, b ->
@@ -57,8 +60,17 @@ class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
                             source.customOrder = it.customOrder
                         }
                     }
-                    if (groupName != null) {
-                        source.sourceGroup = groupName
+                    if (!group.isNullOrEmpty()) {
+                        if (isAddGroup) {
+                            val groups = linkedSetOf<String>()
+                            source.sourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.let {
+                                groups.addAll(it)
+                            }
+                            groups.add(group)
+                            source.sourceGroup = groups.joinToString(",")
+                        } else {
+                            source.sourceGroup = group
+                        }
                     }
                     selectSource.add(source)
                 }