常守达 / doublefeel_flutter · Commits

Go to a project

Commit 2a99dbee3ea6b6f51928bc22ec01ff3bc4311f08

Authored by 常守达
1 parent f82b284b
build: skipped

fix(my): 邮箱密码格式

Inline Side-by-side
Showing 2 changed files with 14 additions and 29 deletions
@@ -150,15 +150,14 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> { @@ -150,15 +150,14 @@ class AddSecurityEmailView extends GetView<AddSecurityEmailController> {
150 Obx(() { 150 Obx(() {
151 if (!c.showError) return const SizedBox(height: 0); 151 if (!c.showError) return const SizedBox(height: 0);
152 return Padding( 152 return Padding(
153 - padding: const EdgeInsets.only(top: 8, left: 20),  
154 - child: Align(  
155 - alignment: Alignment.centerLeft,  
156 - child: Text(  
157 - l10n.invalidEmailFormat,  
158 - style: TextStyle(  
159 - color: context.colors.warning,  
160 - fontSize: 12,  
161 - ), 153 + padding: const EdgeInsets.only(
  154 + top: 8, left: 20, right: 20),
  155 + child: Text(
  156 + textAlign: TextAlign.center,
  157 + l10n.invalidEmailFormat,
  158 + style: TextStyle(
  159 + color: context.colors.warning,
  160 + fontSize: 14,
162 ), 161 ),
163 ), 162 ),
164 ); 163 );
1 import 'package:doublefeel_flutter/app/widget/circular_gradient_progress/combine.dart'; 1 import 'package:doublefeel_flutter/app/widget/circular_gradient_progress/combine.dart';
2 -import 'package:doublefeel_flutter/core/config/app_environment_config.dart';  
3 import 'package:doublefeel_flutter/core/theme/app_theme.dart'; 2 import 'package:doublefeel_flutter/core/theme/app_theme.dart';
4 import 'package:doublefeel_flutter/l10n/l10n_extensions.dart'; 3 import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
5 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
@@ -15,8 +14,6 @@ class TodaySleepCard extends StatelessWidget { @@ -15,8 +14,6 @@ class TodaySleepCard extends StatelessWidget {
15 @override 14 @override
16 Widget build(BuildContext context) { 15 Widget build(BuildContext context) {
17 final l10n = context.l10n; 16 final l10n = context.l10n;
18 - final isGlobal =  
19 - controller.environmentConfig.region.value == AppRegion.global;  
20 return GestureDetector( 17 return GestureDetector(
21 onTap: controller.toTrendSleepPage, 18 onTap: controller.toTrendSleepPage,
22 child: Obx(() { 19 child: Obx(() {
@@ -65,10 +62,7 @@ class TodaySleepCard extends StatelessWidget { @@ -65,10 +62,7 @@ class TodaySleepCard extends StatelessWidget {
65 ), 62 ),
66 children: [ 63 children: [
67 if (sleepHours > 0) ...[ 64 if (sleepHours > 0) ...[
68 - TextSpan(  
69 - text: isGlobal  
70 - ? '$sleepHours '  
71 - : '$sleepHours'), 65 + TextSpan(text: '$sleepHours'),
72 TextSpan( 66 TextSpan(
73 text: l10n.sleepDailyUnitHour, 67 text: l10n.sleepDailyUnitHour,
74 style: TextStyle( 68 style: TextStyle(
@@ -79,10 +73,7 @@ class TodaySleepCard extends StatelessWidget { @@ -79,10 +73,7 @@ class TodaySleepCard extends StatelessWidget {
79 ) 73 )
80 ], 74 ],
81 if (sleepMinutes > 0) ...[ 75 if (sleepMinutes > 0) ...[
82 - TextSpan(  
83 - text: isGlobal  
84 - ? '${sleepHours > 0 ? ' ' : ''}$sleepMinutes '  
85 - : '$sleepMinutes'), 76 + TextSpan(text: '$sleepMinutes'),
86 TextSpan( 77 TextSpan(
87 text: l10n.sleepDailyUnitMinute, 78 text: l10n.sleepDailyUnitMinute,
88 style: TextStyle( 79 style: TextStyle(
@@ -129,7 +120,7 @@ class TodaySleepCard extends StatelessWidget { @@ -129,7 +120,7 @@ class TodaySleepCard extends StatelessWidget {
129 children: [ 120 children: [
130 TextSpan(text: sleepAverageHeartRate), 121 TextSpan(text: sleepAverageHeartRate),
131 TextSpan( 122 TextSpan(
132 - text: isGlobal ? ' bpm' : 'bpm', 123 + text: 'bpm',
133 style: TextStyle( 124 style: TextStyle(
134 color: context.colors.textSecondary, 125 color: context.colors.textSecondary,
135 fontSize: 12, 126 fontSize: 12,
@@ -183,8 +174,6 @@ class TodayActivityCard extends StatelessWidget { @@ -183,8 +174,6 @@ class TodayActivityCard extends StatelessWidget {
183 @override 174 @override
184 Widget build(BuildContext context) { 175 Widget build(BuildContext context) {
185 final l10n = context.l10n; 176 final l10n = context.l10n;
186 - final isGlobal =  
187 - controller.environmentConfig.region.value == AppRegion.global;  
188 return GestureDetector( 177 return GestureDetector(
189 onTap: controller.toTrendActivityPage, 178 onTap: controller.toTrendActivityPage,
190 child: Obx(() { 179 child: Obx(() {
@@ -195,9 +184,7 @@ class TodayActivityCard extends StatelessWidget { @@ -195,9 +184,7 @@ class TodayActivityCard extends StatelessWidget {
195 var exercise = healthData?.exercise ?? 0; 184 var exercise = healthData?.exercise ?? 0;
196 185
197 var activityStr = (activity > 0 && (activityTarget?.move ?? 0) > 0) 186 var activityStr = (activity > 0 && (activityTarget?.move ?? 0) > 0)
198 - ? isGlobal  
199 - ? '$activity '  
200 - : '$activity' 187 + ? '$activity'
201 : '-'; 188 : '-';
202 // exercise 单位为秒，转换为小时+分钟 189 // exercise 单位为秒，转换为小时+分钟
203 Widget exerciseWidget; 190 Widget exerciseWidget;
@@ -211,8 +198,7 @@ class TodayActivityCard extends StatelessWidget { @@ -211,8 +198,7 @@ class TodayActivityCard extends StatelessWidget {
211 fontWeight: FontWeight.w600, 198 fontWeight: FontWeight.w600,
212 ), 199 ),
213 children: [ 200 children: [
214 - TextSpan(  
215 - text: isGlobal ? '$exTotalMinutes ' : '$exTotalMinutes'), 201 + TextSpan(text: '$exTotalMinutes'),
216 TextSpan( 202 TextSpan(
217 text: l10n.activityUnitMinute, 203 text: l10n.activityUnitMinute,
218 style: TextStyle( 204 style: TextStyle(
@@ -250,7 +236,7 @@ class TodayActivityCard extends StatelessWidget { @@ -250,7 +236,7 @@ class TodayActivityCard extends StatelessWidget {
250 fontWeight: FontWeight.w600, 236 fontWeight: FontWeight.w600,
251 ), 237 ),
252 children: [ 238 children: [
253 - TextSpan(text: isGlobal ? '$stand ' : '$stand'), 239 + TextSpan(text: '$stand'),
254 TextSpan( 240 TextSpan(
255 text: l10n.activityUnitHour, 241 text: l10n.activityUnitHour,
256 style: TextStyle( 242 style: TextStyle(