Skip to content

refactor: raw 흑백 리터럴 onInk·onPrimary 토큰 이관 (DQ-15) #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkdee merged 2 commits into from
Jul 4, 2026
Merged

refactor: raw 흑백 리터럴 onInk·onPrimary 토큰 이관 (DQ-15) #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9986e32
refactor: raw 흑백 리터럴을 onInk·onPrimary 토큰으로 이관
pkdee Jul 4, 2026
9e01ddf
style: theme_contrast_test 포맷 정리
pkdee Jul 4, 2026
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
17 changes: 8 additions & 9 deletions lib/parts/dday_hero.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class DdayHero extends StatelessWidget {
final DkDdayInfo info = ddayInfo(event);
final DkHue h = t.hue(event.color);
final bool urgent = info.urgency == DkUrgency.high;
const Color white = Color(0xFFFFFFFF);

return GestureDetector(
onTap: onOpen == null ? null : () => onOpen!(event),
Expand Down Expand Up @@ -66,11 +65,11 @@ class DdayHero extends StatelessWidget {
children: <Widget>[
Text(
event.category,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.caption,
fontWeight: FontWeight.w600,
color: Color(0xB3FFFFFF),
color: t.onInkMuted,
),
),
if (urgent) ...<Widget>[
Expand Down Expand Up @@ -103,20 +102,20 @@ class DdayHero extends StatelessWidget {
event.title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w600,
color: Color(0xE0FFFFFF),
color: t.onInk,
),
),
const SizedBox(height: 2),
Text(
eventDateLabel(event),
style: const TextStyle(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.label,
color: Color(0x99FFFFFF),
color: t.onInkMuted,
),
),
],
Expand All @@ -129,13 +128,13 @@ class DdayHero extends StatelessWidget {
? info.label
: '${info.pct}%')
: info.label,
style: const TextStyle(
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 52,
fontWeight: FontWeight.w800,
letterSpacing: -2.08,
height: 0.9,
color: white,
color: t.onInk,
),
),
],
Expand Down
7 changes: 1 addition & 6 deletions lib/parts/task_row.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ class DkCheckbox extends StatelessWidget {
border: done ? null : Border.all(color: t.borderStrong, width: 2),
),
child: done
? const DkIcon(
'check',
size: 16,
color: Color(0xFFFFFFFF),
strokeWidth: 3,
)
? DkIcon('check', size: 16, color: t.onPrimary, strokeWidth: 3)
: null,
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/calc_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ class _CalcButtonState extends State<_CalcButton> {
case _KeyKind.op:
return (bg: t.primarySubtle, fg: t.primary);
case _KeyKind.eq:
return (bg: t.primary, fg: const Color(0xFFFFFFFF));
return (bg: t.primary, fg: t.onPrimary);
case _KeyKind.clr:
return (bg: t.dangerSubtle, fg: t.danger);
}
Expand Down
35 changes: 19 additions & 16 deletions lib/screens/debt/debt_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ class _DebtScreenState extends State<DebtScreen> {
}

Widget _hero(DkTokens t, int total, int overdue) {
const Color white = Color(0xFFFFFFFF);
return ClipRRect(
borderRadius: BorderRadius.circular(t.radiusLg),
child: Container(
Expand All @@ -172,7 +171,11 @@ class _DebtScreenState extends State<DebtScreen> {
end: Alignment.bottomRight,
colors: <Color>[
t.warningFg,
Color.lerp(t.warningFg, const Color(0xFF000000), 0.22)!,
Color.lerp(
t.warningFg,
const Color(0xFF000000),
0.22,
)!, // token-exempt: warningFg 어둡게 섞는 색연산
],
),
borderRadius: BorderRadius.circular(t.radiusLg),
Expand All @@ -181,13 +184,13 @@ class _DebtScreenState extends State<DebtScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const Text(
Text(
'아직 못 한 일, 사라지지 않아요',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.label,
fontWeight: FontWeight.w600,
color: Color(0xD1FFFFFF),
color: t.onInk,
),
),
const SizedBox(height: 6),
Expand All @@ -197,38 +200,38 @@ class _DebtScreenState extends State<DebtScreen> {
children: <Widget>[
Text(
(total / 60).toStringAsFixed(1),
style: const TextStyle(
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 46,
fontWeight: FontWeight.w800,
letterSpacing: -1.84,
height: 1,
color: white,
color: t.onInk,
),
),
const SizedBox(width: 6),
const Text(
Text(
'시간',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w600,
color: white,
color: t.onInk,
),
),
],
),
const SizedBox(height: 16),
Row(
children: <Widget>[
_heroStat('대기·배정', fmtMins(total - overdue)),
_heroStat(t, '대기·배정', fmtMins(total - overdue)),
Container(
width: 1,
height: 34,
margin: const EdgeInsets.symmetric(horizontal: 16),
color: const Color(0x40FFFFFF),
color: const Color(0x40FFFFFF), // token-exempt: 히어로 장식 구분선
),
_heroStat('계속 밀림', fmtMins(overdue)),
_heroStat(t, '계속 밀림', fmtMins(overdue)),
],
),
],
Expand All @@ -237,26 +240,26 @@ class _DebtScreenState extends State<DebtScreen> {
);
}

Widget _heroStat(String label, String value) {
Widget _heroStat(DkTokens t, String label, String value) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
label,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.caption,
color: Color(0xB3FFFFFF),
color: t.onInkMuted,
),
),
const SizedBox(height: 2),
Text(
value,
style: const TextStyle(
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: SeedType.bodyLg,
fontWeight: FontWeight.w700,
color: Color(0xFFFFFFFF),
color: t.onInk,
),
),
],
Expand Down
20 changes: 10 additions & 10 deletions lib/screens/focus/focus_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ class _FocusScreenState extends State<FocusScreen> {
child: DkIcon(
_c.running ? 'pause' : 'play',
size: 36,
color: const Color(0xFFFFFFFF),
fill: const Color(0xFFFFFFFF),
color: t.onPrimary,
fill: t.onPrimary,
),
),
),
Expand Down Expand Up @@ -412,10 +412,10 @@ class _FocusScreenState extends State<FocusScreen> {
color: t.success,
borderRadius: BorderRadius.circular(SeedRadius.button),
),
child: const DkIcon(
child: DkIcon(
'check',
size: 22,
color: Color(0xFFFFFFFF),
color: t.onPrimary,
strokeWidth: 2.6,
),
),
Expand Down Expand Up @@ -454,10 +454,10 @@ class _FocusScreenState extends State<FocusScreen> {
widget.onCompleteTask(task);
setState(() => _wasDone = false);
},
leading: const DkIcon(
leading: DkIcon(
'check',
size: 16,
color: Color(0xFFFFFFFF),
color: t.onPrimary,
strokeWidth: 2.4,
),
child: const Text('완료'),
Expand Down Expand Up @@ -513,11 +513,11 @@ class _FocusScreenState extends State<FocusScreen> {
child: DkIcon(
'focus',
size: 18,
color: i < _c.sessions
? const Color(0xFFFFFFFF)
: t.fgDisabled,
color: i < _c.sessions ? t.onPrimary : t.fgDisabled,
strokeWidth: 2,
fill: i < _c.sessions ? const Color(0x40FFFFFF) : null,
fill: i < _c.sessions
? const Color(0x40FFFFFF)
: null, // token-exempt: 세션 도트 장식 채움
),
),
),
Expand Down
9 changes: 6 additions & 3 deletions lib/screens/focus/skins.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,21 +321,24 @@ class _FlipDigit extends StatelessWidget {
),
child: Text(
d,
style: const TextStyle(
style: TextStyle(
fontFamily: 'WantedSans',
fontSize: 50,
fontWeight: FontWeight.w800,
height: 1,
fontFeatures: <FontFeature>[FontFeature.tabularFigures()],
color: Color(0xFFFFFFFF),
color: t.onPrimary,
),
),
),
// 중앙 분할선.
Positioned(
left: 0,
right: 0,
child: Container(height: 1, color: const Color(0x59000000)),
child: Container(
height: 1,
color: const Color(0x59000000),
), // token-exempt: 스킨 장식 구분선
),
// 하단 모드색 바.
Positioned(
Expand Down
8 changes: 5 additions & 3 deletions lib/screens/login.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ class _LoginScreenState extends State<LoginScreen> {
const _SocialSpec(
SocialProvider.apple,
'Apple로 시작하기',
Color(0xFF000000),
Color(0xFFFFFFFF),
Color(0xFF000000), // token-exempt: Apple 브랜드 고정색
Color(0xFFFFFFFF), // token-exempt: Apple 브랜드 고정색
brand: 'apple',
),
]
Expand Down Expand Up @@ -373,7 +373,9 @@ class _SocialSpinnerState extends State<_SocialSpinner>

/// 부분 호 스피너. 기본 흰색, [color]로 색을 지정할 수 있다.
class _SpinnerPainter extends CustomPainter {
_SpinnerPainter({this.color = const Color(0xFFFFFFFF)});
_SpinnerPainter({
this.color = const Color(0xFFFFFFFF),
}); // token-exempt: const 기본값(primary 버튼 위 스피너)

final Color color;

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/me/me_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ class MeScreen extends StatelessWidget {
),
],
),
child: const DkIcon(
child: DkIcon(
'user',
size: 30,
color: Color(0xFFFFFFFF),
color: t.onPrimary,
strokeWidth: 2,
),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/me/settings_section.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ class DkToggle extends StatelessWidget {
width: 24,
height: 24,
decoration: BoxDecoration(
color: const Color(0xFFFFFFFF),
color: t.onPrimary,
shape: BoxShape.circle,
boxShadow: const <BoxShadow>[
BoxShadow(
color: Color(0x40000000),
color: Color(0x40000000), // token-exempt: 토글 노브 그림자
blurRadius: 3,
offset: Offset(0, 1),
),
Expand Down
Loading
Loading