GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/make-emoji-verificatoin-scrollable' into 'main' 

fix: Allow key verification to scroll vertically

Closes #228

See merge request ChristianPauly/fluffychat-flutter!311
This commit is contained in:
Sorunome 2020-12-19 13:21:23 +00:00
parent cf707d2ac5 accd9b44c8
commit 992bdaa698
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/components/dialogs/key_verification_dialog.dart
View File

@ -25,6 +25,7 @@ class KeyVerificationDialog extends StatefulWidget {
class _KeyVerificationPageState extends State<KeyVerificationDialog> { class _KeyVerificationPageState extends State<KeyVerificationDialog> {
void Function() originalOnUpdate; void Function() originalOnUpdate;
final _scrollController = ScrollController();
@override @override
void initState() { void initState() {
@ -50,6 +51,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
.contains(widget.request.state)) { .contains(widget.request.state)) {
widget.request.cancel('m.user'); widget.request.cancel('m.user');
} }
_scrollController.dispose();
super.dispose(); super.dispose();
} }
@ -316,17 +318,25 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
subtitle: Text(L10n.of(context).verifyTitle, maxLines: 1), subtitle: Text(L10n.of(context).verifyTitle, maxLines: 1),
title: userNameTitle, title: userNameTitle,
); );
final content = Column( final content = Scrollbar(
mainAxisSize: MainAxisSize.min, isAlwaysShown: true,
children: [ controller: _scrollController,
if (PlatformInfos.isCupertinoStyle) ...{ child: SingleChildScrollView(
SizedBox(height: 8), scrollDirection: Axis.vertical,
Center(child: userNameTitle), controller: _scrollController,
SizedBox(height: 12), child: Column(
}, mainAxisSize: MainAxisSize.min,
body, children: [
if (bottom != null) bottom, if (PlatformInfos.isCupertinoStyle) ...[
], SizedBox(height: 8),
Center(child: userNameTitle),
SizedBox(height: 12),
],
body,
if (bottom != null) bottom,
],
),
),
); );
if (PlatformInfos.isCupertinoStyle) { if (PlatformInfos.isCupertinoStyle) {
return CupertinoAlertDialog( return CupertinoAlertDialog(