SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dashboard groups refresh

Browse source
This commit is contained in:
世界 2024-03-12 18:58:29 +08:00
parent 096d5ef43d
commit 7ac5786548
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
View file

@ -92,18 +92,34 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
}
@SuppressLint("NotifyDataSetChanged")
override fun updateGroups(groups: List<OutboundGroup>) {
override fun updateGroups(newGroups: MutableList<OutboundGroup>) {
val adapter = adapter ?: return
activity?.runOnUiThread {
updateDisplayed(groups.isNotEmpty())
adapter.groups = groups
adapter.notifyDataSetChanged()
updateDisplayed(newGroups.isNotEmpty())
adapter.setGroups(newGroups)
}
}
private class Adapter : RecyclerView.Adapter<GroupView>() {
lateinit var groups: List<OutboundGroup>
private lateinit var groups: MutableList<OutboundGroup>
@SuppressLint("NotifyDataSetChanged")
fun setGroups(newGroups: MutableList<OutboundGroup>) {
if (!::groups.isInitialized || groups.size != newGroups.size) {
groups = newGroups
notifyDataSetChanged()
} else {
newGroups.forEachIndexed { index, group ->
if (this.groups[index] != group) {
this.groups[index] = group
notifyItemChanged(index)
}
}
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupView {
return GroupView(
ViewDashboardGroupBinding.inflate(
@ -157,19 +173,11 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
if (!::adapter.isInitialized) {
adapter = ItemAdapter(this, group, items)
binding.itemList.adapter = adapter
/* val divider =
MaterialDividerItemDecoration(
binding.root.context,
LinearLayoutManager.VERTICAL
)
divider.isLastItemDecorated = false
binding.itemList.addItemDecoration(divider)*/
(binding.itemList.itemAnimator as SimpleItemAnimator).supportsChangeAnimations =
false
binding.itemList.layoutManager = LinearLayoutManager(binding.root.context)
} else {
adapter.items = items
adapter.notifyDataSetChanged()
adapter.setItems(items)
}
updateExpand()
}
@ -234,9 +242,25 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
private class ItemAdapter(
val groupView: GroupView,
val group: OutboundGroup,
var items: List<OutboundGroupItem> = emptyList()
private var items: MutableList<OutboundGroupItem> = mutableListOf()
) :
RecyclerView.Adapter<ItemGroupView>() {
@SuppressLint("NotifyDataSetChanged")
fun setItems(newItems: MutableList<OutboundGroupItem>) {
if (items.size != newItems.size) {
items = newItems
notifyDataSetChanged()
} else {
newItems.forEachIndexed { index, item ->
if (items[index] != item) {
items[index] = item
notifyItemChanged(index)
}
}
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemGroupView {
return ItemGroupView(
ViewDashboardGroupItemBinding.inflate(

2
app/src/main/java/io/nekohasekai/sfa/utils/CommandClient.kt
View file

@ -31,7 +31,7 @@ open class CommandClient(
fun onConnected() {}
fun onDisconnected() {}
fun updateStatus(status: StatusMessage) {}
fun updateGroups(groups: List<OutboundGroup>) {}
fun updateGroups(newGroups: MutableList<OutboundGroup>) {}
fun clearLog() {}
fun appendLog(message: String) {}
fun initializeClashMode(modeList: List<String>, currentMode: String) {}