diff --git a/client/lib/shell/desktop_shell.dart b/client/lib/shell/desktop_shell.dart index a5e9547..011ee64 100644 --- a/client/lib/shell/desktop_shell.dart +++ b/client/lib/shell/desktop_shell.dart @@ -27,13 +27,13 @@ class DesktopShell extends ConsumerWidget { final t = ref.watch(appTextProvider); final view = ref.watch(navViewProvider); + // 「我的」移到侧栏顶部品牌按钮(见 NavSidebar);联系放设置下面。 final items = [ (icon: PangolinIcons.power, label: t.tabConnect, view: NavView.connect), (icon: PangolinIcons.globe, label: t.tabServers, view: NavView.servers), (icon: PangolinIcons.barChart, label: t.tabStats, view: NavView.stats), - (icon: PangolinIcons.user, label: t.tabMe, view: NavView.account), - (icon: PangolinIcons.messageCircle, label: t.contactTitle, view: NavView.contact), (icon: PangolinIcons.settings, label: t.settingsTitle, view: NavView.settings), + (icon: PangolinIcons.messageCircle, label: t.contactTitle, view: NavView.contact), ]; final titles = { diff --git a/client/lib/shell/tablet_shell.dart b/client/lib/shell/tablet_shell.dart index 88a824f..c09506a 100644 --- a/client/lib/shell/tablet_shell.dart +++ b/client/lib/shell/tablet_shell.dart @@ -25,11 +25,11 @@ class TabletShell extends ConsumerWidget { final t = ref.watch(appTextProvider); final view = ref.watch(navViewProvider); + // 「我的」移到侧栏顶部品牌按钮(见 NavSidebar)。 final items = [ (icon: PangolinIcons.power, label: t.tabConnect, view: NavView.connect), (icon: PangolinIcons.globe, label: t.tabServers, view: NavView.servers), (icon: PangolinIcons.barChart, label: t.tabStats, view: NavView.stats), - (icon: PangolinIcons.user, label: t.tabMe, view: NavView.account), ]; final titles = { diff --git a/client/lib/widgets/nav_sidebar.dart b/client/lib/widgets/nav_sidebar.dart index 6679353..4663800 100644 --- a/client/lib/widgets/nav_sidebar.dart +++ b/client/lib/widgets/nav_sidebar.dart @@ -36,23 +36,32 @@ class NavSidebar extends ConsumerWidget { ), padding: EdgeInsets.fromLTRB(dense ? 12 : 14, dense ? 14 : 18, dense ? 12 : 14, dense ? 14 : 16), child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - // 品牌区 - Padding( - padding: EdgeInsets.fromLTRB(6, 2, 6, dense ? 16 : 20), - child: Row(children: [ - PangolinMark(size: dense ? 28 : 30), - SizedBox(width: dense ? 9 : 10), - Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - Text(t.brand, - style: PangolinText.h3.copyWith( - color: c.fg1, fontWeight: FontWeight.w700, fontSize: dense ? 16 : 17, height: 1)), - const SizedBox(height: 3), - Text('PANGOLIN', - style: PangolinText.caption.copyWith( - color: c.accent, fontWeight: FontWeight.w600, fontSize: 9, letterSpacing: 1.6)), - ]), - ]), + // 品牌区(可点 → 我的/账户;选中态高亮)。「我的」已从导航列表移到此处。 + Material( + color: current == NavView.account ? c.accentSubtle : Colors.transparent, + borderRadius: BorderRadius.circular(PangolinRadius.md), + clipBehavior: Clip.antiAlias, + child: InkWell( + onTap: () => ref.read(navViewProvider.notifier).state = NavView.account, + child: Padding( + padding: EdgeInsets.fromLTRB(6, dense ? 7 : 9, 6, dense ? 7 : 9), + child: Row(children: [ + PangolinMark(size: dense ? 28 : 30), + SizedBox(width: dense ? 9 : 10), + Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ + Text(t.brand, + style: PangolinText.h3.copyWith( + color: c.fg1, fontWeight: FontWeight.w700, fontSize: dense ? 16 : 17, height: 1)), + const SizedBox(height: 3), + Text('PANGOLIN', + style: PangolinText.caption.copyWith( + color: c.accent, fontWeight: FontWeight.w600, fontSize: 9, letterSpacing: 1.6)), + ]), + ]), + ), + ), ), + SizedBox(height: dense ? 12 : 16), // Nav 列表 for (final item in items) Padding( diff --git a/client/test/golden/goldens/desktop_account.png b/client/test/golden/goldens/desktop_account.png index cc346dd..e80475e 100644 Binary files a/client/test/golden/goldens/desktop_account.png and b/client/test/golden/goldens/desktop_account.png differ diff --git a/client/test/golden/goldens/desktop_contact.png b/client/test/golden/goldens/desktop_contact.png index ce4265b..e709ec7 100644 Binary files a/client/test/golden/goldens/desktop_contact.png and b/client/test/golden/goldens/desktop_contact.png differ diff --git a/client/test/golden/goldens/desktop_devices.png b/client/test/golden/goldens/desktop_devices.png index 00031a5..f54020c 100644 Binary files a/client/test/golden/goldens/desktop_devices.png and b/client/test/golden/goldens/desktop_devices.png differ diff --git a/client/test/golden/goldens/desktop_plans.png b/client/test/golden/goldens/desktop_plans.png index 341ea3b..971c1f5 100644 Binary files a/client/test/golden/goldens/desktop_plans.png and b/client/test/golden/goldens/desktop_plans.png differ diff --git a/client/test/golden/goldens/desktop_redeem.png b/client/test/golden/goldens/desktop_redeem.png index e4e97e3..f6e58e1 100644 Binary files a/client/test/golden/goldens/desktop_redeem.png and b/client/test/golden/goldens/desktop_redeem.png differ diff --git a/client/test/golden/goldens/desktop_servers.png b/client/test/golden/goldens/desktop_servers.png index f258ef4..0ee629c 100644 Binary files a/client/test/golden/goldens/desktop_servers.png and b/client/test/golden/goldens/desktop_servers.png differ diff --git a/client/test/golden/goldens/desktop_settings.png b/client/test/golden/goldens/desktop_settings.png index 6a0be02..384405d 100644 Binary files a/client/test/golden/goldens/desktop_settings.png and b/client/test/golden/goldens/desktop_settings.png differ diff --git a/client/test/golden/goldens/desktop_stats.png b/client/test/golden/goldens/desktop_stats.png index 308ba2b..d6f5179 100644 Binary files a/client/test/golden/goldens/desktop_stats.png and b/client/test/golden/goldens/desktop_stats.png differ diff --git a/client/test/golden/goldens/tablet_account_dark_zh.png b/client/test/golden/goldens/tablet_account_dark_zh.png index d99c397..888c705 100644 Binary files a/client/test/golden/goldens/tablet_account_dark_zh.png and b/client/test/golden/goldens/tablet_account_dark_zh.png differ diff --git a/client/test/golden/goldens/tablet_account_light_en.png b/client/test/golden/goldens/tablet_account_light_en.png index 5f1c625..2b1f24c 100644 Binary files a/client/test/golden/goldens/tablet_account_light_en.png and b/client/test/golden/goldens/tablet_account_light_en.png differ diff --git a/client/test/golden/goldens/tablet_account_light_zh.png b/client/test/golden/goldens/tablet_account_light_zh.png index 9e4d63e..57727dc 100644 Binary files a/client/test/golden/goldens/tablet_account_light_zh.png and b/client/test/golden/goldens/tablet_account_light_zh.png differ diff --git a/client/test/golden/goldens/tablet_connect_dark_zh.png b/client/test/golden/goldens/tablet_connect_dark_zh.png index 7ad5f22..c3f6cea 100644 Binary files a/client/test/golden/goldens/tablet_connect_dark_zh.png and b/client/test/golden/goldens/tablet_connect_dark_zh.png differ diff --git a/client/test/golden/goldens/tablet_connect_light_en.png b/client/test/golden/goldens/tablet_connect_light_en.png index 542f53e..9ef497c 100644 Binary files a/client/test/golden/goldens/tablet_connect_light_en.png and b/client/test/golden/goldens/tablet_connect_light_en.png differ diff --git a/client/test/golden/goldens/tablet_connect_light_zh.png b/client/test/golden/goldens/tablet_connect_light_zh.png index 22ac0b4..83ae475 100644 Binary files a/client/test/golden/goldens/tablet_connect_light_zh.png and b/client/test/golden/goldens/tablet_connect_light_zh.png differ diff --git a/client/test/golden/goldens/tablet_servers_dark_zh.png b/client/test/golden/goldens/tablet_servers_dark_zh.png index 18b3e79..1dd6584 100644 Binary files a/client/test/golden/goldens/tablet_servers_dark_zh.png and b/client/test/golden/goldens/tablet_servers_dark_zh.png differ diff --git a/client/test/golden/goldens/tablet_servers_light_en.png b/client/test/golden/goldens/tablet_servers_light_en.png index d885db3..538cea4 100644 Binary files a/client/test/golden/goldens/tablet_servers_light_en.png and b/client/test/golden/goldens/tablet_servers_light_en.png differ diff --git a/client/test/golden/goldens/tablet_servers_light_zh.png b/client/test/golden/goldens/tablet_servers_light_zh.png index d595a1d..cc30a56 100644 Binary files a/client/test/golden/goldens/tablet_servers_light_zh.png and b/client/test/golden/goldens/tablet_servers_light_zh.png differ diff --git a/client/test/golden/goldens/tablet_stats_dark_zh.png b/client/test/golden/goldens/tablet_stats_dark_zh.png index 33f3eab..5aa61b0 100644 Binary files a/client/test/golden/goldens/tablet_stats_dark_zh.png and b/client/test/golden/goldens/tablet_stats_dark_zh.png differ diff --git a/client/test/golden/goldens/tablet_stats_light_en.png b/client/test/golden/goldens/tablet_stats_light_en.png index 43d2340..554b707 100644 Binary files a/client/test/golden/goldens/tablet_stats_light_en.png and b/client/test/golden/goldens/tablet_stats_light_en.png differ diff --git a/client/test/golden/goldens/tablet_stats_light_zh.png b/client/test/golden/goldens/tablet_stats_light_zh.png index f1c4704..83194c3 100644 Binary files a/client/test/golden/goldens/tablet_stats_light_zh.png and b/client/test/golden/goldens/tablet_stats_light_zh.png differ