refactor(client): Phase 1 照原型重建 app 外壳(顶栏两级品牌 + 主题器 + 通知铃 + 分组侧栏 + 状态栏)
照 shell.js/statusbar.js/atoms.css 把外壳从「旧单品牌+换色」彻底重建为原型样式: - 顶栏:岩美酒库(线描山形 mark CustomPaint,软件品牌) │分隔│ 鼎晟酒行(门店字标+店名); 右侧 ThemePickerPill(主题器,从系统设置迁来,A/B/C 切换) + NotificationBell(通知) - 侧栏(218w):分组 单据/经营/系统(nav-label) + nav(active 高亮) + 底部 side-user(头像/姓名/店·角色→菜单) - 状态栏:AppStatusBar(原型 .statusbar,AppChrome 主题无关色):店号/操作员/登录/当前(走字) · 连接/版本/授权 - 保留全部既有行为:更新/强制更新/授权横幅与弹窗、离线横幅、心跳、apiMessage、窄屏 Drawer - 新增 widgets/theme_picker_pill.dart · notification_bell.dart · app_status_bar.dart - golden:加载真实 MaterialIcons 字体(消图标豆腐块,全 golden 受益); app_shell golden 用 9 分支+冻结时钟(可测试缝)确定化,对齐原型数据(鼎晟酒行/王经理/库存激活) - fidelity:外壳 vs 原型 diff 3.5% ≤ 阈,montage 目检 chrome 与原型一致 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TSKEiHsvauyxYUW2itzUXX
@@ -12,10 +12,13 @@ import 'package:jiu_client/providers/update_provider.dart';
|
||||
import 'package:jiu_client/providers/connectivity_provider.dart';
|
||||
import 'package:jiu_client/providers/session_heartbeat.dart';
|
||||
import 'package:jiu_client/screens/shell/app_shell.dart';
|
||||
import 'package:jiu_client/widgets/app_status_bar.dart';
|
||||
|
||||
/// design-distill 阶段4:app 外壳(顶栏 + 侧栏 + 内容区)golden × 三主题。
|
||||
/// 锁住导航 chrome 随主题换色——这是最显眼的主题面,之前各屏 golden 都不含外壳。
|
||||
/// 需 MaterialApp.router(外壳依赖 StatefulNavigationShell),故为自定义 golden。
|
||||
import '../support/golden_harness.dart';
|
||||
|
||||
/// design-distill 阶段4:app 外壳(顶栏两级品牌 + 主题器 + 通知铃 + 分组侧栏 + 状态栏)
|
||||
/// golden × 三主题。照原型 shell.js/statusbar.js 重建后的回归基准 + 与原型保真比对基准。
|
||||
/// 与原型对齐:门店=鼎晟酒行/DSJH-001、用户=王经理(管理员)、版本 v1.0.72、库存页激活。
|
||||
/// 更新基准:flutter test --update-goldens test/golden/app_shell_golden_test.dart
|
||||
|
||||
class _FakeAuth extends AuthNotifier {
|
||||
@@ -23,7 +26,7 @@ class _FakeAuth extends AuthNotifier {
|
||||
state = const AuthState(
|
||||
user: AuthUser(
|
||||
accessToken: 't', refreshToken: 'r', id: 1, username: 'wang',
|
||||
realName: '王经理', shopNo: 'DBZB-001', shopId: 1, role: 'admin'),
|
||||
realName: '王经理', shopNo: 'DSJH-001', shopId: 1, role: 'admin'),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -39,7 +42,7 @@ class _FakeLicense extends LicenseNotifier {
|
||||
}
|
||||
|
||||
const _shop = ShopInfo(
|
||||
id: 1, code: 'DBZB-001', name: '鼎昌酒行',
|
||||
id: 1, code: 'DSJH-001', name: '鼎晟酒行',
|
||||
address: '浙江省杭州市', phone: '0571-88886666', managerName: '王经理');
|
||||
|
||||
List<Override> _overrides() => [
|
||||
@@ -55,17 +58,27 @@ List<Override> _overrides() => [
|
||||
isReadonlyProvider.overrideWithValue(false),
|
||||
];
|
||||
|
||||
// 外壳 nav 引用 9 个分支序号(入/出库·库存·财务·往来·基础数据·设备·设置·关于)。
|
||||
// 全部空白内容,仅供外壳渲染;初始定位库存(index 2)以匹配原型激活态。
|
||||
StatefulShellBranch _branch(String path) => StatefulShellBranch(routes: [
|
||||
GoRoute(path: path, builder: (_, __) => const SizedBox.expand()),
|
||||
]);
|
||||
|
||||
GoRouter _router() => GoRouter(
|
||||
initialLocation: '/inventory',
|
||||
routes: [
|
||||
StatefulShellRoute.indexedStack(
|
||||
builder: (ctx, state, shell) => AppShell(navigationShell: shell),
|
||||
branches: [
|
||||
StatefulShellBranch(routes: [
|
||||
GoRoute(
|
||||
path: '/inventory',
|
||||
builder: (_, __) => const SizedBox.expand()),
|
||||
]),
|
||||
_branch('/stock-in'),
|
||||
_branch('/stock-out'),
|
||||
_branch('/inventory'),
|
||||
_branch('/finance'),
|
||||
_branch('/partners'),
|
||||
_branch('/products'),
|
||||
_branch('/devices'),
|
||||
_branch('/settings'),
|
||||
_branch('/about'),
|
||||
],
|
||||
),
|
||||
],
|
||||
@@ -74,10 +87,14 @@ GoRouter _router() => GoRouter(
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
// 冻结状态栏时钟,确定化 golden(关走字,避免像素抖动 / pending timer)。
|
||||
AppStatusBar.clock = () => DateTime(2026, 7, 13, 9, 30, 15);
|
||||
AppStatusBar.ticking = false;
|
||||
|
||||
for (final theme in const ['a', 'b', 'c']) {
|
||||
testWidgets('app shell · theme $theme', (tester) async {
|
||||
tester.view.physicalSize = const Size(2560, 1600);
|
||||
await ensureGoldenFonts();
|
||||
tester.view.physicalSize = const Size(2560, 1800); // 1280×900 @2x
|
||||
tester.view.devicePixelRatio = 2.0;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
@@ -86,7 +103,7 @@ void main() {
|
||||
overrides: _overrides(),
|
||||
child: MaterialApp.router(
|
||||
debugShowCheckedModeBanner: false,
|
||||
theme: buildTheme(theme),
|
||||
theme: withGoldenFont(buildTheme(theme)),
|
||||
routerConfig: _router(),
|
||||
),
|
||||
));
|
||||
|
||||
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 151 KiB |
|
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 137 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 138 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 103 KiB After Width: | Height: | Size: 104 KiB |
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 108 KiB |
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 107 KiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 194 KiB |
|
Before Width: | Height: | Size: 185 KiB After Width: | Height: | Size: 192 KiB |
|
Before Width: | Height: | Size: 188 KiB After Width: | Height: | Size: 195 KiB |
|
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 135 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 135 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 115 KiB |
|
Before Width: | Height: | Size: 115 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 116 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 168 KiB After Width: | Height: | Size: 169 KiB |
|
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 167 KiB |
|
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 169 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 126 KiB After Width: | Height: | Size: 130 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 121 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 120 KiB |
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 163 KiB After Width: | Height: | Size: 167 KiB |
|
Before Width: | Height: | Size: 162 KiB After Width: | Height: | Size: 165 KiB |
|
Before Width: | Height: | Size: 164 KiB After Width: | Height: | Size: 168 KiB |
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 159 KiB |
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 160 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 125 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 122 KiB |
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 125 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 164 KiB |
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 162 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 165 KiB |
|
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 151 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 153 KiB |
|
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 431 KiB |
@@ -12,6 +12,17 @@ Future<void> ensureGoldenFonts() async {
|
||||
final loader = FontLoader('NotoSansSC')
|
||||
..addFont(rootBundle.load('assets/fonts/NotoSansSC.ttf'));
|
||||
await loader.load();
|
||||
// 真实 Material 图标字体(否则 golden 里图标渲染成豆腐块 □)。
|
||||
for (final key in const [
|
||||
'fonts/MaterialIcons-Regular.otf',
|
||||
'packages/flutter/fonts/MaterialIcons-Regular.otf',
|
||||
]) {
|
||||
try {
|
||||
final f = FontLoader('MaterialIcons')..addFont(rootBundle.load(key));
|
||||
await f.load();
|
||||
break;
|
||||
} catch (_) {/* 换下一个 asset key */}
|
||||
}
|
||||
_fontsLoaded = true;
|
||||
}
|
||||
|
||||
|
||||