fix: Minor bugs

This commit is contained in:
Christian Pauly 2021-02-27 10:48:48 +01:00
parent 3283a2e1ce
commit 9fbfca6e04
3 changed files with 20 additions and 21 deletions

View File

@ -71,12 +71,12 @@ class _PermissionSliderDialogState extends State<PermissionSliderDialog> {
);
final buttons = [
AdaptiveFlatButton(
label: L10n.of(context).cancel,
label: L10n.of(context).cancel,
onPressed: () =>
Navigator.of(context, rootNavigator: false).pop<int>(null),
),
AdaptiveFlatButton(
label: L10n.of(context).confirm,
label: L10n.of(context).confirm,
onPressed: () =>
Navigator.of(context, rootNavigator: false).pop<int>(_permission),
),

View File

@ -12,7 +12,6 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
import '../utils/presence_extension.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'dialogs/key_verification_dialog.dart';
class UserBottomSheet extends StatelessWidget {
final User user;
@ -87,17 +86,10 @@ class UserBottomSheet extends StatelessWidget {
}
}
void _verifyAction(BuildContext context) async {
final client = user.room.client;
final req = await client.userDeviceKeys[user.id].startVerification();
await KeyVerificationDialog(request: req).show(context);
}
@override
Widget build(BuildContext context) {
final client = user.room.client;
final presence = client.presences[user.id];
final verificationStatus = client.userDeviceKeys[user.id]?.verified;
var items = <PopupMenuEntry<String>>[];
if (onMention != null) {

View File

@ -259,17 +259,24 @@ class _ChatListState extends State<ChatList> {
IconButton(
icon: Icon(Icons.search_outlined),
tooltip: L10n.of(context).search,
onPressed: () async {
await _scrollController.animateTo(
_scrollController.position.minScrollExtent,
duration: Duration(milliseconds: 200),
curve: Curves.ease,
);
WidgetsBinding.instance.addPostFrameCallback(
(_) => _searchFieldKey.currentState
.requestFocus(),
);
},
onPressed: Matrix.of(context)
.client
.rooms
.isEmpty
? null
: () async {
await _scrollController.animateTo(
_scrollController
.position.minScrollExtent,
duration: Duration(milliseconds: 200),
curve: Curves.ease,
);
WidgetsBinding.instance
.addPostFrameCallback(
(_) => _searchFieldKey.currentState
.requestFocus(),
);
},
),
],
title: Text(selectMode == SelectMode.share