Skip to content

Commit d69b2e0

Browse files
lebojolebojo
committed
fix: Multiple plural variables rename
1 parent 11e70e8 commit d69b2e0

File tree

5 files changed

+28
-29
lines changed

5 files changed

+28
-29
lines changed

‎Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct ActionsPanelViewModifier: ViewModifier {
4747

4848
@ModalState private var reportForJunkMessages: [Message]?
4949
@ModalState private var reportedForDisplayProblemMessage: Message?
50-
@ModalState private var reportedForPhishingMessage: [Message]?
50+
@ModalState private var reportedForPhishingMessages: [Message]?
5151
@ModalState private var blockSenderAlert: BlockRecipientAlertState?
5252
@ModalState private var blockSendersList: BlockRecipientState?
5353
@ModalState private var messagesToMove: [Message]?
@@ -69,8 +69,8 @@ struct ActionsPanelViewModifier: ViewModifier {
6969
nearestMessagesToMoveSheet: $messagesToMove,
7070
nearestBlockSenderAlert: $blockSenderAlert,
7171
nearestBlockSendersList: $blockSendersList,
72-
nearestReportJunkMessageActionsPanel: $reportForJunkMessages,
73-
nearestReportedForPhishingMessageAlert: $reportedForPhishingMessage,
72+
nearestReportJunkMessagesActionsPanel: $reportForJunkMessages,
73+
nearestReportedForPhishingMessagesAlert: $reportedForPhishingMessages,
7474
nearestReportedForDisplayProblemMessageAlert: $reportedForDisplayProblemMessage,
7575
nearestShareMailLinkPanel: $shareMailLink,
7676
messagesToDownload: $messagesToDownload
@@ -104,15 +104,15 @@ struct ActionsPanelViewModifier: ViewModifier {
104104
}
105105
.customAlert(item: $blockSenderAlert) { blockSenderState in
106106
ConfirmationBlockRecipientView(
107-
recipients: blockSenderState.recipient,
108-
reportedMessages: blockSenderState.message,
107+
recipients: blockSenderState.recipients,
108+
reportedMessages: blockSenderState.messages,
109109
origin: origin
110110
)
111111
}
112112
.customAlert(item: $reportedForDisplayProblemMessage) { message in
113113
ReportDisplayProblemView(message: message)
114114
}
115-
.customAlert(item: $reportedForPhishingMessage) { messages in
115+
.customAlert(item: $reportedForPhishingMessages) { messages in
116116
ReportPhishingView(
117117
messagesWithDuplicates: messages,
118118
distinctMessageCount: messages.count,

‎Mail/Views/Bottom sheets/Actions/ReportJunkView.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ struct ReportJunkView: View {
7373
#Preview {
7474
ReportJunkView(
7575
reportedMessages: PreviewHelper.sampleMessages,
76-
origin: .floatingPanel(source: .threadList),
77-
completionHandler: { _ in }
78-
)
79-
.accentColor(AccentColor.pink.primary.swiftUIColor)
76+
origin: .floatingPanel(source: .threadList)
77+
) { _ in }
78+
.accentColor(AccentColor.pink.primary.swiftUIColor)
8079
}

‎MailCore/Cache/Actions/ActionOrigin.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public struct ActionOrigin {
4141
private(set) var nearestMessagesToMoveSheet: Binding<[Message]?>?
4242
private(set) var nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>?
4343
private(set) var nearestBlockSendersList: Binding<BlockRecipientState?>?
44-
private(set) var nearestReportJunkMessageActionsPanel: Binding<[Message]?>?
45-
private(set) var nearestReportedForPhishingMessageAlert: Binding<[Message]?>?
44+
private(set) var nearestReportJunkMessagesActionsPanel: Binding<[Message]?>?
45+
private(set) var nearestReportedForPhishingMessagesAlert: Binding<[Message]?>?
4646
private(set) var nearestReportedForDisplayProblemMessageAlert: Binding<Message?>?
4747
private(set) var nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>?
4848
private(set) var messagesToDownload: Binding<[Message]?>?
@@ -55,8 +55,8 @@ public struct ActionOrigin {
5555
nearestMessagesToMoveSheet: Binding<[Message]?>? = nil,
5656
nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>? = nil,
5757
nearestBlockSendersList: Binding<BlockRecipientState?>? = nil,
58-
nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
59-
nearestReportedForPhishingMessageAlert: Binding<[Message]?>? = nil,
58+
nearestReportJunkMessagesActionsPanel: Binding<[Message]?>? = nil,
59+
nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
6060
nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
6161
nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
6262
messagesToDownload: Binding<[Message]?>? = nil
@@ -68,8 +68,8 @@ public struct ActionOrigin {
6868
self.nearestMessagesToMoveSheet = nearestMessagesToMoveSheet
6969
self.nearestBlockSenderAlert = nearestBlockSenderAlert
7070
self.nearestBlockSendersList = nearestBlockSendersList
71-
self.nearestReportJunkMessageActionsPanel = nearestReportJunkMessageActionsPanel
72-
self.nearestReportedForPhishingMessageAlert = nearestReportedForPhishingMessageAlert
71+
self.nearestReportJunkMessagesActionsPanel = nearestReportJunkMessagesActionsPanel
72+
self.nearestReportedForPhishingMessagesAlert = nearestReportedForPhishingMessagesAlert
7373
self.nearestReportedForDisplayProblemMessageAlert = nearestReportedForDisplayProblemMessageAlert
7474
self.nearestShareMailLinkPanel = nearestShareMailLinkPanel
7575
self.messagesToDownload = messagesToDownload
@@ -86,8 +86,8 @@ public struct ActionOrigin {
8686
nearestMessagesToMoveSheet: Binding<[Message]?>? = nil,
8787
nearestBlockSenderAlert: Binding<BlockRecipientAlertState?>? = nil,
8888
nearestBlockSendersList: Binding<BlockRecipientState?>? = nil,
89-
nearestReportJunkMessageActionsPanel: Binding<[Message]?>? = nil,
90-
nearestReportedForPhishingMessageAlert: Binding<[Message]?>? = nil,
89+
nearestReportJunkMessagesActionsPanel: Binding<[Message]?>? = nil,
90+
nearestReportedForPhishingMessagesAlert: Binding<[Message]?>? = nil,
9191
nearestReportedForDisplayProblemMessageAlert: Binding<Message?>? = nil,
9292
nearestShareMailLinkPanel: Binding<ShareMailLinkResult?>? = nil,
9393
messagesToDownload: Binding<[Message]?>? = nil) -> ActionOrigin {
@@ -98,8 +98,8 @@ public struct ActionOrigin {
9898
nearestMessagesToMoveSheet: nearestMessagesToMoveSheet,
9999
nearestBlockSenderAlert: nearestBlockSenderAlert,
100100
nearestBlockSendersList: nearestBlockSendersList,
101-
nearestReportJunkMessageActionsPanel: nearestReportJunkMessageActionsPanel,
102-
nearestReportedForPhishingMessageAlert: nearestReportedForPhishingMessageAlert,
101+
nearestReportJunkMessagesActionsPanel: nearestReportJunkMessagesActionsPanel,
102+
nearestReportedForPhishingMessagesAlert: nearestReportedForPhishingMessagesAlert,
103103
nearestReportedForDisplayProblemMessageAlert: nearestReportedForDisplayProblemMessageAlert,
104104
nearestShareMailLinkPanel: nearestShareMailLinkPanel,
105105
messagesToDownload: messagesToDownload

‎MailCore/Cache/Actions/ActionsManager.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public class ActionsManager: ObservableObject {
169169
}
170170
case .reportJunk:
171171
Task { @MainActor in
172-
origin.nearestReportJunkMessageActionsPanel?.wrappedValue = messagesWithDuplicates
172+
origin.nearestReportJunkMessagesActionsPanel?.wrappedValue = messagesWithDuplicates
173173
}
174174
case .spam:
175175
let messagesFromFolder = messagesWithDuplicates.fromFolderOrSearch(originFolder: origin.frozenFolder)
@@ -180,7 +180,7 @@ public class ActionsManager: ObservableObject {
180180
}
181181
case .phishing:
182182
Task { @MainActor in
183-
origin.nearestReportedForPhishingMessageAlert?.wrappedValue = messagesWithDuplicates
183+
origin.nearestReportedForPhishingMessagesAlert?.wrappedValue = messagesWithDuplicates
184184
}
185185
case .reportDisplayProblem:
186186
Task { @MainActor in
@@ -198,8 +198,8 @@ public class ActionsManager: ObservableObject {
198198
origin.nearestBlockSendersList?.wrappedValue = BlockRecipientState(recipientsToMessage: uniqueRecipient)
199199
} else {
200200
origin.nearestBlockSenderAlert?.wrappedValue = BlockRecipientAlertState(
201-
recipient: Array(uniqueRecipient.keys),
202-
message: messages
201+
recipients: Array(uniqueRecipient.keys),
202+
messages: messages
203203
)
204204
}
205205
}

‎MailCore/Utils/BlockRecipientState.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public struct BlockRecipientState: Identifiable {
2828

2929
public struct BlockRecipientAlertState: Identifiable {
3030
public var id = UUID()
31-
public let recipient: [Recipient]
32-
public let message: [Message]
31+
public let recipients: [Recipient]
32+
public let messages: [Message]
3333

34-
public init(recipient: [Recipient], message: [Message]) {
35-
self.recipient = recipient
36-
self.message = message
34+
public init(recipients: [Recipient], messages: [Message]) {
35+
self.recipients = recipients
36+
self.messages = messages
3737
}
3838
}

0 commit comments

Comments
 (0)