From f36d5f8a894025eabb03724539f63db340269335 Mon Sep 17 00:00:00 2001 From: Krille Date: Sun, 13 Aug 2023 16:25:56 +0200 Subject: [PATCH] chore: Follow up chat settings --- assets/l10n/intl_en.arb | 6 +---- lib/pages/chat_details/chat_details_view.dart | 26 ++++++++++++++----- .../chat_permissions_settings_view.dart | 2 +- .../permission_list_tile.dart | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 35339c47..2469becc 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -750,11 +750,7 @@ "type": "text", "placeholders": {} }, - "editChatPermissions": "Edit chat permissions", - "@editChatPermissions": { - "type": "text", - "placeholders": {} - }, + "chatPermissions": "Chat permissions", "editDisplayname": "Edit displayname", "@editDisplayname": { "type": "text", diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index c3aebb23..c4e02759 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -298,14 +298,18 @@ class ChatDetailsView extends StatelessWidget { title: Text( L10n.of(context)!.whoIsAllowedToJoinThisGroup, ), - trailing: const Icon(Icons.chevron_right_outlined), + trailing: room.canChangeJoinRules + ? const Icon(Icons.chevron_right_outlined) + : null, subtitle: Text( room.joinRules?.getLocalizedString( MatrixLocals(L10n.of(context)!), ) ?? L10n.of(context)!.none, ), - onTap: controller.setJoinRules, + onTap: room.canChangeJoinRules + ? controller.setJoinRules + : null, ), if (!room.isDirectChat) ListTile( @@ -315,7 +319,9 @@ class ChatDetailsView extends StatelessWidget { foregroundColor: iconColor, child: const Icon(Icons.visibility_outlined), ), - trailing: const Icon(Icons.chevron_right_outlined), + trailing: room.canChangeHistoryVisibility + ? const Icon(Icons.chevron_right_outlined) + : null, title: Text( L10n.of(context)!.visibilityOfTheChatHistory, ), @@ -325,7 +331,9 @@ class ChatDetailsView extends StatelessWidget { ) ?? L10n.of(context)!.none, ), - onTap: controller.setHistoryVisibility, + onTap: room.canChangeHistoryVisibility + ? controller.setHistoryVisibility + : null, ), if (room.joinRules == JoinRules.public) ListTile( @@ -337,7 +345,9 @@ class ChatDetailsView extends StatelessWidget { Icons.person_add_alt_1_outlined, ), ), - trailing: const Icon(Icons.chevron_right_outlined), + trailing: room.canChangeGuestAccess + ? const Icon(Icons.chevron_right_outlined) + : null, title: Text( L10n.of(context)!.areGuestsAllowedToJoin, ), @@ -346,11 +356,13 @@ class ChatDetailsView extends StatelessWidget { MatrixLocals(L10n.of(context)!), ), ), - onTap: controller.setGuestAccess, + onTap: room.canChangeGuestAccess + ? controller.setGuestAccess + : null, ), if (!room.isDirectChat) ListTile( - title: Text(L10n.of(context)!.editChatPermissions), + title: Text(L10n.of(context)!.chatPermissions), subtitle: Text( L10n.of(context)!.whoCanPerformWhichAction, ), diff --git a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart index 9e045342..cbebb23b 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -19,7 +19,7 @@ class ChatPermissionsSettingsView extends StatelessWidget { return Scaffold( appBar: AppBar( leading: const Center(child: BackButton()), - title: Text(L10n.of(context)!.editChatPermissions), + title: Text(L10n.of(context)!.chatPermissions), ), body: MaxWidthBody( child: StreamBuilder( diff --git a/lib/pages/chat_permissions_settings/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart index f16a40d8..0ac68f44 100644 --- a/lib/pages/chat_permissions_settings/permission_list_tile.dart +++ b/lib/pages/chat_permissions_settings/permission_list_tile.dart @@ -45,7 +45,7 @@ class PermissionsListTile extends StatelessWidget { case EventTypes.RoomName: return L10n.of(context)!.changeTheNameOfTheGroup; case EventTypes.RoomPowerLevels: - return L10n.of(context)!.editChatPermissions; + return L10n.of(context)!.chatPermissions; case EventTypes.HistoryVisibility: return L10n.of(context)!.visibilityOfTheChatHistory; case EventTypes.RoomCanonicalAlias: