2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Routing bug when adding second account via password login

Browse source
This commit is contained in:
krille-chan 2023-09-17 09:57:38 +02:00
commit 19cdde2665
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
return list; return list;
} }
void login() => context.go('/home/login'); void login() => context.go('${GoRouterState.of(context).fullPath}/login');
@override @override
void initState() { void initState() {

4
lib/widgets/layouts/login_scaffold.dart
View file

@ -6,6 +6,7 @@ import 'package:url_launcher/url_launcher_string.dart';
import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/matrix.dart';
class LoginScaffold extends StatelessWidget { class LoginScaffold extends StatelessWidget {
final Widget body; final Widget body;
@ -19,7 +20,8 @@ class LoginScaffold extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final isMobileMode = !FluffyThemes.isColumnMode(context); final isMobileMode = Matrix.of(context).client.isLogged() ||
!FluffyThemes.isColumnMode(context);
final scaffold = Scaffold( final scaffold = Scaffold(
key: const Key('LoginScaffold'), key: const Key('LoginScaffold'),
appBar: appBar == null appBar: appBar == null