diff --git a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings index dab5ceed0..329302fe8 100644 --- a/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en-US.lproj/Localizable.strings @@ -527,7 +527,6 @@ "screen_create_room_room_visibility_section_title" = "Room visibility"; "screen_decline_and_block_block_user_option_description" = "You will not see any messages or room invites from this user"; "screen_decline_and_block_report_user_option_description" = "Report this room to your account provider."; -"screen_decline_and_block_title" = "Decline and block"; "screen_edit_room_address_room_address_section_footer" = "You’ll need an address in order to make it visible in the public directory."; "screen_edit_room_address_title" = "Edit address"; "screen_invite_users_already_a_member" = "Already a member"; @@ -604,7 +603,6 @@ "screen_report_room_leave_failed_alert_title" = "Unable to Leave Room"; "screen_report_room_reason_footer" = "Report this room to your admin. If the messages are encrypted, your admin will not be able to read them."; "screen_report_room_reason_placeholder" = "Describe the reason to report…"; -"screen_report_room_title" = "Report room"; "screen_reset_encryption_password_error" = "An unknown error happened. Please check your account password is correct and try again."; "screen_resolve_send_failure_changed_identity_primary_button_title" = "Withdraw verification and send"; "screen_resolve_send_failure_changed_identity_subtitle" = "You can withdraw your verification and send this message anyway, or you can cancel for now and try again later after reverifying %1$@."; @@ -639,23 +637,20 @@ "screen_room_timeline_reactions_show_reactions_summary" = "Show reactions summary"; "screen_roomlist_clear_filters" = "Clear filters"; "screen_roomlist_tombstoned_room_description" = "This room has been upgraded"; -"screen_security_and_privacy_add_room_address_action" = "Add room address"; -"screen_security_and_privacy_ask_to_join_option_description" = "Anyone can request access but an administrator must accept the request."; +"screen_security_and_privacy_add_room_address_action" = "Add address"; +"screen_security_and_privacy_ask_to_join_option_description" = "Everyone must request access."; "screen_security_and_privacy_enable_encryption_alert_confirm_button_title" = "Yes, enable encryption"; "screen_security_and_privacy_enable_encryption_alert_description" = "Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.\nNo one besides the room members will be able to read messages. This may prevent bots and bridges to work correctly.\nWe do not recommend enabling encryption for rooms that anyone can find and join."; "screen_security_and_privacy_enable_encryption_alert_title" = "Enable encryption?"; "screen_security_and_privacy_encryption_section_footer" = "Once enabled, encryption cannot be disabled."; "screen_security_and_privacy_encryption_toggle_title" = "Enable end-to-end encryption"; "screen_security_and_privacy_room_access_anyone_option_description" = "Anyone can join."; -"screen_security_and_privacy_room_access_anyone_option_title" = "Public"; "screen_security_and_privacy_room_access_invite_only_option_description" = "Only invited people can join."; -"screen_security_and_privacy_room_access_invite_only_option_title" = "Private"; +"screen_security_and_privacy_room_access_invite_only_option_title" = "Invite only"; "screen_security_and_privacy_room_access_section_header" = "Access"; "screen_security_and_privacy_room_access_space_members_option_description" = "Spaces are not currently supported"; "screen_security_and_privacy_room_access_space_members_option_title" = "Space members"; -"screen_security_and_privacy_room_address_description" = "You’ll need an address in order to make it visible in the public directory."; -"screen_security_and_privacy_room_address_section_footer" = "You’ll need a room address in order to make it visible in the room directory."; -"screen_security_and_privacy_room_address_section_header" = "Published address"; +"screen_security_and_privacy_room_address_section_header" = "Address"; "screen_security_and_privacy_room_directory_visibility_section_footer" = "Allow for this room to be found by searching %1$@ public room directory"; "screen_security_and_privacy_room_directory_visibility_toggle_description" = "Allow to be found by searching the public directory."; "screen_security_and_privacy_room_directory_visibility_toggle_title" = "Visible in public directory"; @@ -664,7 +659,8 @@ "screen_security_and_privacy_room_history_since_selecting_option_title" = "Members only since selecting this option"; "screen_security_and_privacy_room_publishing_section_footer" = "Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.\nYou can choose to publish your room in your homeserver public room directory."; "screen_security_and_privacy_room_publishing_section_header" = "Room publishing"; -"screen_security_and_privacy_room_visibility_section_footer" = "Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.\nThe address is also required to make the room visible in %1$@ public room directory."; +"screen_security_and_privacy_room_visibility_section_footer" = "Addresses are a way to find and access rooms. This also ensures you can easily share your room with others."; +"screen_security_and_privacy_room_visibility_section_header" = "Visibility"; "screen_security_and_privacy_title" = "Security & privacy"; "screen_space_menu_action_members" = "View members"; "screen_space_announcement_item1" = "View spaces you've created or joined"; @@ -1016,7 +1012,6 @@ "screen_room_change_permissions_moderators" = "Moderator"; "screen_room_change_permissions_remove_people" = "Remove people"; "screen_room_change_permissions_room_avatar" = "Change avatar"; -"screen_room_change_permissions_room_details" = "Edit details"; "screen_room_change_permissions_room_name" = "Change name"; "screen_room_change_permissions_room_topic" = "Change topic"; "screen_room_change_permissions_send_messages" = "Send messages"; @@ -1072,12 +1067,9 @@ "screen_room_member_list_manage_member_remove_confirmation_kick" = "Only remove member"; "screen_room_member_list_manage_member_unban_action" = "Unban"; "screen_room_member_list_manage_member_unban_message" = "They will be able to join this room again if invited."; -"screen_room_member_list_manage_member_unban_title" = "Unban user"; "screen_room_member_list_mode_banned" = "Banned"; "screen_room_member_list_mode_members" = "Members"; "screen_room_member_list_pending_header_title" = "Pending"; -"screen_room_member_list_role_administrator" = "Admin"; -"screen_room_member_list_role_moderator" = "Moderator"; "screen_room_member_list_role_owner" = "Owner"; "screen_room_member_list_room_members_header_title" = "Room members"; "screen_room_member_list_unbanning_user" = "Unbanning %1$@"; @@ -1355,11 +1347,13 @@ "screen_bottom_sheet_manage_room_member_unbanning_user" = "Unbanning %1$@"; "screen_decline_and_block_block_user_option_title" = "Block user"; "screen_decline_and_block_report_user_reason_placeholder" = "Describe the reason to report…"; +"screen_decline_and_block_title" = "Decline and block"; "screen_home_tab_chats" = "Chats"; "screen_home_tab_spaces" = "Spaces"; "screen_join_room_decline_and_block_button_title" = "Decline and block"; "screen_knock_requests_list_title" = "Requests to join"; "screen_pinned_timeline_screen_title_empty" = "Pinned messages"; +"screen_report_room_title" = "Report room"; "screen_room_mentions_at_room_title" = "Everyone"; "screen_room_single_knock_request_accept_button_title" = "Accept"; "screen_room_single_knock_request_view_button_title" = "View"; @@ -1368,8 +1362,9 @@ "screen_roomlist_knock_event_sent_description" = "Request to join sent"; "screen_security_and_privacy_ask_to_join_option_title" = "Ask to join"; "screen_security_and_privacy_encryption_section_header" = "Encryption"; +"screen_security_and_privacy_room_access_anyone_option_title" = "Anyone"; +"screen_security_and_privacy_room_address_section_footer" = "You’ll need an address in order to make it visible in the public directory."; "screen_security_and_privacy_room_history_anyone_option_title" = "Anyone"; -"screen_security_and_privacy_room_visibility_section_header" = "Room visibility"; "screen_space_settings_leave_space" = "Leave space"; "screen_space_settings_roles_and_permissions" = "Roles & permissions"; "screen_space_settings_security_and_privacy" = "Security & privacy"; @@ -1413,6 +1408,7 @@ "screen_reset_encryption_password_placeholder" = "Enter…"; "screen_room_attachment_source_camera_photo" = "Take photo"; "screen_room_change_permissions_messages_and_content" = "Messages and content"; +"screen_room_change_permissions_room_details" = "Edit details"; "screen_room_change_role_section_administrators" = "Admins"; "screen_room_change_role_section_moderators" = "Moderators"; "screen_room_change_role_section_users" = "Members"; @@ -1429,6 +1425,9 @@ "screen_room_details_topic_title" = "Topic"; "screen_room_error_failed_processing_media" = "Failed processing media to upload, please try again."; "screen_room_member_list_manage_member_remove_confirmation_ban" = "Ban user"; +"screen_room_member_list_manage_member_unban_title" = "Unban user"; +"screen_room_member_list_role_administrator" = "Admin"; +"screen_room_member_list_role_moderator" = "Moderator"; "screen_room_notification_settings_mode_all_messages" = "All messages"; "screen_room_notification_settings_mode_mentions_and_keywords" = "Mentions and Keywords only"; "screen_room_roles_and_permissions_permissions_header" = "Permissions"; diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index ba852c066..13ce355e2 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -527,7 +527,6 @@ "screen_create_room_room_visibility_section_title" = "Room visibility"; "screen_decline_and_block_block_user_option_description" = "You will not see any messages or room invites from this user"; "screen_decline_and_block_report_user_option_description" = "Report this room to your account provider."; -"screen_decline_and_block_title" = "Decline and block"; "screen_edit_room_address_room_address_section_footer" = "You’ll need an address in order to make it visible in the public directory."; "screen_edit_room_address_title" = "Edit address"; "screen_invite_users_already_a_member" = "Already a member"; @@ -604,7 +603,6 @@ "screen_report_room_leave_failed_alert_title" = "Unable to Leave Room"; "screen_report_room_reason_footer" = "Report this room to your admin. If the messages are encrypted, your admin will not be able to read them."; "screen_report_room_reason_placeholder" = "Describe the reason to report…"; -"screen_report_room_title" = "Report room"; "screen_reset_encryption_password_error" = "An unknown error happened. Please check your account password is correct and try again."; "screen_resolve_send_failure_changed_identity_primary_button_title" = "Withdraw verification and send"; "screen_resolve_send_failure_changed_identity_subtitle" = "You can withdraw your verification and send this message anyway, or you can cancel for now and try again later after reverifying %1$@."; @@ -639,23 +637,20 @@ "screen_room_timeline_reactions_show_reactions_summary" = "Show reactions summary"; "screen_roomlist_clear_filters" = "Clear filters"; "screen_roomlist_tombstoned_room_description" = "This room has been upgraded"; -"screen_security_and_privacy_add_room_address_action" = "Add room address"; -"screen_security_and_privacy_ask_to_join_option_description" = "Anyone can request access but an administrator must accept the request."; +"screen_security_and_privacy_add_room_address_action" = "Add address"; +"screen_security_and_privacy_ask_to_join_option_description" = "Everyone must request access."; "screen_security_and_privacy_enable_encryption_alert_confirm_button_title" = "Yes, enable encryption"; "screen_security_and_privacy_enable_encryption_alert_description" = "Once enabled, encryption for a room cannot be disabled, Message history will only be visible for room members since they were invited or since they joined the room.\nNo one besides the room members will be able to read messages. This may prevent bots and bridges to work correctly.\nWe do not recommend enabling encryption for rooms that anyone can find and join."; "screen_security_and_privacy_enable_encryption_alert_title" = "Enable encryption?"; "screen_security_and_privacy_encryption_section_footer" = "Once enabled, encryption cannot be disabled."; "screen_security_and_privacy_encryption_toggle_title" = "Enable end-to-end encryption"; "screen_security_and_privacy_room_access_anyone_option_description" = "Anyone can join."; -"screen_security_and_privacy_room_access_anyone_option_title" = "Public"; "screen_security_and_privacy_room_access_invite_only_option_description" = "Only invited people can join."; -"screen_security_and_privacy_room_access_invite_only_option_title" = "Private"; +"screen_security_and_privacy_room_access_invite_only_option_title" = "Invite only"; "screen_security_and_privacy_room_access_section_header" = "Access"; "screen_security_and_privacy_room_access_space_members_option_description" = "Spaces are not currently supported"; "screen_security_and_privacy_room_access_space_members_option_title" = "Space members"; -"screen_security_and_privacy_room_address_description" = "You’ll need an address in order to make it visible in the public directory."; -"screen_security_and_privacy_room_address_section_footer" = "You’ll need a room address in order to make it visible in the room directory."; -"screen_security_and_privacy_room_address_section_header" = "Published address"; +"screen_security_and_privacy_room_address_section_header" = "Address"; "screen_security_and_privacy_room_directory_visibility_section_footer" = "Allow for this room to be found by searching %1$@ public room directory"; "screen_security_and_privacy_room_directory_visibility_toggle_description" = "Allow to be found by searching the public directory."; "screen_security_and_privacy_room_directory_visibility_toggle_title" = "Visible in public directory"; @@ -664,7 +659,8 @@ "screen_security_and_privacy_room_history_since_selecting_option_title" = "Members only since selecting this option"; "screen_security_and_privacy_room_publishing_section_footer" = "Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.\nYou can choose to publish your room in your homeserver public room directory."; "screen_security_and_privacy_room_publishing_section_header" = "Room publishing"; -"screen_security_and_privacy_room_visibility_section_footer" = "Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others.\nThe address is also required to make the room visible in %1$@ public room directory."; +"screen_security_and_privacy_room_visibility_section_footer" = "Addresses are a way to find and access rooms. This also ensures you can easily share your room with others."; +"screen_security_and_privacy_room_visibility_section_header" = "Visibility"; "screen_security_and_privacy_title" = "Security & privacy"; "screen_space_menu_action_members" = "View members"; "screen_space_announcement_item1" = "View spaces you've created or joined"; @@ -1016,7 +1012,6 @@ "screen_room_change_permissions_moderators" = "Moderator"; "screen_room_change_permissions_remove_people" = "Remove people"; "screen_room_change_permissions_room_avatar" = "Change avatar"; -"screen_room_change_permissions_room_details" = "Edit details"; "screen_room_change_permissions_room_name" = "Change name"; "screen_room_change_permissions_room_topic" = "Change topic"; "screen_room_change_permissions_send_messages" = "Send messages"; @@ -1072,12 +1067,9 @@ "screen_room_member_list_manage_member_remove_confirmation_kick" = "Only remove member"; "screen_room_member_list_manage_member_unban_action" = "Unban"; "screen_room_member_list_manage_member_unban_message" = "They will be able to join this room again if invited."; -"screen_room_member_list_manage_member_unban_title" = "Unban user"; "screen_room_member_list_mode_banned" = "Banned"; "screen_room_member_list_mode_members" = "Members"; "screen_room_member_list_pending_header_title" = "Pending"; -"screen_room_member_list_role_administrator" = "Admin"; -"screen_room_member_list_role_moderator" = "Moderator"; "screen_room_member_list_role_owner" = "Owner"; "screen_room_member_list_room_members_header_title" = "Room members"; "screen_room_member_list_unbanning_user" = "Unbanning %1$@"; @@ -1355,11 +1347,13 @@ "screen_bottom_sheet_manage_room_member_unbanning_user" = "Unbanning %1$@"; "screen_decline_and_block_block_user_option_title" = "Block user"; "screen_decline_and_block_report_user_reason_placeholder" = "Describe the reason to report…"; +"screen_decline_and_block_title" = "Decline and block"; "screen_home_tab_chats" = "Chats"; "screen_home_tab_spaces" = "Spaces"; "screen_join_room_decline_and_block_button_title" = "Decline and block"; "screen_knock_requests_list_title" = "Requests to join"; "screen_pinned_timeline_screen_title_empty" = "Pinned messages"; +"screen_report_room_title" = "Report room"; "screen_room_mentions_at_room_title" = "Everyone"; "screen_room_single_knock_request_accept_button_title" = "Accept"; "screen_room_single_knock_request_view_button_title" = "View"; @@ -1368,8 +1362,9 @@ "screen_roomlist_knock_event_sent_description" = "Request to join sent"; "screen_security_and_privacy_ask_to_join_option_title" = "Ask to join"; "screen_security_and_privacy_encryption_section_header" = "Encryption"; +"screen_security_and_privacy_room_access_anyone_option_title" = "Anyone"; +"screen_security_and_privacy_room_address_section_footer" = "You’ll need an address in order to make it visible in the public directory."; "screen_security_and_privacy_room_history_anyone_option_title" = "Anyone"; -"screen_security_and_privacy_room_visibility_section_header" = "Room visibility"; "screen_space_settings_leave_space" = "Leave space"; "screen_space_settings_roles_and_permissions" = "Roles & permissions"; "screen_space_settings_security_and_privacy" = "Security & privacy"; @@ -1413,6 +1408,7 @@ "screen_reset_encryption_password_placeholder" = "Enter…"; "screen_room_attachment_source_camera_photo" = "Take photo"; "screen_room_change_permissions_messages_and_content" = "Messages and content"; +"screen_room_change_permissions_room_details" = "Edit details"; "screen_room_change_role_section_administrators" = "Admins"; "screen_room_change_role_section_moderators" = "Moderators"; "screen_room_change_role_section_users" = "Members"; @@ -1429,6 +1425,9 @@ "screen_room_details_topic_title" = "Topic"; "screen_room_error_failed_processing_media" = "Failed processing media to upload, please try again."; "screen_room_member_list_manage_member_remove_confirmation_ban" = "Ban user"; +"screen_room_member_list_manage_member_unban_title" = "Unban user"; +"screen_room_member_list_role_administrator" = "Admin"; +"screen_room_member_list_role_moderator" = "Moderator"; "screen_room_notification_settings_mode_all_messages" = "All messages"; "screen_room_notification_settings_mode_mentions_and_keywords" = "Mentions and Keywords only"; "screen_room_roles_and_permissions_permissions_header" = "Permissions"; diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index c4f501c2a..ecca2db55 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -2730,9 +2730,9 @@ internal enum L10n { internal static var screenRoomlistMarkAsUnread: String { return L10n.tr("Localizable", "screen_roomlist_mark_as_unread") } /// This room has been upgraded internal static var screenRoomlistTombstonedRoomDescription: String { return L10n.tr("Localizable", "screen_roomlist_tombstoned_room_description") } - /// Add room address + /// Add address internal static var screenSecurityAndPrivacyAddRoomAddressAction: String { return L10n.tr("Localizable", "screen_security_and_privacy_add_room_address_action") } - /// Anyone can request access but an administrator must accept the request. + /// Everyone must request access. internal static var screenSecurityAndPrivacyAskToJoinOptionDescription: String { return L10n.tr("Localizable", "screen_security_and_privacy_ask_to_join_option_description") } /// Ask to join internal static var screenSecurityAndPrivacyAskToJoinOptionTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_ask_to_join_option_title") } @@ -2752,11 +2752,11 @@ internal enum L10n { internal static var screenSecurityAndPrivacyEncryptionToggleTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_encryption_toggle_title") } /// Anyone can join. internal static var screenSecurityAndPrivacyRoomAccessAnyoneOptionDescription: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_anyone_option_description") } - /// Public + /// Anyone internal static var screenSecurityAndPrivacyRoomAccessAnyoneOptionTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_anyone_option_title") } /// Only invited people can join. internal static var screenSecurityAndPrivacyRoomAccessInviteOnlyOptionDescription: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_invite_only_option_description") } - /// Private + /// Invite only internal static var screenSecurityAndPrivacyRoomAccessInviteOnlyOptionTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_invite_only_option_title") } /// Access internal static var screenSecurityAndPrivacyRoomAccessSectionHeader: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_section_header") } @@ -2765,10 +2765,8 @@ internal enum L10n { /// Space members internal static var screenSecurityAndPrivacyRoomAccessSpaceMembersOptionTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_access_space_members_option_title") } /// You’ll need an address in order to make it visible in the public directory. - internal static var screenSecurityAndPrivacyRoomAddressDescription: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_address_description") } - /// You’ll need a room address in order to make it visible in the room directory. internal static var screenSecurityAndPrivacyRoomAddressSectionFooter: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_address_section_footer") } - /// Published address + /// Address internal static var screenSecurityAndPrivacyRoomAddressSectionHeader: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_address_section_header") } /// Allow for this room to be found by searching %1$@ public room directory internal static func screenSecurityAndPrivacyRoomDirectoryVisibilitySectionFooter(_ p1: Any) -> String { @@ -2791,12 +2789,9 @@ internal enum L10n { internal static var screenSecurityAndPrivacyRoomPublishingSectionFooter: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_publishing_section_footer") } /// Room publishing internal static var screenSecurityAndPrivacyRoomPublishingSectionHeader: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_publishing_section_header") } - /// Room addresses are ways to find and access rooms. This also ensures you can easily share your room with others. - /// The address is also required to make the room visible in %1$@ public room directory. - internal static func screenSecurityAndPrivacyRoomVisibilitySectionFooter(_ p1: Any) -> String { - return L10n.tr("Localizable", "screen_security_and_privacy_room_visibility_section_footer", String(describing: p1)) - } - /// Room visibility + /// Addresses are a way to find and access rooms. This also ensures you can easily share your room with others. + internal static var screenSecurityAndPrivacyRoomVisibilitySectionFooter: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_visibility_section_footer") } + /// Visibility internal static var screenSecurityAndPrivacyRoomVisibilitySectionHeader: String { return L10n.tr("Localizable", "screen_security_and_privacy_room_visibility_section_header") } /// Security & privacy internal static var screenSecurityAndPrivacyTitle: String { return L10n.tr("Localizable", "screen_security_and_privacy_title") } diff --git a/ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift b/ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift index 0f64c5461..63c2b2df6 100644 --- a/ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift +++ b/ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift @@ -19,10 +19,10 @@ struct SecurityAndPrivacyScreen: View { } if context.desiredSettings.accessType != .inviteOnly, context.viewState.canEditAddress { + visibilitySection if let canonicalAlias = context.viewState.canonicalAlias { addressSection(canonicalAlias: canonicalAlias) } else { - publishingSection addAddressSection } } @@ -119,26 +119,28 @@ struct SecurityAndPrivacyScreen: View { } } + private var visibilitySection: some View { + Section { + EmptyView() + } header: { + Text(L10n.screenSecurityAndPrivacyRoomVisibilitySectionHeader) + .compoundListSectionHeader() + } footer: { + Text(L10n.screenSecurityAndPrivacyRoomVisibilitySectionFooter) + .compoundListSectionFooter() + } + } + private func addressSection(canonicalAlias: String) -> some View { Section { - ListRow(label: .plain(title: canonicalAlias, - description: L10n.screenSecurityAndPrivacyRoomAddressDescription), + ListRow(label: .plain(title: canonicalAlias), kind: .navigationLink { context.send(viewAction: .editAddress) }) roomDirectoryVisibilityRow } header: { Text(L10n.screenSecurityAndPrivacyRoomAddressSectionHeader) .compoundListSectionHeader() - } - } - - private var publishingSection: some View { - Section { - EmptyView() - } header: { - Text(L10n.screenSecurityAndPrivacyRoomPublishingSectionHeader) - .compoundListSectionHeader() } footer: { - Text(L10n.screenSecurityAndPrivacyRoomPublishingSectionFooter) + Text(L10n.screenSecurityAndPrivacyRoomAddressSectionFooter) .compoundListSectionFooter() } } diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png index fe29e999a..4ecb825bd 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d49795d187889e82efba9e5c47eace46d4391180f32deacc9110e33416f3a42 -size 190580 +oid sha256:5dc7951f0197cd6b3c1d7c1d797f9d48c9ab1b37b69a306898bfbe3c52a89781 +size 198516 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png index 2bda89997..d3cef9e28 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f2c77d66ef035c1873e98e441c19f5e7c678fb6a32d7d50aeae958839a5655 -size 234322 +oid sha256:7577f6ab30f53ab5f536a7ac4ac8a3f331da54e4243648160dd1fd5f606f8b67 +size 241586 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png index 9cdc8a9ca..f464e5e5a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfdb7bb68d026e93a9b2198570a012b9be41d63530b28471b930ce189448b3c7 -size 137217 +oid sha256:a43870d797bb6c444435e6a1b9f2f5401d5f22e73b7b5f987ef6090ef6e616a4 +size 135613 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png index 3dd8c30a3..39fc639e1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5320308000764a27c7cfce9848d48854b8f2d02f78b7879790de5f4b11c1036c -size 168428 +oid sha256:b8cad56755b0646c4806995d8a86e264ae1317dc36c86a4f78b70dd4c0e2ac11 +size 165494 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png index a13d737d9..8b7c99f76 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e26cb961af3c35a6048e7cb5d984bc0e08c46ebbe8ec3db62c26ad5403000b82 -size 142246 +oid sha256:658cb01eb91c91595ac4982cf8b79a2ed818f9417e61ebfa37cde02ae62f8516 +size 143210 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png index 85446f78e..d7f9b0266 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aacb2e24f67a85954e5484d79a428b7661778ecd5bafe69188569dc410a6a0b3 -size 167953 +oid sha256:ee412bb2b2ff205ab7251e169966dfe5b270e442ea34ab9e7e3ac487038f446b +size 168733 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png index fd598bc0e..60638f69a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce33156449eecd53e3ca6efe11a7bc0c7313350fb5f2cb169ee46272615a97c -size 90150 +oid sha256:41eb8edc077578da2734a9fb306917bcfed7f918d9ff1603d24117cebd303671 +size 91073 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png index 0b5406ad0..68cf2c212 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2f9d05c0dbce32cf29f3a4dcf25284ef4e16f5fa608a36b4df6d23b7d8f87c9 -size 125403 +oid sha256:2d71357317019204e133844f6d6ae78712c6bb73602f7def865c0f1c833354e7 +size 125982 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png index 08d626796..960e48970 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4bf83e08f1a753084cb9820113c4a859e55a41c360a8847adc797bfa61bbb6c -size 171790 +oid sha256:88a545a38e0b3e54fcd1030a550cda3a2ffaff9ae7d2e72f5b9109bbb223c22e +size 184511 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png index 0855693ce..254664bb1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2964b3325b64e50ee3db2f138efede0adb9954bda6aaf7b52951157649df2fe3 -size 205313 +oid sha256:d47e146c326b6c20cf1f8e69a893b7c36aaa57312e4c4374624ac1f4b667dc5c +size 225545 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png index 502e2f110..cc77d053d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0a6406118932e2036b68f75e6086320bc3ef29901ed5f1c78ea52c105cb7353 -size 119755 +oid sha256:49300febbb386fea96b6f58bd5758b326d6e4ffdf819e72e6c8d688c16241d17 +size 131393 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png index fb243c338..c7557ed0a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f45d3d800eaf0fe2cf64b93be0a020ba7714bdc49b32ac3a38427d115c9f8f41 -size 165359 +oid sha256:0c323a4b7354e456719b949b0917c338564e90e77fc18f827ebc95b3502f8faf +size 168847 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png index 26d0b67b6..bcf83f000 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07e8b3b7ff9a4be3f4ac789e55b8a1e7f0475b918935b28fca9f3fcdb4477db -size 167145 +oid sha256:4fdc8f6ba9061324b3335683ac17920f857a3d22bceb191edfcb01293fc8c6dc +size 157441 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png index 33d62fe15..707ba6e95 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebef327245d32303ad96ab680c775db3bc705241c353effd82c71f745ceeced1 -size 210415 +oid sha256:f8a6cb3681819e6b234b10d987926d462fc1f62f51805f92d358f6c5ca6ebdfc +size 191900 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png index 1e19c3f68..637e8a931 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a104cb697c6f5c9c2e8cf8b45c9ec12b6766184ab5bed2aaed9f3bfac072108 -size 116244 +oid sha256:b5a5b7bee770a1188f3f761fab685c97484ce32fc33292797c252f804510441e +size 106026 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png index a8c9a4897..8fd409e61 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d397d86eb62ff727ba60cb1ec2adf1e4e237c74b42ce9fec90899406b973644 -size 165520 +oid sha256:5e959a6b4ea7ec396f83ce59073fa92f9cadef1b467016cfb1de65802f597f80 +size 147333 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png index cc243fdd6..1229b0f8d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ef325709eeef4d87a4d5dc25dace69f0ef4481686251e5ed444304d93d08174 -size 137108 +oid sha256:8b9b5f8f200c818668026f2df9198d3025a308839e291a7d87eed1f5b076b5ee +size 150309 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png index b4b024127..381ad1c15 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a000906e09e960479a928a65f8bb3b2238f517c625d264f82a2d8a20b1ee5f4 -size 155711 +oid sha256:b94544323205ca9fe33e0b589ed7117456ab497f89492460de930165be83bef0 +size 177527 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png index e694927df..a87a20632 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51205c40f3612814b1d3099c6e4895272c39533f68c4bf11b71c5350806d6f2a -size 89570 +oid sha256:1d3b57ae58a6edd4382765d7f8b9c94c7422a48800b6930d389a6fb36bafe78c +size 103290 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png index 2e795715d..1093b1f84 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d088eee0980f6a3d249fe85a71b28c3ba6741a9b64551f281d4dda7ab8c6d78 -size 116962 +oid sha256:8ceaa66b7320762837ae08dd1d5ed3252c594a85bc8f6de46d1910900d438806 +size 143281 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-en-GB.png index 8729601f0..d4d501cfb 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c84a212551a0b5b71793ddbd8cf5d22696076186dac8958b1f473a27d77ed55c -size 188505 +oid sha256:e6d129915470b284089c351abed22e6321d8f23d4bbda39cb2b75f3345537504 +size 200299 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-pseudo.png index 70a635b4f..4e38125e9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e8b53afb02965db27c444c14e1f4b55ff5b4428454926166d15c731e63f7c49 -size 229893 +oid sha256:17f9fb4b907518501603e5ad88cc7cf8d5a3e54f82ed92e9b733e5dcfaa9ad3e +size 244493 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-en-GB.png index 474aecf96..ed8cb645e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d168e81dfcfb376065e33790963cd4bc7f1e7dcee7d1ba8ef09dd2f96f3fd7db -size 134182 +oid sha256:9bbe569e38cdc133d87c94eae2c69a8ffbfe5630aa30bc268c37640d9e4e0075 +size 137180 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-pseudo.png index d3dc21ba3..ec07e92a8 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Restricted-room-iPhone-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58e3c542607634c5df4d88cc0bfbd81e90033511f8b6f6a0fd03ad2b49c324ab -size 167752 +oid sha256:aec02ee9bc3f56b805dae6d5f1a4aa7321694a9b4e9c7dd7accfe100f9de5895 +size 164124