Skip to content

Commit ed25e50

Browse files
committed
Remove duplicate Identifiable conformances
1 parent 9a939c0 commit ed25e50

File tree

10 files changed

+4
-34
lines changed

10 files changed

+4
-34
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let package = Package(
1616
)
1717
],
1818
dependencies: [
19-
.package(url: "https://github.com/GetStream/stream-chat-swift.git", branch: "v5-stream-core-web-socket-client")
19+
.package(url: "https://github.com/GetStream/stream-chat-swift.git", branch: "v5")
2020
],
2121
targets: [
2222
.target(

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/FileAttachmentsView.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,3 @@ struct MonthlyAttachmentsHeader: View {
108108
.background(Color(colors.background6))
109109
}
110110
}
111-
112-
extension ChatMessageFileAttachment: Identifiable {}

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ import SwiftUI
813813
}
814814
}
815815

816-
extension ChatMessage: Identifiable {
816+
extension ChatMessage {
817817
@MainActor public var scrollMessageId: String {
818818
messageId
819819
}

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollAttachmentView.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ public struct PollAttachmentView<Factory: ViewFactory>: View {
180180
}
181181
}
182182

183-
extension PollOption: Identifiable {}
184-
185183
struct PollOptionView<Factory: ViewFactory>: View {
186184
@ObservedObject var viewModel: PollAttachmentViewModel
187185

Sources/StreamChatSwiftUI/ChatChannel/MessageList/Polls/PollResultsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ struct PollOptionResultsView<Factory: ViewFactory>: View {
135135
}
136136
}
137137

138-
extension PollVote: Identifiable {
138+
extension PollVote {
139139
var displayId: String {
140140
"\(id)-\(optionId ?? user?.id ?? "")-\(pollId)"
141141
}

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsUsersView.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,3 @@ struct ReactionsUsersView: View {
7979
.accessibilityIdentifier("ReactionsUsersView")
8080
}
8181
}
82-
83-
extension ChatMessageReaction: Identifiable {
84-
public var id: String {
85-
"\(author.id)-\(type.rawValue)"
86-
}
87-
}

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsView.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,3 @@ public struct ReactionIcon: View {
120120
.foregroundColor(color)
121121
}
122122
}
123-
124-
extension MessageReactionType: Identifiable {
125-
public var id: String {
126-
rawValue
127-
}
128-
}

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelList.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,3 @@ public struct ChannelsLazyVStack<Factory: ViewFactory>: View {
211211
.modifier(factory.makeChannelListModifier(options: ChannelListModifierOptions()))
212212
}
213213
}
214-
215-
/// Determines the uniqueness of the channel list item.
216-
extension ChatChannel: Identifiable {
217-
public var id: String {
218-
cid.rawValue
219-
}
220-
}

Sources/StreamChatSwiftUI/ChatThreadList/ChatThreadList.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,3 @@ public struct ThreadsLazyVStack<Factory: ViewFactory>: View {
119119
}
120120
}
121121
}
122-
123-
/// Determines the uniqueness of the channel list item.
124-
extension ChatThread: Identifiable {
125-
public var id: String {
126-
parentMessageId
127-
}
128-
}

StreamChatSwiftUI.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3850,7 +3850,7 @@
38503850
isa = XCRemoteSwiftPackageReference;
38513851
repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
38523852
requirement = {
3853-
branch = "v5-stream-core-web-socket-client";
3853+
branch = v5;
38543854
kind = branch;
38553855
};
38563856
};

0 commit comments

Comments
 (0)