From 662eeabc99586c91f0e22a44c1a9e4e0322de0af Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 5 Feb 2025 13:07:01 +0100 Subject: [PATCH] pr suggestions and updated tests --- .../RoomMemberDetailsScreenModels.swift | 2 +- .../RoomMemberDetailsScreenViewModel.swift | 2 +- .../View/RoomMemberDetailsScreen.swift | 2 +- .../StartChatScreen/View/SendInviteConfirmationView.swift | 4 ++-- .../Screens/UserProfileScreen/UserProfileScreenModels.swift | 2 +- .../UserProfileScreen/UserProfileScreenViewModel.swift | 2 +- .../Screens/UserProfileScreen/View/UserProfileScreen.swift | 2 +- .../test_sendInviteConfirmationView-iPad-en-GB.1.png | 4 ++-- .../test_sendInviteConfirmationView-iPad-pseudo.1.png | 4 ++-- .../test_sendInviteConfirmationView-iPhone-16-en-GB.1.png | 4 ++-- .../test_sendInviteConfirmationView-iPhone-16-pseudo.1.png | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift index fc0ca78b0a..79a893799d 100644 --- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift +++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift @@ -73,7 +73,7 @@ struct RoomMemberDetailsScreenViewStateBindings { var ignoreUserAlert: IgnoreUserAlertItem? var alertInfo: AlertInfo? - var sheetItem: UserProfileProxy? + var inviteConfirmationUser: UserProfileProxy? /// A media item that will be previewed with QuickLook. var mediaPreviewItem: MediaPreviewItem? diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift index 62d89c73e4..2acc99a716 100644 --- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift +++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift @@ -189,7 +189,7 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro if let roomID { actionsSubject.send(.openDirectChat(roomID: roomID)) } else { - state.bindings.sheetItem = .init(userID: roomMemberProxy.userID, displayName: roomMemberProxy.displayName, avatarURL: roomMemberProxy.avatarURL) + state.bindings.inviteConfirmationUser = .init(userID: roomMemberProxy.userID, displayName: roomMemberProxy.displayName, avatarURL: roomMemberProxy.avatarURL) } case .failure: state.bindings.alertInfo = .init(id: .failedOpeningDirectChat) diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift index 63db6e8f2f..32033581d7 100644 --- a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift @@ -25,7 +25,7 @@ struct RoomMemberDetailsScreen: View { .navigationTitle(L10n.screenRoomMemberDetailsTitle) .alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage) .alert(item: $context.alertInfo) - .sheet(item: $context.sheetItem) { user in + .sheet(item: $context.inviteConfirmationUser) { user in SendInviteConfirmationView(userToInvite: user, mediaProvider: context.mediaProvider) { context.send(viewAction: .createDirectChat) diff --git a/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift b/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift index 283e398833..740c18fdef 100644 --- a/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift +++ b/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift @@ -18,7 +18,7 @@ struct SendInviteConfirmationView: View { @State private var sheetHeight: CGFloat = .zero private let topPadding: CGFloat = 24 - var subtitle: String { + private var subtitle: String { if let displayName = userToInvite.displayName { L10n.screenBottomSheetCreateDmMessage(displayName, userToInvite.userID) } else { @@ -89,7 +89,7 @@ struct SendInviteConfirmationView: View { struct SendInviteConfirmationView_Previews: PreviewProvider, TestablePreview { static var previews: some View { - SendInviteConfirmationView(userToInvite: .mockAlice, + SendInviteConfirmationView(userToInvite: .mockBob, mediaProvider: nil) { } } } diff --git a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift index ce8ab1c69f..8aa3da09dc 100644 --- a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift +++ b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift @@ -36,7 +36,7 @@ struct UserProfileScreenViewState: BindableState { struct UserProfileScreenViewStateBindings { var alertInfo: AlertInfo? - var sheetItem: UserProfileProxy? + var inviteConfirmationUser: UserProfileProxy? /// A media item that will be previewed with QuickLook. var mediaPreviewItem: MediaPreviewItem? diff --git a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift index da3beeacec..5d6b2fbe4f 100644 --- a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift +++ b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift @@ -123,7 +123,7 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr if let roomID { actionsSubject.send(.openDirectChat(roomID: roomID)) } else { - state.bindings.sheetItem = userProfile + state.bindings.inviteConfirmationUser = userProfile } case .failure: state.bindings.alertInfo = .init(id: .failedOpeningDirectChat) diff --git a/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift b/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift index 62036219c6..6c35f61e2e 100644 --- a/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift +++ b/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift @@ -22,7 +22,7 @@ struct UserProfileScreen: View { .navigationBarTitleDisplayMode(.inline) .toolbar { toolbar } .alert(item: $context.alertInfo) - .sheet(item: $context.sheetItem) { user in + .sheet(item: $context.inviteConfirmationUser) { user in SendInviteConfirmationView(userToInvite: user, mediaProvider: context.mediaProvider) { context.send(viewAction: .createDirectChat) diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png index 38fe309881..bebdc9694e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9259c1e515177b6729381c71a0970f036fa40cc6a8385f46b3f3534b5909489b -size 96736 +oid sha256:f5134d26db372ed3e79c53d8de118da0c803f8fb7c3fea5aa8937f062e07d405 +size 96670 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png index c4e30466dd..500b073083 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b81f3a8a7afa6e1cd3d264532f4aa3d3c320454632f0ca3e8a8ce437c3207e42 -size 105094 +oid sha256:579816b346b4bd8a865ab3c787712ad7f69a96ea4bdb6175902ddb1d7ee32344 +size 102539 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png index 44642c71f8..50a1506fc6 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e08a1106182ee6936eb8066ab749a3ede52a5a828f490d9f19bf42786c6e9dbf -size 53962 +oid sha256:83c264975969271bf1e573a94fafe01ad912a530f7d9018609f33f4d62ed7fde +size 53588 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png index a6e65b0523..0c6c6997b3 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ffa2702a7b8283af820a3830cc3408f6e32c48ad43907df56ee32d9a6911c98 -size 65186 +oid sha256:bd3dc048f39e113f12a396a25a607b156862583c3f54d580a212b0288c42e8f1 +size 64963