Merge pull request #5569 from 21pages/ios_1.2.2

replace SettingsTile.navigation with SettingsTile()
This commit is contained in:
RustDesk 2023-09-01 14:57:12 +08:00 committed by GitHub
commit 1d32a96b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -383,7 +383,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
SettingsSection( SettingsSection(
title: Text(translate('Account')), title: Text(translate('Account')),
tiles: [ tiles: [
SettingsTile.navigation( SettingsTile(
title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
? translate('Login') ? translate('Login')
: '${translate('Logout')} (${gFFI.userModel.userName.value})')), : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
@ -399,19 +399,19 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
], ],
), ),
SettingsSection(title: Text(translate("Settings")), tiles: [ SettingsSection(title: Text(translate("Settings")), tiles: [
SettingsTile.navigation( SettingsTile(
title: Text(translate('ID/Relay Server')), title: Text(translate('ID/Relay Server')),
leading: Icon(Icons.cloud), leading: Icon(Icons.cloud),
onPressed: (context) { onPressed: (context) {
showServerSettings(gFFI.dialogManager); showServerSettings(gFFI.dialogManager);
}), }),
SettingsTile.navigation( SettingsTile(
title: Text(translate('Language')), title: Text(translate('Language')),
leading: Icon(Icons.translate), leading: Icon(Icons.translate),
onPressed: (context) { onPressed: (context) {
showLanguageSettings(gFFI.dialogManager); showLanguageSettings(gFFI.dialogManager);
}), }),
SettingsTile.navigation( SettingsTile(
title: Text(translate( title: Text(translate(
Theme.of(context).brightness == Brightness.light Theme.of(context).brightness == Brightness.light
? 'Dark Theme' ? 'Dark Theme'
@ -466,7 +466,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
SettingsSection( SettingsSection(
title: Text(translate("About")), title: Text(translate("About")),
tiles: [ tiles: [
SettingsTile.navigation( SettingsTile(
onPressed: (context) async { onPressed: (context) async {
if (await canLaunchUrl(Uri.parse(url))) { if (await canLaunchUrl(Uri.parse(url))) {
await launchUrl(Uri.parse(url)); await launchUrl(Uri.parse(url));
@ -481,14 +481,15 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
)), )),
), ),
leading: Icon(Icons.info)), leading: Icon(Icons.info)),
SettingsTile.navigation( SettingsTile(
title: Text(translate("Build Date")), title: Text(translate("Build Date")),
value: Padding( value: Padding(
padding: EdgeInsets.symmetric(vertical: 8), padding: EdgeInsets.symmetric(vertical: 8),
child: Text(_buildDate), child: Text(_buildDate),
), ),
leading: Icon(Icons.query_builder)), leading: Icon(Icons.query_builder)),
SettingsTile.navigation( if (isAndroid)
SettingsTile(
onPressed: (context) => onCopyFingerprint(_fingerprint), onPressed: (context) => onCopyFingerprint(_fingerprint),
title: Text(translate("Fingerprint")), title: Text(translate("Fingerprint")),
value: Padding( value: Padding(