Commit 2a99dbee3ea6b6f51928bc22ec01ff3bc4311f08

Authored by 常守达
1 parent f82b284b

fix(my): 邮箱密码格式

... ... @@ -150,15 +150,14 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> {
Obx(() {
if (!c.showError) return const SizedBox(height: 0);
return Padding(
padding: const EdgeInsets.only(top: 8, left: 20),
child: Align(
alignment: Alignment.centerLeft,
child: Text(
l10n.invalidEmailFormat,
style: TextStyle(
color: context.colors.warning,
fontSize: 12,
),
padding: const EdgeInsets.only(
top: 8, left: 20, right: 20),
child: Text(
textAlign: TextAlign.center,
l10n.invalidEmailFormat,
style: TextStyle(
color: context.colors.warning,
fontSize: 14,
),
),
);
... ...
import 'package:doublefeel_flutter/app/widget/circular_gradient_progress/combine.dart';
import 'package:doublefeel_flutter/core/config/app_environment_config.dart';
import 'package:doublefeel_flutter/core/theme/app_theme.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
import 'package:flutter/material.dart';
... ... @@ -15,8 +14,6 @@ class TodaySleepCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
final isGlobal =
controller.environmentConfig.region.value == AppRegion.global;
return GestureDetector(
onTap: controller.toTrendSleepPage,
child: Obx(() {
... ... @@ -65,10 +62,7 @@ class TodaySleepCard extends StatelessWidget {
),
children: [
if (sleepHours > 0) ...[
TextSpan(
text: isGlobal
? '$sleepHours '
: '$sleepHours'),
TextSpan(text: '$sleepHours'),
TextSpan(
text: l10n.sleepDailyUnitHour,
style: TextStyle(
... ... @@ -79,10 +73,7 @@ class TodaySleepCard extends StatelessWidget {
)
],
if (sleepMinutes > 0) ...[
TextSpan(
text: isGlobal
? '${sleepHours > 0 ? ' ' : ''}$sleepMinutes '
: '$sleepMinutes'),
TextSpan(text: '$sleepMinutes'),
TextSpan(
text: l10n.sleepDailyUnitMinute,
style: TextStyle(
... ... @@ -129,7 +120,7 @@ class TodaySleepCard extends StatelessWidget {
children: [
TextSpan(text: sleepAverageHeartRate),
TextSpan(
text: isGlobal ? ' bpm' : 'bpm',
text: 'bpm',
style: TextStyle(
color: context.colors.textSecondary,
fontSize: 12,
... ... @@ -183,8 +174,6 @@ class TodayActivityCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final l10n = context.l10n;
final isGlobal =
controller.environmentConfig.region.value == AppRegion.global;
return GestureDetector(
onTap: controller.toTrendActivityPage,
child: Obx(() {
... ... @@ -195,9 +184,7 @@ class TodayActivityCard extends StatelessWidget {
var exercise = healthData?.exercise ?? 0;
var activityStr = (activity > 0 && (activityTarget?.move ?? 0) > 0)
? isGlobal
? '$activity '
: '$activity'
? '$activity'
: '-';
// exercise 单位为秒,转换为小时+分钟
Widget exerciseWidget;
... ... @@ -211,8 +198,7 @@ class TodayActivityCard extends StatelessWidget {
fontWeight: FontWeight.w600,
),
children: [
TextSpan(
text: isGlobal ? '$exTotalMinutes ' : '$exTotalMinutes'),
TextSpan(text: '$exTotalMinutes'),
TextSpan(
text: l10n.activityUnitMinute,
style: TextStyle(
... ... @@ -250,7 +236,7 @@ class TodayActivityCard extends StatelessWidget {
fontWeight: FontWeight.w600,
),
children: [
TextSpan(text: isGlobal ? '$stand ' : '$stand'),
TextSpan(text: '$stand'),
TextSpan(
text: l10n.activityUnitHour,
style: TextStyle(
... ...