From f9fcd400594b5cefcfd3b42a945bc8ae5eebdaf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Tue, 23 Apr 2024 13:58:17 +0800
Subject: [PATCH] Fix groups ui

---
 .../sfa/ui/dashboard/GroupsFragment.kt        | 12 +++++++++++
 .../main/res/layout/view_dashboard_group.xml  | 20 +++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

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 b9dbf82..de5c080 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
@@ -212,12 +212,24 @@ class GroupsFragment : Fragment(), CommandClient.Handler {
                         if (selected != group.selected) {
                             updateSelected(group, selected)
                         }
+                        GlobalScope.launch {
+                            runCatching {
+                                Libbox.newStandaloneCommandClient()
+                                    .selectOutbound(group.tag, selected)
+                            }.onFailure {
+                                withContext(Dispatchers.Main) {
+                                    binding.root.context.errorDialogBuilder(it).show()
+                                }
+                            }
+                        }
                     }
                 }
             }
             if (newExpandStatus) {
+                binding.urlTestButton.isVisible = true
                 binding.expandButton.setImageResource(R.drawable.ic_expand_less_24)
             } else {
+                binding.urlTestButton.isVisible = false
                 binding.expandButton.setImageResource(R.drawable.ic_expand_more_24)
             }
             binding.expandButton.setOnClickListener {
diff --git a/app/src/main/res/layout/view_dashboard_group.xml b/app/src/main/res/layout/view_dashboard_group.xml
index 1b12613..a361e1a 100644
--- a/app/src/main/res/layout/view_dashboard_group.xml
+++ b/app/src/main/res/layout/view_dashboard_group.xml
@@ -48,16 +48,6 @@
                     android:gravity="end"
                     android:orientation="horizontal">
 
-                    <ImageButton
-                        android:id="@+id/expandButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
-                        android:backgroundTint="?colorSurfaceContainerLow"
-                        android:contentDescription="@string/expand"
-                        android:src="@drawable/ic_expand_less_24"
-                        app:tint="?colorControlNormal" />
-
                     <ImageButton
                         android:id="@+id/urlTestButton"
                         android:layout_width="wrap_content"
@@ -68,6 +58,16 @@
                         android:src="@drawable/ic_electric_bolt_24"
                         app:tint="?colorControlNormal" />
 
+                    <ImageButton
+                        android:id="@+id/expandButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:backgroundTint="?colorSurfaceContainerLow"
+                        android:contentDescription="@string/expand"
+                        android:src="@drawable/ic_expand_less_24"
+                        app:tint="?colorControlNormal" />
+
                 </LinearLayout>
 
             </LinearLayout>