From 01b1b56852f6dffc48ab5cb4d7ecce8b988cdcb3 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Fri, 13 Mar 2020 21:42:05 +0100 Subject: [PATCH] Minor fixes --- lib/components/avatar.dart | 10 ++++++++-- lib/components/list_items/message.dart | 2 +- lib/components/list_items/state_message.dart | 7 +++---- lib/i18n/intl_de.arb | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/components/avatar.dart b/lib/components/avatar.dart index c7d4603..0816812 100644 --- a/lib/components/avatar.dart +++ b/lib/components/avatar.dart @@ -11,9 +11,15 @@ class Avatar extends StatelessWidget { final String name; final double size; final Function onTap; + static const double defaultSize = 44; - const Avatar(this.mxContent, this.name, {this.size = 40, this.onTap, Key key}) - : super(key: key); + const Avatar( + this.mxContent, + this.name, { + this.size = defaultSize, + this.onTap, + Key key, + }) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart index 4741928..73e9528 100644 --- a/lib/components/list_items/message.dart +++ b/lib/components/list_items/message.dart @@ -140,7 +140,7 @@ class Message extends StatelessWidget { ), ]; final Widget avatarOrSizedBox = sameSender - ? SizedBox(width: 40) + ? SizedBox(width: Avatar.defaultSize) : Avatar( event.sender.avatarUrl, event.sender.calcDisplayname(), diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart index bafb145..e8c366c 100644 --- a/lib/components/list_items/state_message.dart +++ b/lib/components/list_items/state_message.dart @@ -2,7 +2,6 @@ import 'package:bubble/bubble.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/material.dart'; import 'package:fluffychat/utils/event_extension.dart'; -import 'package:link_text/link_text.dart'; class StateMessage extends StatelessWidget { final Event event; @@ -21,10 +20,10 @@ class StateMessage extends StatelessWidget { elevation: 0, color: Theme.of(context).backgroundColor.withOpacity(0.5), alignment: Alignment.center, - child: LinkText( - text: event.getLocalizedBody(context), + child: Text( + event.getLocalizedBody(context), textAlign: TextAlign.center, - textStyle: TextStyle( + style: TextStyle( color: Theme.of(context).primaryColor, decoration: event.redacted ? TextDecoration.lineThrough : null, ), diff --git a/lib/i18n/intl_de.arb b/lib/i18n/intl_de.arb index 1a6c12f..936fe0b 100644 --- a/lib/i18n/intl_de.arb +++ b/lib/i18n/intl_de.arb @@ -1048,7 +1048,7 @@ "type": "text", "placeholders": {} }, - "Tuesday": "Tuesday", + "Tuesday": "Dienstag", "@Tuesday": { "type": "text", "placeholders": {}