Update appearance of admins when changing moderators.

ElementX.xcodeproj/project.pbxproj

@@ -7324,7 +7324,7 @@
 			repositoryURL = "https://github.com/element-hq/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 19bc4c5cf9c69b7b7aeb9ac8c937c2c81a83e8b1;
+				revision = 6d42477c54a1dae128e0cb3645e3d00a53a5736c;
 			};
 		};
 		F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,7 +14,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-ios",
       "state" : {
-        "revision" : "19bc4c5cf9c69b7b7aeb9ac8c937c2c81a83e8b1"
+        "revision" : "6d42477c54a1dae128e0cb3645e3d00a53a5736c"
       }
     },
     {

ElementX/Resources/Localizations/en.lproj/Localizable.strings

@@ -529,6 +529,7 @@
 "screen_room_change_role_confirm_demote_self_description" = "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.";
 "screen_room_change_role_confirm_demote_self_title" = "Demote yourself?";
 "screen_room_change_role_invited_member_name" = "%1$@ (Pending)";
+"screen_room_change_role_moderators_admin_section_footer" = "Admins automatically have moderator privileges";
 "screen_room_change_role_moderators_title" = "Edit Moderators";
 "screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_change_role_unsaved_changes_title" = "Save changes?";

ElementX/Sources/Generated/Strings.swift

@@ -1287,6 +1287,8 @@ internal enum L10n {
   internal static func screenRoomChangeRoleInvitedMemberName(_ p1: Any) -> String {
     return L10n.tr("Localizable", "screen_room_change_role_invited_member_name", String(describing: p1))
   }
+  /// Admins automatically have moderator privileges
+  internal static var screenRoomChangeRoleModeratorsAdminSectionFooter: String { return L10n.tr("Localizable", "screen_room_change_role_moderators_admin_section_footer") }
   /// Edit Moderators
   internal static var screenRoomChangeRoleModeratorsTitle: String { return L10n.tr("Localizable", "screen_room_change_role_moderators_title") }
   /// Admins

ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift

@@ -58,6 +58,7 @@ struct RoomChangeRolesScreen: View {
 
                 RoomChangeRolesScreenSection(members: context.viewState.administrators,
                                              title: L10n.screenRoomChangeRoleSectionAdministrators,
+                                             isAdministratorsSection: true,
                                              context: context)
                 RoomChangeRolesScreenSection(members: context.viewState.moderators,
                                              title: L10n.screenRoomChangeRoleSectionModerators,

ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSection.swift

@@ -20,6 +20,7 @@ import SwiftUI
 struct RoomChangeRolesScreenSection: View {
     let members: [RoomMemberDetails]
     let title: String
+    var isAdministratorsSection = false
 
     @ObservedObject var context: RoomChangeRolesScreenViewModel.Context
 
@@ -29,15 +30,25 @@ struct RoomChangeRolesScreenSection: View {
                 ForEach(members, id: \.id) { member in
                     RoomChangeRolesScreenRow(member: member,
                                              imageProvider: context.imageProvider,
-                                             isSelected: context.viewState.isMemberSelected(member)) {
+                                             isSelected: isMemberSelected(member)) {
                         context.send(viewAction: .toggleMember(member))
                     }
                     .disabled(member.role == .administrator)
                 }
             } header: {
                 Text(title)
                     .compoundListSectionHeader()
+            } footer: {
+                if isAdministratorsSection, context.viewState.mode == .moderator {
+                    Text(L10n.screenRoomChangeRoleModeratorsAdminSectionFooter)
+                        .compoundListSectionFooter()
+                }
             }
         }
     }
+
+    private func isMemberSelected(_ member: RoomMemberDetails) -> Bool {
+        // We always show administrators as selected, even on the moderators screen.
+        member.role == .administrator || context.viewState.isMemberSelected(member)
+    }
 }

project.yml

@@ -52,7 +52,7 @@ packages:
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios
-    revision: 19bc4c5cf9c69b7b7aeb9ac8c937c2c81a83e8b1
+    revision: 6d42477c54a1dae128e0cb3645e3d00a53a5736c
     # path: ../compound-ios
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events