Upgrade Cwtch, Fix Android File Sharing, Fixup UI Scaling
continuous-integration/drone/pr Build is pending
Details
continuous-integration/drone/pr Build is pending
Details
This commit is contained in:
parent
a7041770a0
commit
4578cc51ec
|
@ -1 +1 @@
|
|||
2024-01-15-10-14-v0.0.10-9-g425c3e6
|
||||
2024-02-09-13-23-v0.0.11
|
|
@ -48,7 +48,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
|
|||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Container(
|
||||
height: 24,
|
||||
height: Provider.of<Settings>(context).fontScaling * 24.0,
|
||||
clipBehavior: Clip.hardEdge,
|
||||
decoration: BoxDecoration(),
|
||||
child: Text(Provider.of<ContactInfoState>(context).nickname + " " + AppLocalizations.of(context)!.conversationSettings)),
|
||||
|
|
|
@ -49,7 +49,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
|||
}
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Container(height: 24, clipBehavior: Clip.hardEdge, decoration: BoxDecoration(), child: Text(handle + " " + AppLocalizations.of(context)!.conversationSettings)),
|
||||
title: Container(
|
||||
height: Provider.of<Settings>(context).fontScaling * 24.0,
|
||||
clipBehavior: Clip.hardEdge,
|
||||
decoration: BoxDecoration(),
|
||||
child: Text(handle + " " + AppLocalizations.of(context)!.conversationSettings)),
|
||||
),
|
||||
body: _buildSettingsList(),
|
||||
);
|
||||
|
|
|
@ -119,59 +119,65 @@ class _ContactRowState extends State<ContactRow> {
|
|||
child: this.cachedMessage == null ? CircularProgressIndicator() : this.cachedMessage!.getPreviewWidget(context),
|
||||
)),
|
||||
Container(
|
||||
padding: EdgeInsets.all(0),
|
||||
height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
|
||||
child: contact.isInvitation == true
|
||||
? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipAcceptContactRequest,
|
||||
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
|
||||
),
|
||||
icon: Icon(
|
||||
Icons.favorite,
|
||||
size: 16,
|
||||
color: Provider.of<Settings>(context).theme.mainTextColor,
|
||||
),
|
||||
onPressed: _btnApprove,
|
||||
)),
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipRejectContactRequest,
|
||||
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
|
||||
),
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
|
||||
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: _btnReject,
|
||||
))
|
||||
])
|
||||
: (contact.isBlocked
|
||||
? IconButton(
|
||||
padding: EdgeInsets.zero,
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: () {},
|
||||
)
|
||||
: Text(prettyDateString(context, widget.messageIndex == null ? contact.lastMessageSentTime : (this.cachedMessage?.getMetadata().timestamp ?? DateTime.now())))),
|
||||
),
|
||||
padding: EdgeInsets.all(0),
|
||||
height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
|
||||
child: contact.isInvitation == true
|
||||
? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipAcceptContactRequest,
|
||||
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
|
||||
),
|
||||
icon: Icon(
|
||||
Icons.favorite,
|
||||
size: 16,
|
||||
color: Provider.of<Settings>(context).theme.mainTextColor,
|
||||
),
|
||||
onPressed: _btnApprove,
|
||||
)),
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipRejectContactRequest,
|
||||
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
|
||||
),
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
|
||||
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: _btnReject,
|
||||
))
|
||||
])
|
||||
: (contact.isBlocked
|
||||
? IconButton(
|
||||
padding: EdgeInsets.symmetric(vertical: 2.0, horizontal: 0.0),
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: null,
|
||||
)
|
||||
: Text(prettyDateString(context, widget.messageIndex == null ? contact.lastMessageSentTime : (this.cachedMessage?.getMetadata().timestamp ?? DateTime.now())),
|
||||
style: Provider.of<Settings>(context).scaleFonts(TextStyle(
|
||||
fontSize: 12.0,
|
||||
fontFamily: "Inter",
|
||||
))))),
|
||||
Visibility(
|
||||
visible: !Provider.of<Settings>(context).streamerMode,
|
||||
child: Text(
|
||||
contact.onion,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Provider.of<Settings>(context).scaleFonts(TextStyle(
|
||||
fontSize: 13.0,
|
||||
fontFamily: "RobotoMono",
|
||||
color: ((contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor) as Color)
|
||||
.withOpacity(0.8))),
|
||||
)),
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(0),
|
||||
height: Provider.of<Settings>(context).fontScaling * 13.0 + 5.0,
|
||||
child: Text(
|
||||
contact.onion,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Provider.of<Settings>(context).scaleFonts(TextStyle(
|
||||
fontSize: 13.0,
|
||||
fontFamily: "RobotoMono",
|
||||
color: ((contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor) as Color)
|
||||
.withOpacity(0.8))),
|
||||
))),
|
||||
],
|
||||
))),
|
||||
Visibility(
|
||||
|
|
Loading…
Reference in New Issue