常守达 / doublefeel_flutter · Commits

Go to a project

Commit 5c9f3b8bbf51ec59ed8f4f2d7071513780e1e5cd

Authored by 常守达
1 parent 82339c8b
build: skipped

fix(today)：去掉卡片空格

Inline Side-by-side
Showing 2 changed files with 7 additions and 8 deletions
1 import 'dart:async'; 1 import 'dart:async';
2 -import 'dart:nativewrappers/_internal/vm/lib/ffi_allocation_patch.dart';  
3 import 'dart:ui'; 2 import 'dart:ui';
4 3
5 import 'package:doublefeel_flutter/app/modules/friends/controllers/friend_trend_controller.dart'; 4 import 'package:doublefeel_flutter/app/modules/friends/controllers/friend_trend_controller.dart';
@@ -58,7 +58,7 @@ class TodaySleepCard extends StatelessWidget { @@ -58,7 +58,7 @@ class TodaySleepCard extends StatelessWidget {
58 if (sleepHours > 0) ...[ 58 if (sleepHours > 0) ...[
59 TextSpan(text: '$sleepHours'), 59 TextSpan(text: '$sleepHours'),
60 TextSpan( 60 TextSpan(
61 - text: ' ${l10n.reportUnitHour} ', 61 + text: l10n.reportUnitHour,
62 style: TextStyle( 62 style: TextStyle(
63 color: context.colors.textSecondary, 63 color: context.colors.textSecondary,
64 fontSize: 12, 64 fontSize: 12,
@@ -69,7 +69,7 @@ class TodaySleepCard extends StatelessWidget { @@ -69,7 +69,7 @@ class TodaySleepCard extends StatelessWidget {
69 if (sleepMinutes > 0) ...[ 69 if (sleepMinutes > 0) ...[
70 TextSpan(text: '$sleepMinutes'), 70 TextSpan(text: '$sleepMinutes'),
71 TextSpan( 71 TextSpan(
72 - text: ' ${l10n.reportUnitMinute}', 72 + text: l10n.reportUnitMinute,
73 style: TextStyle( 73 style: TextStyle(
74 color: context.colors.textSecondary, 74 color: context.colors.textSecondary,
75 fontSize: 12, 75 fontSize: 12,
@@ -114,7 +114,7 @@ class TodaySleepCard extends StatelessWidget { @@ -114,7 +114,7 @@ class TodaySleepCard extends StatelessWidget {
114 children: [ 114 children: [
115 TextSpan(text: sleepAverageHeartRate), 115 TextSpan(text: sleepAverageHeartRate),
116 TextSpan( 116 TextSpan(
117 - text: ' bpm', 117 + text: 'bpm',
118 style: TextStyle( 118 style: TextStyle(
119 color: context.colors.textSecondary, 119 color: context.colors.textSecondary,
120 fontSize: 12, 120 fontSize: 12,
@@ -196,7 +196,7 @@ class TodayActivityCard extends StatelessWidget { @@ -196,7 +196,7 @@ class TodayActivityCard extends StatelessWidget {
196 if (exHours > 0) ...[ 196 if (exHours > 0) ...[
197 TextSpan(text: '$exHours'), 197 TextSpan(text: '$exHours'),
198 TextSpan( 198 TextSpan(
199 - text: ' ${l10n.reportUnitHour} ', 199 + text: l10n.reportUnitHour,
200 style: TextStyle( 200 style: TextStyle(
201 color: context.colors.textSecondary, 201 color: context.colors.textSecondary,
202 fontSize: 12, 202 fontSize: 12,
@@ -207,7 +207,7 @@ class TodayActivityCard extends StatelessWidget { @@ -207,7 +207,7 @@ class TodayActivityCard extends StatelessWidget {
207 if (exMinutes > 0 || exHours == 0) ...[ 207 if (exMinutes > 0 || exHours == 0) ...[
208 TextSpan(text: exMinutes > 0 ? '$exMinutes' : '0'), 208 TextSpan(text: exMinutes > 0 ? '$exMinutes' : '0'),
209 TextSpan( 209 TextSpan(
210 - text: ' ${l10n.reportUnitMinute}', 210 + text: l10n.reportUnitMinute,
211 style: TextStyle( 211 style: TextStyle(
212 color: context.colors.textSecondary, 212 color: context.colors.textSecondary,
213 fontSize: 12, 213 fontSize: 12,
@@ -246,7 +246,7 @@ class TodayActivityCard extends StatelessWidget { @@ -246,7 +246,7 @@ class TodayActivityCard extends StatelessWidget {
246 children: [ 246 children: [
247 TextSpan(text: '$stand'), 247 TextSpan(text: '$stand'),
248 TextSpan( 248 TextSpan(
249 - text: ' ${l10n.reportUnitHour}', 249 + text: l10n.reportUnitHour,
250 style: TextStyle( 250 style: TextStyle(
251 color: context.colors.textSecondary, 251 color: context.colors.textSecondary,
252 fontSize: 12, 252 fontSize: 12,
@@ -302,7 +302,7 @@ class TodayActivityCard extends StatelessWidget { @@ -302,7 +302,7 @@ class TodayActivityCard extends StatelessWidget {
302 TextSpan(text: activityStr), 302 TextSpan(text: activityStr),
303 if (activityStr != '-') 303 if (activityStr != '-')
304 TextSpan( 304 TextSpan(
305 - text: ' ${l10n.reportUnitKcal}', 305 + text: l10n.reportUnitKcal,
306 style: TextStyle( 306 style: TextStyle(
307 color: context.colors.textSecondary, 307 color: context.colors.textSecondary,
308 fontSize: 12, 308 fontSize: 12,