mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-12-25 15:02:33 +01:00
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:
commit
992bdaa698
@ -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(
|
||||||
|
isAlwaysShown: true,
|
||||||
|
controller: _scrollController,
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
scrollDirection: Axis.vertical,
|
||||||
|
controller: _scrollController,
|
||||||
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
if (PlatformInfos.isCupertinoStyle) ...{
|
if (PlatformInfos.isCupertinoStyle) ...[
|
||||||
SizedBox(height: 8),
|
SizedBox(height: 8),
|
||||||
Center(child: userNameTitle),
|
Center(child: userNameTitle),
|
||||||
SizedBox(height: 12),
|
SizedBox(height: 12),
|
||||||
},
|
],
|
||||||
body,
|
body,
|
||||||
if (bottom != null) bottom,
|
if (bottom != null) bottom,
|
||||||
],
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
if (PlatformInfos.isCupertinoStyle) {
|
if (PlatformInfos.isCupertinoStyle) {
|
||||||
return CupertinoAlertDialog(
|
return CupertinoAlertDialog(
|
||||||
|
Loading…
Reference in New Issue
Block a user