常守达 / doublefeel_flutter · Commits

Go to a project

Commit 79227d78a43d46b0c9e69d0cbb37f50b3ac38ecb

Authored by 刘宏哲
1 parent 9c9ee2d8
build: skipped

feat(app): update ui

Inline Side-by-side
Showing 6 changed files with 43 additions and 48 deletions
@@ -105,7 +105,6 @@ class _MonthlySummary extends StatelessWidget { @@ -105,7 +105,6 @@ class _MonthlySummary extends StatelessWidget {
105 height: 1.0, 105 height: 1.0,
106 ), 106 ),
107 ), 107 ),
108 - const SizedBox(width: 4),  
109 Padding( 108 Padding(
110 padding: const EdgeInsets.only(bottom: 5), 109 padding: const EdgeInsets.only(bottom: 5),
111 child: Text( 110 child: Text(
@@ -201,7 +200,6 @@ class _SummaryMetric extends StatelessWidget { @@ -201,7 +200,6 @@ class _SummaryMetric extends StatelessWidget {
201 height: 1.1, 200 height: 1.1,
202 ), 201 ),
203 ), 202 ),
204 - const SizedBox(width: 3),  
205 Padding( 203 Padding(
206 padding: const EdgeInsets.only(bottom: 1), 204 padding: const EdgeInsets.only(bottom: 1),
207 child: Text( 205 child: Text(
@@ -116,7 +116,6 @@ class _MetricColumn extends StatelessWidget { @@ -116,7 +116,6 @@ class _MetricColumn extends StatelessWidget {
116 height: 1.1, 116 height: 1.1,
117 ), 117 ),
118 ), 118 ),
119 - const SizedBox(width: 4),  
120 Padding( 119 Padding(
121 padding: const EdgeInsets.only(bottom: 3), 120 padding: const EdgeInsets.only(bottom: 3),
122 child: Text( 121 child: Text(
@@ -105,7 +105,6 @@ class _WeeklySummary extends StatelessWidget { @@ -105,7 +105,6 @@ class _WeeklySummary extends StatelessWidget {
105 height: 1.0, 105 height: 1.0,
106 ), 106 ),
107 ), 107 ),
108 - const SizedBox(width: 4),  
109 Padding( 108 Padding(
110 padding: const EdgeInsets.only(bottom: 5), 109 padding: const EdgeInsets.only(bottom: 5),
111 child: Text( 110 child: Text(
@@ -202,7 +201,6 @@ class _SummaryMetric extends StatelessWidget { @@ -202,7 +201,6 @@ class _SummaryMetric extends StatelessWidget {
202 height: 1.1, 201 height: 1.1,
203 ), 202 ),
204 ), 203 ),
205 - const SizedBox(width: 3),  
206 Padding( 204 Padding(
207 padding: const EdgeInsets.only(bottom: 1), 205 padding: const EdgeInsets.only(bottom: 1),
208 child: Text( 206 child: Text(
@@ -710,7 +710,7 @@ class _HeartRateMetric extends StatelessWidget { @@ -710,7 +710,7 @@ class _HeartRateMetric extends StatelessWidget {
710 ), 710 ),
711 ), 711 ),
712 Padding( 712 Padding(
713 - padding: const EdgeInsets.only(bottom: 2, left: 4), 713 + padding: const EdgeInsets.only(bottom: 2),
714 child: Text( 714 child: Text(
715 'bpm', 715 'bpm',
716 style: TextStyle( 716 style: TextStyle(
@@ -2062,7 +2062,7 @@ class _ExtremeMetric extends StatelessWidget { @@ -2062,7 +2062,7 @@ class _ExtremeMetric extends StatelessWidget {
2062 ), 2062 ),
2063 if (unit.isNotEmpty) 2063 if (unit.isNotEmpty)
2064 Padding( 2064 Padding(
2065 - padding: const EdgeInsets.only(left: 2, bottom: 3), 2065 + padding: const EdgeInsets.only(bottom: 3),
2066 child: Text( 2066 child: Text(
2067 unit, 2067 unit,
2068 style: const TextStyle( 2068 style: const TextStyle(
@@ -2,47 +2,47 @@ import 'package:flutter/widgets.dart'; @@ -2,47 +2,47 @@ import 'package:flutter/widgets.dart';
2 2
3 Locale resolveAppLocale( 3 Locale resolveAppLocale(
4 Locale? deviceLocale, Iterable<Locale> supportedLocales) { 4 Locale? deviceLocale, Iterable<Locale> supportedLocales) {
5 - if (deviceLocale == null) return const Locale('en');  
6 -  
7 - for (final locale in supportedLocales) {  
8 - if (locale == deviceLocale) {  
9 - return locale;  
10 - }  
11 - }  
12 -  
13 - if (deviceLocale.languageCode == 'zh') {  
14 - final script = deviceLocale.scriptCode?.toLowerCase();  
15 - final country = deviceLocale.countryCode?.toUpperCase();  
16 - final isHant = script == 'hant' ||  
17 - country == 'TW' ||  
18 - country == 'HK' ||  
19 - country == 'MO';  
20 -  
21 - return supportedLocales.firstWhere(  
22 - (locale) =>  
23 - locale.languageCode == 'zh' &&  
24 - locale.scriptCode == (isHant ? 'Hant' : 'Hans'),  
25 - orElse: () => Locale.fromSubtags(  
26 - languageCode: 'zh',  
27 - scriptCode: isHant ? 'Hant' : 'Hans',  
28 - ),  
29 - );  
30 - }  
31 -  
32 - if (deviceLocale.countryCode != null) {  
33 - for (final locale in supportedLocales) {  
34 - if (locale.languageCode == deviceLocale.languageCode &&  
35 - locale.countryCode == deviceLocale.countryCode) {  
36 - return locale;  
37 - }  
38 - }  
39 - }  
40 -  
41 - for (final locale in supportedLocales) {  
42 - if (locale.languageCode == deviceLocale.languageCode) {  
43 - return locale;  
44 - }  
45 - } 5 + // if (deviceLocale == null) return const Locale('en');
  6 + //
  7 + // for (final locale in supportedLocales) {
  8 + // if (locale == deviceLocale) {
  9 + // return locale;
  10 + // }
  11 + // }
  12 + //
  13 + // if (deviceLocale.languageCode == 'zh') {
  14 + // final script = deviceLocale.scriptCode?.toLowerCase();
  15 + // final country = deviceLocale.countryCode?.toUpperCase();
  16 + // final isHant = script == 'hant' ||
  17 + // country == 'TW' ||
  18 + // country == 'HK' ||
  19 + // country == 'MO';
  20 + //
  21 + // return supportedLocales.firstWhere(
  22 + // (locale) =>
  23 + // locale.languageCode == 'zh' &&
  24 + // locale.scriptCode == (isHant ? 'Hant' : 'Hans'),
  25 + // orElse: () => Locale.fromSubtags(
  26 + // languageCode: 'zh',
  27 + // scriptCode: isHant ? 'Hant' : 'Hans',
  28 + // ),
  29 + // );
  30 + // }
  31 + //
  32 + // if (deviceLocale.countryCode != null) {
  33 + // for (final locale in supportedLocales) {
  34 + // if (locale.languageCode == deviceLocale.languageCode &&
  35 + // locale.countryCode == deviceLocale.countryCode) {
  36 + // return locale;
  37 + // }
  38 + // }
  39 + // }
  40 + //
  41 + // for (final locale in supportedLocales) {
  42 + // if (locale.languageCode == deviceLocale.languageCode) {
  43 + // return locale;
  44 + // }
  45 + // }
46 46
47 return const Locale('en'); 47 return const Locale('en');
48 } 48 }