常守达 / doublefeel_flutter · Commits

Go to a project

Commit b34a5288b0762e8e67fffee621061c1b88b2b059

Authored by 常守达
1 parent 98f4b6ab
build: skipped

fix(today)：增大弹窗字体

Inline Side-by-side
Showing 6 changed files with 25 additions and 24 deletions
@@ -207,7 +207,7 @@ class _QuestionRow extends StatelessWidget { @@ -207,7 +207,7 @@ class _QuestionRow extends StatelessWidget {
207 overflow: TextOverflow.ellipsis, 207 overflow: TextOverflow.ellipsis,
208 style: TextStyle( 208 style: TextStyle(
209 color: context.colors.textPrimary, 209 color: context.colors.textPrimary,
210 - fontSize: 12, 210 + fontSize: 13,
211 fontWeight: FontWeight.w400, 211 fontWeight: FontWeight.w400,
212 height: 1.4, 212 height: 1.4,
213 ), 213 ),
@@ -388,7 +388,7 @@ class _QuestionBottomSheet extends StatelessWidget { @@ -388,7 +388,7 @@ class _QuestionBottomSheet extends StatelessWidget {
388 item.body[index], 388 item.body[index],
389 style: TextStyle( 389 style: TextStyle(
390 color: context.colors.textSecondary, 390 color: context.colors.textSecondary,
391 - fontSize: 12, 391 + fontSize: 13,
392 fontWeight: FontWeight.w400, 392 fontWeight: FontWeight.w400,
393 height: 17 / 12, 393 height: 17 / 12,
394 ), 394 ),
@@ -125,7 +125,7 @@ class _HrvInstructionCard extends StatelessWidget { @@ -125,7 +125,7 @@ class _HrvInstructionCard extends StatelessWidget {
125 l10n.todayHrvMeasurementIntro, 125 l10n.todayHrvMeasurementIntro,
126 style: TextStyle( 126 style: TextStyle(
127 color: context.colors.textSecondary, 127 color: context.colors.textSecondary,
128 - fontSize: 12, 128 + fontSize: 13,
129 height: 17 / 12, 129 height: 17 / 12,
130 fontWeight: FontWeight.w400, 130 fontWeight: FontWeight.w400,
131 ), 131 ),
@@ -145,7 +145,7 @@ class _HrvInstructionCard extends StatelessWidget { @@ -145,7 +145,7 @@ class _HrvInstructionCard extends StatelessWidget {
145 l10n.todayHrvMeasurementHint, 145 l10n.todayHrvMeasurementHint,
146 style: TextStyle( 146 style: TextStyle(
147 color: context.colors.textSecondary, 147 color: context.colors.textSecondary,
148 - fontSize: 12, 148 + fontSize: 13,
149 height: 17 / 12, 149 height: 17 / 12,
150 fontWeight: FontWeight.w400, 150 fontWeight: FontWeight.w400,
151 ), 151 ),
@@ -155,7 +155,7 @@ class _HrvInstructionCard extends StatelessWidget { @@ -155,7 +155,7 @@ class _HrvInstructionCard extends StatelessWidget {
155 l10n.todayHrvMeasurementWarning, 155 l10n.todayHrvMeasurementWarning,
156 style: TextStyle( 156 style: TextStyle(
157 color: context.colors.warning, 157 color: context.colors.warning,
158 - fontSize: 12, 158 + fontSize: 13,
159 height: 17 / 12, 159 height: 17 / 12,
160 fontWeight: FontWeight.w400, 160 fontWeight: FontWeight.w400,
161 ), 161 ),
@@ -170,7 +170,7 @@ class _InfoCard extends StatelessWidget { @@ -170,7 +170,7 @@ class _InfoCard extends StatelessWidget {
170 title, 170 title,
171 style: TextStyle( 171 style: TextStyle(
172 color: context.colors.textPrimary, 172 color: context.colors.textPrimary,
173 - fontSize: 12, 173 + fontSize: 14,
174 fontWeight: FontWeight.w600, 174 fontWeight: FontWeight.w600,
175 ), 175 ),
176 ), 176 ),
@@ -195,7 +195,7 @@ class _InfoText extends StatelessWidget { @@ -195,7 +195,7 @@ class _InfoText extends StatelessWidget {
195 text, 195 text,
196 style: TextStyle( 196 style: TextStyle(
197 color: context.colors.textSecondary, 197 color: context.colors.textSecondary,
198 - fontSize: 12, 198 + fontSize: 13,
199 height: 17 / 12, 199 height: 17 / 12,
200 fontWeight: FontWeight.w400, 200 fontWeight: FontWeight.w400,
201 ), 201 ),
@@ -236,7 +236,7 @@ class _StatusItem extends StatelessWidget { @@ -236,7 +236,7 @@ class _StatusItem extends StatelessWidget {
236 title, 236 title,
237 style: TextStyle( 237 style: TextStyle(
238 color: context.colors.textSecondary, 238 color: context.colors.textSecondary,
239 - fontSize: 12, 239 + fontSize: 13,
240 height: 17 / 12, 240 height: 17 / 12,
241 fontWeight: FontWeight.w400, 241 fontWeight: FontWeight.w400,
242 ), 242 ),
@@ -289,7 +289,7 @@ class _FaqLink extends StatelessWidget { @@ -289,7 +289,7 @@ class _FaqLink extends StatelessWidget {
289 text, 289 text,
290 style: TextStyle( 290 style: TextStyle(
291 color: context.colors.textSecondary, 291 color: context.colors.textSecondary,
292 - fontSize: 12, 292 + fontSize: 13,
293 fontWeight: FontWeight.w400, 293 fontWeight: FontWeight.w400,
294 decoration: TextDecoration.underline, 294 decoration: TextDecoration.underline,
295 decorationColor: context.colors.textSecondary, 295 decorationColor: context.colors.textSecondary,
@@ -204,7 +204,7 @@ class _InfoCard extends StatelessWidget { @@ -204,7 +204,7 @@ class _InfoCard extends StatelessWidget {
204 title, 204 title,
205 style: TextStyle( 205 style: TextStyle(
206 color: context.colors.textPrimary, 206 color: context.colors.textPrimary,
207 - fontSize: 12, 207 + fontSize: 14,
208 fontWeight: FontWeight.w600, 208 fontWeight: FontWeight.w600,
209 ), 209 ),
210 ), 210 ),
@@ -229,7 +229,7 @@ class _InfoText extends StatelessWidget { @@ -229,7 +229,7 @@ class _InfoText extends StatelessWidget {
229 text, 229 text,
230 style: TextStyle( 230 style: TextStyle(
231 color: context.colors.textSecondary, 231 color: context.colors.textSecondary,
232 - fontSize: 12, 232 + fontSize: 13,
233 height: 17 / 12, 233 height: 17 / 12,
234 fontWeight: FontWeight.w400, 234 fontWeight: FontWeight.w400,
235 ), 235 ),
@@ -268,7 +268,7 @@ class _StatusItem extends StatelessWidget { @@ -268,7 +268,7 @@ class _StatusItem extends StatelessWidget {
268 title, 268 title,
269 style: TextStyle( 269 style: TextStyle(
270 color: context.colors.textSecondary, 270 color: context.colors.textSecondary,
271 - fontSize: 12, 271 + fontSize: 13,
272 height: 17 / 12, 272 height: 17 / 12,
273 fontWeight: FontWeight.w400, 273 fontWeight: FontWeight.w400,
274 ), 274 ),
@@ -320,7 +320,7 @@ class _FaqLink extends StatelessWidget { @@ -320,7 +320,7 @@ class _FaqLink extends StatelessWidget {
320 text, 320 text,
321 style: TextStyle( 321 style: TextStyle(
322 color: context.colors.textSecondary, 322 color: context.colors.textSecondary,
323 - fontSize: 12, 323 + fontSize: 13,
324 height: 17 / 12, 324 height: 17 / 12,
325 fontWeight: FontWeight.w400, 325 fontWeight: FontWeight.w400,
326 decoration: TextDecoration.underline, 326 decoration: TextDecoration.underline,
@@ -204,7 +204,7 @@ class _InfoCard extends StatelessWidget { @@ -204,7 +204,7 @@ class _InfoCard extends StatelessWidget {
204 title, 204 title,
205 style: TextStyle( 205 style: TextStyle(
206 color: context.colors.textPrimary, 206 color: context.colors.textPrimary,
207 - fontSize: 12, 207 + fontSize: 14,
208 fontWeight: FontWeight.w600, 208 fontWeight: FontWeight.w600,
209 ), 209 ),
210 ), 210 ),
@@ -229,7 +229,7 @@ class _InfoText extends StatelessWidget { @@ -229,7 +229,7 @@ class _InfoText extends StatelessWidget {
229 text, 229 text,
230 style: TextStyle( 230 style: TextStyle(
231 color: context.colors.textSecondary, 231 color: context.colors.textSecondary,
232 - fontSize: 12, 232 + fontSize: 13,
233 height: 17 / 12, 233 height: 17 / 12,
234 fontWeight: FontWeight.w400, 234 fontWeight: FontWeight.w400,
235 ), 235 ),
@@ -270,7 +270,7 @@ class _StatusItem extends StatelessWidget { @@ -270,7 +270,7 @@ class _StatusItem extends StatelessWidget {
270 title, 270 title,
271 style: TextStyle( 271 style: TextStyle(
272 color: context.colors.textSecondary, 272 color: context.colors.textSecondary,
273 - fontSize: 12, 273 + fontSize: 13,
274 height: 17 / 12, 274 height: 17 / 12,
275 fontWeight: FontWeight.w400, 275 fontWeight: FontWeight.w400,
276 ), 276 ),
@@ -323,7 +323,7 @@ class _FaqLink extends StatelessWidget { @@ -323,7 +323,7 @@ class _FaqLink extends StatelessWidget {
323 text, 323 text,
324 style: TextStyle( 324 style: TextStyle(
325 color: context.colors.textSecondary, 325 color: context.colors.textSecondary,
326 - fontSize: 12, 326 + fontSize: 13,
327 height: 17 / 12, 327 height: 17 / 12,
328 fontWeight: FontWeight.w400, 328 fontWeight: FontWeight.w400,
329 decoration: TextDecoration.underline, 329 decoration: TextDecoration.underline,
@@ -269,7 +269,7 @@ class _InfoCard extends StatelessWidget { @@ -269,7 +269,7 @@ class _InfoCard extends StatelessWidget {
269 title, 269 title,
270 style: TextStyle( 270 style: TextStyle(
271 color: context.colors.textPrimary, 271 color: context.colors.textPrimary,
272 - fontSize: 12, 272 + fontSize: 14,
273 fontWeight: FontWeight.w600, 273 fontWeight: FontWeight.w600,
274 ), 274 ),
275 ), 275 ),
@@ -294,7 +294,7 @@ class _InfoText extends StatelessWidget { @@ -294,7 +294,7 @@ class _InfoText extends StatelessWidget {
294 text, 294 text,
295 style: TextStyle( 295 style: TextStyle(
296 color: context.colors.textSecondary, 296 color: context.colors.textSecondary,
297 - fontSize: 12, 297 + fontSize: 13,
298 fontWeight: FontWeight.w400, 298 fontWeight: FontWeight.w400,
299 ), 299 ),
300 ), 300 ),
@@ -309,11 +309,11 @@ class _ContactText extends StatelessWidget { @@ -309,11 +309,11 @@ class _ContactText extends StatelessWidget {
309 Widget build(BuildContext context) { 309 Widget build(BuildContext context) {
310 final l10n = context.l10n; 310 final l10n = context.l10n;
311 311
312 - return RichText(  
313 - text: TextSpan( 312 + return Text.rich(
  313 + TextSpan(
314 style: TextStyle( 314 style: TextStyle(
315 color: context.colors.textSecondary, 315 color: context.colors.textSecondary,
316 - fontSize: 12, 316 + fontSize: 13,
317 fontWeight: FontWeight.w400, 317 fontWeight: FontWeight.w400,
318 ), 318 ),
319 children: [ 319 children: [
@@ -321,7 +321,7 @@ class _ContactText extends StatelessWidget { @@ -321,7 +321,7 @@ class _ContactText extends StatelessWidget {
321 text: l10n.todayFaqContactPrefix, 321 text: l10n.todayFaqContactPrefix,
322 style: TextStyle( 322 style: TextStyle(
323 color: context.colors.textSecondary, 323 color: context.colors.textSecondary,
324 - fontSize: 12, 324 + fontSize: 13,
325 fontWeight: FontWeight.w400, 325 fontWeight: FontWeight.w400,
326 ), 326 ),
327 ), 327 ),
@@ -332,10 +332,11 @@ class _ContactText extends StatelessWidget { @@ -332,10 +332,11 @@ class _ContactText extends StatelessWidget {
332 Get.toNamed(Routes.SUBMIT_FEEDBACK); 332 Get.toNamed(Routes.SUBMIT_FEEDBACK);
333 }, 333 },
334 style: TextStyle( 334 style: TextStyle(
335 - fontSize: 12, 335 + fontSize: 13,
336 color: context.colors.primary, 336 color: context.colors.primary,
337 fontWeight: FontWeight.w400, 337 fontWeight: FontWeight.w400,
338 decoration: TextDecoration.underline, 338 decoration: TextDecoration.underline,
  339 + decorationColor: context.colors.primary,
339 ), 340 ),
340 ), 341 ),
341 TextSpan(text: l10n.todayFaqContactSuffix), 342 TextSpan(text: l10n.todayFaqContactSuffix),