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

Upgrade Cwtch, Fix Android File Sharing, Fixup UI Scaling
continuous-integration/drone/pr Build is pending Details

This commit is contained in:
Sarah Jamie Lewis 2024-02-09 13:34:10 -08:00
parent a7041770a0
commit 4578cc51ec
4 changed files with 64 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LIBCWTCH-GO.version
View File

@ -1 +1 @@
2024-01-15-10-14-v0.0.10-9-g425c3e6 2024-02-09-13-23-v0.0.11

2
lib/views/groupsettingsview.dart
View File

@ -48,7 +48,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Container( title: Container(
height: 24, height: Provider.of<Settings>(context).fontScaling * 24.0,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Text(Provider.of<ContactInfoState>(context).nickname + " " + AppLocalizations.of(context)!.conversationSettings)), child: Text(Provider.of<ContactInfoState>(context).nickname + " " + AppLocalizations.of(context)!.conversationSettings)),

6
lib/views/peersettingsview.dart
View File

@ -49,7 +49,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
} }
return Scaffold( return Scaffold(
appBar: AppBar( 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(), body: _buildSettingsList(),
); );

108
lib/widgets/contactrow.dart
View File

@ -119,59 +119,65 @@ class _ContactRowState extends State<ContactRow> {
child: this.cachedMessage == null ? CircularProgressIndicator() : this.cachedMessage!.getPreviewWidget(context), child: this.cachedMessage == null ? CircularProgressIndicator() : this.cachedMessage!.getPreviewWidget(context),
)), )),
Container( Container(
padding: EdgeInsets.all(0), padding: EdgeInsets.all(0),
height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0, height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
child: contact.isInvitation == true child: contact.isInvitation == true
? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[ ? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
Padding( Padding(
padding: EdgeInsets.all(2), padding: EdgeInsets.all(2),
child: TextButton.icon( child: TextButton.icon(
label: Text( label: Text(
AppLocalizations.of(context)!.tooltipAcceptContactRequest, AppLocalizations.of(context)!.tooltipAcceptContactRequest,
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle), style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
), ),
icon: Icon( icon: Icon(
Icons.favorite, Icons.favorite,
size: 16, size: 16,
color: Provider.of<Settings>(context).theme.mainTextColor, color: Provider.of<Settings>(context).theme.mainTextColor,
), ),
onPressed: _btnApprove, onPressed: _btnApprove,
)), )),
Padding( Padding(
padding: EdgeInsets.all(2), padding: EdgeInsets.all(2),
child: TextButton.icon( child: TextButton.icon(
label: Text( label: Text(
AppLocalizations.of(context)!.tooltipRejectContactRequest, AppLocalizations.of(context)!.tooltipRejectContactRequest,
style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle), style: Provider.of<Settings>(context).scaleFonts(defaultTextButtonStyle),
), ),
style: ButtonStyle( style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor), backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)), foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor), icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor),
onPressed: _btnReject, onPressed: _btnReject,
)) ))
]) ])
: (contact.isBlocked : (contact.isBlocked
? IconButton( ? IconButton(
padding: EdgeInsets.zero, padding: EdgeInsets.symmetric(vertical: 2.0, horizontal: 0.0),
splashRadius: Material.defaultSplashRadius / 2, splashRadius: Material.defaultSplashRadius / 2,
iconSize: 16, iconSize: 16,
icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor), icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
onPressed: () {}, onPressed: null,
) )
: Text(prettyDateString(context, widget.messageIndex == null ? contact.lastMessageSentTime : (this.cachedMessage?.getMetadata().timestamp ?? DateTime.now())))), : 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( Visibility(
visible: !Provider.of<Settings>(context).streamerMode, visible: !Provider.of<Settings>(context).streamerMode,
child: Text( child: Container(
contact.onion, padding: EdgeInsets.all(0),
overflow: TextOverflow.ellipsis, height: Provider.of<Settings>(context).fontScaling * 13.0 + 5.0,
style: Provider.of<Settings>(context).scaleFonts(TextStyle( child: Text(
fontSize: 13.0, contact.onion,
fontFamily: "RobotoMono", overflow: TextOverflow.ellipsis,
color: ((contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor) as Color) style: Provider.of<Settings>(context).scaleFonts(TextStyle(
.withOpacity(0.8))), 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( Visibility(