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

Merge branch 'main' of gitlab.com:famedly/fluffychat

Browse source
This commit is contained in:
Christian Pauly 2021-05-23 13:28:55 +02:00
commit 8fce5c0c4f
11 changed files with 147 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pages/chat_list.dart
View file

@ -245,7 +245,10 @@ class ChatListController extends State<ChatList> {
}
@override
Widget build(BuildContext context) => ChatListView(this);
Widget build(BuildContext context) {
Matrix.of(context).navigatorContext = context;
return ChatListView(this);
}
}
enum ChatListPopupMenuItemActions {

5
lib/pages/homeserver_picker.dart
View file

@ -65,5 +65,8 @@ class HomeserverPickerController extends State<HomeserverPicker> {
}
@override
Widget build(BuildContext context) => HomeserverPickerView(this);
Widget build(BuildContext context) {
Matrix.of(context).navigatorContext = context;
return HomeserverPickerView(this);
}
}

2
lib/pages/sign_up.dart
View file

@ -153,7 +153,7 @@ class SignUpController extends State<SignUp> {
setState(() => loading = false);
VRouter.of(context).push(
'/signup/password/${Uri.encodeComponent(preferredUsername)}/${Uri.encodeComponent(usernameController.text)}',
'/signup/password/${Uri.encodeComponent(preferredUsername)}',
queryParameters: {'displayname': usernameController.text},
);
}

7
lib/pages/views/chat_permissions_settings_view.dart
View file

@ -6,6 +6,7 @@ import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:vrouter/vrouter.dart';
class ChatPermissionsSettingsView extends StatelessWidget {
final ChatPermissionsSettingsController controller;
@ -17,7 +18,11 @@ class ChatPermissionsSettingsView extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
leading: BackButton(),
leading: IconButton(
icon: Icon(Icons.close_outlined),
onPressed: () =>
VRouter.of(context).push('/rooms/${controller.roomId}'),
),
title: Text(L10n.of(context).editChatPermissions),
),
body: MaxWidthBody(

7
lib/pages/views/invitation_selection_view.dart
View file

@ -7,6 +7,7 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:vrouter/vrouter.dart';
class InvitationSelectionView extends StatelessWidget {
final InvitationSelectionController controller;
@ -20,7 +21,11 @@ class InvitationSelectionView extends StatelessWidget {
room.name?.isEmpty ?? false ? L10n.of(context).group : room.name;
return Scaffold(
appBar: AppBar(
leading: BackButton(),
leading: IconButton(
icon: Icon(Icons.close_outlined),
onPressed: () =>
VRouter.of(context).push('/rooms/${controller.roomId}'),
),
titleSpacing: 0,
title: DefaultAppBarSearchField(
autofocus: true,