felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 00:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix fonts and edition on replies

Browse Source
This commit is contained in:
aringenbach
2022-05-04 12:17:21 +02:00
parent 4cdf8b31cd
commit 8077b8058d
10 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.swift
+5 -5
View File
@@ -31,17 +31,17 @@ extension RoomViewController {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
let empty = NSAttributedString(string: " ",
attributes: [.font: inputToolbar.textDefaultFont ?? ThemeService.shared().theme.fonts.body])
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(empty)
} else if roomMember.userId == self.mainSession.myUser.userId {
let selfMentionString = NSAttributedString(string: "/me ",
attributes: [.font: inputToolbar.textDefaultFont ?? ThemeService.shared().theme.fonts.body])
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(selfMentionString)
} else {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
let colon = NSAttributedString(string: ": ",
attributes: [.font: inputToolbar.textDefaultFont ?? ThemeService.shared().theme.fonts.body])
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(colon)
}
@@ -58,7 +58,7 @@ extension RoomViewController {
self.setupRoomDataSource { roomDataSource in
guard let roomDataSource = roomDataSource as? RoomDataSource else { return }
if self.inputToolbar?.sendMode == RoomInputToolbarViewSendModeReply, let eventModified = eventModified {
if self.inputToolbar?.sendMode == .reply, let eventModified = eventModified {
roomDataSource.sendReply(to: eventModified,
withAttributedTextMessage: attributedTextMsg) { response in
switch response {
@@ -68,7 +68,7 @@ extension RoomViewController {
MXLog.error("[RoomViewController] sendAttributedTextMessage failed while updating event: \(eventModified.eventId ?? "N/A")")
}
}
} else if self.inputToolbar?.sendMode == RoomInputToolbarViewSendModeEdit, let eventModified = eventModified {
} else if self.inputToolbar?.sendMode == .edit, let eventModified = eventModified {
roomDataSource.replaceAttributedTextMessage(
for: eventModified,
withAttributedTextMessage: attributedTextMsg,