From 9c89c93013d9e07166d035ba0b6bbe0517472709 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Mon, 17 Apr 2023 10:37:56 -0700 Subject: [PATCH] Formatting --- lib/models/contact.dart | 2 +- lib/models/messages/filemessage.dart | 8 ++++---- lib/views/contactsview.dart | 12 +++++++++--- lib/views/messageview.dart | 11 ++++++----- lib/views/peersettingsview.dart | 15 ++++++++++++--- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/lib/models/contact.dart b/lib/models/contact.dart index 4d6c8f30..665e32ff 100644 --- a/lib/models/contact.dart +++ b/lib/models/contact.dart @@ -402,7 +402,7 @@ class ContactInfoState extends ChangeNotifier { } String augmentedNickname(BuildContext context) { - return this.nickname + (this.availabilityStatus == ProfileStatusMenu.available ? "" : " (" +this.statusString(context) + ")"); + return this.nickname + (this.availabilityStatus == ProfileStatusMenu.available ? "" : " (" + this.statusString(context) + ")"); } String statusString(BuildContext context) { diff --git a/lib/models/messages/filemessage.dart b/lib/models/messages/filemessage.dart index fe4ff9ab..53196dcd 100644 --- a/lib/models/messages/filemessage.dart +++ b/lib/models/messages/filemessage.dart @@ -33,10 +33,10 @@ class FileMessage extends Message { int fileSize = shareObj['s'] as int; String fileKey = rootHash + "." + nonce; - if (metadata.attributes["file-downloaded"] != "true") { - if (!Provider.of(context,listen: false).downloadKnown(fileKey)) { - Provider.of(context, listen: false).cwtch.CheckDownloadStatus(Provider.of(context, listen: false).onion, fileKey); - } + if (metadata.attributes["file-downloaded"] != "true") { + if (!Provider.of(context, listen: false).downloadKnown(fileKey)) { + Provider.of(context, listen: false).cwtch.CheckDownloadStatus(Provider.of(context, listen: false).onion, fileKey); + } } if (!validHash(rootHash, nonce)) { diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart index 8a37a76e..5a375a85 100644 --- a/lib/views/contactsview.dart +++ b/lib/views/contactsview.dart @@ -164,15 +164,21 @@ class _ContactsViewState extends State { itemBuilder: (BuildContext context) => >[ PopupMenuItem( value: ProfileStatusMenu.available, - child: Text(AppLocalizations.of(context)!.availabilityStatusAvailable!,), + child: Text( + AppLocalizations.of(context)!.availabilityStatusAvailable!, + ), ), PopupMenuItem( value: ProfileStatusMenu.away, - child: Text(AppLocalizations.of(context)!.availabilityStatusAway!,), + child: Text( + AppLocalizations.of(context)!.availabilityStatusAway!, + ), ), PopupMenuItem( value: ProfileStatusMenu.busy, - child: Text(AppLocalizations.of(context)!.availabilityStatusBusy!,), + child: Text( + AppLocalizations.of(context)!.availabilityStatusBusy!, + ), ), ], ), diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart index a66a4561..461d5f9d 100644 --- a/lib/views/messageview.dart +++ b/lib/views/messageview.dart @@ -230,11 +230,12 @@ class _MessageViewState extends State { ), Expanded( child: Container( - height: 42, - clipBehavior: Clip.hardEdge, - decoration: BoxDecoration(), - child: Align( - alignment: Alignment.centerLeft, child: Text( + height: 42, + clipBehavior: Clip.hardEdge, + decoration: BoxDecoration(), + child: Align( + alignment: Alignment.centerLeft, + child: Text( Provider.of(context).augmentedNickname(context), overflow: TextOverflow.clip, maxLines: 1, diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart index a066a315..2688fa71 100644 --- a/lib/views/peersettingsview.dart +++ b/lib/views/peersettingsview.dart @@ -113,15 +113,24 @@ class _PeerSettingsViewState extends State { child: Column(children: [ Padding( padding: EdgeInsets.all(1), - child: SelectableText(Provider.of(context, listen: false).attributes[0] ?? "", textAlign: TextAlign.center,), + child: SelectableText( + Provider.of(context, listen: false).attributes[0] ?? "", + textAlign: TextAlign.center, + ), ), Padding( padding: EdgeInsets.all(1), - child: SelectableText(Provider.of(context, listen: false).attributes[1] ?? "", textAlign: TextAlign.center,), + child: SelectableText( + Provider.of(context, listen: false).attributes[1] ?? "", + textAlign: TextAlign.center, + ), ), Padding( padding: EdgeInsets.all(1), - child: SelectableText(Provider.of(context, listen: false).attributes[2] ?? "", textAlign: TextAlign.center,), + child: SelectableText( + Provider.of(context, listen: false).attributes[2] ?? "", + textAlign: TextAlign.center, + ), ) ])) ]),