Skip to content

Commit da7e91a

Browse files
committed
ui: 优化 Shizuku 状态卡片布局并更新多语言文案
本次更新改进了“系统状态”卡片中操作按钮的视觉呈现,并微调了部分功能文本。 - **UI 改进**: 在 `MainActivity` 中引入 `ButtonGroupDefaults`,将 Shizuku 权限操作按钮和 IMS 系统配置按钮改为连接式(Connected)形状,并调整了排列间距。 - **文案微调**: 更新了中英文 `strings.xml` 资源,将“刷新 Shizuku”统一为“刷新权限”,并精简了“查看 IMS 配置”的按钮文本。 - **逻辑优化**: 将“请求权限”按钮设为始终可见,但仅在 `NO_PERMISSION` 状态下启用。
1 parent e9fb7ea commit da7e91a

File tree

3 files changed

+28
-17
lines changed

3 files changed

+28
-17
lines changed

app/src/main/java/io/github/vvb2060/ims/ui/MainActivity.kt

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.compose.material.icons.rounded.SettingsBackupRestore
3030
import androidx.compose.material3.AlertDialog
3131
import androidx.compose.material3.Button
3232
import androidx.compose.material3.ButtonDefaults
33+
import androidx.compose.material3.ButtonGroupDefaults
3334
import androidx.compose.material3.Card
3435
import androidx.compose.material3.CenterAlignedTopAppBar
3536
import androidx.compose.material3.HorizontalDivider
@@ -373,16 +374,24 @@ fun SystemInfoCard(
373374
fontSize = 14.sp,
374375
color = shizukuStatusColor
375376
)
376-
Spacer(modifier = Modifier.weight(1f))
377-
Button(onClick = onRefresh) {
377+
}
378+
Spacer(modifier = Modifier.height(8.dp))
379+
Row(
380+
verticalAlignment = Alignment.CenterVertically,
381+
horizontalArrangement = Arrangement.spacedBy(4.dp),
382+
) {
383+
Button(
384+
shape = ButtonGroupDefaults.connectedLeadingButtonShape,
385+
onClick = onRefresh,
386+
) {
378387
Text(text = stringResource(id = R.string.refresh_permission))
379388
}
380-
381-
if (shizukuStatus == ShizukuStatus.NO_PERMISSION) {
382-
Spacer(modifier = Modifier.width(8.dp))
383-
Button(onClick = onRequestShizukuPermission) {
384-
Text(text = stringResource(id = R.string.request_permission))
385-
}
389+
Button(
390+
enabled = shizukuStatus == ShizukuStatus.NO_PERMISSION,
391+
shape = ButtonGroupDefaults.connectedTrailingButtonShape,
392+
onClick = onRequestShizukuPermission,
393+
) {
394+
Text(text = stringResource(id = R.string.request_permission))
386395
}
387396
}
388397

@@ -391,13 +400,14 @@ fun SystemInfoCard(
391400
Spacer(modifier = Modifier.height(8.dp))
392401
Row(
393402
modifier = Modifier.fillMaxWidth(),
394-
horizontalArrangement = Arrangement.spacedBy(8.dp)
403+
horizontalArrangement = Arrangement.spacedBy(4.dp)
395404
) {
396405
Button(
397406
onClick = onViewSystemConfigClick,
398407
enabled = selectedSim?.subId != -1,
399408
modifier = Modifier.weight(1f),
400-
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.tertiary)
409+
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.tertiary),
410+
shape = ButtonGroupDefaults.connectedLeadingButtonShape,
401411
) {
402412
Text(text = stringResource(id = R.string.view_system_config))
403413
}
@@ -406,7 +416,8 @@ fun SystemInfoCard(
406416
onClick = onResetIms,
407417
enabled = selectedSim?.subId != -1,
408418
modifier = Modifier.weight(1f),
409-
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error)
419+
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error),
420+
shape = ButtonGroupDefaults.connectedTrailingButtonShape,
410421
) {
411422
Text(text = stringResource(id = R.string.restart_ims))
412423
}

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<string name="shizuku_not_running">❌ 未运行</string>
1616
<string name="shizuku_no_permission">⚠️ 未授权</string>
1717
<string name="shizuku_checking">检查中…</string>
18-
<string name="refresh_permission">刷新 Shizuku</string>
19-
<string name="request_permission">请求</string>
20-
<string name="view_system_config">查看 IMS 配置</string>
18+
<string name="refresh_permission">刷新权限</string>
19+
<string name="request_permission">请求权限</string>
20+
<string name="view_system_config">查看 IMS</string>
2121
<string name="restart_ims">重启 IMS</string>
2222
<string name="restart_ims_success">IMS 已重启</string>
2323
<string name="restart_ims_failed">IMS 重启失败:%s</string>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<string name="shizuku_not_running">❌ Not Running</string>
1616
<string name="shizuku_no_permission">⚠️ No Permission</string>
1717
<string name="shizuku_checking">Checking…</string>
18-
<string name="refresh_permission">Refresh Shizuku</string>
19-
<string name="request_permission">Request</string>
20-
<string name="view_system_config">View IMS Config</string>
18+
<string name="refresh_permission">Refresh Permission</string>
19+
<string name="request_permission">Request Permission</string>
20+
<string name="view_system_config">View IMS</string>
2121
<string name="restart_ims">Restart IMS</string>
2222
<string name="restart_ims_success">IMS restarted</string>
2323
<string name="restart_ims_failed">IMS restart failed: %s</string>

0 commit comments

Comments
 (0)