Merge branch 'lollipopkit:main' into main

This commit is contained in:
Thomas
2023-05-12 15:30:17 +02:00
committed by GitHub
12 changed files with 165 additions and 95 deletions

View File

@@ -427,7 +427,7 @@ class _SettingPageState extends State<SettingPage> {
padding: EdgeInsets.zero,
onPressed: () {
if (_pushToken != null) {
copy(_pushToken!);
copy2Clipboard(_pushToken!);
showSnackBar(context, Text(_s.success));
} else {
showSnackBar(context, Text(_s.getPushTokenFailed));
@@ -453,9 +453,10 @@ class _SettingPageState extends State<SettingPage> {
}
Widget _buildFont() {
final fontName = getFileName(_setting.fontPath.fetch());
return ListTile(
title: Text(_s.chooseFontFile),
trailing: Text(getFileName(_setting.fontPath.fetch()) ?? _s.notSelected),
title: Text(_s.choose),
trailing: Text(fontName ?? _s.notSelected),
onTap: () {
showRoundDialog(
context: context,