From 5fd74f9047b93bb4644272336f78b60cf6c35b23 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Sat, 17 Apr 2021 08:40:33 +0200 Subject: [PATCH] Fix appearance issue --- lib/ui/routes/settings/account_privacy_settings.dart | 1 + lib/ui/routes/settings/account_security_settings.dart | 2 ++ lib/ui/routes/settings/account_settings_route.dart | 1 + lib/ui/routes/settings/application_settings.dart | 2 ++ lib/ui/routes/settings/general_account_settings.dart | 2 ++ lib/ui/routes/settings/notifications_settings.dart | 2 ++ lib/ui/screens/group_settings_screen.dart | 1 + 7 files changed, 11 insertions(+) diff --git a/lib/ui/routes/settings/account_privacy_settings.dart b/lib/ui/routes/settings/account_privacy_settings.dart index 458c13e..5bd16fe 100644 --- a/lib/ui/routes/settings/account_privacy_settings.dart +++ b/lib/ui/routes/settings/account_privacy_settings.dart @@ -53,6 +53,7 @@ class _AccountPrivacySettingsState extends State { subtitle: tr( "Permanently delete your account and all data related to it."), onPressed: (_) => _deleteAccount(), + subtitleMaxLines: 2, ) ]) ]), diff --git a/lib/ui/routes/settings/account_security_settings.dart b/lib/ui/routes/settings/account_security_settings.dart index 3682897..50e5627 100644 --- a/lib/ui/routes/settings/account_security_settings.dart +++ b/lib/ui/routes/settings/account_security_settings.dart @@ -42,12 +42,14 @@ class _AccountSecuritySettingsScreenState subtitle: tr( "Your security questions can be used to recover an access to your account when you loose your password..."), onPressed: (_) => _changeSecurityQuestions(), + subtitleMaxLines: 3, ), SettingsTile( title: tr("Disconnect all your devices"), subtitle: tr( "Disconnect all your devices from Comunic, including the current one. Use this option if one of the device you use for Comunic was stolen."), onPressed: (_) => _disconnectAllDevices(), + subtitleMaxLines: 6, ), ], ) diff --git a/lib/ui/routes/settings/account_settings_route.dart b/lib/ui/routes/settings/account_settings_route.dart index 491a4f4..d3cf3eb 100644 --- a/lib/ui/routes/settings/account_settings_route.dart +++ b/lib/ui/routes/settings/account_settings_route.dart @@ -164,6 +164,7 @@ class __AccountSettingsBodyState extends State<_AccountSettingsBody> { leading: Icon(f.icon), subtitle: f.subtitle, onPressed: (_) => _openSectionsAsNewRoute(f), + subtitleMaxLines: 3, )) .toList(), ) diff --git a/lib/ui/routes/settings/application_settings.dart b/lib/ui/routes/settings/application_settings.dart index fca3bdc..6fea300 100644 --- a/lib/ui/routes/settings/application_settings.dart +++ b/lib/ui/routes/settings/application_settings.dart @@ -119,6 +119,8 @@ class _PreferencesSettingsTile extends SettingsTile { subtitle: subtitle, onToggle: _doChange, switchValue: helper.getBool(preferencesKey), + titleMaxLines: 2, + subtitleMaxLines: 3, ); } diff --git a/lib/ui/routes/settings/general_account_settings.dart b/lib/ui/routes/settings/general_account_settings.dart index 8b05a9f..ddab24f 100644 --- a/lib/ui/routes/settings/general_account_settings.dart +++ b/lib/ui/routes/settings/general_account_settings.dart @@ -112,6 +112,7 @@ class _GeneralAccountSettingsScreenState _settings.allowComunicEmails = s; _updateSettings(); }, + titleMaxLines: 2, switchValue: _settings.allowComunicEmails, ), ]; @@ -154,6 +155,7 @@ class _GeneralAccountSettingsScreenState _updateSettings(); }, switchValue: _settings.allowComments, + titleMaxLines: 2, ), // Allow posts from friends diff --git a/lib/ui/routes/settings/notifications_settings.dart b/lib/ui/routes/settings/notifications_settings.dart index d5a85b5..86d144f 100644 --- a/lib/ui/routes/settings/notifications_settings.dart +++ b/lib/ui/routes/settings/notifications_settings.dart @@ -68,6 +68,8 @@ class _NotificationsSettingsScreenState switchValue: _settings.allowConversations, subtitle: tr("Receive notifications for the conversations you follow."), + titleMaxLines: 2, + subtitleMaxLines: 2, ) ], ) diff --git a/lib/ui/screens/group_settings_screen.dart b/lib/ui/screens/group_settings_screen.dart index ae538b0..56dc2e7 100644 --- a/lib/ui/screens/group_settings_screen.dart +++ b/lib/ui/screens/group_settings_screen.dart @@ -258,6 +258,7 @@ class _GroupSettingsScreenState extends SafeState { _updateSettings(); }, switchValue: _groupSettings.isMembersListPublic, + titleMaxLines: 2, ) ], );