常守达 / 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 {
height: 1.0,
),
),
const SizedBox(width: 4),
Padding(
padding: const EdgeInsets.only(bottom: 5),
child: Text(
... ... @@ -201,7 +200,6 @@ class _SummaryMetric extends StatelessWidget {
height: 1.1,
),
),
const SizedBox(width: 3),
Padding(
padding: const EdgeInsets.only(bottom: 1),
child: Text(
... ...
... ... @@ -116,7 +116,6 @@ class _MetricColumn extends StatelessWidget {
height: 1.1,
),
),
const SizedBox(width: 4),
Padding(
padding: const EdgeInsets.only(bottom: 3),
child: Text(
... ...
... ... @@ -105,7 +105,6 @@ class _WeeklySummary extends StatelessWidget {
height: 1.0,
),
),
const SizedBox(width: 4),
Padding(
padding: const EdgeInsets.only(bottom: 5),
child: Text(
... ... @@ -202,7 +201,6 @@ class _SummaryMetric extends StatelessWidget {
height: 1.1,
),
),
const SizedBox(width: 3),
Padding(
padding: const EdgeInsets.only(bottom: 1),
child: Text(
... ...
... ... @@ -710,7 +710,7 @@ class _HeartRateMetric extends StatelessWidget {
),
),
Padding(
padding: const EdgeInsets.only(bottom: 2, left: 4),
padding: const EdgeInsets.only(bottom: 2),
child: Text(
'bpm',
style: TextStyle(
... ...
... ... @@ -2062,7 +2062,7 @@ class _ExtremeMetric extends StatelessWidget {
),
if (unit.isNotEmpty)
Padding(
padding: const EdgeInsets.only(left: 2, bottom: 3),
padding: const EdgeInsets.only(bottom: 3),
child: Text(
unit,
style: const TextStyle(
... ...
... ... @@ -2,47 +2,47 @@ import 'package:flutter/widgets.dart';
Locale resolveAppLocale(
Locale? deviceLocale, Iterable<Locale> supportedLocales) {
if (deviceLocale == null) return const Locale('en');
for (final locale in supportedLocales) {
if (locale == deviceLocale) {
return locale;
}
}
if (deviceLocale.languageCode == 'zh') {
final script = deviceLocale.scriptCode?.toLowerCase();
final country = deviceLocale.countryCode?.toUpperCase();
final isHant = script == 'hant' ||
country == 'TW' ||
country == 'HK' ||
country == 'MO';
return supportedLocales.firstWhere(
(locale) =>
locale.languageCode == 'zh' &&
locale.scriptCode == (isHant ? 'Hant' : 'Hans'),
orElse: () => Locale.fromSubtags(
languageCode: 'zh',
scriptCode: isHant ? 'Hant' : 'Hans',
),
);
}
if (deviceLocale.countryCode != null) {
for (final locale in supportedLocales) {
if (locale.languageCode == deviceLocale.languageCode &&
locale.countryCode == deviceLocale.countryCode) {
return locale;
}
}
}
for (final locale in supportedLocales) {
if (locale.languageCode == deviceLocale.languageCode) {
return locale;
}
}
// if (deviceLocale == null) return const Locale('en');
//
// for (final locale in supportedLocales) {
// if (locale == deviceLocale) {
// return locale;
// }
// }
//
// if (deviceLocale.languageCode == 'zh') {
// final script = deviceLocale.scriptCode?.toLowerCase();
// final country = deviceLocale.countryCode?.toUpperCase();
// final isHant = script == 'hant' ||
// country == 'TW' ||
// country == 'HK' ||
// country == 'MO';
//
// return supportedLocales.firstWhere(
// (locale) =>
// locale.languageCode == 'zh' &&
// locale.scriptCode == (isHant ? 'Hant' : 'Hans'),
// orElse: () => Locale.fromSubtags(
// languageCode: 'zh',
// scriptCode: isHant ? 'Hant' : 'Hans',
// ),
// );
// }
//
// if (deviceLocale.countryCode != null) {
// for (final locale in supportedLocales) {
// if (locale.languageCode == deviceLocale.languageCode &&
// locale.countryCode == deviceLocale.countryCode) {
// return locale;
// }
// }
// }
//
// for (final locale in supportedLocales) {
// if (locale.languageCode == deviceLocale.languageCode) {
// return locale;
// }
// }
return const Locale('en');
}
... ...