GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

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

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