ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pangeachat:main' into 218-improve-interactive-translator

Browse source
This commit is contained in:
Matt 2024-05-28 16:41:43 -04:00 • committed by GitHub
commit 7828f881f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pages/homeserver_picker/homeserver_picker.dart
View file

@ -191,7 +191,10 @@ class HomeserverPickerController extends State<HomeserverPicker> {
} finally {
if (mounted) {
setState(() {
isLoading = isLoggingIn = false;
// #Pangea
// isLoading = isLoggingIn = false;
isLoggingIn = false;
// Pangea#
});
}
}

9
lib/pages/homeserver_picker/homeserver_picker_view.dart
View file

@ -70,7 +70,14 @@ class HomeserverPickerView extends StatelessWidget {
// Pangea#
Expanded(
child: controller.isLoading
? const Center(child: CircularProgressIndicator.adaptive())
// #Pangea
// ? const Center(child: CircularProgressIndicator.adaptive())
? const Center(
child: CircularProgressIndicator(
valueColor: AlwaysStoppedAnimation<Color>(Colors.black),
),
)
// Pangea#
: ListView(
children: [
if (errorText != null) ...[

4
lib/pages/login/login.dart
View file

@ -120,7 +120,9 @@ class LoginController extends State<Login> {
return setState(() => loading = false);
}
if (mounted) setState(() => loading = false);
// #Pangea
// if (mounted) setState(() => loading = false);
// Pangea#
}
Timer? _coolDown;