diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index a03e428ec..f1ef95961 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -4932,5 +4932,7 @@ } }, "joinSpaceOnboardingDesc": "Do you have an invite code or link to a learning community?", - "skipForNow": "Skip for now" + "skipForNow": "Skip for now", + "permissions": "Permissions", + "spaceChildPermission": "Who can add new chats and subspaces to this space" } 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 ac021b8f9..e0f77ffaa 100644 --- a/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart +++ b/lib/pages/chat_permissions_settings/chat_permissions_settings_view.dart @@ -53,7 +53,6 @@ class ChatPermissionsSettingsView extends StatelessWidget { )..removeWhere( (k, v) => v is! int || - k.equals("m.space.child") || k.equals("pangea.usranalytics") || k.equals(EventTypes.RoomPowerLevels), ); diff --git a/lib/pages/chat_permissions_settings/permission_list_tile.dart b/lib/pages/chat_permissions_settings/permission_list_tile.dart index 372e21ce4..704bdc696 100644 --- a/lib/pages/chat_permissions_settings/permission_list_tile.dart +++ b/lib/pages/chat_permissions_settings/permission_list_tile.dart @@ -67,6 +67,10 @@ class PermissionsListTile extends StatelessWidget { return L10n.of(context).enableEncryption; case 'm.room.server_acl': return L10n.of(context).editBlockedServers; + // #Pangea + case EventTypes.SpaceChild: + return L10n.of(context).spaceChildPermission; + // Pangea# } } return permissionKey; diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart index 59536160c..33fbe0d99 100644 --- a/lib/pages/new_group/new_group.dart +++ b/lib/pages/new_group/new_group.dart @@ -256,7 +256,7 @@ class NewGroupController extends State { stateKey: '', content: { 'events': { - EventTypes.SpaceChild: 0, + EventTypes.SpaceChild: 50, }, 'users_default': 0, 'users': { diff --git a/lib/pangea/chat_settings/pages/pangea_chat_details.dart b/lib/pangea/chat_settings/pages/pangea_chat_details.dart index 6a6549db0..71fe5d0e1 100644 --- a/lib/pangea/chat_settings/pages/pangea_chat_details.dart +++ b/lib/pangea/chat_settings/pages/pangea_chat_details.dart @@ -294,31 +294,6 @@ class PangeaChatDetailsView extends StatelessWidget { ), if (room.canInvite && !room.isDirectChat) Divider(color: theme.dividerColor, height: 1), - if (isGroupChat && room.isRoomAdmin) - ListTile( - title: Text( - L10n.of(context).editChatPermissions, - style: TextStyle( - color: theme.colorScheme.secondary, - fontWeight: FontWeight.bold, - ), - ), - subtitle: Text( - L10n.of(context).whoCanPerformWhichAction, - ), - leading: CircleAvatar( - backgroundColor: theme.scaffoldBackgroundColor, - foregroundColor: iconColor, - child: const Icon( - Icons.manage_accounts_outlined, - ), - ), - onTap: () => context.push( - '/rooms/${room.id}/details/permissions', - ), - ), - if (isGroupChat && room.isRoomAdmin) - Divider(color: theme.dividerColor, height: 1), if (room.isRoomAdmin && room.isSpace && room.spaceParents.isEmpty) @@ -332,6 +307,31 @@ class PangeaChatDetailsView extends StatelessWidget { room.isSpace && room.spaceParents.isEmpty) Divider(color: theme.dividerColor, height: 1), + if (room.isRoomAdmin) + ListTile( + title: Text( + L10n.of(context).permissions, + style: TextStyle( + color: theme.colorScheme.secondary, + fontWeight: FontWeight.bold, + ), + ), + subtitle: Text( + L10n.of(context).whoCanPerformWhichAction, + ), + leading: CircleAvatar( + backgroundColor: theme.scaffoldBackgroundColor, + foregroundColor: iconColor, + child: const Icon( + Icons.edit_attributes_outlined, + ), + ), + onTap: () => context.push( + '/rooms/${room.id}/details/permissions', + ), + ), + if (room.isRoomAdmin) + Divider(color: theme.dividerColor, height: 1), if (!room.isSpace && !room.isDirectChat) RoomCapacityButton( room: room,