Merge pull request 'Add Message Status Widget to File Bubble' (#376) from fix297 into trunk
continuous-integration/drone/push Build is passing Details

Reviewed-on: #376
This commit is contained in:
Dan Ballard 2022-02-22 20:49:34 +00:00
commit 9473acd438
2 changed files with 4 additions and 2 deletions

View File

@ -57,7 +57,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
String? acnCircuit = Provider.of<ContactInfoState>(context).acnCircuit;
Widget path = Text(Provider.of<ContactInfoState>(context, listen: false).status);
Widget path = Text(Provider.of<ContactInfoState>(context).status);
if (acnCircuit != null) {
var hops = acnCircuit.split(",");

View File

@ -80,6 +80,8 @@ class FileBubbleState extends State<FileBubble> {
var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
var messageStatusWidget = MessageBubbleDecoration(ackd: metadata.ackd, errored: metadata.error, prettyDate: prettyDate, fromMe: fromMe);
// If the sender is not us, then we want to give them a nickname...
var senderDisplayStr = "";
var senderIsContact = false;
@ -195,7 +197,7 @@ class FileBubbleState extends State<FileBubble> {
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations]),
children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations, messageStatusWidget]),
));
});
}