Merge pull request 'Font Scaling' (#738) from stable-blockers into trunk
continuous-integration/drone/push Build is pending
Details
continuous-integration/drone/push Build is pending
Details
Reviewed-on: #738 Reviewed-by: Dan Ballard <dan@openprivacy.ca>
This commit is contained in:
commit
297a7e8a22
|
@ -469,5 +469,4 @@ class CwtchGomobile implements Cwtch {
|
||||||
void PublishServerUpdate(String profile) {
|
void PublishServerUpdate(String profile) {
|
||||||
cwtchPlatform.invokeMethod("PublishServerUpdate", {"ProfileOnion": profile});
|
cwtchPlatform.invokeMethod("PublishServerUpdate", {"ProfileOnion": profile});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -316,7 +316,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
||||||
icon: Icon(CwtchIcons.leave_group),
|
icon: Icon(CwtchIcons.leave_group),
|
||||||
label: Text(
|
label: Text(
|
||||||
AppLocalizations.of(context)!.leaveConversation,
|
AppLocalizations.of(context)!.leaveConversation,
|
||||||
style: TextStyle(decoration: TextDecoration.underline),
|
style: settings.scaleFonts(defaultTextButtonStyle.copyWith(decoration: TextDecoration.underline)),
|
||||||
),
|
),
|
||||||
))
|
))
|
||||||
])
|
])
|
||||||
|
@ -334,7 +334,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
||||||
|
|
||||||
showAlertDialog(BuildContext context) {
|
showAlertDialog(BuildContext context) {
|
||||||
// set up the buttons
|
// set up the buttons
|
||||||
Widget cancelButton = TextButton(
|
Widget cancelButton = ElevatedButton(
|
||||||
child: Text(AppLocalizations.of(context)!.cancel),
|
child: Text(AppLocalizations.of(context)!.cancel),
|
||||||
style: ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.all(20))),
|
style: ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.all(20))),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
import 'package:cwtch/models/contact.dart';
|
import 'package:cwtch/models/contact.dart';
|
||||||
import 'package:cwtch/models/profile.dart';
|
import 'package:cwtch/models/profile.dart';
|
||||||
|
import 'package:cwtch/themes/opaque.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../settings.dart';
|
||||||
|
|
||||||
bool noFilter(ContactInfoState peer) {
|
bool noFilter(ContactInfoState peer) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -32,7 +35,12 @@ class _DropdownContactsState extends State<DropdownContacts> {
|
||||||
isExpanded: true, // magic property
|
isExpanded: true, // magic property
|
||||||
value: this.selected,
|
value: this.selected,
|
||||||
items: Provider.of<ProfileInfoState>(context, listen: false).contactList.contacts.where(widget.filter).map<DropdownMenuItem<String>>((ContactInfoState contact) {
|
items: Provider.of<ProfileInfoState>(context, listen: false).contactList.contacts.where(widget.filter).map<DropdownMenuItem<String>>((ContactInfoState contact) {
|
||||||
return DropdownMenuItem<String>(value: contact.onion, child: Text(contact.nickname));
|
return DropdownMenuItem<String>(
|
||||||
|
value: contact.onion,
|
||||||
|
child: Text(
|
||||||
|
contact.nickname,
|
||||||
|
style: Provider.of<Settings>(context).scaleFonts(defaultTextStyle),
|
||||||
|
));
|
||||||
}).toList(),
|
}).toList(),
|
||||||
onChanged: (String? newVal) {
|
onChanged: (String? newVal) {
|
||||||
setState(() {
|
setState(() {
|
||||||
|
|
Loading…
Reference in New Issue