From 51c3cf8b04db2f4140a7764ec4f45cd1551dbf83 Mon Sep 17 00:00:00 2001 From: zoe Date: Thu, 29 Sep 2022 22:46:16 +0200 Subject: [PATCH] meow meow meow meow --- lib/dialogues/chatwindow.dart | 8 ++++-- lib/pages/chat/chat.dart | 54 ++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/lib/dialogues/chatwindow.dart b/lib/dialogues/chatwindow.dart index c747878..6f3d41b 100644 --- a/lib/dialogues/chatwindow.dart +++ b/lib/dialogues/chatwindow.dart @@ -127,7 +127,8 @@ class _DirectMessageState extends State { @override Widget build(BuildContext context) { return Padding( - padding: const EdgeInsets.all(themes.defaultSeperatorHeight * 2), + padding: const EdgeInsets.symmetric( + horizontal: themes.defaultSeperatorHeight * 2), child: Align( alignment: (widget.model.identity == "${widget.model.account.acct}@${global.settings!.identities[widget.model.identity]!.instanceUrl}") @@ -135,7 +136,10 @@ class _DirectMessageState extends State { : Alignment.centerLeft, child: LayoutBuilder(builder: ((ctx, constraints) { return Container( - constraints: BoxConstraints(maxWidth: constraints.maxWidth * 0.96), + constraints: BoxConstraints( + maxWidth: constraints.maxWidth * 0.96 + + themes.defaultSeperatorHeight * 2, + ), decoration: BoxDecoration( color: Theme.of(context).colorScheme.surface, border: Border.all( diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 4dbf1ee..dbf30f0 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -3,6 +3,7 @@ import 'package:localization/localization.dart'; import 'package:loris/business_logic/chat/chat.dart'; import 'package:loris/dialogues/chatwindow.dart'; import 'package:loris/partials/loadingbox.dart'; +import 'package:loris/partials/post.dart'; import 'package:loris/partials/post_text_renderer.dart'; import 'package:loris/themes/themes.dart' as themes; import 'package:loris/global.dart' as global; @@ -102,6 +103,10 @@ class ConversationButton extends StatelessWidget { @override Widget build(BuildContext context) { + final List people = []; + for (var p in model.accounts) { + people.add(DisplayName(account: p)); + } return Align( child: Container( decoration: BoxDecoration( @@ -127,26 +132,35 @@ class ConversationButton extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - ElevatedButton.icon( - onPressed: onTap, - icon: const Icon(Icons.open_in_full), - label: Text("show".i18n())), - if (model.unread) const UnreadIndicator(), - ], - ), - Wrap( - alignment: WrapAlignment.spaceBetween, - children: [ - SelectableText(model.getAccountsString()), - SelectableText("${"you-are".i18n()} ${model.identity}"), - ], - ), - if (model.lastStatus != null) - PostTextRenderer(input: model.lastStatus!.content), - ], + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + ElevatedButton.icon( + onPressed: onTap, + icon: const Icon(Icons.open_in_full), + label: Text("show".i18n())), + if (model.unread) const UnreadIndicator(), + ], + ), + Wrap( + alignment: WrapAlignment.spaceBetween, + children: [ + SelectableText(model.getAccountsString()), + SelectableText( + "${"you-are".i18n()} ${model.identity}"), + ], + ), + if (model.lastStatus != null) + PostTextRenderer(input: model.lastStatus!.content), + Divider( + color: Theme.of(context).hintColor, + ), + SelectableText( + "conversation-participants".i18n(), + style: Theme.of(context).textTheme.displaySmall, + ), + ] + + people, ), ), ),