ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build issues for xcode 13.3

Browse Source
This commit is contained in:
Gil Eluard
2022-04-13 12:30:41 +02:00
committed by Stefan Ceriu
parent 8d916e3692
commit def0683328
6 changed files with 144 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+65 -67
View File
@@ -1,70 +1,68 @@
{ {
"object": { "pins" : [
"pins": [ {
{ "identity" : "dtcoretext",
"package": "DTCoreText", "kind" : "remoteSourceControl",
"repositoryURL": "https://github.com/Cocoanetics/DTCoreText", "location" : "https://github.com/Cocoanetics/DTCoreText",
"state": { "state" : {
"branch": "develop", "branch" : "develop",
"revision": "9f515155c6fcb5d9c39150aa048685aa65b4904f", "revision" : "9f515155c6fcb5d9c39150aa048685aa65b4904f"
"version": null
}
},
{
"package": "DTFoundation",
"repositoryURL": "https://github.com/Cocoanetics/DTFoundation.git",
"state": {
"branch": null,
"revision": "76062513434421cb6c8a1ae1d4f8368a7ebc2da3",
"version": "1.7.18"
}
},
{
"package": "KeychainAccess",
"repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess",
"state": {
"branch": "master",
"revision": "6299daec1d74be12164fec090faf9ed14d0da9d6",
"version": null
}
},
{
"package": "Kingfisher",
"repositoryURL": "https://github.com/onevcat/Kingfisher",
"state": {
"branch": null,
"revision": "32e4acdf6971f58f5ad552389cf2d7d016334eaf",
"version": "7.2.0"
}
},
{
"package": "MatrixRustSDK",
"repositoryURL": "https://github.com/matrix-org/matrix-rust-components-swift.git",
"state": {
"branch": "main",
"revision": "f6682cf02eec087f921c53526895996cba169378",
"version": null
}
},
{
"package": "Introspect",
"repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
"state": {
"branch": "master",
"revision": "72a509c93166540c0adf8323fd2652daade7f9f6",
"version": null
}
},
{
"package": "SwiftyBeaver",
"repositoryURL": "https://github.com/SwiftyBeaver/SwiftyBeaver",
"state": {
"branch": null,
"revision": "2c039501d6eeb4d4cd4aec4a8d884ad28862e044",
"version": "1.9.5"
}
} }
] },
}, {
"version": 1 "identity" : "dtfoundation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Cocoanetics/DTFoundation.git",
"state" : {
"revision" : "76062513434421cb6c8a1ae1d4f8368a7ebc2da3",
"version" : "1.7.18"
}
},
{
"identity" : "keychainaccess",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kishikawakatsumi/KeychainAccess",
"state" : {
"branch" : "master",
"revision" : "6299daec1d74be12164fec090faf9ed14d0da9d6"
}
},
{
"identity" : "kingfisher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Kingfisher",
"state" : {
"revision" : "1a7b5480eb750a8e171654b9b1cb0a2cbeb27a55",
"version" : "7.2.1"
}
},
{
"identity" : "matrix-rust-components-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift.git",
"state" : {
"branch" : "main",
"revision" : "f6682cf02eec087f921c53526895996cba169378"
}
},
{
"identity" : "swiftui-introspect",
"kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect.git",
"state" : {
"branch" : "master",
"revision" : "72a509c93166540c0adf8323fd2652daade7f9f6"
}
},
{
"identity" : "swiftybeaver",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftyBeaver/SwiftyBeaver",
"state" : {
"revision" : "12b5acf96d98f91d50de447369bd18df74600f1a",
"version" : "1.9.6"
}
}
],
"version" : 2
} }
ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
+14 -12
View File
@@ -37,19 +37,21 @@ struct EmoteRoomTimelineView_Previews: PreviewProvider {
@ViewBuilder @ViewBuilder
static var body: some View { static var body: some View {
VStack(alignment: .leading, spacing: 20.0) { VStack(alignment: .leading, spacing: 20.0) {
let timelineItem = EmoteRoomTimelineItem(id: UUID().uuidString, EmoteRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", timestamp: "Now",
timestamp: "Now", senderId: "Bob"))
shouldShowSenderDetails: true,
senderId: "Bob")
EmoteRoomTimelineView(timelineItem: timelineItem)
let timelineItem = EmoteRoomTimelineItem(id: UUID().uuidString, EmoteRoomTimelineView(timelineItem: itemWith(text: "Some other text",
text: "Some other text", timestamp: "Later",
timestamp: "Later", senderId: "Anne"))
shouldShowSenderDetails: true,
senderId: "Anne")
EmoteRoomTimelineView(timelineItem: timelineItem)
} }
} }
private static func itemWith(text: String, timestamp: String, senderId: String) -> EmoteRoomTimelineItem {
return EmoteRoomTimelineItem(id: UUID().uuidString,
text: text,
timestamp: timestamp,
shouldShowSenderDetails: true,
senderId: senderId)
}
} }
ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift
+14 -12
View File
@@ -59,19 +59,21 @@ struct EventBasedTimelineView_Previews: PreviewProvider {
@ViewBuilder @ViewBuilder
static var body: some View { static var body: some View {
VStack(alignment: .leading, spacing: 20.0) { VStack(alignment: .leading, spacing: 20.0) {
let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, EventBasedTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", timestamp: "Now",
timestamp: "Now", senderId: "Bob"))
shouldShowSenderDetails: true,
senderId: "Bob")
EventBasedTimelineView(timelineItem: timelineItem)
let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, EventBasedTimelineView(timelineItem: itemWith(text: "Some other text",
text: "Some other text", timestamp: "Later",
timestamp: "Later", senderId: "Anne"))
shouldShowSenderDetails: true,
senderId: "Anne")
EventBasedTimelineView(timelineItem: timelineItem)
} }
} }
private static func itemWith(text: String, timestamp: String, senderId: String) -> TextRoomTimelineItem {
return TextRoomTimelineItem(id: UUID().uuidString,
text: text,
timestamp: timestamp,
shouldShowSenderDetails: true,
senderId: senderId)
}
} }
ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
+23 -26
View File
@@ -60,34 +60,31 @@ struct ImageRoomTimelineView_Previews: PreviewProvider {
@ViewBuilder @ViewBuilder
static var body: some View { static var body: some View {
VStack(spacing: 20.0) { VStack(spacing: 20.0) {
let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,
text: "Some image", text: "Some image",
timestamp: "Now", timestamp: "Now",
shouldShowSenderDetails: false, shouldShowSenderDetails: false,
senderId: "Bob", senderId: "Bob",
source: nil, source: nil,
image: UIImage(systemName: "photo")) image: UIImage(systemName: "photo")))
ImageRoomTimelineView(timelineItem: timelineItem)
let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,
text: "Some other image", text: "Some other image",
timestamp: "Now", timestamp: "Now",
shouldShowSenderDetails: false, shouldShowSenderDetails: false,
senderId: "Bob", senderId: "Bob",
source: nil, source: nil,
image: nil) image: nil))
ImageRoomTimelineView(timelineItem: timelineItem)
let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString,
text: "Blurhashed image", text: "Blurhashed image",
timestamp: "Now", timestamp: "Now",
shouldShowSenderDetails: false, shouldShowSenderDetails: false,
senderId: "Bob", senderId: "Bob",
source: nil, source: nil,
image: nil, image: nil,
aspectRatio: 0.7, aspectRatio: 0.7,
blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW") blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW"))
ImageRoomTimelineView(timelineItem: timelineItem)
} }
} }
} }
ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
+14 -12
View File
@@ -37,20 +37,22 @@ struct NoticeRoomTimelineView_Previews: PreviewProvider {
@ViewBuilder @ViewBuilder
static var body: some View { static var body: some View {
VStack(alignment: .leading, spacing: 20.0) { VStack(alignment: .leading, spacing: 20.0) {
let timelineItem = NoticeRoomTimelineItem(id: UUID().uuidString, NoticeRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", timestamp: "Now",
timestamp: "Now", senderId: "Bob"))
shouldShowSenderDetails: true,
senderId: "Bob")
NoticeRoomTimelineView(timelineItem: timelineItem)
let timelineItem = NoticeRoomTimelineItem(id: UUID().uuidString, NoticeRoomTimelineView(timelineItem: itemWith(text: "Some other text",
text: "Some other text", timestamp: "Later",
timestamp: "Later", senderId: "Anne"))
shouldShowSenderDetails: true,
senderId: "Anne")
NoticeRoomTimelineView(timelineItem: timelineItem)
} }
.padding() .padding()
} }
private static func itemWith(text: String, timestamp: String, senderId: String) -> NoticeRoomTimelineItem {
return NoticeRoomTimelineItem(id: UUID().uuidString,
text: text,
timestamp: timestamp,
shouldShowSenderDetails: true,
senderId: senderId)
}
} }
ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
+14 -12
View File
@@ -34,19 +34,21 @@ struct TextRoomTimelineView_Previews: PreviewProvider {
@ViewBuilder @ViewBuilder
static var body: some View { static var body: some View {
VStack(alignment: .leading, spacing: 20.0) { VStack(alignment: .leading, spacing: 20.0) {
let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, TextRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.",
text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", timestamp: "Now",
timestamp: "Now", senderId: "Bob"))
shouldShowSenderDetails: true,
senderId: "Bob")
TextRoomTimelineView(timelineItem: timelineItem)
let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, TextRoomTimelineView(timelineItem: itemWith(text: "Some other text",
text: "Some other text", timestamp: "Later",
timestamp: "Later", senderId: "Anne"))
shouldShowSenderDetails: true,
senderId: "Anne")
TextRoomTimelineView(timelineItem: timelineItem)
} }
} }
private static func itemWith(text: String, timestamp: String, senderId: String) -> TextRoomTimelineItem {
return TextRoomTimelineItem(id: UUID().uuidString,
text: text,
timestamp: timestamp,
shouldShowSenderDetails: true,
senderId: senderId)
}
} }