cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 2 Projects 2 Releases 28 Wiki Activity

Add replying to

This commit is contained in:
Sarah Jamie Lewis 2022-11-24 13:28:25 -08:00
parent b0668812e4
commit f6710484a2
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/themes/juniper.dart
View File

@ -25,7 +25,6 @@ class Juniper extends CwtchDark {
static final Color accent = Color(0xFF9E6A56); static final Color accent = Color(0xFF9E6A56);
static final Color accentAlt = Color(0xFF845A48); static final Color accentAlt = Color(0xFF845A48);
get theme => juniper_theme; get theme => juniper_theme;
get mode => mode_dark; get mode => mode_dark;

49
lib/widgets/quotedmessage.dart
View File

@ -1,17 +1,14 @@
import 'package:cwtch/controllers/open_link_modal.dart'; import 'package:cwtch/controllers/open_link_modal.dart';
import 'package:cwtch/models/appstate.dart';
import 'package:cwtch/models/contact.dart'; import 'package:cwtch/models/contact.dart';
import 'package:cwtch/models/message.dart'; import 'package:cwtch/models/message.dart';
import 'package:cwtch/models/profile.dart'; import 'package:cwtch/models/profile.dart';
import 'package:cwtch/third_party/linkify/flutter_linkify.dart'; import 'package:cwtch/third_party/linkify/flutter_linkify.dart';
import 'package:cwtch/views/contactsview.dart';
import 'package:cwtch/widgets/malformedbubble.dart'; import 'package:cwtch/widgets/malformedbubble.dart';
import 'package:cwtch/widgets/messageloadingbubble.dart'; import 'package:cwtch/widgets/messageloadingbubble.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:intl/intl.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import '../settings.dart'; import '../settings.dart';
import 'messagebubbledecorations.dart'; import 'messagebubbledecorations.dart';
@ -45,6 +42,7 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
senderDisplayStr = Provider.of<MessageMetadata>(context).senderHandle; senderDisplayStr = Provider.of<MessageMetadata>(context).senderHandle;
} }
} }
var wdgSender = SelectableText(senderDisplayStr, var wdgSender = SelectableText(senderDisplayStr,
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor)); style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor));
@ -81,8 +79,28 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
if (snapshot.hasData) { if (snapshot.hasData) {
try { try {
var qMessage = (snapshot.data! as Message); var qMessage = (snapshot.data! as Message);
// Swap the background color for quoted tweets..
// If the sender is not us, then we want to give them a nickname...
String qMessageSender;
// if we are quoted then display our nickname
if (qMessage.getMetadata().senderHandle == Provider.of<ProfileInfoState>(context).onion) {
qMessageSender = Provider.of<ProfileInfoState>(context).nickname;
} else {
qMessageSender = Provider.of<MessageMetadata>(context).senderHandle;
ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(qMessage.getMetadata().senderHandle);
if (contact != null) {
qMessageSender = contact.nickname;
}
}
var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor : Provider.of<Settings>(context).theme.messageFromMeTextColor; var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor : Provider.of<Settings>(context).theme.messageFromMeTextColor;
var wdgReplyingTo = SelectableText(
AppLocalizations.of(context)!.replyingTo.replaceAll("%1", qMessageSender),
style: TextStyle(fontSize: 10, color: qTextColor.withOpacity(0.8)),
);
// Swap the background color for quoted tweets..
return MouseRegion( return MouseRegion(
cursor: SystemMouseCursors.click, cursor: SystemMouseCursors.click,
child: GestureDetector( child: GestureDetector(
@ -103,15 +121,18 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor, color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
), ),
height: 75, height: 75,
child: Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, children: [ child: Column(children: [
Padding(padding: EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0), child: Icon(Icons.reply, size: 32, color: qTextColor)), Align(alignment: Alignment.centerLeft, child: wdgReplyingTo),
Flexible( Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, children: [
child: DefaultTextStyle( Padding(padding: EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0), child: Icon(Icons.reply, size: 32, color: qTextColor)),
textWidthBasis: TextWidthBasis.parent, Flexible(
child: qMessage.getPreviewWidget(context), child: DefaultTextStyle(
style: TextStyle(color: qTextColor), textWidthBasis: TextWidthBasis.parent,
overflow: TextOverflow.fade, child: qMessage.getPreviewWidget(context),
)) style: TextStyle(color: qTextColor),
overflow: TextOverflow.fade,
))
])
])))); ]))));
} catch (e) { } catch (e) {
return MalformedBubble(); return MalformedBubble();