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

Add polls' room summaries (#1770)

Browse Source 
* Update sdk to 1.1.18 & add poll summary

* Fix localisation
This commit is contained in:
Alfonso Grillo
2023-09-21 09:47:14 +02:00
committed by GitHub
parent 9d91cd4fc0
commit 7048a0e4ad
9 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Generated/Strings.swift
+7 -1
View File
@@ -28,6 +28,8 @@ public enum L10n {
public static var a11yUserMenu: String { return L10n.tr("Localizable", "a11y_user_menu") }
/// Accept
public static var actionAccept: String { return L10n.tr("Localizable", "action_accept") }
/// Add to timeline
public static var actionAddToTimeline: String { return L10n.tr("Localizable", "action_add_to_timeline") }
/// Back
public static var actionBack: String { return L10n.tr("Localizable", "action_back") }
/// Cancel
@@ -230,6 +232,10 @@ public enum L10n {
public static var commonPeople: String { return L10n.tr("Localizable", "common_people") }
/// Permalink
public static var commonPermalink: String { return L10n.tr("Localizable", "common_permalink") }
/// Poll: %1$@
public static func commonPollSummary(_ p1: Any) -> String {
return L10n.tr("Localizable", "common_poll_summary", String(describing: p1))
}
/// Total votes: %1$@
public static func commonPollTotalVotes(_ p1: Any) -> String {
return L10n.tr("Localizable", "common_poll_total_votes", String(describing: p1))
@@ -830,7 +836,7 @@ public enum L10n {
public static var screenRoomAttachmentSourceCamera: String { return L10n.tr("Localizable", "screen_room_attachment_source_camera") }
/// Take photo
public static var screenRoomAttachmentSourceCameraPhoto: String { return L10n.tr("Localizable", "screen_room_attachment_source_camera_photo") }
/// Record a video
/// Record video
public static var screenRoomAttachmentSourceCameraVideo: String { return L10n.tr("Localizable", "screen_room_attachment_source_camera_video") }
/// Attachment
public static var screenRoomAttachmentSourceFiles: String { return L10n.tr("Localizable", "screen_room_attachment_source_files") }
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+3 -3
View File
@@ -1370,11 +1370,11 @@ class RoomProxyMock: RoomProxyProtocol {
return setNameCallsCount > 0
}
var setNameReceivedName: String?
var setNameReceivedInvocations: [String?] = []
var setNameReceivedInvocations: [String] = []
var setNameReturnValue: Result<Void, RoomProxyError>!
var setNameClosure: ((String?) async -> Result<Void, RoomProxyError>)?
var setNameClosure: ((String) async -> Result<Void, RoomProxyError>)?
func setName(_ name: String?) async -> Result<Void, RoomProxyError> {
func setName(_ name: String) async -> Result<Void, RoomProxyError> {
setNameCallsCount += 1
setNameReceivedName = name
setNameReceivedInvocations.append(name)
ElementX/Sources/Services/Room/RoomProxy.swift
+1 -1
View File
@@ -633,7 +633,7 @@ class RoomProxy: RoomProxyProtocol {
}
}
func setName(_ name: String?) async -> Result<Void, RoomProxyError> {
func setName(_ name: String) async -> Result<Void, RoomProxyError> {
await Task.dispatch(on: .global()) {
do {
return try .success(self.room.setName(name: name))
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+1 -1
View File
@@ -159,7 +159,7 @@ protocol RoomProxyProtocol {
func invite(userID: String) async -> Result<Void, RoomProxyError>
func setName(_ name: String?) async -> Result<Void, RoomProxyError>
func setName(_ name: String) async -> Result<Void, RoomProxyError>
func setTopic(_ topic: String) async -> Result<Void, RoomProxyError>
ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
+2 -3
View File
@@ -68,9 +68,8 @@ struct RoomEventStringBuilder {
member: sender.id,
memberIsYou: isOutgoing)
.map(AttributedString.init)
case .poll:
// The Rust SDK doesn't support poll events as room summaries yet
return nil
case .poll(let question, _, _, _, _, _):
return prefix(L10n.commonPollSummary(question), with: senderDisplayName)
}
}