fix: can't quit app

This commit is contained in:
LollipopKit
2022-12-20 13:40:48 +08:00
parent cfd28c3009
commit 6bda94bd7b
17 changed files with 353 additions and 380 deletions

View File

@@ -33,9 +33,8 @@ class _ServerPageState extends State<ServerPage>
late MediaQueryData _media;
late ThemeData _theme;
late Color _primaryColor;
late ServerProvider _serverProvider;
late S s;
late S _s;
@override
void initState() {
@@ -49,7 +48,7 @@ class _ServerPageState extends State<ServerPage>
_media = MediaQuery.of(context);
_theme = Theme.of(context);
_primaryColor = primaryColor;
s = S.of(context);
_s = S.of(context);
}
@override
@@ -60,7 +59,7 @@ class _ServerPageState extends State<ServerPage>
if (pro.servers.isEmpty) {
return Center(
child: Text(
s.serverTabEmpty,
_s.serverTabEmpty,
textAlign: TextAlign.center,
),
);
@@ -87,7 +86,7 @@ class _ServerPageState extends State<ServerPage>
onPressed: () =>
AppRoute(const ServerEditPage(), 'Add server info page')
.go(context),
tooltip: s.addAServer,
tooltip: _s.addAServer,
heroTag: 'server page fab',
child: const Icon(Icons.add),
),
@@ -155,8 +154,8 @@ class _ServerPageState extends State<ServerPage>
hasError
? GestureDetector(
onTap: () => showRoundDialog(
context, s.error, Text(ss.failedInfo ?? ''), []),
child: Text(s.clickSee, style: style))
context, _s.error, Text(ss.failedInfo ?? ''), []),
child: Text(_s.clickSee, style: style))
: Text(topRightStr, style: style, textScaleFactor: 1.0),
_buildMoreBtn(spi),
],
@@ -248,11 +247,11 @@ class _ServerPageState extends State<ServerPage>
String? failedInfo) {
switch (cs) {
case ServerConnectionState.disconnected:
return s.disconnected;
return _s.disconnected;
case ServerConnectionState.connected:
if (temp == '') {
if (upTime == '') {
return s.serverTabLoading;
return _s.serverTabLoading;
} else {
return upTime;
}
@@ -264,17 +263,17 @@ class _ServerPageState extends State<ServerPage>
}
}
case ServerConnectionState.connecting:
return s.serverTabConnecting;
return _s.serverTabConnecting;
case ServerConnectionState.failed:
if (failedInfo == null) {
return s.serverTabFailed;
return _s.serverTabFailed;
}
if (failedInfo.contains('encypted')) {
return s.serverTabPlzSave;
return _s.serverTabPlzSave;
}
return failedInfo;
default:
return s.serverTabUnkown;
return _s.serverTabUnkown;
}
}