Redesign global toast as auto-dismissing top banner.

Use a full-width primary banner with centered text, auto-hide after 2.2 seconds, and tests for timer reset behavior.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-06-23 14:48:31 +08:00
parent 31a262fd08
commit b7054145e7
5 changed files with 146 additions and 27 deletions

View File

@ -19,7 +19,7 @@ App 模块负责应用入口、根视图切换、全局状态注入、主导航
- `PermissionContext`:保存角色权限、当前角色和扁平化权限 URI。
- `ScenicSpotContext`:保存当前景区下的景点/打卡点列表和加载状态。
- `AppRouter`:保存当前 Tab 和每个 Tab 自己的导航路径。
- `ToastCenter`保存当前全局 Toast 文案。
- `ToastCenter`管理当前全局 Toast 文案和自动隐藏任务
- `AuthSessionCoordinator`:统一处理登录完成、退出登录、偏好读取和账号快照刷新。
- `SessionBootstrapper`:冷启动时读取本地 token 和账号快照,并向服务端校验登录态。
- `AccountContextLoader`:统一同步用户资料、角色权限、景区和门店。
@ -55,6 +55,12 @@ App 模块负责应用入口、根视图切换、全局状态注入、主导航
- `AppSession` 切换为 `loggedOut`
- 保留上次手机号、协议状态等非敏感偏好。
## Toast
全局 Toast 由 `RootView` 挂载在页面最上层,业务页面只调用 `toastCenter.show(...)` 发出提示命令。
Toast 展示为顶部全宽横幅,背景使用不透明主色并延伸到屏幕顶部、左边和右边;文案居中展示,不提供关闭按钮,默认 2.2 秒后自动消失。连续展示新 Toast 时会覆盖旧文案并重新计时,旧的自动隐藏任务不会影响新的 Toast。
## 导航规则
主界面使用 `TabView`,每个 Tab 内部由单独的 `NavigationStack` 包裹。`AppRouter` 为每个 `AppTab` 持有独立 `RouterPath`,切换 Tab 不会丢失该 Tab 的内部导航路径。

View File

@ -13,16 +13,54 @@ import SwiftUI
/// Toast
final class ToastCenter {
fileprivate var message: String?
@ObservationIgnored private let autoDismissNanoseconds: UInt64
@ObservationIgnored private var dismissTask: Task<Void, Never>?
@ObservationIgnored private var displayToken: UInt64 = 0
/// Toast 2.2
init(autoDismissNanoseconds: UInt64 = 2_200_000_000) {
self.autoDismissNanoseconds = autoDismissNanoseconds
}
/// Toast
func show(_ message: String) {
displayToken &+= 1
self.message = message
scheduleAutoDismiss(token: displayToken)
}
/// Toast
func dismiss() {
displayToken &+= 1
dismissTask?.cancel()
dismissTask = nil
message = nil
}
/// Toast Toast
private func scheduleAutoDismiss(token: UInt64) {
dismissTask?.cancel()
let delay = autoDismissNanoseconds
dismissTask = Task { [weak self] in
do {
try await Task.sleep(nanoseconds: delay)
} catch {
return
}
await MainActor.run {
guard let self, self.displayToken == token else { return }
self.message = nil
self.dismissTask = nil
}
}
}
#if DEBUG
/// Toast
var snapshotForTests: ToastSnapshot {
ToastSnapshot(message: message)
}
#endif
}
/// Toast Toast
@ -32,35 +70,44 @@ private struct GlobalToastOverlay: ViewModifier {
func body(content: Content) -> some View {
content
.overlay(alignment: .top) {
if let message = toastCenter.message {
HStack(spacing: 10) {
Image(systemName: "exclamationmark.triangle.fill")
.font(.system(size: 14, weight: .semibold))
Text(message)
.font(.system(size: 13, weight: .medium))
.lineLimit(2)
Spacer(minLength: 0)
Button("关闭") {
toastCenter.dismiss()
}
.font(.system(size: 13, weight: .semibold))
GeometryReader { proxy in
if let message = toastCenter.message {
toastBanner(message, topInset: proxy.safeAreaInsets.top)
.transition(.move(edge: .top).combined(with: .opacity))
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
}
.foregroundStyle(.white)
.padding(.horizontal, 14)
.padding(.vertical, 10)
.background(Color.black.opacity(0.78), in: RoundedRectangle(cornerRadius: 12))
.padding(.horizontal, 16)
.padding(.top, 10)
.transition(.move(edge: .top).combined(with: .opacity))
}
.allowsHitTesting(false)
}
.animation(.easeInOut(duration: 0.18), value: toastCenter.message)
}
/// Toast
private func toastBanner(_ message: String, topInset: CGFloat) -> some View {
HStack {
Text(message)
.font(.system(size: 14, weight: .medium))
.lineLimit(2)
.multilineTextAlignment(.center)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: .infinity, alignment: .center)
}
.foregroundStyle(.white)
.padding(.horizontal, AppMetrics.Spacing.pageHorizontal)
.padding(.top, topInset + AppMetrics.Spacing.small)
.padding(.bottom, AppMetrics.Spacing.small)
.frame(maxWidth: .infinity, alignment: .center)
.background(AppDesign.primary.ignoresSafeArea(edges: .top))
}
}
#if DEBUG
/// Toast
struct ToastSnapshot: Equatable {
let message: String?
}
#endif
extension View {
/// Toast
func globalToastOverlay() -> some View {