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

Column-wise contact row (marcia feedback) #466

Merged
sarah merged 4 commits from marcia_fixes into trunk 2022-06-09 20:43:10 +00:00
Conversation 2 Commits 4 Files Changed 1 +43 -35
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/widgets/contactrow.dart
View File

@ -80,33 +80,39 @@ class _ContactRowState extends State<ContactRow> {
Visibility( Visibility(
visible: !Provider.of<Settings>(context).streamerMode, visible: !Provider.of<Settings>(context).streamerMode,
child: Text(contact.onion, child: Text(contact.onion,
overflow: TextOverflow.ellipsis,
style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor)), style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor)),
) ),
], Container(
))), padding: EdgeInsets.all(0),
Padding(
padding: const EdgeInsets.all(5.0),
child: contact.isInvitation == true child: contact.isInvitation == true
? Wrap(direction: Axis.vertical, children: <Widget>[ ? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
IconButton( Padding(
padding: EdgeInsets.zero, padding: EdgeInsets.all(2),
splashRadius: Material.defaultSplashRadius / 2, child: TextButton.icon(
iconSize: 16, label: Text(
AppLocalizations.of(context)!.tooltipAcceptContactRequest,
),
icon: Icon( icon: Icon(
Icons.favorite, Icons.favorite,
size: 16,
color: Provider.of<Settings>(context).theme.mainTextColor, color: Provider.of<Settings>(context).theme.mainTextColor,
), ),
tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest,
onPressed: _btnApprove, onPressed: _btnApprove,
)),
Padding(
padding: EdgeInsets.all(2),
child: TextButton.icon(
label: Text(
AppLocalizations.of(context)!.tooltipRejectContactRequest,
style: TextStyle(decoration: TextDecoration.underline),
), ),
IconButton( style: ButtonStyle(
padding: EdgeInsets.zero, backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
splashRadius: Material.defaultSplashRadius / 2, foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
iconSize: 16, icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor),
icon: Icon(Icons.delete, color: Provider.of<Settings>(context).theme.mainTextColor),
tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest,
onPressed: _btnReject, onPressed: _btnReject,
) ))
]) ])
: (contact.isBlocked != null && contact.isBlocked : (contact.isBlocked != null && contact.isBlocked
? IconButton( ? IconButton(
@ -118,6 +124,8 @@ class _ContactRowState extends State<ContactRow> {
) )
: Text(dateToNiceString(contact.lastMessageTime))), : Text(dateToNiceString(contact.lastMessageTime))),
), ),
],
))),
]), ]),
onTap: () { onTap: () {
selectConversation(context, contact.identifier); selectConversation(context, contact.identifier);