From dd9db2599b236331750bf41f468cae851a9e7ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Fri, 4 Aug 2023 21:04:45 +0800 Subject: [PATCH] Improve dashboard --- .../java/io/nekohasekai/sfa/ktx/Colors.kt | 14 + .../sfa/ui/dashboard/GroupsFragment.kt | 297 +++++++++++ .../sfa/ui/dashboard/OverviewFragment.kt | 262 ++++++++++ .../sfa/ui/main/DashboardFragment.kt | 242 +-------- .../main/res/drawable/ic_electric_bolt_24.xml | 5 + .../main/res/drawable/ic_expand_less_24.xml | 5 + .../main/res/drawable/ic_expand_more_24.xml | 5 + .../main/res/layout/fragment_dashboard.xml | 419 +--------------- .../res/layout/fragment_dashboard_groups.xml | 22 + .../layout/fragment_dashboard_overview.xml | 472 ++++++++++++++++++ .../main/res/layout/view_dashboard_group.xml | 73 +++ .../res/layout/view_dashboard_group_item.xml | 77 +++ app/src/main/res/values/strings.xml | 14 +- 13 files changed, 1283 insertions(+), 624 deletions(-) create mode 100644 app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt create mode 100644 app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt create mode 100644 app/src/main/res/drawable/ic_electric_bolt_24.xml create mode 100644 app/src/main/res/drawable/ic_expand_less_24.xml create mode 100644 app/src/main/res/drawable/ic_expand_more_24.xml create mode 100644 app/src/main/res/layout/fragment_dashboard_groups.xml create mode 100644 app/src/main/res/layout/fragment_dashboard_overview.xml create mode 100644 app/src/main/res/layout/view_dashboard_group.xml create mode 100644 app/src/main/res/layout/view_dashboard_group_item.xml diff --git a/app/src/main/java/io/nekohasekai/sfa/ktx/Colors.kt b/app/src/main/java/io/nekohasekai/sfa/ktx/Colors.kt index 6d7521b..9c5b1f2 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ktx/Colors.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ktx/Colors.kt @@ -1,6 +1,7 @@ package io.nekohasekai.sfa.ktx import android.content.Context +import android.graphics.Color import android.util.TypedValue import androidx.annotation.AttrRes import androidx.annotation.ColorInt @@ -15,3 +16,16 @@ fun Context.getAttrColor( theme.resolveAttribute(attrColor, typedValue, resolveRefs) return typedValue.data } + +@ColorInt +fun colorForURLTestDelay(urlTestDelay: Int): Int { + return if (urlTestDelay <= 0) { + Color.GRAY + } else if (urlTestDelay <= 800) { + Color.GREEN + } else if (urlTestDelay <= 1500) { + Color.YELLOW + } else { + Color.RED + } +} \ 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 new file mode 100644 index 0000000..6c0096a --- /dev/null +++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt @@ -0,0 +1,297 @@ +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.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.view.isInvisible +import androidx.core.view.isVisible +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 go.Seq +import io.nekohasekai.libbox.CommandClient +import io.nekohasekai.libbox.CommandClientHandler +import io.nekohasekai.libbox.CommandClientOptions +import io.nekohasekai.libbox.Libbox +import io.nekohasekai.libbox.OutboundGroup +import io.nekohasekai.libbox.OutboundGroupItem +import io.nekohasekai.libbox.OutboundGroupIterator +import io.nekohasekai.libbox.StatusMessage +import io.nekohasekai.sfa.R +import io.nekohasekai.sfa.constant.Status +import io.nekohasekai.sfa.databinding.FragmentDashboardGroupsBinding +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.ui.MainActivity +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + + +class GroupsFragment : Fragment(), CommandClientHandler { + + private val activity: MainActivity? get() = super.getActivity() as MainActivity? + private var _binding: FragmentDashboardGroupsBinding? = null + private val binding get() = _binding!! + private var commandClient: CommandClient? = null + + private var _adapter: Adapter? = null + private val adapter get() = _adapter!! + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? + ): View { + _binding = FragmentDashboardGroupsBinding.inflate(inflater, container, false) + onCreate() + return binding.root + } + + private fun onCreate() { + val activity = activity ?: return + _adapter = Adapter() + binding.container.adapter = adapter + binding.container.layoutManager = LinearLayoutManager(requireContext()) + activity.serviceStatus.observe(viewLifecycleOwner) { + if (it == Status.Started) { + reconnect() + } + } + } + + private fun reconnect() { + disconnect() + val options = CommandClientOptions() + options.command = Libbox.CommandGroup + options.statusInterval = 2 * 1000 * 1000 * 1000 + val commandClient = CommandClient(requireContext().filesDir.absolutePath, this, options) + this.commandClient = commandClient + lifecycleScope.launch(Dispatchers.IO) { + for (i in 1..3) { + delay(100) + try { + commandClient.connect() + break + } catch (e: Exception) { + break + } + } + } + } + + private fun disconnect() { + commandClient?.apply { + runCatching { + disconnect() + } + Seq.destroyRef(refnum) + } + commandClient = null + } + + override fun connected() { + val binding = _binding ?: return + lifecycleScope.launch(Dispatchers.Main) { + binding.statusText.isVisible = false + binding.container.isVisible = true + } + } + + override fun disconnected(message: String?) { + val binding = _binding ?: return + lifecycleScope.launch(Dispatchers.Main) { + binding.statusText.isVisible = true + binding.container.isVisible = false + } + } + + @SuppressLint("NotifyDataSetChanged") + override fun writeGroups(message: OutboundGroupIterator) { + val groups = mutableListOf() + while (message.hasNext()) { + groups.add(message.next()) + } + activity?.runOnUiThread { + adapter.groups = groups + adapter.notifyDataSetChanged() + } + } + + override fun writeLog(message: String?) { + } + + override fun writeStatus(message: StatusMessage?) { + } + + private class Adapter : RecyclerView.Adapter() { + + lateinit var groups: List + private val expandStatus: MutableMap = mutableMapOf() + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupView { + return GroupView( + ViewDashboardGroupBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ), + expandStatus + ) + } + + override fun getItemCount(): Int { + if (!::groups.isInitialized) { + return 0 + } + return groups.size + } + + override fun onBindViewHolder(holder: GroupView, position: Int) { + holder.bind(groups[position]) + } + } + + private class GroupView( + val binding: ViewDashboardGroupBinding, + val expandStatus: MutableMap + ) : + RecyclerView.ViewHolder(binding.root) { + + lateinit var group: OutboundGroup + lateinit var items: MutableList + lateinit var adapter: ItemAdapter + fun bind(group: OutboundGroup) { + this.group = group + binding.groupName.text = group.tag + binding.groupType.text = Libbox.proxyDisplayType(group.type) + binding.urlTestButton.setOnClickListener { + GlobalScope.launch { + runCatching { + Libbox.newStandaloneCommandClient().urlTest(group.tag) + }.onFailure { + withContext(Dispatchers.Main) { + binding.root.context.errorDialogBuilder(it).show() + } + } + } + } + items = mutableListOf() + val itemIterator = group.items + while (itemIterator.hasNext()) { + items.add(itemIterator.next()) + } + adapter = ItemAdapter(this, group, items) + binding.itemList.adapter = adapter + (binding.itemList.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false + binding.itemList.layoutManager = GridLayoutManager(binding.root.context, 2) + updateExpand() + } + + private fun updateExpand(isExpand: Boolean? = null) { + val newExpandStatus: Boolean + if (isExpand == null) { + newExpandStatus = expandStatus[group.tag] ?: group.selectable + } else { + expandStatus[group.tag] = isExpand + newExpandStatus = isExpand + } + binding.itemList.isVisible = newExpandStatus + binding.itemText.isVisible = !newExpandStatus + if (!newExpandStatus) { + val builder = SpannableStringBuilder() + items.forEach { + builder.append("■") + builder.setSpan( + ForegroundColorSpan(colorForURLTestDelay(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) + } else { + binding.expandButton.setImageResource(R.drawable.ic_expand_more_24) + } + binding.expandButton.setOnClickListener { + updateExpand(!binding.itemList.isVisible) + } + } + + fun updateSelected(group: OutboundGroup, item: OutboundGroupItem) { + val oldSelected = items.indexOfFirst { it.tag == group.selected } + group.selected = item.tag + if (oldSelected != -1) { + adapter.notifyItemChanged(oldSelected) + } + } + } + + private class ItemAdapter( + val groupView: GroupView, + val group: OutboundGroup, + val items: List + ) : + RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemGroupView { + return ItemGroupView( + ViewDashboardGroupItemBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + ) + } + + override fun getItemCount(): Int { + return items.size + } + + override fun onBindViewHolder(holder: ItemGroupView, position: Int) { + holder.bind(groupView, group, items[position]) + } + } + + private class ItemGroupView(val binding: ViewDashboardGroupItemBinding) : + RecyclerView.ViewHolder(binding.root) { + + fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) { + binding.itemCard.setOnClickListener { + binding.selectedView.isVisible = true + groupView.updateSelected(group, item) + GlobalScope.launch { + runCatching { + Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag) + }.onFailure { + withContext(Dispatchers.Main) { + binding.root.context.errorDialogBuilder(it).show() + } + } + } + } + binding.selectedView.isInvisible = group.selected != item.tag + binding.itemName.text = item.tag + binding.itemType.text = Libbox.proxyDisplayType(item.type) + binding.itemStatus.isVisible = item.urlTestTime > 0 + if (item.urlTestTime > 0) { + binding.itemStatus.text = "${item.urlTestDelay}ms" + binding.itemStatus.setTextColor(colorForURLTestDelay(item.urlTestDelay)) + } + } + } + +} + diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt new file mode 100644 index 0000000..7910a0b --- /dev/null +++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/OverviewFragment.kt @@ -0,0 +1,262 @@ +package io.nekohasekai.sfa.ui.dashboard + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.view.isVisible +import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.divider.MaterialDividerItemDecoration +import go.Seq +import io.nekohasekai.libbox.CommandClient +import io.nekohasekai.libbox.CommandClientHandler +import io.nekohasekai.libbox.CommandClientOptions +import io.nekohasekai.libbox.Libbox +import io.nekohasekai.libbox.OutboundGroupIterator +import io.nekohasekai.libbox.StatusMessage +import io.nekohasekai.sfa.R +import io.nekohasekai.sfa.bg.BoxService +import io.nekohasekai.sfa.constant.Status +import io.nekohasekai.sfa.database.Profile +import io.nekohasekai.sfa.database.ProfileManager +import io.nekohasekai.sfa.database.Settings +import io.nekohasekai.sfa.databinding.FragmentDashboardOverviewBinding +import io.nekohasekai.sfa.databinding.ViewProfileItemBinding +import io.nekohasekai.sfa.ktx.errorDialogBuilder +import io.nekohasekai.sfa.ui.MainActivity +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +class OverviewFragment : Fragment(), CommandClientHandler { + + private val activity: MainActivity? get() = super.getActivity() as MainActivity? + private var _binding: FragmentDashboardOverviewBinding? = null + private val binding get() = _binding!! + private var commandClient: CommandClient? = null + + private var _adapter: Adapter? = null + private val adapter get() = _adapter!! + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? + ): View { + _binding = FragmentDashboardOverviewBinding.inflate(inflater, container, false) + onCreate() + return binding.root + } + + private fun onCreate() { + val activity = activity ?: return + binding.profileList.adapter = Adapter(lifecycleScope, binding).apply { + _adapter = this + reload() + } + binding.profileList.layoutManager = LinearLayoutManager(requireContext()) + val divider = MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL) + divider.isLastItemDecorated = false + binding.profileList.addItemDecoration(divider) + activity.serviceStatus.observe(viewLifecycleOwner) { + binding.statusContainer.isVisible = it == Status.Starting || it == Status.Started + if (it == Status.Started) { + reconnect() + } + } + ProfileManager.registerCallback(this::updateProfiles) + } + + private fun reconnect() { + disconnect() + val options = CommandClientOptions() + options.command = Libbox.CommandStatus + options.statusInterval = 2 * 1000 * 1000 * 1000 + val commandClient = CommandClient(requireContext().filesDir.absolutePath, this, options) + this.commandClient = commandClient + lifecycleScope.launch(Dispatchers.IO) { + for (i in 1..3) { + delay(100) + try { + commandClient.connect() + break + } catch (e: Exception) { + break + } + } + } + } + + private fun disconnect() { + commandClient?.apply { + runCatching { + disconnect() + } + Seq.destroyRef(refnum) + } + commandClient = null + } + + override fun onDestroyView() { + super.onDestroyView() + _adapter = null + _binding = null + disconnect() + ProfileManager.unregisterCallback(this::updateProfiles) + } + + private fun updateProfiles() { + _adapter?.reload() + } + + override fun connected() { + val binding = _binding ?: return + lifecycleScope.launch(Dispatchers.Main) { + binding.memoryText.text = getString(R.string.loading) + binding.goroutinesText.text = getString(R.string.loading) + } + } + + override fun disconnected(message: String?) { + val binding = _binding ?: return + lifecycleScope.launch(Dispatchers.Main) { + binding.memoryText.text = getString(R.string.loading) + binding.goroutinesText.text = getString(R.string.loading) + } + } + + override fun writeLog(message: String) { + } + + override fun writeStatus(message: StatusMessage) { + val binding = _binding ?: return + lifecycleScope.launch(Dispatchers.Main) { + binding.memoryText.text = Libbox.formatBytes(message.memory) + binding.goroutinesText.text = message.goroutines.toString() + val trafficAvailable = message.trafficAvailable + binding.trafficContainer.isVisible = trafficAvailable + if (trafficAvailable) { + binding.inboundConnectionsText.text = message.connectionsIn.toString() + binding.outboundConnectionsText.text = message.connectionsOut.toString() + binding.uplinkText.text = Libbox.formatBytes(message.uplink) + "/s" + binding.downlinkText.text = Libbox.formatBytes(message.downlink) + "/s" + binding.uplinkTotalText.text = Libbox.formatBytes(message.uplinkTotal) + binding.downlinkTotalText.text = Libbox.formatBytes(message.downlinkTotal) + } + } + } + + override fun writeGroups(message: OutboundGroupIterator?) { + } + + class Adapter( + internal val scope: CoroutineScope, + private val parent: FragmentDashboardOverviewBinding + ) : + RecyclerView.Adapter() { + + internal var items: MutableList = mutableListOf() + internal var selectedProfileID = -1L + internal var lastSelectedIndex: Int? = null + internal fun reload() { + scope.launch(Dispatchers.IO) { + items = ProfileManager.list().toMutableList() + if (items.isNotEmpty()) { + selectedProfileID = Settings.selectedProfile + for ((index, profile) in items.withIndex()) { + if (profile.id == selectedProfileID) { + lastSelectedIndex = index + break + } + } + if (lastSelectedIndex == null) { + lastSelectedIndex = 0 + selectedProfileID = items[0].id + Settings.selectedProfile = selectedProfileID + } + } + withContext(Dispatchers.Main) { + parent.statusText.isVisible = items.isEmpty() + parent.container.isVisible = items.isNotEmpty() + notifyDataSetChanged() + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder { + return Holder( + this, + ViewProfileItemBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + ) + } + + override fun onBindViewHolder(holder: Holder, position: Int) { + holder.bind(items[position]) + } + + override fun getItemCount(): Int { + return items.size + } + + } + + class Holder( + private val adapter: Adapter, + private val binding: ViewProfileItemBinding + ) : + RecyclerView.ViewHolder(binding.root) { + + internal fun bind(profile: Profile) { + binding.profileName.text = profile.name + binding.profileSelected.setOnCheckedChangeListener(null) + binding.profileSelected.isChecked = profile.id == adapter.selectedProfileID + binding.profileSelected.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + adapter.selectedProfileID = profile.id + adapter.lastSelectedIndex?.let { index -> + adapter.notifyItemChanged(index) + } + adapter.lastSelectedIndex = adapterPosition + adapter.scope.launch(Dispatchers.IO) { + switchProfile(profile) + } + } + } + binding.root.setOnClickListener { + binding.profileSelected.toggle() + } + } + + private suspend fun switchProfile(profile: Profile) { + Settings.selectedProfile = profile.id + val mainActivity = (binding.root.context as? MainActivity) ?: return + val started = mainActivity.serviceStatus.value == Status.Started + if (!started) { + return + } + val restart = Settings.rebuildServiceMode() + if (restart) { + mainActivity.reconnect() + BoxService.stop() + delay(200) + mainActivity.startService() + return + } + runCatching { + Libbox.newStandaloneCommandClient().serviceReload() + }.onFailure { + withContext(Dispatchers.Main) { + mainActivity.errorDialogBuilder(it).show() + } + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt index af26682..771d9be 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt @@ -4,44 +4,24 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.annotation.StringRes import androidx.core.view.isVisible import androidx.fragment.app.Fragment -import androidx.lifecycle.lifecycleScope -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.divider.MaterialDividerItemDecoration -import go.Seq -import io.nekohasekai.libbox.CommandClient -import io.nekohasekai.libbox.CommandClientHandler -import io.nekohasekai.libbox.CommandClientOptions -import io.nekohasekai.libbox.Libbox -import io.nekohasekai.libbox.OutboundGroupIterator -import io.nekohasekai.libbox.StatusMessage +import androidx.viewpager2.adapter.FragmentStateAdapter +import com.google.android.material.tabs.TabLayoutMediator import io.nekohasekai.sfa.R import io.nekohasekai.sfa.bg.BoxService import io.nekohasekai.sfa.constant.Status -import io.nekohasekai.sfa.database.Profile -import io.nekohasekai.sfa.database.ProfileManager -import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.databinding.FragmentDashboardBinding -import io.nekohasekai.sfa.databinding.ViewProfileItemBinding -import io.nekohasekai.sfa.ktx.errorDialogBuilder import io.nekohasekai.sfa.ui.MainActivity -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import io.nekohasekai.sfa.ui.dashboard.GroupsFragment +import io.nekohasekai.sfa.ui.dashboard.OverviewFragment -class DashboardFragment : Fragment(), CommandClientHandler { +class DashboardFragment : Fragment(R.layout.fragment_dashboard) { private val activity: MainActivity? get() = super.getActivity() as MainActivity? private var _binding: FragmentDashboardBinding? = null private val binding get() = _binding!! - private var commandClient: CommandClient? = null - - private var _adapter: Adapter? = null - private val adapter get() = _adapter!! override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? @@ -53,22 +33,17 @@ class DashboardFragment : Fragment(), CommandClientHandler { private fun onCreate() { val activity = activity ?: return - - binding.profileList.adapter = Adapter(lifecycleScope, binding).apply { - _adapter = this - reload() - } - binding.profileList.layoutManager = LinearLayoutManager(requireContext()) - val divider = MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL) - divider.isLastItemDecorated = false - binding.profileList.addItemDecoration(divider) - + binding.dashboardPager.adapter = Adapter(this) + TabLayoutMediator(binding.dashboardTabLayout, binding.dashboardPager) { tab, position -> + tab.setText(Page.values()[position].titleRes) + }.attach() activity.serviceStatus.observe(viewLifecycleOwner) { - binding.statusContainer.isVisible = it == Status.Starting || it == Status.Started when (it) { Status.Stopped -> { binding.fab.setImageResource(R.drawable.ic_play_arrow_24) binding.fab.show() + binding.dashboardTabLayout.isVisible = false + binding.dashboardPager.isUserInputEnabled = false } Status.Starting -> { @@ -78,7 +53,8 @@ class DashboardFragment : Fragment(), CommandClientHandler { Status.Started -> { binding.fab.setImageResource(R.drawable.ic_stop_24) binding.fab.show() - reconnect() + binding.dashboardTabLayout.isVisible = true + binding.dashboardPager.isUserInputEnabled = true } Status.Stopping -> { @@ -101,196 +77,20 @@ class DashboardFragment : Fragment(), CommandClientHandler { else -> {} } } - - ProfileManager.registerCallback(this::updateProfiles) } - private fun reconnect() { - disconnect() - val options = CommandClientOptions() - options.command = Libbox.CommandStatus - options.statusInterval = 2 * 1000 * 1000 * 1000 - val commandClient = CommandClient(requireContext().filesDir.absolutePath, this, options) - this.commandClient = commandClient - lifecycleScope.launch(Dispatchers.IO) { - for (i in 1..3) { - delay(100) - try { - commandClient.connect() - break - } catch (e: Exception) { - break - } - } - } + enum class Page(@StringRes val titleRes: Int, val fragmentClass: Class) { + Overview(R.string.title_overview, OverviewFragment::class.java), + Groups(R.string.title_groups, GroupsFragment::class.java); } - private fun disconnect() { - commandClient?.apply { - runCatching { - disconnect() - } - Seq.destroyRef(refnum) - } - commandClient = null - } - - override fun onDestroyView() { - super.onDestroyView() - _adapter = null - _binding = null - disconnect() - ProfileManager.unregisterCallback(this::updateProfiles) - } - - private fun updateProfiles() { - _adapter?.reload() - } - - override fun connected() { - val binding = _binding ?: return - lifecycleScope.launch(Dispatchers.Main) { - binding.memoryText.text = getString(R.string.loading) - binding.goroutinesText.text = getString(R.string.loading) - } - } - - override fun disconnected(message: String?) { - val binding = _binding ?: return - lifecycleScope.launch(Dispatchers.Main) { - binding.memoryText.text = getString(R.string.loading) - binding.goroutinesText.text = getString(R.string.loading) - } - } - - override fun writeLog(message: String) { - } - - override fun writeStatus(message: StatusMessage) { - val binding = _binding ?: return - lifecycleScope.launch(Dispatchers.Main) { - binding.memoryText.text = Libbox.formatBytes(message.memory) - binding.goroutinesText.text = message.goroutines.toString() - val trafficAvailable = message.trafficAvailable - binding.trafficContainer.isVisible = trafficAvailable - if (trafficAvailable) { - binding.inboundConnectionsText.text = message.connectionsIn.toString() - binding.outboundConnectionsText.text = message.connectionsOut.toString() - binding.uplinkText.text = Libbox.formatBytes(message.uplink) + "/s" - binding.downlinkText.text = Libbox.formatBytes(message.downlink) + "/s" - binding.uplinkTotalText.text = Libbox.formatBytes(message.uplinkTotal) - binding.downlinkTotalText.text = Libbox.formatBytes(message.downlinkTotal) - } - } - } - - override fun writeGroups(message: OutboundGroupIterator?) { - } - - class Adapter( - internal val scope: CoroutineScope, - private val parent: FragmentDashboardBinding - ) : - RecyclerView.Adapter() { - - internal var items: MutableList = mutableListOf() - internal var selectedProfileID = -1L - internal var lastSelectedIndex: Int? = null - internal fun reload() { - scope.launch(Dispatchers.IO) { - items = ProfileManager.list().toMutableList() - if (items.isNotEmpty()) { - selectedProfileID = Settings.selectedProfile - for ((index, profile) in items.withIndex()) { - if (profile.id == selectedProfileID) { - lastSelectedIndex = index - break - } - } - if (lastSelectedIndex == null) { - lastSelectedIndex = 0 - selectedProfileID = items[0].id - Settings.selectedProfile = selectedProfileID - } - } - withContext(Dispatchers.Main) { - parent.statusText.isVisible = items.isEmpty() - parent.container.isVisible = items.isNotEmpty() - notifyDataSetChanged() - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder { - return Holder( - this, - ViewProfileItemBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - ) - } - - override fun onBindViewHolder(holder: Holder, position: Int) { - holder.bind(items[position]) - } - + class Adapter(parent: Fragment) : FragmentStateAdapter(parent) { override fun getItemCount(): Int { - return items.size + return Page.values().size } - } - - class Holder( - private val adapter: Adapter, - private val binding: ViewProfileItemBinding - ) : - RecyclerView.ViewHolder(binding.root) { - - internal fun bind(profile: Profile) { - binding.profileName.text = profile.name - binding.profileSelected.setOnCheckedChangeListener(null) - binding.profileSelected.isChecked = profile.id == adapter.selectedProfileID - binding.profileSelected.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) { - adapter.selectedProfileID = profile.id - adapter.lastSelectedIndex?.let { index -> - adapter.notifyItemChanged(index) - } - adapter.lastSelectedIndex = adapterPosition - adapter.scope.launch(Dispatchers.IO) { - switchProfile(profile) - } - } - } - binding.root.setOnClickListener { - binding.profileSelected.toggle() - } - } - - private suspend fun switchProfile(profile: Profile) { - Settings.selectedProfile = profile.id - val mainActivity = (binding.root.context as? MainActivity) ?: return - val started = mainActivity.serviceStatus.value == Status.Started - if (!started) { - return - } - val restart = Settings.rebuildServiceMode() - if (restart) { - mainActivity.reconnect() - BoxService.stop() - delay(200) - mainActivity.startService() - return - } - runCatching { - Libbox.newStandaloneCommandClient().serviceReload() - }.onFailure { - withContext(Dispatchers.Main) { - mainActivity.errorDialogBuilder(it).show() - } - } + override fun createFragment(position: Int): Fragment { + return Page.values()[position].fragmentClass.newInstance() } } diff --git a/app/src/main/res/drawable/ic_electric_bolt_24.xml b/app/src/main/res/drawable/ic_electric_bolt_24.xml new file mode 100644 index 0000000..a25c5ed --- /dev/null +++ b/app/src/main/res/drawable/ic_electric_bolt_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_expand_less_24.xml b/app/src/main/res/drawable/ic_expand_less_24.xml new file mode 100644 index 0000000..a31d830 --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_less_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_expand_more_24.xml b/app/src/main/res/drawable/ic_expand_more_24.xml new file mode 100644 index 0000000..48368f3 --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_more_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 6424f75..b11aab3 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -6,418 +6,39 @@ android:layout_height="match_parent" tools:context=".ui.main.DashboardFragment"> - + android:gravity="center|top" + android:orientation="vertical"> - - - + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + app:tabIndicatorFullWidth="true"> - + android:text="@string/title_overview" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/title_groups" /> - + - + - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard_overview.xml b/app/src/main/res/layout/fragment_dashboard_overview.xml new file mode 100644 index 0000000..3173f0e --- /dev/null +++ b/app/src/main/res/layout/fragment_dashboard_overview.xml @@ -0,0 +1,472 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_dashboard_group.xml b/app/src/main/res/layout/view_dashboard_group.xml new file mode 100644 index 0000000..b4b369a --- /dev/null +++ b/app/src/main/res/layout/view_dashboard_group.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_dashboard_group_item.xml b/app/src/main/res/layout/view_dashboard_group_item.xml new file mode 100644 index 0000000..3661c5e --- /dev/null +++ b/app/src/main/res/layout/view_dashboard_group_item.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a439ff5..1de1855 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,6 +10,8 @@ New Profile Edit Profile Edit Configuration + Overview + Groups Toggle Name @@ -61,14 +63,16 @@ Create service Start service + Status Memory Goroutines - Inbound Connections - Outbound Connections + Connections + Inbound + Outbound Uplink Downlink - Uplink Total - Downlink Total + Traffic + Traffic Total Profile Version @@ -125,4 +129,6 @@ Are you sure to import profile %s? iCloud profile is not support on current platform Search + URLTest + Expand \ No newline at end of file