This commit is contained in:
wgh136
2024-05-13 11:18:17 +08:00
parent 3aa6c4b7a4
commit e8d8b533e2
4 changed files with 11 additions and 1 deletions

Binary file not shown.

View File

@@ -53,6 +53,7 @@ class MyApp extends StatelessWidget {
title: 'pixes', title: 'pixes',
theme: FluentThemeData( theme: FluentThemeData(
brightness: Brightness.light, brightness: Brightness.light,
fontFamily: App.isWindows ? 'font' : null,
accentColor: AccentColor.swatch({ accentColor: AccentColor.swatch({
'darkest': SystemTheme.accentColor.darkest, 'darkest': SystemTheme.accentColor.darkest,
'darker': SystemTheme.accentColor.darker, 'darker': SystemTheme.accentColor.darker,
@@ -64,6 +65,7 @@ class MyApp extends StatelessWidget {
})), })),
darkTheme: FluentThemeData( darkTheme: FluentThemeData(
brightness: Brightness.dark, brightness: Brightness.dark,
fontFamily: App.isWindows ? 'font' : null,
accentColor: AccentColor.swatch({ accentColor: AccentColor.swatch({
'darkest': SystemTheme.accentColor.darkest, 'darkest': SystemTheme.accentColor.darkest,
'darker': SystemTheme.accentColor.darker, 'darker': SystemTheme.accentColor.darker,

View File

@@ -23,7 +23,9 @@ class _LoginPageState extends State<LoginPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (!waitingForAuth) { if(isLogging) {
return buildLoading(context);
} else if (!waitingForAuth) {
return buildLogin(context); return buildLogin(context);
} else { } else {
return buildWaiting(context); return buildWaiting(context);

View File

@@ -102,3 +102,9 @@ flutter:
# #
# For details regarding fonts from package dependencies, # For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages # see https://flutter.dev/custom-fonts/#from-packages
# font used for building windows application
fonts:
- family: font
fonts:
- asset: assets/SourceHanSansSC-Regular.otf