zoe
/
loris
1
1
Fork 1
Code Issues 9 Pull Requests Projects Releases 6 Wiki Activity

meow meow meow meow

This commit is contained in:
zoe 2022-09-29 22:46:16 +02:00
parent d7a35beb3a
commit 51c3cf8b04
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dialogues/chatwindow.dart
View File

@ -127,7 +127,8 @@ class _DirectMessageState extends State<DirectMessage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: const EdgeInsets.all(themes.defaultSeperatorHeight * 2), padding: const EdgeInsets.symmetric(
horizontal: themes.defaultSeperatorHeight * 2),
child: Align( child: Align(
alignment: (widget.model.identity == alignment: (widget.model.identity ==
"${widget.model.account.acct}@${global.settings!.identities[widget.model.identity]!.instanceUrl}") "${widget.model.account.acct}@${global.settings!.identities[widget.model.identity]!.instanceUrl}")
@ -135,7 +136,10 @@ class _DirectMessageState extends State<DirectMessage> {
: Alignment.centerLeft, : Alignment.centerLeft,
child: LayoutBuilder(builder: ((ctx, constraints) { child: LayoutBuilder(builder: ((ctx, constraints) {
return Container( return Container(
constraints: BoxConstraints(maxWidth: constraints.maxWidth * 0.96), constraints: BoxConstraints(
maxWidth: constraints.maxWidth * 0.96 +
themes.defaultSeperatorHeight * 2,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface, color: Theme.of(context).colorScheme.surface,
border: Border.all( border: Border.all(

54
lib/pages/chat/chat.dart
View File

@ -3,6 +3,7 @@ import 'package:localization/localization.dart';
import 'package:loris/business_logic/chat/chat.dart'; import 'package:loris/business_logic/chat/chat.dart';
import 'package:loris/dialogues/chatwindow.dart'; import 'package:loris/dialogues/chatwindow.dart';
import 'package:loris/partials/loadingbox.dart'; import 'package:loris/partials/loadingbox.dart';
import 'package:loris/partials/post.dart';
import 'package:loris/partials/post_text_renderer.dart'; import 'package:loris/partials/post_text_renderer.dart';
import 'package:loris/themes/themes.dart' as themes; import 'package:loris/themes/themes.dart' as themes;
import 'package:loris/global.dart' as global; import 'package:loris/global.dart' as global;
@ -102,6 +103,10 @@ class ConversationButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<DisplayName> people = [];
for (var p in model.accounts) {
people.add(DisplayName(account: p));
}
return Align( return Align(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -127,26 +132,35 @@ class ConversationButton extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
ElevatedButton.icon( ElevatedButton.icon(
onPressed: onTap, onPressed: onTap,
icon: const Icon(Icons.open_in_full), icon: const Icon(Icons.open_in_full),
label: Text("show".i18n())), label: Text("show".i18n())),
if (model.unread) const UnreadIndicator(), if (model.unread) const UnreadIndicator(),
], ],
), ),
Wrap( Wrap(
alignment: WrapAlignment.spaceBetween, alignment: WrapAlignment.spaceBetween,
children: [ children: [
SelectableText(model.getAccountsString()), SelectableText(model.getAccountsString()),
SelectableText("${"you-are".i18n()} ${model.identity}"), SelectableText(
], "${"you-are".i18n()} ${model.identity}"),
), ],
if (model.lastStatus != null) ),
PostTextRenderer(input: model.lastStatus!.content), 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,
), ),
), ),
), ),