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

Formatting
continuous-integration/drone/pr Build was killed Details

This commit is contained in:
Sarah Jamie Lewis 2023-04-17 10:37:56 -07:00
parent 5418bb00d8
commit 9c89c93013
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/contact.dart
View File

@ -402,7 +402,7 @@ class ContactInfoState extends ChangeNotifier {
} }
String augmentedNickname(BuildContext context) { 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) { String statusString(BuildContext context) {

8
lib/models/messages/filemessage.dart
View File

@ -33,10 +33,10 @@ class FileMessage extends Message {
int fileSize = shareObj['s'] as int; int fileSize = shareObj['s'] as int;
String fileKey = rootHash + "." + nonce; String fileKey = rootHash + "." + nonce;
if (metadata.attributes["file-downloaded"] != "true") { if (metadata.attributes["file-downloaded"] != "true") {
if (!Provider.of<ProfileInfoState>(context,listen: false).downloadKnown(fileKey)) { if (!Provider.of<ProfileInfoState>(context, listen: false).downloadKnown(fileKey)) {
Provider.of<FlwtchState>(context, listen: false).cwtch.CheckDownloadStatus(Provider.of<ProfileInfoState>(context, listen: false).onion, fileKey); Provider.of<FlwtchState>(context, listen: false).cwtch.CheckDownloadStatus(Provider.of<ProfileInfoState>(context, listen: false).onion, fileKey);
} }
} }
if (!validHash(rootHash, nonce)) { if (!validHash(rootHash, nonce)) {

12
lib/views/contactsview.dart
View File

@ -164,15 +164,21 @@ class _ContactsViewState extends State<ContactsView> {
itemBuilder: (BuildContext context) => <PopupMenuEntry<ProfileStatusMenu>>[ itemBuilder: (BuildContext context) => <PopupMenuEntry<ProfileStatusMenu>>[
PopupMenuItem<ProfileStatusMenu>( PopupMenuItem<ProfileStatusMenu>(
value: ProfileStatusMenu.available, value: ProfileStatusMenu.available,
child: Text(AppLocalizations.of(context)!.availabilityStatusAvailable!,), child: Text(
AppLocalizations.of(context)!.availabilityStatusAvailable!,
),
), ),
PopupMenuItem<ProfileStatusMenu>( PopupMenuItem<ProfileStatusMenu>(
value: ProfileStatusMenu.away, value: ProfileStatusMenu.away,
child: Text(AppLocalizations.of(context)!.availabilityStatusAway!,), child: Text(
AppLocalizations.of(context)!.availabilityStatusAway!,
),
), ),
PopupMenuItem<ProfileStatusMenu>( PopupMenuItem<ProfileStatusMenu>(
value: ProfileStatusMenu.busy, value: ProfileStatusMenu.busy,
child: Text(AppLocalizations.of(context)!.availabilityStatusBusy!,), child: Text(
AppLocalizations.of(context)!.availabilityStatusBusy!,
),
), ),
], ],
), ),

11
lib/views/messageview.dart
View File

@ -230,11 +230,12 @@ class _MessageViewState extends State<MessageView> {
), ),
Expanded( Expanded(
child: Container( child: Container(
height: 42, height: 42,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Align( child: Align(
alignment: Alignment.centerLeft, child: Text( alignment: Alignment.centerLeft,
child: Text(
Provider.of<ContactInfoState>(context).augmentedNickname(context), Provider.of<ContactInfoState>(context).augmentedNickname(context),
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
maxLines: 1, maxLines: 1,

15
lib/views/peersettingsview.dart
View File

@ -113,15 +113,24 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
child: Column(children: [ child: Column(children: [
Padding( Padding(
padding: EdgeInsets.all(1), padding: EdgeInsets.all(1),
child: SelectableText(Provider.of<ContactInfoState>(context, listen: false).attributes[0] ?? "", textAlign: TextAlign.center,), child: SelectableText(
Provider.of<ContactInfoState>(context, listen: false).attributes[0] ?? "",
textAlign: TextAlign.center,
),
), ),
Padding( Padding(
padding: EdgeInsets.all(1), padding: EdgeInsets.all(1),
child: SelectableText(Provider.of<ContactInfoState>(context, listen: false).attributes[1] ?? "", textAlign: TextAlign.center,), child: SelectableText(
Provider.of<ContactInfoState>(context, listen: false).attributes[1] ?? "",
textAlign: TextAlign.center,
),
), ),
Padding( Padding(
padding: EdgeInsets.all(1), padding: EdgeInsets.all(1),
child: SelectableText(Provider.of<ContactInfoState>(context, listen: false).attributes[2] ?? "", textAlign: TextAlign.center,), child: SelectableText(
Provider.of<ContactInfoState>(context, listen: false).attributes[2] ?? "",
textAlign: TextAlign.center,
),
) )
])) ]))
]), ]),