forked from cwtch.im/cwtch-ui
Merge pull request 'marcia settings fixes' (#462) from marcia_fixes into trunk
Reviewed-on: cwtch.im/cwtch-ui#462
This commit is contained in:
commit
439b9b874f
|
@ -161,7 +161,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
child: Text(getThemeName(context, themeId)), //"ddi_$themeId", key: Key("ddi_$themeId")),
|
child: Text(getThemeName(context, themeId)), //"ddi_$themeId", key: Key("ddi_$themeId")),
|
||||||
);
|
);
|
||||||
}).toList())),
|
}).toList())),
|
||||||
leading: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor),
|
leading: Icon(Icons.palette, color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor)),
|
title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor)),
|
||||||
|
@ -188,7 +188,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
style: TextStyle(color: settings.current().mainTextColor),
|
style: TextStyle(color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
leading: Icon(Icons.stay_primary_landscape, color: settings.current().mainTextColor),
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: Container(
|
child: Container(
|
||||||
|
@ -406,7 +406,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
},
|
},
|
||||||
activeTrackColor: settings.theme.defaultButtonActiveColor,
|
activeTrackColor: settings.theme.defaultButtonActiveColor,
|
||||||
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
|
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
|
||||||
secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
|
secondary: Icon(Icons.photo, color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
Visibility(
|
Visibility(
|
||||||
visible: settings.isExperimentEnabled(ImagePreviewsExperiment) && !Platform.isAndroid,
|
visible: settings.isExperimentEnabled(ImagePreviewsExperiment) && !Platform.isAndroid,
|
||||||
|
|
|
@ -140,7 +140,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
||||||
CwtchButtonTextField(
|
CwtchButtonTextField(
|
||||||
controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
|
controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
|
||||||
onPressed: _copyOnion,
|
onPressed: _copyOnion,
|
||||||
icon: Icon(Icons.copy),
|
icon: Icon(CwtchIcons.address_copy_2),
|
||||||
tooltip: AppLocalizations.of(context)!.copyBtn,
|
tooltip: AppLocalizations.of(context)!.copyBtn,
|
||||||
)
|
)
|
||||||
]),
|
]),
|
||||||
|
|
Loading…
Reference in New Issue