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

Rename textDefaultFont to defaultFont and remove unnecessary definition in RoomInputToolbarView.h

Browse Source
This commit is contained in:
aringenbach
2023-04-11 14:54:55 +02:00
parent 67c768f8fc
commit 434559488d
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.swift
+4 -4
View File
@@ -32,7 +32,7 @@ extension RoomViewController {
if #available(iOS 15.0, *) {
newAttributedString.append(PillsFormatter.mentionPill(withRoomMember: roomMember,
isHighlighted: false,
font: inputToolbarView.textDefaultFont))
font: inputToolbarView.defaultFont))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
@@ -40,13 +40,13 @@ extension RoomViewController {
} else if roomMember.userId == self.mainSession.myUser.userId {
newAttributedString.appendString("/me ")
newAttributedString.addAttribute(.font,
value: inputToolbarView.textDefaultFont,
value: inputToolbarView.defaultFont,
range: .init(location: 0, length: newAttributedString.length))
} else {
if #available(iOS 15.0, *) {
newAttributedString.append(PillsFormatter.mentionPill(withRoomMember: roomMember,
isHighlighted: false,
font: inputToolbarView.textDefaultFont))
font: inputToolbarView.defaultFont))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
@@ -397,7 +397,7 @@ extension RoomViewController: PermalinkReplacer {
withSession: session,
eventFormatter: eventFormatter,
roomState: roomState,
font: inputToolbarView.textDefaultFont)
font: inputToolbarView.defaultFont)
}
public func restoreMarkdown(in attributedString: NSAttributedString) -> String {