常守达 / 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
import 'dart:async';
import 'dart:nativewrappers/_internal/vm/lib/ffi_allocation_patch.dart';
import 'dart:ui';
import 'package:doublefeel_flutter/app/modules/friends/controllers/friend_trend_controller.dart';
... ...
... ... @@ -58,7 +58,7 @@ class TodaySleepCard extends StatelessWidget {
if (sleepHours > 0) ...[
TextSpan(text: '$sleepHours'),
TextSpan(
text: ' ${l10n.reportUnitHour} ',
text: l10n.reportUnitHour,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -69,7 +69,7 @@ class TodaySleepCard extends StatelessWidget {
if (sleepMinutes > 0) ...[
TextSpan(text: '$sleepMinutes'),
TextSpan(
text: ' ${l10n.reportUnitMinute}',
text: l10n.reportUnitMinute,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -114,7 +114,7 @@ class TodaySleepCard extends StatelessWidget {
children: [
TextSpan(text: sleepAverageHeartRate),
TextSpan(
text: ' bpm',
text: 'bpm',
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -196,7 +196,7 @@ class TodayActivityCard extends StatelessWidget {
if (exHours > 0) ...[
TextSpan(text: '$exHours'),
TextSpan(
text: ' ${l10n.reportUnitHour} ',
text: l10n.reportUnitHour,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -207,7 +207,7 @@ class TodayActivityCard extends StatelessWidget {
if (exMinutes > 0 || exHours == 0) ...[
TextSpan(text: exMinutes > 0 ? '$exMinutes' : '0'),
TextSpan(
text: ' ${l10n.reportUnitMinute}',
text: l10n.reportUnitMinute,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -246,7 +246,7 @@ class TodayActivityCard extends StatelessWidget {
children: [
TextSpan(text: '$stand'),
TextSpan(
text: ' ${l10n.reportUnitHour}',
text: l10n.reportUnitHour,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -302,7 +302,7 @@ class TodayActivityCard extends StatelessWidget {
TextSpan(text: activityStr),
if (activityStr != '-')
TextSpan(
text: ' ${l10n.reportUnitKcal}',
text: l10n.reportUnitKcal,
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ...