AskaEth/Unlucky-Launcher
1
0 Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(app-iced, presenter): M114 r2 —— 登录失败走结构化错误码 + i18n，修 4 条 p2 与 3 条看图意见

Browse Source 
p1（语言泄漏）：后端诊断串不再上屏
- presenter 新增 LoginFailure 原因码（denied / whitelist_pending / unreachable /
  not_authlib_server / bad_credentials / no_profile / store_failed / other）
- 页面按码查 i18n 出标题+正文+「Code: …」，原文只进日志/详细信息
- 进行中（Requesting）也走 i18n，不再复读后端中文状态串
- presenter/state 不再发中文 toast（成败由页面按 i18n 画）
- 新增守门测试：注入带 AADSTS 的失败事件，断言英文视图无 CJK 且含 code

p2-1 复制：on_account 返回 Task，page_messages 把 iced::clipboard::write 交回 runtime
p2-2 可见失败态：新增 AccountNotice（added/removed/switched/名字非法/重名/落盘失败/
      找不到），页面用 M3 内联 alert 画（不是 toast）；离线名字先按 3–16 位规则校验，
      失败不再清空输入
p2-3 重新登录按账户类型分派：微软→授权码流；第三方→预填服务器/登录名并提示补密码；
      离线→明确说明没有可重登的服务器账户
p2-4 入口收敛：删 chip 行；空态=三卡片；有账号时三卡收进 Add an account（按钮不再绑死微软轨）

看图意见/tower 三条：
- 失败横幅改成 M3 alert（SurfaceContainerHigh + 描边，errorContainer 只作图标块，
  不再通栏实心红）；色值本身经复审像素采样确认是 90/30 档，未改角色
- 当前账户卡补齐与列表一致的「服务器/登录名」行；无皮肤时明说 No skin available
- 页面级 scrollable 加 8px 右 gutter，滚动条不再压卡片
- 倒计时改 mm:ss（15:00 left），数字与冒号语言无关

p3（顺带）：AuthlibRequest / Form 手写 Debug 脱敏密码；HTTP 响应体与 base64 输出加上限；
离线提示文案与行为对齐；删除无人使用的 key；皮肤测试断言帽子层真的 blend

测试：app-iced lib 418 绿、presenter 151 / i18n 24 绿（workspace 全量另跑）
This commit is contained in:
AskaEth committed 2026-11-05 05:09:51 +08:00
1 parent 1ff00bbe50
commit 8d8552113a
31 files changed
+1540 -497
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/app-iced/src/pages/account.rs
+31 -8
View File
@@ -38,10 +38,10 @@ pub mod widgets;
#[cfg(test)]
mod tests;
pub use model::{Form, Page, Panel, Track};
pub use model::{Form, Hint, Notice, Page, Panel, Track};
use iced::widget::{column, scrollable};
use iced::{Element, Length};
use iced::widget::{column, container, scrollable};
use iced::{Element, Length, Padding};
use unlucky_design::spacing::Space;
use unlucky_i18n::{Key, Lang};
@@ -84,8 +84,12 @@ pub enum Message {
Switch(String),
/// 删除账户
Remove(String),
/// 重新登录（微软轨 → 授权码流）
Relogin,
/// 重新登录（按账户类型分派：微软 → 授权码流；第三方 → 预填表单；离线 → 明确说明）
Relogin(String),
/// 展开/收起「Add an account」的三张轨道卡（复审 r1 P2-4）
ToggleAdd,
/// 关掉横幅
DismissNotice,
}
impl Message {
@@ -109,7 +113,7 @@ pub fn view<'a>(
.subtitle(subtitle)
.action(buttons::tonal(
ui,
Button::new(add, Message::Open(Track::Microsoft).into_page()),
Button::new(add, Message::ToggleAdd.into_page()),
));
let top = if page.rows.is_empty() {
@@ -131,17 +135,36 @@ pub fn view<'a>(
};
let mut content = column![].spacing(ui.space(Space::X6)).width(Length::Fill);
if let Some(notice) = &page.notice {
content = content.push(widgets::banner(ui, notice, text));
}
if let Some(hint) = page.hint {
content = content.push(widgets::hint(ui, hint, page, text));
}
// 三张轨道卡：空态**总是**画（那就是空态的入口）；有账号时收在「Add an account」后面
let show_tracks = page.panel == Panel::None && (page.rows.is_empty() || page.form.section_open);
content = if page.panel == Panel::None {
content.push(top).push(flows)
if show_tracks {
content.push(top).push(flows)
} else {
content.push(top)
}
} else {
content.push(flows).push(top)
};
// 右缘留 8px gutter：全局 `frame::scroll_style` 的滚动条是 6px + 2px 内缩，
// 满宽卡片会被它压住（tower 看图意见 ②）。页面级留白是这条的最小修法。
let padded = container(content).width(Length::Fill).padding(Padding {
right: ui.space(Space::X2),
..Padding::default()
});
frame::page(
ui,
metrics,
header,
scrollable(content)
scrollable(padded)
.style(frame::scroll_style(ui))
.width(Length::Fill)
.height(Length::Fill),
crates/app-iced/src/pages/account/avatar.rs
+41 -17
View File
@@ -83,24 +83,9 @@ fn decode(skin: &SkinImage) -> Avatar {
let Some(decoded) = decode_png(&skin.png) else {
return Avatar::default();
};
let (width, height) = (decoded.width(), decoded.height());
// 旧版皮肤是 64×32：没有帽子层，只有脸
if width < FACE.0 + FACE_EDGE || height < FACE.1 + FACE_EDGE {
let Some(scaled) = compose_head(&decoded) else {
return Avatar::default();
}
let mut face =
::image::imageops::crop_imm(&decoded, FACE.0, FACE.1, FACE_EDGE, FACE_EDGE).to_image();
if width >= HAT.0 + FACE_EDGE && height >= HAT.1 + FACE_EDGE {
let hat =
::image::imageops::crop_imm(&decoded, HAT.0, HAT.1, FACE_EDGE, FACE_EDGE).to_image();
::image::imageops::overlay(&mut face, &hat, 0, 0);
}
let scaled = ::image::imageops::resize(
&face,
HEAD_PX,
HEAD_PX,
::image::imageops::FilterType::Nearest,
);
};
Avatar {
head: Some(image::Handle::from_rgba(
HEAD_PX,
@@ -112,6 +97,29 @@ fn decode(skin: &SkinImage) -> Avatar {
}
}
/// 裁 8×8 脸 + 叠 (40,8) 的帽子层 + 放大到 64×64（纯函数，单测直接验像素）。
///
/// 旧版 64×32 皮肤没有帽子层（只有脸），所以尺寸不够时只裁脸。
fn compose_head(decoded: &::image::RgbaImage) -> Option<::image::RgbaImage> {
let (width, height) = (decoded.width(), decoded.height());
if width < FACE.0 + FACE_EDGE || height < FACE.1 + FACE_EDGE {
return None;
}
let mut face =
::image::imageops::crop_imm(decoded, FACE.0, FACE.1, FACE_EDGE, FACE_EDGE).to_image();
if width >= HAT.0 + FACE_EDGE && height >= HAT.1 + FACE_EDGE {
let hat =
::image::imageops::crop_imm(decoded, HAT.0, HAT.1, FACE_EDGE, FACE_EDGE).to_image();
::image::imageops::overlay(&mut face, &hat, 0, 0);
}
Some(::image::imageops::resize(
&face,
HEAD_PX,
HEAD_PX,
::image::imageops::FilterType::Nearest,
))
}
/// 解 PNG（尺寸上限与背景图那条守门同源：皮肤不该有超大图）。
fn decode_png(bytes: &[u8]) -> Option<::image::RgbaImage> {
const MAX_EDGE: u32 = 512;
@@ -164,6 +172,11 @@ mod tests {
png_of(&skin)
}
/// **帽子层真的叠进头像了**（复审 r1 P3-4：原用例只断言 `head.is_some()`，
/// 把 overlay 删掉也不会红）。
///
/// 夹具：脸是纯红 (200,10,10,255)，帽子层是半透明蓝 (10,10,200,120)。
/// 叠上去之后头像像素必须**既不等于纯红、也不等于纯蓝**——那就是混合的结果。
#[test]
fn a_real_skin_becomes_a_head_with_the_hat_layer() {
let avatar = decode(&SkinImage {
@@ -172,6 +185,17 @@ mod tests {
});
assert!(avatar.head.is_some(), "64×64 皮肤必须裁出头像");
assert!(avatar.skin.is_some(), "皮肤预览要有原图");
let decoded = decode_png(&skin_bytes()).expect("解码夹具");
let head = compose_head(&decoded).expect("裁头");
let pixel = head.get_pixel(0, 0).0;
assert_ne!(pixel, [200, 10, 10, 255], "帽子层没叠上去（还是纯红）");
assert_ne!(
pixel,
[10, 10, 200, 120],
"帽子层把脸整个盖掉了（不是 blend）"
);
assert!(pixel[2] > 10, "蓝色分量必须被帽子层抬高：{pixel:?}");
}
#[test]
crates/app-iced/src/pages/account/forms.rs
+29 -33
View File
@@ -25,22 +25,13 @@ use crate::pages::Message as PageMessage;
use super::{login, widgets, Message as Account};
/// 空态：不是一张白页——标题 + 说明 + **三条轨道的直达入口**。
/// 空态：不是一张白页——图标块 + 标题 + 说明，下面紧跟**三张轨道卡**（真正的入口）。
///
/// 复审 r1 的 P2-4：空态原先有**三套**同一件事的入口（右上按钮 / 三个 chip / 三张卡），
/// chip 还被当成操作按钮用。现在只剩「右上 Add an account（展开/收起）+ 三张卡」这一套：
/// 空态时卡片本来就可见，有账号时收在按钮后面。
pub fn empty<'a>(ui: &'a Ui, catalog: Catalog, lang: Lang) -> Element<'a, PageMessage> {
let mut actions = row![]
.spacing(ui.space(Space::X2))
.align_y(Alignment::Center);
for track in Track::ALL {
// 三个按钮各用**轨道的名字**做标签（三条都叫「登录」的话，用户分不清点哪个）
actions = actions.push(buttons::tonal(
ui,
Button::new(
catalog.text(track.title_key()),
Account::Open(track).into_page(),
),
));
}
let _ = lang;
let state = empty_state(
ui,
EmptyState::new(
@@ -49,17 +40,10 @@ pub fn empty<'a>(ui: &'a Ui, catalog: Catalog, lang: Lang) -> Element<'a, PageMe
catalog.text(Key::AccountEmptyBody),
),
);
let _ = lang;
column![
container(state).height(Length::Fixed(ui.space(Space::X8) * 8.0)),
container(actions)
.width(Length::Fill)
.align_x(Alignment::Center)
.center_x(Length::Fill),
]
.spacing(ui.space(Space::X4))
.width(Length::Fill)
.into()
container(state)
.height(Length::Fixed(ui.space(Space::X8) * 8.0))
.width(Length::Fill)
.into()
}
/// 三条轨道的入口卡（面板没打开时画这一排）。
@@ -288,13 +272,25 @@ fn status_line<'a>(ui: &'a Ui, page: &'a Page, catalog: Catalog) -> Element<'a,
catalog.render(Key::AccountServerOk, &[("server", server_name.as_str())]),
ui.color(Role::Primary),
),
AuthlibPanel::Failed { message } => frame::text_role(
ui,
TypeRole::LabelMedium,
false,
message,
ui.color(Role::Error),
),
// 失败只画**原因码对应的 i18n** + 一行 Code（原文是中文诊断串，上屏就是语言泄漏）
AuthlibPanel::Failed { failure, .. } => column![
frame::text_role(
ui,
TypeRole::LabelMedium,
false,
catalog.text(super::login::failure_body_key(*failure)),
ui.color(Role::Error),
),
frame::text_role_owned(
ui,
TypeRole::LabelSmall,
false,
catalog.render(Key::AccountFailureCode, &[("code", failure.code())]),
ui.color(Role::Error),
),
]
.spacing(ui.space(Space::X1))
.into(),
AuthlibPanel::Succeeded { name } => frame::text_role(
ui,
TypeRole::LabelMedium,
crates/app-iced/src/pages/account/login.rs
+57 -54
View File
@@ -6,14 +6,14 @@
//! 更不知道已经过期了——M114 把这三件事都做成可见状态：用户码（可复制）、链接（可复制/打开）、
//! 倒计时（`{secs}s left`）与过期后的「已过期，重试」。授权码流同理，另外必须能**取消**。
use iced::widget::{column, container, row};
use iced::{Alignment, Background, Border, Element, Length};
use iced::widget::{column, row};
use iced::{Alignment, Element};
use unlucky_design::color::Role;
use unlucky_design::shape::ShapeScale;
use unlucky_design::spacing::Space;
use unlucky_design::typography::TypeRole;
use unlucky_i18n::{Catalog, Key};
use unlucky_presenter::dto::LoginFailure;
use crate::app::components::buttons::{self, Button};
use crate::pages::frame;
@@ -46,7 +46,7 @@ pub fn panel<'a>(
expired,
..
} => browser(ui, link, *remaining, *expired, catalog),
DevicePanel::Failed { message } => failed(ui, message, catalog),
DevicePanel::Failed { failure, .. } => failed(ui, *failure, catalog),
DevicePanel::Succeeded { name } => succeeded(ui, name, catalog),
}
}
@@ -82,14 +82,16 @@ fn idle<'a>(ui: &'a Ui, catalog: Catalog) -> Element<'a, PageMessage> {
frame::card(ui, body)
}
/// 「正在申请/正在校验」：一句状态 + 取消。
fn notice<'a>(ui: &'a Ui, message: &'a str, catalog: Catalog) -> Element<'a, PageMessage> {
/// 「正在申请/正在校验」：一句**i18n**状态 + 取消。
///
/// 不复读 presenter 的 `message`：那是后端诊断串（中文），上屏就是语言泄漏（复审 r1 P1-1）。
fn notice<'a>(ui: &'a Ui, _message: &str, catalog: Catalog) -> Element<'a, PageMessage> {
let body = column![
frame::text_role(
ui,
TypeRole::BodyMedium,
false,
message,
catalog.text(Key::AccountDeviceRequesting),
ui.color(Role::OnSurfaceVariant),
),
row![buttons::text(
@@ -261,8 +263,12 @@ fn countdown_line<'a>(
);
}
let text = remaining.map_or_else(String::new, |secs| {
catalog.render(Key::AccountDeviceCountdown, &[("secs", &secs.to_string())])
// mm:ss（`15:00 left`）而不是 `900s left`：人读的是分秒，而且不随语言换格式
// （数字与冒号在两种语言里同形，只有 `left`/`剩` 走 catalog）。
let clock = format!("{:02}:{:02}", secs / 60, secs % 60);
catalog.render(Key::AccountDeviceCountdown, &[("time", &clock)])
});
// 运行时格式化的串走 `text_role_owned`（`text_role` 只借 `&'a str`）
frame::text_role_owned(
ui,
TypeRole::LabelMedium,
@@ -272,56 +278,39 @@ fn countdown_line<'a>(
)
}
/// 失败态（`ErrorContainer` 面板：不是一句灰字）。
fn failed<'a>(ui: &'a Ui, message: &'a str, catalog: Catalog) -> Element<'a, PageMessage> {
let body = column![
frame::text_role(
/// 失败态：**M3 内联 alert**（左侧 `ErrorContainer` 图标块 + 标题/正文/Code + 重试/关闭）。
///
/// 两条修订叠在这里：
/// - **语言泄漏（r1 p1）**：只画原因码对应的 i18n + 一行 `Code: …`，后端中文原文不上屏；
/// - **不许通栏实心红（tower r2）**：面板底走 `SurfaceContainerHigh` + 描边，
/// `ErrorContainer`/`OnErrorContainer` 只作左侧图标块的强调（角色不变，面积收小）。
fn failed<'a>(ui: &'a Ui, failure: LoginFailure, catalog: Catalog) -> Element<'a, PageMessage> {
let body = catalog.text(failure_body_key(failure)).to_string();
let code = catalog.render(Key::AccountFailureCode, &[("code", failure.code())]);
let actions = vec![
buttons::tonal(
ui,
TypeRole::TitleSmall,
true,
catalog.text(Key::AccountLoginFailed),
ui.color(Role::OnErrorContainer),
Button::new(
catalog.text(Key::AccountDeviceRetry),
Account::StartDevice.into_page(),
),
),
frame::text_role(
buttons::text(
ui,
TypeRole::BodyMedium,
false,
message,
ui.color(Role::OnErrorContainer),
Button::new(
catalog.text(Key::AccountDialogClose),
Account::Close.into_page(),
),
),
row![
buttons::tonal(
ui,
Button::new(
catalog.text(Key::AccountDeviceRetry),
Account::StartDevice.into_page(),
)
),
buttons::text(
ui,
Button::new(
catalog.text(Key::AccountDialogClose),
Account::Close.into_page()
)
),
]
.spacing(ui.space(Space::X2))
.align_y(Alignment::Center),
]
.spacing(ui.space(Space::X3));
container(body)
.width(Length::Fill)
.padding(ui.metrics().card_padding)
.style(move |_theme| container::Style {
background: Some(Background::Color(ui.color(Role::ErrorContainer))),
border: Border {
radius: ui.radius_dp(ShapeScale::Medium),
..Border::default()
},
..container::Style::default()
})
.into()
];
super::widgets::alert(
ui,
super::widgets::Tone::Error,
catalog.text(Key::AccountLoginFailed),
body,
Some(code),
actions,
)
}
/// 成功态。
@@ -347,3 +336,17 @@ fn succeeded<'a>(ui: &'a Ui, name: &'a str, catalog: Catalog) -> Element<'a, Pag
.spacing(ui.space(Space::X3));
frame::card(ui, body)
}
/// 原因码 → i18n 正文 key（页面里唯一的「码→文案」映射点）。
pub(super) fn failure_body_key(failure: LoginFailure) -> Key {
match failure {
LoginFailure::Denied => Key::AccountFailureDenied,
LoginFailure::NotWhitelisted => Key::AccountFailureWhitelist,
LoginFailure::Unreachable => Key::AccountFailureUnreachable,
LoginFailure::NotAuthlibServer => Key::AccountFailureNotAuthlib,
LoginFailure::BadCredentials => Key::AccountFailureBadCredentials,
LoginFailure::NoProfile => Key::AccountFailureNoProfile,
LoginFailure::StoreFailed => Key::AccountFailureStore,
LoginFailure::Other => Key::AccountFailureOther,
}
}
crates/app-iced/src/pages/account/model.rs
+60 -3
View File
@@ -7,7 +7,7 @@
use iced::widget::image;
use unlucky_i18n::{Key, Lang};
use unlucky_presenter::dto::{AccountKind, AccountView};
use unlucky_presenter::dto::{AccountKind, AccountNotice, AccountNoticeCode, AccountView};
use unlucky_presenter::state::AppState;
use super::avatar::{Avatar, Cache};
@@ -79,7 +79,23 @@ pub enum Panel {
///
/// 密码只存在这里和「一次 `AppCommand::AddAuthlibAccount` 的载荷」里：不进日志、不进快照、
/// 不进任何回程 DTO（M114 凭据红线）。
#[derive(Debug, Clone, Default, PartialEq, Eq)]
/// **手写 `Debug`**：`Form` 里持着一次性密码，任何 `{:?}` 都不许带出明文（凭据红线）。
impl std::fmt::Debug for Form {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Form")
.field("panel", &self.panel)
.field("server", &self.server)
.field("login", &self.login)
.field("password", &"⟪redacted⟫")
.field("offline_name", &self.offline_name)
.field("section_open", &self.section_open)
.field("hint", &self.hint)
.finish()
}
}
/// 三条轨道的表单输入（纯 UI 状态；密码是**一次性请求值**）。
#[derive(Clone, Default, PartialEq, Eq)]
pub struct Form {
/// 当前面板
pub panel: Panel,
@@ -91,6 +107,19 @@ pub struct Form {
pub password: String,
/// 本地档案名
pub offline_name: String,
/// 「Add an account」展开态（有账号时三张轨道卡默认收起，复审 r1 P2-4）
pub section_open: bool,
/// 一次性引导（重新登录时告诉用户下一步；`None` = 没有引导）
pub hint: Option<Hint>,
}
/// 一次性引导（由 app 层在「重新登录」时设置，页面画一行 i18n）。
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Hint {
/// 第三方轨重登：重新输入密码
AuthlibReauth,
/// 本地档案没有可重登的服务器账户
OfflineNoRelogin,
}
impl Form {
@@ -111,6 +140,7 @@ impl Form {
/// 关掉面板（**密码一起清掉**：留着没有意义，只是多留一份凭据在内存里）。
pub fn close(&mut self) {
self.password.clear();
self.hint = None;
self.panel = Panel::None;
}
@@ -179,10 +209,35 @@ pub struct Page {
/// 版面宽度（**中栏可用宽**，M104 的 `AgentUi::content_width`；账户页自己的
/// `layout::frame_metrics` 拿它算列宽，与其它页同源）
pub width: f32,
/// 账户页横幅（添加/删除/切换的结果；`None` = 不画）
pub notice: Option<Notice>,
/// 一次性引导（重新登录的下一步）
pub hint: Option<Hint>,
}
/// 横幅的渲染数据（文案在视图层按 `code` 查 i18n）。
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Notice {
/// 结果码
pub code: AccountNoticeCode,
/// 主题（账户名/服务器地址）
pub subject: String,
/// 是否失败（决定配色）
pub failure: bool,
}
impl Notice {
fn of(notice: &AccountNotice) -> Self {
Self {
code: notice.code,
subject: notice.subject.clone(),
failure: notice.code.is_failure(),
}
}
}
impl Page {
/// 从状态与表单构造（`avatars` 是解码缓存，见 [`Cache]`；`width` 是中栏可用宽）。
/// 从状态与表单构造（`avatars` 是解码缓存，见 [`Cache`]；`width` 是中栏可用宽）。
pub fn build(
state: &AppState,
form: &Form,
@@ -222,6 +277,8 @@ impl Page {
device,
authlib,
checked_server,
notice: state.account_notice.as_ref().map(Notice::of),
hint: form.hint,
width,
}
}
crates/app-iced/src/pages/account/panels.rs
+16 -12
View File
@@ -3,7 +3,7 @@
//! 从 `model.rs` 拆出来守 400 行硬线：这些类型是「UI 要画什么」的枚举，
//! 判定逻辑（倒计时 → 已过期、服务发现 → 可用）也在这里，页面与表单只消费结果。
use unlucky_presenter::dto::{DeviceLoginPhase, DeviceLoginView};
use unlucky_presenter::dto::{AuthlibLoginView, DeviceLoginPhase, DeviceLoginView, LoginFailure};
/// 微软登录面板要画什么（每态都不同，**不允许只有一个转圈**）。
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -39,10 +39,12 @@ pub enum DevicePanel {
/// 状态文案
message: String,
},
/// 失败（原文已脱敏）
/// 失败（**原因码上屏，原文只进日志**）
Failed {
/// 失败原因
message: String,
/// 原因码（页面据此选 i18n）
failure: LoginFailure,
/// 原始诊断（不上屏）
detail: String,
},
/// 成功
Succeeded {
@@ -68,10 +70,12 @@ pub enum AuthlibPanel {
/// 状态文案
message: String,
},
/// 失败（原文已脱敏）
/// 失败（**原因码上屏，原文只进日志**）
Failed {
/// 失败原因
message: String,
/// 原因码（页面据此选 i18n）
failure: LoginFailure,
/// 原始诊断（不上屏）
detail: String,
},
/// 成功
Succeeded {
@@ -107,7 +111,8 @@ pub(super) fn device_panel(view: &DeviceLoginView, remaining: Option<u64>) -> De
}
}
DeviceLoginPhase::Failed => DevicePanel::Failed {
message: view.message.clone(),
failure: view.failure.unwrap_or(LoginFailure::Other),
detail: view.message.clone(),
},
DeviceLoginPhase::Succeeded => DevicePanel::Succeeded {
name: view.account_name.clone(),
@@ -116,9 +121,7 @@ pub(super) fn device_panel(view: &DeviceLoginView, remaining: Option<u64>) -> De
}
/// 第三方轨状态 → 面板态（顺带取出「校验通过的服务器名」）。
pub(super) fn authlib_panel(
view: &unlucky_presenter::dto::AuthlibLoginView,
) -> (AuthlibPanel, String) {
pub(super) fn authlib_panel(view: &AuthlibLoginView) -> (AuthlibPanel, String) {
match view.phase {
DeviceLoginPhase::Idle => (AuthlibPanel::Idle, String::new()),
DeviceLoginPhase::Requesting => (
@@ -142,7 +145,8 @@ pub(super) fn authlib_panel(
),
DeviceLoginPhase::Failed => (
AuthlibPanel::Failed {
message: view.message.clone(),
failure: view.failure.unwrap_or(LoginFailure::Other),
detail: view.message.clone(),
},
String::new(),
),
crates/app-iced/src/pages/account/rows.rs
+45 -4
View File
@@ -36,7 +36,7 @@ pub fn active_card<'a>(
ui,
Button::new(
catalog.text(Key::AccountRelogin),
Account::Relogin.into_page(),
Account::Relogin(current.id.clone()).into_page(),
),
));
actions = actions.push(buttons::text(
@@ -67,7 +67,7 @@ pub fn active_card<'a>(
));
}
let identity = column![
let mut identity = column![
name_line,
frame::text_role(
ui,
@@ -78,6 +78,16 @@ pub fn active_card<'a>(
),
]
.spacing(ui.space(Space::X1));
// 与列表行同源：服务器地址 / 登录名这一行两边都要有（tower 看图意见 ①）
if !current.detail.is_empty() {
identity = identity.push(frame::text_role(
ui,
TypeRole::BodySmall,
false,
&current.detail,
ui.color(Role::OnSurfaceVariant),
));
}
let left = row![
widgets::avatar(ui, current, widgets::AVATAR_ACTIVE),
@@ -93,13 +103,44 @@ pub fn active_card<'a>(
]
.spacing(ui.space(Space::X4));
if let Some(skin) = page.active_skin() {
body = body.push(skin_preview(ui, skin.clone(), catalog));
match page.active_skin() {
Some(skin) => body = body.push(skin_preview(ui, skin.clone(), catalog)),
// 没有皮肤就**说出来**（离线轨永远没有；第三方轨没抓到也是这句），别让用户猜
None => body = body.push(skin_absent(ui, catalog)),
}
frame::card(ui, body)
}
/// 无皮肤时的皮肤区：一句话说清「没有可用皮肤」，与皮肤预览区同一位置、同一节奏。
fn skin_absent<'a>(ui: &'a Ui, catalog: Catalog) -> Element<'a, PageMessage> {
column![
frame::text_role(
ui,
TypeRole::LabelMedium,
true,
catalog.text(Key::AccountSkinTitle),
ui.color(Role::OnSurface),
),
frame::text_role(
ui,
TypeRole::BodySmall,
false,
catalog.text(Key::AccountSkinNone),
ui.color(Role::OnSurfaceVariant),
),
frame::text_role(
ui,
TypeRole::BodySmall,
false,
catalog.text(Key::AccountSkinHint),
ui.color(Role::OnSurfaceVariant),
),
]
.spacing(ui.space(Space::X1))
.into()
}
/// 皮肤预览区：**原图直出**（64×64），旁边一句话说清「皮肤从哪来」。
fn skin_preview<'a>(
ui: &'a Ui,
crates/app-iced/src/pages/account/tests.rs
+151 -73
View File
@@ -3,20 +3,21 @@
//! | 用例 | 抓得住什么 |
//! |---|---|
//! | `a_jwt_injected_into_events_never_reaches_the_page` | **凭据红线**：DTO → 状态 → 视图模型这一路漏了脱敏 |
//! | `a_failure_with_a_provider_code_renders_english_and_the_code` | **语言泄漏（r1 p1）**：后端中文诊断串又直接上屏了 |
//! | `an_empty_account_list_offers_all_three_tracks` | 空态变成白页（没有入口） |
//! | `the_device_code_panel_shows_a_countdown_and_expires` | 设备码「只转圈」（倒计时/过期不可见） |
//! | `the_device_code_panel_shows_a_countdown_and_expires` | 设备码「只转圈」/ 倒计时不是人话格式 |
//! | `a_third_party_account_falls_back_to_the_monogram` | 没有皮肤却画白块 / 拿假皮肤充数 |
//! | `the_offline_track_keeps_the_agreed_wording` | 离线档案的说明被改写成「兼容旧启动器」那套 |
use unlucky_i18n::{Key, Lang};
use unlucky_presenter::dto::{
AccountKind, AccountView, AppEvent, AuthlibLoginView, CoreEvent, DeviceLoginPhase,
DeviceLoginView, SkinImage,
AccountKind, AccountNotice, AccountNoticeCode, AccountView, AppEvent, AuthlibLoginView,
CoreEvent, DeviceLoginPhase, DeviceLoginView, LoginFailure, SkinImage,
};
use unlucky_presenter::state::AppState;
use super::avatar::Cache;
use super::model::{AuthlibPanel, DevicePanel, Form, Page, Panel, Track};
use super::login::failure_body_key;
use super::model::{AuthlibPanel, DevicePanel, Form, Hint, Page, Panel, Track};
fn account(name: &str, kind: AccountKind, active: bool) -> AccountView {
AccountView {
@@ -33,11 +34,14 @@ fn account(name: &str, kind: AccountKind, active: bool) -> AccountView {
}
fn build(state: &AppState, form: &Form) -> Page {
Page::build(state, form, &mut Cache::default(), Lang::ZhCn, 1180.0)
// 断言口径是英文界面（app 钉死 `Lang::En`）：英文目录下「视图里有中文」=「后端原文上屏了」。
// 宽度取验收窗口 1180（r2 起 `Page` 记中栏可用宽）。
Page::build(state, form, &mut Cache::default(), Lang::En, 1180.0)
}
/// 把视图模型里**所有会上屏的文本**拼起来（凭据红线就是在这坨里查）。
fn visible_text(page: &Page) -> String {
/// 页面**会画什么**：模型里的数据 + 视图层对码的 i18n 查表结果。
fn on_screen(page: &Page) -> String {
let catalog = Lang::En.catalog();
let mut out = String::new();
for row in &page.rows {
out.push_str(&row.name);
@@ -46,64 +50,91 @@ fn visible_text(page: &Page) -> String {
out.push_str(&row.added);
out.push_str(&row.detail);
}
out.push_str(&page.form.server);
out.push_str(&page.form.login);
out.push_str(&page.form.offline_name);
out.push_str(&page.checked_server);
out.push_str(&page.form.server);
if let Some(notice) = &page.notice {
// 与 `widgets::banner` 同源：码 → i18n（主题名拼进去）
out.push_str(match notice.code {
AccountNoticeCode::OfflineNameInvalid => {
catalog.text(Key::AccountNoticeOfflineNameInvalid)
}
AccountNoticeCode::AccountExists => catalog.text(Key::AccountNoticeAccountExists),
AccountNoticeCode::StoreFailed => catalog.text(Key::AccountNoticeStoreFailed),
AccountNoticeCode::NotFound => catalog.text(Key::AccountNoticeNotFound),
AccountNoticeCode::Other => catalog.text(Key::AccountNoticeOther),
AccountNoticeCode::Added => catalog.text(Key::AccountNoticeAdded),
AccountNoticeCode::Removed => catalog.text(Key::AccountNoticeRemoved),
AccountNoticeCode::Switched => catalog.text(Key::AccountNoticeSwitched),
});
out.push_str(&notice.subject);
}
if let Some(hint) = page.hint {
out.push_str(match hint {
Hint::AuthlibReauth => catalog.text(Key::AccountHintAuthlibReauth),
Hint::OfflineNoRelogin => catalog.text(Key::AccountHintOfflineNoRelogin),
});
}
match &page.device {
DevicePanel::Hidden => {}
DevicePanel::Requesting { message } => out.push_str(message),
DevicePanel::Requesting { .. } => out.push_str(catalog.text(Key::AccountDeviceRequesting)),
DevicePanel::Code {
code,
link,
message,
remaining,
expired,
..
} => {
out.push_str(code);
out.push_str(link);
out.push_str(message);
if *expired {
out.push_str(catalog.text(Key::AccountDeviceExpired));
} else if let Some(secs) = remaining {
let clock = format!("{:02}:{:02}", secs / 60, secs % 60);
out.push_str(&catalog.render(Key::AccountDeviceCountdown, &[("time", &clock)]));
}
}
DevicePanel::Browser { link, message, .. } => {
out.push_str(link);
out.push_str(message);
DevicePanel::Browser { link, .. } => out.push_str(link),
DevicePanel::Failed { failure, .. } => {
out.push_str(catalog.text(failure_body_key(*failure)));
out.push_str(&catalog.render(Key::AccountFailureCode, &[("code", failure.code())]));
}
DevicePanel::Failed { message } => out.push_str(message),
DevicePanel::Succeeded { name } => out.push_str(name),
}
match &page.authlib {
AuthlibPanel::Idle => {}
AuthlibPanel::Running { message } => out.push_str(message),
AuthlibPanel::Ready {
server_name,
message,
} => {
out.push_str(server_name);
out.push_str(message);
AuthlibPanel::Running { .. } => out.push_str(catalog.text(Key::AccountServerChecking)),
AuthlibPanel::Ready { server_name, .. } => out.push_str(server_name),
AuthlibPanel::Failed { failure, .. } => {
out.push_str(catalog.text(failure_body_key(*failure)));
out.push_str(failure.code());
}
AuthlibPanel::Failed { message } => out.push_str(message),
AuthlibPanel::Succeeded { name } => out.push_str(name),
}
out
}
/// 有没有中日韩统一表意文字（语言泄漏的最直接判据）。
fn has_cjk(text: &str) -> bool {
text.chars().any(|c| matches!(c, '\u{3400}'..='\u{4DBF}' | '\u{4E00}'..='\u{9FFF}' | '\u{3000}'..='\u{303F}' | '\u{FF00}'..='\u{FFEF}'))
}
const JWT: &str =
"eyJhbGciOiJSUzI1NiIsIng1dCI6IkFCQyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.c2lnbmF0dXJlLXZhbHVl";
/// **凭据红线（审核项）**：把 JWT 形状串注入事件 → 视图模型里不许出现。
/// **凭据红线（审核项）**：把 JWT 形状串注入事件 → 状态与视图模型里都不许出现。
///
/// 抓得住：presenter 状态层的脱敏被删（`AppState::apply_device_login` / `apply_authlib_login`），
/// 或页面把 DTO 的错误原文直接搬上屏。
/// 抓不住：某个将来新增的**独立**字段绕过 `message` 通道（那需要另加断言）。
#[test]
fn a_jwt_injected_into_events_never_reaches_the_page() {
let mut state = AppState::new();
state.accounts = vec![account("Steve", AccountKind::Microsoft, true)];
// **绕过构造器**直接摆一个带 JWT 的 DTO：模拟「将来某个新构造器忘了脱敏」/「后端把原文塞进来」。
// 用 `DeviceLoginView::failed(..)` 构造是测不到状态层脱敏的（构造器自己就脱过了）。
state.apply(AppEvent::Core(CoreEvent::DeviceLoginChanged(
DeviceLoginView {
phase: DeviceLoginPhase::Failed,
message: format!("微软返回错误：accessToken={JWT} refresh_token={JWT}"),
failure: Some(LoginFailure::Denied),
..DeviceLoginView::new()
},
)));
@@ -113,21 +144,75 @@ fn a_jwt_injected_into_events_never_reaches_the_page() {
server: "https://littleskin.cn/api/yggdrasil/".to_string(),
server_name: String::new(),
message: format!("服务器回包异常 {JWT}"),
failure: Some(LoginFailure::Denied),
account_name: String::new(),
},
)));
let page = build(&state, &Form::new());
let text = visible_text(&page);
assert!(!text.contains("eyJ"), "视图模型里出现了 JWT：{text}");
assert!(!text.to_lowercase().contains("refreshtoken"), "{text}");
// ① 状态层已经脱敏（这一条抓得住「摘掉 state 层 redact」的变异）
assert!(
text.contains("⟪redacted⟫"),
"错误文案要被标成已脱敏：{text}"
!state.device_login.message.contains("eyJ"),
"{}",
state.device_login.message
);
assert!(
!state.authlib_login.message.contains("eyJ"),
"{}",
state.authlib_login.message
);
// ② 上屏文案更不可能有它（页面根本不画原文）
let text = on_screen(&build(&state, &Form::new()));
assert!(!text.contains("eyJ"), "视图里出现了 JWT：{text}");
assert!(!text.contains("⟪redacted⟫"), "脱敏占位符也不该上屏：{text}");
}
/// 空态：**三条轨道都有入口**，不是一张白页。
/// **语言泄漏（复审 r1 p1）**：带 AADSTS 码的失败事件 → 英文视图里不许有中文，且要带 code。
///
/// 抓得住：有人又把 `view.message`（core 的中文诊断串）画回面板上；或者码→i18n 的映射被摘。
/// 抓不住：catalog 里某条英文译文本身写得差（那只能人工审）。
#[test]
fn a_failure_with_a_provider_code_renders_english_and_the_code() {
let mut state = AppState::new();
state.apply(AppEvent::Core(CoreEvent::DeviceLoginChanged(
DeviceLoginView {
phase: DeviceLoginPhase::Failed,
message:
"微软拒绝了这次登录：AADSTS7000218（HTTP 403）—— 应用白名单还没批准，或网络被拦截"
.to_string(),
failure: Some(LoginFailure::NotWhitelisted),
..DeviceLoginView::new()
},
)));
let page = build(&state, &Form::new());
let text = on_screen(&page);
assert!(!has_cjk(&text), "英文界面里出现了中文：{text}");
assert!(
text.contains("whitelist_pending"),
"面板要给稳定 code：{text}"
);
assert!(
text.to_lowercase().contains("approved"),
"要给出可读的英文原因：{text}"
);
// 第三方轨的失败同样只有 i18n + code
state.apply(AppEvent::Core(CoreEvent::AuthlibLoginChanged(
AuthlibLoginView {
phase: DeviceLoginPhase::Failed,
server: "https://example.invalid/".to_string(),
server_name: String::new(),
message: "服务器不可达：dns error".to_string(),
failure: Some(LoginFailure::Unreachable),
account_name: String::new(),
},
)));
let text = on_screen(&build(&state, &Form::new()));
assert!(!has_cjk(&text), "{text}");
assert!(text.contains("unreachable"), "{text}");
}
/// 空态：**三条轨道都有入口**，不是一张白页；且三张卡的标题各不相同。
#[test]
fn an_empty_account_list_offers_all_three_tracks() {
let state = AppState::new();
@@ -135,8 +220,6 @@ fn an_empty_account_list_offers_all_three_tracks() {
assert!(page.is_empty());
assert_eq!(page.panel, Panel::None);
assert!(page.active_row().is_none());
assert_eq!(Track::ALL.len(), 3);
// 三条轨道的文案 key 各不相同（不是三张一样的卡）
let mut keys: Vec<&str> = Track::ALL
.iter()
.map(|track| track.title_key().name())
@@ -146,7 +229,7 @@ fn an_empty_account_list_offers_all_three_tracks() {
assert_eq!(keys.len(), 3);
}
/// 设备码：**倒计时可见**，过期后是「已过期」而不是继续转圈。
/// 设备码：**倒计时是人话格式（mm:ss）**，过期后是「已过期」而不是继续转圈。
#[test]
fn the_device_code_panel_shows_a_countdown_and_expires() {
let mut state = AppState::new();
@@ -162,11 +245,14 @@ fn the_device_code_panel_shows_a_countdown_and_expires() {
..
} => {
assert_eq!(code, "ABCD-EFGH");
assert!(remaining.is_some_and(|secs| secs > 0));
assert_eq!(*remaining, Some(900));
assert!(!expired);
}
other => panic!("等待态应该是设备码面板，实际 {other:?}"),
}
let text = on_screen(&page);
assert!(text.contains("15:00"), "倒计时要画成 mm:ss：{text}");
assert!(!text.contains("900s"), "不再是 `900s left`：{text}");
// 起点往前挪 20 分钟 ⇒ 过期
state.device_login_started =
@@ -190,7 +276,7 @@ fn the_device_code_panel_shows_a_countdown_and_expires() {
assert!(matches!(page.device, DevicePanel::Browser { .. }));
}
/// 没有皮肤 = 首字母块（不是白块、不是假皮肤）；坏图也必须回落。
/// 没有皮肤 = 首字母块（不是白块、不是假皮肤）；坏图也必须回落；无皮肤时**明说**。
#[test]
fn a_third_party_account_falls_back_to_the_monogram() {
let mut state = AppState::new();
@@ -204,7 +290,9 @@ fn a_third_party_account_falls_back_to_the_monogram() {
"没有皮肤就不许有图"
);
assert!(page.rows.iter().all(|row| !row.monogram.is_empty()));
assert!(page.active_skin().is_none(), "皮肤预览区没有图就不画");
assert!(page.active_skin().is_none(), "皮肤预览区没有图就不画图");
let text = on_screen(&page);
assert!(!has_cjk(&text));
// 塞一张坏图：解码失败 → 仍然回落到首字母块（不 panic、不白块）
state.accounts[0].skin = Some(SkinImage {
@@ -213,12 +301,6 @@ fn a_third_party_account_falls_back_to_the_monogram() {
});
let page = build(&state, &Form::new());
assert!(page.rows[0].head.is_none());
// 离线档案永远没有皮肤：即使被塞了假数据，UI 侧也只认 DTO 的 `kind`
state.accounts[1].skin = None;
state.accounts[1].kind = AccountKind::Offline;
let page = build(&state, &Form::new());
assert!(page.rows[1].head.is_none());
}
/// 离线档案的说明**必须**带「无法连接启用正版验证的服务器」这条限定（中英都要）。
@@ -242,34 +324,31 @@ fn the_offline_track_keeps_the_agreed_wording() {
}
}
/// 三条轨道在列表里**文案互不相同**（每一行都贴自己的轨道徽标）。
/// **离线轨的失败必须可见**（复审 r1 P2-2）：横幅进模型、文案走 i18n、原文不上屏。
#[test]
fn every_track_has_its_own_badge() {
fn a_failed_offline_add_is_visible() {
let mut state = AppState::new();
state.accounts = vec![
account("a", AccountKind::Microsoft, true),
account("b", AccountKind::Authlib, false),
account("c", AccountKind::Offline, false),
];
state.apply(AppEvent::Core(CoreEvent::AccountNoticeChanged(Some(
AccountNotice::new(
AccountNoticeCode::OfflineNameInvalid,
"ab",
"离线名字必须是 3–16 位字母/数字/下划线，收到 \"ab\"",
),
))));
let page = build(&state, &Form::new());
let labels: Vec<&str> = page
.rows
.iter()
.map(|row| row.kind_label.as_str())
.collect();
assert_eq!(labels.len(), 3);
assert_ne!(labels[0], labels[1]);
assert_ne!(labels[1], labels[2]);
assert!(
labels.iter().all(|label| !label.is_empty()),
"轨道徽标不能空"
);
let notice = page.notice.as_ref().expect("失败要有横幅");
assert_eq!(notice.code, AccountNoticeCode::OfflineNameInvalid);
assert!(notice.failure, "失败横幅要用 error 配色");
let text = on_screen(&page);
assert!(text.contains("3–16"), "要说清规则：{text}");
assert!(!has_cjk(&text), "英文界面不许出现中文：{text}");
}
/// 表单状态：三条轨道各开各的，密码关面板即清。
/// 表单状态：三条轨道各开各的，密码关面板即清，三卡默认收起。
#[test]
fn the_form_tracks_are_independent() {
let mut form = Form::new();
assert!(!form.section_open, "有账号时三卡默认收起（P2-4）");
form.open(Track::Offline);
assert_eq!(form.panel, Panel::Offline);
assert!(!form.offline_ready(), "空名字不能提交");
@@ -277,7 +356,6 @@ fn the_form_tracks_are_independent() {
assert!(form.offline_ready());
form.open(Track::Authlib);
assert_eq!(form.panel, Panel::Authlib);
assert!(!form.authlib_ready(), "地址/登录名/密码缺一不可");
form.server = "https://littleskin.cn/api/yggdrasil/".to_string();
form.login = "alex".to_string();
@@ -299,10 +377,10 @@ fn login_phases_map_to_distinct_panels() {
..DeviceLoginView::new()
},
)));
assert!(matches!(
build(&state, &Form::new()).device,
DevicePanel::Requesting { .. }
));
let page = build(&state, &Form::new());
assert!(matches!(page.device, DevicePanel::Requesting { .. }));
// 进行中也只有 i18n（不再复读 presenter 的中文状态串）
assert!(!has_cjk(&on_screen(&page)));
state.apply(AppEvent::Core(CoreEvent::DeviceLoginChanged(
DeviceLoginView::failed("HTTP 403"),
crates/app-iced/src/pages/account/widgets.rs
+192 -2
View File
@@ -11,15 +11,26 @@ use iced::widget::{container, image, row, text};
use iced::{Alignment, Background, Border, ContentFit, Element, Length, Pixels};
use unlucky_design::color::Role;
use unlucky_design::component_map::Component;
use unlucky_design::elevation::MaterialLayer;
use unlucky_design::icons::IconKind;
use unlucky_design::shape::ShapeScale;
use unlucky_design::spacing::Space;
use unlucky_design::typography::TypeRole;
use unlucky_i18n::{Catalog, Key};
use unlucky_presenter::dto::AccountNoticeCode;
use crate::pages::frame;
use crate::pages::frame::ICON_PX;
use crate::theme::Ui;
use super::super::Message;
use super::model::Row;
use crate::app::components::buttons::{self, Button};
use crate::pages::Message as PageMessage;
use crate::pages::Message;
use super::model::{Hint, Notice, Row};
use super::Message as Account;
/// 头像块的可选尺寸（列表 40 / 当前账户 56）。
pub const AVATAR_LIST: f32 = 40.0;
@@ -56,6 +67,185 @@ fn tone(ui: &Ui, tone: u8) -> (iced::Color, iced::Color) {
}
}
/// 提示条的语义档（决定图标块与图标字形用哪一对角色）。
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Tone {
/// 失败（`ErrorContainer` / `OnErrorContainer` 图标块 + `Error` 图形）
Error,
/// 成功/信息（`SecondaryContainer` / `OnSecondaryContainer` 图标块 + `Check` 图形）
Info,
}
/// **M3 内联提示条**（账户页横幅与登录失败面板共用）。
///
/// ## 为什么不是通栏实心色块（tower r2 意见）
///
/// r1 的失败面板把 `errorContainer` 铺满整条内容宽——角色本身是对的（复审按像素采样反证过：
/// 暗色取到容器角色 30 档、浅色取到 90 档，与设计层逐值一致），但**面积**让它像一条通栏告警带。
/// 现在改成 M3 的 alert 形态：面板底走 `SurfaceContainerHigh` + 1dp 描边，
/// `ErrorContainer` / `OnErrorContainer` 只作左侧**图标块**的强调（成功档换成 Secondary 容器），
/// 标题用 `OnSurface`、正文与 code 行用 `OnSurfaceVariant`。语义仍由角色表达，视觉不再是红条。
pub fn alert<'a>(
ui: &'a Ui,
tone: Tone,
title: &'a str,
body: String,
code: Option<String>,
actions: Vec<Element<'a, PageMessage>>,
) -> Element<'a, PageMessage> {
let (chip_bg, chip_fg, glyph, glyph_color) = match tone {
Tone::Error => (
ui.color(Role::ErrorContainer),
ui.color(Role::OnErrorContainer),
IconKind::Error,
ui.color(Role::Error),
),
Tone::Info => (
ui.color(Role::SecondaryContainer),
ui.color(Role::OnSecondaryContainer),
IconKind::Check,
ui.color(Role::OnSecondaryContainer),
),
};
let _ = chip_fg;
let chip = container(frame::glyph_box(glyph, glyph_color, ICON_PX))
.width(Length::Fixed(ui.space(Space::X8)))
.height(Length::Fixed(ui.space(Space::X8)))
.align_x(Alignment::Center)
.align_y(Alignment::Center)
.style(move |_theme| container::Style {
background: Some(Background::Color(chip_bg)),
border: Border {
radius: ui.radius(ShapeScale::Full, ui.space(Space::X8)),
..Border::default()
},
..container::Style::default()
});
let mut lines = iced::widget::Column::new().spacing(ui.space(Space::X1));
lines = lines.push(frame::text_role(
ui,
TypeRole::TitleSmall,
true,
title,
ui.color(Role::OnSurface),
));
lines = lines.push(frame::text_role_owned(
ui,
TypeRole::BodySmall,
false,
body,
ui.color(Role::OnSurfaceVariant),
));
if let Some(code) = code {
lines = lines.push(frame::text_role_owned(
ui,
TypeRole::LabelSmall,
false,
code,
ui.color(Role::OnSurfaceVariant),
));
}
container(
row![
chip,
container(lines).width(Length::Fill),
row(actions)
.spacing(ui.space(Space::X2))
.align_y(Alignment::Center),
]
.spacing(ui.space(Space::X3))
.align_y(Alignment::Center)
.width(Length::Fill),
)
.width(Length::Fill)
.padding(ui.metrics().card_padding)
.style(move |_theme| container::Style {
background: Some(Background::Color(ui.layer(MaterialLayer::Card))),
border: ui.outlined(Component::OutlinedCard.spec().shape),
..container::Style::default()
})
.into()
}
/// 账户页横幅：添加/删除/切换的结果（**页面上真实可见的控件**，不是 toast）。
///
/// 为什么必须有它：app-iced 不渲染 toast（复审 r1 P2-2），离线名字不合法/重名/落盘失败时
/// 用户原本什么都看不到。文案按 `AccountNoticeCode` 查 i18n，后端原文不进 UI。
pub fn banner<'a>(ui: &'a Ui, notice: &'a Notice, catalog: Catalog) -> Element<'a, PageMessage> {
let tone = if notice.failure {
Tone::Error
} else {
Tone::Info
};
let title = if notice.failure {
catalog.text(Key::AccountNoticeTitleFailed)
} else {
catalog.text(Key::AccountNoticeTitleDone)
};
let message = notice_text(notice, catalog);
let dismiss = buttons::text(
ui,
Button::new(
catalog.text(Key::AccountNoticeDismiss),
Account::DismissNotice.into_page(),
),
);
// 只有失败才显示稳定 code（成功态列一串 `added` 是噪音）
let code = notice
.failure
.then(|| catalog.render(Key::AccountFailureCode, &[("code", notice.code.code())]));
alert(ui, tone, title, message, code, vec![dismiss])
}
/// 横幅文案（码 → i18n；主题名拼进带占位符的几句）。
fn notice_text(notice: &Notice, catalog: Catalog) -> String {
let name = notice.subject.as_str();
match notice.code {
AccountNoticeCode::Added => catalog.render(Key::AccountNoticeAdded, &[("name", name)]),
AccountNoticeCode::Removed => catalog.render(Key::AccountNoticeRemoved, &[("name", name)]),
AccountNoticeCode::Switched => {
catalog.render(Key::AccountNoticeSwitched, &[("name", name)])
}
AccountNoticeCode::OfflineNameInvalid => catalog
.text(Key::AccountNoticeOfflineNameInvalid)
.to_string(),
AccountNoticeCode::AccountExists => {
catalog.text(Key::AccountNoticeAccountExists).to_string()
}
AccountNoticeCode::StoreFailed => catalog.text(Key::AccountNoticeStoreFailed).to_string(),
AccountNoticeCode::NotFound => catalog.text(Key::AccountNoticeNotFound).to_string(),
AccountNoticeCode::Other => catalog.text(Key::AccountNoticeOther).to_string(),
}
}
/// 一次性引导（重新登录时告诉用户下一步）。
pub fn hint<'a>(
ui: &'a Ui,
hint: Hint,
page: &'a super::Page,
catalog: Catalog,
) -> Element<'a, PageMessage> {
let message = match hint {
Hint::AuthlibReauth => catalog.render(
Key::AccountHintAuthlibReauth,
&[("server", page.form.server.as_str())],
),
Hint::OfflineNoRelogin => catalog.text(Key::AccountHintOfflineNoRelogin).to_string(),
};
container(frame::text_role_owned(
ui,
TypeRole::BodySmall,
false,
message,
ui.color(Role::OnSurfaceVariant),
))
.width(Length::Fill)
.into()
}
/// 头像块：有真图就画图（圆角裁切），没有就画**首字母块**。
///
/// 三条铁律：① 图解码失败一定回到首字母块（不白块）；② 首字母块的字来自 `AccountView::monogram`，