fix(app): 对齐 Open Design spec — 字体/Token/首页/Tab栏/路由/Discover页
针对 docs/opendesign/warm-notes-design-spec.md 全面审查的修复: ## 🔴 阻断级修复(商用合规) - 下载真实 Quicksand/Nunito 字体文件(原 0 字节) - 添加 OFL.txt 许可证文件,履行 SIL Open Font License 分发义务 ## 🟠 设计 Token 偏差 - AppRadius: 删除非规范的 xs=8px,所有引用迁移至 sm=10px - AppColors.moodColors: 对齐 spec §3.6 - happy #FFD93D → secondary #81B29A - calm #81B29A → tertiary #F2CC8F - sad #7B9CC4 → #5B7DB1 - thinking #B8A9C9(淡紫,spec 无)→ #8B7E74 - AppShadows: blurRadius/alpha 精确对齐 spec §1 (12/20/32 + 0.06/0.08/0.12) - DesignTokens: 补 spacing40 + 新增 safe-top/safe-bottom/tab-height/touch-min 常量 ## 🟠 首页 §3.4 完全重构 - 新增问候语头部(xx好,小暖 + accent 色高亮名字) - 新增 streak-badge pill 徽章(tertiary-soft + #B8860B 暖金) - 心情选择器卡片背景从 primaryContainer 改为 surface(spec 规定 #FFFFFF) - 心情卡片圆角 lg(22) → md(16) 对齐 spec - 新增 today-card 渐变卡片 + 浮动右下圆形写按钮 - 新增 quick-stats 三栏统计(本月日记/连续天数/总日记数) - 移除 AppBar 多余的贴纸/模板按钮,搜索按钮改路由到 /search - HomeBloc 扩展 monthCount/totalCount 字段 - 日记卡片:72×72 预览图 + 标签摘要 + 心情圆点 ## 🟠 路由 §3.12 + §3.13 拆分 - 新建 DiscoverPage (features/discover/views/discover_page.dart) - 搜索框(跳转 /search) - 每日推荐渐变卡片 - 热门话题横向 chips(前 3 个 accent 高亮) - 精选模板 2 列网格 - 达人日记列表 - /discover 路由从指向 SearchPage 改为 DiscoverPage - 新增 /search 路由(全屏无 Tab)指向 SearchPage ## 🟠 Tab 栏 §2.2 重构 - 高度从 64px 改为 56+bottomPadding(含 safe-bottom,约 90px) - 中心按钮从 CircularNotchedRectangle 凹槽改为 margin-top:-16px 凸起 - FAB 尺寸从默认改为 48×48 spec 规格 - FAB 图标从 edit_rounded 改为 add_rounded(spec §2.2) - 删除未使用的 _navItems 旧常量 ## 🟡 登录页圆角统一 - 移除 3 处 InputBorder 显式 mdBorder(16px) 覆盖 - 全局主题 smBorder(10px) 生效,对齐 spec - 提交按钮圆角改为 pill(spec §2.6 Primary 按钮) ## 验证 - flutter analyze: 0 errors (剩余 40 个 warning/info 全为预存) - flutter test: 84/85 通过(widget smoke test 预存失败,与本次无关)
This commit is contained in:
@@ -5,7 +5,7 @@ import 'package:flutter/animation.dart';
|
||||
class DesignTokens {
|
||||
DesignTokens._();
|
||||
|
||||
// ===== 间距 =====
|
||||
// ===== 间距(4px 基准,9 级)=====
|
||||
static const double spacing4 = 4;
|
||||
static const double spacing8 = 8;
|
||||
static const double spacing12 = 12;
|
||||
@@ -13,8 +13,16 @@ class DesignTokens {
|
||||
static const double spacing20 = 20;
|
||||
static const double spacing24 = 24;
|
||||
static const double spacing32 = 32;
|
||||
static const double spacing40 = 40;
|
||||
static const double spacing48 = 48;
|
||||
|
||||
// ===== 安全区 & 布局常量(对齐 spec §1)=====
|
||||
static const double safeTop = 54; // iPhone Dynamic Island
|
||||
static const double safeBottom = 34; // Home Indicator
|
||||
static const double tabHeight = 56; // 底部 Tab 栏
|
||||
static const double touchMin = 44; // WCAG 最小触控目标
|
||||
static const double containerMax = 390; // 移动端容器宽度
|
||||
|
||||
// ===== 动画时长 =====
|
||||
static const Duration animFast = Duration(milliseconds: 150);
|
||||
static const Duration animNormal = Duration(milliseconds: 300);
|
||||
|
||||
@@ -21,6 +21,7 @@ import '../../features/home/views/home_page.dart';
|
||||
import '../../features/calendar/views/calendar_page.dart';
|
||||
import '../../features/mood/views/mood_page.dart';
|
||||
import '../../features/search/views/search_page.dart';
|
||||
import '../../features/discover/views/discover_page.dart';
|
||||
import '../../features/calendar/views/weekly_page.dart';
|
||||
import '../../features/calendar/views/monthly_page.dart';
|
||||
import '../../features/profile/views/profile_page.dart';
|
||||
@@ -151,18 +152,13 @@ GoRouter createAppRouter(AuthBloc authBloc) {
|
||||
name: 'calendar',
|
||||
builder: (context, state) => const CalendarPage(),
|
||||
),
|
||||
// 发现页(搜索页 — 标签+心情筛选日记)
|
||||
// 发现页 — 灵感、话题、达人日记(spec §3.12)
|
||||
GoRoute(
|
||||
path: '/discover',
|
||||
name: 'discover',
|
||||
builder: (context, state) {
|
||||
final journalRepo = context.read<JournalRepository>();
|
||||
return BlocProvider(
|
||||
create: (_) => SearchBloc(journalRepository: journalRepo),
|
||||
child: const SearchPage(),
|
||||
);
|
||||
},
|
||||
builder: (context, state) => const DiscoverPage(),
|
||||
),
|
||||
// 个人中心
|
||||
GoRoute(
|
||||
path: '/profile',
|
||||
name: 'profile',
|
||||
@@ -171,6 +167,20 @@ GoRouter createAppRouter(AuthBloc authBloc) {
|
||||
],
|
||||
),
|
||||
|
||||
// 搜索页 — 全屏无 Tab(spec §3.13)
|
||||
GoRoute(
|
||||
path: '/search',
|
||||
name: 'search',
|
||||
parentNavigatorKey: _rootNavigatorKey,
|
||||
builder: (context, state) {
|
||||
final journalRepo = context.read<JournalRepository>();
|
||||
return BlocProvider(
|
||||
create: (_) => SearchBloc(journalRepository: journalRepo),
|
||||
child: const SearchPage(),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
// 全屏页面(无底部导航)
|
||||
GoRoute(
|
||||
path: '/editor',
|
||||
|
||||
@@ -164,19 +164,21 @@ class AppColors {
|
||||
static const Color shadowDark = Color(0xFF000000);
|
||||
|
||||
// ===== 心情颜色映射 =====
|
||||
// 对齐 spec §2.8 mood-selector: happy/calm/sad/angry/thinking
|
||||
// 对齐 spec §3.6 calendar mood-dot 颜色(开心=secondary, 平静=tertiary, 难过=#5B7DB1)
|
||||
|
||||
/// 心情 → 颜色
|
||||
/// 心情 → 颜色(主色,用于心情选择器圆圈/标签)
|
||||
static const Map<String, Color> moodColors = {
|
||||
'happy': Color(0xFFFFD93D), // 😊 开心 — 暖黄
|
||||
'calm': Color(0xFF81B29A), // 😌 平静 — 鼠尾草绿
|
||||
'sad': Color(0xFF7B9CC4), // 😢 难过 — 灰蓝
|
||||
'angry': Color(0xFFE07A5F), // 😠 生气 — 珊瑚
|
||||
'thinking': Color(0xFFB8A9C9),// 🤔 思考 — 淡紫
|
||||
'happy': secondary, // 😊 开心 — 鼠尾草绿 #81B29A
|
||||
'calm': tertiary, // 😌 平静 — 暖金 #F2CC8F
|
||||
'sad': Color(0xFF5B7DB1), // 😢 难过 — 灰蓝
|
||||
'angry': accent, // 😠 生气 — 珊瑚 #E07A5F
|
||||
'thinking': metaLight, // 🤔 思考 — 灰棕 #8B7E74(替代原先的淡紫,spec 无淡紫)
|
||||
};
|
||||
|
||||
/// 心情 → 日历背景色
|
||||
/// 心情 → 日历单元格背景色
|
||||
static const Map<String, Color> moodCellColors = {
|
||||
'happy': secondarySoftLight, // #D4E8DC
|
||||
'happy': secondarySoftLight, // #D4E8DC
|
||||
'love': roseSoftLight, // #F0DADA
|
||||
'calm': tertiarySoftLight, // #FBE8C8
|
||||
'sad': Color(0xFFD4DDE8), // 灰蓝
|
||||
|
||||
@@ -1,16 +1,12 @@
|
||||
// 暖记圆角系统
|
||||
// 对齐 Open Design 原型稿 tokens.css: xs(8) / sm(10) / md(16) / lg(22) / xl(28) / pill
|
||||
// 对齐 Open Design 原型稿 tokens.css: sm(10) / md(16) / lg(22) / xl(28) / pill
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class AppRadius {
|
||||
AppRadius._();
|
||||
|
||||
/// 极小圆角 8px — 小型元素
|
||||
static const double xs = 8;
|
||||
static BorderRadius get xsBorder => BorderRadius.circular(xs);
|
||||
|
||||
/// 小圆角 10px — 按钮、输入框
|
||||
/// 小圆角 10px — 按钮、输入框、小元素
|
||||
static const double sm = 10;
|
||||
static BorderRadius get smBorder => BorderRadius.circular(sm);
|
||||
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
// 暖记阴影系统 — soft / medium / float
|
||||
// 对齐 spec §1 阴影 token:
|
||||
// --elev-soft: 0 2px 12px rgba(45,36,32,0.06)
|
||||
// --elev-medium: 0 4px 20px rgba(45,36,32,0.08)
|
||||
// --elev-float: 0 8px 32px rgba(45,36,32,0.12)
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
@@ -12,9 +16,9 @@ class AppShadows {
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? Colors.black.withValues(alpha: 0.3)
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.08),
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.06),
|
||||
offset: const Offset(0, 2),
|
||||
blurRadius: 8,
|
||||
blurRadius: 12,
|
||||
),
|
||||
];
|
||||
}
|
||||
@@ -26,9 +30,9 @@ class AppShadows {
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? Colors.black.withValues(alpha: 0.4)
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.12),
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.08),
|
||||
offset: const Offset(0, 4),
|
||||
blurRadius: 16,
|
||||
blurRadius: 20,
|
||||
),
|
||||
];
|
||||
}
|
||||
@@ -40,9 +44,9 @@ class AppShadows {
|
||||
BoxShadow(
|
||||
color: isDark
|
||||
? Colors.black.withValues(alpha: 0.5)
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.16),
|
||||
: const Color(0xFF2D2420).withValues(alpha: 0.12),
|
||||
offset: const Offset(0, 8),
|
||||
blurRadius: 24,
|
||||
blurRadius: 32,
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user