Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions lib/main_dev.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import 'screens/onboarding.dart';
import 'screens/splash.dart';
import 'theme/tokens.dart';
import 'theme/tweaks.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

void main() => runApp(const DevApp());

Expand Down Expand Up @@ -156,21 +157,27 @@ class _DevLauncher extends StatelessWidget {
child: Text(
'화면 점검 (DEV)',
style: TextStyle(
fontSize: 22,
fontSize: SeedType.title,
fontWeight: FontWeight.w800,
color: t.fg,
),
),
),
Text('다크', style: TextStyle(color: t.fgMuted, fontSize: 13)),
Text(
'다크',
style: TextStyle(
color: t.fgMuted,
fontSize: SeedType.label,
),
),
const SizedBox(width: 6),
Switch(value: dark, onChanged: onToggleDark),
],
),
const SizedBox(height: 6),
Text(
'서버 없이 목 데이터로 동작합니다.',
style: TextStyle(color: t.fgMuted, fontSize: 13),
style: TextStyle(color: t.fgMuted, fontSize: SeedType.label),
),
const SizedBox(height: 20),
Expanded(
Expand Down Expand Up @@ -213,10 +220,10 @@ class _LauncherTile extends StatelessWidget {
final DkTokens t = DkTheme.of(context);
return Material(
color: t.bg,
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(SeedRadius.md),
child: InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(SeedRadius.md),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 16),
child: Row(
Expand All @@ -228,15 +235,18 @@ class _LauncherTile extends StatelessWidget {
Text(
title,
style: TextStyle(
fontSize: 16,
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w700,
color: t.fg,
),
),
const SizedBox(height: 4),
Text(
desc,
style: TextStyle(fontSize: 13, color: t.fgMuted),
style: TextStyle(
fontSize: SeedType.label,
color: t.fgMuted,
),
),
],
),
Expand Down
5 changes: 3 additions & 2 deletions lib/parts/app_header.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter/widgets.dart';
import '../theme/tokens.dart';
import '../widgets/dk_bell_button.dart';
import '../widgets/dk_icon.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// 화면 상단 헤더(인사 + 알림 벨). 프로토타입 `AppHeader`.
///
Expand Down Expand Up @@ -45,7 +46,7 @@ class AppHeader extends StatelessWidget {
alignment: Alignment.center,
decoration: BoxDecoration(
color: t.bgPress,
borderRadius: BorderRadius.circular(12),
borderRadius: BorderRadius.circular(SeedRadius.sm),
),
child: DkIcon('chevL', size: 22, color: t.fg),
),
Expand All @@ -61,7 +62,7 @@ class AppHeader extends StatelessWidget {
subtitle!,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 13,
fontSize: SeedType.label,
fontWeight: FontWeight.w600,
color: t.fgSubtle,
),
Expand Down
7 changes: 4 additions & 3 deletions lib/parts/dday_hero.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import '../data/models.dart';
import '../theme/tokens.dart';
import '../widgets/dk_badge.dart';
import '../widgets/dk_icon.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// D-Day 히어로 카드. 프로토타입 `DdayHero`.
///
Expand Down Expand Up @@ -67,7 +68,7 @@ class DdayHero extends StatelessWidget {
event.category,
style: const TextStyle(
fontFamily: 'Pretendard',
fontSize: 12.5,
fontSize: SeedType.caption,
fontWeight: FontWeight.w600,
color: Color(0xB3FFFFFF),
),
Expand Down Expand Up @@ -104,7 +105,7 @@ class DdayHero extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontFamily: 'Pretendard',
fontSize: 16,
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w600,
color: Color(0xE0FFFFFF),
),
Expand All @@ -114,7 +115,7 @@ class DdayHero extends StatelessWidget {
eventDateLabel(event),
style: const TextStyle(
fontFamily: 'Pretendard',
fontSize: 13,
fontSize: SeedType.label,
color: Color(0x99FFFFFF),
),
),
Expand Down
13 changes: 7 additions & 6 deletions lib/parts/metric_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import '../data/models.dart';
import '../theme/tokens.dart';
import '../widgets/dk_card.dart';
import '../widgets/dk_feedback.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// 주간 지표 막대. 프로토타입 `MetricBar`.
///
Expand Down Expand Up @@ -46,7 +47,7 @@ class MetricBar extends StatelessWidget {
),
const SizedBox(height: 14),
ClipRRect(
borderRadius: BorderRadius.circular(99),
borderRadius: BorderRadius.circular(SeedRadius.pill),
child: Stack(
children: <Widget>[
Container(height: 10, color: t.bgPress),
Expand All @@ -61,7 +62,7 @@ class MetricBar extends StatelessWidget {
width: c.maxWidth * v,
decoration: BoxDecoration(
color: t.success,
borderRadius: BorderRadius.circular(99),
borderRadius: BorderRadius.circular(SeedRadius.pill),
),
),
);
Expand All @@ -75,7 +76,7 @@ class MetricBar extends StatelessWidget {
TextSpan(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 12.5,
fontSize: SeedType.caption,
fontWeight: FontWeight.w500,
color: t.fgSubtle,
),
Expand Down Expand Up @@ -130,7 +131,7 @@ class MetricBar extends StatelessWidget {
decimals: isInt ? 0 : 1,
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 25,
fontSize: SeedType.heading,
fontWeight: FontWeight.w800,
letterSpacing: -0.75,
color: color,
Expand All @@ -141,7 +142,7 @@ class MetricBar extends StatelessWidget {
'시간',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 13,
fontSize: SeedType.label,
fontWeight: FontWeight.w600,
color: t.fgSubtle,
),
Expand All @@ -153,7 +154,7 @@ class MetricBar extends StatelessWidget {
label,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 12.5,
fontSize: SeedType.caption,
fontWeight: FontWeight.w500,
color: t.fgSubtle,
),
Expand Down
13 changes: 7 additions & 6 deletions lib/parts/task_row.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '../data/models.dart';
import '../theme/tokens.dart';
import '../widgets/dk_badge.dart';
import '../widgets/dk_icon.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// 완료 체크박스 26 radius 9. done이면 success 채움 + check.
class DkCheckbox extends StatelessWidget {
Expand All @@ -28,7 +29,7 @@ class DkCheckbox extends StatelessWidget {
alignment: Alignment.center,
decoration: BoxDecoration(
color: done ? t.success : const Color(0x00000000),
borderRadius: BorderRadius.circular(9),
borderRadius: BorderRadius.circular(SeedRadius.chip),
border: done ? null : Border.all(color: t.borderStrong, width: 2),
),
child: done
Expand Down Expand Up @@ -80,7 +81,7 @@ class TaskRow extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 13),
decoration: BoxDecoration(
color: t.bg,
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(SeedRadius.md),
border: Border.all(color: t.borderSubtle),
boxShadow: t.shadows.s1,
),
Expand All @@ -101,7 +102,7 @@ class TaskRow extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 15,
fontSize: SeedType.base,
fontWeight: FontWeight.w600,
letterSpacing: -0.15,
color: done ? t.fgDisabled : t.fg,
Expand Down Expand Up @@ -148,7 +149,7 @@ class TaskRow extends StatelessWidget {
fmtMins(task.mins),
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 12.5,
fontSize: SeedType.caption,
fontWeight: FontWeight.w500,
color: t.fgSubtle,
),
Expand Down Expand Up @@ -176,7 +177,7 @@ class TaskRow extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 12.5,
fontSize: SeedType.caption,
fontWeight: FontWeight.w600,
color: h.color,
),
Expand All @@ -190,7 +191,7 @@ class TaskRow extends StatelessWidget {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 12,
fontSize: SeedType.caption,
fontWeight: FontWeight.w500,
color: t.infoFg,
),
Expand Down
3 changes: 2 additions & 1 deletion lib/screens/auth_loading.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/widgets.dart';

import '../theme/tokens.dart';
import '../widgets/dk_logo.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// 로그인(외부 OAuth 복귀 → server provisioning) 중 표시하는 **브랜드 로딩 화면**.
///
Expand Down Expand Up @@ -52,7 +53,7 @@ class _AuthLoadingViewState extends State<AuthLoadingView>
widget.message,
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 14.5,
fontSize: SeedType.body,
fontWeight: FontWeight.w600,
color: t.fgSubtle,
),
Expand Down
11 changes: 6 additions & 5 deletions lib/screens/calc_sheet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../theme/tokens.dart';
import '../widgets/dk_icon.dart';
import '../widgets/dk_segmented.dart';
import '../widgets/dk_sheet.dart';
import 'package:ieoseo/theme/seed_tokens.dart';

/// 계산기 본문(일반 + 공학). 프로토타입 `Calculator`.
///
Expand Down Expand Up @@ -154,14 +155,14 @@ class _CalculatorState extends State<Calculator> {
),
decoration: BoxDecoration(
color: t.bg,
borderRadius: BorderRadius.circular(99),
borderRadius: BorderRadius.circular(SeedRadius.pill),
border: Border.all(color: t.border, width: 1.5),
),
child: Text(
_deg ? 'DEG' : 'RAD',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 13,
fontSize: SeedType.label,
fontWeight: FontWeight.w700,
color: t.fgMuted,
),
Expand Down Expand Up @@ -192,7 +193,7 @@ class _CalculatorState extends State<Calculator> {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 34,
fontSize: SeedType.stat,
fontWeight: FontWeight.w700,
letterSpacing: -1.02,
height: 1.1,
Expand All @@ -206,7 +207,7 @@ class _CalculatorState extends State<Calculator> {
(preview != null && !_justEq && !endsOp) ? '= $preview' : '',
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 16,
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w600,
color: t.fgSubtle,
),
Expand Down Expand Up @@ -423,7 +424,7 @@ class _CalcButtonState extends State<_CalcButton> {
alignment: Alignment.center,
decoration: BoxDecoration(
color: c.bg,
borderRadius: BorderRadius.circular(16),
borderRadius: BorderRadius.circular(SeedRadius.md),
),
child: widget.spec.icon != null
? DkIcon(widget.spec.icon!, size: 22, color: c.fg)
Expand Down
Loading
Loading