diff --git a/app/src/main/java/com/a2i/forwarder/ui/screens/SettingsScreen.kt b/app/src/main/java/com/a2i/forwarder/ui/screens/SettingsScreen.kt index c05b676..017284f 100644 --- a/app/src/main/java/com/a2i/forwarder/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/a2i/forwarder/ui/screens/SettingsScreen.kt @@ -399,10 +399,17 @@ private fun ServerRow( StatusBadge("停用", MaterialTheme.colorScheme.onSurfaceVariant) } } + IconButton( + onClick = { if (!testing) app.appScope.launch { testing = true; testMsg = testPush(app, server); testing = false } }, + enabled = !testing, + ) { + if (testing) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) + else Icon(Icons.AutoMirrored.Filled.Send, "测试") + } IconButton(onClick = onEdit) { Icon(Icons.Filled.Edit, "编辑") } IconButton(onClick = onDelete) { Icon(Icons.Filled.Delete, "删除") } } - // 第二行:地址 + key + 测试/上移/下移 + // 第二行:地址 + key + 上移/下移 Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 2.dp)) { Column(Modifier.weight(1f).padding(start = 36.dp)) { Text( @@ -418,13 +425,6 @@ private fun ServerRow( color = MaterialTheme.colorScheme.onSurfaceVariant, ) } - IconButton( - onClick = { if (!testing) app.appScope.launch { testing = true; testMsg = testPush(app, server); testing = false } }, - enabled = !testing, - ) { - if (testing) CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp) - else Icon(Icons.AutoMirrored.Filled.Send, "测试") - } IconButton(onClick = onMoveUp, enabled = !isFirst) { Icon(Icons.Filled.KeyboardArrowUp, "上移") } IconButton(onClick = onMoveDown, enabled = !isLast) { Icon(Icons.Filled.KeyboardArrowDown, "下移") } }