diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/Groups.kt b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/Groups.kt new file mode 100644 index 0000000..0a63da1 --- /dev/null +++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/Groups.kt @@ -0,0 +1,12 @@ +package io.nekohasekai.sfa.ui.dashboard + +import io.nekohasekai.libbox.OutboundGroupItem +import io.nekohasekai.libbox.OutboundGroupItemIterator + +internal fun OutboundGroupItemIterator.toList(): List { + val list = mutableListOf() + while (hasNext()) { + list.add(next()) + } + return list +} \ No newline at end of file diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt index e95c75a..07e3cab 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt @@ -2,20 +2,20 @@ package io.nekohasekai.sfa.ui.dashboard import android.annotation.SuppressLint import android.os.Bundle -import android.text.Spannable -import android.text.SpannableStringBuilder -import android.text.style.ForegroundColorSpan +import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.view.isInvisible import androidx.core.view.isVisible +import androidx.core.widget.addTextChangedListener import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator +import com.google.android.material.textfield.MaterialAutoCompleteTextView import io.nekohasekai.libbox.Libbox import io.nekohasekai.libbox.OutboundGroup import io.nekohasekai.libbox.OutboundGroupItem @@ -26,6 +26,7 @@ import io.nekohasekai.sfa.databinding.ViewDashboardGroupBinding import io.nekohasekai.sfa.databinding.ViewDashboardGroupItemBinding import io.nekohasekai.sfa.ktx.colorForURLTestDelay import io.nekohasekai.sfa.ktx.errorDialogBuilder +import io.nekohasekai.sfa.ktx.text import io.nekohasekai.sfa.ui.MainActivity import io.nekohasekai.sfa.utils.CommandClient import kotlinx.coroutines.Dispatchers @@ -146,9 +147,10 @@ class GroupsFragment : Fragment(), CommandClient.Handler { private class GroupView(val binding: ViewDashboardGroupBinding) : RecyclerView.ViewHolder(binding.root) { - lateinit var group: OutboundGroup - lateinit var items: MutableList - lateinit var adapter: ItemAdapter + private lateinit var group: OutboundGroup + private lateinit var items: MutableList + private lateinit var adapter: ItemAdapter + private lateinit var textWatcher: TextWatcher @SuppressLint("NotifyDataSetChanged") fun bind(group: OutboundGroup) { @@ -197,29 +199,23 @@ class GroupsFragment : Fragment(), CommandClient.Handler { } } binding.itemList.isVisible = newExpandStatus - binding.itemText.isVisible = !newExpandStatus + binding.groupSelected.isVisible = !newExpandStatus if (!newExpandStatus) { - val builder = SpannableStringBuilder() - items.forEach { - if (it.tag == group.selected) { - builder.append("▣") - } else { - builder.append("■") + binding.groupSelected.text = group.selected + binding.groupSelected.isEnabled = group.selectable + if (group.selectable) { + val textView = (binding.groupSelected.editText as MaterialAutoCompleteTextView) + textView.setSimpleItems(group.items.toList().map { it.tag }.toTypedArray()) + if (::textWatcher.isInitialized) { + textView.removeTextChangedListener(textWatcher) + } + textWatcher = textView.addTextChangedListener { + val selected = textView.text.toString() + if (selected != group.selected) { + updateSelected(group, selected) + } } - builder.setSpan( - ForegroundColorSpan( - colorForURLTestDelay( - binding.root.context, - it.urlTestDelay - ) - ), - builder.length - 1, - builder.length, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ) - builder.append(" ") } - binding.itemText.text = builder } if (newExpandStatus) { binding.expandButton.setImageResource(R.drawable.ic_expand_less_24) @@ -231,9 +227,9 @@ class GroupsFragment : Fragment(), CommandClient.Handler { } } - fun updateSelected(group: OutboundGroup, item: OutboundGroupItem) { + fun updateSelected(group: OutboundGroup, itemTag: String) { val oldSelected = items.indexOfFirst { it.tag == group.selected } - group.selected = item.tag + group.selected = itemTag if (oldSelected != -1) { adapter.notifyItemChanged(oldSelected) } @@ -288,7 +284,7 @@ class GroupsFragment : Fragment(), CommandClient.Handler { if (group.selectable) { binding.itemCard.setOnClickListener { binding.selectedView.isVisible = true - groupView.updateSelected(group, item) + groupView.updateSelected(group, item.tag) GlobalScope.launch { runCatching { Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag) @@ -315,6 +311,5 @@ class GroupsFragment : Fragment(), CommandClient.Handler { } } } - } diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt b/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt index 89b0d98..92f3ece 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt @@ -82,13 +82,13 @@ class PerAppProxyActivity : AbstractActivity() { setTitle(R.string.title_per_app_proxy) lifecycleScope.launch { - proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_EXCLUDE) { - Settings.PER_APP_PROXY_EXCLUDE - } else { + proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) { Settings.PER_APP_PROXY_INCLUDE + } else { + Settings.PER_APP_PROXY_EXCLUDE } withContext(Dispatchers.Main) { - if (proxyMode != Settings.PER_APP_PROXY_EXCLUDE) { + if (proxyMode == Settings.PER_APP_PROXY_INCLUDE) { binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_include_description) } else { binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_exclude_description) @@ -438,16 +438,18 @@ class PerAppProxyActivity : AbstractActivity() { R.id.action_select_all -> { val selectedUIDs = mutableSetOf() - for (packageCache in packages) { - selectedUIDs.add(packageCache.uid) + currentPackages.forEach { + selectedUIDs.add(it.uid) + } + lifecycleScope.launch { + postSaveSelectedApplications(selectedUIDs) } - this.selectedUIDs = selectedUIDs - saveSelectedApplications() } R.id.action_deselect_all -> { - selectedUIDs = mutableSetOf() - saveSelectedApplications() + lifecycleScope.launch { + postSaveSelectedApplications(mutableSetOf()) + } } R.id.action_export -> { @@ -502,6 +504,8 @@ class PerAppProxyActivity : AbstractActivity() { R.id.action_scan_china_apps -> { scanChinaApps() } + + else -> return super.onOptionsItemSelected(item) } return true } @@ -511,8 +515,14 @@ class PerAppProxyActivity : AbstractActivity() { val binding = DialogProgressbarBinding.inflate(layoutInflater) binding.progress.max = currentPackages.size binding.message.setText(R.string.message_scanning) + val dialogTheme = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && resources.configuration.isNightModeActive) { + com.google.android.material.R.style.Theme_MaterialComponents_Dialog + } else { + com.google.android.material.R.style.Theme_MaterialComponents_Light_Dialog + } val progress = MaterialAlertDialogBuilder( - this, com.google.android.material.R.style.Theme_MaterialComponents_Dialog + this, dialogTheme ).setView(binding.root).setCancelable(false).create() progress.show() lifecycleScope.launch { diff --git a/app/src/main/res/layout/view_dashboard_group.xml b/app/src/main/res/layout/view_dashboard_group.xml index 018ec0a..4bc37a5 100644 --- a/app/src/main/res/layout/view_dashboard_group.xml +++ b/app/src/main/res/layout/view_dashboard_group.xml @@ -70,11 +70,21 @@ - + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:hint="@string/group_selected_title"> + + + + + app:cardCornerRadius="4dp" + app:cardElevation="0dp"> Traffic Traffic Total + Selected + Profile Version Core