From 0ca5e1c6486a3ff9e6ab5ae6d11c65ff86d3e364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Mon, 17 Jul 2023 13:08:01 +0800
Subject: [PATCH] Improve dashboard

---
 .../java/io/nekohasekai/sfa/bg/BoxService.kt  |   4 +-
 .../sfa/ui/main/DashboardFragment.kt          |  13 +-
 .../main/res/layout/fragment_dashboard.xml    | 432 +++++++++++++++---
 app/src/main/res/values/strings.xml           |   9 +-
 4 files changed, 383 insertions(+), 75 deletions(-)

diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
index 49698ff..88cbdfc 100644
--- a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
@@ -133,7 +133,7 @@ class BoxService(
 
             newService.start()
             boxService = newService
-
+            commandServer?.setService(boxService)
             status.postValue(Status.Started)
         } catch (e: Exception) {
             stopAndAlert(Alert.StartService, e.message)
@@ -148,6 +148,7 @@ class BoxService(
                 pfd.close()
                 fileDescriptor = null
             }
+            commandServer?.setService(null)
             boxService?.apply {
                 runCatching {
                     close()
@@ -175,6 +176,7 @@ class BoxService(
                 pfd.close()
                 fileDescriptor = null
             }
+            commandServer?.setService(null)
             boxService?.apply {
                 runCatching {
                     close()
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 0c25b03..7dc312a 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
@@ -1,6 +1,7 @@
 package io.nekohasekai.sfa.ui.main
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -64,7 +65,7 @@ class DashboardFragment : Fragment(), CommandClientHandler {
         binding.profileList.addItemDecoration(divider)
 
         activity.serviceStatus.observe(viewLifecycleOwner) {
-            binding.statusCard.isVisible = it == Status.Starting || it == Status.Started
+            binding.statusContainer.isVisible = it == Status.Starting || it == Status.Started
             when (it) {
                 Status.Stopped -> {
                     binding.fab.setImageResource(R.drawable.ic_play_arrow_24)
@@ -164,6 +165,16 @@ class DashboardFragment : Fragment(), CommandClientHandler {
         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)
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 2335678..58ea2a5 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -11,121 +11,409 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:visibility="gone"
         android:text="@string/profile_empty"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        android:visibility="gone" />
 
-    <LinearLayout
+    <ScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="16dp">
+        android:layout_height="match_parent">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/statusCard"
-            style="?attr/materialCardViewElevatedStyle"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="16dp">
 
             <LinearLayout
+                android:id="@+id/statusContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile_status"
-                    android:textAppearance="?attr/textAppearanceTitleLarge">
-
-                </TextView>
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
+                    android:orientation="horizontal">
 
-                    <TextView
-                        style="?attr/textAppearanceTitleSmall"
-                        android:layout_width="0dp"
+                    <com.google.android.material.card.MaterialCardView
+                        style="?attr/materialCardViewElevatedStyle"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/status_memory" />
+                        android:layout_weight="1">
 
-                    <TextView
-                        android:id="@+id/memoryText"
-                        style="?attr/textAppearanceBodyMedium"
-                        android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:padding="16dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/status_memory"
+                                android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                            </TextView>
+
+                            <TextView
+                                android:id="@+id/memoryText"
+                                style="?attr/textAppearanceBodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:text="@string/loading" />
+
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <LinearLayout
+                        android:layout_width="16dp"
+                        android:layout_height="match_parent" />
+
+                    <com.google.android.material.card.MaterialCardView
+                        style="?attr/materialCardViewElevatedStyle"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/loading" />
+                        android:layout_weight="1">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:padding="16dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/status_goroutines"
+                                android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                            </TextView>
+
+                            <TextView
+                                android:id="@+id/goroutinesText"
+                                style="?attr/textAppearanceBodySmall"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:text="@string/loading" />
+
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
 
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/trafficContainer"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
-                    <TextView
-                        style="?attr/textAppearanceTitleSmall"
-                        android:layout_width="0dp"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/status_goroutines" />
+                        android:layout_marginTop="16dp"
+                        android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/goroutinesText"
-                        style="?attr/textAppearanceBodyMedium"
-                        android:layout_width="wrap_content"
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1">
+
+                            <com.google.android.material.card.MaterialCardView
+                                style="?attr/materialCardViewElevatedStyle"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="vertical"
+                                    android:padding="16dp">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/status_inbound_connections"
+                                        android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                    </TextView>
+
+                                    <LinearLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="match_parent"
+                                        android:layout_weight="1"
+                                        android:gravity="bottom|start"
+                                        android:orientation="vertical">
+
+                                        <TextView
+                                            android:id="@+id/inboundConnectionsText"
+                                            style="?attr/textAppearanceBodySmall"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="8dp"
+                                            android:text="@string/loading" />
+
+                                    </LinearLayout>
+
+
+                                </LinearLayout>
+
+                            </com.google.android.material.card.MaterialCardView>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="16dp"
+                            android:layout_height="match_parent" />
+
+                        <com.google.android.material.card.MaterialCardView
+                            style="?attr/materialCardViewElevatedStyle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:padding="16dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/status_outbound_connections"
+                                    android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                </TextView>
+
+                                <TextView
+                                    android:id="@+id/outboundConnectionsText"
+                                    style="?attr/textAppearanceBodySmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="@string/loading" />
+
+
+                            </LinearLayout>
+
+                        </com.google.android.material.card.MaterialCardView>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/loading" />
+                        android:layout_marginTop="16dp"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.card.MaterialCardView
+                            style="?attr/materialCardViewElevatedStyle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:padding="16dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/status_uplink"
+                                    android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                </TextView>
+
+                                <TextView
+                                    android:id="@+id/uplinkText"
+                                    style="?attr/textAppearanceBodySmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="@string/loading" />
+
+
+                            </LinearLayout>
+
+                        </com.google.android.material.card.MaterialCardView>
+
+                        <LinearLayout
+                            android:layout_width="16dp"
+                            android:layout_height="match_parent" />
+
+                        <com.google.android.material.card.MaterialCardView
+                            style="?attr/materialCardViewElevatedStyle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:padding="16dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/status_downlink"
+                                    android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                </TextView>
+
+                                <TextView
+                                    android:id="@+id/downlinkText"
+                                    style="?attr/textAppearanceBodySmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="@string/loading" />
+
+
+                            </LinearLayout>
+
+                        </com.google.android.material.card.MaterialCardView>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.card.MaterialCardView
+                            style="?attr/materialCardViewElevatedStyle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:padding="16dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/status_uplink_total"
+                                    android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                </TextView>
+
+                                <TextView
+                                    android:id="@+id/uplinkTotalText"
+                                    style="?attr/textAppearanceBodySmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="@string/loading" />
+
+
+                            </LinearLayout>
+
+                        </com.google.android.material.card.MaterialCardView>
+
+                        <LinearLayout
+                            android:layout_width="16dp"
+                            android:layout_height="match_parent" />
+
+                        <com.google.android.material.card.MaterialCardView
+                            style="?attr/materialCardViewElevatedStyle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:padding="16dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/status_downlink_total"
+                                    android:textAppearance="?attr/textAppearanceTitleSmall">
+
+                                </TextView>
+
+                                <TextView
+                                    android:id="@+id/downlinkTotalText"
+                                    style="?attr/textAppearanceBodySmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="8dp"
+                                    android:text="@string/loading" />
+
+
+                            </LinearLayout>
+
+                        </com.google.android.material.card.MaterialCardView>
+
+                    </LinearLayout>
+
 
                 </LinearLayout>
 
-
             </LinearLayout>
 
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/profileCard"
-            style="?attr/materialCardViewElevatedStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            tools:visibility="visible">
-
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/profileCard"
+                style="?attr/materialCardViewElevatedStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
+                android:layout_marginTop="16dp"
+                tools:visibility="visible">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile"
-                    android:textAppearance="?attr/textAppearanceTitleLarge">
-
-                </TextView>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/profileList"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="16dp"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
 
-                    tools:itemCount="3"
-                    tools:listitem="@layout/view_profile_item" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile"
+                        android:textAppearance="?attr/textAppearanceTitleLarge">
+
+                    </TextView>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/profileList"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="16dp"
+
+                        tools:itemCount="3"
+                        tools:listitem="@layout/view_profile_item" />
 
 
-            </LinearLayout>
+                </LinearLayout>
 
-        </com.google.android.material.card.MaterialCardView>
+            </com.google.android.material.card.MaterialCardView>
 
 
-    </LinearLayout>
+        </LinearLayout>
+
+    </ScrollView>
 
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 808fc20..2041d6e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,9 +58,16 @@
     <string name="service_error_title_start_command_server">Start command server</string>
     <string name="service_error_title_create_service">Create service</string>
     <string name="service_error_title_start_service">Start service</string>
-    <string name="profile_status">Status</string>
+
     <string name="status_memory">Memory</string>
     <string name="status_goroutines">Goroutines</string>
+    <string name="status_inbound_connections">Inbound Connections</string>
+    <string name="status_outbound_connections">Outbound Connections</string>
+    <string name="status_uplink">Uplink</string>
+    <string name="status_downlink">Downlink</string>
+    <string name="status_uplink_total">Uplink Total</string>
+    <string name="status_downlink_total">Downlink Total</string>
+
     <string name="profile">Profile</string>
     <string name="core_version">Version</string>
     <string name="core">Core</string>