From e76f2883c6efae373a09ac6381c52131df803ac5 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 9 Jun 2022 13:10:07 -0700 Subject: [PATCH 1/4] Column-wise contact row (marcia feedback) --- lib/widgets/contactrow.dart | 71 +++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart index 57dbee25..b2e92b6e 100644 --- a/lib/widgets/contactrow.dart +++ b/lib/widgets/contactrow.dart @@ -80,44 +80,45 @@ class _ContactRowState extends State { Visibility( visible: !Provider.of(context).streamerMode, child: Text(contact.onion, + overflow: TextOverflow.ellipsis, style: TextStyle(color: contact.isBlocked ? Provider.of(context).theme.portraitBlockedTextColor : Provider.of(context).theme.mainTextColor)), - ) + ), + Padding( + padding: const EdgeInsets.all(5.0), + child: contact.isInvitation == true + ? Wrap(direction: Axis.vertical, children: [ + IconButton( + padding: EdgeInsets.zero, + splashRadius: Material.defaultSplashRadius / 2, + iconSize: 16, + icon: Icon( + Icons.favorite, + color: Provider.of(context).theme.mainTextColor, + ), + tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest, + onPressed: _btnApprove, + ), + IconButton( + padding: EdgeInsets.zero, + splashRadius: Material.defaultSplashRadius / 2, + iconSize: 16, + icon: Icon(Icons.delete, color: Provider.of(context).theme.mainTextColor), + tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest, + onPressed: _btnReject, + ) + ]) + : (contact.isBlocked != null && contact.isBlocked + ? IconButton( + padding: EdgeInsets.zero, + splashRadius: Material.defaultSplashRadius / 2, + iconSize: 16, + icon: Icon(Icons.block, color: Provider.of(context).theme.mainTextColor), + onPressed: () {}, + ) + : Text(dateToNiceString(contact.lastMessageTime))), + ), ], ))), - Padding( - padding: const EdgeInsets.all(5.0), - child: contact.isInvitation == true - ? Wrap(direction: Axis.vertical, children: [ - IconButton( - padding: EdgeInsets.zero, - splashRadius: Material.defaultSplashRadius / 2, - iconSize: 16, - icon: Icon( - Icons.favorite, - color: Provider.of(context).theme.mainTextColor, - ), - tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest, - onPressed: _btnApprove, - ), - IconButton( - padding: EdgeInsets.zero, - splashRadius: Material.defaultSplashRadius / 2, - iconSize: 16, - icon: Icon(Icons.delete, color: Provider.of(context).theme.mainTextColor), - tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest, - onPressed: _btnReject, - ) - ]) - : (contact.isBlocked != null && contact.isBlocked - ? IconButton( - padding: EdgeInsets.zero, - splashRadius: Material.defaultSplashRadius / 2, - iconSize: 16, - icon: Icon(Icons.block, color: Provider.of(context).theme.mainTextColor), - onPressed: () {}, - ) - : Text(dateToNiceString(contact.lastMessageTime))), - ), ]), onTap: () { selectConversation(context, contact.identifier); -- 2.25.1 From 15c68d8812eecdec0ec0ca46631dccc2e7f2531b Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 9 Jun 2022 13:20:01 -0700 Subject: [PATCH 2/4] remove padding --- lib/widgets/contactrow.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart index b2e92b6e..222a2650 100644 --- a/lib/widgets/contactrow.dart +++ b/lib/widgets/contactrow.dart @@ -83,10 +83,9 @@ class _ContactRowState extends State { overflow: TextOverflow.ellipsis, style: TextStyle(color: contact.isBlocked ? Provider.of(context).theme.portraitBlockedTextColor : Provider.of(context).theme.mainTextColor)), ), - Padding( - padding: const EdgeInsets.all(5.0), + Container( child: contact.isInvitation == true - ? Wrap(direction: Axis.vertical, children: [ + ? Wrap(direction: Axis.horizontal, children: [ IconButton( padding: EdgeInsets.zero, splashRadius: Material.defaultSplashRadius / 2, -- 2.25.1 From 2bc47173f94aafdb6082c3b62298044c4a504a10 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 9 Jun 2022 13:36:59 -0700 Subject: [PATCH 3/4] more clear contact request --- lib/widgets/contactrow.dart | 52 +++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart index 222a2650..9ec72e14 100644 --- a/lib/widgets/contactrow.dart +++ b/lib/widgets/contactrow.dart @@ -84,27 +84,39 @@ class _ContactRowState extends State { style: TextStyle(color: contact.isBlocked ? Provider.of(context).theme.portraitBlockedTextColor : Provider.of(context).theme.mainTextColor)), ), Container( + padding: EdgeInsets.all(0), child: contact.isInvitation == true - ? Wrap(direction: Axis.horizontal, children: [ - IconButton( - padding: EdgeInsets.zero, - splashRadius: Material.defaultSplashRadius / 2, - iconSize: 16, - icon: Icon( - Icons.favorite, - color: Provider.of(context).theme.mainTextColor, - ), - tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest, - onPressed: _btnApprove, - ), - IconButton( - padding: EdgeInsets.zero, - splashRadius: Material.defaultSplashRadius / 2, - iconSize: 16, - icon: Icon(Icons.delete, color: Provider.of(context).theme.mainTextColor), - tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest, - onPressed: _btnReject, - ) + ? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: [ + Padding( + padding: EdgeInsets.all(2), + child: TextButton.icon( + label: Text( + AppLocalizations.of(context)!.tooltipAcceptContactRequest, + style: TextStyle(decoration: TextDecoration.underline), + ), + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all(Provider.of(context).theme.backgroundPaneColor), + foregroundColor: MaterialStateProperty.all(Provider.of(context).theme.mainTextColor)), + icon: Icon( + Icons.favorite, + size: 16, + color: Provider.of(context).theme.mainTextColor, + ), + onPressed: _btnApprove, + )), + Padding( + padding: EdgeInsets.all(2), + child: TextButton.icon( + label: Text( + AppLocalizations.of(context)!.tooltipRejectContactRequest, + style: TextStyle(decoration: TextDecoration.underline), + ), + style: ButtonStyle( + backgroundColor: MaterialStateProperty.all(Provider.of(context).theme.backgroundPaneColor), + foregroundColor: MaterialStateProperty.all(Provider.of(context).theme.mainTextColor)), + icon: Icon(Icons.delete, size: 16, color: Provider.of(context).theme.mainTextColor), + onPressed: _btnReject, + )) ]) : (contact.isBlocked != null && contact.isBlocked ? IconButton( -- 2.25.1 From d0e7e6703b05230776ee630ce57ac7d6a3356cf2 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 9 Jun 2022 13:40:42 -0700 Subject: [PATCH 4/4] Different buttons --- lib/widgets/contactrow.dart | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart index 9ec72e14..a1769f19 100644 --- a/lib/widgets/contactrow.dart +++ b/lib/widgets/contactrow.dart @@ -92,11 +92,7 @@ class _ContactRowState extends State { child: TextButton.icon( label: Text( AppLocalizations.of(context)!.tooltipAcceptContactRequest, - style: TextStyle(decoration: TextDecoration.underline), ), - style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Provider.of(context).theme.backgroundPaneColor), - foregroundColor: MaterialStateProperty.all(Provider.of(context).theme.mainTextColor)), icon: Icon( Icons.favorite, size: 16, -- 2.25.1