GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-28 07:19:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/minor-design-fix' into 'main'

Browse Source 
fix: Minor key request design fix

See merge request ChristianPauly/fluffychat-flutter!290
This commit is contained in:
Christian Pauly 2020-11-22 14:25:28 +00:00
commit e690da38b5
1 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/views/key_verification.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
import '../components/adaptive_page_layout.dart'; import '../components/adaptive_page_layout.dart';
import '../components/avatar.dart'; import '../components/avatar.dart';
import '../components/dialogs/simple_dialogs.dart'; import '../components/dialogs/simple_dialogs.dart';
import '../utils/string_color.dart';
import 'chat_list.dart'; import 'chat_list.dart';
class KeyVerificationView extends StatelessWidget { class KeyVerificationView extends StatelessWidget {
@ -180,8 +181,11 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
CircularProgressIndicator(), CircularProgressIndicator(),
Container(height: 10), SizedBox(height: 10),
Text(L10n.of(context).waitingPartnerAcceptRequest), Text(
L10n.of(context).waitingPartnerAcceptRequest,
textAlign: TextAlign.center,
),
], ],
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
); );
@ -207,16 +211,14 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
} }
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
Container( Center(
alignment: Alignment.center,
child: Text( child: Text(
compareText, compareText,
style: TextStyle(fontSize: 20), style: TextStyle(fontSize: 20),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
padding: const EdgeInsets.all(16.0),
), ),
Container(height: 10), SizedBox(height: 10),
Text.rich( Text.rich(
compareWidget, compareWidget,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -252,8 +254,11 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
CircularProgressIndicator(), CircularProgressIndicator(),
Container(height: 10), SizedBox(height: 10),
Text(acceptText), Text(
acceptText,
textAlign: TextAlign.center,
),
], ],
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
); );
@ -262,8 +267,11 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
Icon(Icons.check_circle, color: Colors.green, size: 200.0), Icon(Icons.check_circle, color: Colors.green, size: 200.0),
Container(height: 10), SizedBox(height: 10),
Text(L10n.of(context).verifySuccess), Text(
L10n.of(context).verifySuccess,
textAlign: TextAlign.center,
),
], ],
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
); );
@ -282,9 +290,11 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
Icon(Icons.cancel, color: Colors.red, size: 200.0), Icon(Icons.cancel, color: Colors.red, size: 200.0),
Container(height: 10), SizedBox(height: 10),
Text( Text(
'Error ${widget.request.canceledCode}: ${widget.request.canceledReason}'), 'Error ${widget.request.canceledCode}: ${widget.request.canceledReason}',
textAlign: TextAlign.center,
),
], ],
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
); );
@ -323,12 +333,25 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
title: ListTile( title: ListTile(
leading: Avatar(profile?.avatarUrl, otherName), leading: Avatar(profile?.avatarUrl, otherName),
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
title: Text(L10n.of(context).verifyTitle, maxLines: 1), subtitle: Text(L10n.of(context).verifyTitle, maxLines: 1),
subtitle: Row( title: Row(
children: <Widget>[ children: <Widget>[
Text(otherName, maxLines: 1), Text(
otherName,
maxLines: 1,
style: TextStyle(
color: otherName.color,
fontWeight: FontWeight.bold,
),
),
if (otherName != widget.request.userId) if (otherName != widget.request.userId)
Text(' -> ' + widget.request.userId, maxLines: 1), Text(
' - ' + widget.request.userId,
maxLines: 1,
style: TextStyle(
fontStyle: FontStyle.italic,
),
),
], ],
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
), ),
@ -340,10 +363,13 @@ class _KeyVerificationPageState extends State<KeyVerificationPage> {
children: [ children: [
Expanded( Expanded(
child: Center( child: Center(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: body, child: body,
), ),
), ),
bottom, ),
if (bottom != null) bottom,
], ],
), ),
), ),