fix(sub2api): 余额标签与数字同行;请求次数改为「消耗 N 次」

This commit is contained in:
Liuxinyu176 2026-09-13 00:02:16 +08:00
parent 62ddf50638
commit bc862df226
4 changed files with 32 additions and 32 deletions

View File

@ -663,32 +663,32 @@ internal fun Sub2ApiMainBalance(balance: ServiceBalance, modifier: Modifier = Mo
@Composable @Composable
private fun Sub2ApiBalanceHero(balance: ServiceBalance, modifier: Modifier = Modifier) { private fun Sub2ApiBalanceHero(balance: ServiceBalance, modifier: Modifier = Modifier) {
Column(modifier = modifier.fillMaxWidth()) { // 「余额 357.06 USD」单行排列:小标签 + 大数字 + 单位
Row(verticalAlignment = Alignment.Bottom, modifier = modifier.fillMaxWidth()) {
Text( Text(
text = stringResource(R.string.sub2_balance_label), text = stringResource(R.string.sub2_balance_label),
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelMedium,
color = inkMuted(), color = inkMuted(),
modifier = Modifier.padding(bottom = 6.dp),
maxLines = 1
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = formatAmount(balance.amount),
style = MaterialTheme.typography.displaySmall,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Spacer(modifier = Modifier.width(6.dp))
Text(
text = balance.unit,
style = MaterialTheme.typography.titleSmall,
color = inkMuted(),
modifier = Modifier.padding(bottom = 4.dp),
maxLines = 1 maxLines = 1
) )
Spacer(modifier = Modifier.height(2.dp))
Row(verticalAlignment = Alignment.Bottom) {
Text(
text = formatAmount(balance.amount),
style = MaterialTheme.typography.displaySmall,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.onSurface,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Spacer(modifier = Modifier.width(6.dp))
Text(
text = balance.unit,
style = MaterialTheme.typography.titleSmall,
color = inkMuted(),
modifier = Modifier.padding(bottom = 4.dp),
maxLines = 1
)
}
} }
} }

View File

@ -675,6 +675,6 @@
<string name="sub2_panel_keys_header">API Key 列表</string> <string name="sub2_panel_keys_header">API Key 列表</string>
<string name="sub2_auth_panel">邮箱登录</string> <string name="sub2_auth_panel">邮箱登录</string>
<string name="sub2_auth_apikey">API 登录</string> <string name="sub2_auth_apikey">API 登录</string>
<string name="sub2_home_requests">%1$d 次</string> <string name="sub2_home_requests">消耗 %1$d 次</string>
<string name="sub2_balance_label">余额</string> <string name="sub2_balance_label">余额</string>
</resources> </resources>

View File

@ -675,6 +675,6 @@
<string name="sub2_panel_keys_header">API Key 列表</string> <string name="sub2_panel_keys_header">API Key 列表</string>
<string name="sub2_auth_panel">信箱登錄</string> <string name="sub2_auth_panel">信箱登錄</string>
<string name="sub2_auth_apikey">API 登錄</string> <string name="sub2_auth_apikey">API 登錄</string>
<string name="sub2_home_requests">%1$d 次</string> <string name="sub2_home_requests">消耗 %1$d 次</string>
<string name="sub2_balance_label">餘額</string> <string name="sub2_balance_label">餘額</string>
</resources> </resources>

View File

@ -645,15 +645,15 @@
<string name="month_12">Dec</string> <string name="month_12">Dec</string>
<string name="field_api_key">API Key</string> <string name="field_api_key">API Key</string>
<string name="field_workspace_id">Workspace ID</string> <string name="field_workspace_id">Workspace ID</string>
<string name="sub2_site_probing">正在识别站点…</string> <string name="sub2_site_probing">Detecting site…</string>
<string name="sub2_mode_api_key_desc">API Key:仅统计该 Key 的用量</string> <string name="sub2_mode_api_key_desc">API Key: tracks usage for this key only</string>
<string name="sub2_mode_panel_desc">面板登录:全账号消费统计,并解锁 Key 管理/分组/兑换</string> <string name="sub2_mode_panel_desc">Panel login: full-account usage stats; unlocks key management, grouping and redemption</string>
<string name="sub2_panel_oneclick">账号一键登录(推荐)</string> <string name="sub2_panel_oneclick">One-click account login (recommended)</string>
<string name="sub2_panel_logining">正在登录…</string> <string name="sub2_panel_logining">Logging in…</string>
<string name="sub2_panel_login">网页登录(备用,如开了二次验证)</string> <string name="sub2_panel_login">Web login (fallback, e.g. if 2FA is enabled)</string>
<string name="sub2_mode_account">账号密码</string> <string name="sub2_mode_account">Email login</string>
<string name="sub2_mode_apikey">API Key</string> <string name="sub2_mode_apikey">API key login</string>
<string name="sub2_field_totp">二次验证码(选填)</string> <string name="sub2_field_totp">2FA code (optional)</string>
<string name="sub2_home_no_usage">No usage data yet — pull to refresh</string> <string name="sub2_home_no_usage">No usage data yet — pull to refresh</string>
<string name="sub2_panel_manage_title">Panel management</string> <string name="sub2_panel_manage_title">Panel management</string>
<string name="sub2_panel_load_keys">Load API Key list</string> <string name="sub2_panel_load_keys">Load API Key list</string>
@ -680,6 +680,6 @@
<string name="sub2_panel_keys_header">API keys</string> <string name="sub2_panel_keys_header">API keys</string>
<string name="sub2_auth_panel">Email login</string> <string name="sub2_auth_panel">Email login</string>
<string name="sub2_auth_apikey">API key login</string> <string name="sub2_auth_apikey">API key login</string>
<string name="sub2_home_requests">%1$d req</string> <string name="sub2_home_requests">%1$d calls</string>
<string name="sub2_balance_label">Balance</string> <string name="sub2_balance_label">Balance</string>
</resources> </resources>