Commit 6d777e6283ba92b8037912673815a919c5899398

Authored by 权海
1 parent 1a793440

feat(ui):指定苹方字体

@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" 36 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
37 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" 37 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
38 customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" 38 customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
  39 + language = "en"
39 launchStyle = "0" 40 launchStyle = "0"
40 useCustomWorkingDirectory = "NO" 41 useCustomWorkingDirectory = "NO"
41 ignoresPersistentStateOnLaunch = "NO" 42 ignoresPersistentStateOnLaunch = "NO"
@@ -42,7 +42,7 @@ class TrendDateRangeBar extends StatelessWidget { @@ -42,7 +42,7 @@ class TrendDateRangeBar extends StatelessWidget {
42 Text( 42 Text(
43 controller.dateRangeLabel, 43 controller.dateRangeLabel,
44 style: const TextStyle( 44 style: const TextStyle(
45 - fontFamily: 'PingFang SC', 45 + fontFamily: 'PingFangSC',
46 fontSize: 14, 46 fontSize: 14,
47 fontWeight: FontWeight.w500, 47 fontWeight: FontWeight.w500,
48 color: _brandColor, 48 color: _brandColor,
@@ -56,7 +56,7 @@ class TrendPeriodTabBar extends StatelessWidget { @@ -56,7 +56,7 @@ class TrendPeriodTabBar extends StatelessWidget {
56 child: AnimatedDefaultTextStyle( 56 child: AnimatedDefaultTextStyle(
57 duration: const Duration(milliseconds: 200), 57 duration: const Duration(milliseconds: 200),
58 style: TextStyle( 58 style: TextStyle(
59 - fontFamily: 'PingFang SC', 59 + fontFamily: 'PingFangSC',
60 fontSize: 14, 60 fontSize: 14,
61 fontWeight: FontWeight.w500, 61 fontWeight: FontWeight.w500,
62 color: isSelected ? _h1 : _h2, 62 color: isSelected ? _h1 : _h2,
@@ -32,12 +32,12 @@ class TrendTypeTabBar extends StatelessWidget { @@ -32,12 +32,12 @@ class TrendTypeTabBar extends StatelessWidget {
32 labelColor: _selectedColor, 32 labelColor: _selectedColor,
33 unselectedLabelColor: _unselectedColor, 33 unselectedLabelColor: _unselectedColor,
34 labelStyle: const TextStyle( 34 labelStyle: const TextStyle(
35 - fontFamily: 'PingFang SC', 35 + fontFamily: 'PingFangSC',
36 fontSize: 18, 36 fontSize: 18,
37 fontWeight: FontWeight.w600, 37 fontWeight: FontWeight.w600,
38 ), 38 ),
39 unselectedLabelStyle: const TextStyle( 39 unselectedLabelStyle: const TextStyle(
40 - fontFamily: 'PingFang SC', 40 + fontFamily: 'PingFangSC',
41 fontSize: 18, 41 fontSize: 18,
42 fontWeight: FontWeight.w500, 42 fontWeight: FontWeight.w500,
43 ), 43 ),
@@ -53,6 +53,7 @@ class ReportDateSwitcher extends StatelessWidget { @@ -53,6 +53,7 @@ class ReportDateSwitcher extends StatelessWidget {
53 fontSize: 14, 53 fontSize: 14,
54 fontWeight: FontWeight.w500, 54 fontWeight: FontWeight.w500,
55 height: 1.2, 55 height: 1.2,
  56 + fontFamily: 'PingFangSC',
56 ), 57 ),
57 ), 58 ),
58 const SizedBox(width: 2), 59 const SizedBox(width: 2),
@@ -17,7 +17,7 @@ abstract final class SleepReportTextStyles { @@ -17,7 +17,7 @@ abstract final class SleepReportTextStyles {
17 ); 17 );
18 if (!_usesAppleTextRenderer) return baseStyle; 18 if (!_usesAppleTextRenderer) return baseStyle;
19 return baseStyle.copyWith( 19 return baseStyle.copyWith(
20 - fontFamily: 'PingFang SC', 20 + fontFamily: 'PingFangSC',
21 fontFamilyFallback: const ['Heiti SC', 'Arial Unicode MS'], 21 fontFamilyFallback: const ['Heiti SC', 'Arial Unicode MS'],
22 ); 22 );
23 } 23 }
@@ -31,7 +31,7 @@ abstract final class SleepReportTextStyles { @@ -31,7 +31,7 @@ abstract final class SleepReportTextStyles {
31 } 31 }
32 return const StrutStyle( 32 return const StrutStyle(
33 fontSize: 16, 33 fontSize: 16,
34 - fontFamily: 'PingFang SC', 34 + fontFamily: 'PingFangSC',
35 fontFamilyFallback: ['Heiti SC', 'Arial Unicode MS'], 35 fontFamilyFallback: ['Heiti SC', 'Arial Unicode MS'],
36 height: 1.2, 36 height: 1.2,
37 ); 37 );
@@ -8,7 +8,7 @@ import 'app_colors_extension.dart'; @@ -8,7 +8,7 @@ import 'app_colors_extension.dart';
8 class AppTheme { 8 class AppTheme {
9 AppTheme._(); 9 AppTheme._();
10 static String? get _platformFontFamily => 10 static String? get _platformFontFamily =>
11 - defaultTargetPlatform == TargetPlatform.iOS ? 'PingFang SC' : null; 11 + defaultTargetPlatform == TargetPlatform.iOS ? 'PingFangSC' : null;
12 12
13 static const systemUiOverlayStyle = SystemUiOverlayStyle( 13 static const systemUiOverlayStyle = SystemUiOverlayStyle(
14 statusBarColor: Colors.transparent, 14 statusBarColor: Colors.transparent,
@@ -2,6 +2,8 @@ import 'package:flutter/widgets.dart'; @@ -2,6 +2,8 @@ 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 + return const Locale('en');
  6 +
5 if (deviceLocale == null) return const Locale('en'); 7 if (deviceLocale == null) return const Locale('en');
6 8
7 for (final locale in supportedLocales) { 9 for (final locale in supportedLocales) {